From 662c0bb889fea51088fdd59482311b7b81a8aae2 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 2 Jan 2011 10:21:52 -0800
Subject: [PATCH 001/314] Move discovery library from OStatus plugin to core

---
 {plugins/OStatus/lib => lib}/discovery.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {plugins/OStatus/lib => lib}/discovery.php (100%)

diff --git a/plugins/OStatus/lib/discovery.php b/lib/discovery.php
similarity index 100%
rename from plugins/OStatus/lib/discovery.php
rename to lib/discovery.php

From 5dfc751d1429b8ec6fccfff0f53a4652abcf7daa Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 2 Jan 2011 10:49:44 -0800
Subject: [PATCH 002/314] move linkheader.php to core

---
 lib/linkheader.php | 66 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 lib/linkheader.php

diff --git a/lib/linkheader.php b/lib/linkheader.php
new file mode 100644
index 0000000000..efa3f65ff3
--- /dev/null
+++ b/lib/linkheader.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * @todo Add file header and documentation.
+ */
+
+class LinkHeader
+{
+    var $href;
+    var $rel;
+    var $type;
+
+    function __construct($str)
+    {
+        preg_match('/^<[^>]+>/', $str, $uri_reference);
+        //if (empty($uri_reference)) return;
+
+        $this->href = trim($uri_reference[0], '<>');
+        $this->rel = array();
+        $this->type = null;
+
+        // remove uri-reference from header
+        $str = substr($str, strlen($uri_reference[0]));
+
+        // parse link-params
+        $params = explode(';', $str);
+
+        foreach ($params as $param) {
+            if (empty($param)) continue;
+            list($param_name, $param_value) = explode('=', $param, 2);
+            $param_name = trim($param_name);
+            $param_value = preg_replace('(^"|"$)', '', trim($param_value));
+
+            // for now we only care about 'rel' and 'type' link params
+            // TODO do something with the other links-params
+            switch ($param_name) {
+            case 'rel':
+                $this->rel = trim($param_value);
+                break;
+
+            case 'type':
+                $this->type = trim($param_value);
+            }
+        }
+    }
+
+    static function getLink($response, $rel=null, $type=null)
+    {
+        $headers = $response->getHeader('Link');
+        if ($headers) {
+            // Can get an array or string, so try to simplify the path
+            if (!is_array($headers)) {
+                $headers = array($headers);
+            }
+
+            foreach ($headers as $header) {
+                $lh = new LinkHeader($header);
+
+                if ((is_null($rel) || $lh->rel == $rel) &&
+                    (is_null($type) || $lh->type == $type)) {
+                    return $lh->href;
+                }
+            }
+        }
+        return null;
+    }
+}

From fda79a38ac1db57c652b2d0f8f9d0cebc8126cd1 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 2 Jan 2011 11:01:01 -0800
Subject: [PATCH 003/314] move linkheader.php to core

---
 plugins/OStatus/lib/linkheader.php | 66 ------------------------------
 1 file changed, 66 deletions(-)
 delete mode 100644 plugins/OStatus/lib/linkheader.php

diff --git a/plugins/OStatus/lib/linkheader.php b/plugins/OStatus/lib/linkheader.php
deleted file mode 100644
index efa3f65ff3..0000000000
--- a/plugins/OStatus/lib/linkheader.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * @todo Add file header and documentation.
- */
-
-class LinkHeader
-{
-    var $href;
-    var $rel;
-    var $type;
-
-    function __construct($str)
-    {
-        preg_match('/^<[^>]+>/', $str, $uri_reference);
-        //if (empty($uri_reference)) return;
-
-        $this->href = trim($uri_reference[0], '<>');
-        $this->rel = array();
-        $this->type = null;
-
-        // remove uri-reference from header
-        $str = substr($str, strlen($uri_reference[0]));
-
-        // parse link-params
-        $params = explode(';', $str);
-
-        foreach ($params as $param) {
-            if (empty($param)) continue;
-            list($param_name, $param_value) = explode('=', $param, 2);
-            $param_name = trim($param_name);
-            $param_value = preg_replace('(^"|"$)', '', trim($param_value));
-
-            // for now we only care about 'rel' and 'type' link params
-            // TODO do something with the other links-params
-            switch ($param_name) {
-            case 'rel':
-                $this->rel = trim($param_value);
-                break;
-
-            case 'type':
-                $this->type = trim($param_value);
-            }
-        }
-    }
-
-    static function getLink($response, $rel=null, $type=null)
-    {
-        $headers = $response->getHeader('Link');
-        if ($headers) {
-            // Can get an array or string, so try to simplify the path
-            if (!is_array($headers)) {
-                $headers = array($headers);
-            }
-
-            foreach ($headers as $header) {
-                $lh = new LinkHeader($header);
-
-                if ((is_null($rel) || $lh->rel == $rel) &&
-                    (is_null($type) || $lh->type == $type)) {
-                    return $lh->href;
-                }
-            }
-        }
-        return null;
-    }
-}

From a6867422a38409665fb9d31539469798f298fb00 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 2 Jan 2011 11:01:28 -0800
Subject: [PATCH 004/314] PHPCS discovery.php

---
 lib/discovery.php | 219 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 205 insertions(+), 14 deletions(-)

diff --git a/lib/discovery.php b/lib/discovery.php
index 905ece2ca5..c66790c1d9 100644
--- a/lib/discovery.php
+++ b/lib/discovery.php
@@ -3,7 +3,7 @@
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2010, StatusNet, Inc.
  *
- * A sample module to show best practices for StatusNet plugins
+ * Use Hammer discovery stack to find out interesting things about an URI
  *
  * PHP version 5
  *
@@ -20,6 +20,7 @@
  * 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  Discovery
  * @package   StatusNet
  * @author    James Walker <james@status.net>
  * @copyright 2010 StatusNet, Inc.
@@ -31,18 +32,33 @@
  * This class implements LRDD-based service discovery based on the "Hammer Draft"
  * (including webfinger)
  *
- * @see http://groups.google.com/group/webfinger/browse_thread/thread/9f3d93a479e91bbf
+ * @category  Discovery
+ * @package   StatusNet
+ * @author    James Walker <james@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ *
+ * @see       http://groups.google.com/group/webfinger/browse_thread/thread/9f3d93a479e91bbf
  */
+
 class Discovery
 {
-
-    const LRDD_REL = 'lrdd';
+    const LRDD_REL    = 'lrdd';
     const PROFILEPAGE = 'http://webfinger.net/rel/profile-page';
     const UPDATESFROM = 'http://schemas.google.com/g/2010#updates-from';
-    const HCARD = 'http://microformats.org/profile/hcard';
+    const HCARD       = 'http://microformats.org/profile/hcard';
 
     public $methods = array();
 
+    /**
+     * Constructor for a discovery object
+     *
+     * Registers different discovery methods.
+     *
+     * @return Discovery this
+     */
+
     public function __construct()
     {
         $this->registerMethod('Discovery_LRDD_Host_Meta');
@@ -50,6 +66,14 @@ class Discovery
         $this->registerMethod('Discovery_LRDD_Link_HTML');
     }
 
+    /**
+     * Register a discovery class
+     * 
+     * @param string $class Class name
+     *
+     * @return void
+     */
+
     public function registerMethod($class)
     {
         $this->methods[] = $class;
@@ -58,7 +82,12 @@ class Discovery
     /**
      * Given a "user id" make sure it's normalized to either a webfinger
      * acct: uri or a profile HTTP URL.
+     *
+     * @param string $user_id User ID to normalize
+     *
+     * @return string normalized acct: or http(s)?: URI
      */
+
     public static function normalize($user_id)
     {
         if (substr($user_id, 0, 5) == 'http:' ||
@@ -67,13 +96,23 @@ class Discovery
             return $user_id;
         }
 
-        if (strpos($user_id, '@') !== FALSE) {
+        if (strpos($user_id, '@') !== false) {
             return 'acct:' . $user_id;
         }
 
         return 'http://' . $user_id;
     }
 
+    /**
+     * Determine if a string is a Webfinger ID
+     *
+     * Webfinger IDs look like foo@example.com or acct:foo@example.com
+     *
+     * @param string $user_id ID to check
+     *
+     * @return boolean true if $user_id is a Webfinger, else false
+     */
+     
     public static function isWebfinger($user_id)
     {
         $uri = Discovery::normalize($user_id);
@@ -82,8 +121,13 @@ class Discovery
     }
 
     /**
-     * This implements the actual lookup procedure
+     * Given a user ID, return the first available XRD
+     *
+     * @param string $id User ID URI
+     *
+     * @return XRD XRD object for the user
      */
+
     public function lookup($id)
     {
         // Normalize the incoming $id to make sure we have a uri
@@ -107,10 +151,20 @@ class Discovery
         }
 
         // TRANS: Exception.
-        throw new Exception(sprintf(_m('Unable to find services for %s.'),$id));
+        throw new Exception(sprintf(_('Unable to find services for %s.'), $id));
     }
 
-    public static function getService($links, $service) {
+    /**
+     * Given an array of links, returns the matching service
+     *
+     * @param array  $links   Links to check
+     * @param string $service Service to find
+     *
+     * @return array $link assoc array representing the link
+     */
+
+    public static function getService($links, $service)
+    {
         if (!is_array($links)) {
             return false;
         }
@@ -122,6 +176,17 @@ class Discovery
         }
     }
 
+    /**
+     * Apply a template using an ID
+     *
+     * Replaces {uri} in template string with the ID given.
+     *
+     * @param string $template Template to match
+     * @param string $id       User ID to replace with
+     *
+     * @return string replaced values
+     */
+
     public static function applyTemplate($template, $id)
     {
         $template = str_replace('{uri}', urlencode($id), $template);
@@ -129,10 +194,18 @@ class Discovery
         return $template;
     }
 
+    /**
+     * Fetch an XRD file and parse
+     *
+     * @param string $url URL of the XRD
+     * 
+     * @return XRD object representing the XRD file
+     */
+
     public static function fetchXrd($url)
     {
         try {
-            $client = new HTTPClient();
+            $client   = new HTTPClient();
             $response = $client->get($url);
         } catch (HTTP_Request2_Exception $e) {
             return false;
@@ -146,13 +219,60 @@ class Discovery
     }
 }
 
+/**
+ * Abstract interface for discovery
+ *
+ * Objects that implement this interface can retrieve an array of
+ * XRD links for the URI.
+ *
+ * @category  Discovery
+ * @package   StatusNet
+ * @author    James Walker <james@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
 interface Discovery_LRDD
 {
+    /**
+     * Discover interesting info about the URI
+     *
+     * @param string $uri URI to inquire about
+     *
+     * @return array Links in the XRD file
+     */
+
     public function discover($uri);
 }
 
+/**
+ * Implementation of discovery using host-meta file
+ *
+ * Discovers XRD file for a user by going to the organization's
+ * host-meta file and trying to find a template for LRDD.
+ *
+ * @category  Discovery
+ * @package   StatusNet
+ * @author    James Walker <james@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 Discovery_LRDD_Host_Meta implements Discovery_LRDD
 {
+    /**
+     * Discovery core method
+     *
+     * For Webfinger and HTTP URIs, fetch the host-meta file
+     * and look for LRDD templates
+     *
+     * @param string $uri URI to inquire about
+     *
+     * @return array Links in the XRD file
+     */
+
     public function discover($uri)
     {
         if (Discovery::isWebfinger($uri)) {
@@ -176,12 +296,38 @@ class Discovery_LRDD_Host_Meta implements Discovery_LRDD
     }
 }
 
+/**
+ * Implementation of discovery using HTTP Link header
+ *
+ * Discovers XRD file for a user by fetching the URL and reading any
+ * Link: headers in the HTTP response.
+ *
+ * @category  Discovery
+ * @package   StatusNet
+ * @author    James Walker <james@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 Discovery_LRDD_Link_Header implements Discovery_LRDD
 {
+    /**
+     * Discovery core method
+     *
+     * For HTTP IDs fetch the URL and look for Link headers.
+     *
+     * @param string $uri URI to inquire about
+     *
+     * @return array Links in the XRD file
+     *
+     * @todo fail out of Webfinger URIs faster 
+     */
+
     public function discover($uri)
     {
         try {
-            $client = new HTTPClient();
+            $client   = new HTTPClient();
             $response = $client->get($uri);
         } catch (HTTP_Request2_Exception $e) {
             return false;
@@ -199,6 +345,14 @@ class Discovery_LRDD_Link_Header implements Discovery_LRDD
         return array(Discovery_LRDD_Link_Header::parseHeader($link_header));
     }
 
+    /**
+     * Given a string or array of headers, returns XRD-like assoc array
+     *
+     * @param string|array $header string or array of strings for headers
+     * 
+     * @return array Link header in XRD-like format
+     */
+
     protected static function parseHeader($header)
     {
         $lh = new LinkHeader($header);
@@ -209,12 +363,39 @@ class Discovery_LRDD_Link_Header implements Discovery_LRDD
     }
 }
 
+/**
+ * Implementation of discovery using HTML <link> element
+ *
+ * Discovers XRD file for a user by fetching the URL and reading any
+ * <link> elements in the HTML response.
+ *
+ * @category  Discovery
+ * @package   StatusNet
+ * @author    James Walker <james@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 Discovery_LRDD_Link_HTML implements Discovery_LRDD
 {
+    /**
+     * Discovery core method
+     *
+     * For HTTP IDs, fetch the URL and look for <link> elements
+     * in the HTML response.
+     *
+     * @param string $uri URI to inquire about
+     *
+     * @return array Links in XRD-ish assoc array
+     *
+     * @todo fail out of Webfinger URIs faster 
+     */
+
     public function discover($uri)
     {
         try {
-            $client = new HTTPClient();
+            $client   = new HTTPClient();
             $response = $client->get($uri);
         } catch (HTTP_Request2_Exception $e) {
             return false;
@@ -227,6 +408,16 @@ class Discovery_LRDD_Link_HTML implements Discovery_LRDD
         return Discovery_LRDD_Link_HTML::parse($response->getBody());
     }
 
+    /**
+     * Parse HTML and return <link> elements
+     *
+     * Given an HTML string, scans the string for <link> elements
+     *
+     * @param string $html HTML to scan
+     *
+     * @return array array of associative arrays in XRD-ish format
+     */
+
     public function parse($html)
     {
         $links = array();
@@ -237,8 +428,8 @@ class Discovery_LRDD_Link_HTML implements Discovery_LRDD
         preg_match_all('/<link\s[^>]*>/i', $head_html, $link_matches);
 
         foreach ($link_matches[0] as $link_html) {
-            $link_url = null;
-            $link_rel = null;
+            $link_url  = null;
+            $link_rel  = null;
             $link_type = null;
 
             preg_match('/\srel=(("|\')([^\\2]*?)\\2|[^"\'\s]+)/i', $link_html, $rel_matches);

From 1ea8ca813bf277b05c5736799b3be43ebb91ab30 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 2 Jan 2011 11:08:32 -0800
Subject: [PATCH 005/314] PHPCS linkheader.php

---
 lib/linkheader.php | 74 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 70 insertions(+), 4 deletions(-)

diff --git a/lib/linkheader.php b/lib/linkheader.php
index efa3f65ff3..a08fb67116 100644
--- a/lib/linkheader.php
+++ b/lib/linkheader.php
@@ -1,6 +1,51 @@
 <?php
 /**
- * @todo Add file header and documentation.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * Parse HTTP response for interesting Link: headers
+ *
+ * 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  Discovery
+ * @package   StatusNet
+ * @author    James Walker <james@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')) {
+    exit(1);
+}
+
+/**
+ * Class to represent Link: headers in an HTTP response
+ *
+ * Since these are a fairly important part of Hammer-stack discovery, they're
+ * reified and implemented here.
+ *
+ * @category  Discovery
+ * @package   StatusNet
+ * @author    James Walker <james@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ *
+ * @see       Discovery
  */
 
 class LinkHeader
@@ -9,13 +54,21 @@ class LinkHeader
     var $rel;
     var $type;
 
+    /**
+     * Initialize from a string
+     *
+     * @param string $str Link: header value
+     *
+     * @return LinkHeader self
+     */
+
     function __construct($str)
     {
         preg_match('/^<[^>]+>/', $str, $uri_reference);
         //if (empty($uri_reference)) return;
 
         $this->href = trim($uri_reference[0], '<>');
-        $this->rel = array();
+        $this->rel  = array();
         $this->type = null;
 
         // remove uri-reference from header
@@ -25,9 +78,12 @@ class LinkHeader
         $params = explode(';', $str);
 
         foreach ($params as $param) {
-            if (empty($param)) continue;
+            if (empty($param)) { 
+                continue;
+            }
             list($param_name, $param_value) = explode('=', $param, 2);
-            $param_name = trim($param_name);
+
+            $param_name  = trim($param_name);
             $param_value = preg_replace('(^"|"$)', '', trim($param_value));
 
             // for now we only care about 'rel' and 'type' link params
@@ -43,6 +99,16 @@ class LinkHeader
         }
     }
 
+    /**
+     * Given an HTTP response, return the requested Link: header
+     *
+     * @param HTTP_Request2_Response $response response to check
+     * @param string                 $rel      relationship to look for
+     * @param string                 $type     media type to look for
+     *
+     * @return LinkHeader discovered header, or null on failure
+     */
+
     static function getLink($response, $rel=null, $type=null)
     {
         $headers = $response->getHeader('Link');

From 199704458943246108f6aded720337b6ecdde0ab Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 2 Jan 2011 11:10:46 -0800
Subject: [PATCH 006/314] execution protection on discovery.php

---
 lib/discovery.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/discovery.php b/lib/discovery.php
index c66790c1d9..d67ec94f00 100644
--- a/lib/discovery.php
+++ b/lib/discovery.php
@@ -28,6 +28,10 @@
  * @link      http://status.net/
  */
 
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
 /**
  * This class implements LRDD-based service discovery based on the "Hammer Draft"
  * (including webfinger)

From 810304159e2ba5a7b68aef45480ba822ec3fce2b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 2 Jan 2011 15:21:56 -0800
Subject: [PATCH 007/314] let callers pass in an XMLOutputter to output to

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

diff --git a/lib/activity.php b/lib/activity.php
index 8d7ae1540b..b77d53427c 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -322,6 +322,7 @@ class Activity
      *
      * @return DOMElement Atom entry
      */
+
     function toAtomEntry()
     {
         return null;
@@ -330,7 +331,12 @@ class Activity
     function asString($namespace=false, $author=true, $source=false)
     {
         $xs = new XMLStringer(true);
+        $this->outputTo($xs, $namespace, $author, $source);
+        return $xs->getString();
+    }
 
+    function outputTo($xs, $namespace=false, $author=true, $source=false)
+    {
         if ($namespace) {
             $attrs = array('xmlns' => 'http://www.w3.org/2005/Atom',
                            'xmlns:thr' => 'http://purl.org/syndication/thread/1.0',
@@ -518,9 +524,7 @@ class Activity
 
         $xs->elementEnd('entry');
 
-        $str = $xs->getString();
-	
-        return $str;
+        return;
     }
 
     private function _child($element, $tag, $namespace=self::SPEC)

From db899a07a5f10801bc0c7c1cbb4f4574df1e15f1 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 2 Jan 2011 15:22:12 -0800
Subject: [PATCH 008/314] preserve activities in object

---
 lib/useractivitystream.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/useractivitystream.php b/lib/useractivitystream.php
index 0fc315e26e..7d9b02ded8 100644
--- a/lib/useractivitystream.php
+++ b/lib/useractivitystream.php
@@ -28,6 +28,8 @@
 
 class UserActivityStream extends AtomUserNoticeFeed
 {
+    public $activities = array();
+
     function __construct($user, $indent = true)
     {
         parent::__construct($user, null, $indent);
@@ -45,10 +47,15 @@ class UserActivityStream extends AtomUserNoticeFeed
         usort($objs, 'UserActivityStream::compareObject');
 
         foreach ($objs as $obj) {
-            $act = $obj->asActivity();
+            $this->activities[] = $obj->asActivity();
+        }
+    }
+    
+    function renderEntries()
+    {
+        foreach ($this->activities as $act) {
             // Only show the author sub-element if it's different from default user
-            $str = $act->asString(false, ($act->actor->id != $this->user->uri));
-            $this->addEntryRaw($str);
+            $act->outputTo($this, false, ($act->actor->id != $this->user->uri));
         }
     }
 

From f51db8eb0d0eda837e0b309729266201fffc6b44 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 3 Jan 2011 07:40:57 -0800
Subject: [PATCH 009/314] Add the Atom username to the XRD output

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

diff --git a/lib/xrdaction.php b/lib/xrdaction.php
index 855ed1ea89..b59e0f78a4 100644
--- a/lib/xrdaction.php
+++ b/lib/xrdaction.php
@@ -99,7 +99,9 @@ class XrdAction extends Action
 	    
             $xrd->links[] = array('rel' => 'http://apinamespace.org/atom',
                                   'type' => 'application/atomsvc+xml',
-                                  'href' => common_local_url('ApiAtomService', array('id' => $nick)));
+                                  'href' => common_local_url('ApiAtomService', array('id' => $nick)),
+                                  'property' => array(array('type' => 'http://apinamespace.org/atom/username',
+                                                            'value' => $nick)));
 
             if (common_config('site', 'fancy')) {
                 $apiRoot = common_path('api/', true);

From ef1fdd595f0bee0847be187733eea9d7b705b328 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 3 Jan 2011 07:41:13 -0800
Subject: [PATCH 010/314] Parse properties of links in XRD files

---
 lib/xrd.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/xrd.php b/lib/xrd.php
index 9c6d9f3ab7..40372b9d7a 100644
--- a/lib/xrd.php
+++ b/lib/xrd.php
@@ -173,6 +173,13 @@ class XRD
                 switch($node->tagName) {
                 case 'Title':
                     $link['title'][] = $node->nodeValue;
+                    break;
+                case 'Property':
+                    $link['property'][] = array('type' => $node->getAttribute('type'),
+                                                'value' => $node->nodeValue);
+                    break;
+                default:
+                    common_log(LOG_NOTICE, "Unexpected tag name {$node->tagName} found in XRD file.");
                 }
             }
         }

From c937d3a8437e23cb5c1c2de3bc501bec8b725802 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 3 Jan 2011 14:59:28 -0800
Subject: [PATCH 011/314] first example of moving a user

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

diff --git a/scripts/moveuser.php b/scripts/moveuser.php
new file mode 100644
index 0000000000..feaca15103
--- /dev/null
+++ b/scripts/moveuser.php
@@ -0,0 +1,296 @@
+<?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/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+$shortoptions = 'i:n:r:w:';
+$longoptions = array('id=', 'nickname=', 'remote=', 'password=');
+
+$helptext = <<<END_OF_MOVEUSER_HELP
+moveuser.php [options]
+Move a local user to a remote account.
+
+  -i --id       ID of user to move
+  -n --nickname nickname of the user to move
+  -r --remote   Full ID of remote users
+  -w --password Password of remote user
+
+Remote user identity must be a Webfinger (nickname@example.com) or 
+an HTTP or HTTPS URL (http://example.com/social/site/user/nickname).
+
+END_OF_MOVEUSER_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
+
+class ActivitySink
+{
+    protected $svcDocUrl   = null;
+    protected $username    = null;
+    protected $password    = null;
+    protected $collections = array();
+
+    function __construct($svcDocUrl, $username, $password)
+    {
+        $this->svcDocUrl = $svcDocUrl;
+        $this->username  = $username;
+        $this->password  = $password;
+
+        $this->_parseSvcDoc();
+    }
+
+    private function _parseSvcDoc()
+    {
+        $client   = new HTTPClient();
+        $response = $client->get($this->svcDocUrl);
+
+        if ($response->getStatus() != 200) {
+            throw new Exception("Can't get {$this->svcDocUrl}; response status " . $response->getStatus());
+        }
+
+        $xml = $response->getBody();
+
+        $dom = new DOMDocument();
+
+        // We don't want to bother with white spaces
+        $dom->preserveWhiteSpace = false;
+
+        // Don't spew XML warnings to output
+        $old = error_reporting();
+        error_reporting($old & ~E_WARNING);
+        $ok = $dom->loadXML($xml);
+        error_reporting($old);
+
+        $path = new DOMXPath($dom);
+
+        $path->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
+        $path->registerNamespace('app', 'http://www.w3.org/2007/app');
+        $path->registerNamespace('activity', 'http://activitystrea.ms/spec/1.0/');
+
+        $collections = $path->query('//app:collection');
+
+        for ($i = 0; $i < $collections->length; $i++) {
+            $collection = $collections->item($i);
+            $url = $collection->getAttribute('href');
+            $takesEntries = false;
+            $accepts = $path->query('app:accept', $collection);
+            for ($j = 0; $j < $accepts->length; $j++) {
+                $accept = $accepts->item($j);
+                $acceptValue = $accept->nodeValue;
+                if (preg_match('#application/atom\+xml(;\s*type=entry)?#', $acceptValue)) {
+                    $takesEntries = true;
+                    break;
+                }
+            }
+            if (!$takesEntries) {
+                continue;
+            }
+            $verbs = $path->query('activity:verb', $collection);
+            if ($verbs->length == 0) {
+                $this->_addCollection(ActivityVerb::POST, $url);
+            } else {
+                for ($k = 0; $k < $verbs->length; $k++) {
+                    $verb = $verbs->item($k);
+                    $this->_addCollection($verb->nodeValue, $url);
+                }
+            }
+        }
+    }
+
+    private function _addCollection($verb, $url)
+    {
+        if (array_key_exists($verb, $this->collections)) {
+            $this->collections[$verb][] = $url;
+        } else {
+            $this->collections[$verb] = array($url);
+        }
+        return;
+    }
+
+    function postActivity($activity)
+    {
+        if (!array_key_exists($activity->verb, $this->collections)) {
+            throw new Exception("No collection for verb {$activity->verb}");
+        } else {
+            if (count($this->collections[$activity->verb]) > 1) {
+                common_log(LOG_NOTICE, "More than one collection for verb {$activity->verb}");
+            }
+            $this->postToCollection($this->collections[$activity->verb][0], $activity);
+        }
+    }
+
+    function postToCollection($url, $activity)
+    {
+        $client = new HTTPClient($url);
+
+        $client->setMethod('POST');
+        $client->setAuth($this->username, $this->password);
+        $client->setHeader('Content-Type', 'application/atom+xml;type=entry');
+        $client->setBody($activity->asString(true, true, true));
+
+        $response = $client->send();
+    }
+}
+
+function getServiceDocument($remote)
+{
+    $discovery = new Discovery();
+
+    $xrd = $discovery->lookup($remote);
+
+    if (empty($xrd)) {
+        throw new Exception("Can't find XRD for $remote");
+    } 
+
+    $svcDocUrl = null;
+    $username  = null;
+
+    foreach ($xrd->links as $link) {
+        if ($link['rel'] == 'http://apinamespace.org/atom' &&
+            $link['type'] == 'application/atomsvc+xml') {
+            $svcDocUrl = $link['href'];
+            if (!empty($link['property'])) {
+                foreach ($link['property'] as $property) {
+                    if ($property['type'] == 'http://apinamespace.org/atom/username') {
+                        $username = $property['value'];
+                        break;
+                    }
+                }
+            }
+            break;
+        }
+    }
+
+    if (empty($svcDocUrl)) {
+        throw new Exception("No AtomPub API service for $remote.");
+    }
+
+    return array($svcDocUrl, $username);
+}
+
+class AccountMover
+{
+    private $_user    = null;
+    private $_profile = null;
+    private $_remote  = null;
+    private $_sink    = null;
+    
+    function __construct($user, $remote, $password)
+    {
+        $this->_user    = $user;
+        $this->_profile = $user->getProfile();
+
+        $oprofile = Ostatus_profile::ensureProfileURI($remote);
+
+        if (empty($oprofile)) {
+            throw new Exception("Can't locate account {$remote}");
+        }
+
+        $this->_remote = $oprofile->localProfile();
+
+        list($svcDocUrl, $username) = getServiceDocument($remote);
+
+        $this->_sink = new ActivitySink($svcDocUrl, $username, $password);
+    }
+
+    function move()
+    {
+        $stream = new UserActivityStream($this->_user);
+
+        $acts = array_reverse($stream->activities);
+
+        // Reverse activities to run in correct chron order
+
+        foreach ($acts as $act) {
+            $this->_moveActivity($act);
+        }
+    }
+
+    private function _moveActivity($act)
+    {
+        switch ($act->verb) {
+        case ActivityVerb::FAVORITE:
+            // push it, then delete local
+            $this->_sink->postActivity($act);
+            $notice = Notice::staticGet('uri', $act->objects[0]->id);
+            if (!empty($notice)) {
+                $fave = Fave::pkeyGet(array('user_id' => $this->_user->id,
+                                            'notice_id' => $notice->id));
+                $fave->delete();
+            }
+            break;
+        case ActivityVerb::POST:
+            // XXX: send a reshare, not a post
+            common_log(LOG_INFO, "Pushing notice {$act->objects[0]->id} to {$this->_remote->getURI()}");
+            $this->_sink->postActivity($act);
+            $notice = Notice::staticGet('uri', $act->objects[0]->id);
+            if (!empty($notice)) {
+                $notice->delete();
+            }
+            break;
+        case ActivityVerb::JOIN:
+            $this->_sink->postActivity($act);
+            $group = User_group::staticGet('uri', $act->objects[0]->id);
+            if (!empty($group)) {
+                Group_member::leave($group->id, $this->_user->id);
+            }
+            break;
+        case ActivityVerb::FOLLOW:
+            if ($act->actor->id == $this->_user->uri) {
+                $this->_sink->postActivity($act);
+                $other = Profile::fromURI($act->objects[0]->id);
+                if (!empty($other)) {
+                    Subscription::cancel($this->_profile, $other);
+                }
+            } else {
+                $otherUser = User::staticGet('uri', $act->actor->id);
+                if (!empty($otherUser)) {
+                    $otherProfile = $otherUser->getProfile();
+                    Subscription::start($otherProfile, $this->_remote);
+                    Subscription::cancel($otherProfile, $this->_user->getProfile());
+                } else {
+                    // It's a remote subscription. Do something here!
+                }
+            }
+            break;
+        }
+    }
+}
+
+try {
+
+    $user = getUser();
+
+    $remote = get_option_value('r', 'remote');
+
+    if (empty($remote)) {
+        show_help();
+        exit(1);
+    }
+
+    $password = get_option_value('w', 'password');
+
+    $mover = new AccountMover($user, $remote, $password);
+
+    $mover->move();
+
+} catch (Exception $e) {
+    print $e->getMessage()."\n";
+    exit(1);
+}

From 60d8fcd0e781f70e1f250db6ba0bd331a307eab0 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 5 Jan 2011 10:52:44 -0800
Subject: [PATCH 012/314] Revert "Revert "0.9.7alpha1""

This reverts commit fd205546512b75016b1e055aec24eab586ae818b.

Conflicts:

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

diff --git a/lib/common.php b/lib/common.php
index 6138200e49..22890b5cb7 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -22,13 +22,13 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 //exit with 200 response, if this is checking fancy from the installer
 if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') {  exit; }
 
-define('STATUSNET_BASE_VERSION', '0.9.8');
-define('STATUSNET_LIFECYCLE', 'dev'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
+define('STATUSNET_BASE_VERSION', '0.9.7');
+define('STATUSNET_LIFECYCLE', 'alpha1'); // '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', 'Letter Never Sent');
+define('STATUSNET_CODENAME', 'World Leader Pretend');
 
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);

From d0d39b51b8b85a86d8d62a4327d2f119d003cb78 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 5 Jan 2011 12:26:20 -0800
Subject: [PATCH 013/314] Fixes for RegisterThrottle plugin: alt registration
 methods (OpenID, FBConnect, Twitter) weren't triggering the throttle check or
 recording of IPs.

Added StartRegistrationTry/EndRegistrationTry calls into those three, and moved the actual recording hook to EndUserRegister which is guaranteed to be called from User::register (so we don't need to worry about other auth methods forgetting to call the other UI-code hooks).
---
 plugins/Facebook/FBConnectAuth.php               |  6 ++++++
 plugins/OpenID/finishopenidlogin.php             |  7 +++++++
 .../RegisterThrottle/RegisterThrottlePlugin.php  | 16 ++++++----------
 plugins/TwitterBridge/twitterauthorization.php   |  6 ++++++
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/plugins/Facebook/FBConnectAuth.php b/plugins/Facebook/FBConnectAuth.php
index d6d3786261..33c975d650 100644
--- a/plugins/Facebook/FBConnectAuth.php
+++ b/plugins/Facebook/FBConnectAuth.php
@@ -232,6 +232,10 @@ class FBConnectauthAction extends Action
 
     function createNewUser()
     {
+        if (!Event::handle('StartRegistrationTry', array($this))) {
+            return;
+        }
+
         if (common_config('site', 'closed')) {
             // TRANS: Client error trying to register with registrations not allowed.
             $this->clientError(_m('Registration not allowed.'));
@@ -300,6 +304,8 @@ class FBConnectauthAction extends Action
         common_debug('Facebook Connect Plugin - ' .
                      "Registered new user $user->id from Facebook user $this->fbuid");
 
+        Event::handle('EndRegistrationTry', array($this));
+
         common_redirect(common_local_url('showstream', array('nickname' => $user->nickname)),
                         303);
     }
diff --git a/plugins/OpenID/finishopenidlogin.php b/plugins/OpenID/finishopenidlogin.php
index 01dd61edb1..6c4e713897 100644
--- a/plugins/OpenID/finishopenidlogin.php
+++ b/plugins/OpenID/finishopenidlogin.php
@@ -247,6 +247,10 @@ class FinishopenidloginAction extends Action
     {
         # FIXME: save invite code before redirect, and check here
 
+        if (!Event::handle('StartRegistrationTry', array($this))) {
+            return;
+        }
+
         if (common_config('site', 'closed')) {
             // TRANS: OpenID plugin message. No new user registration is allowed on the site.
             $this->clientError(_m('Registration not allowed.'));
@@ -362,6 +366,9 @@ class FinishopenidloginAction extends Action
             common_rememberme($user);
         }
         unset($_SESSION['openid_rememberme']);
+
+        Event::handle('EndRegistrationTry', array($this));
+
         common_redirect(common_local_url('showstream', array('nickname' => $user->nickname)),
                         303);
     }
diff --git a/plugins/RegisterThrottle/RegisterThrottlePlugin.php b/plugins/RegisterThrottle/RegisterThrottlePlugin.php
index 0078d3c600..e3982427da 100644
--- a/plugins/RegisterThrottle/RegisterThrottlePlugin.php
+++ b/plugins/RegisterThrottle/RegisterThrottlePlugin.php
@@ -167,28 +167,24 @@ class RegisterThrottlePlugin extends Plugin
     }
 
     /**
-     * Called after someone registers.
+     * Called after someone registers, by any means.
      *
      * We record the successful registration and IP address.
      *
-     * @param Action $action Action that is being executed
+     * @param Profile $profile new user's profile
+     * @param User $user new user
      *
      * @return boolean hook value
      *
      */
 
-    function onEndRegistrationTry($action)
+    function onEndUserRegister($profile, $user)
     {
         $ipaddress = $this->_getIpAddress();
 
         if (empty($ipaddress)) {
-            throw new ServerException(_m('Cannot find IP address.'));
-        }
-
-        $user = common_current_user();
-
-        if (empty($user)) {
-            throw new ServerException(_m('Cannot find user after successful registration.'));
+            // User registration can happen from command-line scripts etc.
+            return true;
         }
 
         $reg = new Registration_ip();
diff --git a/plugins/TwitterBridge/twitterauthorization.php b/plugins/TwitterBridge/twitterauthorization.php
index 931a037230..33ef71fcdd 100644
--- a/plugins/TwitterBridge/twitterauthorization.php
+++ b/plugins/TwitterBridge/twitterauthorization.php
@@ -419,6 +419,10 @@ class TwitterauthorizationAction extends Action
 
     function createNewUser()
     {
+        if (!Event::handle('StartRegistrationTry', array($this))) {
+            return;
+        }
+
         if (common_config('site', 'closed')) {
             $this->clientError(_m('Registration not allowed.'));
             return;
@@ -492,6 +496,8 @@ class TwitterauthorizationAction extends Action
         common_debug('TwitterBridge Plugin - ' .
                      "Registered new user $user->id from Twitter user $this->twuid");
 
+        Event::handle('EndRegistrationTry', array($this));
+
         common_redirect(common_local_url('showstream', array('nickname' => $user->nickname)),
                         303);
     }

From 51d1535f155c1178d8d17a40f06b6d9f7df9ff98 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 5 Jan 2011 14:05:59 -0800
Subject: [PATCH 014/314] Added doc comments on Salmon magicsig-related stuff
 to help in figuring out what's going on

---
 plugins/OStatus/classes/Magicsig.php        | 111 +++++++++++++++++++-
 plugins/OStatus/classes/Ostatus_profile.php |   1 +
 plugins/OStatus/lib/magicenvelope.php       |  72 +++++++++++++
 plugins/OStatus/lib/salmon.php              |  34 +++++-
 4 files changed, 215 insertions(+), 3 deletions(-)

diff --git a/plugins/OStatus/classes/Magicsig.php b/plugins/OStatus/classes/Magicsig.php
index e057deb144..31d061e6a0 100644
--- a/plugins/OStatus/classes/Magicsig.php
+++ b/plugins/OStatus/classes/Magicsig.php
@@ -39,11 +39,41 @@ class Magicsig extends Memcached_DataObject
 
     public $__table = 'magicsig';
 
+    /**
+     * Key to user.id/profile.id for the local user whose key we're storing.
+     *
+     * @var int
+     */
     public $user_id;
+
+    /**
+     * Flattened string representation of the key pair; callers should
+     * usually use $this->publicKey and $this->privateKey directly,
+     * which hold live Crypt_RSA key objects.
+     *
+     * @var string
+     */
     public $keypair;
+
+    /**
+     * Crypto algorithm used for this key; currently only RSA-SHA256 is supported.
+     *
+     * @var string
+     */
     public $alg;
 
+    /**
+     * Public RSA key; gets serialized in/out via $this->keypair string.
+     *
+     * @var Crypt_RSA
+     */
     public $publicKey;
+
+    /**
+     * PrivateRSA key; gets serialized in/out via $this->keypair string.
+     *
+     * @var Crypt_RSA
+     */
     public $privateKey;
 
     public function __construct($alg = 'RSA-SHA256')
@@ -51,6 +81,13 @@ class Magicsig extends Memcached_DataObject
         $this->alg = $alg;
     }
 
+    /**
+     * Fetch a Magicsig object from the cache or database on a field match.
+     *
+     * @param string $k
+     * @param mixed $v
+     * @return Magicsig
+     */
     public /*static*/ function staticGet($k, $v=null)
     {
         $obj =  parent::staticGet(__CLASS__, $k, $v);
@@ -103,6 +140,14 @@ class Magicsig extends Memcached_DataObject
         return array(false, false, false);
     }
 
+    /**
+     * Save this keypair into the database.
+     *
+     * Overloads default insert behavior to encode the live key objects
+     * as a flat string for storage.
+     *
+     * @return mixed
+     */
     function insert()
     {
         $this->keypair = $this->toString();
@@ -110,6 +155,14 @@ class Magicsig extends Memcached_DataObject
         return parent::insert();
     }
 
+    /**
+     * Generate a new keypair for a local user and store in the database.
+     *
+     * Warning: this can be very slow on systems without the GMP module.
+     * Runtimes of 20-30 seconds are not unheard-of.
+     *
+     * @param int $user_id id of local user we're creating a key for
+     */
     public function generate($user_id)
     {
         $rsa = new Crypt_RSA();
@@ -128,6 +181,12 @@ class Magicsig extends Memcached_DataObject
         $this->insert();
     }
 
+    /**
+     * Encode the keypair or public key as a string.
+     *
+     * @param boolean $full_pair set to false to leave out the private key.
+     * @return string
+     */
     public function toString($full_pair = true)
     {
         $mod = Magicsig::base64_url_encode($this->publicKey->modulus->toBytes());
@@ -140,6 +199,13 @@ class Magicsig extends Memcached_DataObject
         return 'RSA.' . $mod . '.' . $exp . $private_exp;
     }
 
+    /**
+     * Decode a string representation of an RSA public key or keypair
+     * as a Magicsig object which can be used to sign or verify.
+     *
+     * @param string $text
+     * @return Magicsig
+     */
     public static function fromString($text)
     {
         $magic_sig = new Magicsig();
@@ -168,6 +234,14 @@ class Magicsig extends Memcached_DataObject
         return $magic_sig;
     }
 
+    /**
+     * Fill out $this->privateKey or $this->publicKey with a Crypt_RSA object
+     * representing the give key (as mod/exponent pair).
+     *
+     * @param string $mod base64-encoded
+     * @param string $exp base64-encoded exponent
+     * @param string $type one of 'public' or 'private'
+     */
     public function loadKey($mod, $exp, $type = 'public')
     {
         common_log(LOG_DEBUG, "Adding ".$type." key: (".$mod .', '. $exp .")");
@@ -186,11 +260,22 @@ class Magicsig extends Memcached_DataObject
         }
     }
 
+    /**
+     * Returns the name of the crypto algorithm used for this key.
+     *
+     * @return string
+     */
     public function getName()
     {
         return $this->alg;
     }
 
+    /**
+     * Returns the name of a hash function to use for signing with this key.
+     *
+     * @return string
+     * @fixme is this used? doesn't seem to be called by name.
+     */
     public function getHash()
     {
         switch ($this->alg) {
@@ -200,24 +285,48 @@ class Magicsig extends Memcached_DataObject
         }
     }
 
+    /**
+     * Generate base64-encoded signature for the given byte string
+     * using our private key.
+     *
+     * @param string $bytes as raw byte string
+     * @return string base64-encoded signature
+     */
     public function sign($bytes)
     {
         $sig = $this->privateKey->sign($bytes);
         return Magicsig::base64_url_encode($sig);
     }
 
+    /**
+     *
+     * @param string $signed_bytes as raw byte string
+     * @param string $signature as base64
+     * @return boolean
+     */
     public function verify($signed_bytes, $signature)
     {
         $signature = Magicsig::base64_url_decode($signature);
         return $this->publicKey->verify($signed_bytes, $signature);
     }
 
-
+    /**
+     * URL-encoding-friendly base64 variant encoding.
+     *
+     * @param string $input
+     * @return string
+     */
     public static function base64_url_encode($input)
     {
         return strtr(base64_encode($input), '+/', '-_');
     }
 
+    /**
+     * URL-encoding-friendly base64 variant decoding.
+     *
+     * @param string $input
+     * @return string
+     */
     public static function base64_url_decode($input)
     {
         return base64_decode(strtr($input, '-_', '+/'));
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 9c0f014fc6..06e42187d4 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -331,6 +331,7 @@ class Ostatus_profile extends Memcached_DataObject
      * an acceptable response from the remote site.
      *
      * @param mixed $entry XML string, Notice, or Activity
+     * @param Profile $actor
      * @return boolean success
      */
     public function notifyActivity($entry, $actor)
diff --git a/plugins/OStatus/lib/magicenvelope.php b/plugins/OStatus/lib/magicenvelope.php
index 03e6f7c665..6d3956cb9b 100644
--- a/plugins/OStatus/lib/magicenvelope.php
+++ b/plugins/OStatus/lib/magicenvelope.php
@@ -81,6 +81,14 @@ class MagicEnvelope
     }
 
 
+    /**
+     *
+     * @param <type> $text
+     * @param <type> $mimetype
+     * @param <type> $keypair
+     * @return array: associative array of envelope properties
+     * @fixme it might be easier to work with storing envelope data these in the object instead of passing arrays around
+     */
     public function signMessage($text, $mimetype, $keypair)
     {
         $signature_alg = Magicsig::fromString($keypair);
@@ -95,6 +103,13 @@ class MagicEnvelope
         );
     }
 
+    /**
+     * Create an <me:env> XML representation of the envelope.
+     *
+     * @param array $env associative array with envelope data
+     * @return string representation of XML document
+     * @fixme it might be easier to work with storing envelope data these in the object instead of passing arrays around
+     */
     public function toXML($env) {
         $xs = new XMLStringer();
         $xs->startXML();
@@ -110,6 +125,16 @@ class MagicEnvelope
         return $string;
     }
 
+    /**
+     * Extract the contained XML payload, and insert a copy of the envelope
+     * signature data as an <me:provenance> section.
+     *
+     * @param array $env associative array with envelope data
+     * @return string representation of modified XML document
+     *
+     * @fixme in case of XML parsing errors, this will spew to the error log or output
+     * @fixme it might be easier to work with storing envelope data these in the object instead of passing arrays around
+     */
     public function unfold($env)
     {
         $dom = new DOMDocument();
@@ -136,6 +161,14 @@ class MagicEnvelope
         return $dom->saveXML();
     }
 
+    /**
+     * Find the author URI referenced in the given Atom entry.
+     *
+     * @param string $text string containing Atom entry XML
+     * @return mixed URI string or false if XML parsing fails, or null if no author URI can be found
+     *
+     * @fixme XML parsing failures will spew to error logs/output
+     */
     public function getAuthor($text) {
         $doc = new DOMDocument();
         if (!$doc->loadXML($text)) {
@@ -153,11 +186,30 @@ class MagicEnvelope
         }
     }
 
+    /**
+     * Check if the author in the Atom entry fragment claims to match
+     * the given identifier URI.
+     *
+     * @param string $text string containing Atom entry XML
+     * @param string $signer_uri
+     * @return boolean
+     */
     public function checkAuthor($text, $signer_uri)
     {
         return ($this->getAuthor($text) == $signer_uri);
     }
 
+    /**
+     * Attempt to verify cryptographic signing for parsed envelope data.
+     * Requires network access to retrieve public key referenced by the envelope signer.
+     *
+     * Details of failure conditions are dumped to output log and not exposed to caller.
+     *
+     * @param array $env array representation of magic envelope data, as returned from MagicEnvelope::parse()
+     * @return boolean
+     *
+     * @fixme it might be easier to work with storing envelope data these in the object instead of passing arrays around
+     */
     public function verify($env)
     {
         if ($env['alg'] != 'RSA-SHA256') {
@@ -190,12 +242,32 @@ class MagicEnvelope
         return $verifier->verify($env['data'], $env['sig']);
     }
 
+    /**
+     * Extract envelope data from an XML document containing an <me:env> or <me:provenance> element.
+     *
+     * @param string XML source
+     * @return mixed associative array of envelope data, or false on unrecognized input
+     *
+     * @fixme it might be easier to work with storing envelope data these in the object instead of passing arrays around
+     * @fixme will spew errors to logs or output in case of XML parse errors
+     * @fixme may give fatal errors if some elements are missing or invalid XML
+     * @fixme calling DOMDocument::loadXML statically triggers warnings in strict mode
+     */
     public function parse($text)
     {
         $dom = DOMDocument::loadXML($text);
         return $this->fromDom($dom);
     }
 
+    /**
+     * Extract envelope data from an XML document containing an <me:env> or <me:provenance> element.
+     *
+     * @param DOMDocument $dom
+     * @return mixed associative array of envelope data, or false on unrecognized input
+     *
+     * @fixme it might be easier to work with storing envelope data these in the object instead of passing arrays around
+     * @fixme may give fatal errors if some elements are missing
+     */
     public function fromDom($dom)
     {
         $env_element = $dom->getElementsByTagNameNS(MagicEnvelope::NS, 'env')->item(0);
diff --git a/plugins/OStatus/lib/salmon.php b/plugins/OStatus/lib/salmon.php
index 963da65084..6137f7bee5 100644
--- a/plugins/OStatus/lib/salmon.php
+++ b/plugins/OStatus/lib/salmon.php
@@ -38,10 +38,12 @@ class Salmon
     /**
      * Sign and post the given Atom entry as a Salmon message.
      *
-     * @fixme pass through the actor for signing?
+     * Side effects: may generate a keypair on-demand for the given user,
+     * which can be very slow on some systems.
      *
      * @param string $endpoint_uri
-     * @param string $xml
+     * @param string $xml string representation of payload
+     * @param Profile $actor local user profile whose keys to sign with
      * @return boolean success
      */
     public function post($endpoint_uri, $xml, $actor)
@@ -75,6 +77,21 @@ class Salmon
         return true;
     }
 
+    /**
+     * Encode the given string as a signed MagicEnvelope XML document,
+     * using the keypair for the given local user profile.
+     *
+     * Side effects: will create and store a keypair on-demand if one
+     * hasn't already been generated for this user. This can be very slow
+     * on some systems.
+     *
+     * @param string $text XML fragment to sign, assumed to be Atom
+     * @param Profile $actor Profile of a local user to use as signer
+     * @return string XML string representation of magic envelope
+     *
+     * @throws Exception on bad profile input or key generation problems
+     * @fixme if signing fails, this seems to return the original text without warning. Is there a reason for this?
+     */
     public function createMagicEnv($text, $actor)
     {
         $magic_env = new MagicEnvelope();
@@ -101,6 +118,19 @@ class Salmon
         return $magic_env->toXML($env);
     }
 
+    /**
+     * Check if the given magic envelope is well-formed and correctly signed.
+     * Needs to have network access to fetch public keys over the web.
+     *
+     * Side effects: exceptions and caching updates may occur during network
+     * fetches.
+     *
+     * @param string $text XML fragment of magic envelope
+     * @return boolean
+     *
+     * @throws Exception on bad profile input or key generation problems
+     * @fixme could hit fatal errors or spew output on invalid XML
+     */
     public function verifyMagicEnv($text)
     {
         $magic_env = new MagicEnvelope();

From e25c34a2b60c4d6050896e51c63f1ba52dfbc45f Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 5 Jan 2011 14:27:53 -0800
Subject: [PATCH 015/314] Salmon slap / magicsig test script

Given a notice in the local system, we package it up as an Atom entry and MagicSig it up.
We run the magicenv verification on it locally to make sure our own functions can decode it.
Optionally with --verify we can send to Tuomas Koski's verification test service (not sure if this is working 100%)
If given --slap= with a target Salmon endpoint, we'll sent it on and see if it liked it. (Note that StatusNet will reject if there's not a relevant mention, but will report acceptance for dupes so you can use a message that's already been delivered as a test.)
---
 plugins/OStatus/tests/slap.php | 92 ++++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 plugins/OStatus/tests/slap.php

diff --git a/plugins/OStatus/tests/slap.php b/plugins/OStatus/tests/slap.php
new file mode 100644
index 0000000000..b5f9d3e073
--- /dev/null
+++ b/plugins/OStatus/tests/slap.php
@@ -0,0 +1,92 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a 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/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
+
+$longoptions = array('verify', 'slap=', 'notice=');
+
+$helptext = <<<END_OF_HELP
+slap.php [options]
+
+Test generation and sending of magic envelopes for Salmon slaps.
+
+     --notice=N   generate entry for this notice number
+     --verify     send signed magic envelope to Tuomas Koski's test service
+     --slap=<url> send signed Salmon slap to the destination endpoint
+
+
+END_OF_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+if (!have_option('--notice')) {
+    print "$helptext";
+    exit(1);
+}
+
+$notice_id = get_option_value('--notice');
+
+$notice = Notice::staticGet('id', $notice_id);
+$profile = $notice->getProfile();
+$entry = $notice->asAtomEntry(true);
+
+echo "== Original entry ==\n\n";
+print $entry;
+print "\n\n";
+
+$salmon = new Salmon();
+$envelope = $salmon->createMagicEnv($entry, $profile);
+
+echo "== Signed envelope ==\n\n";
+print $envelope;
+print "\n\n";
+
+echo "== Testing local verification ==\n\n";
+$ok = $salmon->verifyMagicEnv($envelope);
+if ($ok) {
+    print "OK\n\n";
+} else {
+    print "FAIL\n\n";
+}
+
+if (have_option('--verify')) {
+    $url = 'http://www.madebymonsieur.com/ostatus_discovery/magic_env/validate/';
+    echo "== Testing remote verification ==\n\n";
+    print "Sending for verification to $url ...\n";
+
+    $client = new HTTPClient();
+    $response = $client->post($url, array(), array('magic_env' => $envelope));
+
+    print $response->getStatus() . "\n\n";
+    print $response->getBody() . "\n\n";
+}
+
+if (have_option('--slap')) {
+    $url = get_option_value('--slap');
+    echo "== Remote salmon slap ==\n\n";
+    print "Sending signed Salmon slap to $url ...\n";
+
+    $ok = $salmon->post($url, $entry, $profile);
+    if ($ok) {
+        print "OK\n\n";
+    } else {
+        print "FAIL\n\n";
+    }
+}

From 946a4ac17b5152119e8618d3339777159b524d53 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 5 Jan 2011 23:26:09 +0000
Subject: [PATCH 016/314] Add test cases for internal change in Salmon signing;
 fix for the new code. Updated sig passes Tuomas's verifier, which is a good
 sign

---
 plugins/OStatus/lib/magicenvelope.php       | 46 ++++++++++++++--
 plugins/OStatus/tests/MagicEnvelopeTest.php | 60 +++++++++++++++++++++
 2 files changed, 102 insertions(+), 4 deletions(-)
 create mode 100644 plugins/OStatus/tests/MagicEnvelopeTest.php

diff --git a/plugins/OStatus/lib/magicenvelope.php b/plugins/OStatus/lib/magicenvelope.php
index 6d3956cb9b..384506280d 100644
--- a/plugins/OStatus/lib/magicenvelope.php
+++ b/plugins/OStatus/lib/magicenvelope.php
@@ -80,6 +80,20 @@ class MagicEnvelope
         throw new Exception(_m('Unable to locate signer public key.'));
     }
 
+    /**
+     * The current MagicEnvelope spec as used in StatusNet 0.9.7 and later
+     * includes both the original data and some signing metadata fields as
+     * the input plaintext for the signature hash.
+     *
+     * @param array $env
+     * @return string
+     */
+    public function signingText($env) {
+        return implode('.', array($env['data'], // this field is pre-base64'd
+                            Magicsig::base64_url_encode($env['data_type']),
+                            Magicsig::base64_url_encode($env['encoding']),
+                            Magicsig::base64_url_encode($env['alg'])));
+    }
 
     /**
      *
@@ -93,14 +107,17 @@ class MagicEnvelope
     {
         $signature_alg = Magicsig::fromString($keypair);
         $armored_text = Magicsig::base64_url_encode($text);
-
-        return array(
+        $env = array(
             'data' => $armored_text,
             'encoding' => MagicEnvelope::ENCODING,
             'data_type' => $mimetype,
-            'sig' => $signature_alg->sign($armored_text),
+            'sig' => '',
             'alg' => $signature_alg->getName()
         );
+
+        $env['sig'] = $signature_alg->sign($this->signingText($env));
+
+        return $env;
     }
 
     /**
@@ -239,7 +256,7 @@ class MagicEnvelope
             return false;
         }
 
-        return $verifier->verify($env['data'], $env['sig']);
+        return $verifier->verify($this->signingText($env), $env['sig']);
     }
 
     /**
@@ -290,3 +307,24 @@ class MagicEnvelope
         );
     }
 }
+
+/**
+ * Variant of MagicEnvelope using the earlier signature form listed in the MagicEnvelope
+ * spec in early 2010; this was used in StatusNet up through 0.9.6, so for backwards compatiblity
+ * we still need to accept and sometimes send this format.
+ */
+class MagicEnvelopeCompat extends MagicEnvelope {
+
+    /**
+     * StatusNet through 0.9.6 used an earlier version of the MagicEnvelope spec
+     * which used only the input data, without the additional fields, as the plaintext
+     * for signing.
+     *
+     * @param array $env
+     * @return string
+     */
+    public function signingText($env) {
+        return $env['data'];
+    }
+}
+
diff --git a/plugins/OStatus/tests/MagicEnvelopeTest.php b/plugins/OStatus/tests/MagicEnvelopeTest.php
new file mode 100644
index 0000000000..5ee0362d28
--- /dev/null
+++ b/plugins/OStatus/tests/MagicEnvelopeTest.php
@@ -0,0 +1,60 @@
+<?php
+
+if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
+    print "This script must be run from the command line\n";
+    exit();
+}
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
+define('STATUSNET', true);
+
+require_once INSTALLDIR . '/lib/common.php';
+
+class MagicEnvelopeTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Test that MagicEnvelope builds the correct plaintext for signing.
+     * @dataProvider provider
+     */
+    public function testSignatureText($env, $expected)
+    {
+        $magic = new MagicEnvelope;
+        $text = $magic->signingText($env);
+
+        $this->assertEquals($expected, $text, "'$text' should be '$expected'");
+    }
+
+    static public function provider()
+    {
+        return array(
+            array(
+                // Sample case given in spec:
+                // http://salmon-protocol.googlecode.com/svn/trunk/draft-panzer-magicsig-00.html#signing
+                array(
+                    'data' => 'Tm90IHJlYWxseSBBdG9t',
+                    'data_type' => 'application/atom+xml',
+                    'encoding' => 'base64url',
+                    'alg' => 'RSA-SHA256'
+                ),
+                'Tm90IHJlYWxseSBBdG9t.YXBwbGljYXRpb24vYXRvbSt4bWw=.YmFzZTY0dXJs.UlNBLVNIQTI1Ng=='
+            )
+        );
+    }
+
+
+    /**
+     * Test that MagicEnvelope builds the correct plaintext for signing.
+     * @dataProvider provider
+     */
+    public function testSignatureTextCompat($env, $expected)
+    {
+        // Our old code didn't add the extra fields, just used the armored text.
+        $alt = $env['data'];
+
+        $magic = new MagicEnvelopeCompat;
+        $text = $magic->signingText($env);
+
+        $this->assertEquals($alt, $text, "'$text' should be '$alt'");
+    }
+
+}

From f5650806cc0556d93ada1b43b16608ea3695c76a Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 5 Jan 2011 23:27:17 +0000
Subject: [PATCH 017/314] Switch autoloader from '__autoload' magic function
 name to registering our function with spl_autoload_register(); fixes compat
 problem with PHPUnit 3.5+ which seems to break the old __autoload

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

diff --git a/lib/common.php b/lib/common.php
index 6138200e49..b072a49699 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -95,7 +95,11 @@ function _have_config()
     return StatusNet::haveConfig();
 }
 
-function __autoload($cls)
+/**
+ * Wrapper for class autoloaders.
+ * This used to be the special function name __autoload(), but that causes bugs with PHPUnit 3.5+
+ */
+function autoload_sn($cls)
 {
     if (file_exists(INSTALLDIR.'/classes/' . $cls . '.php')) {
         require_once(INSTALLDIR.'/classes/' . $cls . '.php');
@@ -111,6 +115,8 @@ function __autoload($cls)
     }
 }
 
+spl_autoload_register('autoload_sn');
+
 // 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.

From 437ac120b07542952c30c21ec93f8ebecda012a3 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 5 Jan 2011 23:54:16 +0000
Subject: [PATCH 018/314] Outgoing Salmon slaps now use the corrected signature
 format; if the first hit is rejected with an HTTP error, we try again with
 the old format.

(This is not 100% ideal; possibly should try to distinguish between server errors and rejections, etc.)
---
 plugins/OStatus/lib/salmon.php | 54 +++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/plugins/OStatus/lib/salmon.php b/plugins/OStatus/lib/salmon.php
index 6137f7bee5..5535049203 100644
--- a/plugins/OStatus/lib/salmon.php
+++ b/plugins/OStatus/lib/salmon.php
@@ -52,29 +52,35 @@ class Salmon
             return false;
         }
 
-        try {
-            $xml = $this->createMagicEnv($xml, $actor);
-        } catch (Exception $e) {
-            common_log(LOG_ERR, "Salmon unable to sign: " . $e->getMessage());
-            return false;
-        }
+        $classes = array('MagicEnvelope', 'MagicEnvelopeCompat');
+        foreach ($classes as $class) {
+            try {
+                $envelope = $this->createMagicEnv($xml, $actor, $class);
+            } catch (Exception $e) {
+                common_log(LOG_ERR, "Salmon unable to sign: " . $e->getMessage());
+                return false;
+            }
+    
+            $headers = array('Content-Type: application/magic-envelope+xml');
+    
+            try {
+                $client = new HTTPClient();
+                $client->setBody($envelope);
+                $response = $client->post($endpoint_uri, $headers);
+            } catch (HTTP_Request2_Exception $e) {
+                common_log(LOG_ERR, "Salmon ($class) post to $endpoint_uri failed: " . $e->getMessage());
+                continue;
+            }
+            if ($response->getStatus() != 200) {
+                common_log(LOG_ERR, "Salmon ($class) at $endpoint_uri returned status " .
+                    $response->getStatus() . ': ' . $response->getBody());
+                continue;
+            }
 
-        $headers = array('Content-Type: application/magic-envelope+xml');
-
-        try {
-            $client = new HTTPClient();
-            $client->setBody($xml);
-            $response = $client->post($endpoint_uri, $headers);
-        } catch (HTTP_Request2_Exception $e) {
-            common_log(LOG_ERR, "Salmon post to $endpoint_uri failed: " . $e->getMessage());
-            return false;
+            // Success!
+            return true;
         }
-        if ($response->getStatus() != 200) {
-            common_log(LOG_ERR, "Salmon at $endpoint_uri returned status " .
-                $response->getStatus() . ': ' . $response->getBody());
-            return false;
-        }
-        return true;
+        return false;
     }
 
     /**
@@ -87,14 +93,16 @@ class Salmon
      *
      * @param string $text XML fragment to sign, assumed to be Atom
      * @param Profile $actor Profile of a local user to use as signer
+     * @param string $class to override the magic envelope signature version, pass a MagicEnvelope subclass here
+     *
      * @return string XML string representation of magic envelope
      *
      * @throws Exception on bad profile input or key generation problems
      * @fixme if signing fails, this seems to return the original text without warning. Is there a reason for this?
      */
-    public function createMagicEnv($text, $actor)
+    public function createMagicEnv($text, $actor, $class='MagicEnvelope')
     {
-        $magic_env = new MagicEnvelope();
+        $magic_env = new $class();
 
         $user = User::staticGet('id', $actor->id);
         if ($user->id) {

From 1d15145993a00d1db1057dacf71f3783cd16c119 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 6 Jan 2011 00:01:42 +0000
Subject: [PATCH 019/314] Salmon signature checks on incoming slaps now check
 both old and new signature formats.

---
 plugins/OStatus/lib/salmon.php | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/plugins/OStatus/lib/salmon.php b/plugins/OStatus/lib/salmon.php
index 5535049203..2f5772a844 100644
--- a/plugins/OStatus/lib/salmon.php
+++ b/plugins/OStatus/lib/salmon.php
@@ -52,8 +52,7 @@ class Salmon
             return false;
         }
 
-        $classes = array('MagicEnvelope', 'MagicEnvelopeCompat');
-        foreach ($classes as $class) {
+        foreach ($this->formatClasses() as $class) {
             try {
                 $envelope = $this->createMagicEnv($xml, $actor, $class);
             } catch (Exception $e) {
@@ -83,6 +82,15 @@ class Salmon
         return false;
     }
 
+    /**
+     * List the magic envelope signature class variants in the order we try them.
+     * Multiples are needed for backwards-compat with StatusNet prior to 0.9.7,
+     * which used a draft version of the magic envelope spec.
+     */
+    protected function formatClasses() {
+        return array('MagicEnvelope', 'MagicEnvelopeCompat');
+    }
+
     /**
      * Encode the given string as a signed MagicEnvelope XML document,
      * using the keypair for the given local user profile.
@@ -129,6 +137,7 @@ class Salmon
     /**
      * Check if the given magic envelope is well-formed and correctly signed.
      * Needs to have network access to fetch public keys over the web.
+     * Both current and back-compat signature formats will be checked.
      *
      * Side effects: exceptions and caching updates may occur during network
      * fetches.
@@ -141,10 +150,16 @@ class Salmon
      */
     public function verifyMagicEnv($text)
     {
-        $magic_env = new MagicEnvelope();
+        foreach ($this->formatClasses() as $class) {
+            $magic_env = new $class();
 
-        $env = $magic_env->parse($text);
+            $env = $magic_env->parse($text);
 
-        return $magic_env->verify($env);
+            if ($magic_env->verify($env)) {
+                return true;
+            }
+        }
+
+        return false;
     }
 }

From 281076d5f68e07d67709a5e97740a4b625f4ad68 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 6 Jan 2011 13:22:08 -0800
Subject: [PATCH 020/314] Fix for PHP notice spew in group creation via API:
 set default 'mainpage' in User_group::register() rather than forcing all
 callers to do it manually.

---
 actions/newgroup.php   | 3 ---
 classes/User_group.php | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/actions/newgroup.php b/actions/newgroup.php
index 42d488e54e..fb7f6347d4 100644
--- a/actions/newgroup.php
+++ b/actions/newgroup.php
@@ -200,8 +200,6 @@ class NewgroupAction extends Action
             }
         }
 
-        $mainpage = common_local_url('showgroup', array('nickname' => $nickname));
-
         $cur = common_current_user();
 
         // Checked in prepare() above
@@ -215,7 +213,6 @@ class NewgroupAction extends Action
                                             'location' => $location,
                                             'aliases'  => $aliases,
                                             'userid'   => $cur->id,
-                                            'mainpage' => $mainpage,
                                             'local'    => true));
 
         common_redirect($group->homeUrl(), 303);
diff --git a/classes/User_group.php b/classes/User_group.php
index 68f61cb7f4..d402ed4773 100644
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -487,6 +487,7 @@ class User_group extends Memcached_DataObject
         }
 
         // MAGICALLY put fields into current scope
+        // @fixme kill extract(); it makes debugging absurdly hard
 
         extract($fields);
 
@@ -498,6 +499,9 @@ class User_group extends Memcached_DataObject
             // fill in later...
             $uri = null;
         }
+        if (empty($mainpage)) {
+            $mainpage = common_local_url('showgroup', array('nickname' => $nickname));
+        }
 
         $group->nickname    = $nickname;
         $group->fullname    = $fullname;

From edf8101b29010e9e8f9f27b628db10ef7a40400f Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 6 Jan 2011 13:46:39 -0800
Subject: [PATCH 021/314] allow group join/leave commands in api posting, at
 least for the moment (no other way to do remote subscribe without a
 preexisting local id number via api)

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

diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php
index a8ec7f8bb9..5773bdc2e8 100644
--- a/actions/apistatusesupdate.php
+++ b/actions/apistatusesupdate.php
@@ -377,7 +377,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction
     function supported($cmd)
     {
         static $cmdlist = array('MessageCommand', 'SubCommand', 'UnsubCommand',
-            'FavCommand', 'OnCommand', 'OffCommand');
+            'FavCommand', 'OnCommand', 'OffCommand', 'JoinCommand', 'LeaveCommand');
 
         if (in_array(get_class($cmd), $cmdlist)) {
             return true;

From f2a43769e7a77a626df6111c2059870e548bc47a Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 6 Jan 2011 15:05:29 -0800
Subject: [PATCH 022/314] Fix for atom/activity streams parsing: feed's
 <activity:subject> was being taken at a higher priority than entry's
 <atom:author>, which broke OStatus group posting since we retired
 <activity:actor>. Added test case to ActivityParseTests.

---
 lib/activity.php             |  18 ++++--
 tests/ActivityParseTests.php | 113 +++++++++++++++++++++++++++++++++++
 2 files changed, 126 insertions(+), 5 deletions(-)

diff --git a/lib/activity.php b/lib/activity.php
index 8d7ae1540b..7a33c23b14 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -182,6 +182,9 @@ class Activity
         $actorEl = $this->_child($entry, self::ACTOR);
 
         if (!empty($actorEl)) {
+            // Standalone <activity:actor> elements are a holdover from older
+            // versions of ActivityStreams. Newer feeds should have this data
+            // integrated straight into <atom:author>.
 
             $this->actor = new ActivityObject($actorEl);
 
@@ -196,19 +199,24 @@ class Activity
                     $this->actor->id = $authorObj->id;
                 }
             }
-        } else if (!empty($feed) &&
-                   $subjectEl = $this->_child($feed, self::SUBJECT)) {
-
-            $this->actor = new ActivityObject($subjectEl);
-
         } else if ($authorEl = $this->_child($entry, self::AUTHOR, self::ATOM)) {
 
+            // An <atom:author> in the entry overrides any author info on
+            // the surrounding feed.
             $this->actor = new ActivityObject($authorEl);
 
         } else if (!empty($feed) && $authorEl = $this->_child($feed, self::AUTHOR,
                                                               self::ATOM)) {
 
+            // If there's no <atom:author> on the entry, it's safe to assume
+            // the containing feed's authorship info applies.
             $this->actor = new ActivityObject($authorEl);
+        } else if (!empty($feed) &&
+                   $subjectEl = $this->_child($feed, self::SUBJECT)) {
+
+            // Feed subject is used for things like groups.
+            // Should actually possibly not be interpreted as an actor...?
+            $this->actor = new ActivityObject($subjectEl);
         }
 
         $contextEl = $this->_child($entry, self::CONTEXT);
diff --git a/tests/ActivityParseTests.php b/tests/ActivityParseTests.php
index 378478d741..c2817a4602 100644
--- a/tests/ActivityParseTests.php
+++ b/tests/ActivityParseTests.php
@@ -382,6 +382,29 @@ class ActivityParseTests extends PHPUnit_Framework_TestCase
         }
     }
 
+    public function testExample10()
+    {
+        global $_example10;
+        $dom = new DOMDocument();
+        $dom->loadXML($_example10);
+
+        // example 10 is a PuSH item of a post on a group feed, as generated
+        // by 0.9.7 code after migration away from <activity:actor> to <author>
+        $feed = $dom->documentElement;
+        $entry = $dom->getElementsByTagName('entry')->item(0);
+        $expected = 'http://lazarus.local/mublog/user/557';
+
+        // Reading just the entry alone should pick up its own <author>
+        // as the actor.
+        $act = new Activity($entry);
+        $this->assertEquals($act->actor->id, $expected);
+
+        // Reading the entry in feed context used to be buggy, picking up
+        // the feed's <activity:subject> which referred to the group.
+        // It should now be returning the expected author entry...
+        $act = new Activity($entry, $feed);
+        $this->assertEquals($act->actor->id, $expected);
+    }
 }
 
 $_example1 = <<<EXAMPLE1
@@ -792,3 +815,93 @@ $_example9 = <<<EXAMPLE9
     </entry>
 </feed>
 EXAMPLE9;
+
+// Sample PuSH entry from a group feed in 0.9.7
+// Old <activity:actor> has been removed from entries in this version.
+// A bug in the order of input processing meant that we were incorrectly
+// reading the feed's <activity:subject> instead of the entry's <author>,
+// causing the entry to get rejected as malformed (groups can't post on
+// their own; we want to see the actual author's info here).
+$_example10 = <<<EXAMPLE10
+<?xml version="1.0" encoding="UTF-8"?>
+<feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/">
+ <generator uri="http://status.net" version="0.9.7alpha1">StatusNet</generator>
+ <id>http://lazarus.local/mublog/api/statusnet/groups/timeline/22.atom</id>
+ <title>grouptest316173 timeline</title>
+ <subtitle>Updates from grouptest316173 on Blaguette!</subtitle>
+ <logo>http://lazarus.local/mublog/theme/default/default-avatar-profile.png</logo>
+ <updated>2011-01-06T22:44:18+00:00</updated>
+<author>
+ <activity:object-type>http://activitystrea.ms/schema/1.0/group</activity:object-type>
+ <uri>http://lazarus.local/mublog/group/22/id</uri>
+ <name>grouptest316173</name>
+ <link rel="alternate" type="text/html" href="http://lazarus.local/mublog/group/22/id"/>
+ <link rel="avatar" type="image/png" media:width="96" media:height="96" href="http://lazarus.local/mublog/theme/default/default-avatar-profile.png"/>
+ <link rel="avatar" type="image/png" media:width="48" media:height="48" href="http://lazarus.local/mublog/theme/default/default-avatar-stream.png"/>
+ <link rel="avatar" type="image/png" media:width="24" media:height="24" href="http://lazarus.local/mublog/theme/default/default-avatar-mini.png"/>
+ <poco:preferredUsername>grouptest316173</poco:preferredUsername>
+ <poco:displayName>grouptest316173</poco:displayName>
+</author>
+<activity:subject>
+ <activity:object-type>http://activitystrea.ms/schema/1.0/group</activity:object-type>
+ <id>http://lazarus.local/mublog/group/22/id</id>
+ <title>grouptest316173</title>
+ <link rel="alternate" type="text/html" href="http://lazarus.local/mublog/group/22/id"/>
+ <link rel="avatar" type="image/png" media:width="96" media:height="96" href="http://lazarus.local/mublog/theme/default/default-avatar-profile.png"/>
+ <link rel="avatar" type="image/png" media:width="48" media:height="48" href="http://lazarus.local/mublog/theme/default/default-avatar-stream.png"/>
+ <link rel="avatar" type="image/png" media:width="24" media:height="24" href="http://lazarus.local/mublog/theme/default/default-avatar-mini.png"/>
+ <poco:preferredUsername>grouptest316173</poco:preferredUsername>
+ <poco:displayName>grouptest316173</poco:displayName>
+</activity:subject>
+ <link href="http://lazarus.local/mublog/group/grouptest316173" rel="alternate" type="text/html"/>
+ <link href="http://lazarus.local/mublog/main/push/hub" rel="hub"/>
+ <link href="http://lazarus.local/mublog/main/salmon/group/22" rel="salmon"/>
+ <link href="http://lazarus.local/mublog/main/salmon/group/22" rel="http://salmon-protocol.org/ns/salmon-replies"/>
+ <link href="http://lazarus.local/mublog/main/salmon/group/22" rel="http://salmon-protocol.org/ns/salmon-mention"/>
+ <link href="http://lazarus.local/mublog/api/statusnet/groups/timeline/22.atom" rel="self" type="application/atom+xml"/>
+ <statusnet:group_info member_count="2"></statusnet:group_info>
+<entry>
+ <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
+ <id>http://lazarus.local/mublog/notice/1243</id>
+ <title>Group post from local to !grouptest316173, should go out over push.</title>
+ <content type="html">Group post from local to !&lt;span class=&quot;vcard&quot;&gt;&lt;a href=&quot;http://lazarus.local/mublog/group/22/id&quot; class=&quot;url&quot;&gt;&lt;span class=&quot;fn nickname&quot;&gt;grouptest316173&lt;/span&gt;&lt;/a&gt;&lt;/span&gt;, should go out over push.</content>
+ <link rel="alternate" type="text/html" href="http://lazarus.local/mublog/notice/1243"/>
+ <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
+ <published>2011-01-06T22:44:18+00:00</published>
+ <updated>2011-01-06T22:44:18+00:00</updated>
+ <author>
+  <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
+  <uri>http://lazarus.local/mublog/user/557</uri>
+  <name>Pubtest316173 Smith</name>
+  <link rel="alternate" type="text/html" href="http://lazarus.local/mublog/pubtest316173"/>
+  <link rel="avatar" type="image/png" media:width="96" media:height="96" href="http://lazarus.local/mublog/theme/default/default-avatar-profile.png"/>
+  <link rel="avatar" type="image/png" media:width="48" media:height="48" href="http://lazarus.local/mublog/theme/default/default-avatar-stream.png"/>
+  <link rel="avatar" type="image/png" media:width="24" media:height="24" href="http://lazarus.local/mublog/theme/default/default-avatar-mini.png"/>
+  <poco:preferredUsername>pubtest316173</poco:preferredUsername>
+  <poco:displayName>Pubtest316173 Smith</poco:displayName>
+  <poco:note>Stub account for OStatus tests.</poco:note>
+  <poco:urls>
+   <poco:type>homepage</poco:type>
+   <poco:value>http://example.org/pubtest316173</poco:value>
+   <poco:primary>true</poco:primary>
+  </poco:urls>
+ </author>
+ <link rel="ostatus:conversation" href="http://lazarus.local/mublog/conversation/1131"/>
+ <link rel="ostatus:attention" href="http://lazarus.local/mublog/group/22/id"/>
+ <link rel="mentioned" href="http://lazarus.local/mublog/group/22/id"/>
+ <category term="grouptest316173"></category>
+ <source>
+  <id>http://lazarus.local/mublog/api/statuses/user_timeline/557.atom</id>
+  <title>Pubtest316173 Smith</title>
+  <link rel="alternate" type="text/html" href="http://lazarus.local/mublog/pubtest316173"/>
+  <link rel="self" type="application/atom+xml" href="http://lazarus.local/mublog/api/statuses/user_timeline/557.atom"/>
+  <link rel="license" href="http://creativecommons.org/licenses/by/3.0/"/>
+  <icon>http://lazarus.local/mublog/theme/default/default-avatar-profile.png</icon>
+  <updated>2011-01-06T22:44:18+00:00</updated>
+ </source>
+ <link rel="self" type="application/atom+xml" href="http://lazarus.local/mublog/api/statuses/show/1243.atom"/>
+ <link rel="edit" type="application/atom+xml" href="http://lazarus.local/mublog/api/statuses/show/1243.atom"/>
+ <statusnet:notice_info local_id="1243" source="api"></statusnet:notice_info>
+</entry>
+</feed>
+EXAMPLE10;

From 7ec456198a4041974189462cd0f7b763eff972e6 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 6 Jan 2011 13:52:12 -0800
Subject: [PATCH 023/314] Ticket #2732: add some regression tests for groups to
 OStatus remote-tests.php

Note that these tests won't pass on master branch yet as the join/leave don't work, and there's a bug in Activity parsing which prevents interop between new feeds and old remote subscribers (both fixed in this branch).
---
 plugins/OStatus/tests/remote-tests.php | 92 ++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)

diff --git a/plugins/OStatus/tests/remote-tests.php b/plugins/OStatus/tests/remote-tests.php
index 7888ec7c5d..1dce588dfe 100644
--- a/plugins/OStatus/tests/remote-tests.php
+++ b/plugins/OStatus/tests/remote-tests.php
@@ -72,6 +72,8 @@ class OStatusTester extends TestBase
         $base = 'test' . mt_rand(1, 1000000);
         $this->pub = new SNTestClient($this->a, 'pub' . $base, 'pw-' . mt_rand(1, 1000000), $timeout);
         $this->sub = new SNTestClient($this->b, 'sub' . $base, 'pw-' . mt_rand(1, 1000000), $timeout);
+
+        $this->group = 'group' . $base;
     }
 
     function run()
@@ -163,6 +165,39 @@ class OStatusTester extends TestBase
         $this->assertFalse($this->pub->hasSubscriber($this->sub->getProfileUri()));
     }
 
+    function testCreateGroup()
+    {
+        $this->groupUrl = $this->pub->createGroup($this->group);
+        $this->assertTrue(!empty($this->groupUrl));
+    }
+
+    function testJoinGroup()
+    {
+        #$this->assertFalse($this->sub->inGroup($this->groupUrl));
+        $this->sub->joinGroup($this->groupUrl);
+        #$this->assertTrue($this->sub->inGroup($this->groupUrl));
+    }
+
+    function testLocalGroupPost()
+    {
+        $post = $this->pub->post("Group post from local to !{$this->group}, should go out over push.");
+        $this->assertNotEqual('', $post);
+        $this->sub->assertReceived($post);
+    }
+
+    function testRemoteGroupPost()
+    {
+        $post = $this->sub->post("Group post from remote to !{$this->group}, should come in over salmon.");
+        $this->assertNotEqual('', $post);
+        $this->pub->assertReceived($post);
+    }
+
+    function testLeaveGroup()
+    {
+        #$this->assertTrue($this->sub->inGroup($this->groupUrl));
+        $this->sub->leaveGroup($this->groupUrl);
+        #$this->assertFalse($this->sub->inGroup($this->groupUrl));
+    }
 }
 
 class SNTestClient extends TestBase
@@ -534,6 +569,63 @@ class SNTestClient extends TestBase
         return false;
     }
 
+    /**
+     * Create a group on this site.
+     *
+     * @param string $nickname
+     * @param array $options
+     * @return string: profile URL for the group
+     */
+    function createGroup($nickname, $options=array()) {
+        $this->log("Creating group as %s on %s: %s",
+                   $this->username,
+                   $this->basepath,
+                   $nickname);
+
+        $data = $this->api('statusnet/groups/create', 'json',
+            array_merge(array('nickname' => $nickname), $options));
+        $url = $data['url'];
+
+        if ($url) {
+            $this->log('  created as %s', $url);
+        } else {
+            $this->log('  failed? %s', var_export($data, true));
+        }
+        return $url;
+    }
+
+    function groupInfo($nickname) {
+        $data = $this->api('statusnet/groups/show', 'json', array(
+            'id' => $nickname
+        ));
+    }
+
+    /**
+     * Join a group.
+     *
+     * @param string $group nickname or URL
+     */
+    function joinGroup($group) {
+        $this->post('join ' . $group);
+    }
+
+    /**
+     * Leave a group.
+     *
+     * @param string $group nickname or URL
+     */
+    function leaveGroup($group) {
+        $this->post('drop ' . $group);
+    }
+
+    /**
+     *
+     * @param string $nickname
+     * @return
+     */
+    function inGroup($nickname) {
+        // @todo
+    }
 }
 
 // @fixme switch to commandline.inc?

From f97380fdb5c03557fc01ee8301f4c558e916d374 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 6 Jan 2011 16:36:57 -0800
Subject: [PATCH 024/314] Fix regression in last year's update of
 InfiniteScroll -- having debug off caused breakage due to bad code
 interpreting every variable as a selector, and jQuery then failing when
 passed 'false'.

Note that the current version of the infinitescroll jquery plugin fixes this, but I'm not updating to it because the code's been altered from the upstream version, apparently to stop it from actually working as infinite scroll. WTF? :)
---
 plugins/InfiniteScroll/jquery.infinitescroll.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/InfiniteScroll/jquery.infinitescroll.js b/plugins/InfiniteScroll/jquery.infinitescroll.js
index ec31bb0863..dd61f8b18a 100644
--- a/plugins/InfiniteScroll/jquery.infinitescroll.js
+++ b/plugins/InfiniteScroll/jquery.infinitescroll.js
@@ -21,7 +21,7 @@
     // grab each selector option and see if any fail.
     function areSelectorsValid(opts){
       for (var key in opts){
-        if (key.indexOf && key.indexOf('Selector') && $(opts[key]).length === 0){
+        if (key.indexOf && (key.indexOf('Selector') != -1) && $(opts[key]).length === 0){
             debug('Your ' + key + ' found no elements.');    
             return false;
         } 

From 36711f305a93c21e485da328eca4b4e35e2510db Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 6 Jan 2011 16:53:39 -0800
Subject: [PATCH 025/314] Ticket #1968: fix favoriting, reply when using
 InfiniteScroll

---
 plugins/InfiniteScroll/infinitescroll.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/InfiniteScroll/infinitescroll.js b/plugins/InfiniteScroll/infinitescroll.js
index 0c8edce2b0..961c320916 100644
--- a/plugins/InfiniteScroll/infinitescroll.js
+++ b/plugins/InfiniteScroll/infinitescroll.js
@@ -16,6 +16,12 @@ jQuery(document).ready(function($){
     contentSelector : "#notices_primary ol.notices",
     itemSelector    : "#notices_primary ol.notices li"
     },function(){
-        SN.Init.Notices();
+        // Reply button and attachment magic need to be set up
+        // for each new notice.
+        // DO NOT run SN.Init.Notices() which will duplicate stuff.
+        $(this).find('.notice').each(function() {
+            SN.U.NoticeReplyTo($(this));
+            SN.U.NoticeWithAttachment($(this));
+        });
     });
 });

From 35507cd0394fd058d69e65e7d18fcf880588bf2b Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 6 Jan 2011 17:43:00 -0800
Subject: [PATCH 026/314] Fix ticket #2392: sending invitation email fails when
 site name contains double quotes

Gotta escape quotes!
---
 lib/mail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mail.php b/lib/mail.php
index dd6a1a366e..9b6b7d6988 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -121,7 +121,7 @@ function mail_notify_from()
 
         $domain = mail_domain();
 
-        $notifyfrom = '"'.common_config('site', 'name') .'" <noreply@'.$domain.'>';
+        $notifyfrom = '"'. str_replace('"', '\\"', common_config('site', 'name')) .'" <noreply@'.$domain.'>';
     }
 
     return $notifyfrom;

From 0ec07e9c651f747d93865f75b8631899a7d7f04d Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 7 Jan 2011 14:48:40 -0800
Subject: [PATCH 027/314] Use ReflectionFunction to check for a
 present-but-disabled dl() function instead of manually parsing the
 disable_functions php.ini setting.

We were checking the list as comma-delimited (per the description of it as comma-delimited), but in fact spaces are also accepted, and who knows what else.
---
 lib/common.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/common.php b/lib/common.php
index cd4fbfb15a..3963402158 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -60,8 +60,13 @@ if (!function_exists('dl')) {
     // 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)) {
+    try {
+        // Reading the ini setting is hard as we don't know PHP's parsing,
+        // but we can check if it is disabled through reflection.
+        $dl = new ReflectionFunction('dl');
+        // $disabled = $dl->isDisabled(); // don't need to check this now
+    } catch (ReflectionException $e) {
+        // Ok, it *really* doesn't exist!
         function dl($library) {
             return false;
         }

From 5616bfb5ffa3af4c6a375ff9c8c8560d86208898 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 7 Jan 2011 15:29:30 -0800
Subject: [PATCH 028/314] Fix warning in subscribers/subscriptions list pages
 where we attempted to call free() an ArrayWrapper after it was used up, thus
 trying to forward the call to a nonexistent object.

Removed the free calls (unneeded since destructors now work), and added an error check w/ logging & an exception for future attempts to forward calls to nonexistent object.
---
 actions/subscribers.php   | 2 --
 actions/subscriptions.php | 2 --
 lib/arraywrapper.php      | 4 ++++
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/actions/subscribers.php b/actions/subscribers.php
index 2862f35c6d..ad522a4bae 100644
--- a/actions/subscribers.php
+++ b/actions/subscribers.php
@@ -100,8 +100,6 @@ class SubscribersAction extends GalleryAction
             }
         }
 
-        $subscribers->free();
-
         $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
                           $this->page, 'subscribers',
                           array('nickname' => $this->user->nickname));
diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index a814a4f354..ddcf237e62 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -106,8 +106,6 @@ class SubscriptionsAction extends GalleryAction
                 }
             }
 
-            $subscriptions->free();
-
             $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
                               $this->page, 'subscriptions',
                               array('nickname' => $this->user->nickname));
diff --git a/lib/arraywrapper.php b/lib/arraywrapper.php
index 8a1cdd96e1..f9d3c3cf94 100644
--- a/lib/arraywrapper.php
+++ b/lib/arraywrapper.php
@@ -76,6 +76,10 @@ class ArrayWrapper
     function __call($name, $args)
     {
         $item =& $this->_items[$this->_i];
+        if (!is_object($item)) {
+            common_log(LOG_ERR, "Invalid entry " . var_export($item, true) . " at index $this->_i of $this->N; calling $name()");
+            throw new ServerException("Internal error: bad entry in array wrapper list.");
+        }
         return call_user_func_array(array($item, $name), $args);
     }
 }

From cb56f445b89ab0c60236bdeb3335305d825576cf Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 7 Jan 2011 16:23:54 -0800
Subject: [PATCH 029/314] Ticket #2166: accept aliases for local group names in
 API

Also simplifies the code by using User_group::getForNickname instead of duplicating half of it :D
---
 lib/apiaction.php | 32 +++++++-------------------------
 1 file changed, 7 insertions(+), 25 deletions(-)

diff --git a/lib/apiaction.php b/lib/apiaction.php
index 2de513cbb1..dcce18ef27 100644
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -1437,41 +1437,23 @@ class ApiAction extends Action
     {
         if (empty($id)) {
             if (self::is_decimal($this->arg('id'))) {
-                return User_group::staticGet($this->arg('id'));
+                return User_group::staticGet('id', $this->arg('id'));
             } else if ($this->arg('id')) {
-                $nickname = common_canonical_nickname($this->arg('id'));
-                $local = Local_group::staticGet('nickname', $nickname);
-                if (empty($local)) {
-                    return null;
-                } else {
-                    return User_group::staticGet('id', $local->id);
-                }
+                return User_group::getForNickname($this->arg('id'));
             } else if ($this->arg('group_id')) {
-                // This is to ensure that a non-numeric user_id still
-                // overrides screen_name even if it doesn't get used
+                // This is to ensure that a non-numeric group_id still
+                // overrides group_name even if it doesn't get used
                 if (self::is_decimal($this->arg('group_id'))) {
                     return User_group::staticGet('id', $this->arg('group_id'));
                 }
             } else if ($this->arg('group_name')) {
-                $nickname = common_canonical_nickname($this->arg('group_name'));
-                $local = Local_group::staticGet('nickname', $nickname);
-                if (empty($local)) {
-                    return null;
-                } else {
-                    return User_group::staticGet('id', $local->group_id);
-                }
+                return User_group::getForNickname($this->arg('group_name'));
             }
 
         } else if (self::is_decimal($id)) {
-            return User_group::staticGet($id);
+            return User_group::staticGet('id', $id);
         } else {
-            $nickname = common_canonical_nickname($id);
-            $local = Local_group::staticGet('nickname', $nickname);
-            if (empty($local)) {
-                return null;
-            } else {
-                return User_group::staticGet('id', $local->group_id);
-            }
+            return User_group::getForNickname($id);
         }
     }
 

From 74a1c9def08a052180d50854ac6f0e28795f7bfa Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 7 Jan 2011 16:25:58 -0800
Subject: [PATCH 030/314] Fix error handling for missing group in
 apigroupmembership -- was trying to call methods on the variable before we
 checked it, which triggers PHP fatal error

---
 actions/apigroupmembership.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/actions/apigroupmembership.php b/actions/apigroupmembership.php
index 99ac965fa1..939d22d757 100644
--- a/actions/apigroupmembership.php
+++ b/actions/apigroupmembership.php
@@ -66,6 +66,12 @@ class ApiGroupMembershipAction extends ApiPrivateAuthAction
         parent::prepare($args);
 
         $this->group    = $this->getTargetGroup($this->arg('id'));
+        if (empty($this->group)) {
+            // TRANS: Client error displayed trying to show group membership on a non-existing group.
+            $this->clientError(_('Group not found.'), 404, $this->format);
+            return false;
+        }
+
         $this->profiles = $this->getProfiles();
 
         return true;
@@ -84,12 +90,6 @@ class ApiGroupMembershipAction extends ApiPrivateAuthAction
     {
         parent::handle($args);
 
-        if (empty($this->group)) {
-            // TRANS: Client error displayed trying to show group membership on a non-existing group.
-            $this->clientError(_('Group not found.'), 404, $this->format);
-            return false;
-        }
-
         // XXX: RSS and Atom
 
         switch($this->format) {

From 92d7a7b96f5510be44ca3ded0a7f3b974e5e96f3 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 2 Jan 2011 10:21:52 -0800
Subject: [PATCH 031/314] Move discovery library from OStatus plugin to core

---
 {plugins/OStatus/lib => lib}/discovery.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {plugins/OStatus/lib => lib}/discovery.php (100%)

diff --git a/plugins/OStatus/lib/discovery.php b/lib/discovery.php
similarity index 100%
rename from plugins/OStatus/lib/discovery.php
rename to lib/discovery.php

From 14fc0e589a0afa132de5803b05ff3d7846528e7e Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 2 Jan 2011 10:49:44 -0800
Subject: [PATCH 032/314] move linkheader.php to core

---
 lib/linkheader.php | 66 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 lib/linkheader.php

diff --git a/lib/linkheader.php b/lib/linkheader.php
new file mode 100644
index 0000000000..efa3f65ff3
--- /dev/null
+++ b/lib/linkheader.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * @todo Add file header and documentation.
+ */
+
+class LinkHeader
+{
+    var $href;
+    var $rel;
+    var $type;
+
+    function __construct($str)
+    {
+        preg_match('/^<[^>]+>/', $str, $uri_reference);
+        //if (empty($uri_reference)) return;
+
+        $this->href = trim($uri_reference[0], '<>');
+        $this->rel = array();
+        $this->type = null;
+
+        // remove uri-reference from header
+        $str = substr($str, strlen($uri_reference[0]));
+
+        // parse link-params
+        $params = explode(';', $str);
+
+        foreach ($params as $param) {
+            if (empty($param)) continue;
+            list($param_name, $param_value) = explode('=', $param, 2);
+            $param_name = trim($param_name);
+            $param_value = preg_replace('(^"|"$)', '', trim($param_value));
+
+            // for now we only care about 'rel' and 'type' link params
+            // TODO do something with the other links-params
+            switch ($param_name) {
+            case 'rel':
+                $this->rel = trim($param_value);
+                break;
+
+            case 'type':
+                $this->type = trim($param_value);
+            }
+        }
+    }
+
+    static function getLink($response, $rel=null, $type=null)
+    {
+        $headers = $response->getHeader('Link');
+        if ($headers) {
+            // Can get an array or string, so try to simplify the path
+            if (!is_array($headers)) {
+                $headers = array($headers);
+            }
+
+            foreach ($headers as $header) {
+                $lh = new LinkHeader($header);
+
+                if ((is_null($rel) || $lh->rel == $rel) &&
+                    (is_null($type) || $lh->type == $type)) {
+                    return $lh->href;
+                }
+            }
+        }
+        return null;
+    }
+}

From a6a8a547abcf04ac0fb6b23bf1b4c65b6101f582 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 2 Jan 2011 11:01:01 -0800
Subject: [PATCH 033/314] move linkheader.php to core

---
 plugins/OStatus/lib/linkheader.php | 66 ------------------------------
 1 file changed, 66 deletions(-)
 delete mode 100644 plugins/OStatus/lib/linkheader.php

diff --git a/plugins/OStatus/lib/linkheader.php b/plugins/OStatus/lib/linkheader.php
deleted file mode 100644
index efa3f65ff3..0000000000
--- a/plugins/OStatus/lib/linkheader.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * @todo Add file header and documentation.
- */
-
-class LinkHeader
-{
-    var $href;
-    var $rel;
-    var $type;
-
-    function __construct($str)
-    {
-        preg_match('/^<[^>]+>/', $str, $uri_reference);
-        //if (empty($uri_reference)) return;
-
-        $this->href = trim($uri_reference[0], '<>');
-        $this->rel = array();
-        $this->type = null;
-
-        // remove uri-reference from header
-        $str = substr($str, strlen($uri_reference[0]));
-
-        // parse link-params
-        $params = explode(';', $str);
-
-        foreach ($params as $param) {
-            if (empty($param)) continue;
-            list($param_name, $param_value) = explode('=', $param, 2);
-            $param_name = trim($param_name);
-            $param_value = preg_replace('(^"|"$)', '', trim($param_value));
-
-            // for now we only care about 'rel' and 'type' link params
-            // TODO do something with the other links-params
-            switch ($param_name) {
-            case 'rel':
-                $this->rel = trim($param_value);
-                break;
-
-            case 'type':
-                $this->type = trim($param_value);
-            }
-        }
-    }
-
-    static function getLink($response, $rel=null, $type=null)
-    {
-        $headers = $response->getHeader('Link');
-        if ($headers) {
-            // Can get an array or string, so try to simplify the path
-            if (!is_array($headers)) {
-                $headers = array($headers);
-            }
-
-            foreach ($headers as $header) {
-                $lh = new LinkHeader($header);
-
-                if ((is_null($rel) || $lh->rel == $rel) &&
-                    (is_null($type) || $lh->type == $type)) {
-                    return $lh->href;
-                }
-            }
-        }
-        return null;
-    }
-}

From 70bbaa9a9bfe1a2901ce8c3fa305f9db84bacbba Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 2 Jan 2011 11:01:28 -0800
Subject: [PATCH 034/314] PHPCS discovery.php

---
 lib/discovery.php | 219 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 205 insertions(+), 14 deletions(-)

diff --git a/lib/discovery.php b/lib/discovery.php
index 905ece2ca5..c66790c1d9 100644
--- a/lib/discovery.php
+++ b/lib/discovery.php
@@ -3,7 +3,7 @@
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2010, StatusNet, Inc.
  *
- * A sample module to show best practices for StatusNet plugins
+ * Use Hammer discovery stack to find out interesting things about an URI
  *
  * PHP version 5
  *
@@ -20,6 +20,7 @@
  * 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  Discovery
  * @package   StatusNet
  * @author    James Walker <james@status.net>
  * @copyright 2010 StatusNet, Inc.
@@ -31,18 +32,33 @@
  * This class implements LRDD-based service discovery based on the "Hammer Draft"
  * (including webfinger)
  *
- * @see http://groups.google.com/group/webfinger/browse_thread/thread/9f3d93a479e91bbf
+ * @category  Discovery
+ * @package   StatusNet
+ * @author    James Walker <james@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ *
+ * @see       http://groups.google.com/group/webfinger/browse_thread/thread/9f3d93a479e91bbf
  */
+
 class Discovery
 {
-
-    const LRDD_REL = 'lrdd';
+    const LRDD_REL    = 'lrdd';
     const PROFILEPAGE = 'http://webfinger.net/rel/profile-page';
     const UPDATESFROM = 'http://schemas.google.com/g/2010#updates-from';
-    const HCARD = 'http://microformats.org/profile/hcard';
+    const HCARD       = 'http://microformats.org/profile/hcard';
 
     public $methods = array();
 
+    /**
+     * Constructor for a discovery object
+     *
+     * Registers different discovery methods.
+     *
+     * @return Discovery this
+     */
+
     public function __construct()
     {
         $this->registerMethod('Discovery_LRDD_Host_Meta');
@@ -50,6 +66,14 @@ class Discovery
         $this->registerMethod('Discovery_LRDD_Link_HTML');
     }
 
+    /**
+     * Register a discovery class
+     * 
+     * @param string $class Class name
+     *
+     * @return void
+     */
+
     public function registerMethod($class)
     {
         $this->methods[] = $class;
@@ -58,7 +82,12 @@ class Discovery
     /**
      * Given a "user id" make sure it's normalized to either a webfinger
      * acct: uri or a profile HTTP URL.
+     *
+     * @param string $user_id User ID to normalize
+     *
+     * @return string normalized acct: or http(s)?: URI
      */
+
     public static function normalize($user_id)
     {
         if (substr($user_id, 0, 5) == 'http:' ||
@@ -67,13 +96,23 @@ class Discovery
             return $user_id;
         }
 
-        if (strpos($user_id, '@') !== FALSE) {
+        if (strpos($user_id, '@') !== false) {
             return 'acct:' . $user_id;
         }
 
         return 'http://' . $user_id;
     }
 
+    /**
+     * Determine if a string is a Webfinger ID
+     *
+     * Webfinger IDs look like foo@example.com or acct:foo@example.com
+     *
+     * @param string $user_id ID to check
+     *
+     * @return boolean true if $user_id is a Webfinger, else false
+     */
+     
     public static function isWebfinger($user_id)
     {
         $uri = Discovery::normalize($user_id);
@@ -82,8 +121,13 @@ class Discovery
     }
 
     /**
-     * This implements the actual lookup procedure
+     * Given a user ID, return the first available XRD
+     *
+     * @param string $id User ID URI
+     *
+     * @return XRD XRD object for the user
      */
+
     public function lookup($id)
     {
         // Normalize the incoming $id to make sure we have a uri
@@ -107,10 +151,20 @@ class Discovery
         }
 
         // TRANS: Exception.
-        throw new Exception(sprintf(_m('Unable to find services for %s.'),$id));
+        throw new Exception(sprintf(_('Unable to find services for %s.'), $id));
     }
 
-    public static function getService($links, $service) {
+    /**
+     * Given an array of links, returns the matching service
+     *
+     * @param array  $links   Links to check
+     * @param string $service Service to find
+     *
+     * @return array $link assoc array representing the link
+     */
+
+    public static function getService($links, $service)
+    {
         if (!is_array($links)) {
             return false;
         }
@@ -122,6 +176,17 @@ class Discovery
         }
     }
 
+    /**
+     * Apply a template using an ID
+     *
+     * Replaces {uri} in template string with the ID given.
+     *
+     * @param string $template Template to match
+     * @param string $id       User ID to replace with
+     *
+     * @return string replaced values
+     */
+
     public static function applyTemplate($template, $id)
     {
         $template = str_replace('{uri}', urlencode($id), $template);
@@ -129,10 +194,18 @@ class Discovery
         return $template;
     }
 
+    /**
+     * Fetch an XRD file and parse
+     *
+     * @param string $url URL of the XRD
+     * 
+     * @return XRD object representing the XRD file
+     */
+
     public static function fetchXrd($url)
     {
         try {
-            $client = new HTTPClient();
+            $client   = new HTTPClient();
             $response = $client->get($url);
         } catch (HTTP_Request2_Exception $e) {
             return false;
@@ -146,13 +219,60 @@ class Discovery
     }
 }
 
+/**
+ * Abstract interface for discovery
+ *
+ * Objects that implement this interface can retrieve an array of
+ * XRD links for the URI.
+ *
+ * @category  Discovery
+ * @package   StatusNet
+ * @author    James Walker <james@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
 interface Discovery_LRDD
 {
+    /**
+     * Discover interesting info about the URI
+     *
+     * @param string $uri URI to inquire about
+     *
+     * @return array Links in the XRD file
+     */
+
     public function discover($uri);
 }
 
+/**
+ * Implementation of discovery using host-meta file
+ *
+ * Discovers XRD file for a user by going to the organization's
+ * host-meta file and trying to find a template for LRDD.
+ *
+ * @category  Discovery
+ * @package   StatusNet
+ * @author    James Walker <james@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 Discovery_LRDD_Host_Meta implements Discovery_LRDD
 {
+    /**
+     * Discovery core method
+     *
+     * For Webfinger and HTTP URIs, fetch the host-meta file
+     * and look for LRDD templates
+     *
+     * @param string $uri URI to inquire about
+     *
+     * @return array Links in the XRD file
+     */
+
     public function discover($uri)
     {
         if (Discovery::isWebfinger($uri)) {
@@ -176,12 +296,38 @@ class Discovery_LRDD_Host_Meta implements Discovery_LRDD
     }
 }
 
+/**
+ * Implementation of discovery using HTTP Link header
+ *
+ * Discovers XRD file for a user by fetching the URL and reading any
+ * Link: headers in the HTTP response.
+ *
+ * @category  Discovery
+ * @package   StatusNet
+ * @author    James Walker <james@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 Discovery_LRDD_Link_Header implements Discovery_LRDD
 {
+    /**
+     * Discovery core method
+     *
+     * For HTTP IDs fetch the URL and look for Link headers.
+     *
+     * @param string $uri URI to inquire about
+     *
+     * @return array Links in the XRD file
+     *
+     * @todo fail out of Webfinger URIs faster 
+     */
+
     public function discover($uri)
     {
         try {
-            $client = new HTTPClient();
+            $client   = new HTTPClient();
             $response = $client->get($uri);
         } catch (HTTP_Request2_Exception $e) {
             return false;
@@ -199,6 +345,14 @@ class Discovery_LRDD_Link_Header implements Discovery_LRDD
         return array(Discovery_LRDD_Link_Header::parseHeader($link_header));
     }
 
+    /**
+     * Given a string or array of headers, returns XRD-like assoc array
+     *
+     * @param string|array $header string or array of strings for headers
+     * 
+     * @return array Link header in XRD-like format
+     */
+
     protected static function parseHeader($header)
     {
         $lh = new LinkHeader($header);
@@ -209,12 +363,39 @@ class Discovery_LRDD_Link_Header implements Discovery_LRDD
     }
 }
 
+/**
+ * Implementation of discovery using HTML <link> element
+ *
+ * Discovers XRD file for a user by fetching the URL and reading any
+ * <link> elements in the HTML response.
+ *
+ * @category  Discovery
+ * @package   StatusNet
+ * @author    James Walker <james@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 Discovery_LRDD_Link_HTML implements Discovery_LRDD
 {
+    /**
+     * Discovery core method
+     *
+     * For HTTP IDs, fetch the URL and look for <link> elements
+     * in the HTML response.
+     *
+     * @param string $uri URI to inquire about
+     *
+     * @return array Links in XRD-ish assoc array
+     *
+     * @todo fail out of Webfinger URIs faster 
+     */
+
     public function discover($uri)
     {
         try {
-            $client = new HTTPClient();
+            $client   = new HTTPClient();
             $response = $client->get($uri);
         } catch (HTTP_Request2_Exception $e) {
             return false;
@@ -227,6 +408,16 @@ class Discovery_LRDD_Link_HTML implements Discovery_LRDD
         return Discovery_LRDD_Link_HTML::parse($response->getBody());
     }
 
+    /**
+     * Parse HTML and return <link> elements
+     *
+     * Given an HTML string, scans the string for <link> elements
+     *
+     * @param string $html HTML to scan
+     *
+     * @return array array of associative arrays in XRD-ish format
+     */
+
     public function parse($html)
     {
         $links = array();
@@ -237,8 +428,8 @@ class Discovery_LRDD_Link_HTML implements Discovery_LRDD
         preg_match_all('/<link\s[^>]*>/i', $head_html, $link_matches);
 
         foreach ($link_matches[0] as $link_html) {
-            $link_url = null;
-            $link_rel = null;
+            $link_url  = null;
+            $link_rel  = null;
             $link_type = null;
 
             preg_match('/\srel=(("|\')([^\\2]*?)\\2|[^"\'\s]+)/i', $link_html, $rel_matches);

From 80065e6ece8faa33c31d7bec6a2a29e433c05ca5 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 2 Jan 2011 11:08:32 -0800
Subject: [PATCH 035/314] PHPCS linkheader.php

---
 lib/linkheader.php | 74 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 70 insertions(+), 4 deletions(-)

diff --git a/lib/linkheader.php b/lib/linkheader.php
index efa3f65ff3..a08fb67116 100644
--- a/lib/linkheader.php
+++ b/lib/linkheader.php
@@ -1,6 +1,51 @@
 <?php
 /**
- * @todo Add file header and documentation.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * Parse HTTP response for interesting Link: headers
+ *
+ * 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  Discovery
+ * @package   StatusNet
+ * @author    James Walker <james@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')) {
+    exit(1);
+}
+
+/**
+ * Class to represent Link: headers in an HTTP response
+ *
+ * Since these are a fairly important part of Hammer-stack discovery, they're
+ * reified and implemented here.
+ *
+ * @category  Discovery
+ * @package   StatusNet
+ * @author    James Walker <james@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ *
+ * @see       Discovery
  */
 
 class LinkHeader
@@ -9,13 +54,21 @@ class LinkHeader
     var $rel;
     var $type;
 
+    /**
+     * Initialize from a string
+     *
+     * @param string $str Link: header value
+     *
+     * @return LinkHeader self
+     */
+
     function __construct($str)
     {
         preg_match('/^<[^>]+>/', $str, $uri_reference);
         //if (empty($uri_reference)) return;
 
         $this->href = trim($uri_reference[0], '<>');
-        $this->rel = array();
+        $this->rel  = array();
         $this->type = null;
 
         // remove uri-reference from header
@@ -25,9 +78,12 @@ class LinkHeader
         $params = explode(';', $str);
 
         foreach ($params as $param) {
-            if (empty($param)) continue;
+            if (empty($param)) { 
+                continue;
+            }
             list($param_name, $param_value) = explode('=', $param, 2);
-            $param_name = trim($param_name);
+
+            $param_name  = trim($param_name);
             $param_value = preg_replace('(^"|"$)', '', trim($param_value));
 
             // for now we only care about 'rel' and 'type' link params
@@ -43,6 +99,16 @@ class LinkHeader
         }
     }
 
+    /**
+     * Given an HTTP response, return the requested Link: header
+     *
+     * @param HTTP_Request2_Response $response response to check
+     * @param string                 $rel      relationship to look for
+     * @param string                 $type     media type to look for
+     *
+     * @return LinkHeader discovered header, or null on failure
+     */
+
     static function getLink($response, $rel=null, $type=null)
     {
         $headers = $response->getHeader('Link');

From 00516fc16f95c55b8d991ea9f187286d821097a0 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 2 Jan 2011 11:10:46 -0800
Subject: [PATCH 036/314] execution protection on discovery.php

---
 lib/discovery.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/discovery.php b/lib/discovery.php
index c66790c1d9..d67ec94f00 100644
--- a/lib/discovery.php
+++ b/lib/discovery.php
@@ -28,6 +28,10 @@
  * @link      http://status.net/
  */
 
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
 /**
  * This class implements LRDD-based service discovery based on the "Hammer Draft"
  * (including webfinger)

From df18ba2fd9478693d3ed3ec3ecc8302e90596619 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 2 Jan 2011 15:21:56 -0800
Subject: [PATCH 037/314] let callers pass in an XMLOutputter to output to

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

diff --git a/lib/activity.php b/lib/activity.php
index 8d7ae1540b..b77d53427c 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -322,6 +322,7 @@ class Activity
      *
      * @return DOMElement Atom entry
      */
+
     function toAtomEntry()
     {
         return null;
@@ -330,7 +331,12 @@ class Activity
     function asString($namespace=false, $author=true, $source=false)
     {
         $xs = new XMLStringer(true);
+        $this->outputTo($xs, $namespace, $author, $source);
+        return $xs->getString();
+    }
 
+    function outputTo($xs, $namespace=false, $author=true, $source=false)
+    {
         if ($namespace) {
             $attrs = array('xmlns' => 'http://www.w3.org/2005/Atom',
                            'xmlns:thr' => 'http://purl.org/syndication/thread/1.0',
@@ -518,9 +524,7 @@ class Activity
 
         $xs->elementEnd('entry');
 
-        $str = $xs->getString();
-	
-        return $str;
+        return;
     }
 
     private function _child($element, $tag, $namespace=self::SPEC)

From 1166f9d7c1fa04a4006407a8ad8fa20abf2263b1 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 2 Jan 2011 15:22:12 -0800
Subject: [PATCH 038/314] preserve activities in object

---
 lib/useractivitystream.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/useractivitystream.php b/lib/useractivitystream.php
index 0fc315e26e..7d9b02ded8 100644
--- a/lib/useractivitystream.php
+++ b/lib/useractivitystream.php
@@ -28,6 +28,8 @@
 
 class UserActivityStream extends AtomUserNoticeFeed
 {
+    public $activities = array();
+
     function __construct($user, $indent = true)
     {
         parent::__construct($user, null, $indent);
@@ -45,10 +47,15 @@ class UserActivityStream extends AtomUserNoticeFeed
         usort($objs, 'UserActivityStream::compareObject');
 
         foreach ($objs as $obj) {
-            $act = $obj->asActivity();
+            $this->activities[] = $obj->asActivity();
+        }
+    }
+    
+    function renderEntries()
+    {
+        foreach ($this->activities as $act) {
             // Only show the author sub-element if it's different from default user
-            $str = $act->asString(false, ($act->actor->id != $this->user->uri));
-            $this->addEntryRaw($str);
+            $act->outputTo($this, false, ($act->actor->id != $this->user->uri));
         }
     }
 

From c3aca938a86806eefda3dec83ca089b943d72b3a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 3 Jan 2011 07:40:57 -0800
Subject: [PATCH 039/314] Add the Atom username to the XRD output

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

diff --git a/lib/xrdaction.php b/lib/xrdaction.php
index 855ed1ea89..b59e0f78a4 100644
--- a/lib/xrdaction.php
+++ b/lib/xrdaction.php
@@ -99,7 +99,9 @@ class XrdAction extends Action
 	    
             $xrd->links[] = array('rel' => 'http://apinamespace.org/atom',
                                   'type' => 'application/atomsvc+xml',
-                                  'href' => common_local_url('ApiAtomService', array('id' => $nick)));
+                                  'href' => common_local_url('ApiAtomService', array('id' => $nick)),
+                                  'property' => array(array('type' => 'http://apinamespace.org/atom/username',
+                                                            'value' => $nick)));
 
             if (common_config('site', 'fancy')) {
                 $apiRoot = common_path('api/', true);

From 63890996717507765ed219824c61bef906429e06 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 3 Jan 2011 07:41:13 -0800
Subject: [PATCH 040/314] Parse properties of links in XRD files

---
 lib/xrd.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/xrd.php b/lib/xrd.php
index 9c6d9f3ab7..40372b9d7a 100644
--- a/lib/xrd.php
+++ b/lib/xrd.php
@@ -173,6 +173,13 @@ class XRD
                 switch($node->tagName) {
                 case 'Title':
                     $link['title'][] = $node->nodeValue;
+                    break;
+                case 'Property':
+                    $link['property'][] = array('type' => $node->getAttribute('type'),
+                                                'value' => $node->nodeValue);
+                    break;
+                default:
+                    common_log(LOG_NOTICE, "Unexpected tag name {$node->tagName} found in XRD file.");
                 }
             }
         }

From 4690d0c0dbe91d2bf6bb3a6969e380f44d328517 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 3 Jan 2011 14:59:28 -0800
Subject: [PATCH 041/314] first example of moving a user

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

diff --git a/scripts/moveuser.php b/scripts/moveuser.php
new file mode 100644
index 0000000000..feaca15103
--- /dev/null
+++ b/scripts/moveuser.php
@@ -0,0 +1,296 @@
+<?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/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+$shortoptions = 'i:n:r:w:';
+$longoptions = array('id=', 'nickname=', 'remote=', 'password=');
+
+$helptext = <<<END_OF_MOVEUSER_HELP
+moveuser.php [options]
+Move a local user to a remote account.
+
+  -i --id       ID of user to move
+  -n --nickname nickname of the user to move
+  -r --remote   Full ID of remote users
+  -w --password Password of remote user
+
+Remote user identity must be a Webfinger (nickname@example.com) or 
+an HTTP or HTTPS URL (http://example.com/social/site/user/nickname).
+
+END_OF_MOVEUSER_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
+
+class ActivitySink
+{
+    protected $svcDocUrl   = null;
+    protected $username    = null;
+    protected $password    = null;
+    protected $collections = array();
+
+    function __construct($svcDocUrl, $username, $password)
+    {
+        $this->svcDocUrl = $svcDocUrl;
+        $this->username  = $username;
+        $this->password  = $password;
+
+        $this->_parseSvcDoc();
+    }
+
+    private function _parseSvcDoc()
+    {
+        $client   = new HTTPClient();
+        $response = $client->get($this->svcDocUrl);
+
+        if ($response->getStatus() != 200) {
+            throw new Exception("Can't get {$this->svcDocUrl}; response status " . $response->getStatus());
+        }
+
+        $xml = $response->getBody();
+
+        $dom = new DOMDocument();
+
+        // We don't want to bother with white spaces
+        $dom->preserveWhiteSpace = false;
+
+        // Don't spew XML warnings to output
+        $old = error_reporting();
+        error_reporting($old & ~E_WARNING);
+        $ok = $dom->loadXML($xml);
+        error_reporting($old);
+
+        $path = new DOMXPath($dom);
+
+        $path->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
+        $path->registerNamespace('app', 'http://www.w3.org/2007/app');
+        $path->registerNamespace('activity', 'http://activitystrea.ms/spec/1.0/');
+
+        $collections = $path->query('//app:collection');
+
+        for ($i = 0; $i < $collections->length; $i++) {
+            $collection = $collections->item($i);
+            $url = $collection->getAttribute('href');
+            $takesEntries = false;
+            $accepts = $path->query('app:accept', $collection);
+            for ($j = 0; $j < $accepts->length; $j++) {
+                $accept = $accepts->item($j);
+                $acceptValue = $accept->nodeValue;
+                if (preg_match('#application/atom\+xml(;\s*type=entry)?#', $acceptValue)) {
+                    $takesEntries = true;
+                    break;
+                }
+            }
+            if (!$takesEntries) {
+                continue;
+            }
+            $verbs = $path->query('activity:verb', $collection);
+            if ($verbs->length == 0) {
+                $this->_addCollection(ActivityVerb::POST, $url);
+            } else {
+                for ($k = 0; $k < $verbs->length; $k++) {
+                    $verb = $verbs->item($k);
+                    $this->_addCollection($verb->nodeValue, $url);
+                }
+            }
+        }
+    }
+
+    private function _addCollection($verb, $url)
+    {
+        if (array_key_exists($verb, $this->collections)) {
+            $this->collections[$verb][] = $url;
+        } else {
+            $this->collections[$verb] = array($url);
+        }
+        return;
+    }
+
+    function postActivity($activity)
+    {
+        if (!array_key_exists($activity->verb, $this->collections)) {
+            throw new Exception("No collection for verb {$activity->verb}");
+        } else {
+            if (count($this->collections[$activity->verb]) > 1) {
+                common_log(LOG_NOTICE, "More than one collection for verb {$activity->verb}");
+            }
+            $this->postToCollection($this->collections[$activity->verb][0], $activity);
+        }
+    }
+
+    function postToCollection($url, $activity)
+    {
+        $client = new HTTPClient($url);
+
+        $client->setMethod('POST');
+        $client->setAuth($this->username, $this->password);
+        $client->setHeader('Content-Type', 'application/atom+xml;type=entry');
+        $client->setBody($activity->asString(true, true, true));
+
+        $response = $client->send();
+    }
+}
+
+function getServiceDocument($remote)
+{
+    $discovery = new Discovery();
+
+    $xrd = $discovery->lookup($remote);
+
+    if (empty($xrd)) {
+        throw new Exception("Can't find XRD for $remote");
+    } 
+
+    $svcDocUrl = null;
+    $username  = null;
+
+    foreach ($xrd->links as $link) {
+        if ($link['rel'] == 'http://apinamespace.org/atom' &&
+            $link['type'] == 'application/atomsvc+xml') {
+            $svcDocUrl = $link['href'];
+            if (!empty($link['property'])) {
+                foreach ($link['property'] as $property) {
+                    if ($property['type'] == 'http://apinamespace.org/atom/username') {
+                        $username = $property['value'];
+                        break;
+                    }
+                }
+            }
+            break;
+        }
+    }
+
+    if (empty($svcDocUrl)) {
+        throw new Exception("No AtomPub API service for $remote.");
+    }
+
+    return array($svcDocUrl, $username);
+}
+
+class AccountMover
+{
+    private $_user    = null;
+    private $_profile = null;
+    private $_remote  = null;
+    private $_sink    = null;
+    
+    function __construct($user, $remote, $password)
+    {
+        $this->_user    = $user;
+        $this->_profile = $user->getProfile();
+
+        $oprofile = Ostatus_profile::ensureProfileURI($remote);
+
+        if (empty($oprofile)) {
+            throw new Exception("Can't locate account {$remote}");
+        }
+
+        $this->_remote = $oprofile->localProfile();
+
+        list($svcDocUrl, $username) = getServiceDocument($remote);
+
+        $this->_sink = new ActivitySink($svcDocUrl, $username, $password);
+    }
+
+    function move()
+    {
+        $stream = new UserActivityStream($this->_user);
+
+        $acts = array_reverse($stream->activities);
+
+        // Reverse activities to run in correct chron order
+
+        foreach ($acts as $act) {
+            $this->_moveActivity($act);
+        }
+    }
+
+    private function _moveActivity($act)
+    {
+        switch ($act->verb) {
+        case ActivityVerb::FAVORITE:
+            // push it, then delete local
+            $this->_sink->postActivity($act);
+            $notice = Notice::staticGet('uri', $act->objects[0]->id);
+            if (!empty($notice)) {
+                $fave = Fave::pkeyGet(array('user_id' => $this->_user->id,
+                                            'notice_id' => $notice->id));
+                $fave->delete();
+            }
+            break;
+        case ActivityVerb::POST:
+            // XXX: send a reshare, not a post
+            common_log(LOG_INFO, "Pushing notice {$act->objects[0]->id} to {$this->_remote->getURI()}");
+            $this->_sink->postActivity($act);
+            $notice = Notice::staticGet('uri', $act->objects[0]->id);
+            if (!empty($notice)) {
+                $notice->delete();
+            }
+            break;
+        case ActivityVerb::JOIN:
+            $this->_sink->postActivity($act);
+            $group = User_group::staticGet('uri', $act->objects[0]->id);
+            if (!empty($group)) {
+                Group_member::leave($group->id, $this->_user->id);
+            }
+            break;
+        case ActivityVerb::FOLLOW:
+            if ($act->actor->id == $this->_user->uri) {
+                $this->_sink->postActivity($act);
+                $other = Profile::fromURI($act->objects[0]->id);
+                if (!empty($other)) {
+                    Subscription::cancel($this->_profile, $other);
+                }
+            } else {
+                $otherUser = User::staticGet('uri', $act->actor->id);
+                if (!empty($otherUser)) {
+                    $otherProfile = $otherUser->getProfile();
+                    Subscription::start($otherProfile, $this->_remote);
+                    Subscription::cancel($otherProfile, $this->_user->getProfile());
+                } else {
+                    // It's a remote subscription. Do something here!
+                }
+            }
+            break;
+        }
+    }
+}
+
+try {
+
+    $user = getUser();
+
+    $remote = get_option_value('r', 'remote');
+
+    if (empty($remote)) {
+        show_help();
+        exit(1);
+    }
+
+    $password = get_option_value('w', 'password');
+
+    $mover = new AccountMover($user, $remote, $password);
+
+    $mover->move();
+
+} catch (Exception $e) {
+    print $e->getMessage()."\n";
+    exit(1);
+}

From 4be9fe01bf9564cd447112064e3cdfb035540ceb Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 7 Jan 2011 19:48:50 -0500
Subject: [PATCH 042/314] move account-moving classes to their own libraries

---
 lib/accountmover.php | 171 +++++++++++++++++++++++++++++++
 lib/activitysink.php | 155 ++++++++++++++++++++++++++++
 scripts/moveuser.php | 235 -------------------------------------------
 3 files changed, 326 insertions(+), 235 deletions(-)
 create mode 100644 lib/accountmover.php
 create mode 100644 lib/activitysink.php

diff --git a/lib/accountmover.php b/lib/accountmover.php
new file mode 100644
index 0000000000..ba9da0f6fd
--- /dev/null
+++ b/lib/accountmover.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * A class for moving an account to a new server
+ * 
+ * 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  Account
+ * @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);
+}
+
+/**
+ * Moves an account from this server to another
+ *
+ * @category  Account
+ * @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 AccountMover
+{
+    private $_user    = null;
+    private $_profile = null;
+    private $_remote  = null;
+    private $_sink    = null;
+    
+    function __construct($user, $remote, $password)
+    {
+        $this->_user    = $user;
+        $this->_profile = $user->getProfile();
+
+        $oprofile = Ostatus_profile::ensureProfileURI($remote);
+
+        if (empty($oprofile)) {
+            throw new Exception("Can't locate account {$remote}");
+        }
+
+        $this->_remote = $oprofile->localProfile();
+
+        list($svcDocUrl, $username) = self::getServiceDocument($remote);
+
+        $this->_sink = new ActivitySink($svcDocUrl, $username, $password);
+    }
+
+    static function getServiceDocument($remote)
+    {
+        $discovery = new Discovery();
+
+        $xrd = $discovery->lookup($remote);
+
+        if (empty($xrd)) {
+            throw new Exception("Can't find XRD for $remote");
+        } 
+
+        $svcDocUrl = null;
+        $username  = null;
+
+        foreach ($xrd->links as $link) {
+            if ($link['rel'] == 'http://apinamespace.org/atom' &&
+                $link['type'] == 'application/atomsvc+xml') {
+                $svcDocUrl = $link['href'];
+                if (!empty($link['property'])) {
+                    foreach ($link['property'] as $property) {
+                        if ($property['type'] == 'http://apinamespace.org/atom/username') {
+                            $username = $property['value'];
+                            break;
+                        }
+                    }
+                }
+                break;
+            }
+        }
+
+        if (empty($svcDocUrl)) {
+            throw new Exception("No AtomPub API service for $remote.");
+        }
+
+        return array($svcDocUrl, $username);
+    }
+
+    function move()
+    {
+        $stream = new UserActivityStream($this->_user);
+
+        $acts = array_reverse($stream->activities);
+
+        // Reverse activities to run in correct chron order
+
+        foreach ($acts as $act) {
+            $this->_moveActivity($act);
+        }
+    }
+
+    private function _moveActivity($act)
+    {
+        switch ($act->verb) {
+        case ActivityVerb::FAVORITE:
+            // push it, then delete local
+            $this->_sink->postActivity($act);
+            $notice = Notice::staticGet('uri', $act->objects[0]->id);
+            if (!empty($notice)) {
+                $fave = Fave::pkeyGet(array('user_id' => $this->_user->id,
+                                            'notice_id' => $notice->id));
+                $fave->delete();
+            }
+            break;
+        case ActivityVerb::POST:
+            // XXX: send a reshare, not a post
+            common_log(LOG_INFO, "Pushing notice {$act->objects[0]->id} to {$this->_remote->getURI()}");
+            $this->_sink->postActivity($act);
+            $notice = Notice::staticGet('uri', $act->objects[0]->id);
+            if (!empty($notice)) {
+                $notice->delete();
+            }
+            break;
+        case ActivityVerb::JOIN:
+            $this->_sink->postActivity($act);
+            $group = User_group::staticGet('uri', $act->objects[0]->id);
+            if (!empty($group)) {
+                Group_member::leave($group->id, $this->_user->id);
+            }
+            break;
+        case ActivityVerb::FOLLOW:
+            if ($act->actor->id == $this->_user->uri) {
+                $this->_sink->postActivity($act);
+                $other = Profile::fromURI($act->objects[0]->id);
+                if (!empty($other)) {
+                    Subscription::cancel($this->_profile, $other);
+                }
+            } else {
+                $otherUser = User::staticGet('uri', $act->actor->id);
+                if (!empty($otherUser)) {
+                    $otherProfile = $otherUser->getProfile();
+                    Subscription::start($otherProfile, $this->_remote);
+                    Subscription::cancel($otherProfile, $this->_user->getProfile());
+                } else {
+                    // It's a remote subscription. Do something here!
+                }
+            }
+            break;
+        }
+    }
+}
diff --git a/lib/activitysink.php b/lib/activitysink.php
new file mode 100644
index 0000000000..287fd8f0ab
--- /dev/null
+++ b/lib/activitysink.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * A remote, atompub-receiving service
+ * 
+ * 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  AtomPub
+ * @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 remote service that supports AtomPub
+ *
+ * @category  AtomPub
+ * @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 ActivitySink
+{
+    protected $svcDocUrl   = null;
+    protected $username    = null;
+    protected $password    = null;
+    protected $collections = array();
+
+    function __construct($svcDocUrl, $username, $password)
+    {
+        $this->svcDocUrl = $svcDocUrl;
+        $this->username  = $username;
+        $this->password  = $password;
+
+        $this->_parseSvcDoc();
+    }
+
+    private function _parseSvcDoc()
+    {
+        $client   = new HTTPClient();
+        $response = $client->get($this->svcDocUrl);
+
+        if ($response->getStatus() != 200) {
+            throw new Exception("Can't get {$this->svcDocUrl}; response status " . $response->getStatus());
+        }
+
+        $xml = $response->getBody();
+
+        $dom = new DOMDocument();
+
+        // We don't want to bother with white spaces
+        $dom->preserveWhiteSpace = false;
+
+        // Don't spew XML warnings to output
+        $old = error_reporting();
+        error_reporting($old & ~E_WARNING);
+        $ok = $dom->loadXML($xml);
+        error_reporting($old);
+
+        $path = new DOMXPath($dom);
+
+        $path->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
+        $path->registerNamespace('app', 'http://www.w3.org/2007/app');
+        $path->registerNamespace('activity', 'http://activitystrea.ms/spec/1.0/');
+
+        $collections = $path->query('//app:collection');
+
+        for ($i = 0; $i < $collections->length; $i++) {
+            $collection = $collections->item($i);
+            $url = $collection->getAttribute('href');
+            $takesEntries = false;
+            $accepts = $path->query('app:accept', $collection);
+            for ($j = 0; $j < $accepts->length; $j++) {
+                $accept = $accepts->item($j);
+                $acceptValue = $accept->nodeValue;
+                if (preg_match('#application/atom\+xml(;\s*type=entry)?#', $acceptValue)) {
+                    $takesEntries = true;
+                    break;
+                }
+            }
+            if (!$takesEntries) {
+                continue;
+            }
+            $verbs = $path->query('activity:verb', $collection);
+            if ($verbs->length == 0) {
+                $this->_addCollection(ActivityVerb::POST, $url);
+            } else {
+                for ($k = 0; $k < $verbs->length; $k++) {
+                    $verb = $verbs->item($k);
+                    $this->_addCollection($verb->nodeValue, $url);
+                }
+            }
+        }
+    }
+
+    private function _addCollection($verb, $url)
+    {
+        if (array_key_exists($verb, $this->collections)) {
+            $this->collections[$verb][] = $url;
+        } else {
+            $this->collections[$verb] = array($url);
+        }
+        return;
+    }
+
+    function postActivity($activity)
+    {
+        if (!array_key_exists($activity->verb, $this->collections)) {
+            throw new Exception("No collection for verb {$activity->verb}");
+        } else {
+            if (count($this->collections[$activity->verb]) > 1) {
+                common_log(LOG_NOTICE, "More than one collection for verb {$activity->verb}");
+            }
+            $this->postToCollection($this->collections[$activity->verb][0], $activity);
+        }
+    }
+
+    function postToCollection($url, $activity)
+    {
+        $client = new HTTPClient($url);
+
+        $client->setMethod('POST');
+        $client->setAuth($this->username, $this->password);
+        $client->setHeader('Content-Type', 'application/atom+xml;type=entry');
+        $client->setBody($activity->asString(true, true, true));
+
+        $response = $client->send();
+    }
+}
diff --git a/scripts/moveuser.php b/scripts/moveuser.php
index feaca15103..b02b10b1e5 100644
--- a/scripts/moveuser.php
+++ b/scripts/moveuser.php
@@ -37,241 +37,6 @@ an HTTP or HTTPS URL (http://example.com/social/site/user/nickname).
 END_OF_MOVEUSER_HELP;
 
 require_once INSTALLDIR.'/scripts/commandline.inc';
-require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
-
-class ActivitySink
-{
-    protected $svcDocUrl   = null;
-    protected $username    = null;
-    protected $password    = null;
-    protected $collections = array();
-
-    function __construct($svcDocUrl, $username, $password)
-    {
-        $this->svcDocUrl = $svcDocUrl;
-        $this->username  = $username;
-        $this->password  = $password;
-
-        $this->_parseSvcDoc();
-    }
-
-    private function _parseSvcDoc()
-    {
-        $client   = new HTTPClient();
-        $response = $client->get($this->svcDocUrl);
-
-        if ($response->getStatus() != 200) {
-            throw new Exception("Can't get {$this->svcDocUrl}; response status " . $response->getStatus());
-        }
-
-        $xml = $response->getBody();
-
-        $dom = new DOMDocument();
-
-        // We don't want to bother with white spaces
-        $dom->preserveWhiteSpace = false;
-
-        // Don't spew XML warnings to output
-        $old = error_reporting();
-        error_reporting($old & ~E_WARNING);
-        $ok = $dom->loadXML($xml);
-        error_reporting($old);
-
-        $path = new DOMXPath($dom);
-
-        $path->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
-        $path->registerNamespace('app', 'http://www.w3.org/2007/app');
-        $path->registerNamespace('activity', 'http://activitystrea.ms/spec/1.0/');
-
-        $collections = $path->query('//app:collection');
-
-        for ($i = 0; $i < $collections->length; $i++) {
-            $collection = $collections->item($i);
-            $url = $collection->getAttribute('href');
-            $takesEntries = false;
-            $accepts = $path->query('app:accept', $collection);
-            for ($j = 0; $j < $accepts->length; $j++) {
-                $accept = $accepts->item($j);
-                $acceptValue = $accept->nodeValue;
-                if (preg_match('#application/atom\+xml(;\s*type=entry)?#', $acceptValue)) {
-                    $takesEntries = true;
-                    break;
-                }
-            }
-            if (!$takesEntries) {
-                continue;
-            }
-            $verbs = $path->query('activity:verb', $collection);
-            if ($verbs->length == 0) {
-                $this->_addCollection(ActivityVerb::POST, $url);
-            } else {
-                for ($k = 0; $k < $verbs->length; $k++) {
-                    $verb = $verbs->item($k);
-                    $this->_addCollection($verb->nodeValue, $url);
-                }
-            }
-        }
-    }
-
-    private function _addCollection($verb, $url)
-    {
-        if (array_key_exists($verb, $this->collections)) {
-            $this->collections[$verb][] = $url;
-        } else {
-            $this->collections[$verb] = array($url);
-        }
-        return;
-    }
-
-    function postActivity($activity)
-    {
-        if (!array_key_exists($activity->verb, $this->collections)) {
-            throw new Exception("No collection for verb {$activity->verb}");
-        } else {
-            if (count($this->collections[$activity->verb]) > 1) {
-                common_log(LOG_NOTICE, "More than one collection for verb {$activity->verb}");
-            }
-            $this->postToCollection($this->collections[$activity->verb][0], $activity);
-        }
-    }
-
-    function postToCollection($url, $activity)
-    {
-        $client = new HTTPClient($url);
-
-        $client->setMethod('POST');
-        $client->setAuth($this->username, $this->password);
-        $client->setHeader('Content-Type', 'application/atom+xml;type=entry');
-        $client->setBody($activity->asString(true, true, true));
-
-        $response = $client->send();
-    }
-}
-
-function getServiceDocument($remote)
-{
-    $discovery = new Discovery();
-
-    $xrd = $discovery->lookup($remote);
-
-    if (empty($xrd)) {
-        throw new Exception("Can't find XRD for $remote");
-    } 
-
-    $svcDocUrl = null;
-    $username  = null;
-
-    foreach ($xrd->links as $link) {
-        if ($link['rel'] == 'http://apinamespace.org/atom' &&
-            $link['type'] == 'application/atomsvc+xml') {
-            $svcDocUrl = $link['href'];
-            if (!empty($link['property'])) {
-                foreach ($link['property'] as $property) {
-                    if ($property['type'] == 'http://apinamespace.org/atom/username') {
-                        $username = $property['value'];
-                        break;
-                    }
-                }
-            }
-            break;
-        }
-    }
-
-    if (empty($svcDocUrl)) {
-        throw new Exception("No AtomPub API service for $remote.");
-    }
-
-    return array($svcDocUrl, $username);
-}
-
-class AccountMover
-{
-    private $_user    = null;
-    private $_profile = null;
-    private $_remote  = null;
-    private $_sink    = null;
-    
-    function __construct($user, $remote, $password)
-    {
-        $this->_user    = $user;
-        $this->_profile = $user->getProfile();
-
-        $oprofile = Ostatus_profile::ensureProfileURI($remote);
-
-        if (empty($oprofile)) {
-            throw new Exception("Can't locate account {$remote}");
-        }
-
-        $this->_remote = $oprofile->localProfile();
-
-        list($svcDocUrl, $username) = getServiceDocument($remote);
-
-        $this->_sink = new ActivitySink($svcDocUrl, $username, $password);
-    }
-
-    function move()
-    {
-        $stream = new UserActivityStream($this->_user);
-
-        $acts = array_reverse($stream->activities);
-
-        // Reverse activities to run in correct chron order
-
-        foreach ($acts as $act) {
-            $this->_moveActivity($act);
-        }
-    }
-
-    private function _moveActivity($act)
-    {
-        switch ($act->verb) {
-        case ActivityVerb::FAVORITE:
-            // push it, then delete local
-            $this->_sink->postActivity($act);
-            $notice = Notice::staticGet('uri', $act->objects[0]->id);
-            if (!empty($notice)) {
-                $fave = Fave::pkeyGet(array('user_id' => $this->_user->id,
-                                            'notice_id' => $notice->id));
-                $fave->delete();
-            }
-            break;
-        case ActivityVerb::POST:
-            // XXX: send a reshare, not a post
-            common_log(LOG_INFO, "Pushing notice {$act->objects[0]->id} to {$this->_remote->getURI()}");
-            $this->_sink->postActivity($act);
-            $notice = Notice::staticGet('uri', $act->objects[0]->id);
-            if (!empty($notice)) {
-                $notice->delete();
-            }
-            break;
-        case ActivityVerb::JOIN:
-            $this->_sink->postActivity($act);
-            $group = User_group::staticGet('uri', $act->objects[0]->id);
-            if (!empty($group)) {
-                Group_member::leave($group->id, $this->_user->id);
-            }
-            break;
-        case ActivityVerb::FOLLOW:
-            if ($act->actor->id == $this->_user->uri) {
-                $this->_sink->postActivity($act);
-                $other = Profile::fromURI($act->objects[0]->id);
-                if (!empty($other)) {
-                    Subscription::cancel($this->_profile, $other);
-                }
-            } else {
-                $otherUser = User::staticGet('uri', $act->actor->id);
-                if (!empty($otherUser)) {
-                    $otherProfile = $otherUser->getProfile();
-                    Subscription::start($otherProfile, $this->_remote);
-                    Subscription::cancel($otherProfile, $this->_user->getProfile());
-                } else {
-                    // It's a remote subscription. Do something here!
-                }
-            }
-            break;
-        }
-    }
-}
 
 try {
 

From 566f7c42a5c6d2b1784e5bf86acae8f52f2a89eb Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 10 Jan 2011 14:56:15 -0500
Subject: [PATCH 043/314] normalize accounts and check for return in HTTP for
 moving

---
 lib/accountmover.php |  2 ++
 lib/activitysink.php | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/lib/accountmover.php b/lib/accountmover.php
index ba9da0f6fd..eefd0487d8 100644
--- a/lib/accountmover.php
+++ b/lib/accountmover.php
@@ -57,6 +57,8 @@ class AccountMover
         $this->_user    = $user;
         $this->_profile = $user->getProfile();
 
+        $remote = Discovery::normalize($remote);
+
         $oprofile = Ostatus_profile::ensureProfileURI($remote);
 
         if (empty($oprofile)) {
diff --git a/lib/activitysink.php b/lib/activitysink.php
index 287fd8f0ab..fbe1f1e7ff 100644
--- a/lib/activitysink.php
+++ b/lib/activitysink.php
@@ -151,5 +151,19 @@ class ActivitySink
         $client->setBody($activity->asString(true, true, true));
 
         $response = $client->send();
+
+        $status = $response->getStatus();
+        $reason = $response->getReasonPhrase();
+
+        if ($status >= 200 && $status < 300) {
+            return true;
+        } else if ($status >= 400 && $status < 500) {
+            throw new ClientException("{$url} {$status} {$reason}");
+        } else if ($status >= 500 && $status < 600) {
+            throw new ServerException("{$url} {$status} {$reason}");
+        } else {
+            // That's unexpected.
+            throw new Exception("{$url} {$status} {$reason}");
+        }
     }
 }

From 9da9504823e9e137476614d3fb48fbe592aefb48 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Fri, 14 Jan 2011 12:07:57 +0100
Subject: [PATCH 044/314] Fix typo in extension description.

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

diff --git a/plugins/Awesomeness/AwesomenessPlugin.php b/plugins/Awesomeness/AwesomenessPlugin.php
index 46a70a83f7..31f8ea35f4 100644
--- a/plugins/Awesomeness/AwesomenessPlugin.php
+++ b/plugins/Awesomeness/AwesomenessPlugin.php
@@ -53,7 +53,7 @@ class AwesomenessPlugin extends Plugin
             'homepage' => 'http://status.net/wiki/Plugin:Awesomeness',
             // TRANS: Plugin description for a sample plugin.
             'rawdescription' => _m(
-                'The Awesomeness plugin adds aditional awesomeness ' .
+                'The Awesomeness plugin adds additional awesomeness ' .
                 'to a StatusNet installation.'
             )
         );

From 380ca7187c27944c58a535955b83ff83b356dae7 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Fri, 14 Jan 2011 12:10:05 +0100
Subject: [PATCH 045/314] Localisation updates from http://translatewiki.net.

---
 .../APC/locale/be-tarask/LC_MESSAGES/APC.po   |  10 +-
 .../locale/be-tarask/LC_MESSAGES/Adsense.po   |  10 +-
 .../Adsense/locale/gl/LC_MESSAGES/Adsense.po  |  10 +-
 .../Adsense/locale/lb/LC_MESSAGES/Adsense.po  | 101 +++++++++++++
 .../be-tarask/LC_MESSAGES/AnonymousFave.po    |  10 +-
 .../be-tarask/LC_MESSAGES/AutoSandbox.po      |  10 +-
 .../be-tarask/LC_MESSAGES/Autocomplete.po     |  10 +-
 .../be-tarask/LC_MESSAGES/Awesomeness.po      |  32 ++++
 .../locale/fr/LC_MESSAGES/Awesomeness.po      |  31 ++++
 .../locale/ia/LC_MESSAGES/Awesomeness.po      |  31 ++++
 .../locale/mk/LC_MESSAGES/Awesomeness.po      |  31 ++++
 .../locale/nl/LC_MESSAGES/Awesomeness.po      |  31 ++++
 .../locale/ru/LC_MESSAGES/Awesomeness.po      |  30 ++++
 .../locale/uk/LC_MESSAGES/Awesomeness.po      |  32 ++++
 .../locale/be-tarask/LC_MESSAGES/BitlyUrl.po  |  10 +-
 .../locale/gl/LC_MESSAGES/BitlyUrl.po         |  10 +-
 .../locale/ru/LC_MESSAGES/BitlyUrl.po         |  11 +-
 .../locale/uk/LC_MESSAGES/BitlyUrl.po         |   8 +-
 .../locale/be-tarask/LC_MESSAGES/Blacklist.po |  10 +-
 .../locale/br/LC_MESSAGES/Blacklist.po        |  18 +--
 .../locale/be-tarask/LC_MESSAGES/BlankAd.po   |  10 +-
 .../BlankAd/locale/br/LC_MESSAGES/BlankAd.po  |   8 +-
 .../BlankAd/locale/de/LC_MESSAGES/BlankAd.po  |   8 +-
 .../BlankAd/locale/es/LC_MESSAGES/BlankAd.po  |   8 +-
 .../BlankAd/locale/fr/LC_MESSAGES/BlankAd.po  |   8 +-
 .../BlankAd/locale/he/LC_MESSAGES/BlankAd.po  |   8 +-
 .../BlankAd/locale/ia/LC_MESSAGES/BlankAd.po  |   8 +-
 .../BlankAd/locale/mk/LC_MESSAGES/BlankAd.po  |   8 +-
 .../BlankAd/locale/nb/LC_MESSAGES/BlankAd.po  |   8 +-
 .../BlankAd/locale/nl/LC_MESSAGES/BlankAd.po  |   8 +-
 .../BlankAd/locale/pt/LC_MESSAGES/BlankAd.po  |   8 +-
 .../BlankAd/locale/ru/LC_MESSAGES/BlankAd.po  |   8 +-
 .../BlankAd/locale/tl/LC_MESSAGES/BlankAd.po  |   8 +-
 .../BlankAd/locale/uk/LC_MESSAGES/BlankAd.po  |   8 +-
 .../locale/zh_CN/LC_MESSAGES/BlankAd.po       |   8 +-
 .../be-tarask/LC_MESSAGES/BlogspamNet.po      |  10 +-
 .../locale/br/LC_MESSAGES/BlogspamNet.po      |   8 +-
 .../locale/de/LC_MESSAGES/BlogspamNet.po      |   8 +-
 .../locale/es/LC_MESSAGES/BlogspamNet.po      |   8 +-
 .../locale/fr/LC_MESSAGES/BlogspamNet.po      |   8 +-
 .../locale/he/LC_MESSAGES/BlogspamNet.po      |   8 +-
 .../locale/ia/LC_MESSAGES/BlogspamNet.po      |   8 +-
 .../locale/mk/LC_MESSAGES/BlogspamNet.po      |   8 +-
 .../locale/nb/LC_MESSAGES/BlogspamNet.po      |   8 +-
 .../locale/nl/LC_MESSAGES/BlogspamNet.po      |   8 +-
 .../locale/pt/LC_MESSAGES/BlogspamNet.po      |   8 +-
 .../locale/ru/LC_MESSAGES/BlogspamNet.po      |   8 +-
 .../locale/tl/LC_MESSAGES/BlogspamNet.po      |   8 +-
 .../locale/uk/LC_MESSAGES/BlogspamNet.po      |   8 +-
 .../locale/zh_CN/LC_MESSAGES/BlogspamNet.po   |   8 +-
 plugins/Bookmark/locale/Bookmark.pot          |  31 ++++
 .../locale/be-tarask/LC_MESSAGES/CacheLog.po  |  10 +-
 .../locale/br/LC_MESSAGES/CacheLog.po         |   8 +-
 .../locale/es/LC_MESSAGES/CacheLog.po         |   8 +-
 .../locale/fr/LC_MESSAGES/CacheLog.po         |   8 +-
 .../locale/he/LC_MESSAGES/CacheLog.po         |   8 +-
 .../locale/ia/LC_MESSAGES/CacheLog.po         |   8 +-
 .../locale/mk/LC_MESSAGES/CacheLog.po         |   8 +-
 .../locale/nb/LC_MESSAGES/CacheLog.po         |   8 +-
 .../locale/nl/LC_MESSAGES/CacheLog.po         |   8 +-
 .../locale/pt/LC_MESSAGES/CacheLog.po         |   8 +-
 .../locale/ru/LC_MESSAGES/CacheLog.po         |   8 +-
 .../locale/tl/LC_MESSAGES/CacheLog.po         |   8 +-
 .../locale/uk/LC_MESSAGES/CacheLog.po         |   8 +-
 .../locale/zh_CN/LC_MESSAGES/CacheLog.po      |   8 +-
 .../LC_MESSAGES/CasAuthentication.po          |  10 +-
 .../br/LC_MESSAGES/CasAuthentication.po       |  75 +++++++++
 .../de/LC_MESSAGES/CasAuthentication.po       |   8 +-
 .../es/LC_MESSAGES/CasAuthentication.po       |   8 +-
 .../fr/LC_MESSAGES/CasAuthentication.po       |   8 +-
 .../gl/LC_MESSAGES/CasAuthentication.po       |   8 +-
 .../ia/LC_MESSAGES/CasAuthentication.po       |   8 +-
 .../mk/LC_MESSAGES/CasAuthentication.po       |   8 +-
 .../nl/LC_MESSAGES/CasAuthentication.po       |   8 +-
 .../pt_BR/LC_MESSAGES/CasAuthentication.po    |   8 +-
 .../ru/LC_MESSAGES/CasAuthentication.po       |   8 +-
 .../te/LC_MESSAGES/CasAuthentication.po       |   8 +-
 .../uk/LC_MESSAGES/CasAuthentication.po       |   8 +-
 .../zh_CN/LC_MESSAGES/CasAuthentication.po    |   8 +-
 .../LC_MESSAGES/ClientSideShorten.po          |  10 +-
 .../br/LC_MESSAGES/ClientSideShorten.po       |   8 +-
 .../de/LC_MESSAGES/ClientSideShorten.po       |   8 +-
 .../es/LC_MESSAGES/ClientSideShorten.po       |   8 +-
 .../fr/LC_MESSAGES/ClientSideShorten.po       |   8 +-
 .../he/LC_MESSAGES/ClientSideShorten.po       |   8 +-
 .../ia/LC_MESSAGES/ClientSideShorten.po       |   8 +-
 .../id/LC_MESSAGES/ClientSideShorten.po       |   8 +-
 .../mk/LC_MESSAGES/ClientSideShorten.po       |   8 +-
 .../nb/LC_MESSAGES/ClientSideShorten.po       |   8 +-
 .../nl/LC_MESSAGES/ClientSideShorten.po       |   8 +-
 .../ru/LC_MESSAGES/ClientSideShorten.po       |   8 +-
 .../tl/LC_MESSAGES/ClientSideShorten.po       |   8 +-
 .../uk/LC_MESSAGES/ClientSideShorten.po       |   8 +-
 .../zh_CN/LC_MESSAGES/ClientSideShorten.po    |   8 +-
 .../locale/be-tarask/LC_MESSAGES/Comet.po     |  10 +-
 plugins/Comet/locale/br/LC_MESSAGES/Comet.po  |   8 +-
 plugins/Comet/locale/de/LC_MESSAGES/Comet.po  |   8 +-
 plugins/Comet/locale/es/LC_MESSAGES/Comet.po  |   8 +-
 plugins/Comet/locale/fr/LC_MESSAGES/Comet.po  |   8 +-
 plugins/Comet/locale/he/LC_MESSAGES/Comet.po  |   8 +-
 plugins/Comet/locale/ia/LC_MESSAGES/Comet.po  |   8 +-
 plugins/Comet/locale/id/LC_MESSAGES/Comet.po  |   8 +-
 plugins/Comet/locale/mk/LC_MESSAGES/Comet.po  |   8 +-
 plugins/Comet/locale/nb/LC_MESSAGES/Comet.po  |   8 +-
 plugins/Comet/locale/nl/LC_MESSAGES/Comet.po  |   8 +-
 plugins/Comet/locale/pt/LC_MESSAGES/Comet.po  |   8 +-
 .../Comet/locale/pt_BR/LC_MESSAGES/Comet.po   |   8 +-
 plugins/Comet/locale/ru/LC_MESSAGES/Comet.po  |   8 +-
 plugins/Comet/locale/tl/LC_MESSAGES/Comet.po  |   8 +-
 plugins/Comet/locale/uk/LC_MESSAGES/Comet.po  |   8 +-
 .../Comet/locale/zh_CN/LC_MESSAGES/Comet.po   |   8 +-
 .../LC_MESSAGES/DirectionDetector.po          |  10 +-
 .../br/LC_MESSAGES/DirectionDetector.po       |   8 +-
 .../de/LC_MESSAGES/DirectionDetector.po       |   8 +-
 .../es/LC_MESSAGES/DirectionDetector.po       |   8 +-
 .../fr/LC_MESSAGES/DirectionDetector.po       |   8 +-
 .../he/LC_MESSAGES/DirectionDetector.po       |   8 +-
 .../ia/LC_MESSAGES/DirectionDetector.po       |   8 +-
 .../id/LC_MESSAGES/DirectionDetector.po       |   8 +-
 .../ja/LC_MESSAGES/DirectionDetector.po       |   8 +-
 .../lb/LC_MESSAGES/DirectionDetector.po       |   8 +-
 .../mk/LC_MESSAGES/DirectionDetector.po       |   8 +-
 .../nb/LC_MESSAGES/DirectionDetector.po       |   8 +-
 .../nl/LC_MESSAGES/DirectionDetector.po       |   8 +-
 .../pt/LC_MESSAGES/DirectionDetector.po       |   8 +-
 .../ru/LC_MESSAGES/DirectionDetector.po       |   8 +-
 .../tl/LC_MESSAGES/DirectionDetector.po       |   8 +-
 .../uk/LC_MESSAGES/DirectionDetector.po       |   8 +-
 .../zh_CN/LC_MESSAGES/DirectionDetector.po    |   8 +-
 .../locale/be-tarask/LC_MESSAGES/DiskCache.po |  10 +-
 .../locale/br/LC_MESSAGES/DiskCache.po        |   8 +-
 .../locale/de/LC_MESSAGES/DiskCache.po        |   8 +-
 .../locale/es/LC_MESSAGES/DiskCache.po        |   8 +-
 .../locale/fr/LC_MESSAGES/DiskCache.po        |   8 +-
 .../locale/he/LC_MESSAGES/DiskCache.po        |   8 +-
 .../locale/ia/LC_MESSAGES/DiskCache.po        |   8 +-
 .../locale/id/LC_MESSAGES/DiskCache.po        |   8 +-
 .../locale/mk/LC_MESSAGES/DiskCache.po        |   8 +-
 .../locale/nb/LC_MESSAGES/DiskCache.po        |   8 +-
 .../locale/nl/LC_MESSAGES/DiskCache.po        |   8 +-
 .../locale/pt/LC_MESSAGES/DiskCache.po        |   8 +-
 .../locale/pt_BR/LC_MESSAGES/DiskCache.po     |   8 +-
 .../locale/ru/LC_MESSAGES/DiskCache.po        |   8 +-
 .../locale/tl/LC_MESSAGES/DiskCache.po        |   8 +-
 .../locale/uk/LC_MESSAGES/DiskCache.po        |   8 +-
 .../locale/zh_CN/LC_MESSAGES/DiskCache.po     |   8 +-
 .../locale/be-tarask/LC_MESSAGES/Disqus.po    |  10 +-
 .../Disqus/locale/br/LC_MESSAGES/Disqus.po    |   8 +-
 .../Disqus/locale/de/LC_MESSAGES/Disqus.po    |   8 +-
 .../Disqus/locale/es/LC_MESSAGES/Disqus.po    |   8 +-
 .../Disqus/locale/fr/LC_MESSAGES/Disqus.po    |   8 +-
 .../Disqus/locale/gl/LC_MESSAGES/Disqus.po    |   8 +-
 .../Disqus/locale/ia/LC_MESSAGES/Disqus.po    |   8 +-
 .../Disqus/locale/lb/LC_MESSAGES/Disqus.po    |  43 ++++++
 .../Disqus/locale/mk/LC_MESSAGES/Disqus.po    |   8 +-
 .../Disqus/locale/nb/LC_MESSAGES/Disqus.po    |   8 +-
 .../Disqus/locale/nl/LC_MESSAGES/Disqus.po    |   8 +-
 .../Disqus/locale/ru/LC_MESSAGES/Disqus.po    |   8 +-
 .../Disqus/locale/te/LC_MESSAGES/Disqus.po    |   8 +-
 .../Disqus/locale/tl/LC_MESSAGES/Disqus.po    |   8 +-
 .../Disqus/locale/uk/LC_MESSAGES/Disqus.po    |   8 +-
 .../Disqus/locale/zh_CN/LC_MESSAGES/Disqus.po |   8 +-
 .../Echo/locale/be-tarask/LC_MESSAGES/Echo.po |  10 +-
 plugins/Echo/locale/br/LC_MESSAGES/Echo.po    |   8 +-
 plugins/Echo/locale/de/LC_MESSAGES/Echo.po    |   8 +-
 plugins/Echo/locale/es/LC_MESSAGES/Echo.po    |   8 +-
 plugins/Echo/locale/fi/LC_MESSAGES/Echo.po    |   8 +-
 plugins/Echo/locale/fr/LC_MESSAGES/Echo.po    |   8 +-
 plugins/Echo/locale/he/LC_MESSAGES/Echo.po    |   8 +-
 plugins/Echo/locale/ia/LC_MESSAGES/Echo.po    |   8 +-
 plugins/Echo/locale/id/LC_MESSAGES/Echo.po    |   8 +-
 plugins/Echo/locale/lb/LC_MESSAGES/Echo.po    |   8 +-
 plugins/Echo/locale/mk/LC_MESSAGES/Echo.po    |   8 +-
 plugins/Echo/locale/nb/LC_MESSAGES/Echo.po    |   8 +-
 plugins/Echo/locale/nl/LC_MESSAGES/Echo.po    |   8 +-
 plugins/Echo/locale/pt/LC_MESSAGES/Echo.po    |   8 +-
 plugins/Echo/locale/pt_BR/LC_MESSAGES/Echo.po |   8 +-
 plugins/Echo/locale/ru/LC_MESSAGES/Echo.po    |   8 +-
 plugins/Echo/locale/tl/LC_MESSAGES/Echo.po    |   8 +-
 plugins/Echo/locale/uk/LC_MESSAGES/Echo.po    |   8 +-
 plugins/Echo/locale/zh_CN/LC_MESSAGES/Echo.po |   8 +-
 .../LC_MESSAGES/EmailAuthentication.po        |  10 +-
 .../br/LC_MESSAGES/EmailAuthentication.po     |   8 +-
 .../de/LC_MESSAGES/EmailAuthentication.po     |   8 +-
 .../es/LC_MESSAGES/EmailAuthentication.po     |   8 +-
 .../fr/LC_MESSAGES/EmailAuthentication.po     |   8 +-
 .../he/LC_MESSAGES/EmailAuthentication.po     |   8 +-
 .../ia/LC_MESSAGES/EmailAuthentication.po     |   8 +-
 .../id/LC_MESSAGES/EmailAuthentication.po     |   8 +-
 .../ja/LC_MESSAGES/EmailAuthentication.po     |   8 +-
 .../mk/LC_MESSAGES/EmailAuthentication.po     |   8 +-
 .../nb/LC_MESSAGES/EmailAuthentication.po     |   8 +-
 .../nl/LC_MESSAGES/EmailAuthentication.po     |   8 +-
 .../pt/LC_MESSAGES/EmailAuthentication.po     |   8 +-
 .../pt_BR/LC_MESSAGES/EmailAuthentication.po  |   8 +-
 .../ru/LC_MESSAGES/EmailAuthentication.po     |   8 +-
 .../tl/LC_MESSAGES/EmailAuthentication.po     |   8 +-
 .../uk/LC_MESSAGES/EmailAuthentication.po     |   8 +-
 .../zh_CN/LC_MESSAGES/EmailAuthentication.po  |   8 +-
 .../be-tarask/LC_MESSAGES/EmailSummary.po     |  10 +-
 .../locale/br/LC_MESSAGES/EmailSummary.po     |   8 +-
 .../locale/fr/LC_MESSAGES/EmailSummary.po     |   8 +-
 .../locale/he/LC_MESSAGES/EmailSummary.po     |   8 +-
 .../locale/ia/LC_MESSAGES/EmailSummary.po     |   8 +-
 .../locale/id/LC_MESSAGES/EmailSummary.po     |   8 +-
 .../locale/mk/LC_MESSAGES/EmailSummary.po     |   8 +-
 .../locale/nl/LC_MESSAGES/EmailSummary.po     |   8 +-
 .../locale/ru/LC_MESSAGES/EmailSummary.po     |   8 +-
 .../locale/uk/LC_MESSAGES/EmailSummary.po     |   8 +-
 .../locale/be-tarask/LC_MESSAGES/Facebook.po  |  38 ++---
 .../locale/br/LC_MESSAGES/Facebook.po         |  10 +-
 .../locale/de/LC_MESSAGES/Facebook.po         |   8 +-
 .../locale/es/LC_MESSAGES/Facebook.po         |   8 +-
 .../locale/fr/LC_MESSAGES/Facebook.po         |   8 +-
 .../locale/gl/LC_MESSAGES/Facebook.po         |   8 +-
 .../locale/ia/LC_MESSAGES/Facebook.po         |   8 +-
 .../locale/mk/LC_MESSAGES/Facebook.po         |  10 +-
 .../locale/nb/LC_MESSAGES/Facebook.po         |   8 +-
 .../locale/nl/LC_MESSAGES/Facebook.po         |   8 +-
 .../locale/pt_BR/LC_MESSAGES/Facebook.po      |   8 +-
 .../locale/tl/LC_MESSAGES/Facebook.po         |   8 +-
 .../locale/uk/LC_MESSAGES/Facebook.po         |   8 +-
 .../locale/vi/LC_MESSAGES/Facebook.po         |   8 +-
 .../locale/zh_CN/LC_MESSAGES/Facebook.po      |   8 +-
 .../FacebookBridge/locale/FacebookBridge.pot  |  14 +-
 .../locale/br/LC_MESSAGES/FacebookBridge.po   |  32 ++--
 .../locale/ca/LC_MESSAGES/FacebookBridge.po   | 102 +++++++------
 .../locale/ia/LC_MESSAGES/FacebookBridge.po   |  22 +--
 .../locale/mk/LC_MESSAGES/FacebookBridge.po   |  22 +--
 .../locale/nl/LC_MESSAGES/FacebookBridge.po   |  22 +--
 .../locale/uk/LC_MESSAGES/FacebookBridge.po   |  22 +--
 .../locale/br/LC_MESSAGES/ForceGroup.po       |  36 +++++
 .../locale/fr/LC_MESSAGES/InProcessCache.po   |  26 ++++
 .../locale/ia/LC_MESSAGES/InProcessCache.po   |  26 ++++
 .../locale/mk/LC_MESSAGES/InProcessCache.po   |  26 ++++
 .../locale/nl/LC_MESSAGES/InProcessCache.po   |  26 ++++
 .../locale/ru/LC_MESSAGES/InProcessCache.po   |  27 ++++
 .../locale/uk/LC_MESSAGES/InProcessCache.po   |  27 ++++
 .../locale/br/LC_MESSAGES/Mapstraction.po     |  10 +-
 .../locale/bg/LC_MESSAGES/MobileProfile.po    |  78 ++++++++++
 plugins/NewMenu/locale/NewMenu.pot            |  93 ++++++++++++
 plugins/OStatus/locale/OStatus.pot            | 128 ++++++++--------
 .../OStatus/locale/br/LC_MESSAGES/OStatus.po  | 142 +++++++++---------
 .../OStatus/locale/fr/LC_MESSAGES/OStatus.po  | 134 ++++++++---------
 .../OStatus/locale/gl/LC_MESSAGES/OStatus.po  | 134 ++++++++---------
 .../OStatus/locale/ia/LC_MESSAGES/OStatus.po  | 134 ++++++++---------
 .../OStatus/locale/mk/LC_MESSAGES/OStatus.po  | 134 ++++++++---------
 .../OStatus/locale/nl/LC_MESSAGES/OStatus.po  | 134 ++++++++---------
 .../OStatus/locale/uk/LC_MESSAGES/OStatus.po  | 134 ++++++++---------
 .../ca/LC_MESSAGES/PoweredByStatusNet.po      |  40 +++++
 .../ru/LC_MESSAGES/PoweredByStatusNet.po      |  12 +-
 .../PtitUrl/locale/gl/LC_MESSAGES/PtitUrl.po  |  29 ++++
 .../locale/de/LC_MESSAGES/RSSCloud.po         |  77 ++++++++++
 .../locale/ca/LC_MESSAGES/Realtime.po         |  58 +++++++
 .../locale/lb/LC_MESSAGES/Realtime.po         |  58 +++++++
 plugins/SQLProfile/locale/SQLProfile.pot      |  21 +++
 .../locale/ca/LC_MESSAGES/ShareNotice.po      |  55 +++++++
 .../locale/gl/LC_MESSAGES/SimpleUrl.po        |  29 ++++
 .../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        |   8 +-
 .../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 +-
 .../ru/LC_MESSAGES/SubscriptionThrottle.po    |   8 +-
 .../tl/LC_MESSAGES/SubscriptionThrottle.po    |   8 +-
 .../uk/LC_MESSAGES/SubscriptionThrottle.po    |   8 +-
 .../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 +-
 .../locale/de/LC_MESSAGES/TightUrl.po         |   8 +-
 .../locale/es/LC_MESSAGES/TightUrl.po         |   8 +-
 .../locale/fr/LC_MESSAGES/TightUrl.po         |   8 +-
 .../locale/gl/LC_MESSAGES/TightUrl.po         |  29 ++++
 .../locale/he/LC_MESSAGES/TightUrl.po         |   8 +-
 .../locale/ia/LC_MESSAGES/TightUrl.po         |   8 +-
 .../locale/id/LC_MESSAGES/TightUrl.po         |   8 +-
 .../locale/ja/LC_MESSAGES/TightUrl.po         |   8 +-
 .../locale/mk/LC_MESSAGES/TightUrl.po         |   8 +-
 .../locale/nb/LC_MESSAGES/TightUrl.po         |   8 +-
 .../locale/nl/LC_MESSAGES/TightUrl.po         |   8 +-
 .../locale/pt_BR/LC_MESSAGES/TightUrl.po      |   8 +-
 .../locale/ru/LC_MESSAGES/TightUrl.po         |   8 +-
 .../locale/tl/LC_MESSAGES/TightUrl.po         |   8 +-
 .../locale/uk/LC_MESSAGES/TightUrl.po         |   8 +-
 .../TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po  |  28 ++++
 .../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 +-
 .../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 +-
 .../locale/br/LC_MESSAGES/TwitterBridge.po    |  12 +-
 .../locale/ca/LC_MESSAGES/TwitterBridge.po    |   8 +-
 .../locale/fa/LC_MESSAGES/TwitterBridge.po    |   8 +-
 .../locale/fr/LC_MESSAGES/TwitterBridge.po    |   8 +-
 .../locale/gl/LC_MESSAGES/TwitterBridge.po    |   8 +-
 .../locale/ia/LC_MESSAGES/TwitterBridge.po    |   8 +-
 .../locale/mk/LC_MESSAGES/TwitterBridge.po    |  10 +-
 .../locale/nl/LC_MESSAGES/TwitterBridge.po    |   8 +-
 .../locale/tr/LC_MESSAGES/TwitterBridge.po    |   8 +-
 .../locale/uk/LC_MESSAGES/TwitterBridge.po    |   8 +-
 .../locale/zh_CN/LC_MESSAGES/TwitterBridge.po |   8 +-
 .../locale/br/LC_MESSAGES/UserFlag.po         |   8 +-
 .../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         | 112 ++++++++++++++
 .../locale/uk/LC_MESSAGES/UserFlag.po         |   8 +-
 .../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 +-
 .../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_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 +-
 .../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 +-
 .../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_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 +-
 .../locale/br/LC_MESSAGES/YammerImport.po     |  10 +-
 .../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 +-
 405 files changed, 3521 insertions(+), 2133 deletions(-)
 create mode 100644 plugins/Adsense/locale/lb/LC_MESSAGES/Adsense.po
 create mode 100644 plugins/Awesomeness/locale/be-tarask/LC_MESSAGES/Awesomeness.po
 create mode 100644 plugins/Awesomeness/locale/fr/LC_MESSAGES/Awesomeness.po
 create mode 100644 plugins/Awesomeness/locale/ia/LC_MESSAGES/Awesomeness.po
 create mode 100644 plugins/Awesomeness/locale/mk/LC_MESSAGES/Awesomeness.po
 create mode 100644 plugins/Awesomeness/locale/nl/LC_MESSAGES/Awesomeness.po
 create mode 100644 plugins/Awesomeness/locale/ru/LC_MESSAGES/Awesomeness.po
 create mode 100644 plugins/Awesomeness/locale/uk/LC_MESSAGES/Awesomeness.po
 create mode 100644 plugins/Bookmark/locale/Bookmark.pot
 create mode 100644 plugins/CasAuthentication/locale/br/LC_MESSAGES/CasAuthentication.po
 create mode 100644 plugins/Disqus/locale/lb/LC_MESSAGES/Disqus.po
 create mode 100644 plugins/ForceGroup/locale/br/LC_MESSAGES/ForceGroup.po
 create mode 100644 plugins/InProcessCache/locale/fr/LC_MESSAGES/InProcessCache.po
 create mode 100644 plugins/InProcessCache/locale/ia/LC_MESSAGES/InProcessCache.po
 create mode 100644 plugins/InProcessCache/locale/mk/LC_MESSAGES/InProcessCache.po
 create mode 100644 plugins/InProcessCache/locale/nl/LC_MESSAGES/InProcessCache.po
 create mode 100644 plugins/InProcessCache/locale/ru/LC_MESSAGES/InProcessCache.po
 create mode 100644 plugins/InProcessCache/locale/uk/LC_MESSAGES/InProcessCache.po
 create mode 100644 plugins/MobileProfile/locale/bg/LC_MESSAGES/MobileProfile.po
 create mode 100644 plugins/NewMenu/locale/NewMenu.pot
 create mode 100644 plugins/PoweredByStatusNet/locale/ca/LC_MESSAGES/PoweredByStatusNet.po
 create mode 100644 plugins/PtitUrl/locale/gl/LC_MESSAGES/PtitUrl.po
 create mode 100644 plugins/RSSCloud/locale/de/LC_MESSAGES/RSSCloud.po
 create mode 100644 plugins/Realtime/locale/ca/LC_MESSAGES/Realtime.po
 create mode 100644 plugins/Realtime/locale/lb/LC_MESSAGES/Realtime.po
 create mode 100644 plugins/SQLProfile/locale/SQLProfile.pot
 create mode 100644 plugins/ShareNotice/locale/ca/LC_MESSAGES/ShareNotice.po
 create mode 100644 plugins/SimpleUrl/locale/gl/LC_MESSAGES/SimpleUrl.po
 create mode 100644 plugins/TightUrl/locale/gl/LC_MESSAGES/TightUrl.po
 create mode 100644 plugins/TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po
 create mode 100644 plugins/UserFlag/locale/ru/LC_MESSAGES/UserFlag.po

diff --git a/plugins/APC/locale/be-tarask/LC_MESSAGES/APC.po b/plugins/APC/locale/be-tarask/LC_MESSAGES/APC.po
index bf8ac0c1ff..6c0f3ee90c 100644
--- a/plugins/APC/locale/be-tarask/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/be-tarask/LC_MESSAGES/APC.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - APC to Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
+# Translation of StatusNet - APC to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
 # Expored from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:29+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:43+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: 2010-11-29 19:38:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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"
diff --git a/plugins/Adsense/locale/be-tarask/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/be-tarask/LC_MESSAGES/Adsense.po
index 114231d779..5214fbf141 100644
--- a/plugins/Adsense/locale/be-tarask/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/be-tarask/LC_MESSAGES/Adsense.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Adsense to Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
+# Translation of StatusNet - Adsense to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
 # Expored from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:23+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 20:40:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:56+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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"
diff --git a/plugins/Adsense/locale/gl/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/gl/LC_MESSAGES/Adsense.po
index 3109ce0005..f3288ab509 100644
--- a/plugins/Adsense/locale/gl/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/gl/LC_MESSAGES/Adsense.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:26+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 20:40:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:56+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
@@ -78,7 +78,7 @@ msgstr ""
 
 #: adsenseadminpanel.php:188
 msgid "Leaderboard"
-msgstr ""
+msgstr "Taboleiro de logros"
 
 #: adsenseadminpanel.php:189
 msgid "Leaderboard slot code"
diff --git a/plugins/Adsense/locale/lb/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/lb/LC_MESSAGES/Adsense.po
new file mode 100644
index 0000000000..8126640244
--- /dev/null
+++ b/plugins/Adsense/locale/lb/LC_MESSAGES/Adsense.po
@@ -0,0 +1,101 @@
+# Translation of StatusNet - Adsense to Luxembourgish (Lëtzebuergesch)
+# Expored from translatewiki.net
+#
+# Author: Robby
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Adsense\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:40+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:25:56+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: lb\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 Astellungen"
+
+#. TRANS: Menu item for site administration
+#: AdsensePlugin.php:196
+msgid "AdSense"
+msgstr ""
+
+#: AdsensePlugin.php:209
+msgid "Plugin to add Google AdSense to StatusNet sites."
+msgstr ""
+
+#: adsenseadminpanel.php:52
+msgctxt "TITLE"
+msgid "AdSense"
+msgstr ""
+
+#: adsenseadminpanel.php:62
+msgid "AdSense settings for this StatusNet site"
+msgstr ""
+
+#: adsenseadminpanel.php:164
+msgid "Client ID"
+msgstr ""
+
+#: adsenseadminpanel.php:165
+msgid "Google client ID"
+msgstr ""
+
+#: 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 "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 "Vertikale Banner"
+
+#: adsenseadminpanel.php:195
+msgid "Wide skyscraper slot code"
+msgstr ""
+
+#: adsenseadminpanel.php:208
+msgid "Save"
+msgstr "Späicheren"
+
+#: adsenseadminpanel.php:208
+msgid "Save AdSense settings"
+msgstr "AdSense-Astellunge späicheren"
diff --git a/plugins/AnonymousFave/locale/be-tarask/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/be-tarask/LC_MESSAGES/AnonymousFave.po
index 7ca33b65e8..2bbc454eee 100644
--- a/plugins/AnonymousFave/locale/be-tarask/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/be-tarask/LC_MESSAGES/AnonymousFave.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - AnonymousFave to Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
+# Translation of StatusNet - AnonymousFave to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
 # Expored from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:28+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:42+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: 2010-11-29 19:38:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:56+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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"
diff --git a/plugins/AutoSandbox/locale/be-tarask/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/be-tarask/LC_MESSAGES/AutoSandbox.po
index 14498824fc..8404811696 100644
--- a/plugins/AutoSandbox/locale/be-tarask/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/be-tarask/LC_MESSAGES/AutoSandbox.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - AutoSandbox to Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
+# Translation of StatusNet - AutoSandbox to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
 # Expored from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:30+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:38:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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"
diff --git a/plugins/Autocomplete/locale/be-tarask/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/be-tarask/LC_MESSAGES/Autocomplete.po
index 24f846e228..dd840b9804 100644
--- a/plugins/Autocomplete/locale/be-tarask/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/be-tarask/LC_MESSAGES/Autocomplete.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Autocomplete to Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
+# Translation of StatusNet - Autocomplete to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
 # Expored from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:30+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:43+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: 2010-11-29 19:38:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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"
diff --git a/plugins/Awesomeness/locale/be-tarask/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/be-tarask/LC_MESSAGES/Awesomeness.po
new file mode 100644
index 0000000000..55bc46c747
--- /dev/null
+++ b/plugins/Awesomeness/locale/be-tarask/LC_MESSAGES/Awesomeness.po
@@ -0,0 +1,32 @@
+# Translation of StatusNet - Awesomeness to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
+# Expored from translatewiki.net
+#
+# Author: EugeneZelenko
+# --
+# 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-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:45+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-10 18:25:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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
+#, fuzzy
+msgid ""
+"The Awesomeness plugin adds aditional awesomeness to a StatusNet "
+"installation."
+msgstr ""
+"Дапаўненьне Awesomeness дадае незвычайныя магчымасьці ў усталяваньне "
+"StatusNet."
diff --git a/plugins/Awesomeness/locale/fr/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/fr/LC_MESSAGES/Awesomeness.po
new file mode 100644
index 0000000000..9e75b27bd8
--- /dev/null
+++ b/plugins/Awesomeness/locale/fr/LC_MESSAGES/Awesomeness.po
@@ -0,0 +1,31 @@
+# Translation of StatusNet - Awesomeness to French (Français)
+# Expored from translatewiki.net
+#
+# Author: Sherbrooke
+# --
+# 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-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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-01-10 18:25:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: fr\n"
+"X-Message-Group: #out-statusnet-plugin-awesomeness\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: AwesomenessPlugin.php:56
+#, fuzzy
+msgid ""
+"The Awesomeness plugin adds aditional awesomeness to a StatusNet "
+"installation."
+msgstr ""
+"Le plugin Awesomeness ajoute des suppléments impressionnants à une "
+"installation de StatusNet."
diff --git a/plugins/Awesomeness/locale/ia/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/ia/LC_MESSAGES/Awesomeness.po
new file mode 100644
index 0000000000..e4954f4299
--- /dev/null
+++ b/plugins/Awesomeness/locale/ia/LC_MESSAGES/Awesomeness.po
@@ -0,0 +1,31 @@
+# Translation of StatusNet - Awesomeness to Interlingua (Interlingua)
+# Expored from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Awesomeness\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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-10 18:25:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-awesomeness\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: AwesomenessPlugin.php:56
+#, fuzzy
+msgid ""
+"The Awesomeness plugin adds aditional awesomeness to a StatusNet "
+"installation."
+msgstr ""
+"Le plug-in Awesomeness rende un installation de StatusNet plus "
+"impressionante."
diff --git a/plugins/Awesomeness/locale/mk/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/mk/LC_MESSAGES/Awesomeness.po
new file mode 100644
index 0000000000..8894e66a5a
--- /dev/null
+++ b/plugins/Awesomeness/locale/mk/LC_MESSAGES/Awesomeness.po
@@ -0,0 +1,31 @@
+# Translation of StatusNet - Awesomeness to Macedonian (Македонски)
+# Expored from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Awesomeness\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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-10 18:25:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-awesomeness\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+#: AwesomenessPlugin.php:56
+#, fuzzy
+msgid ""
+"The Awesomeness plugin adds aditional awesomeness to a StatusNet "
+"installation."
+msgstr ""
+"Приклучокот „Феноменалност“ ѝ дава дополнителна феноменалност на "
+"инсталацијата на StatusNet."
diff --git a/plugins/Awesomeness/locale/nl/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/nl/LC_MESSAGES/Awesomeness.po
new file mode 100644
index 0000000000..390202bf99
--- /dev/null
+++ b/plugins/Awesomeness/locale/nl/LC_MESSAGES/Awesomeness.po
@@ -0,0 +1,31 @@
+# Translation of StatusNet - Awesomeness to Dutch (Nederlands)
+# Expored from translatewiki.net
+#
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Awesomeness\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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-10 18:25:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-awesomeness\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: AwesomenessPlugin.php:56
+#, fuzzy
+msgid ""
+"The Awesomeness plugin adds aditional awesomeness to a StatusNet "
+"installation."
+msgstr ""
+"De Awesomenessplug-in voegt extra awesomeness toe aan een "
+"StatusNetinstallatie."
diff --git a/plugins/Awesomeness/locale/ru/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/ru/LC_MESSAGES/Awesomeness.po
new file mode 100644
index 0000000000..772da076cb
--- /dev/null
+++ b/plugins/Awesomeness/locale/ru/LC_MESSAGES/Awesomeness.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - Awesomeness to Russian (Русский)
+# Expored from translatewiki.net
+#
+# Author: Александр Сигачёв
+# --
+# 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-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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-10 18:25:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ru\n"
+"X-Message-Group: #out-statusnet-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
+#, fuzzy
+msgid ""
+"The Awesomeness plugin adds aditional awesomeness to a StatusNet "
+"installation."
+msgstr "Потрясающий плагин добавляет потрясающие вещи в StatusNet."
diff --git a/plugins/Awesomeness/locale/uk/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/uk/LC_MESSAGES/Awesomeness.po
new file mode 100644
index 0000000000..853595785c
--- /dev/null
+++ b/plugins/Awesomeness/locale/uk/LC_MESSAGES/Awesomeness.po
@@ -0,0 +1,32 @@
+# Translation of StatusNet - Awesomeness to Ukrainian (Українська)
+# Expored from translatewiki.net
+#
+# Author: Boogie
+# --
+# 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-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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-10 18:25:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-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
+#, fuzzy
+msgid ""
+"The Awesomeness plugin adds aditional awesomeness to a StatusNet "
+"installation."
+msgstr ""
+"Напрочуд дивовижний додаток додає додаткову напрочуд дивовижну "
+"функціональність до вашої інсталяції StatusNet."
diff --git a/plugins/BitlyUrl/locale/be-tarask/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/be-tarask/LC_MESSAGES/BitlyUrl.po
index 597fa221e5..57288dad56 100644
--- a/plugins/BitlyUrl/locale/be-tarask/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/be-tarask/LC_MESSAGES/BitlyUrl.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BitlyUrl to Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
+# Translation of StatusNet - BitlyUrl to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
 # Expored from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:32+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:46+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: 2010-11-30 20:40:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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"
diff --git a/plugins/BitlyUrl/locale/gl/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/gl/LC_MESSAGES/BitlyUrl.po
index bdd6a3f737..7579d59f1b 100644
--- a/plugins/BitlyUrl/locale/gl/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/gl/LC_MESSAGES/BitlyUrl.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:32+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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-POT-Import-Date: 2010-11-30 20:40:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
@@ -29,6 +29,8 @@ 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>."
 
 #: BitlyUrlPlugin.php:216
 msgid "bit.ly"
diff --git a/plugins/BitlyUrl/locale/ru/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/ru/LC_MESSAGES/BitlyUrl.po
index 7df515cf34..1c32944812 100644
--- a/plugins/BitlyUrl/locale/ru/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/ru/LC_MESSAGES/BitlyUrl.po
@@ -3,6 +3,7 @@
 #
 # Author: Eleferen
 # Author: Lockal
+# Author: Александр Сигачёв
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -10,13 +11,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:32+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:46+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: 2010-11-30 20:40:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
@@ -25,7 +26,7 @@ msgstr ""
 
 #: BitlyUrlPlugin.php:48
 msgid "You must specify a serviceUrl for bit.ly shortening."
-msgstr ""
+msgstr "Вы должны указать serviceUrl для bit.ly сокращений."
 
 #: BitlyUrlPlugin.php:175
 #, php-format
diff --git a/plugins/BitlyUrl/locale/uk/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/uk/LC_MESSAGES/BitlyUrl.po
index 74b7903896..eb45c857ed 100644
--- a/plugins/BitlyUrl/locale/uk/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/uk/LC_MESSAGES/BitlyUrl.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:32+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 20:40:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
diff --git a/plugins/Blacklist/locale/be-tarask/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/be-tarask/LC_MESSAGES/Blacklist.po
index c98f7863e3..19d02bdd9a 100644
--- a/plugins/Blacklist/locale/be-tarask/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/be-tarask/LC_MESSAGES/Blacklist.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Blacklist to Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
+# Translation of StatusNet - Blacklist to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
 # Expored from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:34+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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"
diff --git a/plugins/Blacklist/locale/br/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/br/LC_MESSAGES/Blacklist.po
index a6b1def150..6320720dd1 100644
--- a/plugins/Blacklist/locale/br/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/br/LC_MESSAGES/Blacklist.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:34+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
@@ -59,13 +59,13 @@ msgstr ""
 #: BlacklistPlugin.php:381
 msgctxt "MENU"
 msgid "Blacklist"
-msgstr ""
+msgstr "Roll zu"
 
 #. TRANS: Tooltip for menu item in admin panel.
 #: BlacklistPlugin.php:383
 msgctxt "TOOLTIP"
 msgid "Blacklist configuration"
-msgstr ""
+msgstr "Kefluniadur ar roll zu"
 
 #. TRANS: Checkbox with text label in the delete user form.
 #: BlacklistPlugin.php:410
@@ -92,13 +92,13 @@ 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
+#, php-format
 msgid "Can't subscribe to nickname \"%s\"."
-msgstr "Ne c'hellit ket implij al lesanv \"%s\"."
+msgstr "Ne c'hellit ket en em enskrivañ gant al lesanv \"%s\"."
 
 #: blacklistadminpanel.php:52
 msgid "Blacklist"
-msgstr ""
+msgstr "Roll zu"
 
 #: blacklistadminpanel.php:62
 msgid "Blacklisted URLs and nicknames"
diff --git a/plugins/BlankAd/locale/be-tarask/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/be-tarask/LC_MESSAGES/BlankAd.po
index 20b984860c..10f142c88c 100644
--- a/plugins/BlankAd/locale/be-tarask/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/be-tarask/LC_MESSAGES/BlankAd.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BlankAd to Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
+# Translation of StatusNet - BlankAd to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
 # Expored from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:34+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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"
diff --git a/plugins/BlankAd/locale/br/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/br/LC_MESSAGES/BlankAd.po
index 11173c92d2..7d4547a0e2 100644
--- a/plugins/BlankAd/locale/br/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/br/LC_MESSAGES/BlankAd.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:34+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlankAd/locale/de/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/de/LC_MESSAGES/BlankAd.po
index 30f2e7765f..2cdc4a9df7 100644
--- a/plugins/BlankAd/locale/de/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/de/LC_MESSAGES/BlankAd.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:34+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlankAd/locale/es/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/es/LC_MESSAGES/BlankAd.po
index d47d009133..6e64f7fb2e 100644
--- a/plugins/BlankAd/locale/es/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/es/LC_MESSAGES/BlankAd.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:34+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:49+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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlankAd/locale/fr/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/fr/LC_MESSAGES/BlankAd.po
index c6507e3ce3..7c9892c152 100644
--- a/plugins/BlankAd/locale/fr/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/fr/LC_MESSAGES/BlankAd.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:35+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlankAd/locale/he/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/he/LC_MESSAGES/BlankAd.po
index fb2d05de90..0444e0b9d8 100644
--- a/plugins/BlankAd/locale/he/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/he/LC_MESSAGES/BlankAd.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:35+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlankAd/locale/ia/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/ia/LC_MESSAGES/BlankAd.po
index 49aff4da5a..80d2103e80 100644
--- a/plugins/BlankAd/locale/ia/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/ia/LC_MESSAGES/BlankAd.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:35+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlankAd/locale/mk/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/mk/LC_MESSAGES/BlankAd.po
index ec4aa3e95f..91c08e9ec4 100644
--- a/plugins/BlankAd/locale/mk/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/mk/LC_MESSAGES/BlankAd.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:35+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlankAd/locale/nb/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/nb/LC_MESSAGES/BlankAd.po
index 7566058e64..be02bf3d01 100644
--- a/plugins/BlankAd/locale/nb/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/nb/LC_MESSAGES/BlankAd.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:35+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:49+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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlankAd/locale/nl/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/nl/LC_MESSAGES/BlankAd.po
index 7b18aced13..bbd3658c1a 100644
--- a/plugins/BlankAd/locale/nl/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/nl/LC_MESSAGES/BlankAd.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:35+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlankAd/locale/pt/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/pt/LC_MESSAGES/BlankAd.po
index 80935f68cb..522f170aa9 100644
--- a/plugins/BlankAd/locale/pt/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/pt/LC_MESSAGES/BlankAd.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:35+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlankAd/locale/ru/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/ru/LC_MESSAGES/BlankAd.po
index a7e3919052..a54a59d6f6 100644
--- a/plugins/BlankAd/locale/ru/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/ru/LC_MESSAGES/BlankAd.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:35+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlankAd/locale/tl/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/tl/LC_MESSAGES/BlankAd.po
index bb8512b21e..105d345f26 100644
--- a/plugins/BlankAd/locale/tl/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/tl/LC_MESSAGES/BlankAd.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:35+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlankAd/locale/uk/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/uk/LC_MESSAGES/BlankAd.po
index 483809c1f9..59cb404b7c 100644
--- a/plugins/BlankAd/locale/uk/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/uk/LC_MESSAGES/BlankAd.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:35+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlankAd/locale/zh_CN/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/zh_CN/LC_MESSAGES/BlankAd.po
index e7ac577d07..cbb95f58ff 100644
--- a/plugins/BlankAd/locale/zh_CN/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/zh_CN/LC_MESSAGES/BlankAd.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:35+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlogspamNet/locale/be-tarask/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/be-tarask/LC_MESSAGES/BlogspamNet.po
index d5429781a6..ef9ac94515 100644
--- a/plugins/BlogspamNet/locale/be-tarask/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/be-tarask/LC_MESSAGES/BlogspamNet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - BlogspamNet to Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
+# Translation of StatusNet - BlogspamNet to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
 # Expored from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:35+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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"
diff --git a/plugins/BlogspamNet/locale/br/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/br/LC_MESSAGES/BlogspamNet.po
index 89ce628462..5963bc442b 100644
--- a/plugins/BlogspamNet/locale/br/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/br/LC_MESSAGES/BlogspamNet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:35+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/BlogspamNet/locale/de/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/de/LC_MESSAGES/BlogspamNet.po
index eca760eb96..0935a0e406 100644
--- a/plugins/BlogspamNet/locale/de/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/de/LC_MESSAGES/BlogspamNet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:35+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/BlogspamNet/locale/es/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/es/LC_MESSAGES/BlogspamNet.po
index 17848d8317..99ad3a5fe4 100644
--- a/plugins/BlogspamNet/locale/es/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/es/LC_MESSAGES/BlogspamNet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:35+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:49+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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/BlogspamNet/locale/fr/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/fr/LC_MESSAGES/BlogspamNet.po
index 3cdc3d359e..9ba1425208 100644
--- a/plugins/BlogspamNet/locale/fr/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/fr/LC_MESSAGES/BlogspamNet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:35+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/BlogspamNet/locale/he/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/he/LC_MESSAGES/BlogspamNet.po
index a31da991e8..5fada49f8d 100644
--- a/plugins/BlogspamNet/locale/he/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/he/LC_MESSAGES/BlogspamNet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:35+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/BlogspamNet/locale/ia/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/ia/LC_MESSAGES/BlogspamNet.po
index 55e70da8f6..d5fe8f9515 100644
--- a/plugins/BlogspamNet/locale/ia/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/ia/LC_MESSAGES/BlogspamNet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:35+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/BlogspamNet/locale/mk/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/mk/LC_MESSAGES/BlogspamNet.po
index aff816d35a..a691006ba3 100644
--- a/plugins/BlogspamNet/locale/mk/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/mk/LC_MESSAGES/BlogspamNet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:35+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/BlogspamNet/locale/nb/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/nb/LC_MESSAGES/BlogspamNet.po
index 637b545610..8abc4a6e2a 100644
--- a/plugins/BlogspamNet/locale/nb/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/nb/LC_MESSAGES/BlogspamNet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:35+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:49+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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/BlogspamNet/locale/nl/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/nl/LC_MESSAGES/BlogspamNet.po
index 5c0ffdec74..8357ac1cf7 100644
--- a/plugins/BlogspamNet/locale/nl/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/nl/LC_MESSAGES/BlogspamNet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:35+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/BlogspamNet/locale/pt/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/pt/LC_MESSAGES/BlogspamNet.po
index 9dce9d08c8..00c9160a53 100644
--- a/plugins/BlogspamNet/locale/pt/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/pt/LC_MESSAGES/BlogspamNet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:35+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/BlogspamNet/locale/ru/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/ru/LC_MESSAGES/BlogspamNet.po
index 7110e646f4..ccc8fb0ee3 100644
--- a/plugins/BlogspamNet/locale/ru/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/ru/LC_MESSAGES/BlogspamNet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:35+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/BlogspamNet/locale/tl/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/tl/LC_MESSAGES/BlogspamNet.po
index 36dc0e0a18..372b200fa6 100644
--- a/plugins/BlogspamNet/locale/tl/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/tl/LC_MESSAGES/BlogspamNet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:35+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/BlogspamNet/locale/uk/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/uk/LC_MESSAGES/BlogspamNet.po
index 780794f43b..639fefa3fc 100644
--- a/plugins/BlogspamNet/locale/uk/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/uk/LC_MESSAGES/BlogspamNet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:36+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/BlogspamNet/locale/zh_CN/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/zh_CN/LC_MESSAGES/BlogspamNet.po
index 9a9814a7c8..f1fd6f092c 100644
--- a/plugins/BlogspamNet/locale/zh_CN/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/zh_CN/LC_MESSAGES/BlogspamNet.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:36+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/Bookmark/locale/Bookmark.pot b/plugins/Bookmark/locale/Bookmark.pot
new file mode 100644
index 0000000000..fa76e9d0b6
--- /dev/null
+++ b/plugins/Bookmark/locale/Bookmark.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-01-14 10:29+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"
+
+#: bookmarkform.php:162
+msgctxt "BUTTON"
+msgid "Save"
+msgstr ""
+
+#: importdelicious.php:340
+msgctxt "BUTTON"
+msgid "Upload"
+msgstr ""
+
+#: BookmarkPlugin.php:458
+msgid "Simple extension for supporting bookmarks."
+msgstr ""
diff --git a/plugins/CacheLog/locale/be-tarask/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/be-tarask/LC_MESSAGES/CacheLog.po
index 2d5a897b53..8b9a451044 100644
--- a/plugins/CacheLog/locale/be-tarask/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/be-tarask/LC_MESSAGES/CacheLog.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - CacheLog to Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
+# Translation of StatusNet - CacheLog to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
 # Expored from translatewiki.net
 #
 # Author: Jim-by
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:36+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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"
diff --git a/plugins/CacheLog/locale/br/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/br/LC_MESSAGES/CacheLog.po
index 8f79259d84..1b2962f6a0 100644
--- a/plugins/CacheLog/locale/br/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/br/LC_MESSAGES/CacheLog.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:36+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
diff --git a/plugins/CacheLog/locale/es/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/es/LC_MESSAGES/CacheLog.po
index 0872e2f038..f859729f13 100644
--- a/plugins/CacheLog/locale/es/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/es/LC_MESSAGES/CacheLog.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:36+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
diff --git a/plugins/CacheLog/locale/fr/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/fr/LC_MESSAGES/CacheLog.po
index d2ef629446..454cc16f40 100644
--- a/plugins/CacheLog/locale/fr/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/fr/LC_MESSAGES/CacheLog.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:36+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
diff --git a/plugins/CacheLog/locale/he/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/he/LC_MESSAGES/CacheLog.po
index ab80cdc0ca..f9bed9f77d 100644
--- a/plugins/CacheLog/locale/he/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/he/LC_MESSAGES/CacheLog.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:36+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:50+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: 2010-11-29 19:41:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
diff --git a/plugins/CacheLog/locale/ia/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/ia/LC_MESSAGES/CacheLog.po
index 6fd137ccb2..7bb1aafc25 100644
--- a/plugins/CacheLog/locale/ia/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/ia/LC_MESSAGES/CacheLog.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:36+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
diff --git a/plugins/CacheLog/locale/mk/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/mk/LC_MESSAGES/CacheLog.po
index 7eeaa78753..6c900bd45b 100644
--- a/plugins/CacheLog/locale/mk/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/mk/LC_MESSAGES/CacheLog.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:36+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
diff --git a/plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
index a57c71c8c8..b3c4807562 100644
--- a/plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:36+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
diff --git a/plugins/CacheLog/locale/nl/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/nl/LC_MESSAGES/CacheLog.po
index ad30513090..cda36b00ad 100644
--- a/plugins/CacheLog/locale/nl/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/nl/LC_MESSAGES/CacheLog.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:36+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
diff --git a/plugins/CacheLog/locale/pt/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/pt/LC_MESSAGES/CacheLog.po
index 4c52ac10e7..c8323f9f15 100644
--- a/plugins/CacheLog/locale/pt/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/pt/LC_MESSAGES/CacheLog.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:36+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
diff --git a/plugins/CacheLog/locale/ru/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/ru/LC_MESSAGES/CacheLog.po
index 2711e8ff3e..e33d04e3fd 100644
--- a/plugins/CacheLog/locale/ru/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/ru/LC_MESSAGES/CacheLog.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:36+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
diff --git a/plugins/CacheLog/locale/tl/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/tl/LC_MESSAGES/CacheLog.po
index e4d8f8aa2f..ccd5ee04c0 100644
--- a/plugins/CacheLog/locale/tl/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/tl/LC_MESSAGES/CacheLog.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:36+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
diff --git a/plugins/CacheLog/locale/uk/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/uk/LC_MESSAGES/CacheLog.po
index a4bebfc581..bcff53b47a 100644
--- a/plugins/CacheLog/locale/uk/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/uk/LC_MESSAGES/CacheLog.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:36+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
diff --git a/plugins/CacheLog/locale/zh_CN/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/zh_CN/LC_MESSAGES/CacheLog.po
index af3e7211ef..a46b7a0ac9 100644
--- a/plugins/CacheLog/locale/zh_CN/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/zh_CN/LC_MESSAGES/CacheLog.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:36+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
diff --git a/plugins/CasAuthentication/locale/be-tarask/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/be-tarask/LC_MESSAGES/CasAuthentication.po
index d102fe3a47..ef1fdc1ee8 100644
--- a/plugins/CasAuthentication/locale/be-tarask/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/be-tarask/LC_MESSAGES/CasAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - CasAuthentication to Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
+# Translation of StatusNet - CasAuthentication to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
 # Expored from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:37+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 20:40:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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"
diff --git a/plugins/CasAuthentication/locale/br/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/br/LC_MESSAGES/CasAuthentication.po
new file mode 100644
index 0000000000..031c1686ba
--- /dev/null
+++ b/plugins/CasAuthentication/locale/br/LC_MESSAGES/CasAuthentication.po
@@ -0,0 +1,75 @@
+# Translation of StatusNet - CasAuthentication to Breton (Brezhoneg)
+# Expored 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 - CasAuthentication\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: br\n"
+"X-Message-Group: #out-statusnet-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 "
+"evit en ober."
diff --git a/plugins/CasAuthentication/locale/de/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/de/LC_MESSAGES/CasAuthentication.po
index fdde1086d1..abeee5435a 100644
--- a/plugins/CasAuthentication/locale/de/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/de/LC_MESSAGES/CasAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:37+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 20:40:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
diff --git a/plugins/CasAuthentication/locale/es/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/es/LC_MESSAGES/CasAuthentication.po
index a724686808..7dcf5fbd38 100644
--- a/plugins/CasAuthentication/locale/es/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/es/LC_MESSAGES/CasAuthentication.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:37+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:51+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: 2010-11-30 20:40:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
diff --git a/plugins/CasAuthentication/locale/fr/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/fr/LC_MESSAGES/CasAuthentication.po
index 2d40030f27..ebfc089f55 100644
--- a/plugins/CasAuthentication/locale/fr/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/fr/LC_MESSAGES/CasAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:37+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:51+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:40:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
diff --git a/plugins/CasAuthentication/locale/gl/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/gl/LC_MESSAGES/CasAuthentication.po
index 76d62f0008..b0382ce901 100644
--- a/plugins/CasAuthentication/locale/gl/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/gl/LC_MESSAGES/CasAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:37+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:51+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: 2010-11-30 20:40:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
diff --git a/plugins/CasAuthentication/locale/ia/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/ia/LC_MESSAGES/CasAuthentication.po
index 12d00394d7..48f7f9a3df 100644
--- a/plugins/CasAuthentication/locale/ia/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/ia/LC_MESSAGES/CasAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:37+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:51+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:40:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
diff --git a/plugins/CasAuthentication/locale/mk/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/mk/LC_MESSAGES/CasAuthentication.po
index 77ef387afb..a2ef264728 100644
--- a/plugins/CasAuthentication/locale/mk/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/mk/LC_MESSAGES/CasAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:37+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:51+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:40:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
diff --git a/plugins/CasAuthentication/locale/nl/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/nl/LC_MESSAGES/CasAuthentication.po
index 062efe4d99..6b6b776904 100644
--- a/plugins/CasAuthentication/locale/nl/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/nl/LC_MESSAGES/CasAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:37+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:51+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:40:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
diff --git a/plugins/CasAuthentication/locale/pt_BR/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/pt_BR/LC_MESSAGES/CasAuthentication.po
index fc123e8baa..88015cfc7a 100644
--- a/plugins/CasAuthentication/locale/pt_BR/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/pt_BR/LC_MESSAGES/CasAuthentication.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:37+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:51+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: 2010-11-30 20:40:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
diff --git a/plugins/CasAuthentication/locale/ru/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/ru/LC_MESSAGES/CasAuthentication.po
index 6f00f55863..12748e09f4 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:37+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 20:40:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
diff --git a/plugins/CasAuthentication/locale/te/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/te/LC_MESSAGES/CasAuthentication.po
index 431faf0b6d..9bb2e7055c 100644
--- a/plugins/CasAuthentication/locale/te/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/te/LC_MESSAGES/CasAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:37+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:51+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:40:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
diff --git a/plugins/CasAuthentication/locale/uk/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/uk/LC_MESSAGES/CasAuthentication.po
index 1af21acb0d..be02142d78 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:37+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:51+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:40:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
diff --git a/plugins/CasAuthentication/locale/zh_CN/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/zh_CN/LC_MESSAGES/CasAuthentication.po
index bf9e9d91ac..d43a5d0524 100644
--- a/plugins/CasAuthentication/locale/zh_CN/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/zh_CN/LC_MESSAGES/CasAuthentication.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:37+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:52+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: 2010-11-30 20:40:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
diff --git a/plugins/ClientSideShorten/locale/be-tarask/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/be-tarask/LC_MESSAGES/ClientSideShorten.po
index c90e836f5d..793983b2f9 100644
--- a/plugins/ClientSideShorten/locale/be-tarask/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/be-tarask/LC_MESSAGES/ClientSideShorten.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - ClientSideShorten to Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
+# Translation of StatusNet - ClientSideShorten to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
 # Expored from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:38+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:52+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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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"
diff --git a/plugins/ClientSideShorten/locale/br/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/br/LC_MESSAGES/ClientSideShorten.po
index 337cdfb38a..4719e52334 100644
--- a/plugins/ClientSideShorten/locale/br/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/br/LC_MESSAGES/ClientSideShorten.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:38+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:52+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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/ClientSideShorten/locale/de/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/de/LC_MESSAGES/ClientSideShorten.po
index cf0f720bae..ad97d60445 100644
--- a/plugins/ClientSideShorten/locale/de/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/de/LC_MESSAGES/ClientSideShorten.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:38+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/ClientSideShorten/locale/es/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/es/LC_MESSAGES/ClientSideShorten.po
index 4b0c9b55c7..c9892f4054 100644
--- a/plugins/ClientSideShorten/locale/es/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/es/LC_MESSAGES/ClientSideShorten.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:38+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:52+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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/ClientSideShorten/locale/fr/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/fr/LC_MESSAGES/ClientSideShorten.po
index 8cac015807..1ece5618ac 100644
--- a/plugins/ClientSideShorten/locale/fr/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/fr/LC_MESSAGES/ClientSideShorten.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:38+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/ClientSideShorten/locale/he/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/he/LC_MESSAGES/ClientSideShorten.po
index 2d37093418..69f289f221 100644
--- a/plugins/ClientSideShorten/locale/he/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/he/LC_MESSAGES/ClientSideShorten.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:38+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:52+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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/ClientSideShorten/locale/ia/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/ia/LC_MESSAGES/ClientSideShorten.po
index 3fa272a20c..8b9e799531 100644
--- a/plugins/ClientSideShorten/locale/ia/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/ia/LC_MESSAGES/ClientSideShorten.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:38+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/ClientSideShorten/locale/id/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/id/LC_MESSAGES/ClientSideShorten.po
index ba7bbed979..f4fbbf0670 100644
--- a/plugins/ClientSideShorten/locale/id/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/id/LC_MESSAGES/ClientSideShorten.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:38+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:52+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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/ClientSideShorten/locale/mk/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/mk/LC_MESSAGES/ClientSideShorten.po
index cf2278ca4b..fc5b3bd57f 100644
--- a/plugins/ClientSideShorten/locale/mk/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/mk/LC_MESSAGES/ClientSideShorten.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:38+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/ClientSideShorten/locale/nb/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/nb/LC_MESSAGES/ClientSideShorten.po
index 186e877eac..ea5e5bce95 100644
--- a/plugins/ClientSideShorten/locale/nb/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/nb/LC_MESSAGES/ClientSideShorten.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:38+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/ClientSideShorten/locale/nl/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/nl/LC_MESSAGES/ClientSideShorten.po
index eb813c0015..88f3c78556 100644
--- a/plugins/ClientSideShorten/locale/nl/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/nl/LC_MESSAGES/ClientSideShorten.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:38+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/ClientSideShorten/locale/ru/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/ru/LC_MESSAGES/ClientSideShorten.po
index 998698867e..a24961ef59 100644
--- a/plugins/ClientSideShorten/locale/ru/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/ru/LC_MESSAGES/ClientSideShorten.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:38+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/ClientSideShorten/locale/tl/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/tl/LC_MESSAGES/ClientSideShorten.po
index 89d9c35447..154844479b 100644
--- a/plugins/ClientSideShorten/locale/tl/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/tl/LC_MESSAGES/ClientSideShorten.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:38+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/ClientSideShorten/locale/uk/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/uk/LC_MESSAGES/ClientSideShorten.po
index 59568f2435..6196cd7cf8 100644
--- a/plugins/ClientSideShorten/locale/uk/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/uk/LC_MESSAGES/ClientSideShorten.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:38+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/ClientSideShorten/locale/zh_CN/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/zh_CN/LC_MESSAGES/ClientSideShorten.po
index d846ae50ad..d56da6db75 100644
--- a/plugins/ClientSideShorten/locale/zh_CN/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/zh_CN/LC_MESSAGES/ClientSideShorten.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:38+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:52+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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/Comet/locale/be-tarask/LC_MESSAGES/Comet.po b/plugins/Comet/locale/be-tarask/LC_MESSAGES/Comet.po
index 9a6781f584..a25c690a1a 100644
--- a/plugins/Comet/locale/be-tarask/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/be-tarask/LC_MESSAGES/Comet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Comet to Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
+# Translation of StatusNet - Comet to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
 # Expored from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:39+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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"
diff --git a/plugins/Comet/locale/br/LC_MESSAGES/Comet.po b/plugins/Comet/locale/br/LC_MESSAGES/Comet.po
index 3e77022c37..2633b94790 100644
--- a/plugins/Comet/locale/br/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/br/LC_MESSAGES/Comet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:39+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/de/LC_MESSAGES/Comet.po b/plugins/Comet/locale/de/LC_MESSAGES/Comet.po
index b52da76d3f..ab9105f7fd 100644
--- a/plugins/Comet/locale/de/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/de/LC_MESSAGES/Comet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:39+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/es/LC_MESSAGES/Comet.po b/plugins/Comet/locale/es/LC_MESSAGES/Comet.po
index b85b05f40c..97faf52617 100644
--- a/plugins/Comet/locale/es/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/es/LC_MESSAGES/Comet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:39+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:53+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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/fr/LC_MESSAGES/Comet.po b/plugins/Comet/locale/fr/LC_MESSAGES/Comet.po
index 2489be7954..bc953d9d1a 100644
--- a/plugins/Comet/locale/fr/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/fr/LC_MESSAGES/Comet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:39+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/he/LC_MESSAGES/Comet.po b/plugins/Comet/locale/he/LC_MESSAGES/Comet.po
index 5039f01385..f2c34798fc 100644
--- a/plugins/Comet/locale/he/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/he/LC_MESSAGES/Comet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:39+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:53+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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/ia/LC_MESSAGES/Comet.po b/plugins/Comet/locale/ia/LC_MESSAGES/Comet.po
index e74cb999f9..e238bcd16f 100644
--- a/plugins/Comet/locale/ia/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/ia/LC_MESSAGES/Comet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:39+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/id/LC_MESSAGES/Comet.po b/plugins/Comet/locale/id/LC_MESSAGES/Comet.po
index 12c5ed726a..1957988add 100644
--- a/plugins/Comet/locale/id/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/id/LC_MESSAGES/Comet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:39+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:53+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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/mk/LC_MESSAGES/Comet.po b/plugins/Comet/locale/mk/LC_MESSAGES/Comet.po
index b03591de91..c96635c325 100644
--- a/plugins/Comet/locale/mk/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/mk/LC_MESSAGES/Comet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:39+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/nb/LC_MESSAGES/Comet.po b/plugins/Comet/locale/nb/LC_MESSAGES/Comet.po
index d1212757f5..c29732ddc3 100644
--- a/plugins/Comet/locale/nb/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/nb/LC_MESSAGES/Comet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:39+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:53+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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/nl/LC_MESSAGES/Comet.po b/plugins/Comet/locale/nl/LC_MESSAGES/Comet.po
index d92d013dfa..84706cb3a3 100644
--- a/plugins/Comet/locale/nl/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/nl/LC_MESSAGES/Comet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:39+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/pt/LC_MESSAGES/Comet.po b/plugins/Comet/locale/pt/LC_MESSAGES/Comet.po
index 581f198f56..20409ec118 100644
--- a/plugins/Comet/locale/pt/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/pt/LC_MESSAGES/Comet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:39+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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-POT-Import-Date: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/pt_BR/LC_MESSAGES/Comet.po b/plugins/Comet/locale/pt_BR/LC_MESSAGES/Comet.po
index 1ba0a38181..7883afb513 100644
--- a/plugins/Comet/locale/pt_BR/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/pt_BR/LC_MESSAGES/Comet.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:39+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:53+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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/ru/LC_MESSAGES/Comet.po b/plugins/Comet/locale/ru/LC_MESSAGES/Comet.po
index b41179e7cd..674f73b2f0 100644
--- a/plugins/Comet/locale/ru/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/ru/LC_MESSAGES/Comet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:39+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/tl/LC_MESSAGES/Comet.po b/plugins/Comet/locale/tl/LC_MESSAGES/Comet.po
index 1c48ad7c5b..c59c589946 100644
--- a/plugins/Comet/locale/tl/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/tl/LC_MESSAGES/Comet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:39+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/uk/LC_MESSAGES/Comet.po b/plugins/Comet/locale/uk/LC_MESSAGES/Comet.po
index 9fd469027f..3dd139e6e8 100644
--- a/plugins/Comet/locale/uk/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/uk/LC_MESSAGES/Comet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:39+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/zh_CN/LC_MESSAGES/Comet.po b/plugins/Comet/locale/zh_CN/LC_MESSAGES/Comet.po
index 39472f8bf1..b7538f4f48 100644
--- a/plugins/Comet/locale/zh_CN/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/zh_CN/LC_MESSAGES/Comet.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:39+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/DirectionDetector/locale/be-tarask/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/be-tarask/LC_MESSAGES/DirectionDetector.po
index 96a7aed027..c84164c668 100644
--- a/plugins/DirectionDetector/locale/be-tarask/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/be-tarask/LC_MESSAGES/DirectionDetector.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DirectionDetector to Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
+# Translation of StatusNet - DirectionDetector to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
 # Expored from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:39+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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"
diff --git a/plugins/DirectionDetector/locale/br/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/br/LC_MESSAGES/DirectionDetector.po
index 501aa06d97..095bea95ab 100644
--- a/plugins/DirectionDetector/locale/br/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/br/LC_MESSAGES/DirectionDetector.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:39+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/de/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/de/LC_MESSAGES/DirectionDetector.po
index 09a419578b..df2b65788e 100644
--- a/plugins/DirectionDetector/locale/de/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/de/LC_MESSAGES/DirectionDetector.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:39+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/es/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/es/LC_MESSAGES/DirectionDetector.po
index 46391a045d..6699930de3 100644
--- a/plugins/DirectionDetector/locale/es/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/es/LC_MESSAGES/DirectionDetector.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:39+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:53+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: 2010-11-29 19:41:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/fr/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/fr/LC_MESSAGES/DirectionDetector.po
index 9cb2941505..b6843cdcb1 100644
--- a/plugins/DirectionDetector/locale/fr/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/fr/LC_MESSAGES/DirectionDetector.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:39+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/he/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/he/LC_MESSAGES/DirectionDetector.po
index 9eb7a00025..fa4e11dc33 100644
--- a/plugins/DirectionDetector/locale/he/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/he/LC_MESSAGES/DirectionDetector.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:39+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:53+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: 2010-11-29 19:41:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/ia/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/ia/LC_MESSAGES/DirectionDetector.po
index 86b3c6d394..4ac8df046f 100644
--- a/plugins/DirectionDetector/locale/ia/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/ia/LC_MESSAGES/DirectionDetector.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:39+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/id/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/id/LC_MESSAGES/DirectionDetector.po
index 308414756e..3a3bcbd9f8 100644
--- a/plugins/DirectionDetector/locale/id/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/id/LC_MESSAGES/DirectionDetector.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:40+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:54+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: 2010-11-29 19:41:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/ja/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/ja/LC_MESSAGES/DirectionDetector.po
index c1ec889c25..61eb22c413 100644
--- a/plugins/DirectionDetector/locale/ja/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/ja/LC_MESSAGES/DirectionDetector.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:40+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:54+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: 2010-11-29 19:41:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/lb/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/lb/LC_MESSAGES/DirectionDetector.po
index dace861fa5..39a483ebcc 100644
--- a/plugins/DirectionDetector/locale/lb/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/lb/LC_MESSAGES/DirectionDetector.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:40+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:54+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: 2010-11-29 19:41:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: lb\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/mk/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/mk/LC_MESSAGES/DirectionDetector.po
index 69ba036a4a..07825d7540 100644
--- a/plugins/DirectionDetector/locale/mk/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/mk/LC_MESSAGES/DirectionDetector.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:40+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/nb/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/nb/LC_MESSAGES/DirectionDetector.po
index 0d39b4b1da..ac2dd32ade 100644
--- a/plugins/DirectionDetector/locale/nb/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/nb/LC_MESSAGES/DirectionDetector.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:40+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:54+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: 2010-11-29 19:41:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/nl/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/nl/LC_MESSAGES/DirectionDetector.po
index 0c014ca851..f8629da75f 100644
--- a/plugins/DirectionDetector/locale/nl/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/nl/LC_MESSAGES/DirectionDetector.po
@@ -9,16 +9,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:40+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:54+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: 2010-11-29 19:41:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/pt/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/pt/LC_MESSAGES/DirectionDetector.po
index 8cf80ef17d..2e50da9e60 100644
--- a/plugins/DirectionDetector/locale/pt/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/pt/LC_MESSAGES/DirectionDetector.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:40+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:54+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: 2010-11-29 19:41:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/ru/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/ru/LC_MESSAGES/DirectionDetector.po
index 08edceb73b..f585770521 100644
--- a/plugins/DirectionDetector/locale/ru/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/ru/LC_MESSAGES/DirectionDetector.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:40+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/tl/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/tl/LC_MESSAGES/DirectionDetector.po
index 23a6ca407c..f7e360bb52 100644
--- a/plugins/DirectionDetector/locale/tl/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/tl/LC_MESSAGES/DirectionDetector.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:40+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/uk/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/uk/LC_MESSAGES/DirectionDetector.po
index 0d806440fb..ad9a16434d 100644
--- a/plugins/DirectionDetector/locale/uk/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/uk/LC_MESSAGES/DirectionDetector.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:40+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/zh_CN/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/zh_CN/LC_MESSAGES/DirectionDetector.po
index 9f2991989e..134ed66754 100644
--- a/plugins/DirectionDetector/locale/zh_CN/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/zh_CN/LC_MESSAGES/DirectionDetector.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:40+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DiskCache/locale/be-tarask/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/be-tarask/LC_MESSAGES/DiskCache.po
index 817895fb24..cb3dec3643 100644
--- a/plugins/DiskCache/locale/be-tarask/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/be-tarask/LC_MESSAGES/DiskCache.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - DiskCache to Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
+# Translation of StatusNet - DiskCache to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
 # Expored from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:40+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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"
diff --git a/plugins/DiskCache/locale/br/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/br/LC_MESSAGES/DiskCache.po
index 535091cff1..624c2b373b 100644
--- a/plugins/DiskCache/locale/br/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/br/LC_MESSAGES/DiskCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:40+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/de/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/de/LC_MESSAGES/DiskCache.po
index 9a5726a641..9733b36fa6 100644
--- a/plugins/DiskCache/locale/de/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/de/LC_MESSAGES/DiskCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:40+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/es/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/es/LC_MESSAGES/DiskCache.po
index 10be296bed..94eff5d400 100644
--- a/plugins/DiskCache/locale/es/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/es/LC_MESSAGES/DiskCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:40+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/fr/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/fr/LC_MESSAGES/DiskCache.po
index 93b73611ed..63f588394e 100644
--- a/plugins/DiskCache/locale/fr/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/fr/LC_MESSAGES/DiskCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:40+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/he/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/he/LC_MESSAGES/DiskCache.po
index dbe746f407..67a86f2c1c 100644
--- a/plugins/DiskCache/locale/he/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/he/LC_MESSAGES/DiskCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:40+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/ia/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/ia/LC_MESSAGES/DiskCache.po
index ccd2d2dbcf..db94009f0b 100644
--- a/plugins/DiskCache/locale/ia/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/ia/LC_MESSAGES/DiskCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:40+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/id/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/id/LC_MESSAGES/DiskCache.po
index d6b76ef367..c90eda6774 100644
--- a/plugins/DiskCache/locale/id/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/id/LC_MESSAGES/DiskCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:40+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:54+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: 2010-11-29 19:41:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/mk/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/mk/LC_MESSAGES/DiskCache.po
index aacc061b87..013b44d3e2 100644
--- a/plugins/DiskCache/locale/mk/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/mk/LC_MESSAGES/DiskCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:40+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/nb/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/nb/LC_MESSAGES/DiskCache.po
index 7cb99a566d..520822915e 100644
--- a/plugins/DiskCache/locale/nb/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/nb/LC_MESSAGES/DiskCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:40+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:54+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: 2010-11-29 19:41:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/nl/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/nl/LC_MESSAGES/DiskCache.po
index cf3f141bcc..e4ce9f7024 100644
--- a/plugins/DiskCache/locale/nl/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/nl/LC_MESSAGES/DiskCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:40+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/pt/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/pt/LC_MESSAGES/DiskCache.po
index dc14835051..28f657d7b2 100644
--- a/plugins/DiskCache/locale/pt/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/pt/LC_MESSAGES/DiskCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:41+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:54+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: 2010-11-29 19:41:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/pt_BR/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/pt_BR/LC_MESSAGES/DiskCache.po
index 7b5a622d2d..ba76762365 100644
--- a/plugins/DiskCache/locale/pt_BR/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/pt_BR/LC_MESSAGES/DiskCache.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:41+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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-POT-Import-Date: 2010-11-29 19:41:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/ru/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/ru/LC_MESSAGES/DiskCache.po
index 79b7c95757..568a0852de 100644
--- a/plugins/DiskCache/locale/ru/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/ru/LC_MESSAGES/DiskCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:41+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/tl/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/tl/LC_MESSAGES/DiskCache.po
index 17a4d63687..55413484cd 100644
--- a/plugins/DiskCache/locale/tl/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/tl/LC_MESSAGES/DiskCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:41+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/uk/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/uk/LC_MESSAGES/DiskCache.po
index ba09317403..4414b51a2b 100644
--- a/plugins/DiskCache/locale/uk/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/uk/LC_MESSAGES/DiskCache.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:41+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/zh_CN/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/zh_CN/LC_MESSAGES/DiskCache.po
index c58d8df9fb..44f974327b 100644
--- a/plugins/DiskCache/locale/zh_CN/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/zh_CN/LC_MESSAGES/DiskCache.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:41+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-29 19:41:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/Disqus/locale/be-tarask/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/be-tarask/LC_MESSAGES/Disqus.po
index 6505846060..65e52609c7 100644
--- a/plugins/Disqus/locale/be-tarask/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/be-tarask/LC_MESSAGES/Disqus.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Disqus to Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
+# Translation of StatusNet - Disqus to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
 # Expored from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:41+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 20:40:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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"
diff --git a/plugins/Disqus/locale/br/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/br/LC_MESSAGES/Disqus.po
index 73765e3631..167e9dd07c 100644
--- a/plugins/Disqus/locale/br/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/br/LC_MESSAGES/Disqus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:41+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 20:40:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
diff --git a/plugins/Disqus/locale/de/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/de/LC_MESSAGES/Disqus.po
index c6a48d9aa0..1cc9eb1b60 100644
--- a/plugins/Disqus/locale/de/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/de/LC_MESSAGES/Disqus.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:41+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 20:40:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
diff --git a/plugins/Disqus/locale/es/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/es/LC_MESSAGES/Disqus.po
index 450a3f49ef..0701dd7bd4 100644
--- a/plugins/Disqus/locale/es/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/es/LC_MESSAGES/Disqus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:41+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 20:40:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
diff --git a/plugins/Disqus/locale/fr/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/fr/LC_MESSAGES/Disqus.po
index 8e1477dbd3..eb6e26b749 100644
--- a/plugins/Disqus/locale/fr/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/fr/LC_MESSAGES/Disqus.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:41+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 20:40:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
diff --git a/plugins/Disqus/locale/gl/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/gl/LC_MESSAGES/Disqus.po
index dc4a9316d5..363e6c9929 100644
--- a/plugins/Disqus/locale/gl/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/gl/LC_MESSAGES/Disqus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:41+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:55+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: 2010-11-30 20:40:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
diff --git a/plugins/Disqus/locale/ia/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/ia/LC_MESSAGES/Disqus.po
index 4cc996d5aa..1773bc3cd2 100644
--- a/plugins/Disqus/locale/ia/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/ia/LC_MESSAGES/Disqus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:41+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 20:40:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
diff --git a/plugins/Disqus/locale/lb/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/lb/LC_MESSAGES/Disqus.po
new file mode 100644
index 0000000000..5c7b26d301
--- /dev/null
+++ b/plugins/Disqus/locale/lb/LC_MESSAGES/Disqus.po
@@ -0,0 +1,43 @@
+# Translation of StatusNet - Disqus to Luxembourgish (Lëtzebuergesch)
+# Expored from translatewiki.net
+#
+# Author: Robby
+# --
+# 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-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:55+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:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: lb\n"
+"X-Message-Group: #out-statusnet-plugin-disqus\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: DisqusPlugin.php:142
+#, php-format
+msgid ""
+"Please enable JavaScript to view the [comments powered by Disqus](http://"
+"disqus.com/?ref_noscript=%s)."
+msgstr ""
+
+#: DisqusPlugin.php:149
+msgid "Comments powered by "
+msgstr ""
+
+#: DisqusPlugin.php:201
+msgid "Comments"
+msgstr "Bemierkungen"
+
+#: DisqusPlugin.php:241
+msgid ""
+"Use <a href=\"http://disqus.com/\">Disqus</a> to add commenting to notice "
+"pages."
+msgstr ""
diff --git a/plugins/Disqus/locale/mk/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/mk/LC_MESSAGES/Disqus.po
index 22dc17b7ef..f155e4fe8f 100644
--- a/plugins/Disqus/locale/mk/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/mk/LC_MESSAGES/Disqus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:41+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 20:40:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
diff --git a/plugins/Disqus/locale/nb/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/nb/LC_MESSAGES/Disqus.po
index ee1ceacbcf..bbe0067ebe 100644
--- a/plugins/Disqus/locale/nb/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/nb/LC_MESSAGES/Disqus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:41+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 20:40:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
diff --git a/plugins/Disqus/locale/nl/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/nl/LC_MESSAGES/Disqus.po
index 894f559a5f..1ec14913a0 100644
--- a/plugins/Disqus/locale/nl/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/nl/LC_MESSAGES/Disqus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:41+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 20:40:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
diff --git a/plugins/Disqus/locale/ru/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/ru/LC_MESSAGES/Disqus.po
index ecc9062c70..efeb1cf1fb 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:42+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 20:40:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
diff --git a/plugins/Disqus/locale/te/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/te/LC_MESSAGES/Disqus.po
index 6dec826ed8..77524735f1 100644
--- a/plugins/Disqus/locale/te/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/te/LC_MESSAGES/Disqus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:42+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:55+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:40:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
diff --git a/plugins/Disqus/locale/tl/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/tl/LC_MESSAGES/Disqus.po
index cc8aea0e15..c93c1de672 100644
--- a/plugins/Disqus/locale/tl/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/tl/LC_MESSAGES/Disqus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:42+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 20:40:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
diff --git a/plugins/Disqus/locale/uk/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/uk/LC_MESSAGES/Disqus.po
index d2d94b1965..0ff85249c8 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:42+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 20:40:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
diff --git a/plugins/Disqus/locale/zh_CN/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/zh_CN/LC_MESSAGES/Disqus.po
index 5378c3c809..3507e1be9d 100644
--- a/plugins/Disqus/locale/zh_CN/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/zh_CN/LC_MESSAGES/Disqus.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:42+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 20:40:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
diff --git a/plugins/Echo/locale/be-tarask/LC_MESSAGES/Echo.po b/plugins/Echo/locale/be-tarask/LC_MESSAGES/Echo.po
index 92cae98378..924fc70899 100644
--- a/plugins/Echo/locale/be-tarask/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/be-tarask/LC_MESSAGES/Echo.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Echo to Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
+# Translation of StatusNet - Echo to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
 # Expored from translatewiki.net
 #
 # Author: Jim-by
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:42+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:56+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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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"
diff --git a/plugins/Echo/locale/br/LC_MESSAGES/Echo.po b/plugins/Echo/locale/br/LC_MESSAGES/Echo.po
index 4f635f66e7..23d131fb10 100644
--- a/plugins/Echo/locale/br/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/br/LC_MESSAGES/Echo.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:42+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/de/LC_MESSAGES/Echo.po b/plugins/Echo/locale/de/LC_MESSAGES/Echo.po
index b3a10d98d8..1740654151 100644
--- a/plugins/Echo/locale/de/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/de/LC_MESSAGES/Echo.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:42+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/es/LC_MESSAGES/Echo.po b/plugins/Echo/locale/es/LC_MESSAGES/Echo.po
index ecfe210e97..11329a5b3d 100644
--- a/plugins/Echo/locale/es/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/es/LC_MESSAGES/Echo.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:42+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:56+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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/fi/LC_MESSAGES/Echo.po b/plugins/Echo/locale/fi/LC_MESSAGES/Echo.po
index 1d35f86269..cea7ef8437 100644
--- a/plugins/Echo/locale/fi/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/fi/LC_MESSAGES/Echo.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:42+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:56+0000\n"
 "Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/fr/LC_MESSAGES/Echo.po b/plugins/Echo/locale/fr/LC_MESSAGES/Echo.po
index 253f33997e..93481eeca8 100644
--- a/plugins/Echo/locale/fr/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/fr/LC_MESSAGES/Echo.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:42+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/he/LC_MESSAGES/Echo.po b/plugins/Echo/locale/he/LC_MESSAGES/Echo.po
index 2acd539647..cc4738da17 100644
--- a/plugins/Echo/locale/he/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/he/LC_MESSAGES/Echo.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:42+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/ia/LC_MESSAGES/Echo.po b/plugins/Echo/locale/ia/LC_MESSAGES/Echo.po
index 9803054a4a..29f6cdd8a9 100644
--- a/plugins/Echo/locale/ia/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/ia/LC_MESSAGES/Echo.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:42+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/id/LC_MESSAGES/Echo.po b/plugins/Echo/locale/id/LC_MESSAGES/Echo.po
index 9902ed62e8..d20cd14bca 100644
--- a/plugins/Echo/locale/id/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/id/LC_MESSAGES/Echo.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:42+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/lb/LC_MESSAGES/Echo.po b/plugins/Echo/locale/lb/LC_MESSAGES/Echo.po
index f767f2133e..3639c55577 100644
--- a/plugins/Echo/locale/lb/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/lb/LC_MESSAGES/Echo.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:42+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:56+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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: lb\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/mk/LC_MESSAGES/Echo.po b/plugins/Echo/locale/mk/LC_MESSAGES/Echo.po
index 13a5c66a81..c23d2f7f47 100644
--- a/plugins/Echo/locale/mk/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/mk/LC_MESSAGES/Echo.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:42+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/nb/LC_MESSAGES/Echo.po b/plugins/Echo/locale/nb/LC_MESSAGES/Echo.po
index 4f12e8bd01..132c85e330 100644
--- a/plugins/Echo/locale/nb/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/nb/LC_MESSAGES/Echo.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:42+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/nl/LC_MESSAGES/Echo.po b/plugins/Echo/locale/nl/LC_MESSAGES/Echo.po
index 23163ed7e7..86f29ad64d 100644
--- a/plugins/Echo/locale/nl/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/nl/LC_MESSAGES/Echo.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:42+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/pt/LC_MESSAGES/Echo.po b/plugins/Echo/locale/pt/LC_MESSAGES/Echo.po
index 78725c015c..94de378ee7 100644
--- a/plugins/Echo/locale/pt/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/pt/LC_MESSAGES/Echo.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:42+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/pt_BR/LC_MESSAGES/Echo.po b/plugins/Echo/locale/pt_BR/LC_MESSAGES/Echo.po
index 0c3de7af68..8871b987cc 100644
--- a/plugins/Echo/locale/pt_BR/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/pt_BR/LC_MESSAGES/Echo.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:42+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:56+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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/ru/LC_MESSAGES/Echo.po b/plugins/Echo/locale/ru/LC_MESSAGES/Echo.po
index a0308bcb6f..d55f7ad3ac 100644
--- a/plugins/Echo/locale/ru/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/ru/LC_MESSAGES/Echo.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:42+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/tl/LC_MESSAGES/Echo.po b/plugins/Echo/locale/tl/LC_MESSAGES/Echo.po
index 24a10710eb..193497bc8f 100644
--- a/plugins/Echo/locale/tl/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/tl/LC_MESSAGES/Echo.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:42+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/uk/LC_MESSAGES/Echo.po b/plugins/Echo/locale/uk/LC_MESSAGES/Echo.po
index 38894272a9..00ed7b10c4 100644
--- a/plugins/Echo/locale/uk/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/uk/LC_MESSAGES/Echo.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:42+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/zh_CN/LC_MESSAGES/Echo.po b/plugins/Echo/locale/zh_CN/LC_MESSAGES/Echo.po
index 1c18f42a93..2d8b88f4b8 100644
--- a/plugins/Echo/locale/zh_CN/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/zh_CN/LC_MESSAGES/Echo.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:42+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/EmailAuthentication/locale/be-tarask/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/be-tarask/LC_MESSAGES/EmailAuthentication.po
index 70733997d8..934c42123e 100644
--- a/plugins/EmailAuthentication/locale/be-tarask/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/be-tarask/LC_MESSAGES/EmailAuthentication.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - EmailAuthentication to Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
+# Translation of StatusNet - EmailAuthentication to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
 # Expored from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:43+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:56+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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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"
diff --git a/plugins/EmailAuthentication/locale/br/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/br/LC_MESSAGES/EmailAuthentication.po
index 160c9c8984..c80247ec47 100644
--- a/plugins/EmailAuthentication/locale/br/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/br/LC_MESSAGES/EmailAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:43+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/de/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/de/LC_MESSAGES/EmailAuthentication.po
index 883002f70d..5850458083 100644
--- a/plugins/EmailAuthentication/locale/de/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/de/LC_MESSAGES/EmailAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:43+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/es/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/es/LC_MESSAGES/EmailAuthentication.po
index 33aa39f8f7..43882f42aa 100644
--- a/plugins/EmailAuthentication/locale/es/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/es/LC_MESSAGES/EmailAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:43+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:56+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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/fr/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/fr/LC_MESSAGES/EmailAuthentication.po
index 29a18f5710..d8bdd04460 100644
--- a/plugins/EmailAuthentication/locale/fr/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/fr/LC_MESSAGES/EmailAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:43+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/he/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/he/LC_MESSAGES/EmailAuthentication.po
index fcc8d678cb..21146aa71d 100644
--- a/plugins/EmailAuthentication/locale/he/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/he/LC_MESSAGES/EmailAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:43+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/ia/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/ia/LC_MESSAGES/EmailAuthentication.po
index 0f0d3710df..a06d8bf308 100644
--- a/plugins/EmailAuthentication/locale/ia/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/ia/LC_MESSAGES/EmailAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:43+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:57+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/id/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/id/LC_MESSAGES/EmailAuthentication.po
index f58bfde70f..85b62ad482 100644
--- a/plugins/EmailAuthentication/locale/id/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/id/LC_MESSAGES/EmailAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:43+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:57+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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/ja/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/ja/LC_MESSAGES/EmailAuthentication.po
index 28d4dcb973..f08ac5ab89 100644
--- a/plugins/EmailAuthentication/locale/ja/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/ja/LC_MESSAGES/EmailAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:43+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:57+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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/mk/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/mk/LC_MESSAGES/EmailAuthentication.po
index 18b13b33b3..65745cbaba 100644
--- a/plugins/EmailAuthentication/locale/mk/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/mk/LC_MESSAGES/EmailAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:43+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:57+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/nb/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/nb/LC_MESSAGES/EmailAuthentication.po
index 8a00fdc8a7..3a58753f82 100644
--- a/plugins/EmailAuthentication/locale/nb/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/nb/LC_MESSAGES/EmailAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:43+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/nl/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/nl/LC_MESSAGES/EmailAuthentication.po
index 5f145dedb5..54edceb57a 100644
--- a/plugins/EmailAuthentication/locale/nl/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/nl/LC_MESSAGES/EmailAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:43+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:57+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/pt/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/pt/LC_MESSAGES/EmailAuthentication.po
index 1649d0d7fe..1788be6fd6 100644
--- a/plugins/EmailAuthentication/locale/pt/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/pt/LC_MESSAGES/EmailAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:43+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/pt_BR/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/pt_BR/LC_MESSAGES/EmailAuthentication.po
index 9d7b3de728..688169b073 100644
--- a/plugins/EmailAuthentication/locale/pt_BR/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/pt_BR/LC_MESSAGES/EmailAuthentication.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:43+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:57+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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/ru/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/ru/LC_MESSAGES/EmailAuthentication.po
index 9f66bfefdf..4824b20899 100644
--- a/plugins/EmailAuthentication/locale/ru/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/ru/LC_MESSAGES/EmailAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:43+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/tl/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/tl/LC_MESSAGES/EmailAuthentication.po
index c1f18d9a66..0eec3f312b 100644
--- a/plugins/EmailAuthentication/locale/tl/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/tl/LC_MESSAGES/EmailAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:43+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/uk/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/uk/LC_MESSAGES/EmailAuthentication.po
index 0fecb9fe53..77140faa67 100644
--- a/plugins/EmailAuthentication/locale/uk/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/uk/LC_MESSAGES/EmailAuthentication.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:43+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/zh_CN/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/zh_CN/LC_MESSAGES/EmailAuthentication.po
index 2bd6bb516d..d7834d6cca 100644
--- a/plugins/EmailAuthentication/locale/zh_CN/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/zh_CN/LC_MESSAGES/EmailAuthentication.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:43+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-10-29 16:12:44+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailSummary/locale/be-tarask/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/be-tarask/LC_MESSAGES/EmailSummary.po
index b2b05ccf18..8b223cfa2b 100644
--- a/plugins/EmailSummary/locale/be-tarask/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/be-tarask/LC_MESSAGES/EmailSummary.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - EmailSummary to Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
+# Translation of StatusNet - EmailSummary to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
 # Expored from translatewiki.net
 #
 # Author: Jim-by
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:43+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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"
diff --git a/plugins/EmailSummary/locale/br/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/br/LC_MESSAGES/EmailSummary.po
index acdfaae83f..afe8f2380b 100644
--- a/plugins/EmailSummary/locale/br/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/br/LC_MESSAGES/EmailSummary.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:43+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
diff --git a/plugins/EmailSummary/locale/fr/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/fr/LC_MESSAGES/EmailSummary.po
index b8a132d966..c9d1b0b6a1 100644
--- a/plugins/EmailSummary/locale/fr/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/fr/LC_MESSAGES/EmailSummary.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:43+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
diff --git a/plugins/EmailSummary/locale/he/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/he/LC_MESSAGES/EmailSummary.po
index 3f2d4e2132..9dbeea02bd 100644
--- a/plugins/EmailSummary/locale/he/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/he/LC_MESSAGES/EmailSummary.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:44+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:58+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: 2010-11-30 17:54:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
diff --git a/plugins/EmailSummary/locale/ia/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/ia/LC_MESSAGES/EmailSummary.po
index 3bec115266..8a4e935858 100644
--- a/plugins/EmailSummary/locale/ia/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/ia/LC_MESSAGES/EmailSummary.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:44+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
diff --git a/plugins/EmailSummary/locale/id/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/id/LC_MESSAGES/EmailSummary.po
index 48e216ff09..48fcb86262 100644
--- a/plugins/EmailSummary/locale/id/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/id/LC_MESSAGES/EmailSummary.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:44+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:58+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: 2010-11-30 17:54:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
diff --git a/plugins/EmailSummary/locale/mk/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/mk/LC_MESSAGES/EmailSummary.po
index 2c7360e952..e510ca80b2 100644
--- a/plugins/EmailSummary/locale/mk/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/mk/LC_MESSAGES/EmailSummary.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:44+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
diff --git a/plugins/EmailSummary/locale/nl/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/nl/LC_MESSAGES/EmailSummary.po
index b17bc8d089..f8f9c6ec80 100644
--- a/plugins/EmailSummary/locale/nl/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/nl/LC_MESSAGES/EmailSummary.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:44+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
diff --git a/plugins/EmailSummary/locale/ru/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/ru/LC_MESSAGES/EmailSummary.po
index eca47f5db9..b3a6488050 100644
--- a/plugins/EmailSummary/locale/ru/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/ru/LC_MESSAGES/EmailSummary.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:44+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
diff --git a/plugins/EmailSummary/locale/uk/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/uk/LC_MESSAGES/EmailSummary.po
index be4d2cf405..071c64201a 100644
--- a/plugins/EmailSummary/locale/uk/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/uk/LC_MESSAGES/EmailSummary.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:44+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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: 2010-11-30 17:54:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
diff --git a/plugins/Facebook/locale/be-tarask/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/be-tarask/LC_MESSAGES/Facebook.po
index 0e972515e1..52511e51de 100644
--- a/plugins/Facebook/locale/be-tarask/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/be-tarask/LC_MESSAGES/Facebook.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet - Facebook to Belarusian (Taraškievica orthography) (Беларуская (тарашкевіца))
+# Translation of StatusNet - Facebook to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
 # Expored from translatewiki.net
 #
 # Author: EugeneZelenko
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:50+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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: 2010-11-30 20:40:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -245,75 +245,75 @@ msgstr "Так, зрабіць гэта!"
 #: facebookhome.php:217
 msgctxt "BUTTON"
 msgid "Skip"
-msgstr ""
+msgstr "Прапусьціць"
 
 #: facebookhome.php:244 facebookaction.php:336
 msgid "Pagination"
-msgstr ""
+msgstr "Нумарацыя старонак"
 
 #. TRANS: Pagination link.
 #: facebookhome.php:254 facebookaction.php:345
 msgid "After"
-msgstr ""
+msgstr "Пасьля"
 
 #. TRANS: Pagination link.
 #: facebookhome.php:263 facebookaction.php:353
 msgid "Before"
-msgstr ""
+msgstr "Перад"
 
 #. TRANS: %s is the name of the site.
 #: facebookinvite.php:69
 #, php-format
 msgid "Thanks for inviting your friends to use %s."
-msgstr ""
+msgstr "Дзякуем за запрашэньне Вашых сяброў карыстацца %s."
 
 #. TRANS: Followed by an unordered list with invited friends.
 #: facebookinvite.php:72
 msgid "Invitations have been sent to the following users:"
-msgstr ""
+msgstr "Запрашэньні былі дасланыя наступным карыстальнікам:"
 
 #: facebookinvite.php:91
 #, php-format
 msgid "You have been invited to %s"
-msgstr ""
+msgstr "Вы былі запрошаныя ў %s"
 
 #. TRANS: %s is the name of the site.
 #: facebookinvite.php:101
 #, php-format
 msgid "Invite your friends to use %s"
-msgstr ""
+msgstr "Запрасіць Вашых сяброў карыстацца %s"
 
 #. TRANS: %s is the name of the site.
 #: facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
-msgstr ""
+msgstr "Сябры, якія ўжо карыстаюцца %s:"
 
 #. TRANS: Page title.
 #: facebookinvite.php:143
 msgid "Send invitations"
-msgstr ""
+msgstr "Даслаць запрашэньні"
 
 #. TRANS: Menu item.
 #. TRANS: Menu item tab.
 #: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
 msgctxt "MENU"
 msgid "Facebook"
-msgstr ""
+msgstr "Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
 #: FacebookPlugin.php:190
 msgid "Facebook integration configuration"
-msgstr ""
+msgstr "Налады інтэграцыі Facebook"
 
 #: FacebookPlugin.php:431
 msgid "Facebook Connect User"
-msgstr ""
+msgstr "Карыстальнік злучэньня Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
 #: FacebookPlugin.php:463
 msgid "Login or register using Facebook"
-msgstr ""
+msgstr "Увайсьці ці зарэгістравацца з выкарыстаньнем Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title.
diff --git a/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po
index 8e16956d8f..1ee2bf7f1a 100644
--- a/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:50+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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: 2010-11-30 20:40:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -424,7 +424,7 @@ msgstr ""
 
 #: facebookadminpanel.php:178
 msgid "Facebook application settings"
-msgstr ""
+msgstr "Arventennoù poellad Facebook"
 
 #: facebookadminpanel.php:184
 msgid "API key"
diff --git a/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po
index f7e6d95761..3ae1c2fa8a 100644
--- a/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:50+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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: 2010-11-30 20:40:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
diff --git a/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po
index d6de8f9339..8ba04b2829 100644
--- a/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po
@@ -11,13 +11,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:50+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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: 2010-11-30 20:40:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
diff --git a/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po
index d443bf6252..d4bb47a5e1 100644
--- a/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:50+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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: 2010-11-30 20:40:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
diff --git a/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po
index dabe269091..d46ed10995 100644
--- a/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:50+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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: 2010-11-30 20:40:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
diff --git a/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po
index 5aa17e6382..3f2eebf349 100644
--- a/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:51+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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: 2010-11-30 20:40:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
diff --git a/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po
index 6db60733d7..20349393a7 100644
--- a/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:51+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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: 2010-11-30 20:40:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -498,7 +498,7 @@ msgstr ""
 #. TRANS: Preceded by "Please " and followed by " first."
 #: FBConnectSettings.php:130
 msgid "set a password"
-msgstr "поставете лозинка"
+msgstr "ставете лозинка"
 
 #. TRANS: Preceded by "Please set a password".
 #: FBConnectSettings.php:132
diff --git a/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po
index 6270b67ca2..bf797b3ac4 100644
--- a/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:51+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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: 2010-11-30 20:40:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
diff --git a/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
index d7de8a153a..9802bfa379 100644
--- a/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:51+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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: 2010-11-30 20:40:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
diff --git a/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po
index 9edd467733..b6c5a45c97 100644
--- a/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:51+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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: 2010-11-30 20:40:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
diff --git a/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po
index 61d2167c4a..8d975e3a2b 100644
--- a/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:51+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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: 2010-11-30 20:40:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
diff --git a/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po
index dd90a4c498..5f28c03f52 100644
--- a/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:51+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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: 2010-11-30 20:40:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
diff --git a/plugins/Facebook/locale/vi/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/vi/LC_MESSAGES/Facebook.po
index c38ff42cc4..15c861e90e 100644
--- a/plugins/Facebook/locale/vi/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/vi/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:51+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33:07+0000\n"
 "Language-Team: Vietnamese <http://translatewiki.net/wiki/Portal:vi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:40:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: vi\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
diff --git a/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po
index 1f3be132ba..40c83bb8f5 100644
--- a/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:51+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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: 2010-11-30 20:40:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
diff --git a/plugins/FacebookBridge/locale/FacebookBridge.pot b/plugins/FacebookBridge/locale/FacebookBridge.pot
index 132516b793..2eba65cc68 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+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"
@@ -151,28 +151,28 @@ msgstr ""
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: actions/facebookfinishlogin.php:304 actions/facebookfinishlogin.php:314
+#: actions/facebookfinishlogin.php:308 actions/facebookfinishlogin.php:318
 msgid "Registration not allowed."
 msgstr ""
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: actions/facebookfinishlogin.php:322
+#: actions/facebookfinishlogin.php:326
 msgid "Not a valid invitation code."
 msgstr ""
 
-#: actions/facebookfinishlogin.php:335
+#: actions/facebookfinishlogin.php:339
 msgid "Nickname not allowed."
 msgstr ""
 
-#: actions/facebookfinishlogin.php:340
+#: actions/facebookfinishlogin.php:344
 msgid "Nickname already in use. Try another one."
 msgstr ""
 
-#: actions/facebookfinishlogin.php:368 actions/facebookfinishlogin.php:505
+#: actions/facebookfinishlogin.php:372 actions/facebookfinishlogin.php:511
 msgid "Error connecting user to Facebook."
 msgstr ""
 
-#: actions/facebookfinishlogin.php:468
+#: actions/facebookfinishlogin.php:474
 msgid "Invalid username or password."
 msgstr ""
 
diff --git a/plugins/FacebookBridge/locale/br/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/br/LC_MESSAGES/FacebookBridge.po
index e416f0e727..3231cc8935 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:55+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33:10+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: 2010-11-30 20:40:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -158,28 +158,28 @@ 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:304 actions/facebookfinishlogin.php:314
+#: actions/facebookfinishlogin.php:308 actions/facebookfinishlogin.php:318
 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:322
+#: actions/facebookfinishlogin.php:326
 msgid "Not a valid invitation code."
 msgstr "N'eo ket reizh ar c'hod pedadenn."
 
-#: actions/facebookfinishlogin.php:335
+#: actions/facebookfinishlogin.php:339
 msgid "Nickname not allowed."
 msgstr "Lesanv nann-aotreet."
 
-#: actions/facebookfinishlogin.php:340
+#: actions/facebookfinishlogin.php:344
 msgid "Nickname already in use. Try another one."
 msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
 
-#: actions/facebookfinishlogin.php:368 actions/facebookfinishlogin.php:505
+#: actions/facebookfinishlogin.php:372 actions/facebookfinishlogin.php:511
 msgid "Error connecting user to Facebook."
 msgstr ""
 
-#: actions/facebookfinishlogin.php:468
+#: actions/facebookfinishlogin.php:474
 msgid "Invalid username or password."
 msgstr "Anv implijer pe ger-tremen direizh."
 
@@ -239,11 +239,11 @@ msgstr "Enrollañ"
 
 #: actions/facebookadminpanel.php:210
 msgid "Save Facebook settings"
-msgstr ""
+msgstr "Enrollañ arventennoù Facebook"
 
 #: actions/facebooksettings.php:137
 msgid "Connected Facebook user"
-msgstr ""
+msgstr "Implijer Facebook kevreet"
 
 #: actions/facebooksettings.php:164
 msgid "Publish my notices to Facebook."
@@ -251,7 +251,7 @@ msgstr ""
 
 #: actions/facebooksettings.php:174
 msgid "Send \"@\" replies to Facebook."
-msgstr ""
+msgstr "Kas respontoù \"@\" da Facebook."
 
 #. TRANS: Submit button to save synchronisation settings.
 #: actions/facebooksettings.php:183
@@ -262,7 +262,7 @@ msgstr "Enrollañ"
 #. TRANS: Legend.
 #: actions/facebooksettings.php:192
 msgid "Disconnect my account from Facebook"
-msgstr ""
+msgstr "Digevreañ ma c'hont deus Facebook"
 
 #: actions/facebooksettings.php:199
 #, php-format
@@ -295,8 +295,8 @@ msgstr ""
 
 #: actions/facebooksettings.php:260
 msgid "Couldn't delete link to Facebook."
-msgstr ""
+msgstr "N'eus ket bet gallet diverkañ al liamm war-du Facebook."
 
 #: actions/facebooksettings.php:264
 msgid "You have disconnected from Facebook."
-msgstr ""
+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 38d44b9424..ecb15c6a60 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:55+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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-POT-Import-Date: 2010-11-30 20:40:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -62,22 +62,24 @@ msgstr "Contacteu amb l'administrador de %s per recuperar el vostre compte"
 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 ""
+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 ""
+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 ""
+msgstr "No podeu registrar-vos-hi si no accepteu la llicència."
 
 #: actions/facebookfinishlogin.php:167
 msgid "An unknown error has occured."
-msgstr ""
+msgstr "S'ha produït un error desconegut."
 
 #: actions/facebookfinishlogin.php:185
 #, php-format
@@ -86,16 +88,19 @@ msgid ""
 "Facebook to a local account. You can either create a new local account, or "
 "connect with an existing local account."
 msgstr ""
+"És la primera vegada que inicieu una sessió a %s, per tant, hem de connectar "
+"el vostre Facebook a un compte local. Podeu crear un compte local nou, o bé "
+"connectar-vos amb un compte ja existent."
 
 #. TRANS: Page title.
 #: actions/facebookfinishlogin.php:195
 msgid "Facebook Setup"
-msgstr ""
+msgstr "Configuració del Facebook"
 
 #. TRANS: Legend.
 #: actions/facebookfinishlogin.php:229
 msgid "Connection options"
-msgstr ""
+msgstr "Opcions de connexió"
 
 #. TRANS: %s is the name of the license used by the user for their status updates.
 #: actions/facebookfinishlogin.php:239
@@ -104,24 +109,27 @@ 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 sota %s excepte pel que fa a les "
+"dades privades: contrasenya, adreça electrònica, adreça de MI i número de "
+"telèfon."
 
 #. TRANS: Legend.
 #: actions/facebookfinishlogin.php:256
 msgid "Create new account"
-msgstr ""
+msgstr "Crea un compte nou"
 
 #: actions/facebookfinishlogin.php:258
 msgid "Create a new user with this nickname."
-msgstr ""
+msgstr "Crea un usuari nou amb aquest sobrenom"
 
 #. TRANS: Field label.
 #: actions/facebookfinishlogin.php:262
 msgid "New nickname"
-msgstr ""
+msgstr "Nou sobrenom"
 
 #: actions/facebookfinishlogin.php:264
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
+msgstr "1-64 lletres en minúscules o nombres, sense puntuacions o espais"
 
 #. TRANS: Submit button.
 #: actions/facebookfinishlogin.php:268
@@ -138,11 +146,13 @@ msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Facebook."
 msgstr ""
+"Si ja teniu un compte, inicieu una sessió amb el vostre nom d'usuari i "
+"contrasenya per connectar-lo al Facebook."
 
 #. TRANS: Field label.
 #: actions/facebookfinishlogin.php:280
 msgid "Existing nickname"
-msgstr ""
+msgstr "ja existeix el sobrenom"
 
 #: actions/facebookfinishlogin.php:283
 msgid "Password"
@@ -156,84 +166,86 @@ 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:304 actions/facebookfinishlogin.php:314
+#: actions/facebookfinishlogin.php:308 actions/facebookfinishlogin.php:318
 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:322
+#: actions/facebookfinishlogin.php:326
 msgid "Not a valid invitation code."
 msgstr "No és un codi d'invitació vàlid"
 
-#: actions/facebookfinishlogin.php:335
+#: actions/facebookfinishlogin.php:339
 msgid "Nickname not allowed."
 msgstr "No es permet el sobrenom."
 
-#: actions/facebookfinishlogin.php:340
+#: actions/facebookfinishlogin.php:344
 msgid "Nickname already in use. Try another one."
 msgstr "El sobrenom ja és en ús. Trieu-ne un altre."
 
-#: actions/facebookfinishlogin.php:368 actions/facebookfinishlogin.php:505
+#: actions/facebookfinishlogin.php:372 actions/facebookfinishlogin.php:511
 msgid "Error connecting user to Facebook."
-msgstr ""
+msgstr "S'ha produït un error en connectar l'usuari al Facebook."
 
-#: actions/facebookfinishlogin.php:468
+#: actions/facebookfinishlogin.php:474
 msgid "Invalid username or password."
-msgstr ""
+msgstr "Nom d'usuari o contrasenya no vàlids"
 
 #: actions/facebooklogin.php:43
 msgid "Already logged in."
-msgstr ""
+msgstr "Ja heu iniciat una sessió."
 
 #. TRANS: Instructions.
 #: actions/facebooklogin.php:52
 msgid "Login with your Facebook Account"
-msgstr ""
+msgstr "Inicieu una sessió amb el compte del Facebook"
 
 #. TRANS: Page title.
 #: actions/facebooklogin.php:67
 msgid "Login with Facebook"
-msgstr ""
+msgstr "Inicia una sessió amb el Facebook"
 
 #: actions/facebookadminpanel.php:52
 msgid "Facebook"
-msgstr ""
+msgstr "Facebook"
 
 #: actions/facebookadminpanel.php:62
 msgid "Facebook integration settings"
-msgstr ""
+msgstr "Paràmetres d'integració del Facebook"
 
 #: actions/facebookadminpanel.php:123
 msgid "Invalid Facebook ID. Max length is 255 characters."
-msgstr ""
+msgstr "L'ID del Facebook no és vàlid. La longitud màxima són 255 caràcters."
 
 #: 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."
 
 #: actions/facebookadminpanel.php:178
 msgid "Facebook application settings"
-msgstr ""
+msgstr "Paràmetres d'aplicació del Facebook"
 
 #: actions/facebookadminpanel.php:184
 msgid "Application ID"
-msgstr ""
+msgstr "ID de l'aplicació"
 
 #: actions/facebookadminpanel.php:185
 msgid "ID of your Facebook application"
-msgstr ""
+msgstr "ID de la vostra aplicació de Facebook"
 
 #: actions/facebookadminpanel.php:193
 msgid "Secret"
-msgstr ""
+msgstr "Clau secreta"
 
 #: actions/facebookadminpanel.php:194
 msgid "Application secret"
-msgstr ""
+msgstr "Clau secreta de l'aplicació"
 
 #: actions/facebookadminpanel.php:210
 msgid "Save"
-msgstr ""
+msgstr "Desa"
 
 #: actions/facebookadminpanel.php:210
 msgid "Save Facebook settings"
@@ -241,15 +253,15 @@ msgstr "Desa els paràmetres del Facebook"
 
 #: actions/facebooksettings.php:137
 msgid "Connected Facebook user"
-msgstr ""
+msgstr "Usuari del Facebook connectat"
 
 #: actions/facebooksettings.php:164
 msgid "Publish my notices to Facebook."
-msgstr ""
+msgstr "Publica els meus avisos al Facebook."
 
 #: actions/facebooksettings.php:174
 msgid "Send \"@\" replies to Facebook."
-msgstr ""
+msgstr "Envia respostes amb «@» al Facebook."
 
 #. TRANS: Submit button to save synchronisation settings.
 #: actions/facebooksettings.php:183
@@ -260,7 +272,7 @@ msgstr "Desa"
 #. TRANS: Legend.
 #: actions/facebooksettings.php:192
 msgid "Disconnect my account from Facebook"
-msgstr ""
+msgstr "Desconnecta el meu compte del Facebook"
 
 #: actions/facebooksettings.php:199
 #, php-format
@@ -268,6 +280,8 @@ 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
@@ -275,6 +289,8 @@ 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
@@ -284,17 +300,17 @@ msgstr "Desconnecta"
 
 #: actions/facebooksettings.php:243
 msgid "There was a problem saving your sync preferences."
-msgstr ""
+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 ""
+msgstr "S'han desat les preferències de sincronització."
 
 #: actions/facebooksettings.php:260
 msgid "Couldn't delete link to Facebook."
-msgstr ""
+msgstr "No s'ha pogut eliminar l'enllaç al Facebook."
 
 #: actions/facebooksettings.php:264
 msgid "You have disconnected from Facebook."
-msgstr ""
+msgstr "Us heu desconnectat del Facebook."
diff --git a/plugins/FacebookBridge/locale/ia/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/ia/LC_MESSAGES/FacebookBridge.po
index 5478474bc7..82a485b620 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:55+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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: 2010-11-30 20:40:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -166,28 +166,28 @@ 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:304 actions/facebookfinishlogin.php:314
+#: actions/facebookfinishlogin.php:308 actions/facebookfinishlogin.php:318
 msgid "Registration not allowed."
 msgstr "Creation de conto non permittite."
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: actions/facebookfinishlogin.php:322
+#: actions/facebookfinishlogin.php:326
 msgid "Not a valid invitation code."
 msgstr "Le codice de invitation es invalide."
 
-#: actions/facebookfinishlogin.php:335
+#: actions/facebookfinishlogin.php:339
 msgid "Nickname not allowed."
 msgstr "Pseudonymo non permittite."
 
-#: actions/facebookfinishlogin.php:340
+#: actions/facebookfinishlogin.php:344
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonymo ja in uso. Proba un altere."
 
-#: actions/facebookfinishlogin.php:368 actions/facebookfinishlogin.php:505
+#: actions/facebookfinishlogin.php:372 actions/facebookfinishlogin.php:511
 msgid "Error connecting user to Facebook."
 msgstr "Error durante le connexion del usator a Facebook."
 
-#: actions/facebookfinishlogin.php:468
+#: actions/facebookfinishlogin.php:474
 msgid "Invalid username or password."
 msgstr "Nomine de usator o contrasigno invalide."
 
@@ -282,7 +282,7 @@ msgstr ""
 "[defini un contrasigno](%s) primo."
 
 #: actions/facebooksettings.php:213
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
 "password to log in."
diff --git a/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po
index 23614078ee..27f617a48d 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:55+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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: 2010-11-30 20:40:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -165,28 +165,28 @@ msgstr "Поврзи"
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: actions/facebookfinishlogin.php:304 actions/facebookfinishlogin.php:314
+#: actions/facebookfinishlogin.php:308 actions/facebookfinishlogin.php:318
 msgid "Registration not allowed."
 msgstr "Регистрирањето не е дозволено."
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: actions/facebookfinishlogin.php:322
+#: actions/facebookfinishlogin.php:326
 msgid "Not a valid invitation code."
 msgstr "Ова не е важечки код за покана."
 
-#: actions/facebookfinishlogin.php:335
+#: actions/facebookfinishlogin.php:339
 msgid "Nickname not allowed."
 msgstr "Прекарот не е дозволен."
 
-#: actions/facebookfinishlogin.php:340
+#: actions/facebookfinishlogin.php:344
 msgid "Nickname already in use. Try another one."
 msgstr "Тој прекар е во употреба. Одберете друг."
 
-#: actions/facebookfinishlogin.php:368 actions/facebookfinishlogin.php:505
+#: actions/facebookfinishlogin.php:372 actions/facebookfinishlogin.php:511
 msgid "Error connecting user to Facebook."
 msgstr "Грешка при поврзувањето на корисникот со Facebook."
 
-#: actions/facebookfinishlogin.php:468
+#: actions/facebookfinishlogin.php:474
 msgid "Invalid username or password."
 msgstr "Погрешно име или лозинка."
 
@@ -281,7 +281,7 @@ msgstr ""
 "најавувате! Најпрвин [ставете лозинка](%s)."
 
 #: actions/facebooksettings.php:213
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
 "password to log in."
diff --git a/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po
index 06a115f2b2..e49b594965 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:56+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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: 2010-11-30 20:40:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -169,29 +169,29 @@ 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:304 actions/facebookfinishlogin.php:314
+#: actions/facebookfinishlogin.php:308 actions/facebookfinishlogin.php:318
 msgid "Registration not allowed."
 msgstr "Registratie is niet toegestaan."
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: actions/facebookfinishlogin.php:322
+#: actions/facebookfinishlogin.php:326
 msgid "Not a valid invitation code."
 msgstr "De uitnodigingscode is ongeldig."
 
-#: actions/facebookfinishlogin.php:335
+#: actions/facebookfinishlogin.php:339
 msgid "Nickname not allowed."
 msgstr "Gebruikersnaam niet toegestaan."
 
-#: actions/facebookfinishlogin.php:340
+#: actions/facebookfinishlogin.php:344
 msgid "Nickname already in use. Try another one."
 msgstr ""
 "De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
 
-#: actions/facebookfinishlogin.php:368 actions/facebookfinishlogin.php:505
+#: actions/facebookfinishlogin.php:372 actions/facebookfinishlogin.php:511
 msgid "Error connecting user to Facebook."
 msgstr "Fout bij het verbinden van de gebruiker met Facebook."
 
-#: actions/facebookfinishlogin.php:468
+#: actions/facebookfinishlogin.php:474
 msgid "Invalid username or password."
 msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
@@ -286,7 +286,7 @@ msgstr ""
 "eerst een wachtwoord in](%s)."
 
 #: actions/facebooksettings.php:213
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
 "password to log in."
diff --git a/plugins/FacebookBridge/locale/uk/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/uk/LC_MESSAGES/FacebookBridge.po
index 600f86dce8..cfa45d8d51 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:56+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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: 2010-11-30 20:40:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:01+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -167,28 +167,28 @@ msgstr "Під’єднати"
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: actions/facebookfinishlogin.php:304 actions/facebookfinishlogin.php:314
+#: actions/facebookfinishlogin.php:308 actions/facebookfinishlogin.php:318
 msgid "Registration not allowed."
 msgstr "Реєстрацію не дозволено."
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: actions/facebookfinishlogin.php:322
+#: actions/facebookfinishlogin.php:326
 msgid "Not a valid invitation code."
 msgstr "Це не дійсний код запрошення."
 
-#: actions/facebookfinishlogin.php:335
+#: actions/facebookfinishlogin.php:339
 msgid "Nickname not allowed."
 msgstr "Нікнейм не допускається."
 
-#: actions/facebookfinishlogin.php:340
+#: actions/facebookfinishlogin.php:344
 msgid "Nickname already in use. Try another one."
 msgstr "Це ім’я вже використовується. Спробуйте інше."
 
-#: actions/facebookfinishlogin.php:368 actions/facebookfinishlogin.php:505
+#: actions/facebookfinishlogin.php:372 actions/facebookfinishlogin.php:511
 msgid "Error connecting user to Facebook."
 msgstr "Помилка при підключенні до Facebook."
 
-#: actions/facebookfinishlogin.php:468
+#: actions/facebookfinishlogin.php:474
 msgid "Invalid username or password."
 msgstr "Недійсне ім’я або пароль."
 
@@ -284,7 +284,7 @@ msgstr ""
 "сервісу у майбутньому! Будь ласка, спочатку [встановіть пароль](%s)."
 
 #: actions/facebooksettings.php:213
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Keep your %1$s account but disconnect from Facebook. You'll use your %1$s "
 "password to log in."
diff --git a/plugins/ForceGroup/locale/br/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/br/LC_MESSAGES/ForceGroup.po
new file mode 100644
index 0000000000..ea92b7dab1
--- /dev/null
+++ b/plugins/ForceGroup/locale/br/LC_MESSAGES/ForceGroup.po
@@ -0,0 +1,36 @@
+# Translation of StatusNet - ForceGroup to Breton (Brezhoneg)
+# Expored 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 - ForceGroup\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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-01-10 18:26:01+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: br\n"
+"X-Message-Group: #out-statusnet-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.
+#: 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."
+msgstr ""
diff --git a/plugins/InProcessCache/locale/fr/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/fr/LC_MESSAGES/InProcessCache.po
new file mode 100644
index 0000000000..7ecedf459a
--- /dev/null
+++ b/plugins/InProcessCache/locale/fr/LC_MESSAGES/InProcessCache.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - InProcessCache to French (Français)
+# Expored from translatewiki.net
+#
+# Author: Sherbrooke
+# --
+# 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-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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-10 18:26:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: fr\n"
+"X-Message-Group: #out-statusnet-plugin-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
new file mode 100644
index 0000000000..c75561c5d9
--- /dev/null
+++ b/plugins/InProcessCache/locale/ia/LC_MESSAGES/InProcessCache.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - InProcessCache to Interlingua (Interlingua)
+# Expored from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - InProcessCache\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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-10 18:26:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-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
new file mode 100644
index 0000000000..09f44c2ad8
--- /dev/null
+++ b/plugins/InProcessCache/locale/mk/LC_MESSAGES/InProcessCache.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - InProcessCache to Macedonian (Македонски)
+# Expored from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - InProcessCache\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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-10 18:26:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-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
new file mode 100644
index 0000000000..889d41a9c0
--- /dev/null
+++ b/plugins/InProcessCache/locale/nl/LC_MESSAGES/InProcessCache.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - InProcessCache to Dutch (Nederlands)
+# Expored from translatewiki.net
+#
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - InProcessCache\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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-10 18:26:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-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/ru/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/ru/LC_MESSAGES/InProcessCache.po
new file mode 100644
index 0000000000..090b6c790c
--- /dev/null
+++ b/plugins/InProcessCache/locale/ru/LC_MESSAGES/InProcessCache.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - InProcessCache to Russian (Русский)
+# Expored from translatewiki.net
+#
+# Author: Александр Сигачёв
+# --
+# 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-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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-10 18:26:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ru\n"
+"X-Message-Group: #out-statusnet-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
new file mode 100644
index 0000000000..e2be01ffbd
--- /dev/null
+++ b/plugins/InProcessCache/locale/uk/LC_MESSAGES/InProcessCache.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - InProcessCache to Ukrainian (Українська)
+# Expored from translatewiki.net
+#
+# Author: Boogie
+# --
+# 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-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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 (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-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/Mapstraction/locale/br/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/br/LC_MESSAGES/Mapstraction.po
index 7bc4a4a155..7eb61b0493 100644
--- a/plugins/Mapstraction/locale/br/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/br/LC_MESSAGES/Mapstraction.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:13+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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: 2010-11-30 20:40:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:04+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
@@ -56,7 +56,7 @@ msgstr "Kartenn mignoned %s"
 #: allmap.php:75
 #, fuzzy, php-format
 msgid "%1$s friends map, page %2$d"
-msgstr "%s gartenn, pajenn %d"
+msgstr "Kartenn mignoned %d, pajenn %d"
 
 #: usermap.php:68
 #, php-format
diff --git a/plugins/MobileProfile/locale/bg/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/bg/LC_MESSAGES/MobileProfile.po
new file mode 100644
index 0000000000..93e39f57b1
--- /dev/null
+++ b/plugins/MobileProfile/locale/bg/LC_MESSAGES/MobileProfile.po
@@ -0,0 +1,78 @@
+# Translation of StatusNet - MobileProfile to Bulgarian (Български)
+# Expored from translatewiki.net
+#
+# Author: DCLXVI
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - MobileProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33:27+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-10 18:26:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: bg\n"
+"X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: MobileProfilePlugin.php:193
+msgid "This page is not available in a media type you accept."
+msgstr ""
+
+#: MobileProfilePlugin.php:310
+msgid "Home"
+msgstr ""
+
+#: MobileProfilePlugin.php:312
+msgid "Account"
+msgstr ""
+
+#: MobileProfilePlugin.php:314
+msgid "Connect"
+msgstr ""
+
+#: MobileProfilePlugin.php:317
+msgid "Admin"
+msgstr ""
+
+#: MobileProfilePlugin.php:317
+msgid "Change site configuration"
+msgstr ""
+
+#: MobileProfilePlugin.php:321
+msgid "Invite"
+msgstr ""
+
+#: MobileProfilePlugin.php:324
+msgid "Logout"
+msgstr "Излизане"
+
+#: MobileProfilePlugin.php:328
+msgid "Register"
+msgstr ""
+
+#: MobileProfilePlugin.php:331
+msgid "Login"
+msgstr "Влизане"
+
+#: MobileProfilePlugin.php:335
+msgid "Search"
+msgstr "Търсене"
+
+#: MobileProfilePlugin.php:361
+msgid "Attach"
+msgstr "Прикачване"
+
+#: MobileProfilePlugin.php:365
+msgid "Attach a file"
+msgstr "Прикачване на файл"
+
+#: MobileProfilePlugin.php:417
+msgid "XHTML MobileProfile output for supporting user agents."
+msgstr ""
diff --git a/plugins/NewMenu/locale/NewMenu.pot b/plugins/NewMenu/locale/NewMenu.pot
new file mode 100644
index 0000000000..191a3a8bcc
--- /dev/null
+++ b/plugins/NewMenu/locale/NewMenu.pot
@@ -0,0 +1,93 @@
+# 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-01-14 10:29+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"
+
+#: NewMenuPlugin.php:99
+msgid "Home"
+msgstr ""
+
+#: NewMenuPlugin.php:100
+msgid "Friends timeline"
+msgstr ""
+
+#: NewMenuPlugin.php:105
+msgid "Profile"
+msgstr ""
+
+#: NewMenuPlugin.php:106
+msgid "Your profile"
+msgstr ""
+
+#: NewMenuPlugin.php:110 NewMenuPlugin.php:133
+msgid "Public"
+msgstr ""
+
+#: NewMenuPlugin.php:111 NewMenuPlugin.php:134
+msgid "Everyone on this site"
+msgstr ""
+
+#: NewMenuPlugin.php:115
+msgid "Settings"
+msgstr ""
+
+#: NewMenuPlugin.php:116
+msgid "Change your personal settings"
+msgstr ""
+
+#: NewMenuPlugin.php:121
+msgid "Admin"
+msgstr ""
+
+#: NewMenuPlugin.php:122
+msgid "Site configuration"
+msgstr ""
+
+#: NewMenuPlugin.php:127
+msgid "Logout"
+msgstr ""
+
+#: NewMenuPlugin.php:128
+msgid "Logout from the site"
+msgstr ""
+
+#: NewMenuPlugin.php:138
+msgid "Login"
+msgstr ""
+
+#: NewMenuPlugin.php:139
+msgid "Login to the site"
+msgstr ""
+
+#: NewMenuPlugin.php:146
+msgid "Search"
+msgstr ""
+
+#: NewMenuPlugin.php:147
+msgid "Search the site"
+msgstr ""
+
+#: NewMenuPlugin.php:332
+msgid "IM"
+msgstr ""
+
+#: NewMenuPlugin.php:339
+msgid "SMS"
+msgstr ""
+
+#: NewMenuPlugin.php:431
+msgid "A preview of the new menu layout in StatusNet 1.0."
+msgstr ""
diff --git a/plugins/OStatus/locale/OStatus.pot b/plugins/OStatus/locale/OStatus.pot
index 212bb7a327..d14c29322c 100644
--- a/plugins/OStatus/locale/OStatus.pot
+++ b/plugins/OStatus/locale/OStatus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+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,94 +18,94 @@ 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:225 OStatusPlugin.php:935
+#: OStatusPlugin.php:223 OStatusPlugin.php:933
 msgid "Subscribe"
 msgstr ""
 
 #. TRANS: Link description for link to join a remote group.
-#: OStatusPlugin.php:244 OStatusPlugin.php:653 actions/ostatussub.php:109
+#: OStatusPlugin.php:242 OStatusPlugin.php:651 actions/ostatussub.php:109
 msgid "Join"
 msgstr ""
 
 #. TRANSLATE: %s is a domain.
-#: OStatusPlugin.php:457
+#: OStatusPlugin.php:455
 #, php-format
 msgid "Sent from %s via OStatus"
 msgstr ""
 
 #. TRANS: Exception.
-#: OStatusPlugin.php:529
+#: OStatusPlugin.php:527
 msgid "Could not set up remote subscription."
 msgstr ""
 
-#: OStatusPlugin.php:603
+#: 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:606
+#: OStatusPlugin.php:604
 #, php-format
 msgid "%1$s stopped following %2$s."
 msgstr ""
 
-#: OStatusPlugin.php:634
+#: 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:656
+#: OStatusPlugin.php:654
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Exception.
-#: OStatusPlugin.php:665
+#: OStatusPlugin.php:663
 msgid "Failed joining remote group."
 msgstr ""
 
-#: OStatusPlugin.php:705
+#: 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:708
+#: OStatusPlugin.php:706
 #, php-format
 msgid "%1$s has left group %2$s."
 msgstr ""
 
-#: OStatusPlugin.php:783
+#: 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:786
+#: OStatusPlugin.php:784
 #, php-format
 msgid "%1$s marked notice %2$s as no longer a favorite."
 msgstr ""
 
 #. TRANS: Link text for link to remote subscribe.
-#: OStatusPlugin.php:862
+#: OStatusPlugin.php:860
 msgid "Remote"
 msgstr ""
 
 #. TRANS: Title for activity.
-#: OStatusPlugin.php:902
+#: 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:905
+#: OStatusPlugin.php:903
 #, php-format
 msgid "%s has updated their profile page."
 msgstr ""
 
 #. TRANS: Plugin description.
-#: OStatusPlugin.php:950
+#: OStatusPlugin.php:948
 msgid ""
 "Follow people across social networks that implement <a href=\"http://ostatus."
 "org/\">OStatus</a>."
@@ -156,102 +156,102 @@ msgid "RSS feed without a channel."
 msgstr ""
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:478
+#: classes/Ostatus_profile.php:479
 msgid "Can't handle that kind of post."
 msgstr ""
 
 #. TRANS: Client exception. %s is a source URI.
-#: classes/Ostatus_profile.php:561
+#: classes/Ostatus_profile.php:537
 #, 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:596
+#: classes/Ostatus_profile.php:572
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:789
+#: classes/Ostatus_profile.php:765
 #, php-format
 msgid "Could not reach profile page %s."
 msgstr ""
 
 #. TRANS: Exception. %s is a URL.
-#: classes/Ostatus_profile.php:847
+#: classes/Ostatus_profile.php:823
 #, php-format
 msgid "Could not find a feed URL for profile page %s."
 msgstr ""
 
 #. TRANS: Feed sub exception.
-#: classes/Ostatus_profile.php:985
+#: classes/Ostatus_profile.php:922
 msgid "Can't find enough profile information to make a feed."
 msgstr ""
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:1045
+#: classes/Ostatus_profile.php:986
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr ""
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:1056
+#: classes/Ostatus_profile.php:997
 #, php-format
 msgid "Tried to update avatar for unsaved remote profile %s."
 msgstr ""
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:1066
+#: classes/Ostatus_profile.php:1007
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1292
+#: classes/Ostatus_profile.php:1233
 msgid "Local user can't be referenced as remote."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1297
+#: classes/Ostatus_profile.php:1238
 msgid "Local group can't be referenced as remote."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1349 classes/Ostatus_profile.php:1360
+#: classes/Ostatus_profile.php:1290 classes/Ostatus_profile.php:1301
 msgid "Can't save local profile."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1368
+#: classes/Ostatus_profile.php:1309
 msgid "Can't save OStatus profile."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1632 classes/Ostatus_profile.php:1660
+#: classes/Ostatus_profile.php:1573 classes/Ostatus_profile.php:1601
 msgid "Not a valid webfinger address."
 msgstr ""
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1742
+#: classes/Ostatus_profile.php:1683
 #, php-format
 msgid "Couldn't save profile for \"%s\"."
 msgstr ""
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1761
+#: classes/Ostatus_profile.php:1702
 #, php-format
 msgid "Couldn't save ostatus_profile for \"%s\"."
 msgstr ""
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1769
+#: classes/Ostatus_profile.php:1710
 #, php-format
 msgid "Couldn't find a valid profile for \"%s\"."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1812
+#: classes/Ostatus_profile.php:1753
 msgid "Could not store HTML content of long post as file."
 msgstr ""
 
@@ -268,72 +268,72 @@ msgid "Callback returned status: %1$s. Body: %2$s"
 msgstr ""
 
 #. TRANS: Client error. POST is a HTTP command. It should not be translated.
-#: lib/salmonaction.php:42
+#: lib/salmonaction.php:43
 msgid "This method requires a POST."
 msgstr ""
 
 #. TRANS: Client error. Do not translate "application/magic-envelope+xml"
-#: lib/salmonaction.php:47
+#: lib/salmonaction.php:48
 msgid "Salmon requires \"application/magic-envelope+xml\"."
 msgstr ""
 
 #. TRANS: Client error.
-#: lib/salmonaction.php:57
+#: lib/salmonaction.php:58
 msgid "Salmon signature verification failed."
 msgstr ""
 
 #. TRANS: Client error.
-#: lib/salmonaction.php:69
+#: lib/salmonaction.php:70
 msgid "Salmon post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:118
+#: lib/salmonaction.php:120
 msgid "Unrecognized activity type."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:127
+#: lib/salmonaction.php:130
 msgid "This target doesn't understand posts."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:133
+#: lib/salmonaction.php:136
 msgid "This target doesn't understand follows."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:139
+#: lib/salmonaction.php:142
 msgid "This target doesn't understand unfollows."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:145
+#: lib/salmonaction.php:148
 msgid "This target doesn't understand favorites."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:151
+#: lib/salmonaction.php:154
 msgid "This target doesn't understand unfavorites."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:157
+#: lib/salmonaction.php:160
 msgid "This target doesn't understand share events."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:163
+#: lib/salmonaction.php:166
 msgid "This target doesn't understand joins."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:169
+#: lib/salmonaction.php:172
 msgid "This target doesn't understand leave events."
 msgstr ""
 
 #. TRANS: Exception.
-#: lib/salmonaction.php:197
+#: lib/salmonaction.php:200
 msgid "Received a salmon slap from unidentified actor."
 msgstr ""
 
@@ -423,38 +423,38 @@ msgid "No ID."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:81
+#: actions/usersalmon.php:83
 msgid "In reply to unknown notice."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:86
+#: 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:163
+#: actions/usersalmon.php:165
 msgid "Could not save new favorite."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:195
+#: actions/usersalmon.php:197
 msgid "Can't favorite/unfavorite without an object."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:207
+#: 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:214
+#: 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:219
+#: actions/usersalmon.php:221
 #, php-format
 msgid "Notice with ID %1$s not posted by %2$s."
 msgstr ""
@@ -512,36 +512,36 @@ msgid "No such group."
 msgstr ""
 
 #. TRANS: Client error.
-#: actions/groupsalmon.php:53
+#: actions/groupsalmon.php:56
 msgid "Can't accept remote posts for a remote group."
 msgstr ""
 
 #. TRANS: Client error.
-#: actions/groupsalmon.php:127
+#: actions/groupsalmon.php:130
 msgid "Can't read profile to set up group membership."
 msgstr ""
 
 #. TRANS: Client error.
-#: actions/groupsalmon.php:131 actions/groupsalmon.php:174
+#: actions/groupsalmon.php:134 actions/groupsalmon.php:177
 msgid "Groups can't join groups."
 msgstr ""
 
-#: actions/groupsalmon.php:144
+#: 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:159
+#: actions/groupsalmon.php:162
 #, php-format
 msgid "Could not join remote user %1$s to group %2$s."
 msgstr ""
 
-#: actions/groupsalmon.php:171
+#: 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:188
+#: actions/groupsalmon.php:191
 #, php-format
 msgid "Could not remove remote user %1$s from group %2$s."
 msgstr ""
diff --git a/plugins/OStatus/locale/br/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/br/LC_MESSAGES/OStatus.po
index 4f41ba1371..cad5dd558c 100644
--- a/plugins/OStatus/locale/br/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/br/LC_MESSAGES/OStatus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:44+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -23,94 +23,94 @@ 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:225 OStatusPlugin.php:935
+#: OStatusPlugin.php:223 OStatusPlugin.php:933
 msgid "Subscribe"
 msgstr "Koumanantiñ"
 
 #. TRANS: Link description for link to join a remote group.
-#: OStatusPlugin.php:244 OStatusPlugin.php:653 actions/ostatussub.php:109
+#: OStatusPlugin.php:242 OStatusPlugin.php:651 actions/ostatussub.php:109
 msgid "Join"
 msgstr "Stagañ"
 
 #. TRANSLATE: %s is a domain.
-#: OStatusPlugin.php:457
+#: OStatusPlugin.php:455
 #, php-format
 msgid "Sent from %s via OStatus"
 msgstr "Kaset adalek %s dre OStatus"
 
 #. TRANS: Exception.
-#: OStatusPlugin.php:529
+#: OStatusPlugin.php:527
 msgid "Could not set up remote subscription."
 msgstr ""
 
-#: OStatusPlugin.php:603
+#: OStatusPlugin.php:601
 msgid "Unfollow"
 msgstr "Chom hep heuliañ"
 
 #. 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:606
+#: OStatusPlugin.php:604
 #, php-format
 msgid "%1$s stopped following %2$s."
 msgstr ""
 
-#: OStatusPlugin.php:634
+#: 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:656
+#: OStatusPlugin.php:654
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr "%1$s a zo bet er strollad %2$s."
 
 #. TRANS: Exception.
-#: OStatusPlugin.php:665
+#: OStatusPlugin.php:663
 msgid "Failed joining remote group."
 msgstr ""
 
-#: OStatusPlugin.php:705
+#: OStatusPlugin.php:703
 msgid "Leave"
 msgstr "Kuitaat"
 
 #. 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:708
+#: OStatusPlugin.php:706
 #, php-format
 msgid "%1$s has left group %2$s."
 msgstr ""
 
-#: OStatusPlugin.php:783
+#: 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:786
+#: OStatusPlugin.php:784
 #, php-format
 msgid "%1$s marked notice %2$s as no longer a favorite."
 msgstr ""
 
 #. TRANS: Link text for link to remote subscribe.
-#: OStatusPlugin.php:862
+#: OStatusPlugin.php:860
 msgid "Remote"
 msgstr ""
 
 #. TRANS: Title for activity.
-#: OStatusPlugin.php:902
+#: 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:905
+#: OStatusPlugin.php:903
 #, php-format
 msgid "%s has updated their profile page."
 msgstr ""
 
 #. TRANS: Plugin description.
-#: OStatusPlugin.php:950
+#: OStatusPlugin.php:948
 msgid ""
 "Follow people across social networks that implement <a href=\"http://ostatus."
 "org/\">OStatus</a>."
@@ -161,102 +161,102 @@ msgid "RSS feed without a channel."
 msgstr ""
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:478
+#: classes/Ostatus_profile.php:479
 msgid "Can't handle that kind of post."
 msgstr ""
 
 #. TRANS: Client exception. %s is a source URI.
-#: classes/Ostatus_profile.php:561
+#: classes/Ostatus_profile.php:537
 #, 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:596
+#: classes/Ostatus_profile.php:572
 msgid "Show more"
 msgstr "Diskouez muioc'h"
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:789
+#: classes/Ostatus_profile.php:765
 #, php-format
 msgid "Could not reach profile page %s."
 msgstr ""
 
 #. TRANS: Exception. %s is a URL.
-#: classes/Ostatus_profile.php:847
+#: classes/Ostatus_profile.php:823
 #, php-format
 msgid "Could not find a feed URL for profile page %s."
 msgstr ""
 
 #. TRANS: Feed sub exception.
-#: classes/Ostatus_profile.php:985
+#: classes/Ostatus_profile.php:922
 msgid "Can't find enough profile information to make a feed."
 msgstr ""
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:1045
+#: classes/Ostatus_profile.php:986
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr ""
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:1056
+#: classes/Ostatus_profile.php:997
 #, php-format
 msgid "Tried to update avatar for unsaved remote profile %s."
 msgstr ""
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:1066
+#: classes/Ostatus_profile.php:1007
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1292
+#: classes/Ostatus_profile.php:1233
 msgid "Local user can't be referenced as remote."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1297
+#: classes/Ostatus_profile.php:1238
 msgid "Local group can't be referenced as remote."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1349 classes/Ostatus_profile.php:1360
+#: classes/Ostatus_profile.php:1290 classes/Ostatus_profile.php:1301
 msgid "Can't save local profile."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1368
+#: classes/Ostatus_profile.php:1309
 msgid "Can't save OStatus profile."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1632 classes/Ostatus_profile.php:1660
+#: classes/Ostatus_profile.php:1573 classes/Ostatus_profile.php:1601
 msgid "Not a valid webfinger address."
 msgstr ""
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1742
+#: classes/Ostatus_profile.php:1683
 #, php-format
 msgid "Couldn't save profile for \"%s\"."
 msgstr ""
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1761
+#: classes/Ostatus_profile.php:1702
 #, php-format
 msgid "Couldn't save ostatus_profile for \"%s\"."
 msgstr ""
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1769
+#: classes/Ostatus_profile.php:1710
 #, php-format
 msgid "Couldn't find a valid profile for \"%s\"."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1812
+#: classes/Ostatus_profile.php:1753
 msgid "Could not store HTML content of long post as file."
 msgstr ""
 
@@ -273,72 +273,72 @@ msgid "Callback returned status: %1$s. Body: %2$s"
 msgstr ""
 
 #. TRANS: Client error. POST is a HTTP command. It should not be translated.
-#: lib/salmonaction.php:42
+#: lib/salmonaction.php:43
 msgid "This method requires a POST."
 msgstr ""
 
 #. TRANS: Client error. Do not translate "application/magic-envelope+xml"
-#: lib/salmonaction.php:47
+#: lib/salmonaction.php:48
 msgid "Salmon requires \"application/magic-envelope+xml\"."
 msgstr ""
 
 #. TRANS: Client error.
-#: lib/salmonaction.php:57
+#: lib/salmonaction.php:58
 msgid "Salmon signature verification failed."
 msgstr ""
 
 #. TRANS: Client error.
-#: lib/salmonaction.php:69
+#: lib/salmonaction.php:70
 msgid "Salmon post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:118
+#: lib/salmonaction.php:120
 msgid "Unrecognized activity type."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:127
+#: lib/salmonaction.php:130
 msgid "This target doesn't understand posts."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:133
+#: lib/salmonaction.php:136
 msgid "This target doesn't understand follows."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:139
+#: lib/salmonaction.php:142
 msgid "This target doesn't understand unfollows."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:145
+#: lib/salmonaction.php:148
 msgid "This target doesn't understand favorites."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:151
+#: lib/salmonaction.php:154
 msgid "This target doesn't understand unfavorites."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:157
+#: lib/salmonaction.php:160
 msgid "This target doesn't understand share events."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:163
+#: lib/salmonaction.php:166
 msgid "This target doesn't understand joins."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:169
+#: lib/salmonaction.php:172
 msgid "This target doesn't understand leave events."
 msgstr ""
 
 #. TRANS: Exception.
-#: lib/salmonaction.php:197
+#: lib/salmonaction.php:200
 msgid "Received a salmon slap from unidentified actor."
 msgstr ""
 
@@ -428,38 +428,38 @@ msgid "No ID."
 msgstr "ID ebet"
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:81
+#: actions/usersalmon.php:83
 msgid "In reply to unknown notice."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:86
+#: 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:163
+#: actions/usersalmon.php:165
 msgid "Could not save new favorite."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:195
+#: actions/usersalmon.php:197
 msgid "Can't favorite/unfavorite without an object."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:207
+#: 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:214
+#: 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:219
+#: actions/usersalmon.php:221
 #, php-format
 msgid "Notice with ID %1$s not posted by %2$s."
 msgstr ""
@@ -482,7 +482,7 @@ msgstr "Kenderc'hel"
 
 #: actions/ostatusgroup.php:105
 msgid "You are already a member of this group."
-msgstr ""
+msgstr "Un ezel eus ar strollad-mañ oc'h dija."
 
 #. TRANS: OStatus remote group subscription dialog error.
 #: actions/ostatusgroup.php:140
@@ -517,36 +517,36 @@ msgid "No such group."
 msgstr "N'eus ket eus ar strollad-se."
 
 #. TRANS: Client error.
-#: actions/groupsalmon.php:53
+#: actions/groupsalmon.php:56
 msgid "Can't accept remote posts for a remote group."
 msgstr ""
 
 #. TRANS: Client error.
-#: actions/groupsalmon.php:127
+#: actions/groupsalmon.php:130
 msgid "Can't read profile to set up group membership."
 msgstr ""
 
 #. TRANS: Client error.
-#: actions/groupsalmon.php:131 actions/groupsalmon.php:174
+#: actions/groupsalmon.php:134 actions/groupsalmon.php:177
 msgid "Groups can't join groups."
-msgstr ""
+msgstr "Ne c'hell ket strolladoù mont e strolladoù."
 
-#: actions/groupsalmon.php:144
+#: actions/groupsalmon.php:147
 msgid "You have been blocked from that group by the admin."
-msgstr ""
+msgstr "Stanket oc'h bet eus ar strollad-mañ gant ur merour."
 
 #. TRANS: Server error. %1$s is a profile URI, %2$s is a group nickname.
-#: actions/groupsalmon.php:159
+#: actions/groupsalmon.php:162
 #, php-format
 msgid "Could not join remote user %1$s to group %2$s."
-msgstr ""
+msgstr "Dibosupl eo distagañ an implijer %1$s deus ar strollad %2$s."
 
-#: actions/groupsalmon.php:171
+#: 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:188
+#: actions/groupsalmon.php:191
 #, php-format
 msgid "Could not remove remote user %1$s from group %2$s."
 msgstr ""
diff --git a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
index 2cc4f73728..067c78e1c1 100644
--- a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:44+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -24,94 +24,94 @@ 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:225 OStatusPlugin.php:935
+#: OStatusPlugin.php:223 OStatusPlugin.php:933
 msgid "Subscribe"
 msgstr "S'abonner"
 
 #. TRANS: Link description for link to join a remote group.
-#: OStatusPlugin.php:244 OStatusPlugin.php:653 actions/ostatussub.php:109
+#: OStatusPlugin.php:242 OStatusPlugin.php:651 actions/ostatussub.php:109
 msgid "Join"
 msgstr "Rejoindre"
 
 #. TRANSLATE: %s is a domain.
-#: OStatusPlugin.php:457
+#: OStatusPlugin.php:455
 #, php-format
 msgid "Sent from %s via OStatus"
 msgstr "Envoyé depuis %s via OStatus"
 
 #. TRANS: Exception.
-#: OStatusPlugin.php:529
+#: OStatusPlugin.php:527
 msgid "Could not set up remote subscription."
 msgstr "Impossible de mettre en place l’abonnement distant."
 
-#: OStatusPlugin.php:603
+#: 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:606
+#: OStatusPlugin.php:604
 #, php-format
 msgid "%1$s stopped following %2$s."
 msgstr "%1$s a cessé de suivre %2$s."
 
-#: OStatusPlugin.php:634
+#: 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:656
+#: 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:665
+#: OStatusPlugin.php:663
 msgid "Failed joining remote group."
 msgstr "Échec lors de l’adhésion au groupe distant."
 
-#: OStatusPlugin.php:705
+#: 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:708
+#: OStatusPlugin.php:706
 #, php-format
 msgid "%1$s has left group %2$s."
 msgstr "%1$s a quitté le groupe %2$s."
 
-#: OStatusPlugin.php:783
+#: 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:786
+#: 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:862
+#: OStatusPlugin.php:860
 msgid "Remote"
 msgstr "À distance"
 
 #. TRANS: Title for activity.
-#: OStatusPlugin.php:902
+#: 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:905
+#: 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:950
+#: OStatusPlugin.php:948
 msgid ""
 "Follow people across social networks that implement <a href=\"http://ostatus."
 "org/\">OStatus</a>."
@@ -174,30 +174,30 @@ msgid "RSS feed without a channel."
 msgstr "Flux RSS sans canal."
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:478
+#: classes/Ostatus_profile.php:479
 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:561
+#: classes/Ostatus_profile.php:537
 #, 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:596
+#: classes/Ostatus_profile.php:572
 msgid "Show more"
 msgstr "Voir davantage"
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:789
+#: classes/Ostatus_profile.php:765
 #, 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:847
+#: classes/Ostatus_profile.php:823
 #, php-format
 msgid "Could not find a feed URL for profile page %s."
 msgstr ""
@@ -205,20 +205,20 @@ msgstr ""
 "profil « %s »."
 
 #. TRANS: Feed sub exception.
-#: classes/Ostatus_profile.php:985
+#: classes/Ostatus_profile.php:922
 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:1045
+#: classes/Ostatus_profile.php:986
 #, 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:1056
+#: classes/Ostatus_profile.php:997
 #, php-format
 msgid "Tried to update avatar for unsaved remote profile %s."
 msgstr ""
@@ -226,56 +226,56 @@ msgstr ""
 "»."
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:1066
+#: classes/Ostatus_profile.php:1007
 #, 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:1292
+#: classes/Ostatus_profile.php:1233
 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:1297
+#: classes/Ostatus_profile.php:1238
 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:1349 classes/Ostatus_profile.php:1360
+#: classes/Ostatus_profile.php:1290 classes/Ostatus_profile.php:1301
 msgid "Can't save local profile."
 msgstr "Impossible de sauvegarder le profil local."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1368
+#: classes/Ostatus_profile.php:1309
 msgid "Can't save OStatus profile."
 msgstr "Impossible de sauvegarder le profil OStatus."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1632 classes/Ostatus_profile.php:1660
+#: classes/Ostatus_profile.php:1573 classes/Ostatus_profile.php:1601
 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:1742
+#: classes/Ostatus_profile.php:1683
 #, 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:1761
+#: classes/Ostatus_profile.php:1702
 #, 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:1769
+#: classes/Ostatus_profile.php:1710
 #, 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:1812
+#: classes/Ostatus_profile.php:1753
 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."
@@ -295,72 +295,72 @@ 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:42
+#: 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:47
+#: 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:57
+#: lib/salmonaction.php:58
 msgid "Salmon signature verification failed."
 msgstr "La vérification de signature Salmon a échoué."
 
 #. TRANS: Client error.
-#: lib/salmonaction.php:69
+#: 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:118
+#: lib/salmonaction.php:120
 msgid "Unrecognized activity type."
 msgstr "Type d’activité non reconnu."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:127
+#: 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:133
+#: 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:139
+#: 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:145
+#: 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:151
+#: 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:157
+#: 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:163
+#: 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:169
+#: 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:197
+#: lib/salmonaction.php:200
 msgid "Received a salmon slap from unidentified actor."
 msgstr "Réception d’une giffle Salmon d’un acteur non identifié."
 
@@ -459,41 +459,41 @@ msgid "No ID."
 msgstr "Aucun identifiant."
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:81
+#: actions/usersalmon.php:83
 msgid "In reply to unknown notice."
 msgstr "En réponse à l’avis inconnu."
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:86
+#: 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:163
+#: actions/usersalmon.php:165
 msgid "Could not save new favorite."
 msgstr "Impossible de sauvegarder le nouveau favori."
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:195
+#: 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:207
+#: 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:214
+#: 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:219
+#: 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."
@@ -555,38 +555,38 @@ msgid "No such group."
 msgstr "Groupe inexistant."
 
 #. TRANS: Client error.
-#: actions/groupsalmon.php:53
+#: 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:127
+#: 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:131 actions/groupsalmon.php:174
+#: 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:144
+#: 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:159
+#: 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:171
+#: 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:188
+#: 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."
diff --git a/plugins/OStatus/locale/gl/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/gl/LC_MESSAGES/OStatus.po
index 4c3376e94a..bf492b90e3 100644
--- a/plugins/OStatus/locale/gl/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/gl/LC_MESSAGES/OStatus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:44+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33:50+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: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -23,94 +23,94 @@ 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:225 OStatusPlugin.php:935
+#: OStatusPlugin.php:223 OStatusPlugin.php:933
 msgid "Subscribe"
 msgstr "Subscribirse"
 
 #. TRANS: Link description for link to join a remote group.
-#: OStatusPlugin.php:244 OStatusPlugin.php:653 actions/ostatussub.php:109
+#: OStatusPlugin.php:242 OStatusPlugin.php:651 actions/ostatussub.php:109
 msgid "Join"
 msgstr "Unirse"
 
 #. TRANSLATE: %s is a domain.
-#: OStatusPlugin.php:457
+#: OStatusPlugin.php:455
 #, php-format
 msgid "Sent from %s via OStatus"
 msgstr ""
 
 #. TRANS: Exception.
-#: OStatusPlugin.php:529
+#: OStatusPlugin.php:527
 msgid "Could not set up remote subscription."
 msgstr ""
 
-#: OStatusPlugin.php:603
+#: 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:606
+#: OStatusPlugin.php:604
 #, php-format
 msgid "%1$s stopped following %2$s."
 msgstr ""
 
-#: OStatusPlugin.php:634
+#: 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:656
+#: OStatusPlugin.php:654
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr ""
 
 #. TRANS: Exception.
-#: OStatusPlugin.php:665
+#: OStatusPlugin.php:663
 msgid "Failed joining remote group."
 msgstr ""
 
-#: OStatusPlugin.php:705
+#: OStatusPlugin.php:703
 msgid "Leave"
 msgstr "Deixar"
 
 #. 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:708
+#: OStatusPlugin.php:706
 #, php-format
 msgid "%1$s has left group %2$s."
 msgstr ""
 
-#: OStatusPlugin.php:783
+#: 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:786
+#: OStatusPlugin.php:784
 #, php-format
 msgid "%1$s marked notice %2$s as no longer a favorite."
 msgstr ""
 
 #. TRANS: Link text for link to remote subscribe.
-#: OStatusPlugin.php:862
+#: OStatusPlugin.php:860
 msgid "Remote"
 msgstr ""
 
 #. TRANS: Title for activity.
-#: OStatusPlugin.php:902
+#: OStatusPlugin.php:900
 msgid "Profile update"
 msgstr "Actualización do perfil"
 
 #. TRANS: Ping text for remote profile update through OStatus.
 #. TRANS: %s is user that updated their profile.
-#: OStatusPlugin.php:905
+#: OStatusPlugin.php:903
 #, php-format
 msgid "%s has updated their profile page."
 msgstr ""
 
 #. TRANS: Plugin description.
-#: OStatusPlugin.php:950
+#: OStatusPlugin.php:948
 msgid ""
 "Follow people across social networks that implement <a href=\"http://ostatus."
 "org/\">OStatus</a>."
@@ -161,102 +161,102 @@ msgid "RSS feed without a channel."
 msgstr ""
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:478
+#: classes/Ostatus_profile.php:479
 msgid "Can't handle that kind of post."
 msgstr ""
 
 #. TRANS: Client exception. %s is a source URI.
-#: classes/Ostatus_profile.php:561
+#: classes/Ostatus_profile.php:537
 #, 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:596
+#: classes/Ostatus_profile.php:572
 msgid "Show more"
 msgstr "Mostrar máis"
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:789
+#: classes/Ostatus_profile.php:765
 #, php-format
 msgid "Could not reach profile page %s."
 msgstr ""
 
 #. TRANS: Exception. %s is a URL.
-#: classes/Ostatus_profile.php:847
+#: classes/Ostatus_profile.php:823
 #, php-format
 msgid "Could not find a feed URL for profile page %s."
 msgstr ""
 
 #. TRANS: Feed sub exception.
-#: classes/Ostatus_profile.php:985
+#: classes/Ostatus_profile.php:922
 msgid "Can't find enough profile information to make a feed."
 msgstr ""
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:1045
+#: classes/Ostatus_profile.php:986
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr ""
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:1056
+#: classes/Ostatus_profile.php:997
 #, php-format
 msgid "Tried to update avatar for unsaved remote profile %s."
 msgstr ""
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:1066
+#: classes/Ostatus_profile.php:1007
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1292
+#: classes/Ostatus_profile.php:1233
 msgid "Local user can't be referenced as remote."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1297
+#: classes/Ostatus_profile.php:1238
 msgid "Local group can't be referenced as remote."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1349 classes/Ostatus_profile.php:1360
+#: classes/Ostatus_profile.php:1290 classes/Ostatus_profile.php:1301
 msgid "Can't save local profile."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1368
+#: classes/Ostatus_profile.php:1309
 msgid "Can't save OStatus profile."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1632 classes/Ostatus_profile.php:1660
+#: classes/Ostatus_profile.php:1573 classes/Ostatus_profile.php:1601
 msgid "Not a valid webfinger address."
 msgstr ""
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1742
+#: classes/Ostatus_profile.php:1683
 #, php-format
 msgid "Couldn't save profile for \"%s\"."
 msgstr ""
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1761
+#: classes/Ostatus_profile.php:1702
 #, php-format
 msgid "Couldn't save ostatus_profile for \"%s\"."
 msgstr ""
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1769
+#: classes/Ostatus_profile.php:1710
 #, php-format
 msgid "Couldn't find a valid profile for \"%s\"."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1812
+#: classes/Ostatus_profile.php:1753
 msgid "Could not store HTML content of long post as file."
 msgstr ""
 
@@ -273,72 +273,72 @@ msgid "Callback returned status: %1$s. Body: %2$s"
 msgstr ""
 
 #. TRANS: Client error. POST is a HTTP command. It should not be translated.
-#: lib/salmonaction.php:42
+#: lib/salmonaction.php:43
 msgid "This method requires a POST."
 msgstr ""
 
 #. TRANS: Client error. Do not translate "application/magic-envelope+xml"
-#: lib/salmonaction.php:47
+#: lib/salmonaction.php:48
 msgid "Salmon requires \"application/magic-envelope+xml\"."
 msgstr ""
 
 #. TRANS: Client error.
-#: lib/salmonaction.php:57
+#: lib/salmonaction.php:58
 msgid "Salmon signature verification failed."
 msgstr ""
 
 #. TRANS: Client error.
-#: lib/salmonaction.php:69
+#: lib/salmonaction.php:70
 msgid "Salmon post must be an Atom entry."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:118
+#: lib/salmonaction.php:120
 msgid "Unrecognized activity type."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:127
+#: lib/salmonaction.php:130
 msgid "This target doesn't understand posts."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:133
+#: lib/salmonaction.php:136
 msgid "This target doesn't understand follows."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:139
+#: lib/salmonaction.php:142
 msgid "This target doesn't understand unfollows."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:145
+#: lib/salmonaction.php:148
 msgid "This target doesn't understand favorites."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:151
+#: lib/salmonaction.php:154
 msgid "This target doesn't understand unfavorites."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:157
+#: lib/salmonaction.php:160
 msgid "This target doesn't understand share events."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:163
+#: lib/salmonaction.php:166
 msgid "This target doesn't understand joins."
 msgstr ""
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:169
+#: lib/salmonaction.php:172
 msgid "This target doesn't understand leave events."
 msgstr ""
 
 #. TRANS: Exception.
-#: lib/salmonaction.php:197
+#: lib/salmonaction.php:200
 msgid "Received a salmon slap from unidentified actor."
 msgstr ""
 
@@ -428,38 +428,38 @@ msgid "No ID."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:81
+#: actions/usersalmon.php:83
 msgid "In reply to unknown notice."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:86
+#: 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:163
+#: actions/usersalmon.php:165
 msgid "Could not save new favorite."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:195
+#: actions/usersalmon.php:197
 msgid "Can't favorite/unfavorite without an object."
 msgstr ""
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:207
+#: 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:214
+#: 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:219
+#: actions/usersalmon.php:221
 #, php-format
 msgid "Notice with ID %1$s not posted by %2$s."
 msgstr ""
@@ -517,36 +517,36 @@ msgid "No such group."
 msgstr ""
 
 #. TRANS: Client error.
-#: actions/groupsalmon.php:53
+#: actions/groupsalmon.php:56
 msgid "Can't accept remote posts for a remote group."
 msgstr ""
 
 #. TRANS: Client error.
-#: actions/groupsalmon.php:127
+#: actions/groupsalmon.php:130
 msgid "Can't read profile to set up group membership."
 msgstr ""
 
 #. TRANS: Client error.
-#: actions/groupsalmon.php:131 actions/groupsalmon.php:174
+#: actions/groupsalmon.php:134 actions/groupsalmon.php:177
 msgid "Groups can't join groups."
 msgstr ""
 
-#: actions/groupsalmon.php:144
+#: 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:159
+#: actions/groupsalmon.php:162
 #, php-format
 msgid "Could not join remote user %1$s to group %2$s."
 msgstr ""
 
-#: actions/groupsalmon.php:171
+#: 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:188
+#: actions/groupsalmon.php:191
 #, php-format
 msgid "Could not remove remote user %1$s from group %2$s."
 msgstr ""
diff --git a/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po
index a0cf61fc57..8e522802af 100644
--- a/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:44+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33:51+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -23,94 +23,94 @@ 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:225 OStatusPlugin.php:935
+#: OStatusPlugin.php:223 OStatusPlugin.php:933
 msgid "Subscribe"
 msgstr "Subscriber"
 
 #. TRANS: Link description for link to join a remote group.
-#: OStatusPlugin.php:244 OStatusPlugin.php:653 actions/ostatussub.php:109
+#: OStatusPlugin.php:242 OStatusPlugin.php:651 actions/ostatussub.php:109
 msgid "Join"
 msgstr "Inscriber"
 
 #. TRANSLATE: %s is a domain.
-#: OStatusPlugin.php:457
+#: OStatusPlugin.php:455
 #, php-format
 msgid "Sent from %s via OStatus"
 msgstr "Inviate de %s via OStatus"
 
 #. TRANS: Exception.
-#: OStatusPlugin.php:529
+#: OStatusPlugin.php:527
 msgid "Could not set up remote subscription."
 msgstr "Non poteva configurar le subscription remote."
 
-#: OStatusPlugin.php:603
+#: 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:606
+#: OStatusPlugin.php:604
 #, php-format
 msgid "%1$s stopped following %2$s."
 msgstr "%1$s cessava de sequer %2$s."
 
-#: OStatusPlugin.php:634
+#: 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:656
+#: 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:665
+#: OStatusPlugin.php:663
 msgid "Failed joining remote group."
 msgstr "Falleva de facer se membro del gruppo remote."
 
-#: OStatusPlugin.php:705
+#: 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:708
+#: OStatusPlugin.php:706
 #, php-format
 msgid "%1$s has left group %2$s."
 msgstr "%1$s ha quitate le gruppo %2$s."
 
-#: OStatusPlugin.php:783
+#: 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:786
+#: 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:862
+#: OStatusPlugin.php:860
 msgid "Remote"
 msgstr "Remote"
 
 #. TRANS: Title for activity.
-#: OStatusPlugin.php:902
+#: 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:905
+#: 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:950
+#: OStatusPlugin.php:948
 msgid ""
 "Follow people across social networks that implement <a href=\"http://ostatus."
 "org/\">OStatus</a>."
@@ -167,103 +167,103 @@ msgid "RSS feed without a channel."
 msgstr "Syndication RSS sin canal."
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:478
+#: classes/Ostatus_profile.php:479
 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:561
+#: classes/Ostatus_profile.php:537
 #, 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:596
+#: classes/Ostatus_profile.php:572
 msgid "Show more"
 msgstr "Monstrar plus"
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:789
+#: classes/Ostatus_profile.php:765
 #, 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:847
+#: classes/Ostatus_profile.php:823
 #, 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:985
+#: classes/Ostatus_profile.php:922
 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:1045
+#: classes/Ostatus_profile.php:986
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "URL de avatar %s invalide."
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:1056
+#: classes/Ostatus_profile.php:997
 #, 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:1066
+#: classes/Ostatus_profile.php:1007
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Incapace de obtener avatar ab %s."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1292
+#: classes/Ostatus_profile.php:1233
 msgid "Local user can't be referenced as remote."
 msgstr "Usator local non pote esser referentiate como remote."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1297
+#: classes/Ostatus_profile.php:1238
 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:1349 classes/Ostatus_profile.php:1360
+#: classes/Ostatus_profile.php:1290 classes/Ostatus_profile.php:1301
 msgid "Can't save local profile."
 msgstr "Non pote salveguardar profilo local."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1368
+#: classes/Ostatus_profile.php:1309
 msgid "Can't save OStatus profile."
 msgstr "Non pote salveguardar profilo OStatus."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1632 classes/Ostatus_profile.php:1660
+#: classes/Ostatus_profile.php:1573 classes/Ostatus_profile.php:1601
 msgid "Not a valid webfinger address."
 msgstr "Adresse webfinger invalide."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1742
+#: classes/Ostatus_profile.php:1683
 #, 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:1761
+#: classes/Ostatus_profile.php:1702
 #, 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:1769
+#: classes/Ostatus_profile.php:1710
 #, 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:1812
+#: classes/Ostatus_profile.php:1753
 msgid "Could not store HTML content of long post as file."
 msgstr "Non poteva immagazinar contento HTML de longe message como file."
 
@@ -280,72 +280,72 @@ 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:42
+#: 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:47
+#: lib/salmonaction.php:48
 msgid "Salmon requires \"application/magic-envelope+xml\"."
 msgstr "Salmon require \"application/magic-envelope+xml\"."
 
 #. TRANS: Client error.
-#: lib/salmonaction.php:57
+#: lib/salmonaction.php:58
 msgid "Salmon signature verification failed."
 msgstr "Verification de signatura Salmon falleva."
 
 #. TRANS: Client error.
-#: lib/salmonaction.php:69
+#: 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:118
+#: lib/salmonaction.php:120
 msgid "Unrecognized activity type."
 msgstr "Typo de activitate non recognoscite."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:127
+#: lib/salmonaction.php:130
 msgid "This target doesn't understand posts."
 msgstr "Iste destination non comprende messages."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:133
+#: lib/salmonaction.php:136
 msgid "This target doesn't understand follows."
 msgstr "Iste destination non comprende sequimentos."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:139
+#: 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:145
+#: 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:151
+#: 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:157
+#: 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:163
+#: 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:169
+#: 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:197
+#: lib/salmonaction.php:200
 msgid "Received a salmon slap from unidentified actor."
 msgstr "Recipeva un claffo de salmon de un actor non identificate."
 
@@ -438,40 +438,40 @@ msgid "No ID."
 msgstr "Nulle ID."
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:81
+#: actions/usersalmon.php:83
 msgid "In reply to unknown notice."
 msgstr "In responsa a un nota incognite."
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:86
+#: 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:163
+#: actions/usersalmon.php:165
 msgid "Could not save new favorite."
 msgstr "Non poteva salveguardar le nove favorite."
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:195
+#: 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:207
+#: 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:214
+#: 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:219
+#: 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."
@@ -532,36 +532,36 @@ msgid "No such group."
 msgstr "Gruppo non existe."
 
 #. TRANS: Client error.
-#: actions/groupsalmon.php:53
+#: 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:127
+#: 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:131 actions/groupsalmon.php:174
+#: actions/groupsalmon.php:134 actions/groupsalmon.php:177
 msgid "Groups can't join groups."
 msgstr "Gruppos non pote adherer a gruppos."
 
-#: actions/groupsalmon.php:144
+#: 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:159
+#: 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:171
+#: 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:188
+#: 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."
diff --git a/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po
index 7cf9f06ca8..0ffbaaa756 100644
--- a/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:45+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33:51+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -23,94 +23,94 @@ 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:225 OStatusPlugin.php:935
+#: OStatusPlugin.php:223 OStatusPlugin.php:933
 msgid "Subscribe"
 msgstr "Претплати се"
 
 #. TRANS: Link description for link to join a remote group.
-#: OStatusPlugin.php:244 OStatusPlugin.php:653 actions/ostatussub.php:109
+#: OStatusPlugin.php:242 OStatusPlugin.php:651 actions/ostatussub.php:109
 msgid "Join"
 msgstr "Зачлени се"
 
 #. TRANSLATE: %s is a domain.
-#: OStatusPlugin.php:457
+#: OStatusPlugin.php:455
 #, php-format
 msgid "Sent from %s via OStatus"
 msgstr "Испратено од %s преку OStatus"
 
 #. TRANS: Exception.
-#: OStatusPlugin.php:529
+#: OStatusPlugin.php:527
 msgid "Could not set up remote subscription."
 msgstr "Не можев да ја поставам далечинската претплата."
 
-#: OStatusPlugin.php:603
+#: 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:606
+#: OStatusPlugin.php:604
 #, php-format
 msgid "%1$s stopped following %2$s."
 msgstr "%1$s престана да го/ја следи %2$s."
 
-#: OStatusPlugin.php:634
+#: 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:656
+#: OStatusPlugin.php:654
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr "%1$s се зачлени во групата %2$s."
 
 #. TRANS: Exception.
-#: OStatusPlugin.php:665
+#: OStatusPlugin.php:663
 msgid "Failed joining remote group."
 msgstr "Не успеав да Ве зачленам во далечинската група."
 
-#: OStatusPlugin.php:705
+#: 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:708
+#: OStatusPlugin.php:706
 #, php-format
 msgid "%1$s has left group %2$s."
 msgstr "%1$s ја напушти групата %2$s."
 
-#: OStatusPlugin.php:783
+#: 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:786
+#: 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:862
+#: OStatusPlugin.php:860
 msgid "Remote"
 msgstr "Далечински"
 
 #. TRANS: Title for activity.
-#: OStatusPlugin.php:902
+#: 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:905
+#: OStatusPlugin.php:903
 #, php-format
 msgid "%s has updated their profile page."
 msgstr "%s ја поднови својата профилна страница."
 
 #. TRANS: Plugin description.
-#: OStatusPlugin.php:950
+#: OStatusPlugin.php:948
 msgid ""
 "Follow people across social networks that implement <a href=\"http://ostatus."
 "org/\">OStatus</a>."
@@ -170,103 +170,103 @@ msgid "RSS feed without a channel."
 msgstr "RSS-емитување без канал."
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:478
+#: classes/Ostatus_profile.php:479
 msgid "Can't handle that kind of post."
 msgstr "Не можам да работам со таква објава."
 
 #. TRANS: Client exception. %s is a source URI.
-#: classes/Ostatus_profile.php:561
+#: classes/Ostatus_profile.php:537
 #, 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:596
+#: classes/Ostatus_profile.php:572
 msgid "Show more"
 msgstr "Повеќе"
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:789
+#: classes/Ostatus_profile.php:765
 #, php-format
 msgid "Could not reach profile page %s."
 msgstr "Не можев да ја добијам профилната страница %s."
 
 #. TRANS: Exception. %s is a URL.
-#: classes/Ostatus_profile.php:847
+#: classes/Ostatus_profile.php:823
 #, php-format
 msgid "Could not find a feed URL for profile page %s."
 msgstr "Не можев да пронајдам каналска URL-адреса за профилната страница %s."
 
 #. TRANS: Feed sub exception.
-#: classes/Ostatus_profile.php:985
+#: classes/Ostatus_profile.php:922
 msgid "Can't find enough profile information to make a feed."
 msgstr "Не можев да најдам доволно профилни податоци за да направам канал."
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:1045
+#: classes/Ostatus_profile.php:986
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Неважечка URL-адреса за аватарот: %s."
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:1056
+#: classes/Ostatus_profile.php:997
 #, 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:1066
+#: classes/Ostatus_profile.php:1007
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Не можам да го добијам аватарот од %s."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1292
+#: classes/Ostatus_profile.php:1233
 msgid "Local user can't be referenced as remote."
 msgstr "Локалниот корисник не може да се наведе како далечински."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1297
+#: classes/Ostatus_profile.php:1238
 msgid "Local group can't be referenced as remote."
 msgstr "Локалната група не може да се наведе како далечинска."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1349 classes/Ostatus_profile.php:1360
+#: classes/Ostatus_profile.php:1290 classes/Ostatus_profile.php:1301
 msgid "Can't save local profile."
 msgstr "Не можам да го зачувам локалниот профил."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1368
+#: classes/Ostatus_profile.php:1309
 msgid "Can't save OStatus profile."
 msgstr "Не можам да го зачувам профилот од OStatus."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1632 classes/Ostatus_profile.php:1660
+#: classes/Ostatus_profile.php:1573 classes/Ostatus_profile.php:1601
 msgid "Not a valid webfinger address."
 msgstr "Ова не е важечка Webfinger-адреса"
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1742
+#: classes/Ostatus_profile.php:1683
 #, php-format
 msgid "Couldn't save profile for \"%s\"."
 msgstr "Не можам да го зачувам профилот за „%s“."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1761
+#: classes/Ostatus_profile.php:1702
 #, 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:1769
+#: classes/Ostatus_profile.php:1710
 #, php-format
 msgid "Couldn't find a valid profile for \"%s\"."
 msgstr "Не можев да пронајдам важечки профил за „%s“."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1812
+#: classes/Ostatus_profile.php:1753
 msgid "Could not store HTML content of long post as file."
 msgstr ""
 "Не можам да ја складирам HTML-содржината на долгата објава како податотека."
@@ -284,72 +284,72 @@ 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:42
+#: 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:47
+#: lib/salmonaction.php:48
 msgid "Salmon requires \"application/magic-envelope+xml\"."
 msgstr "Salmon бара „програм/magic-envelope+xml“."
 
 #. TRANS: Client error.
-#: lib/salmonaction.php:57
+#: lib/salmonaction.php:58
 msgid "Salmon signature verification failed."
 msgstr "Salmon-овото потврдување на потпис не успеа."
 
 #. TRANS: Client error.
-#: lib/salmonaction.php:69
+#: lib/salmonaction.php:70
 msgid "Salmon post must be an Atom entry."
 msgstr "Salmon-овата објава мора да биде Atom-ова ставка."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:118
+#: lib/salmonaction.php:120
 msgid "Unrecognized activity type."
 msgstr "Непризнаен вид на активност."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:127
+#: lib/salmonaction.php:130
 msgid "This target doesn't understand posts."
 msgstr "Оваа цел не разбира објави."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:133
+#: lib/salmonaction.php:136
 msgid "This target doesn't understand follows."
 msgstr "Оваа цел не разбира следења."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:139
+#: lib/salmonaction.php:142
 msgid "This target doesn't understand unfollows."
 msgstr "Оваа цел не разбира прекини на следења."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:145
+#: lib/salmonaction.php:148
 msgid "This target doesn't understand favorites."
 msgstr "Оваа цел не разбира бендисување на забелешки."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:151
+#: lib/salmonaction.php:154
 msgid "This target doesn't understand unfavorites."
 msgstr "Оваа цел не разбира одбендисување на забелешки."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:157
+#: lib/salmonaction.php:160
 msgid "This target doesn't understand share events."
 msgstr "Оваа цел не разбира споделување на настани."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:163
+#: lib/salmonaction.php:166
 msgid "This target doesn't understand joins."
 msgstr "Оваа цел не разбира придружувања."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:169
+#: lib/salmonaction.php:172
 msgid "This target doesn't understand leave events."
 msgstr "Оваа цел не разбира напуштање на настани."
 
 #. TRANS: Exception.
-#: lib/salmonaction.php:197
+#: lib/salmonaction.php:200
 msgid "Received a salmon slap from unidentified actor."
 msgstr "Примив Salmon-шамар од непознат учесник."
 
@@ -441,40 +441,40 @@ msgid "No ID."
 msgstr "Нема ID."
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:81
+#: actions/usersalmon.php:83
 msgid "In reply to unknown notice."
 msgstr "Како одговор на непозната забелешка."
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:86
+#: 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:163
+#: actions/usersalmon.php:165
 msgid "Could not save new favorite."
 msgstr "Не можам да го зачувам новобендисаното."
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:195
+#: actions/usersalmon.php:197
 msgid "Can't favorite/unfavorite without an object."
 msgstr "Не можам да означам како бендисано или да тргнам бендисано без објект."
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:207
+#: 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:214
+#: 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:219
+#: actions/usersalmon.php:221
 #, php-format
 msgid "Notice with ID %1$s not posted by %2$s."
 msgstr "Забелешката со ID %1$s не е објавена од %2$s."
@@ -535,37 +535,37 @@ msgid "No such group."
 msgstr "Нема таква група."
 
 #. TRANS: Client error.
-#: actions/groupsalmon.php:53
+#: actions/groupsalmon.php:56
 msgid "Can't accept remote posts for a remote group."
 msgstr "Не можам да прифаќам далечински објави од далечинска група."
 
 #. TRANS: Client error.
-#: actions/groupsalmon.php:127
+#: actions/groupsalmon.php:130
 msgid "Can't read profile to set up group membership."
 msgstr ""
 "Не можев да го прочитам профилот за да го поставам членството во групата."
 
 #. TRANS: Client error.
-#: actions/groupsalmon.php:131 actions/groupsalmon.php:174
+#: actions/groupsalmon.php:134 actions/groupsalmon.php:177
 msgid "Groups can't join groups."
 msgstr "Во групите не можат да се зачленуваат групи."
 
-#: actions/groupsalmon.php:144
+#: 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:159
+#: 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:171
+#: 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:188
+#: actions/groupsalmon.php:191
 #, php-format
 msgid "Could not remove remote user %1$s from group %2$s."
 msgstr "Не можев да го отстранам далечинскиот корисник %1$s од групата %2$s."
diff --git a/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po
index 8a6e3a8a79..20331f169a 100644
--- a/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:45+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33:51+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -24,39 +24,39 @@ 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:225 OStatusPlugin.php:935
+#: OStatusPlugin.php:223 OStatusPlugin.php:933
 msgid "Subscribe"
 msgstr "Abonneren"
 
 #. TRANS: Link description for link to join a remote group.
-#: OStatusPlugin.php:244 OStatusPlugin.php:653 actions/ostatussub.php:109
+#: OStatusPlugin.php:242 OStatusPlugin.php:651 actions/ostatussub.php:109
 msgid "Join"
 msgstr "Toetreden"
 
 #. TRANSLATE: %s is a domain.
-#: OStatusPlugin.php:457
+#: OStatusPlugin.php:455
 #, php-format
 msgid "Sent from %s via OStatus"
 msgstr "Verzonden vanaf %s via OStatus"
 
 #. TRANS: Exception.
-#: OStatusPlugin.php:529
+#: 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:603
+#: 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:606
+#: OStatusPlugin.php:604
 #, php-format
 msgid "%1$s stopped following %2$s."
 msgstr "%1$s volgt %2$s niet langer."
 
-#: OStatusPlugin.php:634
+#: 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 +64,58 @@ 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:656
+#: 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:665
+#: 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:705
+#: 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:708
+#: OStatusPlugin.php:706
 #, php-format
 msgid "%1$s has left group %2$s."
 msgstr "%1$s heeft de groep %2$s verlaten"
 
-#: OStatusPlugin.php:783
+#: 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:786
+#: 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:862
+#: OStatusPlugin.php:860
 msgid "Remote"
 msgstr "Via andere dienst"
 
 #. TRANS: Title for activity.
-#: OStatusPlugin.php:902
+#: 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:905
+#: OStatusPlugin.php:903
 #, php-format
 msgid "%s has updated their profile page."
 msgstr "Het profiel van %s is bijgewerkt."
 
 #. TRANS: Plugin description.
-#: OStatusPlugin.php:950
+#: OStatusPlugin.php:948
 msgid ""
 "Follow people across social networks that implement <a href=\"http://ostatus."
 "org/\">OStatus</a>."
@@ -176,109 +176,109 @@ msgid "RSS feed without a channel."
 msgstr "RSS-feed zonder kanaal."
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:478
+#: classes/Ostatus_profile.php:479
 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:561
+#: classes/Ostatus_profile.php:537
 #, 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:596
+#: classes/Ostatus_profile.php:572
 msgid "Show more"
 msgstr "Meer weergeven"
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:789
+#: classes/Ostatus_profile.php:765
 #, 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:847
+#: classes/Ostatus_profile.php:823
 #, 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:985
+#: classes/Ostatus_profile.php:922
 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:1045
+#: classes/Ostatus_profile.php:986
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Ongeldige avatar-URL %s."
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:1056
+#: classes/Ostatus_profile.php:997
 #, 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:1066
+#: classes/Ostatus_profile.php:1007
 #, 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:1292
+#: classes/Ostatus_profile.php:1233
 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:1297
+#: classes/Ostatus_profile.php:1238
 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:1349 classes/Ostatus_profile.php:1360
+#: classes/Ostatus_profile.php:1290 classes/Ostatus_profile.php:1301
 msgid "Can't save local profile."
 msgstr "Het was niet mogelijk het lokale profiel op te slaan."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1368
+#: classes/Ostatus_profile.php:1309
 msgid "Can't save OStatus profile."
 msgstr "Het was niet mogelijk het Ostatusprofiel op te slaan."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1632 classes/Ostatus_profile.php:1660
+#: classes/Ostatus_profile.php:1573 classes/Ostatus_profile.php:1601
 msgid "Not a valid webfinger address."
 msgstr "Geen geldig webfingeradres."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1742
+#: classes/Ostatus_profile.php:1683
 #, 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:1761
+#: classes/Ostatus_profile.php:1702
 #, 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:1769
+#: classes/Ostatus_profile.php:1710
 #, 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:1812
+#: classes/Ostatus_profile.php:1753
 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 "
@@ -297,72 +297,72 @@ 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:42
+#: 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:47
+#: lib/salmonaction.php:48
 msgid "Salmon requires \"application/magic-envelope+xml\"."
 msgstr "Salmon vereist \"application/magic-envelope+xml\"."
 
 #. TRANS: Client error.
-#: lib/salmonaction.php:57
+#: lib/salmonaction.php:58
 msgid "Salmon signature verification failed."
 msgstr "De controle voor Salmon is mislukt."
 
 #. TRANS: Client error.
-#: lib/salmonaction.php:69
+#: 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:118
+#: lib/salmonaction.php:120
 msgid "Unrecognized activity type."
 msgstr "Onbekend activiteitentype."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:127
+#: lib/salmonaction.php:130
 msgid "This target doesn't understand posts."
 msgstr "Deze bestemming begrijpt berichten niet."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:133
+#: lib/salmonaction.php:136
 msgid "This target doesn't understand follows."
 msgstr "Deze bestemming begrijpt volgen niet."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:139
+#: 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:145
+#: lib/salmonaction.php:148
 msgid "This target doesn't understand favorites."
 msgstr "Deze bestemming begrijpt favorieten niet."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:151
+#: lib/salmonaction.php:154
 msgid "This target doesn't understand unfavorites."
 msgstr "Deze bestemming begrijpt favorieten verwijderen niet."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:157
+#: 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:163
+#: lib/salmonaction.php:166
 msgid "This target doesn't understand joins."
 msgstr "Deze bestemming begrijpt lid worden niet."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:169
+#: 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:197
+#: lib/salmonaction.php:200
 msgid "Received a salmon slap from unidentified actor."
 msgstr "Er is een Salmonslap ontvangen van een niet-geïdentificeerde actor."
 
@@ -459,42 +459,42 @@ msgid "No ID."
 msgstr "Geen ID."
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:81
+#: actions/usersalmon.php:83
 msgid "In reply to unknown notice."
 msgstr "In antwoord op een onbekende mededeling."
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:86
+#: 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:163
+#: 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:195
+#: 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:207
+#: 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:214
+#: 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:219
+#: 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."
@@ -556,41 +556,41 @@ msgid "No such group."
 msgstr "De opgegeven groep bestaat niet."
 
 #. TRANS: Client error.
-#: actions/groupsalmon.php:53
+#: 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:127
+#: 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:131 actions/groupsalmon.php:174
+#: 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:144
+#: 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:159
+#: 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:171
+#: 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:188
+#: actions/groupsalmon.php:191
 #, php-format
 msgid "Could not remove remote user %1$s from group %2$s."
 msgstr ""
diff --git a/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po
index fbd2207c46..d9e9a4d27a 100644
--- a/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:45+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33:51+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -24,94 +24,94 @@ 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:225 OStatusPlugin.php:935
+#: OStatusPlugin.php:223 OStatusPlugin.php:933
 msgid "Subscribe"
 msgstr "Підписатись"
 
 #. TRANS: Link description for link to join a remote group.
-#: OStatusPlugin.php:244 OStatusPlugin.php:653 actions/ostatussub.php:109
+#: OStatusPlugin.php:242 OStatusPlugin.php:651 actions/ostatussub.php:109
 msgid "Join"
 msgstr "Приєднатися"
 
 #. TRANSLATE: %s is a domain.
-#: OStatusPlugin.php:457
+#: OStatusPlugin.php:455
 #, php-format
 msgid "Sent from %s via OStatus"
 msgstr "Надіслано з %s через OStatus"
 
 #. TRANS: Exception.
-#: OStatusPlugin.php:529
+#: OStatusPlugin.php:527
 msgid "Could not set up remote subscription."
 msgstr "Не вдалося створити віддалену підписку."
 
-#: OStatusPlugin.php:603
+#: 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:606
+#: OStatusPlugin.php:604
 #, php-format
 msgid "%1$s stopped following %2$s."
 msgstr "%1$s припинив читати ваші дописи %2$s."
 
-#: OStatusPlugin.php:634
+#: 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:656
+#: OStatusPlugin.php:654
 #, php-format
 msgid "%1$s has joined group %2$s."
 msgstr "%1$s приєднався до спільноти %2$s."
 
 #. TRANS: Exception.
-#: OStatusPlugin.php:665
+#: OStatusPlugin.php:663
 msgid "Failed joining remote group."
 msgstr "Помилка приєднання до віддаленої спільноти."
 
-#: OStatusPlugin.php:705
+#: 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:708
+#: OStatusPlugin.php:706
 #, php-format
 msgid "%1$s has left group %2$s."
 msgstr "%1$s залишив спільноту %2$s."
 
-#: OStatusPlugin.php:783
+#: 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:786
+#: 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:862
+#: OStatusPlugin.php:860
 msgid "Remote"
 msgstr "Віддалено"
 
 #. TRANS: Title for activity.
-#: OStatusPlugin.php:902
+#: 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:905
+#: OStatusPlugin.php:903
 #, php-format
 msgid "%s has updated their profile page."
 msgstr "%s оновив сторінку свого профілю."
 
 #. TRANS: Plugin description.
-#: OStatusPlugin.php:950
+#: OStatusPlugin.php:948
 msgid ""
 "Follow people across social networks that implement <a href=\"http://ostatus."
 "org/\">OStatus</a>."
@@ -173,103 +173,103 @@ msgid "RSS feed without a channel."
 msgstr "RSS-стрічка не має каналу."
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:478
+#: classes/Ostatus_profile.php:479
 msgid "Can't handle that kind of post."
 msgstr "Не вдається обробити такий тип допису."
 
 #. TRANS: Client exception. %s is a source URI.
-#: classes/Ostatus_profile.php:561
+#: classes/Ostatus_profile.php:537
 #, 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:596
+#: classes/Ostatus_profile.php:572
 msgid "Show more"
 msgstr "Розгорнути"
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:789
+#: classes/Ostatus_profile.php:765
 #, php-format
 msgid "Could not reach profile page %s."
 msgstr "Не вдалося досягти сторінки профілю %s."
 
 #. TRANS: Exception. %s is a URL.
-#: classes/Ostatus_profile.php:847
+#: classes/Ostatus_profile.php:823
 #, php-format
 msgid "Could not find a feed URL for profile page %s."
 msgstr "Не вдалося знайти URL веб-стрічки для сторінки профілю %s."
 
 #. TRANS: Feed sub exception.
-#: classes/Ostatus_profile.php:985
+#: classes/Ostatus_profile.php:922
 msgid "Can't find enough profile information to make a feed."
 msgstr ""
 "Не можу знайти достатньо інформації про профіль, аби сформувати веб-стрічку."
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:1045
+#: classes/Ostatus_profile.php:986
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Невірна URL-адреса аватари %s."
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:1056
+#: classes/Ostatus_profile.php:997
 #, 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:1066
+#: classes/Ostatus_profile.php:1007
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Неможливо завантажити аватару з %s."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1292
+#: classes/Ostatus_profile.php:1233
 msgid "Local user can't be referenced as remote."
 msgstr "Місцевий користувач не може бути зазначеним у якості віддаленого."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1297
+#: classes/Ostatus_profile.php:1238
 msgid "Local group can't be referenced as remote."
 msgstr "Локальну спільноту не можна зазначити у якості віддаленої."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1349 classes/Ostatus_profile.php:1360
+#: classes/Ostatus_profile.php:1290 classes/Ostatus_profile.php:1301
 msgid "Can't save local profile."
 msgstr "Не вдається зберегти місцевий профіль."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1368
+#: classes/Ostatus_profile.php:1309
 msgid "Can't save OStatus profile."
 msgstr "Не вдається зберегти профіль OStatus."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1632 classes/Ostatus_profile.php:1660
+#: classes/Ostatus_profile.php:1573 classes/Ostatus_profile.php:1601
 msgid "Not a valid webfinger address."
 msgstr "Це недійсна адреса для протоколу WebFinger."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1742
+#: classes/Ostatus_profile.php:1683
 #, php-format
 msgid "Couldn't save profile for \"%s\"."
 msgstr "Не можу зберегти профіль для «%s»."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1761
+#: classes/Ostatus_profile.php:1702
 #, php-format
 msgid "Couldn't save ostatus_profile for \"%s\"."
 msgstr "Не можу зберегти профіль OStatus для «%s»."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1769
+#: classes/Ostatus_profile.php:1710
 #, php-format
 msgid "Couldn't find a valid profile for \"%s\"."
 msgstr "не можу знайти відповідний й профіль для «%s»."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1812
+#: classes/Ostatus_profile.php:1753
 msgid "Could not store HTML content of long post as file."
 msgstr "Не можу зберегти HTML місткого допису у якості файлу."
 
@@ -286,72 +286,72 @@ 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:42
+#: 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:47
+#: lib/salmonaction.php:48
 msgid "Salmon requires \"application/magic-envelope+xml\"."
 msgstr "Протокол Salmon вимагає \"application/magic-envelope+xml\"."
 
 #. TRANS: Client error.
-#: lib/salmonaction.php:57
+#: lib/salmonaction.php:58
 msgid "Salmon signature verification failed."
 msgstr "Перевірка підпису протоколу Salmon не вдалася."
 
 #. TRANS: Client error.
-#: lib/salmonaction.php:69
+#: lib/salmonaction.php:70
 msgid "Salmon post must be an Atom entry."
 msgstr "Дописи за протоколом Salmon мають бути у форматі Atom."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:118
+#: lib/salmonaction.php:120
 msgid "Unrecognized activity type."
 msgstr "Невідомий тип діяльності."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:127
+#: lib/salmonaction.php:130
 msgid "This target doesn't understand posts."
 msgstr "Ціль не розуміє, що таке «дописи»."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:133
+#: lib/salmonaction.php:136
 msgid "This target doesn't understand follows."
 msgstr "Ціль не розуміє, що таке «слідувати»."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:139
+#: lib/salmonaction.php:142
 msgid "This target doesn't understand unfollows."
 msgstr "Ціль не розуміє, що таке «не слідувати»."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:145
+#: lib/salmonaction.php:148
 msgid "This target doesn't understand favorites."
 msgstr "Ціль не розуміє, що таке «додати до обраних»."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:151
+#: lib/salmonaction.php:154
 msgid "This target doesn't understand unfavorites."
 msgstr "Ціль не розуміє, що таке «вилучити з обраних»."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:157
+#: lib/salmonaction.php:160
 msgid "This target doesn't understand share events."
 msgstr "Ціль не розуміє, що таке «поділитися подією»."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:163
+#: lib/salmonaction.php:166
 msgid "This target doesn't understand joins."
 msgstr "Ціль не розуміє, що таке «приєднатися»."
 
 #. TRANS: Client exception.
-#: lib/salmonaction.php:169
+#: lib/salmonaction.php:172
 msgid "This target doesn't understand leave events."
 msgstr "Ціль не розуміє, що таке «залишати подію»."
 
 #. TRANS: Exception.
-#: lib/salmonaction.php:197
+#: lib/salmonaction.php:200
 msgid "Received a salmon slap from unidentified actor."
 msgstr "Отримано ляпаса від невизначеного учасника за протоколом Salmon."
 
@@ -445,43 +445,43 @@ msgid "No ID."
 msgstr "Немає ідентифікатора."
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:81
+#: actions/usersalmon.php:83
 msgid "In reply to unknown notice."
 msgstr "У відповідь на невідомий допис."
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:86
+#: 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:163
+#: actions/usersalmon.php:165
 msgid "Could not save new favorite."
 msgstr "Не вдалося зберегти як новий обраний допис."
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:195
+#: actions/usersalmon.php:197
 msgid "Can't favorite/unfavorite without an object."
 msgstr ""
 "Неможливо додати до обраних або видалити зі списку обраних, якщо немає "
 "об’єкта."
 
 #. TRANS: Client exception.
-#: actions/usersalmon.php:207
+#: 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:214
+#: 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:219
+#: actions/usersalmon.php:221
 #, php-format
 msgid "Notice with ID %1$s not posted by %2$s."
 msgstr "Допис з ідентифікатором %1$s було надіслано не %2$s."
@@ -543,39 +543,39 @@ msgid "No such group."
 msgstr "Такої спільноти немає."
 
 #. TRANS: Client error.
-#: actions/groupsalmon.php:53
+#: actions/groupsalmon.php:56
 msgid "Can't accept remote posts for a remote group."
 msgstr "Не можу узгодити віддалену пересилку дописів до віддаленої спільноти."
 
 #. TRANS: Client error.
-#: actions/groupsalmon.php:127
+#: actions/groupsalmon.php:130
 msgid "Can't read profile to set up group membership."
 msgstr "Не можу прочитати профіль, аби долучитися до спільноти."
 
 #. TRANS: Client error.
-#: actions/groupsalmon.php:131 actions/groupsalmon.php:174
+#: actions/groupsalmon.php:134 actions/groupsalmon.php:177
 msgid "Groups can't join groups."
 msgstr "Спільноти ніяк не можуть приєднуватися до спільнот."
 
-#: actions/groupsalmon.php:144
+#: 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:159
+#: 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:171
+#: 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:188
+#: actions/groupsalmon.php:191
 #, php-format
 msgid "Could not remove remote user %1$s from group %2$s."
 msgstr "Не вдалось видалити віддаленого користувача %1$s зі спільноти %2$s."
diff --git a/plugins/PoweredByStatusNet/locale/ca/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/ca/LC_MESSAGES/PoweredByStatusNet.po
new file mode 100644
index 0000000000..8ae39b7109
--- /dev/null
+++ b/plugins/PoweredByStatusNet/locale/ca/LC_MESSAGES/PoweredByStatusNet.po
@@ -0,0 +1,40 @@
+# Translation of StatusNet - PoweredByStatusNet to Catalan (Català)
+# Expored from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - PoweredByStatusNet\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33:53+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:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-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."
+msgstr ""
+"Les sortides «funciona amb <a href=\"http://status.net/\">StatusNet</a>» "
+"després del lloc del nom."
diff --git a/plugins/PoweredByStatusNet/locale/ru/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/ru/LC_MESSAGES/PoweredByStatusNet.po
index ee7920d542..3f4f317892 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:47+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
@@ -25,9 +25,9 @@ msgstr ""
 
 #. TRANS: %s is a URL to status.net with "StatusNet" (localised) as link text.
 #: PoweredByStatusNetPlugin.php:51
-#, fuzzy, php-format
+#, php-format
 msgid "powered by %s"
-msgstr "при поддержке $1"
+msgstr "при поддержке %s"
 
 #: PoweredByStatusNetPlugin.php:53
 msgid "StatusNet"
diff --git a/plugins/PtitUrl/locale/gl/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/gl/LC_MESSAGES/PtitUrl.po
new file mode 100644
index 0000000000..dca828d6cd
--- /dev/null
+++ b/plugins/PtitUrl/locale/gl/LC_MESSAGES/PtitUrl.po
@@ -0,0 +1,29 @@
+# Translation of StatusNet - PtitUrl to Galician (Galego)
+# Expored from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - PtitUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33:53+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-10 18:26:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-ptiturl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: PtitUrlPlugin.php:67
+#, 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>."
diff --git a/plugins/RSSCloud/locale/de/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/de/LC_MESSAGES/RSSCloud.po
new file mode 100644
index 0000000000..7cd3a26247
--- /dev/null
+++ b/plugins/RSSCloud/locale/de/LC_MESSAGES/RSSCloud.po
@@ -0,0 +1,77 @@
+# Translation of StatusNet - RSSCloud to German (Deutsch)
+# Expored from translatewiki.net
+#
+# Author: David Güdel
+# Author: Umherirrender
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - RSSCloud\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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-10 18:27:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: de\n"
+"X-Message-Group: #out-statusnet-plugin-rsscloud\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: RSSCloudRequestNotify.php:90
+msgid "Request must be POST."
+msgstr ""
+
+#: RSSCloudRequestNotify.php:107
+msgid "Only http-post notifications are supported at this time."
+msgstr ""
+
+#. 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 ""
+
+#: RSSCloudRequestNotify.php:124
+msgid ""
+"You must provide at least one valid profile feed url (url1, url2, url3 ... "
+"urlN)."
+msgstr ""
+"Sie müssen mindestens eine gültige Profil-Feed-URL angeben (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."
+msgstr ""
+"Vielen Dank für das Abonnement. Sie werden benachrichtigt, wenn der Feed "
+"aktualisiert wird."
+
+#: LoggingAggregator.php:93
+msgid "This resource requires an HTTP GET."
+msgstr ""
+
+#: LoggingAggregator.php:104
+msgid "This resource requires an HTTP POST."
+msgstr ""
+
+#: RSSCloudPlugin.php:248
+msgid ""
+"The RSSCloud plugin enables your StatusNet instance to publish real-time "
+"updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
+"\">RSSCloud protocol</a>."
+msgstr ""
diff --git a/plugins/Realtime/locale/ca/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/ca/LC_MESSAGES/Realtime.po
new file mode 100644
index 0000000000..85581557d5
--- /dev/null
+++ b/plugins/Realtime/locale/ca/LC_MESSAGES/Realtime.po
@@ -0,0 +1,58 @@
+# Translation of StatusNet - Realtime to Catalan (Català)
+# Expored from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Realtime\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33: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-10 18:26:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-realtime\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
+#: RealtimePlugin.php:339
+msgctxt "BUTTON"
+msgid "Play"
+msgstr "Reprodueix"
+
+#. TRANS: Tooltip for realtime view "play" button.
+#: RealtimePlugin.php:341
+msgctxt "TOOLTIP"
+msgid "Play"
+msgstr "Reprodueix"
+
+#. TRANS: Text label for realtime view "pause" button
+#: RealtimePlugin.php:343
+msgctxt "BUTTON"
+msgid "Pause"
+msgstr "Pausa"
+
+#. TRANS: Tooltip for realtime view "pause" button
+#: RealtimePlugin.php:345
+msgctxt "TOOLTIP"
+msgid "Pause"
+msgstr "Pausa"
+
+#. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
+#: RealtimePlugin.php:347
+msgctxt "BUTTON"
+msgid "Pop up"
+msgstr "Emergent"
+
+#. TRANS: Tooltip for realtime view "popup" button.
+#: RealtimePlugin.php:349
+msgctxt "TOOLTIP"
+msgid "Pop up in a window"
+msgstr "Emergent en una finestra"
diff --git a/plugins/Realtime/locale/lb/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/lb/LC_MESSAGES/Realtime.po
new file mode 100644
index 0000000000..787b21a7fc
--- /dev/null
+++ b/plugins/Realtime/locale/lb/LC_MESSAGES/Realtime.po
@@ -0,0 +1,58 @@
+# Translation of StatusNet - Realtime to Luxembourgish (Lëtzebuergesch)
+# Expored from translatewiki.net
+#
+# Author: Robby
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Realtime\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:33:54+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:26:07+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: lb\n"
+"X-Message-Group: #out-statusnet-plugin-realtime\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
+#: RealtimePlugin.php:339
+msgctxt "BUTTON"
+msgid "Play"
+msgstr ""
+
+#. TRANS: Tooltip for realtime view "play" button.
+#: RealtimePlugin.php:341
+msgctxt "TOOLTIP"
+msgid "Play"
+msgstr ""
+
+#. TRANS: Text label for realtime view "pause" button
+#: RealtimePlugin.php:343
+msgctxt "BUTTON"
+msgid "Pause"
+msgstr "Paus"
+
+#. TRANS: Tooltip for realtime view "pause" button
+#: RealtimePlugin.php:345
+msgctxt "TOOLTIP"
+msgid "Pause"
+msgstr "Paus"
+
+#. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
+#: RealtimePlugin.php:347
+msgctxt "BUTTON"
+msgid "Pop up"
+msgstr ""
+
+#. TRANS: Tooltip for realtime view "popup" button.
+#: RealtimePlugin.php:349
+msgctxt "TOOLTIP"
+msgid "Pop up in a window"
+msgstr ""
diff --git a/plugins/SQLProfile/locale/SQLProfile.pot b/plugins/SQLProfile/locale/SQLProfile.pot
new file mode 100644
index 0000000000..f0e58516b6
--- /dev/null
+++ b/plugins/SQLProfile/locale/SQLProfile.pot
@@ -0,0 +1,21 @@
+# 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-01-14 10:29+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"
+
+#: SQLProfilePlugin.php:41
+msgid "Debug tool to watch for poorly indexed DB queries"
+msgstr ""
diff --git a/plugins/ShareNotice/locale/ca/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/ca/LC_MESSAGES/ShareNotice.po
new file mode 100644
index 0000000000..1f4701818c
--- /dev/null
+++ b/plugins/ShareNotice/locale/ca/LC_MESSAGES/ShareNotice.po
@@ -0,0 +1,55 @@
+# Translation of StatusNet - ShareNotice to Catalan (Català)
+# Expored from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ShareNotice\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34:00+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:27:22+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-sharenotice\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. 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."
+msgstr ""
+"Aquest connector permet compartir avisos al Twitter, al Facebook i a altres "
+"plataformes."
diff --git a/plugins/SimpleUrl/locale/gl/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/gl/LC_MESSAGES/SimpleUrl.po
new file mode 100644
index 0000000000..c83591c838
--- /dev/null
+++ b/plugins/SimpleUrl/locale/gl/LC_MESSAGES/SimpleUrl.po
@@ -0,0 +1,29 @@
+# Translation of StatusNet - SimpleUrl to Galician (Galego)
+# Expored from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SimpleUrl\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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"
+"X-POT-Import-Date: 2011-01-10 18:27:22+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-simpleurl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: SimpleUrlPlugin.php:58
+#, 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>."
diff --git a/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po
index 05c1930b3f..34ecd07d99 100644
--- a/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:59+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
diff --git a/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po
index 50cc3d8038..82a256b4a3 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:59+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
diff --git a/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po
index 2bcc38f26f..c96e79d2ab 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:59+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
diff --git a/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po
index 0a86484919..3cb01f9091 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:59+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
diff --git a/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po
index fc0b2c4a45..80acc98723 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:59+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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 0529c6667e..dbed72b95e 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:59+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
diff --git a/plugins/SubscriptionThrottle/locale/de/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/de/LC_MESSAGES/SubscriptionThrottle.po
index 8370877760..00ce5fc9a2 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:00+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
diff --git a/plugins/SubscriptionThrottle/locale/es/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/es/LC_MESSAGES/SubscriptionThrottle.po
index 6b5b43f1ec..b5711bbfbe 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:00+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
diff --git a/plugins/SubscriptionThrottle/locale/fr/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/fr/LC_MESSAGES/SubscriptionThrottle.po
index 335867a733..017c0f27d8 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:00+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
diff --git a/plugins/SubscriptionThrottle/locale/he/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/he/LC_MESSAGES/SubscriptionThrottle.po
index 42cfcfdb5f..b1a41a490d 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:00+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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 f4cd22d802..015f7a7fb0 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:00+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
diff --git a/plugins/SubscriptionThrottle/locale/id/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/id/LC_MESSAGES/SubscriptionThrottle.po
index e0e6fbce09..04640a625d 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:00+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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 1ba7e3328d..f572f8cae2 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:00+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
diff --git a/plugins/SubscriptionThrottle/locale/nb/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/nb/LC_MESSAGES/SubscriptionThrottle.po
index 9a2c8594d5..75d4b93880 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:00+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
diff --git a/plugins/SubscriptionThrottle/locale/nl/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/nl/LC_MESSAGES/SubscriptionThrottle.po
index 4dcd28b4ef..af8504c0b4 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:00+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
diff --git a/plugins/SubscriptionThrottle/locale/ru/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/ru/LC_MESSAGES/SubscriptionThrottle.po
index 65a40d0682..fd41c30ec2 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:00+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
diff --git a/plugins/SubscriptionThrottle/locale/tl/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/tl/LC_MESSAGES/SubscriptionThrottle.po
index 17d69556f7..9d3740b53c 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:00+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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 f6c080df33..0d1d449bdb 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:01+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-subscriptionthrottle\n"
diff --git a/plugins/TabFocus/locale/br/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/br/LC_MESSAGES/TabFocus.po
index 36cf6726b5..71bb14bda6 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:01+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-07 21:35:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
diff --git a/plugins/TabFocus/locale/es/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/es/LC_MESSAGES/TabFocus.po
index 6979a26513..2b010fdbae 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:01+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-07 21:35:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
diff --git a/plugins/TabFocus/locale/fr/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/fr/LC_MESSAGES/TabFocus.po
index a61b6413ba..26cde0c772 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:02+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-07 21:35:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
diff --git a/plugins/TabFocus/locale/gl/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/gl/LC_MESSAGES/TabFocus.po
index 0dd7dc9f64..c18bc34a0b 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:02+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-07 21:35:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
diff --git a/plugins/TabFocus/locale/he/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/he/LC_MESSAGES/TabFocus.po
index 320e68aad6..c771c70912 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:02+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-07 21:35:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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 21d4232e5f..de3b285adc 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:02+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-07 21:35:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
diff --git a/plugins/TabFocus/locale/id/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/id/LC_MESSAGES/TabFocus.po
index 46aa191ea6..108fa22d3e 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:02+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-07 21:35:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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 3c674d107d..64e5fc4157 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:02+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-07 21:35:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
diff --git a/plugins/TabFocus/locale/nb/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/nb/LC_MESSAGES/TabFocus.po
index a6f6dd5da9..cfee70343d 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:02+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-07 21:35:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
diff --git a/plugins/TabFocus/locale/nl/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/nl/LC_MESSAGES/TabFocus.po
index 95387ecc63..29f8b3aaf5 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:02+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-07 21:35:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
diff --git a/plugins/TabFocus/locale/ru/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/ru/LC_MESSAGES/TabFocus.po
index 0383e29177..9354eb21bf 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:02+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-07 21:35:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
diff --git a/plugins/TabFocus/locale/tl/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/tl/LC_MESSAGES/TabFocus.po
index c91e3ba786..8fe63b3cc0 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:02+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-07 21:35:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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 beda21dbbc..8532106136 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:03+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-07 21:35:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
diff --git a/plugins/TightUrl/locale/de/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/de/LC_MESSAGES/TightUrl.po
index 59f394824a..f66930df46 100644
--- a/plugins/TightUrl/locale/de/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/de/LC_MESSAGES/TightUrl.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:03+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TightUrl/locale/es/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/es/LC_MESSAGES/TightUrl.po
index bbadb535ad..f5ee7593ab 100644
--- a/plugins/TightUrl/locale/es/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/es/LC_MESSAGES/TightUrl.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:03+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TightUrl/locale/fr/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/fr/LC_MESSAGES/TightUrl.po
index 09e6e50693..e6e5e76349 100644
--- a/plugins/TightUrl/locale/fr/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/fr/LC_MESSAGES/TightUrl.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:03+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TightUrl/locale/gl/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/gl/LC_MESSAGES/TightUrl.po
new file mode 100644
index 0000000000..8d124cafaf
--- /dev/null
+++ b/plugins/TightUrl/locale/gl/LC_MESSAGES/TightUrl.po
@@ -0,0 +1,29 @@
+# Translation of StatusNet - TightUrl to Galician (Galego)
+# Expored from translatewiki.net
+#
+# Author: Toliño
+# --
+# 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-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-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 ""
+"Emprega o servizo de abreviación de enderezos URL <a href=\"http://%1$s/\">%1"
+"$s</a>."
diff --git a/plugins/TightUrl/locale/he/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/he/LC_MESSAGES/TightUrl.po
index 25bbc4d156..c630f07bdd 100644
--- a/plugins/TightUrl/locale/he/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/he/LC_MESSAGES/TightUrl.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:03+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TightUrl/locale/ia/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/ia/LC_MESSAGES/TightUrl.po
index 2b26c31633..b98cdd10ed 100644
--- a/plugins/TightUrl/locale/ia/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/ia/LC_MESSAGES/TightUrl.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:03+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TightUrl/locale/id/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/id/LC_MESSAGES/TightUrl.po
index 1c7f1f4a3b..298e006f2b 100644
--- a/plugins/TightUrl/locale/id/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/id/LC_MESSAGES/TightUrl.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:03+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TightUrl/locale/ja/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/ja/LC_MESSAGES/TightUrl.po
index dc5bd24411..7cca39df77 100644
--- a/plugins/TightUrl/locale/ja/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/ja/LC_MESSAGES/TightUrl.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:03+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TightUrl/locale/mk/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/mk/LC_MESSAGES/TightUrl.po
index e8604d451d..7d383bca3c 100644
--- a/plugins/TightUrl/locale/mk/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/mk/LC_MESSAGES/TightUrl.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:03+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TightUrl/locale/nb/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/nb/LC_MESSAGES/TightUrl.po
index efb1a31d77..fd0fbbfe8c 100644
--- a/plugins/TightUrl/locale/nb/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/nb/LC_MESSAGES/TightUrl.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:03+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TightUrl/locale/nl/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/nl/LC_MESSAGES/TightUrl.po
index c6760c2a23..ee0f4c92a6 100644
--- a/plugins/TightUrl/locale/nl/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/nl/LC_MESSAGES/TightUrl.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:03+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TightUrl/locale/pt_BR/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/pt_BR/LC_MESSAGES/TightUrl.po
index 950d7965f7..5292d16708 100644
--- a/plugins/TightUrl/locale/pt_BR/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/pt_BR/LC_MESSAGES/TightUrl.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:04+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TightUrl/locale/ru/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/ru/LC_MESSAGES/TightUrl.po
index f8df97c6b2..fb5a3a67b6 100644
--- a/plugins/TightUrl/locale/ru/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/ru/LC_MESSAGES/TightUrl.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:04+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TightUrl/locale/tl/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/tl/LC_MESSAGES/TightUrl.po
index 9c333ba912..f255eecc61 100644
--- a/plugins/TightUrl/locale/tl/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/tl/LC_MESSAGES/TightUrl.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:04+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TightUrl/locale/uk/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/uk/LC_MESSAGES/TightUrl.po
index b9d70ef9a5..abf41e2df0 100644
--- a/plugins/TightUrl/locale/uk/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/uk/LC_MESSAGES/TightUrl.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:04+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po
new file mode 100644
index 0000000000..2595824774
--- /dev/null
+++ b/plugins/TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - TinyMCE to Catalan (Català)
+# Expored from translatewiki.net
+#
+# Author: Toniher
+# --
+# 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-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-tinymce\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: TinyMCEPlugin.php:83
+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 "
+"navegador."
diff --git a/plugins/TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po
index ec74749a3c..3b35e68a19 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:04+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: eo\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po
index 1e783df8b6..aa2175bf44 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:04+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po
index 38fdbfd5a7..5e7006f8b2 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:04+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po
index 0dc5ce731f..9e90c8feb1 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:04+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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 252f41a71a..19325a6e2c 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:04+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po
index 9f71ef3bca..e0ef734cb8 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:04+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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 71f5f3d056..458058447a 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:04+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po
index 767061d80b..e5fd81129b 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:04+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po
index d4c927e53f..0a528af6a9 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:04+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/pt_BR/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/pt_BR/LC_MESSAGES/TinyMCE.po
index 6cfb5d75f7..edf1d8461f 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:04+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po
index 0bb7b575a9..e87596078d 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:04+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po
index 5ecf01f339..ed5a35b025 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:05+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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 b564f27e96..92f2c3011d 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:05+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:10+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po
index c31fb16ab7..8fb31bea0c 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:10+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-30 20:43:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -55,11 +55,11 @@ msgstr "Twitter"
 
 #: TwitterBridgePlugin.php:152
 msgid "Login or register using Twitter"
-msgstr ""
+msgstr "Kevreañ pe en em enskrivañ dre Twitter"
 
 #: TwitterBridgePlugin.php:175
 msgid "Twitter integration options"
-msgstr ""
+msgstr "Dibarzhioù enframmañ Twitter"
 
 #: TwitterBridgePlugin.php:303
 msgid "Twitter bridge configuration"
diff --git a/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po
index f282f82b80..d7d7aff526 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:10+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34:14+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: 2010-11-30 20:43:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
diff --git a/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po
index 4755b93413..1cf6c42123 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:10+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-30 20:43:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fa\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
diff --git a/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po
index 67da0e339b..0074adcaaa 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:11+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-30 20:43:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
diff --git a/plugins/TwitterBridge/locale/gl/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/gl/LC_MESSAGES/TwitterBridge.po
index afd3dc8ffd..c6fbbd1824 100644
--- a/plugins/TwitterBridge/locale/gl/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/gl/LC_MESSAGES/TwitterBridge.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:11+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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-POT-Import-Date: 2010-11-30 20:43:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
diff --git a/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po
index 67b68729df..7208474565 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:11+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-30 20:43:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
diff --git a/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po
index 889f4766ab..8962394f0e 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:11+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-30 20:43:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -333,7 +333,7 @@ msgstr ""
 
 #: twittersettings.php:136
 msgid "set a password"
-msgstr "поставете лозинка"
+msgstr "ставете лозинка"
 
 #: twittersettings.php:138
 msgid " first."
diff --git a/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po
index 41d2eb3138..6763193f09 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:11+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-30 20:43:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
diff --git a/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po
index 253ee5e8cc..9bcd226ce5 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:11+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-30 20:43:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
diff --git a/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po
index 3e775b11e9..1a26acc4cc 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:11+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-30 20:43:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
diff --git a/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po
index b852a58257..ef027ff8d5 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:11+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34:15+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: 2010-11-30 20:43:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
diff --git a/plugins/UserFlag/locale/br/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/br/LC_MESSAGES/UserFlag.po
index da9cb869bf..0ea28e87ac 100644
--- a/plugins/UserFlag/locale/br/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/br/LC_MESSAGES/UserFlag.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:12+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-07 21:20:38+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
diff --git a/plugins/UserFlag/locale/ca/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/ca/LC_MESSAGES/UserFlag.po
index 53f88671d7..c781665f88 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:12+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-07 21:20:38+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
diff --git a/plugins/UserFlag/locale/fr/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/fr/LC_MESSAGES/UserFlag.po
index 2c81d5008d..598792700b 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:12+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-07 21:20:38+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
diff --git a/plugins/UserFlag/locale/ia/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/ia/LC_MESSAGES/UserFlag.po
index fd68957ee8..1febf97e41 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:12+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-07 21:20:38+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
diff --git a/plugins/UserFlag/locale/mk/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/mk/LC_MESSAGES/UserFlag.po
index bc8727a51d..70145e6e38 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:12+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-07 21:20:38+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
diff --git a/plugins/UserFlag/locale/nl/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/nl/LC_MESSAGES/UserFlag.po
index fefbd582d8..fe48fb507f 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:12+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-07 21:20:38+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
diff --git a/plugins/UserFlag/locale/pt/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/pt/LC_MESSAGES/UserFlag.po
index 04e63babb0..0c3baec421 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:13+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-07 21:20:38+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
diff --git a/plugins/UserFlag/locale/ru/LC_MESSAGES/UserFlag.po b/plugins/UserFlag/locale/ru/LC_MESSAGES/UserFlag.po
new file mode 100644
index 0000000000..6e20a1a182
--- /dev/null
+++ b/plugins/UserFlag/locale/ru/LC_MESSAGES/UserFlag.po
@@ -0,0 +1,112 @@
+# Translation of StatusNet - UserFlag to Russian (Русский)
+# Expored from translatewiki.net
+#
+# Author: Byulent
+# --
+# 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-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ru\n"
+"X-Message-Group: #out-statusnet-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: 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"
+msgstr[0] ""
+msgstr[1] ""
+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 3dff4ec9e9..bec8593ea6 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:13+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-07 21:20:38+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-userflag\n"
diff --git a/plugins/UserLimit/locale/br/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/br/LC_MESSAGES/UserLimit.po
index 2fe548d71d..3ffaf4e099 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:13+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/de/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/de/LC_MESSAGES/UserLimit.po
index 58164146e0..69dbc67a02 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:13+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/es/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/es/LC_MESSAGES/UserLimit.po
index e93f4629ee..b429dd082c 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:13+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/fi/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/fi/LC_MESSAGES/UserLimit.po
index 0704fa0600..fef8244207 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:13+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/fr/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/fr/LC_MESSAGES/UserLimit.po
index 18545c5b43..0fe147a7b2 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:13+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/gl/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/gl/LC_MESSAGES/UserLimit.po
index a422577f9c..5d62775fa4 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:13+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/he/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/he/LC_MESSAGES/UserLimit.po
index 458af68000..816c717483 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:13+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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 c54e449806..c0da2c4f05 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:13+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/id/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/id/LC_MESSAGES/UserLimit.po
index c1485c2a95..a03021177c 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:13+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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 17af3b888a..9ceaacec84 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:13+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34:17+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: 2010-11-29 19:46:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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 4a36c5e2e8..72acf5f873 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:13+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34:17+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: 2010-11-29 19:46:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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 7352e26498..fda78a738c 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:13+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/nb/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/nb/LC_MESSAGES/UserLimit.po
index a543fb95b1..17d04c7e17 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:13+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/nl/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/nl/LC_MESSAGES/UserLimit.po
index b4c6950383..0719b90e83 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:13+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/pt/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/pt/LC_MESSAGES/UserLimit.po
index 11fc2d128d..8a57376d96 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:13+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-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 8bc0a6d028..409a1e7c57 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:13+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/ru/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/ru/LC_MESSAGES/UserLimit.po
index 39afac67c9..a721828955 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:13+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/tl/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/tl/LC_MESSAGES/UserLimit.po
index 0e489edd78..499e9fde47 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:13+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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 5f433de628..70cd0e65af 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:13+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/UserLimit/locale/uk/LC_MESSAGES/UserLimit.po b/plugins/UserLimit/locale/uk/LC_MESSAGES/UserLimit.po
index 9af2d0314b..10a78ccfc4 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:14+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-userlimit\n"
diff --git a/plugins/WikiHashtags/locale/br/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/br/LC_MESSAGES/WikiHashtags.po
index 5d13f3e7c7..dc5092befc 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:14+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
diff --git a/plugins/WikiHashtags/locale/de/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/de/LC_MESSAGES/WikiHashtags.po
index 076502a504..efe0061028 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:14+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
diff --git a/plugins/WikiHashtags/locale/fr/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/fr/LC_MESSAGES/WikiHashtags.po
index 542158e7da..a48be4da4d 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:14+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
diff --git a/plugins/WikiHashtags/locale/he/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/he/LC_MESSAGES/WikiHashtags.po
index 2516266b7b..5411a8bd5b 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:14+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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 b2a0c6ed3e..a7baaf2e36 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:14+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
diff --git a/plugins/WikiHashtags/locale/id/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/id/LC_MESSAGES/WikiHashtags.po
index 998252845b..11e47470ea 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:14+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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 b605cae786..0e909d421f 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:14+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
diff --git a/plugins/WikiHashtags/locale/nb/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/nb/LC_MESSAGES/WikiHashtags.po
index a1b349a4ef..660becfc65 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:14+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
diff --git a/plugins/WikiHashtags/locale/nl/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/nl/LC_MESSAGES/WikiHashtags.po
index 911706d2a9..e896646fdc 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:14+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
diff --git a/plugins/WikiHashtags/locale/pt_BR/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/pt_BR/LC_MESSAGES/WikiHashtags.po
index 894f064d2d..2e9c551864 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:14+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
diff --git a/plugins/WikiHashtags/locale/ru/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/ru/LC_MESSAGES/WikiHashtags.po
index e553a044ec..9cb50b0031 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:14+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
diff --git a/plugins/WikiHashtags/locale/tl/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/tl/LC_MESSAGES/WikiHashtags.po
index e07b9e004b..5231c438d3 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:14+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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 b96a704dd8..d386b58f50 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:14+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34:18+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: 2010-11-29 19:46:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
diff --git a/plugins/WikiHashtags/locale/uk/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/uk/LC_MESSAGES/WikiHashtags.po
index cb71cc0abf..7f8ecf1de5 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:14+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-wikihashtags\n"
diff --git a/plugins/WikiHowProfile/locale/fr/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/fr/LC_MESSAGES/WikiHowProfile.po
index 9d6f739976..8dffddab20 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:15+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
diff --git a/plugins/WikiHowProfile/locale/ia/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/ia/LC_MESSAGES/WikiHowProfile.po
index 36e6bdfcbf..66fe6bdd41 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:15+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
diff --git a/plugins/WikiHowProfile/locale/mk/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/mk/LC_MESSAGES/WikiHowProfile.po
index 4b7a85357b..341075f009 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:15+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
diff --git a/plugins/WikiHowProfile/locale/nl/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/nl/LC_MESSAGES/WikiHowProfile.po
index 8549ca968e..6ca83137d7 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:15+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
diff --git a/plugins/WikiHowProfile/locale/ru/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/ru/LC_MESSAGES/WikiHowProfile.po
index d44df8df91..39dfa24296 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:15+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
diff --git a/plugins/WikiHowProfile/locale/tl/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/tl/LC_MESSAGES/WikiHowProfile.po
index 90b1c79a4f..81ac70270c 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:15+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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 12d0a041c6..fd96d79ba2 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:15+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34:18+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: 2010-10-29 16:14:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
diff --git a/plugins/WikiHowProfile/locale/uk/LC_MESSAGES/WikiHowProfile.po b/plugins/WikiHowProfile/locale/uk/LC_MESSAGES/WikiHowProfile.po
index f9836afeb1..0ab8f978c3 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:15+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-29 16:14:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-wikihowprofile\n"
diff --git a/plugins/XCache/locale/br/LC_MESSAGES/XCache.po b/plugins/XCache/locale/br/LC_MESSAGES/XCache.po
index d302b397d6..f6192612dc 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:15+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-30 23:43:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/XCache/locale/es/LC_MESSAGES/XCache.po b/plugins/XCache/locale/es/LC_MESSAGES/XCache.po
index 26e00b9c14..e18f9a3676 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:16+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-30 23:43:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/XCache/locale/fi/LC_MESSAGES/XCache.po b/plugins/XCache/locale/fi/LC_MESSAGES/XCache.po
index f215b85221..d58fb236cd 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:16+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34:19+0000\n"
 "Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-30 23:43:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/XCache/locale/fr/LC_MESSAGES/XCache.po b/plugins/XCache/locale/fr/LC_MESSAGES/XCache.po
index 7ff7e557a1..acee70ce27 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:19+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-30 23:43:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/XCache/locale/gl/LC_MESSAGES/XCache.po b/plugins/XCache/locale/gl/LC_MESSAGES/XCache.po
index eb18a667a8..98c58a77aa 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:19+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-30 23:43:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/XCache/locale/he/LC_MESSAGES/XCache.po b/plugins/XCache/locale/he/LC_MESSAGES/XCache.po
index f4963bd7d4..d51ca1839e 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:20+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-30 23:43:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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 ee38159fe0..a06a12f1dd 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:20+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-30 23:43:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/XCache/locale/id/LC_MESSAGES/XCache.po b/plugins/XCache/locale/id/LC_MESSAGES/XCache.po
index ca4cafa696..d4209e4bfd 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:20+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-30 23:43:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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 89e874e715..1da41535fc 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:20+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-30 23:43:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/XCache/locale/nb/LC_MESSAGES/XCache.po b/plugins/XCache/locale/nb/LC_MESSAGES/XCache.po
index 4ba4011105..7287a3b3e7 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:20+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-30 23:43:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/XCache/locale/nl/LC_MESSAGES/XCache.po b/plugins/XCache/locale/nl/LC_MESSAGES/XCache.po
index e03ff1b145..26664fc3dc 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:20+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-30 23:43:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/XCache/locale/pt_BR/LC_MESSAGES/XCache.po b/plugins/XCache/locale/pt_BR/LC_MESSAGES/XCache.po
index 2a5d75ca2d..0818a1b090 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:20+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34:19+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: 2010-10-30 23:43:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/XCache/locale/ru/LC_MESSAGES/XCache.po b/plugins/XCache/locale/ru/LC_MESSAGES/XCache.po
index 5aba7773df..63367f59db 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:20+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-30 23:43:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/XCache/locale/tl/LC_MESSAGES/XCache.po b/plugins/XCache/locale/tl/LC_MESSAGES/XCache.po
index d0d4ce40a1..4ae9977888 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:20+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-30 23:43:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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 ce461a81d3..59410a1e17 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:20+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34:19+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: 2010-10-30 23:43:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/XCache/locale/uk/LC_MESSAGES/XCache.po b/plugins/XCache/locale/uk/LC_MESSAGES/XCache.po
index 8161ea2d7d..7798e1dae3 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:20+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-10-30 23:43:41+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-xcache\n"
diff --git a/plugins/YammerImport/locale/br/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/br/LC_MESSAGES/YammerImport.po
index 0cd1f4b875..50973ddd2a 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:24+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
@@ -49,7 +49,7 @@ msgstr ""
 
 #: lib/yammerimporter.php:230
 msgid "Expertise:"
-msgstr ""
+msgstr "Prizacha :"
 
 #: lib/yammerimporter.php:433
 #, php-format
diff --git a/plugins/YammerImport/locale/fr/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/fr/LC_MESSAGES/YammerImport.po
index 497f01d3a2..bfd5a9fe3e 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:25+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34:22+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-29 19:46:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
diff --git a/plugins/YammerImport/locale/gl/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/gl/LC_MESSAGES/YammerImport.po
index d70f45a07a..c8e2f40a36 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:26+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34:22+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: 2010-11-29 19:46:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
diff --git a/plugins/YammerImport/locale/ia/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/ia/LC_MESSAGES/YammerImport.po
index a7eb7711e3..a3c50004de 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:26+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
diff --git a/plugins/YammerImport/locale/mk/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/mk/LC_MESSAGES/YammerImport.po
index 771cbef50c..e0b5b010a5 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:26+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
diff --git a/plugins/YammerImport/locale/nl/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/nl/LC_MESSAGES/YammerImport.po
index 1838248715..92459c1570 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:26+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
diff --git a/plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po
index 233b5a794f..6096d2ec9c 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:27+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
diff --git a/plugins/YammerImport/locale/tr/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/tr/LC_MESSAGES/YammerImport.po
index 31fb640bcc..9457a8dde7 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:27+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34:23+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: 2010-11-29 19:46:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"
diff --git a/plugins/YammerImport/locale/uk/LC_MESSAGES/YammerImport.po b/plugins/YammerImport/locale/uk/LC_MESSAGES/YammerImport.po
index da0ac349ab..e545a9e543 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:13:27+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:34: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: 2010-11-29 19:46:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"

From 224a7986af551ecad0c50ac6ce102c9c4c925e3d Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Fri, 14 Jan 2011 12:11:10 +0100
Subject: [PATCH 046/314] Localisation updates from http://translatewiki.net.

---
 locale/af/LC_MESSAGES/statusnet.po    |  425 +-
 locale/ar/LC_MESSAGES/statusnet.po    |  432 +-
 locale/arz/LC_MESSAGES/statusnet.po   |  432 +-
 locale/bg/LC_MESSAGES/statusnet.po    |  426 +-
 locale/br/LC_MESSAGES/statusnet.po    |  529 +-
 locale/ca/LC_MESSAGES/statusnet.po    |  548 +-
 locale/cs/LC_MESSAGES/statusnet.po    |  435 +-
 locale/da/LC_MESSAGES/statusnet.po    |  424 +-
 locale/de/LC_MESSAGES/statusnet.po    |  503 +-
 locale/en_GB/LC_MESSAGES/statusnet.po |  426 +-
 locale/eo/LC_MESSAGES/statusnet.po    |  473 +-
 locale/es/LC_MESSAGES/statusnet.po    |  434 +-
 locale/fa/LC_MESSAGES/statusnet.po    |  425 +-
 locale/fi/LC_MESSAGES/statusnet.po    |  441 +-
 locale/fr/LC_MESSAGES/statusnet.po    |  434 +-
 locale/ga/LC_MESSAGES/statusnet.po    |  424 +-
 locale/gl/LC_MESSAGES/statusnet.po    |  433 +-
 locale/hsb/LC_MESSAGES/statusnet.po   |  536 +-
 locale/hu/LC_MESSAGES/statusnet.po    |  426 +-
 locale/ia/LC_MESSAGES/statusnet.po    |  545 +-
 locale/is/LC_MESSAGES/statusnet.po    |  425 +-
 locale/it/LC_MESSAGES/statusnet.po    |  436 +-
 locale/ja/LC_MESSAGES/statusnet.po    |  455 +-
 locale/ka/LC_MESSAGES/statusnet.po    |  431 +-
 locale/ko/LC_MESSAGES/statusnet.po    |  427 +-
 locale/mk/LC_MESSAGES/statusnet.po    |  547 +-
 locale/ml/LC_MESSAGES/statusnet.po    | 8641 +++++++++++++++++++++++++
 locale/nb/LC_MESSAGES/statusnet.po    |  525 +-
 locale/nl/LC_MESSAGES/statusnet.po    |  556 +-
 locale/nn/LC_MESSAGES/statusnet.po    |  458 +-
 locale/pl/LC_MESSAGES/statusnet.po    |  543 +-
 locale/pt/LC_MESSAGES/statusnet.po    |  432 +-
 locale/pt_BR/LC_MESSAGES/statusnet.po |  434 +-
 locale/ru/LC_MESSAGES/statusnet.po    |  437 +-
 locale/statusnet.pot                  |  401 +-
 locale/sv/LC_MESSAGES/statusnet.po    |  442 +-
 locale/te/LC_MESSAGES/statusnet.po    |  428 +-
 locale/tr/LC_MESSAGES/statusnet.po    |  434 +-
 locale/uk/LC_MESSAGES/statusnet.po    |  547 +-
 locale/vi/LC_MESSAGES/statusnet.po    |  420 +-
 locale/zh_CN/LC_MESSAGES/statusnet.po |  431 +-
 41 files changed, 20697 insertions(+), 6304 deletions(-)
 create mode 100644 locale/ml/LC_MESSAGES/statusnet.po

diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po
index 2c4afe8d0b..e2ccd61446 100644
--- a/locale/af/LC_MESSAGES/statusnet.po
+++ b/locale/af/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:10:21+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:31:28+0000\n"
 "Language-Team: Afrikaans <http://translatewiki.net/wiki/Portal:af>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: af\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -271,7 +271,7 @@ msgstr "Opdaterings van %1$s en vriende op %2$s."
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -316,7 +316,8 @@ msgstr "Kon nie die gebruiker opdateer nie."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -549,7 +550,7 @@ msgstr "Kon nie die gebruiker opdateer nie."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Die gebruikersnaam is reeds in gebruik. Kies 'n ander een."
@@ -559,7 +560,7 @@ msgstr "Die gebruikersnaam is reeds in gebruik. Kies 'n ander een."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Nie 'n geldige gebruikersnaam nie."
@@ -571,7 +572,7 @@ msgstr "Nie 'n geldige gebruikersnaam nie."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Tuisblad is nie 'n geldige URL nie."
@@ -581,7 +582,7 @@ msgstr "Tuisblad is nie 'n geldige URL nie."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -597,7 +598,7 @@ msgstr "Volledige naam is te lang (maksimum 255 karakters)."
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -609,7 +610,7 @@ msgstr[1] "Die beskrywing is te lank (die maksimum is %d karakters)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -622,7 +623,7 @@ msgstr "Ligging is te lank is (maksimum 255 karakters)."
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -641,7 +642,7 @@ msgstr "Ongeldige alias: \"%s\""
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Die alias \"%s\" word al reeds gebruik. Probeer 'n ander een."
@@ -650,7 +651,7 @@ msgstr "Die alias \"%s\" word al reeds gebruik. Probeer 'n ander een."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Die alias kan nie dieselfde as die gebruikersnaam wees nie."
 
@@ -1047,7 +1048,7 @@ msgstr "%1$s / Gunstelinge van %2$s"
 
 #. TRANS: Server error displayed when generating an Atom feed fails.
 #. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:138
+#: actions/apitimelinegroup.php:134
 #, fuzzy, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Dit was nie moontlik om die groep by te werk nie."
@@ -1139,30 +1140,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "U kan nie u eie kennisgewings herhaal nie."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1174,7 +1175,7 @@ msgid "API method under construction."
 msgstr "Die API-funksie is nie gevind nie."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 #, fuzzy
 msgid "User not found."
 msgstr "Die API-funksie is nie gevind nie."
@@ -1267,9 +1268,8 @@ msgstr ""
 "Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
-msgstr "Die groep bestaan nie."
+msgstr "Hierdie groep bestaat nie"
 
 #: actions/atompubshowmembership.php:90
 #, fuzzy
@@ -1394,14 +1394,14 @@ msgid "Preview"
 msgstr "Voorskou"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Skrap"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
@@ -1444,6 +1444,37 @@ msgstr "Die opdatering van die avatar het gefaal."
 msgid "Avatar deleted."
 msgstr "Die avatar is verwyder."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+msgid "Only logged-in users can backup their account."
+msgstr ""
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Agtergrond"
+
+#: actions/backupaccount.php:258
+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."
@@ -1652,6 +1683,59 @@ msgstr "Gesprek"
 msgid "Notices"
 msgstr "Kennisgewings"
 
+#: actions/deleteaccount.php:72
+msgid "Only logged-in users can delete their account."
+msgstr ""
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "U kan nie gebruikers verwyder nie."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Die avatar is verwyder."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Skep 'n gebruiker"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Bevestig"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1797,7 +1881,7 @@ msgid "Do not delete this notice"
 msgstr "Moenie hierdie kennisgewing verwyder nie"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Verwyder hierdie kennisgewing"
 
@@ -2106,7 +2190,7 @@ msgstr "Gebruik hierdie vorm om die groep te wysig."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Ongeldige alias: \"%s\""
@@ -2118,7 +2202,7 @@ msgstr "Dit was nie moontlik om die groep by te werk nie."
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "Dit was nie moontlik om die aliasse te skep nie."
 
@@ -3303,8 +3387,14 @@ msgstr "Dit was nie moontlik om die applikasie te skep nie."
 msgid "New group"
 msgstr "Nuwe groep"
 
+#. 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 "U is nie 'n lid van die groep nie."
+
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:110
+#: actions/newgroup.php:117
 #, fuzzy
 msgid "Use this form to create a new group."
 msgstr "Gebruik hierdie vorm om die groep te wysig."
@@ -3629,11 +3719,6 @@ msgstr "Nuwe wagwoord"
 msgid "6 or more characters"
 msgstr "6 of meer karakters"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Bevestig"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Dieselfde as wagwoord hierbo"
@@ -4163,6 +4248,11 @@ msgstr "Kon nie gebruiker opdateer nie."
 msgid "Settings saved."
 msgstr "Voorkeure is gestoor."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Skep 'n gebruiker"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4608,7 +4698,7 @@ msgstr "U kan nie u eie kennisgewings herhaal nie."
 msgid "You already repeated that notice."
 msgstr "U het reeds die kennisgewing herhaal."
 
-#: actions/repeat.php:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Herhalend"
 
@@ -4670,6 +4760,89 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Opdaterings van %1$s op %2$s."
 
+#: actions/restoreaccount.php:79
+msgid "Only logged-in users can restore their account."
+msgstr ""
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "Dit was nie moontlik om die applikasie te skep nie."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, fuzzy
+msgid "No uploaded file."
+msgstr "Oplaai"
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: actions/restoreaccount.php:130 lib/mediafile.php:194
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:136 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:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr ""
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Alle lede"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, fuzzy
+msgid "Upload the file"
+msgstr "Oplaai"
+
 #: actions/revokerole.php:75
 #, fuzzy
 msgid "You cannot revoke user roles on this site."
@@ -4778,7 +4951,7 @@ msgid "Reset key & secret"
 msgstr ""
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Skrap"
 
@@ -6022,14 +6195,14 @@ msgid "Author(s)"
 msgstr "Outeur(s)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 #, fuzzy
 msgid "Favor"
 msgstr "Gunstelinge"
 
 #. 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:154
+#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "Hierdie kennisgewing is nie 'n gunsteling nie!"
@@ -6140,7 +6313,7 @@ msgid "Could not create login token for %s"
 msgstr "Dit was nie moontlik om die aliasse te skep nie."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6170,72 +6343,72 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: 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:288
+#: 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:296
+#: classes/Notice.php:305
 #, fuzzy
 msgid "You are banned from posting notices on this site."
 msgstr "Jy kan nie gebruikers op hierdie webwerf stilmaak nie."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Kon nie die profiel stoor nie."
 
 #. 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6243,14 +6416,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6329,34 +6502,34 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "Welkom by %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "Kon nie die groep skep nie."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 #, fuzzy
 msgid "Could not set group URI."
 msgstr "Kon nie die groep skep nie."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:549
 #, fuzzy
 msgid "Could not set group membership."
 msgstr "Kon nie die groep skep nie."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:559
+#: classes/User_group.php:564
 #, fuzzy
 msgid "Could not save local group info."
 msgstr "Kon nie die profiel stoor nie."
@@ -6695,10 +6868,19 @@ msgstr "Voor"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Foto"
+msgid "Unknown profile."
+msgstr "Onbekende lêertipe"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7003,6 +7185,10 @@ msgstr "Verwyder"
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7407,25 +7593,25 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Geen bevestigingskode."
 
 #. 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:150
+#: lib/common.php:153
 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "Gaan na die installeerder."
 
@@ -7535,6 +7721,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "Vriende van vriende (FOAF)"
 
+#: 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"
@@ -7720,11 +7914,6 @@ msgstr "Die kennisgewing is te lank. Gebruik maksimum %d karakters."
 msgid "Partial upload."
 msgstr "Geen lêer opgelaai nie."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr ""
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr ""
@@ -8044,7 +8233,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "van"
 
@@ -8074,38 +8263,6 @@ msgstr "Nie-ondersteunde formaat."
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: lib/mediafile.php:194
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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.
-#: lib/mediafile.php:222
-msgid "File upload stopped by extension."
-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."
@@ -8128,7 +8285,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8137,7 +8294,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
@@ -8172,19 +8329,19 @@ msgid "Send"
 msgstr "Stuur"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
 "Die gebruikersnaam mag slegs uit kleinletters en syfers bestaan en mag geen "
 "spasies bevat nie."
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:176
+#: 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:189
+#: 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."
@@ -8225,56 +8382,56 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "O"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "W"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, 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:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "op"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "in konteks"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "Herhaal deur"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 #, fuzzy
 msgid "Reply to this notice"
 msgstr "Verwyder hierdie kennisgewing"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Antwoord"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 #, fuzzy
 msgid "Notice repeated"
 msgstr "Hierdie kennisgewing is verwyder."
@@ -8439,7 +8596,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Blok hierdie gebruiker van hierdie groep"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:957
+#: lib/router.php:974
 #, fuzzy
 msgid "Page not found."
 msgstr "Die API-funksie is nie gevind nie."
@@ -8802,22 +8959,10 @@ msgstr "Ongeldige grootte."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
 #, fuzzy
-msgid "No user specified; using backup user."
-msgstr "Geen groep verskaf nie."
+#~ msgid "Post"
+#~ msgstr "Foto"
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+#~ msgid "No user specified; using backup user."
+#~ msgstr "Geen groep verskaf nie."
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index 2eb7e3f32d..4af3e36a6a 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -11,19 +11,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:10:23+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:31:29+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 (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
 "2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
 "99) ? 4 : 5 ) ) ) );\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -275,7 +275,7 @@ msgstr "الإشعارات التي فضلها %1$s في %2$s!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -320,7 +320,8 @@ msgstr "تعذّر تحديث المستخدم."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -557,7 +558,7 @@ msgstr "تعذّر إيجاد المستخدم الهدف."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "الاسم المستعار مستخدم بالفعل. جرّب اسمًا آخرًا."
@@ -567,7 +568,7 @@ msgstr "الاسم المستعار مستخدم بالفعل. جرّب اسمً
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "ليس اسمًا مستعارًا صحيحًا."
@@ -579,7 +580,7 @@ msgstr "ليس اسمًا مستعارًا صحيحًا."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "الصفحة الرئيسية ليست عنونًا صالحًا."
@@ -589,7 +590,7 @@ msgstr "الصفحة الرئيسية ليست عنونًا صالحًا."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -605,7 +606,7 @@ msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -621,7 +622,7 @@ msgstr[5] "المنظمة طويلة جدا (الأقصى %d حرفا)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -634,7 +635,7 @@ msgstr "المنظمة طويلة جدا (الأقصى 255 حرفا)."
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -657,7 +658,7 @@ msgstr "كنية غير صالحة: \"%s\"."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, fuzzy, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "الاسم المستعار مستخدم بالفعل. جرّب اسمًا آخرًا."
@@ -666,7 +667,7 @@ msgstr "الاسم المستعار مستخدم بالفعل. جرّب اسمً
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -1076,7 +1077,7 @@ msgstr "الإشعارات التي فضلها %1$s في %2$s!"
 
 #. TRANS: Server error displayed when generating an Atom feed fails.
 #. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:138
+#: actions/apitimelinegroup.php:134
 #, fuzzy, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "تعذر تحديث المجموعة."
@@ -1169,30 +1170,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "ابحث عن محتويات في الإشعارات"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "لا ملف بهذه الهوية."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1204,7 +1205,7 @@ msgid "API method under construction."
 msgstr "لم يتم العثور على وسيلة API."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "لم يُعثرعلى المستخدم."
 
@@ -1294,9 +1295,8 @@ msgid "Can't delete someone else's favorite"
 msgstr "تعذّر حذف المفضلة."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
-msgstr "لا مجموعة كهذه."
+msgstr "لا مجموعة كهذه"
 
 #: actions/atompubshowmembership.php:90
 #, fuzzy
@@ -1419,14 +1419,14 @@ msgid "Preview"
 msgstr "معاينة"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "احذف"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
@@ -1469,6 +1469,38 @@ msgstr "فشل تحديث الأفتار."
 msgid "Avatar deleted."
 msgstr "حُذف الأفتار."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "يستطيع المستخدمون الوالجون وحدهم تكرار الإشعارات."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "الخلفية"
+
+#: actions/backupaccount.php:258
+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."
@@ -1674,6 +1706,60 @@ msgstr "محادثة"
 msgid "Notices"
 msgstr "الإشعارات"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "يستطيع المستخدمون الوالجون وحدهم تكرار الإشعارات."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "لا يمكنك حذف المستخدمين."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "حُذف الأفتار."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "أنشئ حسابًا"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "أكّد"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1820,7 +1906,7 @@ msgid "Do not delete this notice"
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "احذف هذا الإشعار"
 
@@ -2128,7 +2214,7 @@ msgstr "استخدم هذا النموذج لتعديل المجموعة."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "كنية غير صالحة: \"%s\""
@@ -2140,7 +2226,7 @@ msgstr "تعذر تحديث المجموعة."
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "تعذّر إنشاء الكنى."
 
@@ -3330,8 +3416,14 @@ msgstr "لم يمكن إنشاء التطبيق."
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "استخدم هذا النموذج لإنشاء مجموعة جديدة."
 
@@ -3644,11 +3736,6 @@ msgstr "كلمة السر الجديدة"
 msgid "6 or more characters"
 msgstr "6 أحرف أو أكثر"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "أكّد"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "نفس كلمة السر أعلاه"
@@ -4187,6 +4274,11 @@ msgstr "تعذّر حفظ الوسوم."
 msgid "Settings saved."
 msgstr "حُفظت الإعدادات."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "أنشئ حسابًا"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4619,7 +4711,7 @@ msgstr "لا يمكنك تكرار ملاحظتك الشخصية."
 msgid "You already repeated that notice."
 msgstr "أنت كررت هذه الملاحظة بالفعل."
 
-#: actions/repeat.php:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "مكرر"
 
@@ -4679,6 +4771,90 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "الردود على %1$s، الصفحة %2$d"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "يستطيع المستخدمون الوالجون وحدهم تكرار الإشعارات."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "يجب أن تكون مسجل الدخول لتسجل تطبيقا."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, fuzzy
+msgid "No uploaded file."
+msgstr "ارفع ملفًا"
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: actions/restoreaccount.php:130 lib/mediafile.php:194
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:136 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:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr ""
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "جميع الأعضاء"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, fuzzy
+msgid "Upload the file"
+msgstr "ارفع ملفًا"
+
 #: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "لا يمكنك سحب أدوار المستخدمين على هذا الموقع."
@@ -4784,7 +4960,7 @@ msgid "Reset key & secret"
 msgstr ""
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "احذف"
 
@@ -6026,13 +6202,13 @@ msgid "Author(s)"
 msgstr "المؤلف(ون)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "لقد أضاف %s (@%s) إشعارك إلى مفضلاته"
@@ -6152,7 +6328,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6180,73 +6356,73 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: 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:288
+#: 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:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1012
+#: classes/Notice.php:1013
 #, 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6254,14 +6430,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6333,32 +6509,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "أهلا بكم في %1$s يا @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "تعذّر إنشاء المجموعة."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 msgid "Could not set group URI."
 msgstr "تعذّر إنشاء المجموعة."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:549
 msgid "Could not set group membership."
 msgstr "تعذّر ضبط عضوية المجموعة."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "تعذر تحديث المجموعة المحلية."
 
@@ -6696,10 +6872,19 @@ msgstr "قبل"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "صورة"
+msgid "Unknown profile."
+msgstr "نوع ملف غير معروف"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -6995,6 +7180,10 @@ msgstr "أزل"
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7448,25 +7637,25 @@ msgstr ""
 "tracking - لم يطبق بعد.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 #, 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:150
+#: lib/common.php:153
 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "اذهب إلى المُثبّت."
 
@@ -7573,6 +7762,14 @@ msgstr "أتوم"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: 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"
@@ -7763,11 +7960,6 @@ msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات
 msgid "Partial upload."
 msgstr "لم يُرفع ملف."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr ""
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr ""
@@ -8120,7 +8312,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "من"
 
@@ -8152,38 +8344,6 @@ msgstr "نوع رسالة غير مدعوم: %s"
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: lib/mediafile.php:194
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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.
-#: lib/mediafile.php:222
-msgid "File upload stopped by extension."
-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."
@@ -8204,7 +8364,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8213,7 +8373,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
@@ -8248,18 +8408,18 @@ msgid "Send"
 msgstr "أرسل"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8302,55 +8462,55 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "ش"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "ج"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "ر"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "غ"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "في"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "في السياق"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "مكرر بواسطة"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "رُد على هذا الإشعار"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "رُد"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "الإشعار مكرر"
 
@@ -8505,7 +8665,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:957
+#: lib/router.php:974
 #, fuzzy
 msgid "Page not found."
 msgstr "لم يتم العثور على وسيلة API."
@@ -8879,26 +9039,10 @@ msgstr "حجم غير صالح."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
 #, fuzzy
-msgid "No user specified; using backup user."
-msgstr "لا هوية مستخدم محددة."
+#~ msgid "Post"
+#~ msgstr "صورة"
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
+#, fuzzy
+#~ msgid "No user specified; using backup user."
+#~ msgstr "لا هوية مستخدم محددة."
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index 4f56fcd5de..e291d49190 100644
--- a/locale/arz/LC_MESSAGES/statusnet.po
+++ b/locale/arz/LC_MESSAGES/statusnet.po
@@ -11,19 +11,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:10:25+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:31:31+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 (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: arz\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -279,7 +279,7 @@ msgstr "%1$s و الصحاب, صفحه %2$d"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -324,7 +324,8 @@ msgstr "تعذّر تحديث المستخدم."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -563,7 +564,7 @@ msgstr "تعذّر إيجاد المستخدم الهدف."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr ""
@@ -573,7 +574,7 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "ليس اسمًا مستعارًا صحيحًا."
@@ -585,7 +586,7 @@ msgstr "ليس اسمًا مستعارًا صحيحًا."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "الصفحه الرئيسيه ليست عنونًا صالحًا."
@@ -595,7 +596,7 @@ msgstr "الصفحه الرئيسيه ليست عنونًا صالحًا."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -611,7 +612,7 @@ msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -627,7 +628,7 @@ msgstr[5] "المنظمه طويله جدا (اكتر حاجه %d رمز)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -640,7 +641,7 @@ msgstr "المنظمه طويله جدا (اكتر حاجه 255 رمز)."
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -663,7 +664,7 @@ msgstr "كنيه غير صالحة: \"%s\""
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr ""
@@ -672,7 +673,7 @@ msgstr ""
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -1085,7 +1086,7 @@ msgstr "نتايج التدوير لـ\"%1$s\" على %2$s"
 
 #. TRANS: Server error displayed when generating an Atom feed fails.
 #. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:138
+#: actions/apitimelinegroup.php:134
 #, fuzzy, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "تعذر تحديث المجموعه."
@@ -1178,30 +1179,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "ابحث عن محتويات فى الإشعارات"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "لا ملف بهذه الهويه."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1213,7 +1214,7 @@ msgid "API method under construction."
 msgstr "الـ API method مش موجوده."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 #, fuzzy
 msgid "User not found."
 msgstr "الـ API method مش موجوده."
@@ -1305,9 +1306,8 @@ msgid "Can't delete someone else's favorite"
 msgstr "تعذّر حذف المفضله."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
-msgstr "لا مجموعه كهذه."
+msgstr "لا مجموعه كهذه"
 
 #: actions/atompubshowmembership.php:90
 #, fuzzy
@@ -1430,14 +1430,14 @@ msgid "Preview"
 msgstr "عاين"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "احذف"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
@@ -1481,6 +1481,38 @@ msgstr "فشل تحديث الأفتار."
 msgid "Avatar deleted."
 msgstr "حُذف الأفتار."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "يحق للمُرسل والمستلم فقط قراءه هذه الرساله."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "الخلفية"
+
+#: actions/backupaccount.php:258
+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."
@@ -1688,6 +1720,60 @@ msgstr "محادثة"
 msgid "Notices"
 msgstr "الإشعارات"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "يحق للمُرسل والمستلم فقط قراءه هذه الرساله."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "لا يمكنك حذف المستخدمين."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "حُذف الأفتار."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "أنشئ مجموعه جديدة"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "أكّد"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1837,7 +1923,7 @@ msgid "Do not delete this notice"
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "احذف هذا الإشعار"
 
@@ -2148,7 +2234,7 @@ msgstr "استخدم هذا النموذج لتعديل المجموعه."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "كنيه غير صالحة: \"%s\""
@@ -2160,7 +2246,7 @@ msgstr "تعذر تحديث المجموعه."
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "تعذّر إنشاء الكنى."
 
@@ -3363,8 +3449,14 @@ msgstr "مش ممكن إنشاء الapplication."
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "استخدم هذا النموذج لإنشاء مجموعه جديده."
 
@@ -3677,11 +3769,6 @@ msgstr "كلمه سر جديدة"
 msgid "6 or more characters"
 msgstr "6 حروف أو أكثر. مطلوب."
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "أكّد"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "نفس كلمه السر أعلاه"
@@ -4216,6 +4303,11 @@ msgstr "تعذّر حفظ الوسوم."
 msgid "Settings saved."
 msgstr "حُفظت الإعدادات."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "أنشئ مجموعه جديدة"
+
 #: actions/public.php:83
 #, fuzzy, php-format
 msgid "Beyond the page limit (%s)."
@@ -4648,7 +4740,7 @@ msgstr "ما ينفعش تكرر الملاحظه بتاعتك."
 msgid "You already repeated that notice."
 msgstr "انت عيدت الملاحظه دى فعلا."
 
-#: actions/repeat.php:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "مكرر"
 
@@ -4708,6 +4800,90 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "أهلا بكم فى %1$s يا @%2$s!"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "يحق للمُرسل والمستلم فقط قراءه هذه الرساله."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "لازم تكون مسجل دخوللك علشان تسجل application."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, fuzzy
+msgid "No uploaded file."
+msgstr "ارفع ملفًا"
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: actions/restoreaccount.php:130 lib/mediafile.php:194
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:136 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:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr ""
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "جميع الأعضاء"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, fuzzy
+msgid "Upload the file"
+msgstr "ارفع ملفًا"
+
 #: actions/revokerole.php:75
 #, fuzzy
 msgid "You cannot revoke user roles on this site."
@@ -4814,7 +4990,7 @@ msgid "Reset key & secret"
 msgstr ""
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "احذف"
 
@@ -6063,13 +6239,13 @@ msgid "Author(s)"
 msgstr "المؤلف/ين"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "أرسل لى بريدًا إلكرتونيًا عندما يضيف أحدهم إشعارى مفضله."
@@ -6190,7 +6366,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6218,73 +6394,73 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: 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:288
+#: 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:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1012
+#: classes/Notice.php:1013
 #, 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6292,14 +6468,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6370,32 +6546,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "أهلا بكم فى %1$s يا @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "تعذّر إنشاء المجموعه."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 msgid "Could not set group URI."
 msgstr "تعذّر إنشاء المجموعه."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:549
 msgid "Could not set group membership."
 msgstr "تعذّر ضبط عضويه المجموعه."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:559
+#: classes/User_group.php:564
 #, fuzzy
 msgid "Could not save local group info."
 msgstr "تعذّر حفظ الاشتراك."
@@ -6748,10 +6924,19 @@ msgstr "قبل"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "صورة"
+msgid "Unknown profile."
+msgstr "نوع ملف غير معروف"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7055,6 +7240,10 @@ msgstr "استرجع"
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7473,25 +7662,25 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 #, 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:150
+#: lib/common.php:153
 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "اذهب إلى المُثبّت."
 
@@ -7598,6 +7787,14 @@ msgstr "أتوم"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: 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"
@@ -7788,11 +7985,6 @@ msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات
 msgid "Partial upload."
 msgstr "رُفع الأفتار."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr ""
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr ""
@@ -8125,7 +8317,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "من"
 
@@ -8156,38 +8348,6 @@ msgstr "نوع رساله مش مدعوم: %s"
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: lib/mediafile.php:194
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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.
-#: lib/mediafile.php:222
-msgid "File upload stopped by extension."
-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."
@@ -8208,7 +8368,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8217,7 +8377,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
@@ -8253,17 +8413,17 @@ msgid "Send"
 msgstr "أرسل"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8306,55 +8466,55 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "ش"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "ج"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "ر"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "غ"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "في"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "فى السياق"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "متكرر من"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "رُد على هذا الإشعار"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "رُد"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "الإشعار مكرر"
 
@@ -8509,7 +8669,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:957
+#: lib/router.php:974
 #, fuzzy
 msgid "Page not found."
 msgstr "الـ API method مش موجوده."
@@ -8886,26 +9046,10 @@ msgstr "حجم غير صالح."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
 #, fuzzy
-msgid "No user specified; using backup user."
-msgstr "ما فيش ID متحدد لليوزر."
+#~ msgid "Post"
+#~ msgstr "صورة"
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
+#, fuzzy
+#~ msgid "No user specified; using backup user."
+#~ msgstr "ما فيش ID متحدد لليوزر."
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index bb1f0c3e0f..4a710964e5 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:10:26+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:31:33+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 (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: bg\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -270,7 +270,7 @@ msgstr "Бележки от %1$s и приятели в %2$s."
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -315,7 +315,8 @@ msgstr "Грешка при обновяване на потребителя."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -549,7 +550,7 @@ msgstr "Целевият потребител не беше открит."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Опитайте друг псевдоним, този вече е зает."
@@ -559,7 +560,7 @@ msgstr "Опитайте друг псевдоним, този вече е за
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Неправилен псевдоним."
@@ -571,7 +572,7 @@ msgstr "Неправилен псевдоним."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Адресът на личната страница не е правилен URL."
@@ -581,7 +582,7 @@ msgstr "Адресът на личната страница не е правил
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -597,7 +598,7 @@ msgstr "Пълното име е твърде дълго (макс. 255 знак
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -609,7 +610,7 @@ msgstr[1] "Описанието е твърде дълго (до %d символ
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -622,7 +623,7 @@ msgstr "Името на местоположението е твърде дъл
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -641,7 +642,7 @@ msgstr "Неправилен псевдоним: \"%s\""
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Псевдонимът \"%s\" вече е зает. Опитайте друг."
@@ -650,7 +651,7 @@ msgstr "Псевдонимът \"%s\" вече е зает. Опитайте д
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -1049,7 +1050,7 @@ 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:138
+#: actions/apitimelinegroup.php:134
 #, fuzzy, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Грешка при обновяване на групата."
@@ -1142,30 +1143,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Търсене в съдържанието на бележките"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Не е открита бележка с такъв идентификатор."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1176,7 +1177,7 @@ msgid "API method under construction."
 msgstr "Методът в API все още се разработва."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "Не е открит методът в API."
 
@@ -1266,7 +1267,6 @@ msgid "Can't delete someone else's favorite"
 msgstr "Грешка при изтриване на любима бележка."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
 msgstr "Няма такава група"
 
@@ -1392,14 +1392,14 @@ msgid "Preview"
 msgstr "Преглед"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Изтриване"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
@@ -1442,6 +1442,38 @@ msgstr "Неуспешно обновяване на аватара."
 msgid "Avatar deleted."
 msgstr "Аватарът е изтрит."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "Само влезли потребители могат да повтарят бележки."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Фон"
+
+#: actions/backupaccount.php:258
+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."
@@ -1647,6 +1679,60 @@ msgstr "Разговор"
 msgid "Notices"
 msgstr "Бележки"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "Само влезли потребители могат да повтарят бележки."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "Не можете да изтривате потребители."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Аватарът е изтрит."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Създаване на нова сметка"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Потвърждаване"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1793,7 +1879,7 @@ msgid "Do not delete this notice"
 msgstr "Да не се изтрива бележката"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Изтриване на бележката"
 
@@ -2115,7 +2201,7 @@ msgstr "Използвайте тази бланка за създаване н
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Неправилен псевдоним: \"%s\""
@@ -2127,7 +2213,7 @@ msgstr "Грешка при обновяване на групата."
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 #, fuzzy
 msgid "Could not create aliases."
 msgstr "Грешка при отбелязване като любима."
@@ -3361,8 +3447,14 @@ msgstr "Грешка при отбелязване като любима."
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Използвайте тази бланка за създаване на нова група."
 
@@ -3679,11 +3771,6 @@ msgstr "Нова парола"
 msgid "6 or more characters"
 msgstr "6 или повече знака"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Потвърждаване"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Също като паролата по-горе"
@@ -4212,6 +4299,11 @@ msgstr "Грешка при запазване етикетите."
 msgid "Settings saved."
 msgstr "Настройките са запазени."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Създаване на нова сметка"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4661,7 +4753,7 @@ msgstr "Не можете да повтаряте собствена бележ
 msgid "You already repeated that notice."
 msgstr "Вече сте повторили тази бележка."
 
-#: actions/repeat.php:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Повторено"
 
@@ -4721,6 +4813,90 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Отговори до %1$s в %2$s!"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "Само влезли потребители могат да повтарят бележки."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "Не сте собственик на това приложение."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, fuzzy
+msgid "No uploaded file."
+msgstr "Качване на файл"
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: actions/restoreaccount.php:130 lib/mediafile.php:194
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:136 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:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "Системна грешка при качване на файл."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Всички членове"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, fuzzy
+msgid "Upload the file"
+msgstr "Качване на файл"
+
 #: actions/revokerole.php:75
 #, fuzzy
 msgid "You cannot revoke user roles on this site."
@@ -4824,7 +5000,7 @@ msgid "Reset key & secret"
 msgstr ""
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Изтриване"
 
@@ -6063,13 +6239,13 @@ msgid "Author(s)"
 msgstr "Автор(и)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%s (@%s) отбеляза бележката ви като любима"
@@ -6181,7 +6357,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6209,24 +6385,24 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -6234,7 +6410,7 @@ msgstr ""
 "отново след няколко минути."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:288
+#: classes/Notice.php:297
 #, fuzzy
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
@@ -6244,43 +6420,43 @@ msgstr ""
 "отново след няколко минути."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1012
+#: classes/Notice.php:1013
 #, 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6288,14 +6464,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6369,32 +6545,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "Добре дошли в %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "Грешка при създаване на групата."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 msgid "Could not set group URI."
 msgstr "Грешка при създаване на групата."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:549
 msgid "Could not set group membership."
 msgstr "Грешка при създаване на групата."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "Грешка при запазване на етикетите."
 
@@ -6736,10 +6912,19 @@ msgstr "Преди"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Снимка"
+msgid "Unknown profile."
+msgstr "Неподдържан вид файл"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7041,6 +7226,10 @@ msgstr "Премахване"
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7442,26 +7631,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 #, 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:150
+#: lib/common.php:153
 #, 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Влизане в сайта"
@@ -7571,6 +7760,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: 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"
@@ -7752,11 +7949,6 @@ msgstr "Може да качите лого за групата ви."
 msgid "Partial upload."
 msgstr "Частично качване на файла."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "Системна грешка при качване на файл."
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "Файлът не е изображение или е повреден."
@@ -8083,7 +8275,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "от"
 
@@ -8113,38 +8305,6 @@ msgstr "Форматът на файла с изображението не се
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: lib/mediafile.php:194
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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.
-#: lib/mediafile.php:222
-msgid "File upload stopped by extension."
-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."
@@ -8165,7 +8325,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8174,7 +8334,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
@@ -8210,19 +8370,19 @@ msgid "Send"
 msgstr "Прати"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8261,56 +8421,56 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "С"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "Ю"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "И"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "З"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:468
+#: lib/noticelist.php:469
 #, fuzzy
 msgid "at"
 msgstr "Път"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "в контекст"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "Повторено от"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "Отговаряне на тази бележка"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Отговор"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Бележката е повторена."
 
@@ -8465,7 +8625,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:957
+#: lib/router.php:974
 #, fuzzy
 msgid "Page not found."
 msgstr "Не е открит методът в API."
@@ -8823,22 +8983,10 @@ msgstr "Неправилен размер."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
 #, fuzzy
-msgid "No user specified; using backup user."
-msgstr "Не е указана група."
+#~ msgid "Post"
+#~ msgstr "Снимка"
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+#~ msgid "No user specified; using backup user."
+#~ msgstr "Не е указана група."
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 7a98ba56b9..52395c6a46 100644
--- a/locale/br/LC_MESSAGES/statusnet.po
+++ b/locale/br/LC_MESSAGES/statusnet.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - Core to Breton (Brezhoneg)
 # Expored from translatewiki.net
 #
+# Author: Fohanno
 # Author: Fulup
 # Author: Gwendal
 # Author: Y-M D
@@ -11,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:10:27+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:31:38+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 (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -276,7 +277,7 @@ msgstr "Hizivadennoù %1$s ha mignoned e %2$s!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -310,7 +311,7 @@ msgstr ""
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
 #: actions/apiaccountupdatedeliverydevice.php:130
 msgid "Could not update user."
-msgstr "Diposubl eo hizivaat an implijer."
+msgstr "Dibosupl eo hizivaat an implijer."
 
 #. TRANS: Client error displayed if a user profile could not be found.
 #. TRANS: Client error displayed when a user has no profile.
@@ -321,7 +322,8 @@ msgstr "Diposubl eo hizivaat an implijer."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -331,7 +333,7 @@ msgstr "An implijer-mañ n'eus profil ebet dezhañ."
 #. TRANS: Server error displayed if a user profile could not be saved.
 #: actions/apiaccountupdateprofile.php:147
 msgid "Could not save profile."
-msgstr "Diposubl eo enrollañ ar profil."
+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.
@@ -371,11 +373,11 @@ msgstr "Dibosupl eo enrollañ an arventennoù empentiñ."
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
 msgid "Could not update your design."
-msgstr "Diposubl eo hizivat ho design."
+msgstr "Dibosupl eo hizivaat ho design."
 
 #: actions/apiatomservice.php:86
 msgid "Main"
-msgstr ""
+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.
@@ -520,7 +522,7 @@ msgstr "Dibosupl eo heuliañ an implijer : n'eo ket bet kavet ar profil."
 #: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
-msgstr "Diposubl eo heuliañ an implijer : war ho listenn emañ %s dija."
+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
@@ -542,19 +544,19 @@ 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 "Diposubl eo termeniñ an implijer mammenn."
+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 "Diposubl eo kavout an implijer pal."
+msgstr "Dibosupl eo kavout an implijer pal."
 
 #. TRANS: Client error trying to create a group with a nickname this is already in use.
 #. 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:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
@@ -564,7 +566,7 @@ msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "N'eo ket ul lesanv mat."
@@ -576,7 +578,7 @@ msgstr "N'eo ket ul lesanv mat."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "N'eo ket chomlec'h al lec'hienn personel un URL reizh."
@@ -586,7 +588,7 @@ 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:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -602,7 +604,7 @@ msgstr "Re hir eo an anv klok (255 arouezenn d'ar muiañ)."
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -614,7 +616,7 @@ 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:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -627,7 +629,7 @@ msgstr "Re hir eo al lec'hiadur (255 arouezenn d'ar muiañ)."
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -646,7 +648,7 @@ msgstr "Alias fall : \"%s\"."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Implijet e vez an alias \"%s\" dija. Klaskit gant unan all."
@@ -655,7 +657,7 @@ msgstr "Implijet e vez an alias \"%s\" dija. Klaskit gant unan all."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Ne c'hell ket an alias bezañ ar memes hini eget al lesanv."
 
@@ -690,7 +692,7 @@ msgstr "Stanket oc'h bet eus ar strollad-mañ gant ur merour."
 #: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
-msgstr "Diposubl eo stagañ an implijer %1$s d'ar strollad %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
@@ -705,7 +707,7 @@ msgstr "N'oc'h ket ezel eus ar strollad-mañ."
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
-msgstr "Diposubl eo dilemel an implijer %1$s deus ar strollad %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
@@ -1048,7 +1050,7 @@ msgstr "%1$s statud pennroll da %2$s / %2$s."
 
 #. TRANS: Server error displayed when generating an Atom feed fails.
 #. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:138
+#: actions/apitimelinegroup.php:134
 #, fuzzy, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Diposubl eo hizivaat ar strollad."
@@ -1141,30 +1143,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Klask alioù en danvez"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1175,7 +1177,7 @@ msgid "API method under construction."
 msgstr "Hentenn API war sevel."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 #, fuzzy
 msgid "User not found."
 msgstr "N'eo ket bet kavet an hentenn API !"
@@ -1266,9 +1268,8 @@ msgid "Can't delete someone else's favorite"
 msgstr "Diposupl eo dilemel ar pennroll-mañ."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
-msgstr "N'eus ket eus ar strollad-se."
+msgstr "N'eus ket eus ar strollad-se"
 
 #: actions/atompubshowmembership.php:90
 #, fuzzy
@@ -1391,13 +1392,13 @@ msgid "Preview"
 msgstr "Rakwelet"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Dilemel"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Enporzhiañ"
@@ -1438,6 +1439,38 @@ msgstr "Ur gudenn 'zo bet e-pad hizivadenn an avatar."
 msgid "Avatar deleted."
 msgstr "Dilammet eo bet an Avatar."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "N'eus nemet an implijerien kevreet hag a c'hell adkemer alioù."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Background"
+
+#: actions/backupaccount.php:258
+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."
@@ -1498,7 +1531,7 @@ 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 "Diposubl eo enrollañ an titouroù stankañ."
+msgstr "Dibosupl eo enrollañ an titouroù stankañ."
 
 #. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
 #. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
@@ -1610,7 +1643,7 @@ msgstr "Kadarnaet eo bet dija ar chomlec'h-mañ."
 #: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
-msgstr "Diposubl eo hizivaat an implijer."
+msgstr "Dibosupl eo hizivaat an implijer."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
@@ -1642,6 +1675,60 @@ msgstr "Kaozeadenn"
 msgid "Notices"
 msgstr "Ali"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "N'eus nemet an implijerien kevreet hag a c'hell adkemer alioù."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "N'hallit ket diverkañ implijerien."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Dilammet eo bet an Avatar."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Krouiñ ur gont"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Kadarnaat"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1778,7 +1865,7 @@ 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 ho peus c'hoant dilemel ar c'hemenn-mañ ?"
+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
@@ -1786,7 +1873,7 @@ 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:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Dilemel ar c'hemenn-mañ"
 
@@ -2062,7 +2149,7 @@ 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:282
 msgid "Could not update application."
-msgstr "Diposubl eo hizivaat ar poellad"
+msgstr "Dibosupl eo hizivaat ar poellad"
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
 #: actions/editgroup.php:55
@@ -2089,7 +2176,7 @@ msgstr "Leunit ar furmskrid-mañ evit kemmañ dibarzhioù ar strollad."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Alias fall : \"%s\""
@@ -2097,13 +2184,13 @@ msgstr "Alias fall : \"%s\""
 #. TRANS: Server error displayed when editing a group fails.
 #: actions/editgroup.php:272
 msgid "Could not update group."
-msgstr "Diposubl eo hizivaat ar strollad."
+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:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
-msgstr "Diposubl eo krouiñ an aliasoù."
+msgstr "Dibosupl eo krouiñ an aliasoù."
 
 #. TRANS: Group edit form success message.
 #: actions/editgroup.php:296
@@ -2273,9 +2360,8 @@ msgstr "Ho postel eo dija."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
 #: actions/emailsettings.php:409
-#, fuzzy
 msgid "That email address already belongs to another user."
-msgstr "D'un implijer all eo an niverenn-mañ dija."
+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 IM confirmation code.
@@ -2309,7 +2395,7 @@ msgstr "N'eo ket mat ar chomlec'h postelerezh prim."
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
 #: actions/emailsettings.php:468 actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
-msgstr "Diposubl eo dilemel ar postel kadarnadur."
+msgstr "Dibosupl eo dilemel ar postel kadarnadur."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 #: actions/emailsettings.php:473
@@ -2575,7 +2661,7 @@ msgstr ""
 #: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
 #: lib/designsettings.php:405 lib/designsettings.php:427
 msgid "Couldn't update your design."
-msgstr "Diposubl eo hizivaat ho design."
+msgstr "Dibosupl eo hizivaat ho design."
 
 #: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
 msgid "Design preferences saved."
@@ -2835,7 +2921,7 @@ msgstr "ID Jabber ebet."
 #. TRANS: Message given saving IM address that cannot be normalised.
 #: actions/imsettings.php:320
 msgid "Cannot normalize that Jabber ID"
-msgstr "Diposubl eo implijout an ID Jabber-mañ"
+msgstr "Dibosupl eo implijout an ID Jabber-mañ"
 
 #. TRANS: Message given saving IM address that not valid.
 #: actions/imsettings.php:325
@@ -3261,7 +3347,7 @@ msgstr "Diposubl eo lakaat %1$s da merour ar strollad %2$s."
 #: actions/makeadmin.php:146
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
-msgstr "Diposubl eo lakaat %1$s da merour ar strollad %2$s."
+msgstr "Dibosupl eo lakaat %1$s da merour ar strollad %2$s."
 
 #: actions/microsummary.php:69
 msgid "No current status."
@@ -3294,8 +3380,14 @@ msgstr "N'eo ket posubl krouiñ ar poellad."
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Implijit ar furmskrid-mañ a-benn krouiñ ur strollad nevez."
 
@@ -3617,11 +3709,6 @@ msgstr "Ger-tremen nevez"
 msgid "6 or more characters"
 msgstr "6 arouezenn pe muioc'h"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Kadarnaat"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Memestra eget ar ger tremen a-us"
@@ -4141,12 +4228,12 @@ msgstr "Dibosupl eo enrollañ an dibaboù lec'hiadur."
 #. TRANS: Server error thrown when user profile settings could not be saved.
 #: actions/profilesettings.php:422
 msgid "Couldn't save profile."
-msgstr "Diposubl eo enrollañ ar profil."
+msgstr "Dibosupl eo enrollañ ar profil."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
 #: actions/profilesettings.php:431
 msgid "Couldn't save tags."
-msgstr "Diposubl eo enrollañ ar balizennoù."
+msgstr "Dibosupl eo enrollañ ar balizennoù."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
@@ -4154,6 +4241,11 @@ msgstr "Diposubl eo enrollañ ar balizennoù."
 msgid "Settings saved."
 msgstr "Enrollet eo bet an arventennoù."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Krouiñ ur gont"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4595,7 +4687,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:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Adlavaret"
 
@@ -4657,6 +4749,90 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Respontoù da %1$s war %2$s !"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "N'eus nemet an implijerien kevreet hag a c'hell adkemer alioù."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "N'ho peus enrollet poellad ebet evit poent."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, 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:130 lib/mediafile.php:194
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:136 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:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr ""
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "An holl izili"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, 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ñ."
@@ -4758,7 +4934,7 @@ msgid "Reset key & secret"
 msgstr "Adderaouekaat an alc'hwez hag ar sekred"
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Diverkañ"
 
@@ -5233,7 +5409,7 @@ 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 "Diposubl eo enrollañ ali al lec'hienn."
+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
@@ -5999,13 +6175,13 @@ msgid "Author(s)"
 msgstr "Aozer(ien)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: 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."
@@ -6114,7 +6290,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6127,7 +6303,7 @@ 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 "Diposubl eo ensoc'hañ ur gemenadenn"
+msgstr "Dibosupl eo ensoc'hañ ur gemennadenn"
 
 #. TRANS: Message given when a message could not be updated on the server.
 #: classes/Message.php:80
@@ -6142,72 +6318,72 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: 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:288
+#: 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:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6215,14 +6391,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6292,32 +6468,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "Deuet mat da %1$s, @%2$s !"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 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:521
+#: classes/User_group.php:526
 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:544
+#: classes/User_group.php:549
 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:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "Dibosupl eo enrollañ titouroù ar strollad lec'hel."
 
@@ -6649,10 +6825,19 @@ msgstr "Kent"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Skeudenn"
+msgid "Unknown profile."
+msgstr "Dizanv eo seurt ar restr"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -6940,6 +7125,10 @@ msgstr "Disteuler"
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7345,26 +7534,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 #, 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:150
+#: lib/common.php:153
 #, 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "Mont d'ar meziant staliañ"
 
@@ -7423,24 +7612,21 @@ msgstr ""
 
 #. TRANS: Radio button on profile design page that will enable use of the uploaded profile image.
 #: lib/designsettings.php:139
-#, fuzzy
 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
-#, fuzzy
 msgctxt "RADIO"
 msgid "Off"
 msgstr "Diweredekaet"
 
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
 #: lib/designsettings.php:264
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reset"
-msgstr "Adderaouekaat"
+msgstr "Adderaouiñ"
 
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
 #: lib/designsettings.php:433
@@ -7472,6 +7658,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "Mignon ur mignon (FOAF)"
 
+#: 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"
@@ -7656,11 +7850,6 @@ msgstr "Re vras eo ar restr ! %d eo ar vent vrasañ evit ur restr."
 msgid "Partial upload."
 msgstr "Enporzhiadenn diglok."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr ""
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr ""
@@ -7675,19 +7864,19 @@ msgstr "Dizanv eo seurt ar restr"
 
 #. TRANS: Number of megabytes. %d is the number.
 #: lib/imagefile.php:283
-#, fuzzy, php-format
+#, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
-msgstr[0] "Mo"
-msgstr[1] "Mo"
+msgstr[0] "%d&nbsp;Mo"
+msgstr[1] "%d&nbsp;Mo"
 
 #. TRANS: Number of kilobytes. %d is the number.
 #: lib/imagefile.php:287
-#, fuzzy, php-format
+#, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
-msgstr[0] "Ko"
-msgstr[1] "Ko"
+msgstr[0] "%d&nbsp;Ko"
+msgstr[1] "%d&nbsp;Ko"
 
 #. TRANS: Number of bytes. %d is the number.
 #: lib/imagefile.php:290
@@ -7982,7 +8171,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "eus"
 
@@ -8015,38 +8204,6 @@ msgstr "Diembreget eo ar furmad-se."
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: lib/mediafile.php:194
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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.
-#: lib/mediafile.php:222
-msgid "File upload stopped by extension."
-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."
@@ -8068,7 +8225,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8077,7 +8234,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
@@ -8113,18 +8270,18 @@ msgid "Send"
 msgstr "Kas"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8163,55 +8320,55 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "R"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "K"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, 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:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "e"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "en amdro"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "Adkemeret gant"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "Respont d'ar c'hemenn-mañ"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Respont"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Ali adkemeret"
 
@@ -8337,9 +8494,8 @@ msgid "Recent tags"
 msgstr "Merkoù nevez"
 
 #: lib/publicgroupnav.php:88
-#, fuzzy
 msgid "Featured"
-msgstr "Krouet"
+msgstr "Heverk"
 
 #: lib/publicgroupnav.php:92
 msgid "Popular"
@@ -8368,7 +8524,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:957
+#: lib/router.php:974
 #, fuzzy
 msgid "Page not found."
 msgstr "N'eo ket bet kavet an hentenn API !"
@@ -8438,14 +8594,14 @@ msgid "Silence this user"
 msgstr "Diverkañ an implijer-mañ"
 
 #: lib/subgroupnav.php:83
-#, fuzzy, php-format
+#, php-format
 msgid "People %s subscribes to"
-msgstr "Koumanantet da %s"
+msgstr "Koumanantoù %s"
 
 #: lib/subgroupnav.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "People subscribed to %s"
-msgstr "Koumanantet da %s"
+msgstr "Koumananterien %s"
 
 #: lib/subgroupnav.php:99
 #, php-format
@@ -8457,7 +8613,7 @@ msgid "Invite"
 msgstr "Pediñ"
 
 #: lib/subgroupnav.php:106
-#, fuzzy, php-format
+#, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Pediñ mignoned hag kenseurted da zont ganeoc'h war %s"
 
@@ -8543,9 +8699,8 @@ msgid "Unblock"
 msgstr "Distankañ"
 
 #: lib/unsandboxform.php:69
-#, fuzzy
 msgid "Unsandbox"
-msgstr "Poull-traezh"
+msgstr "Kuitaat ar poull-traezh"
 
 #: lib/unsandboxform.php:80
 #, fuzzy
@@ -8638,8 +8793,8 @@ msgstr "1 vunutenn zo well-wazh"
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+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
@@ -8651,8 +8806,8 @@ msgstr "1 eurvezh zo well-wazh"
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
-msgstr[0] ""
-msgstr[1] ""
+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
@@ -8664,8 +8819,8 @@ msgstr "1 devezh zo well-wazh"
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
-msgstr[0] ""
-msgstr[1] ""
+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
@@ -8677,8 +8832,8 @@ msgstr "miz zo well-wazh"
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
-msgstr[0] ""
-msgstr[1] ""
+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
@@ -8693,7 +8848,7 @@ msgstr "n'eo ket %s ul liv reizh !"
 #. TRANS: Validation error for a web colour.
 #. TRANS: %s is the provided (invalid) text for colour.
 #: lib/webcolor.php:120
-#, fuzzy, php-format
+#, 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."
 
@@ -8727,22 +8882,10 @@ msgstr "Ment direizh."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
 #, fuzzy
-msgid "No user specified; using backup user."
-msgstr "N'eus bet diferet ID implijer ebet."
+#~ msgid "Post"
+#~ msgstr "Skeudenn"
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+#~ msgid "No user specified; using backup user."
+#~ msgstr "N'eus bet diferet ID implijer ebet."
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index cb4381819e..1c71bbb421 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -2,6 +2,7 @@
 # Expored from translatewiki.net
 #
 # Author: Aleator
+# Author: Brion
 # Author: El libre
 # Author: Martorell
 # Author: McDutchie
@@ -15,17 +16,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:10:29+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:31:46+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 (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -285,7 +286,7 @@ msgstr "Actualitzacions de %1$s i amics a %2$s!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -332,7 +333,8 @@ msgstr "No s'ha pogut actualitzar l'usuari."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -411,14 +413,14 @@ msgid "%s subscriptions"
 msgstr "Subscripcions de %s"
 
 #: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "%s favorites"
-msgstr "Preferits"
+msgstr "%s preferits"
 
 #: actions/apiatomservice.php:123
-#, fuzzy, php-format
+#, php-format
 msgid "%s memberships"
-msgstr "%s membre/s en el grup"
+msgstr "%s pertinències al grup"
 
 #. TRANS: Client error displayed when users try to block themselves.
 #: actions/apiblockcreate.php:104
@@ -564,7 +566,7 @@ msgstr "No s'ha pogut trobar l'usuari de destinació."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Aquest sobrenom ja existeix. Prova un altre. "
@@ -574,7 +576,7 @@ msgstr "Aquest sobrenom ja existeix. Prova un altre. "
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Sobrenom no vàlid."
@@ -586,7 +588,7 @@ msgstr "Sobrenom no vàlid."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "La pàgina personal no és un URL vàlid."
@@ -596,7 +598,7 @@ 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:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: 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)."
@@ -611,7 +613,7 @@ msgstr "El vostre nom sencer és massa llarg (màx. 255 caràcters)."
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -623,7 +625,7 @@ 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:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "La localització és massa llarga (màx. 255 caràcters)."
@@ -635,7 +637,7 @@ msgstr "La localització és massa llarga (màx. 255 caràcters)."
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -654,7 +656,7 @@ msgstr "L'àlies no és vàlid: «%s»."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "L'àlies «%s» ja està en ús. Proveu-ne un altre."
@@ -663,7 +665,7 @@ msgstr "L'àlies «%s» ja està en ús. Proveu-ne un altre."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "L'àlies no pot ser el mateix que el sobrenom."
 
@@ -1063,7 +1065,7 @@ 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:138
+#: 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."
@@ -1134,19 +1136,16 @@ 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
-#, fuzzy
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Només accepta AtomPub per als canals Atom."
 
 #: actions/apitimelineuser.php:310
-#, fuzzy
 msgid "Atom post must not be empty."
-msgstr "L'enviament Atom ha de ser una entrada Atom."
+msgstr "L'enviament Atom no ha de ser buit."
 
 #: actions/apitimelineuser.php:315
-#, fuzzy
 msgid "Atom post must be well-formed XML."
-msgstr "L'enviament Atom ha de ser una entrada Atom."
+msgstr "L'enviament Atom ha de ser un XML ben format."
 
 #. TRANS: Client error displayed when not using an Atom entry.
 #: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
@@ -1157,31 +1156,30 @@ msgstr "L'enviament Atom ha de ser una entrada Atom."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
-#, fuzzy
+#: actions/apitimelineuser.php:334
 msgid "Can only handle POST activities."
-msgstr "Només es poden gestionar les activitats enviades."
+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:343
-#, fuzzy, php-format
+#: actions/apitimelineuser.php:345
+#, php-format
 msgid "Cannot handle activity object type \"%s\"."
-msgstr "Només es pot gestionar l'activitat dels tipus d'objecte «%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.
-#: actions/apitimelineuser.php:376
-#, fuzzy, php-format
+#: actions/apitimelineuser.php:378
+#, php-format
 msgid "No content for notice %d."
-msgstr "Cerca el contingut dels avisos"
+msgstr "No hi ha contingut de l'avís %d"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "L'avís amb URI «%s» amb ja existeix."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr "Enviament AtomPub amb un URI %s d'atenció desconegut"
@@ -1192,46 +1190,40 @@ 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/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "No s'ha trobat el mètode API!"
 
 #: actions/atompubfavoritefeed.php:70
-#, fuzzy
 msgid "No such profile"
-msgstr "No existeix el perfil."
+msgstr "No existeix el perfil"
 
 #: actions/atompubfavoritefeed.php:145
 #, php-format
 msgid "Notices %s has favorited to on %s"
-msgstr ""
+msgstr "Els avisos que %s ha preferit a %s"
 
 #: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-#, fuzzy
 msgid "Can't add someone else's subscription"
-msgstr "No s'ha pogut inserir una nova subscripció."
+msgstr "No es pot afegir la subscripció d'algú altre"
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
 #: actions/atompubfavoritefeed.php:239
-#, fuzzy
 msgid "Can only handle Favorite activities."
-msgstr "Només es poden gestionar les activitats enviades."
+msgstr "Només es poden gestionar les activitats de preferència."
 
 #: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
-#, fuzzy
 msgid "Can only fave notices."
-msgstr "Només es poden gestionar les activitats enviades."
+msgstr "Només es poden preferir els avisos."
 
 #: actions/atompubfavoritefeed.php:256
-#, fuzzy
 msgid "Unknown note."
-msgstr "Desconegut"
+msgstr "Nota desconeguda."
 
 #: actions/atompubfavoritefeed.php:263
-#, fuzzy
 msgid "Already a favorite."
-msgstr "Afegeix als preferits"
+msgstr "Ja és una preferit."
 
 #: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
 #: actions/atompubshowmembership.php:73 actions/subscribe.php:107
@@ -1239,106 +1231,96 @@ msgid "No such profile."
 msgstr "No existeix el perfil."
 
 #: actions/atompubmembershipfeed.php:144
-#, fuzzy, php-format
+#, php-format
 msgid "%s group memberships"
-msgstr "%s membre/s en el grup"
+msgstr "%s pertinències a grup"
 
 #: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %s is a member of on %s"
-msgstr "%s grups són membres de"
+msgstr "Els grups en què %s és membre a %s"
 
 #: actions/atompubmembershipfeed.php:217
 msgid "Can't add someone else's membership"
-msgstr ""
+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:241
-#, fuzzy
 msgid "Can only handle Join activities."
-msgstr "Només es poden gestionar les activitats enviades."
+msgstr "Només es poden gestionar les activitats d'unió."
 
 #: actions/atompubmembershipfeed.php:256
-#, fuzzy
 msgid "Unknown group."
-msgstr "Desconegut"
+msgstr "Grup desconegut."
 
 #: actions/atompubmembershipfeed.php:263
-#, fuzzy
 msgid "Already a member."
-msgstr "Tots els membres"
+msgstr "Ja és un membre."
 
 #: actions/atompubmembershipfeed.php:270
 msgid "Blocked by admin."
-msgstr ""
+msgstr "Bloquejat per l'administrador."
 
 #: actions/atompubshowfavorite.php:89
-#, fuzzy
 msgid "No such favorite."
-msgstr "No existeix el fitxer."
+msgstr "No existeix el preferit."
 
 #: actions/atompubshowfavorite.php:151
-#, fuzzy
 msgid "Can't delete someone else's favorite"
-msgstr "No s'ha pogut eliminar el preferit."
+msgstr "No es pot eliminar el preferit d'algú altre"
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
 msgstr "No s'ha trobat el grup."
 
 #: actions/atompubshowmembership.php:90
-#, fuzzy
 msgid "Not a member"
-msgstr "Tots els membres"
+msgstr "No és un membre"
 
 #: actions/atompubshowmembership.php:115
-#, fuzzy
 msgid "Method not supported"
-msgstr "El mètode HTTP no està implementat."
+msgstr "El mètode no està implementat"
 
 #: actions/atompubshowmembership.php:150
 msgid "Can't delete someone else's membership"
-msgstr ""
+msgstr "No es pot eliminar la pertinència d'algú altre"
 
 #: actions/atompubshowsubscription.php:72
 #: actions/atompubshowsubscription.php:81
 #: actions/atompubsubscriptionfeed.php:74
-#, fuzzy, php-format
+#, php-format
 msgid "No such profile id: %d"
-msgstr "No existeix el perfil."
+msgstr "No existeix l'id de perfil: %d"
 
 #: actions/atompubshowsubscription.php:90
-#, fuzzy, php-format
+#, php-format
 msgid "Profile %d not subscribed to profile %d"
-msgstr "No estàs subscrit a aquest perfil."
+msgstr "El perfil %d no està subscrit al perfil %d"
 
 #: actions/atompubshowsubscription.php:154
-#, fuzzy
 msgid "Can't delete someone else's subscription"
-msgstr "No s'ha pogut eliminar l'autosubscripció."
+msgstr "No es pot eliminar la subscripció d'algú altre"
 
 #: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
+#, php-format
 msgid "People %s has subscribed to on %s"
-msgstr "Gent subscrita a %s"
+msgstr "La gent a qui %s s'ha subscrit a %s"
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
 #: actions/atompubsubscriptionfeed.php:246
-#, fuzzy
 msgid "Can only handle Follow activities."
-msgstr "Només es poden gestionar les activitats enviades."
+msgstr "Només es poden gestionar les activitats de seguiment."
 
 #: actions/atompubsubscriptionfeed.php:253
 msgid "Can only follow people."
-msgstr ""
+msgstr "Només es pot seguir gent."
 
 #: actions/atompubsubscriptionfeed.php:262
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown profile %s"
-msgstr "Tipus de fitxer desconegut"
+msgstr "Perfil desconegut %s"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
@@ -1411,13 +1393,13 @@ msgid "Preview"
 msgstr "Vista prèvia"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Elimina"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Puja"
@@ -1460,6 +1442,38 @@ msgstr "Error en actualitzar avatar."
 msgid "Avatar deleted."
 msgstr "S'ha eliminat l'avatar."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "Només els usuaris que han iniciat una sessió poden enviar avisos."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Fons"
+
+#: actions/backupaccount.php:258
+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."
@@ -1665,6 +1679,60 @@ msgstr "Conversa"
 msgid "Notices"
 msgstr "Avisos"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "Només els usuaris que han iniciat una sessió poden enviar avisos."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "No podeu eliminar els usuaris."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "S'ha eliminat l'avatar."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Crea un compte"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Confirma"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1813,7 +1881,7 @@ msgid "Do not delete this notice"
 msgstr "No eliminis aquest avís"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Elimina aquest avís"
 
@@ -2116,7 +2184,7 @@ msgstr "Utilitza aquest formulari per editar el grup."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "L'àlies no és vàlid «%s»"
@@ -2128,7 +2196,7 @@ 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:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "No s'han pogut crear els àlies."
 
@@ -2227,6 +2295,8 @@ msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
 msgstr ""
+"Per enviar avisos per correu, cal que tingueu una adreça electrònica única "
+"en aquest 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.
@@ -3367,8 +3437,14 @@ msgstr "No s'ha pogut crear l'aplicació."
 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
+#, fuzzy
+msgid "You are not allowed to create groups on this site."
+msgstr "No teniu permisos per eliminar el grup."
+
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Utilitza aquest formulari per crear un nou grup."
 
@@ -3692,11 +3768,6 @@ msgstr "Nova contrasenya"
 msgid "6 or more characters"
 msgstr "6 o més caràcters"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Confirma"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Igual a la contrasenya de dalt"
@@ -4214,6 +4285,11 @@ msgstr "No s'han pogut desar les etiquetes."
 msgid "Settings saved."
 msgstr "S'ha desat la configuració."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Crea un compte"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4681,7 +4757,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:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Repetit"
 
@@ -4746,6 +4822,94 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Respostes a %1$s el %2$s!"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "Només els usuaris que han iniciat una sessió poden enviar avisos."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "No teniu cap aplicació registrada encara."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, fuzzy
+msgid "No uploaded file."
+msgstr "Puja un fitxer"
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: actions/restoreaccount.php:130 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:136 lib/mediafile.php:200
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"El fitxer pujat excedeix la mida de la directiva MAX_FILE_SIZE especificada "
+"en el formulari HTML."
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "Error del sistema en pujar el fitxer."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr "Es recupera la còpia de seguretat del fitxer '%s'."
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "No és un membre"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, fuzzy
+msgid "Upload the file"
+msgstr "Puja un 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."
@@ -4846,7 +5010,7 @@ msgid "Reset key & secret"
 msgstr "Reinicialitza la clau i la secreta"
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Elimina"
 
@@ -5709,9 +5873,9 @@ msgid "%s is not listening to anyone."
 msgstr "%s no escolta a ningú."
 
 #: actions/subscriptions.php:178
-#, fuzzy, php-format
+#, php-format
 msgid "Subscription feed for %s (Atom)"
-msgstr "Canal d'avisos de %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:242
@@ -6130,13 +6294,13 @@ msgid "Author(s)"
 msgstr "Autoria"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: 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"
@@ -6251,7 +6415,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr "No s'ha trobat el nom de la base de dades o el DSN enlloc."
 
@@ -6278,7 +6442,7 @@ 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:193
+#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr ""
@@ -6286,24 +6450,24 @@ msgstr ""
 "coixinet (%): %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:270
+#: 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:275
+#: 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:281
+#: 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:288
+#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -6312,42 +6476,42 @@ msgstr ""
 "enviar en uns minuts."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 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:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6355,14 +6519,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6434,32 +6598,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "Us donem la benvinguda a %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 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
+#: classes/User.php:922
 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:511
+#: classes/User_group.php:516
 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:521
+#: classes/User_group.php:526
 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:544
+#: classes/User_group.php:549
 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:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "No s'ha pogut desar la informació del grup local."
 
@@ -6801,10 +6965,19 @@ msgstr ""
 "S'esperava un element del canal arrel, però se n'ha obtingut tot un document "
 "XML sencer."
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Foto"
+msgid "Unknown profile."
+msgstr "Perfil desconegut %s"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7093,6 +7266,10 @@ msgstr "Revoca"
 msgid "author element must contain a name element."
 msgstr "l'element autor ha de contenir un element nom."
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7525,24 +7702,24 @@ 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:147
+#: lib/common.php:150
 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:150
+#: lib/common.php:153
 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "Vés a l'instal·lador."
 
@@ -7644,6 +7821,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: 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"
@@ -7828,11 +8013,6 @@ msgstr "La mida del fitxer és massa gran, La mida màxima és %s."
 msgid "Partial upload."
 msgstr "Càrrega parcial."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "Error del sistema en pujar el fitxer."
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "No és una imatge o és un fitxer corrupte."
@@ -8252,7 +8432,7 @@ msgstr ""
 "usuaris en la conversa. La gent pot enviar-vos missatges només per als "
 "vostres ulls."
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "de"
 
@@ -8284,42 +8464,6 @@ 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 an uploaded file is larger than set in php.ini.
-#: 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.
-#: lib/mediafile.php:200
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
-msgstr ""
-"El fitxer pujat excedeix la mida de la directiva MAX_FILE_SIZE especificada "
-"en el formulari HTML."
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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 would cause a user to exceed a set quota.
 #: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
@@ -8340,7 +8484,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8351,7 +8495,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: 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."
@@ -8384,19 +8528,19 @@ msgid "Send"
 msgstr "Envia"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8437,55 +8581,55 @@ msgstr ""
 "l'esperat; torneu-ho a provar més tard"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "O"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, 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:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "a"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "en context"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "Repetit per"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "respondre a aquesta nota"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Respon"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Avís repetit"
 
@@ -8639,7 +8783,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:957
+#: lib/router.php:974
 msgid "Page not found."
 msgstr "No s'ha trobat la pàgina."
 
@@ -8989,21 +9133,13 @@ msgstr "L'XML no és vàlid."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr "Es recupera la còpia de seguretat del fitxer '%s'."
+#~ msgid "Post"
+#~ msgstr "Enviament"
 
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
-msgid "No user specified; using backup user."
-msgstr "No s'ha especificat cap usuari; s'utilitza l'usuari de reserva."
+#~ msgid "No user specified; using backup user."
+#~ msgstr "No s'ha especificat cap usuari; s'utilitza l'usuari de reserva."
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] "%d entrada a la còpia de seguretat."
-msgstr[1] "%d entrades a la còpia de seguretat."
+#~ msgid "%d entry in backup."
+#~ msgid_plural "%d entries in backup."
+#~ msgstr[0] "%d entrada a la còpia de seguretat."
+#~ msgstr[1] "%d entrades a la còpia de seguretat."
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index ea427b9ef7..54062efb31 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -11,18 +11,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:10:30+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:31: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"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: cs\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n >= 2 && n <= 4) ? 1 : "
 "2 );\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -280,7 +280,7 @@ msgstr "Novinky od uživatele %1$s a přátel na %2$s!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -326,7 +326,8 @@ msgstr "Nepodařilo se aktualizovat nastavení uživatele"
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -562,7 +563,7 @@ msgstr "Nepodařilo se najít cílového uživatele."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Přezdívku již někdo používá. Zkuste jinou."
@@ -572,7 +573,7 @@ msgstr "Přezdívku již někdo používá. Zkuste jinou."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Není platnou přezdívkou."
@@ -584,7 +585,7 @@ msgstr "Není platnou přezdívkou."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Domovská stránka není platná URL."
@@ -594,7 +595,7 @@ 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:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -610,7 +611,7 @@ msgstr "Celé jméno je moc dlouhé (maximální délka je 255 znaků)."
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -623,7 +624,7 @@ 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:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -636,7 +637,7 @@ msgstr "Umístění je příliš dlouhé (maximálně 255 znaků)."
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -656,7 +657,7 @@ msgstr "Neplatný alias: \"%s\"."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias \"%s\" se již používá. Zkuste jiný."
@@ -665,7 +666,7 @@ msgstr "Alias \"%s\" se již používá. Zkuste jiný."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Alias nemůže být stejný jako přezdívka."
 
@@ -1071,7 +1072,7 @@ 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:138
+#: actions/apitimelinegroup.php:134
 #, fuzzy, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Nelze aktualizovat skupinu."
@@ -1164,30 +1165,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, 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:404
+#: actions/apitimelineuser.php:406
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Oznámení s tímto id neexistuje."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1198,7 +1199,7 @@ 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/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 #, fuzzy
 msgid "User not found."
 msgstr " API metoda nebyla nalezena."
@@ -1289,9 +1290,8 @@ msgid "Can't delete someone else's favorite"
 msgstr "Nelze smazat oblíbenou položku."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
-msgstr "Žádný takový uživatel."
+msgstr "Žádná taková skupina"
 
 #: actions/atompubshowmembership.php:90
 #, fuzzy
@@ -1414,14 +1414,14 @@ msgid "Preview"
 msgstr "Náhled"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Odstranit"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
@@ -1464,6 +1464,38 @@ msgstr "Nahrávání obrázku selhalo."
 msgid "Avatar deleted."
 msgstr "Avatar smazán."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "Pouze přihlášení uživatelé mohou opakovat oznámení."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Pozadí"
+
+#: actions/backupaccount.php:258
+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."
@@ -1671,6 +1703,60 @@ msgstr "Konverzace"
 msgid "Notices"
 msgstr "Sdělení"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "Pouze přihlášení uživatelé mohou opakovat oznámení."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "Nemůžete odstranit uživatele."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Avatar smazán."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Zaregistrujte se"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Potvrdit"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1823,7 +1909,7 @@ 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:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Odstranit toto oznámení"
 
@@ -2130,7 +2216,7 @@ msgstr "Použijte tento formulář k úpravám skupiny."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Neplatný alias: \"%s\""
@@ -2142,7 +2228,7 @@ 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:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "Nelze vytvořit aliasy."
 
@@ -3375,8 +3461,14 @@ msgstr "Nelze vytvořit aplikaci."
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Použijte tento formulář k vytvoření nové skupiny."
 
@@ -3697,11 +3789,6 @@ msgstr "Nové heslo"
 msgid "6 or more characters"
 msgstr "6 a více znaků"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Potvrdit"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Stejné jako heslo výše"
@@ -4237,6 +4324,11 @@ msgstr "Nelze uložit tagy."
 msgid "Settings saved."
 msgstr "Nastavení uloženo"
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Zaregistrujte se"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4694,7 +4786,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:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Opakované"
 
@@ -4760,6 +4852,93 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Odpovědi na %1$s na %2$s!"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "Pouze přihlášení uživatelé mohou opakovat oznámení."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "Ještě jste nezaregistrovali žádné aplikace."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, 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:130 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:136 lib/mediafile.php:200
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"Velkost uploadovaného souboru překračuje MAX_FILE_SIZE limit, které bylo "
+"uvedeno v HTML formuláři."
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "Chyba systému při nahrávání souboru"
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Všichni členové"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, 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."
@@ -4861,7 +5040,7 @@ msgid "Reset key & secret"
 msgstr "Resetovat klíč a tajemství"
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Odstranit"
 
@@ -6138,13 +6317,13 @@ msgid "Author(s)"
 msgstr "Autoři"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: 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é"
@@ -6260,7 +6439,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr "Nenalezeno jméno databáze ani DSN."
 
@@ -6287,23 +6466,23 @@ 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:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -6311,7 +6490,7 @@ 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:288
+#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -6320,43 +6499,43 @@ msgstr ""
 "několik minut."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 #, 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:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6364,14 +6543,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, 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."
@@ -6441,32 +6620,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "Vítejte na %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 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
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "Nelze vytvořit skupinu."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 msgid "Could not set group URI."
 msgstr "Nelze nastavit URI skupiny."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:549
 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:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "Nelze uložit místní info skupiny."
 
@@ -6801,10 +6980,19 @@ msgstr "Před"
 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."
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Fotka"
+msgid "Unknown profile."
+msgstr "Neznámý typ souboru"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7094,6 +7282,10 @@ msgstr "Obnovit"
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7528,26 +7720,26 @@ msgstr ""
 "tracking - Dosud neimplementován.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 #, 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:150
+#: lib/common.php:153
 #, 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "Jdi na instalaci."
 
@@ -7655,6 +7847,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: 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"
@@ -7839,11 +8039,6 @@ msgstr "Ten soubor je příliš velký. Maximální velikost souboru je %s."
 msgid "Partial upload."
 msgstr "Částečné náhrání."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "Chyba systému při nahrávání souboru"
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "Není obrázkem, nebo jde o poškozený soubor."
@@ -8267,7 +8462,7 @@ msgstr ""
 "zapojili ostatní uživatelé v rozhovoru. Lidé mohou posílat zprávy jen pro "
 "vaše oči."
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "od"
 
@@ -8297,41 +8492,6 @@ msgstr "Nepodporovaný typ zprávy: %s"
 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 an uploaded file is larger than set in php.ini.
-#: 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.
-#: lib/mediafile.php:200
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
-msgstr ""
-"Velkost uploadovaného souboru překračuje MAX_FILE_SIZE limit, které bylo "
-"uvedeno v HTML formuláři."
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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 would cause a user to exceed a set quota.
 #: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
@@ -8352,7 +8512,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8361,7 +8521,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
@@ -8396,17 +8556,17 @@ msgid "Send"
 msgstr "Odeslat"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8448,55 +8608,55 @@ msgstr ""
 "prosím znovu později"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "J"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "V"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "Z"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, 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:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "v"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "v kontextu"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "Opakováno"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "Odpovědět na toto oznámení"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Odpovědět"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Sdělení opakováno"
 
@@ -8650,7 +8810,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:957
+#: lib/router.php:974
 #, fuzzy
 msgid "Page not found."
 msgstr " API metoda nebyla nalezena."
@@ -9009,23 +9169,10 @@ msgstr "Neplatná velikost"
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
 #, fuzzy
-msgid "No user specified; using backup user."
-msgstr "Nebylo zadáno uživatelské ID."
+#~ msgid "Post"
+#~ msgstr "Fotka"
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+#, fuzzy
+#~ msgid "No user specified; using backup user."
+#~ msgstr "Nebylo zadáno uživatelské ID."
diff --git a/locale/da/LC_MESSAGES/statusnet.po b/locale/da/LC_MESSAGES/statusnet.po
index 32e65b0fe0..720d70c260 100644
--- a/locale/da/LC_MESSAGES/statusnet.po
+++ b/locale/da/LC_MESSAGES/statusnet.po
@@ -3,6 +3,7 @@
 #
 # Author: Brion
 # Author: Mstenbaek
+# Author: Nghtwlkr
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -10,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:10:31+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:31:52+0000\n"
 "Language-Team: Danish <http://translatewiki.net/wiki/Portal:da>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: da\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+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 "Opdateringer fra %1$s og venner på %2$s!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -325,7 +326,8 @@ msgstr "Kunne ikke opdatere brugeren."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -400,9 +402,9 @@ msgid "%s subscriptions"
 msgstr ""
 
 #: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "%s favorites"
-msgstr "Tilføj til favoritter"
+msgstr "%s favoritter"
 
 #: actions/apiatomservice.php:123
 #, fuzzy, php-format
@@ -551,7 +553,7 @@ msgstr "Kunne ikke finde mål bruger."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Kaldenavn allerede er i brug. Prøv med et andet."
@@ -561,7 +563,7 @@ msgstr "Kaldenavn allerede er i brug. Prøv med et andet."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ikke et gyldigt kaldenavn"
@@ -573,7 +575,7 @@ msgstr "Ikke et gyldigt kaldenavn"
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Hjemmesiden er ikke en gyldig URL adresse."
@@ -583,7 +585,7 @@ msgstr "Hjemmesiden er ikke en gyldig URL adresse."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr ""
@@ -598,7 +600,7 @@ msgstr ""
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -610,7 +612,7 @@ msgstr[1] ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr ""
@@ -622,7 +624,7 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -641,7 +643,7 @@ msgstr "Ugyldigt alias: \"%s\"."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias \"%s\" er allerede i brug. Prøv med et andet."
@@ -650,7 +652,7 @@ msgstr "Alias \"%s\" er allerede i brug. Prøv med et andet."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Alias kan ikke være det samme som kaldenavn."
 
@@ -1040,7 +1042,7 @@ msgstr ""
 
 #. TRANS: Server error displayed when generating an Atom feed fails.
 #. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:138
+#: actions/apitimelinegroup.php:134
 #, php-format
 msgid "Could not generate feed for group - %s"
 msgstr ""
@@ -1131,30 +1133,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Kan ikke gentage din egen meddelelse."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1165,14 +1167,13 @@ msgid "API method under construction."
 msgstr "API metode under udvikling."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr ""
 
 #: actions/atompubfavoritefeed.php:70
-#, fuzzy
 msgid "No such profile"
-msgstr "Ingen sådan fil."
+msgstr "Ingen sådan profil"
 
 #: actions/atompubfavoritefeed.php:145
 #, php-format
@@ -1379,13 +1380,13 @@ msgid "Preview"
 msgstr "Forhåndsvisning"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr ""
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr ""
@@ -1426,6 +1427,37 @@ msgstr "Mislykket ajourføring af Avatar."
 msgid "Avatar deleted."
 msgstr "Avatar slettet."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+msgid "Only logged-in users can backup their account."
+msgstr ""
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Baggrund"
+
+#: actions/backupaccount.php:258
+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."
@@ -1631,6 +1663,59 @@ msgstr "Samtale"
 msgid "Notices"
 msgstr "Bekendtgørelser"
 
+#: actions/deleteaccount.php:72
+msgid "Only logged-in users can delete their account."
+msgstr ""
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "Du kan ikke slette brugere."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Avatar slettet."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Slet program"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Bekræft"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1775,7 +1860,7 @@ msgid "Do not delete this notice"
 msgstr "Slet ikke denne meddelelse"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Slet denne meddelelse"
 
@@ -2080,7 +2165,7 @@ msgstr "Brug denne formular til at redigere gruppen."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Ugyldigt alias: \"%s\"."
@@ -2092,7 +2177,7 @@ msgstr "Kunne ikke opdatere gruppe."
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "Kunne ikke oprette aliaser."
 
@@ -3317,8 +3402,14 @@ msgstr "Kunne ikke oprette programmet."
 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 kan ikke tildele brugerroller på dette site."
+
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Brug denne formular for at oprette en ny gruppe."
 
@@ -3645,11 +3736,6 @@ msgstr "Ny adgangskode"
 msgid "6 or more characters"
 msgstr ""
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Bekræft"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr ""
@@ -4173,6 +4259,10 @@ msgstr "Kunne ikke opdatere brugeren."
 msgid "Settings saved."
 msgstr "Valg gemt."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+msgid "Restore account"
+msgstr ""
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4621,7 +4711,7 @@ msgstr "Kan ikke gentage din egen meddelelse."
 msgid "You already repeated that notice."
 msgstr "Allerede gentaget denne medelelse."
 
-#: actions/repeat.php:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 #, fuzzy
 msgid "Repeated"
 msgstr "Gentagne til %s"
@@ -4684,6 +4774,88 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Opdateringer markeret som favorit af %1$s på %2$s!"
 
+#: actions/restoreaccount.php:79
+msgid "Only logged-in users can restore their account."
+msgstr ""
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "Du har ikke registreret nogen programmer endnu."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, fuzzy
+msgid "No uploaded file."
+msgstr "Oplægge"
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: actions/restoreaccount.php:130 lib/mediafile.php:194
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:136 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:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr ""
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+msgid "Not an atom feed."
+msgstr ""
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, fuzzy
+msgid "Upload the file"
+msgstr "Oplægge"
+
 #: actions/revokerole.php:75
 #, fuzzy
 msgid "You cannot revoke user roles on this site."
@@ -4796,7 +4968,7 @@ msgid "Reset key & secret"
 msgstr ""
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Slet"
 
@@ -6060,13 +6232,13 @@ msgid "Author(s)"
 msgstr ""
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: classes/Fave.php:167
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr ""
@@ -6177,7 +6349,7 @@ msgid "Could not create login token for %s"
 msgstr "Kunne ikke oprette aliaser."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6206,72 +6378,72 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:193
+#: classes/Notice.php:199
 #, fuzzy, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Databasefejl ved tilføjelse af OAuth applikationsbruger."
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:270
+#: 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:275
+#: 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:281
+#: 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:288
+#: 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:296
+#: classes/Notice.php:305
 #, fuzzy
 msgid "You are banned from posting notices on this site."
 msgstr "Du kan ikke tildele brugerroller på dette site."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6279,14 +6451,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6363,35 +6535,35 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 #, fuzzy
 msgid "Could not create group."
 msgstr "Kunne ikke opdatere gruppe."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 #, fuzzy
 msgid "Could not set group URI."
 msgstr "Kunne ikke opdatere gruppe."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:549
 #, fuzzy
 msgid "Could not set group membership."
 msgstr "Kunne ikke opdatere gruppe."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:559
+#: classes/User_group.php:564
 #, fuzzy
 msgid "Could not save local group info."
 msgstr "Kunne ikke gemme profilen."
@@ -6739,8 +6911,18 @@ msgstr ""
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activity.php:360
-msgid "Post"
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
+#, fuzzy
+msgid "Unknown profile."
+msgstr "Brugeren har ingen profil."
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
 msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
@@ -7040,6 +7222,10 @@ msgstr "Fjern"
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7438,24 +7624,24 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 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:150
+#: lib/common.php:153
 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr ""
 
@@ -7562,6 +7748,14 @@ msgstr ""
 msgid "FOAF"
 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"
@@ -7747,11 +7941,6 @@ msgstr ""
 msgid "Partial upload."
 msgstr "Ingen fil uploaded."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr ""
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr ""
@@ -8073,7 +8262,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr ""
 
@@ -8106,38 +8295,6 @@ msgstr "Formatet understøttes ikke"
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: lib/mediafile.php:194
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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.
-#: lib/mediafile.php:222
-msgid "File upload stopped by extension."
-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."
@@ -8159,7 +8316,7 @@ msgstr "Kunne ikke finde kilde bruger"
 #. 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8168,7 +8325,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
@@ -8202,17 +8359,17 @@ msgid "Send"
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Kaldenavn må kun have små bogstaver og tal og ingen mellemrum."
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:176
+#: 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:189
+#: 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."
@@ -8253,58 +8410,58 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 #, fuzzy
 msgid "N"
 msgstr "Nej"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr ""
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr ""
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 #, fuzzy
 msgid "Repeated by"
 msgstr "Gentagne til %s"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 #, fuzzy
 msgid "Reply to this notice"
 msgstr "Slet denne meddelelse"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr ""
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr ""
 
@@ -8472,7 +8629,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Bloker denne bruger fra denne gruppe"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:957
+#: lib/router.php:974
 msgid "Page not found."
 msgstr ""
 
@@ -8829,22 +8986,3 @@ msgstr ""
 #: lib/xrd.php:69
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
-msgid "No user specified; using backup user."
-msgstr ""
-
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
-msgstr[1] ""
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index e10a3eac06..f8cf8e6cbc 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -19,17 +19,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:10:33+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:31: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-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -288,7 +288,7 @@ msgstr "Aktualisierungen von %1$s und Freunden auf %2$s!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -335,7 +335,8 @@ msgstr "Konnte Benutzerdaten nicht aktualisieren."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -414,14 +415,14 @@ msgid "%s subscriptions"
 msgstr "%s Abonnements"
 
 #: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "%s favorites"
-msgstr "Favoriten"
+msgstr "%s Favoriten"
 
 #: actions/apiatomservice.php:123
-#, fuzzy, php-format
+#, php-format
 msgid "%s memberships"
-msgstr "%s Gruppen-Mitglieder"
+msgstr "%s Mitgliedschaften"
 
 #. TRANS: Client error displayed when users try to block themselves.
 #: actions/apiblockcreate.php:104
@@ -572,7 +573,7 @@ msgstr "Konnte keine Statusmeldungen finden."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
@@ -582,7 +583,7 @@ msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ungültiger Benutzername."
@@ -594,7 +595,7 @@ msgstr "Ungültiger Benutzername."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr ""
@@ -605,7 +606,7 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Der bürgerliche Name ist zu lang (maximal 255 Zeichen)."
@@ -620,7 +621,7 @@ msgstr "Der bürgerliche Name ist zu lang (maximal 255 Zeichen)."
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -632,7 +633,7 @@ 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:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
@@ -644,7 +645,7 @@ msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -663,7 +664,7 @@ msgstr "Ungültiges Alias: „%s“"
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Benutzername „%s“ wird bereits verwendet. Suche dir einen anderen aus."
@@ -672,7 +673,7 @@ msgstr "Benutzername „%s“ wird bereits verwendet. Suche dir einen anderen au
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Alias kann nicht das gleiche wie der Spitzname sein."
 
@@ -985,14 +986,13 @@ msgstr "Nachricht bereits wiederholt"
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
 #: actions/atompubshowsubscription.php:118
 #: actions/atompubsubscriptionfeed.php:109
-#, fuzzy
 msgid "HTTP method not supported."
-msgstr "API-Methode nicht gefunden."
+msgstr "HTTP-Methode wird nicht unterstützt."
 
 #: actions/apistatusesshow.php:141
-#, fuzzy, php-format
+#, php-format
 msgid "Unsupported format: %s"
-msgstr "Bildformat wird nicht unterstützt."
+msgstr "Nicht unterstütztes Bildformat: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
 #: actions/apistatusesshow.php:152
@@ -1014,9 +1014,9 @@ msgid "Can't delete this notice."
 msgstr "Die Nachricht konnte nicht gelöscht werden."
 
 #: actions/apistatusesshow.php:243
-#, fuzzy, php-format
+#, php-format
 msgid "Deleted notice %d"
-msgstr "Notiz löschen"
+msgstr "Notiz %d löschen"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #: actions/apistatusesupdate.php:221
@@ -1078,7 +1078,7 @@ 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:138
+#: actions/apitimelinegroup.php:134
 #, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Konnte keinen Gruppen-Feed erstellen - %s"
@@ -1170,30 +1170,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
-#, fuzzy, php-format
+#: actions/apitimelineuser.php:378
+#, php-format
 msgid "No content for notice %d."
-msgstr "Durchsuche den Inhalt der Nachrichten"
+msgstr "Kein Inhalt für Nachricht %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
-#, fuzzy, php-format
+#: actions/apitimelineuser.php:406
+#, php-format
 msgid "Notice with URI \"%s\" already exists."
-msgstr "Nachricht mit dieser ID existiert nicht."
+msgstr "Nachricht mit URI „%s“ existiert bereits."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1204,12 +1204,11 @@ msgid "API method under construction."
 msgstr "API-Methode im Aufbau."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "API-Methode nicht gefunden."
 
 #: actions/atompubfavoritefeed.php:70
-#, fuzzy
 msgid "No such profile"
 msgstr "Profil nicht gefunden."
 
@@ -1235,14 +1234,12 @@ msgid "Can only fave notices."
 msgstr "Durchsuche den Inhalt der Nachrichten"
 
 #: actions/atompubfavoritefeed.php:256
-#, fuzzy
 msgid "Unknown note."
-msgstr "Unbekannt"
+msgstr "Unbekannter Hinweis."
 
 #: actions/atompubfavoritefeed.php:263
-#, fuzzy
 msgid "Already a favorite."
-msgstr "Zu Favoriten hinzufügen"
+msgstr "Bereits ein Favorit."
 
 #: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
 #: actions/atompubshowmembership.php:73 actions/subscribe.php:107
@@ -1250,9 +1247,9 @@ msgid "No such profile."
 msgstr "Profil nicht gefunden."
 
 #: actions/atompubmembershipfeed.php:144
-#, fuzzy, php-format
+#, php-format
 msgid "%s group memberships"
-msgstr "%s Gruppen-Mitglieder"
+msgstr "%s Gruppen-Mitgliedschaften"
 
 #: actions/atompubmembershipfeed.php:147
 #, fuzzy, php-format
@@ -1270,14 +1267,12 @@ msgid "Can only handle Join activities."
 msgstr ""
 
 #: actions/atompubmembershipfeed.php:256
-#, fuzzy
 msgid "Unknown group."
-msgstr "Unbekannt"
+msgstr "Unbekannte Gruppe."
 
 #: actions/atompubmembershipfeed.php:263
-#, fuzzy
 msgid "Already a member."
-msgstr "Alle Mitglieder"
+msgstr "Bereits Mitglied."
 
 #: actions/atompubmembershipfeed.php:270
 msgid "Blocked by admin."
@@ -1294,19 +1289,16 @@ msgid "Can't delete someone else's favorite"
 msgstr "Konnte Favoriten nicht löschen."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
-msgstr "Keine derartige Gruppe."
+msgstr "Keine derartige Gruppe"
 
 #: actions/atompubshowmembership.php:90
-#, fuzzy
 msgid "Not a member"
-msgstr "Alle Mitglieder"
+msgstr "Kein Mitglied"
 
 #: actions/atompubshowmembership.php:115
-#, fuzzy
 msgid "Method not supported"
-msgstr "API-Methode nicht gefunden."
+msgstr "Methode wird nicht unterstützt"
 
 #: actions/atompubshowmembership.php:150
 msgid "Can't delete someone else's membership"
@@ -1315,9 +1307,9 @@ msgstr ""
 #: actions/atompubshowsubscription.php:72
 #: actions/atompubshowsubscription.php:81
 #: actions/atompubsubscriptionfeed.php:74
-#, fuzzy, php-format
+#, php-format
 msgid "No such profile id: %d"
-msgstr "Profil nicht gefunden."
+msgstr "Keine Profil-Id: %d"
 
 #: actions/atompubshowsubscription.php:90
 #, fuzzy, php-format
@@ -1345,9 +1337,9 @@ msgid "Can only follow people."
 msgstr ""
 
 #: actions/atompubsubscriptionfeed.php:262
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown profile %s"
-msgstr "Unbekannter Dateityp"
+msgstr "Profil %s ist unbekannt"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
@@ -1420,13 +1412,13 @@ msgid "Preview"
 msgstr "Vorschau"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Löschen"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Hochladen"
@@ -1468,6 +1460,38 @@ msgstr "Aktualisierung des Avatars fehlgeschlagen."
 msgid "Avatar deleted."
 msgstr "Avatar gelöscht."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "Nur angemeldete Benutzer können Nachrichten wiederholen."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Hintergrund"
+
+#: actions/backupaccount.php:258
+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."
@@ -1673,6 +1697,60 @@ msgstr "Unterhaltung"
 msgid "Notices"
 msgstr "Nachrichten"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "Nur angemeldete Benutzer können Nachrichten wiederholen."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "Du kannst keine Benutzer löschen."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Avatar gelöscht."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Neues Benutzerkonto erstellen"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Bestätigen"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1820,7 +1898,7 @@ 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:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Nachricht löschen"
 
@@ -2125,7 +2203,7 @@ msgstr "Benutze dieses Formular, um die Gruppe zu bearbeiten."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Ungültiges Stichwort: „%s“"
@@ -2137,7 +2215,7 @@ 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:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "Konnte keinen Favoriten erstellen."
 
@@ -3381,8 +3459,14 @@ msgstr "Konnte das Programm nicht erstellen."
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Benutze dieses Formular, um eine neue Gruppe zu erstellen."
 
@@ -3707,11 +3791,6 @@ msgstr "Neues Passwort"
 msgid "6 or more characters"
 msgstr "6 oder mehr Zeichen"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Bestätigen"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Gleiches Passwort wie zuvor"
@@ -4231,6 +4310,11 @@ msgstr "Konnte Tags nicht speichern."
 msgid "Settings saved."
 msgstr "Einstellungen gespeichert."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Neues Benutzerkonto erstellen"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4700,7 +4784,7 @@ msgstr "Du kannst deine eigene Nachricht nicht wiederholen."
 msgid "You already repeated that notice."
 msgstr "Nachricht bereits wiederholt"
 
-#: actions/repeat.php:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Wiederholt"
 
@@ -4766,6 +4850,94 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Antworten an %1$s auf %2$s!"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "Nur angemeldete Benutzer können Nachrichten wiederholen."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "Du hast noch keine Programme registriert"
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, 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:130 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:136 lib/mediafile.php:200
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"Die Größe der hochgeladenen Datei überschreitet die MAX_FILE_SIZE Angabe, "
+"die im HTML-Formular angegeben wurde."
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "Systemfehler beim Hochladen der Datei."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr "Hole Backup von der Datei „%s“."
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Kein Mitglied"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, fuzzy
+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."
@@ -4866,7 +5038,7 @@ msgid "Reset key & secret"
 msgstr "Schlüssel zurücksetzen"
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Löschen"
 
@@ -6148,13 +6320,13 @@ msgid "Author(s)"
 msgstr "Autor(en)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: 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."
@@ -6271,7 +6443,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr "Nirgendwo einen Datenbanknamen oder DSN gefunden."
 
@@ -6298,23 +6470,23 @@ 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:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -6322,7 +6494,7 @@ 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:288
+#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -6331,45 +6503,45 @@ msgstr ""
 "ein paar Minuten ab."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 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:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6377,7 +6549,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:798
+#: classes/Profile.php:765
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -6386,7 +6558,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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6458,32 +6630,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "Herzlich willkommen bei %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 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
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "Konnte Gruppe nicht erstellen."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 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:544
+#: classes/User_group.php:549
 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:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "Konnte die lokale Gruppen Information nicht speichern."
 
@@ -6822,10 +6994,19 @@ msgstr "Vorher"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Root-Element eines Feeds erwartet, aber ganzes XML-Dokument erhalten."
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Foto"
+msgid "Unknown profile."
+msgstr "Profil %s ist unbekannt"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7112,6 +7293,10 @@ msgstr "Widerrufen"
 msgid "author element must contain a name element."
 msgstr "Das „author“-Element muss ein „name“-Element erhaten."
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7542,24 +7727,24 @@ msgstr ""
 "tracking - noch nicht implementiert\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 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:150
+#: lib/common.php:153
 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "Zur Installation gehen."
 
@@ -7661,6 +7846,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: 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"
@@ -7843,11 +8036,6 @@ msgstr "Diese Datei ist zu groß. Die maximale Dateigröße ist %s."
 msgid "Partial upload."
 msgstr "Unvollständiges Hochladen."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "Systemfehler beim Hochladen der Datei."
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "Kein Bild oder defekte Datei."
@@ -8267,7 +8455,7 @@ msgstr ""
 "schicken, um sie in eine Konversation zu verwickeln. Andere Leute können dir "
 "Nachrichten schicken, die nur du sehen kannst."
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "von"
 
@@ -8299,42 +8487,6 @@ msgstr ""
 "Beim Speichern der Datei trat ein Datenbankfehler auf. Bitte versuche es "
 "noch einmal."
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: 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.
-#: lib/mediafile.php:200
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
-msgstr ""
-"Die Größe der hochgeladenen Datei überschreitet die MAX_FILE_SIZE Angabe, "
-"die im HTML-Formular angegeben wurde."
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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 would cause a user to exceed a set quota.
 #: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
@@ -8355,7 +8507,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8366,7 +8518,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: 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."
@@ -8377,9 +8529,8 @@ 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
-#, fuzzy
 msgid "Select recipient:"
-msgstr "Lizenz auswählen"
+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
@@ -8401,19 +8552,19 @@ msgid "Send"
 msgstr "Senden"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8454,55 +8605,55 @@ msgstr ""
 "Bitte versuche es später wieder."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "O"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "W"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, 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:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "in"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr "Web"
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "im Zusammenhang"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "Wiederholt von"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "Auf diese Nachricht antworten"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Antworten"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Nachricht wiederholt"
 
@@ -8656,7 +8807,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:957
+#: lib/router.php:974
 msgid "Page not found."
 msgstr "Seite nicht gefunden."
 
@@ -9003,30 +9154,22 @@ msgstr[1] ""
 
 #. TRANS: Exception.
 #: lib/xrd.php:64
-#, fuzzy
 msgid "Invalid XML."
-msgstr "Ungültige Größe."
+msgstr "Ungültiges XML."
 
 #. TRANS: Exception.
 #: lib/xrd.php:69
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr "Hole Backup von der Datei „%s“."
+#, fuzzy
+#~ msgid "Post"
+#~ msgstr "Foto"
 
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
-msgid "No user specified; using backup user."
-msgstr "Kein Benutzer angegeben; hole Backup-Benutzer."
+#~ msgid "No user specified; using backup user."
+#~ msgstr "Kein Benutzer angegeben; hole Backup-Benutzer."
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] "Ein Eintrag im Backup."
-msgstr[1] "%d Einträge im Backup."
+#~ msgid "%d entry in backup."
+#~ msgid_plural "%d entries in backup."
+#~ msgstr[0] "Ein Eintrag im Backup."
+#~ msgstr[1] "%d Einträge im Backup."
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 5978efd553..27fbcb5784 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -13,17 +13,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:10:35+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:31:55+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 (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: en-gb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -280,7 +280,7 @@ msgstr "Updates from %1$s and friends on %2$s!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -327,7 +327,8 @@ msgstr "Could not update user."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -559,7 +560,7 @@ msgstr "Could not find target user."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Nickname already in use. Try another one."
@@ -569,7 +570,7 @@ msgstr "Nickname already in use. Try another one."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Not a valid nickname."
@@ -581,7 +582,7 @@ msgstr "Not a valid nickname."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Homepage is not a valid URL."
@@ -591,7 +592,7 @@ 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:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -607,7 +608,7 @@ msgstr "Full name is too long (max 255 chars)."
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -619,7 +620,7 @@ 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:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -632,7 +633,7 @@ msgstr "Location is too long (max 255 chars)."
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -651,7 +652,7 @@ msgstr "Invalid alias: \"%s\"."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias \"%s\" already in use. Try another one."
@@ -660,7 +661,7 @@ msgstr "Alias \"%s\" already in use. Try another one."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Alias can't be the same as nickname."
 
@@ -1060,7 +1061,7 @@ 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:138
+#: actions/apitimelinegroup.php:134
 #, fuzzy, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Could not delete group %s."
@@ -1153,30 +1154,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, 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:404
+#: actions/apitimelineuser.php:406
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Notice with that id does not exist."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1187,7 +1188,7 @@ msgid "API method under construction."
 msgstr "API method under construction."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "API method not found."
 
@@ -1277,7 +1278,6 @@ msgid "Can't delete someone else's favorite"
 msgstr "Could not delete favourite."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
 msgstr "No such group."
 
@@ -1402,14 +1402,14 @@ msgid "Preview"
 msgstr "Preview"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Delete"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
@@ -1452,6 +1452,38 @@ msgstr "Failed updating avatar."
 msgid "Avatar deleted."
 msgstr "Avatar deleted."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "Only logged-in users can repeat notices."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Background"
+
+#: actions/backupaccount.php:258
+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."
@@ -1659,6 +1691,60 @@ msgstr "Conversation"
 msgid "Notices"
 msgstr "Notices"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "Only logged-in users can repeat notices."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "You cannot delete users."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Avatar deleted."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Create an account"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Confirm"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1807,7 +1893,7 @@ 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:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Delete this notice"
 
@@ -2113,7 +2199,7 @@ msgstr "Use this form to edit the group."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Invalid alias: \"%s\""
@@ -2125,7 +2211,7 @@ 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:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "Could not create aliases."
 
@@ -3352,8 +3438,14 @@ msgstr "Could not create application."
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Use this form to create a new group."
 
@@ -3672,11 +3764,6 @@ msgstr "New password"
 msgid "6 or more characters"
 msgstr "6 or more characters"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Confirm"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Same as password above"
@@ -4200,6 +4287,11 @@ msgstr "Couldn't save tags."
 msgid "Settings saved."
 msgstr "Settings saved."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Create an account"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4655,7 +4747,7 @@ msgstr "You can't repeat your own notice."
 msgid "You already repeated that notice."
 msgstr "You already repeated that notice."
 
-#: actions/repeat.php:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Repeated"
 
@@ -4719,6 +4811,90 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Replies to %1$s on %2$s!"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "Only logged-in users can repeat notices."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "You have not registered any applications yet."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, 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:130 lib/mediafile.php:194
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:136 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:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "System error uploading file."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "All members"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, 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."
@@ -4819,7 +4995,7 @@ msgid "Reset key & secret"
 msgstr ""
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Delete"
 
@@ -6078,13 +6254,13 @@ msgid "Author(s)"
 msgstr ""
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: 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."
@@ -6191,7 +6367,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6218,30 +6394,30 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: 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:288
+#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -6250,42 +6426,42 @@ msgstr ""
 "few minutes."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6293,14 +6469,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6370,32 +6546,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "Welcome to %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "Could not create group."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 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:544
+#: classes/User_group.php:549
 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:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "Could not save local group info."
 
@@ -6730,10 +6906,19 @@ msgstr "Before"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Photo"
+msgid "Unknown profile."
+msgstr "Unknown file type"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7020,6 +7205,10 @@ msgstr "Revoke"
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7441,26 +7630,26 @@ msgstr ""
 "tracking - not yet implemented.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 #, 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:150
+#: lib/common.php:153
 #, 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "Go to the installer."
 
@@ -7564,6 +7753,14 @@ msgstr ""
 msgid "FOAF"
 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"
@@ -7745,11 +7942,6 @@ msgstr "That file is too big. The maximum file size is %s."
 msgid "Partial upload."
 msgstr "Partial upload."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "System error uploading file."
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "Not an image or corrupt file."
@@ -8084,7 +8276,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "from"
 
@@ -8114,38 +8306,6 @@ msgstr "Unsupported message type: %s"
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: lib/mediafile.php:194
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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.
-#: lib/mediafile.php:222
-msgid "File upload stopped by extension."
-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."
@@ -8166,7 +8326,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8175,7 +8335,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
@@ -8210,17 +8370,17 @@ msgid "Send"
 msgstr "Send"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8259,55 +8419,55 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr ""
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "in context"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "Repeated by"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "Reply to this notice"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Reply"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Notice repeated"
 
@@ -8461,7 +8621,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:957
+#: lib/router.php:974
 #, fuzzy
 msgid "Page not found."
 msgstr "API method not found."
@@ -8809,21 +8969,9 @@ msgstr "Invalid size."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
+#, fuzzy
+#~ msgid "Post"
+#~ msgstr "Photo"
 
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
-msgid "No user specified; using backup user."
-msgstr "No user specified; using backup user."
-
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
-msgstr[1] ""
+#~ msgid "No user specified; using backup user."
+#~ msgstr "No user specified; using backup user."
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index 2b7e513e4b..54af3721c3 100644
--- a/locale/eo/LC_MESSAGES/statusnet.po
+++ b/locale/eo/LC_MESSAGES/statusnet.po
@@ -7,6 +7,7 @@
 # Author: Ianmcorvidae
 # Author: Kris10
 # Author: LyzTyphone
+# Author: Mihxil
 # Author: Petrus Adamus
 # Author: Yekrats
 # --
@@ -16,17 +17,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:10:36+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:31:57+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 (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: eo\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -283,7 +284,7 @@ msgstr "Ĝisdatiĝoj de %1$s kaj amikoj ĉe %2$s!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -330,7 +331,8 @@ msgstr "Malsukcesis ĝisdatigi uzanton"
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -351,7 +353,7 @@ msgstr "Malsukcesis konservi la profilon."
 #: actions/designadminpanel.php:125 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
 "current configuration."
@@ -359,10 +361,10 @@ msgid_plural ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
 "current configuration."
 msgstr[0] ""
-"La servilo ne povis trakti tiom da POST-datumo (% bajtoj) pro ĝia nuna "
+"La servilo ne povis trakti tiom da POST-datumo (%s bajto) pro ĝia nuna "
 "agordo."
 msgstr[1] ""
-"La servilo ne povis trakti tiom da POST-datumo (% bajtoj) pro ĝia nuna "
+"La servilo ne povis trakti tiom da POST-datumo (%s bajtoj) pro ĝia nuna "
 "agordo."
 
 #. TRANS: Client error displayed when saving design settings fails because of an empty id.
@@ -388,7 +390,7 @@ msgstr "Malsukcesis ĝisdatigi vian desegnon."
 
 #: actions/apiatomservice.php:86
 msgid "Main"
-msgstr ""
+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.
@@ -409,12 +411,12 @@ msgid "%s subscriptions"
 msgstr "%s abonatoj"
 
 #: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "%s favorites"
-msgstr "Ŝatolisto"
+msgstr "%s da ŝatolisteroj"
 
 #: actions/apiatomservice.php:123
-#, fuzzy, php-format
+#, php-format
 msgid "%s memberships"
 msgstr "%s grupanoj"
 
@@ -467,10 +469,10 @@ msgstr "Sen mesaĝteksto!"
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
 #: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
-msgstr[0] "Tro longas. Mesaĝa longlimo estas %d signoj."
+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).
@@ -485,10 +487,9 @@ 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
-#, fuzzy
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
-msgstr "Ne sendu mesaĝon al vi mem! Simple suspiru anstataŭ."
+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.
@@ -543,9 +544,8 @@ 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
-#, fuzzy
 msgid "Two valid IDs or nick names must be supplied."
-msgstr "Du uzantajn IDojn aŭ montronomojn vi devas specifi."
+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
@@ -562,7 +562,7 @@ msgstr "Malsukcesis trovi celan uzanton."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "La uzantnomo jam uziĝis. Provu ion alian."
@@ -572,7 +572,7 @@ msgstr "La uzantnomo jam uziĝis. Provu ion alian."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ne valida kromnomo."
@@ -584,7 +584,7 @@ msgstr "Ne valida kromnomo."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Ĉefpaĝo ne estas valida URL."
@@ -594,11 +594,10 @@ 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:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
-#, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
-msgstr "Plennomo estas tro longa (maksimume 255 literoj)"
+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.
@@ -610,11 +609,11 @@ msgstr "Plennomo estas tro longa (maksimume 255 literoj)"
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
-#, fuzzy, php-format
+#: actions/newgroup.php:156
+#, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
-msgstr[0] "Priskribo estas tro longa (maksimume %d signoj)."
+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.
@@ -622,11 +621,10 @@ 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:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
-#, fuzzy
 msgid "Location is too long (maximum 255 characters)."
-msgstr "lokonomo estas tro longa (maksimume 255 literoj)"
+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.
@@ -635,8 +633,8 @@ msgstr "lokonomo estas tro longa (maksimume 255 literoj)"
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
-#, fuzzy, php-format
+#: actions/newgroup.php:176
+#, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
 msgstr[0] "Tro da alinomoj! Maksimume %d."
@@ -654,7 +652,7 @@ msgstr "La alinomo estas nevalida: \"%*s\"."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "La alinomo \"%s\" estas jam okupita. Provu ion alian."
@@ -663,7 +661,7 @@ msgstr "La alinomo \"%s\" estas jam okupita. Provu ion alian."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "La alinomo devas ne esti sama al la kromnomo."
 
@@ -762,9 +760,8 @@ msgstr "Nevalida peto-ĵetono."
 
 #. 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 "Vi ne estas rajtigita."
+msgstr ""
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
@@ -1066,7 +1063,7 @@ 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:138
+#: actions/apitimelinegroup.php:134
 #, fuzzy, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Malsukcesis ĝisdatigi grupon."
@@ -1159,30 +1156,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, 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:404
+#: actions/apitimelineuser.php:406
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Avizo kun tiu identigaĵo ne ekzistas."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1193,7 +1190,7 @@ msgid "API method under construction."
 msgstr "API-metodo farata."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 #, fuzzy
 msgid "User not found."
 msgstr "Metodo de API ne troviĝas."
@@ -1409,14 +1406,14 @@ msgid "Preview"
 msgstr "Antaŭrigardo"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Forigi"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
@@ -1459,6 +1456,38 @@ msgstr "Eraris ĝisdatigi vizaĝbildon."
 msgid "Avatar deleted."
 msgstr "Vizaĝbildo forigita."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "Nur ensalutinto rajtas ripeti avizon."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Fono"
+
+#: actions/backupaccount.php:258
+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."
@@ -1665,6 +1694,60 @@ msgstr "Konversacio"
 msgid "Notices"
 msgstr "Avizoj"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "Nur ensalutinto rajtas ripeti avizon."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "Vi ne povas forigi uzantojn."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Vizaĝbildo forigita."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Krei konton"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Konfirmi"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1816,7 +1899,7 @@ 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:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Forigi la avizon"
 
@@ -2122,7 +2205,7 @@ msgstr "Uzas ĉi tiun formularon por redakti la grupon."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Nevalida alinomo: \"%s\""
@@ -2134,7 +2217,7 @@ 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:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "Malsukcesis krei alinomon."
 
@@ -3353,8 +3436,14 @@ msgstr "Malsukcesis krei aplikaĵon."
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Uzas ĉi tiun formularon por krei novan grupon."
 
@@ -3673,11 +3762,6 @@ msgstr "Nova pasvorto"
 msgid "6 or more characters"
 msgstr "6 aŭ pli da literoj"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Konfirmi"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Same kiel pasvorto supra"
@@ -4194,6 +4278,11 @@ msgstr "Malsukcesis konservi markilojn."
 msgid "Settings saved."
 msgstr "Agordo konservitas."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Krei konton"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4649,7 +4738,7 @@ msgstr "Vi ne povas ripeti vian propran avizon."
 msgid "You already repeated that notice."
 msgstr "La avizo jam ripetiĝis."
 
-#: actions/repeat.php:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Ripetita"
 
@@ -4715,6 +4804,94 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Respondoj al %1$s ĉe %2$s!"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "Nur ensalutinto rajtas ripeti avizon."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "Vi ankoraŭ neniun aplikaĵon registris."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, 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:130 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:136 lib/mediafile.php:200
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"Alŝutata dosiero superas la dosierujon MAX_FILE_SIZE (Alŝuta grandlimo) "
+"difinitan per HTML formo."
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "Sisteme eraris alŝuti dosieron."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Ĉiuj grupanoj"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, 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."
@@ -4815,7 +4992,7 @@ msgid "Reset key & secret"
 msgstr "Rekomencigi ŝlosilon & sekreton"
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Forigi"
 
@@ -6075,13 +6252,13 @@ msgid "Author(s)"
 msgstr "Aŭtoro(j)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%s (@%s) ŝatis vian avizon"
@@ -6192,7 +6369,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr "Ne troviĝas datumbaza nomo aŭ DSN ie ajn."
 
@@ -6219,30 +6396,30 @@ 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:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: 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:288
+#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -6250,43 +6427,43 @@ 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:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 #, 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:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6294,14 +6471,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, 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."
@@ -6371,32 +6548,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "Bonvenon al %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 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
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "Malsukcesis krei grupon."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 msgid "Could not set group URI."
 msgstr "Malsukcesis ĝisdatigi grupan URI."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:549
 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:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "Malsukcesis lokan grupan informon."
 
@@ -6734,10 +6911,19 @@ msgstr "Antaŭe"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Foto"
+msgid "Unknown profile."
+msgstr "Nekonata dosiertipo"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7024,6 +7210,10 @@ msgstr "Revoki"
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7457,26 +7647,26 @@ msgstr ""
 "tracking -ankoraŭ ne realigita.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 #, 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:150
+#: lib/common.php:153
 #, 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "Al la instalilo."
 
@@ -7583,6 +7773,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: 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"
@@ -7767,11 +7965,6 @@ msgstr "La dosiero tro grandas. Dosiera grandlimo estas %s."
 msgid "Partial upload."
 msgstr "Parta alŝuto."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "Sisteme eraris alŝuti dosieron."
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "Ne bildo aŭ dosiero difektita."
@@ -8188,7 +8381,7 @@ 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/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "de"
 
@@ -8219,42 +8412,6 @@ msgstr "Nesubtenata mesaĝo-tipo: %s"
 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 an uploaded file is larger than set in php.ini.
-#: 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.
-#: lib/mediafile.php:200
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
-msgstr ""
-"Alŝutata dosiero superas la dosierujon MAX_FILE_SIZE (Alŝuta grandlimo) "
-"difinitan per HTML formo."
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: lib/mediafile.php:222
-msgid "File upload stopped by extension."
-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."
@@ -8275,7 +8432,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8286,7 +8443,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: 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."
@@ -8321,18 +8478,18 @@ msgid "Send"
 msgstr "Sendi"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8373,55 +8530,55 @@ msgstr ""
 "poste."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "W"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, 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:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "al"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr "TTT"
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "kuntekste"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "Ripetita de"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "Respondi ĉi tiun avizon"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Respondi"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Avizo ripetiĝas"
 
@@ -8576,7 +8733,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:957
+#: lib/router.php:974
 #, fuzzy
 msgid "Page not found."
 msgstr "Metodo de API ne troviĝas."
@@ -8928,22 +9085,10 @@ msgstr "Grando nevalida."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
 #, fuzzy
-msgid "No user specified; using backup user."
-msgstr "Neniu uzanto-ID specifiĝas."
+#~ msgid "Post"
+#~ msgstr "Foto"
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+#~ msgid "No user specified; using backup user."
+#~ msgstr "Neniu uzanto-ID specifiĝas."
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 39cebc687a..b58a46ce19 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -16,17 +16,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:10:37+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:31: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-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -284,7 +284,7 @@ msgstr "¡Actualizaciones de %1$s y sus amistades en %2$s!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -331,7 +331,8 @@ msgstr "No se pudo actualizar el usuario."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -563,7 +564,7 @@ msgstr "No se pudo encontrar ningún usuario de destino."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "El usuario ya existe. Prueba con otro."
@@ -573,7 +574,7 @@ msgstr "El usuario ya existe. Prueba con otro."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Usuario inválido"
@@ -585,7 +586,7 @@ msgstr "Usuario inválido"
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "La página de inicio no es un URL válido."
@@ -595,7 +596,7 @@ 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:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -611,7 +612,7 @@ msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -623,7 +624,7 @@ 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:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -636,7 +637,7 @@ msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -655,7 +656,7 @@ msgstr "Alias inválido: \"%s\"."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "El alias \"%s\" ya está en uso. Intenta usar otro."
@@ -664,7 +665,7 @@ msgstr "El alias \"%s\" ya está en uso. Intenta usar otro."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "El alias no puede ser el mismo que el usuario."
 
@@ -1071,7 +1072,7 @@ 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:138
+#: actions/apitimelinegroup.php:134
 #, fuzzy, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "No se pudo actualizar el grupo."
@@ -1164,30 +1165,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Buscar en el contenido de mensajes"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "No existe ningún mensaje con ese ID."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1198,7 +1199,7 @@ 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/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "Método de API no encontrado."
 
@@ -1288,9 +1289,8 @@ msgid "Can't delete someone else's favorite"
 msgstr "No se pudo borrar favorito."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
-msgstr "No existe ese grupo."
+msgstr "No existe ese grupo"
 
 #: actions/atompubshowmembership.php:90
 #, fuzzy
@@ -1413,14 +1413,14 @@ msgid "Preview"
 msgstr "Vista previa"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Borrar"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
@@ -1463,6 +1463,38 @@ msgstr "Error al actualizar la imagen."
 msgid "Avatar deleted."
 msgstr "Imagen borrada."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "Sólo los usuarios que hayan accedido pueden repetir mensajes."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Fondo"
+
+#: actions/backupaccount.php:258
+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."
@@ -1671,6 +1703,60 @@ msgstr "Conversación"
 msgid "Notices"
 msgstr "Mensajes"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "Sólo los usuarios que hayan accedido pueden repetir mensajes."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "No puedes borrar usuarios."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Imagen borrada."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Crear una cuenta"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Confirmar"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1824,7 +1910,7 @@ 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:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Borrar este mensaje"
 
@@ -2132,7 +2218,7 @@ msgstr "Usa este formulario para editar el grupo."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Alias inválido: \"%s\""
@@ -2144,7 +2230,7 @@ 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:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "No fue posible crear alias."
 
@@ -3387,8 +3473,14 @@ msgstr "No se pudo crear la aplicación."
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Usa este formulario para crear un grupo nuevo."
 
@@ -3709,11 +3801,6 @@ msgstr "Nueva contraseña"
 msgid "6 or more characters"
 msgstr "6 o más caracteres"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Confirmar"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Igual a la contraseña de arriba"
@@ -4252,6 +4339,11 @@ msgstr "No se pudo guardar las etiquetas."
 msgid "Settings saved."
 msgstr "Se guardó configuración."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Crear una cuenta"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4727,7 +4819,7 @@ msgstr "No puedes repetir tus propios mensajes."
 msgid "You already repeated that notice."
 msgstr "Ya has repetido este mensaje."
 
-#: actions/repeat.php:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Repetido"
 
@@ -4793,6 +4885,93 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Respuestas a %1$s en %2$s!"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "Sólo los usuarios que hayan accedido pueden repetir mensajes."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "Aún no has registrado aplicación alguna."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, 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:130 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:136 lib/mediafile.php:200
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"El archivo subido sobrepasa la directiva MAX_FILE_SIZE que se especificó en "
+"el formulario HTML."
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "Error del sistema subir el archivo"
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Todos los miembros"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, 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."
@@ -4893,7 +5072,7 @@ msgid "Reset key & secret"
 msgstr "Reiniciar clave y secreto"
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Borrar"
 
@@ -6182,13 +6361,13 @@ msgid "Author(s)"
 msgstr "Autor(es)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: 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"
@@ -6303,7 +6482,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr "Ningún nombre de base de datos o DSN encontrado."
 
@@ -6330,23 +6509,23 @@ 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:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -6354,7 +6533,7 @@ msgstr ""
 "minutos."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:288
+#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -6363,43 +6542,43 @@ msgstr ""
 "pasados unos minutos."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 #, 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:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6407,14 +6586,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6486,32 +6665,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "Bienvenido a %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 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
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 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:521
+#: classes/User_group.php:526
 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:544
+#: classes/User_group.php:549
 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:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "No se ha podido guardar la información del grupo local."
 
@@ -6853,10 +7032,19 @@ msgstr ""
 "A espera de un elemento de alimentación de raíz, pero se obtuvo un documento "
 "XML entero."
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Foto"
+msgid "Unknown profile."
+msgstr "Tipo de archivo desconocido"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7146,6 +7334,10 @@ msgstr "Revocar"
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7580,26 +7772,26 @@ msgstr ""
 "tracking - aún sin implementar.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 #, 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:150
+#: lib/common.php:153
 #, 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "Ir al instalador."
 
@@ -7707,6 +7899,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "Amistad de amistad"
 
+#: 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"
@@ -7892,11 +8092,6 @@ msgstr "El archivo es muy grande. El tamaño máximo permitido es %s."
 msgid "Partial upload."
 msgstr "Subida parcial"
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "Error del sistema subir el archivo"
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "No es una imagen o es un fichero corrupto."
@@ -8319,7 +8514,7 @@ msgstr ""
 "otros usuarios partícipes de la conversación. La gente puede enviarte "
 "mensajes que sólo puedas leer tú."
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "desde"
 
@@ -8351,41 +8546,6 @@ 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 an uploaded file is larger than set in php.ini.
-#: 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.
-#: lib/mediafile.php:200
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
-msgstr ""
-"El archivo subido sobrepasa la directiva MAX_FILE_SIZE que se especificó en "
-"el formulario HTML."
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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 would cause a user to exceed a set quota.
 #: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
@@ -8406,7 +8566,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8417,7 +8577,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: 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."
@@ -8452,19 +8612,19 @@ msgid "Send"
 msgstr "Enviar"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8505,55 +8665,55 @@ msgstr ""
 "favor, inténtalo más tarde."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "W"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, 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:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "en"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr "red"
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "en contexto"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "Repetido por"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "Responder a este mensaje."
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Mensaje repetido"
 
@@ -8707,7 +8867,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:957
+#: lib/router.php:974
 #, fuzzy
 msgid "Page not found."
 msgstr "Método de API no encontrado."
@@ -9061,22 +9221,10 @@ msgstr "Tamaño inválido."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
 #, fuzzy
-msgid "No user specified; using backup user."
-msgstr "No se ha especificado ID de usuario."
+#~ msgid "Post"
+#~ msgstr "Foto"
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+#~ msgid "No user specified; using backup user."
+#~ msgstr "No se ha especificado ID de usuario."
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index 383e6d5151..59588dee35 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:10:39+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:00+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 (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -283,7 +283,7 @@ msgstr "به روز رسانی از %1$s و دوستان در %2$s"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -329,7 +329,8 @@ msgstr "نمی‌توان کاربر را به‌هنگام‌سازی کرد."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -556,7 +557,7 @@ msgstr "نمی‌توان کاربر هدف را پیدا کرد."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "این لقب در حال حاضر ثبت شده است. لطفا یکی دیگر انتخاب کنید."
@@ -566,7 +567,7 @@ msgstr "این لقب در حال حاضر ثبت شده است. لطفا یکی
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "لقب نا معتبر."
@@ -578,7 +579,7 @@ msgstr "لقب نا معتبر."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "صفحهٔ خانگی یک نشانی معتبر نیست."
@@ -588,7 +589,7 @@ msgstr "صفحهٔ خانگی یک نشانی معتبر نیست."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -604,7 +605,7 @@ msgstr "نام کامل خیلی طولانی است (حداکثر ۲۵۵ نوی
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -615,7 +616,7 @@ msgstr[0] "توصیف خیلی طولانی است (حداکثر %d نویسه)"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -628,7 +629,7 @@ msgstr "نام مکان خیلی طولانی است (حداکثر ۲۵۵ نوی
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -646,7 +647,7 @@ msgstr "نام مستعار نامعتبر است: «%s»."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "نام‌مستعار «%s» ازپیش گرفته‌شده‌است. یکی دیگر را امتحان کنید."
@@ -655,7 +656,7 @@ msgstr "نام‌مستعار «%s» ازپیش گرفته‌شده‌است. ی
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "نام و نام مستعار شما نمی تواند یکی باشد ."
 
@@ -1059,7 +1060,7 @@ msgstr "به‌روزرسانی‌های %1$s که توسط %2$s برگزیده
 
 #. TRANS: Server error displayed when generating an Atom feed fails.
 #. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:138
+#: actions/apitimelinegroup.php:134
 #, fuzzy, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "نمی‌توان گروه را به‌هنگام‌سازی کرد."
@@ -1152,30 +1153,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "پیدا کردن محتوای پیام‌ها"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "پیامی با آن شناسه وجود ندارد."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1186,7 +1187,7 @@ msgid "API method under construction."
 msgstr "روش API در دست ساخت."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 #, fuzzy
 msgid "User not found."
 msgstr "رابط مورد نظر پیدا نشد."
@@ -1277,7 +1278,6 @@ msgid "Can't delete someone else's favorite"
 msgstr "نمی‌توان پیام برگزیده را حذف کرد."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
 msgstr "چنین گروهی وجود ندارد."
 
@@ -1403,14 +1403,14 @@ msgid "Preview"
 msgstr "پیش‌نمایش"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "حذف"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
@@ -1454,6 +1454,38 @@ msgstr "به روز رسانی چهره موفقیت آمیر نبود."
 msgid "Avatar deleted."
 msgstr "چهره پاک شد."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "تنها کاربران وارد شده می توانند پیام‌ها را تکرار کنند."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "پیش‌زمینه"
+
+#: actions/backupaccount.php:258
+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."
@@ -1662,6 +1694,60 @@ msgstr "مکالمه"
 msgid "Notices"
 msgstr "پیام‌ها"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "تنها کاربران وارد شده می توانند پیام‌ها را تکرار کنند."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "شما نمی‌توانید کاربران را پاک کنید."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "چهره پاک شد."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "ساختن یک جساب‌کاربری"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "تایید"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1815,7 +1901,7 @@ msgid "Do not delete this notice"
 msgstr "این پیام را پاک نکن"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "این پیام را پاک کن"
 
@@ -2127,7 +2213,7 @@ msgstr "از این روش برای ویرایش گروه استفاده کنی
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "نام‌مستعار غیر مجاز: «%s»"
@@ -2139,7 +2225,7 @@ msgstr "نمی‌توان گروه را به‌هنگام‌سازی کرد."
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "نمی‌توان نام‌های مستعار را ساخت."
 
@@ -3362,8 +3448,14 @@ msgstr "نمی‌توان برنامه را ساخت."
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "از این فرم برای ساختن یک گروه جدید استفاده کنید"
 
@@ -3683,11 +3775,6 @@ msgstr "گذرواژهٔ تازه"
 msgid "6 or more characters"
 msgstr "۶ نویسه یا بیش‌تر"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "تایید"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "مانند گذرواژهٔ بالا"
@@ -4219,6 +4306,11 @@ msgstr "نمی‌توان نشان را ذخیره کرد."
 msgid "Settings saved."
 msgstr "تنظیمات ذخیره شد."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "ساختن یک جساب‌کاربری"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4679,7 +4771,7 @@ msgstr "شما نمی‌توانید پیام خودتان را تکرار کن
 msgid "You already repeated that notice."
 msgstr "شما قبلا آن پیام را تکرار کرده‌اید."
 
-#: actions/repeat.php:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "تکرار شده"
 
@@ -4743,6 +4835,90 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "پاسخ‌های به %1$s در %2$s!"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "تنها کاربران وارد شده می توانند پیام‌ها را تکرار کنند."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "شما هنوز هیچ برنامه‌ای را ثبت نکرده‌اید."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, fuzzy
+msgid "No uploaded file."
+msgstr "بارگذاری پرونده"
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: actions/restoreaccount.php:130 lib/mediafile.php:194
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:136 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:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "هنگام بارگذاری پرونده خطای سیستمی رخ داد."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "همهٔ اعضا"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, fuzzy
+msgid "Upload the file"
+msgstr "بارگذاری پرونده"
+
 #: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "شما نمی‌توانید نقش‌های کاربری را در این وب‌گاه لغو کنید."
@@ -4846,7 +5022,7 @@ msgid "Reset key & secret"
 msgstr ""
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "حذف"
 
@@ -6122,13 +6298,13 @@ msgid "Author(s)"
 msgstr "مؤلف(ها)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "پیام شما را به برگزیده‌های خود اضافه کرد %s (@%s)"
@@ -6237,7 +6413,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr "هیچ پایگاه‌داده یا DSN هیچ‌جا پیدا نشد."
 
@@ -6265,23 +6441,23 @@ 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:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -6289,7 +6465,7 @@ msgstr ""
 "دوباره بفرستید."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:288
+#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -6298,42 +6474,42 @@ msgstr ""
 "ارسال کنید."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6341,14 +6517,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6420,33 +6596,33 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "@%2$s، به %1$s خوش آمدید!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 msgid "No single user defined for single-user mode."
 msgstr "هیچ کاربر تنهایی برای حالت تک کاربره مشخص نشده است."
 
 #. TRANS: Server exception.
-#: classes/User.php:927
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "نمیتوان گروه را تشکیل داد"
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 #, fuzzy
 msgid "Could not set group URI."
 msgstr "نمیتوان گروه را تشکیل داد"
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:549
 msgid "Could not set group membership."
 msgstr "نمی‌توان عضویت گروه را تعیین کرد."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "نمی‌توان اطلاعات گروه محلی را ذخیره کرد."
 
@@ -6782,10 +6958,19 @@ msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 "در حال انتظار برای یک عامل خوراک ریشه‌ای، اما یک سند XML کامل دریافت شد."
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "تصویر"
+msgid "Unknown profile."
+msgstr "نوع فایل پشتیبانی نشده"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7073,6 +7258,10 @@ msgstr "لغو کردن"
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7503,26 +7692,26 @@ msgstr ""
 "tracking - هنوز پیاده نشده است.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 #, 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:150
+#: lib/common.php:153
 #, 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "برو به نصاب."
 
@@ -7631,6 +7820,14 @@ msgstr "مؤلف"
 msgid "FOAF"
 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"
@@ -7811,11 +8008,6 @@ msgstr "این پرونده خیلی بزرگ است. بیشینهٔ انداز
 msgid "Partial upload."
 msgstr "هیچ پرونده‌ای بارگذاری نشد."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "هنگام بارگذاری پرونده خطای سیستمی رخ داد."
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "تصویر یا فایل خرابی نیست"
@@ -8230,7 +8422,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "از"
 
@@ -8261,38 +8453,6 @@ msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 "یک خطای پایگاه داده هنگام ذخیره کردن فایل شما رخ داد. لطفا بعدا سعی کنید."
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: lib/mediafile.php:194
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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.
-#: lib/mediafile.php:222
-msgid "File upload stopped by extension."
-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."
@@ -8313,7 +8473,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8322,7 +8482,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
@@ -8357,17 +8517,17 @@ msgid "Send"
 msgstr "فرستادن"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8407,56 +8567,56 @@ msgstr ""
 "دوباره تلاش کنید."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 #, fuzzy
 msgid "N"
 msgstr "خیر"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr ""
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "در"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "در زمینه"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "تکرار از"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "به این پیام پاسخ دهید"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "پاسخ"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "پیام تکرار شد"
 
@@ -8611,7 +8771,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:957
+#: lib/router.php:974
 #, fuzzy
 msgid "Page not found."
 msgstr "رابط مورد نظر پیدا نشد."
@@ -8960,21 +9120,10 @@ msgstr "اندازه نادرست است."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
 #, fuzzy
-msgid "No user specified; using backup user."
-msgstr "هیچ شناسهٔ کاربری مشخص نشده است."
+#~ msgid "Post"
+#~ msgstr "تصویر"
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
+#, fuzzy
+#~ msgid "No user specified; using backup user."
+#~ msgstr "هیچ شناسهٔ کاربری مشخص نشده است."
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index fb4e344692..7f78676be0 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -14,17 +14,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:10:40+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -286,7 +286,7 @@ msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -331,7 +331,8 @@ msgstr "Käyttäjän päivitys epäonnistui."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -564,7 +565,7 @@ msgstr "Ei voitu päivittää käyttäjää."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
@@ -574,7 +575,7 @@ msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Tuo ei ole kelvollinen tunnus."
@@ -586,7 +587,7 @@ msgstr "Tuo ei ole kelvollinen tunnus."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Kotisivun verkko-osoite ei ole toimiva."
@@ -596,7 +597,7 @@ 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:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -612,7 +613,7 @@ msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -624,7 +625,7 @@ 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:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -637,7 +638,7 @@ msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)."
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -656,7 +657,7 @@ msgstr "Virheellinen alias: \"%s\""
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias \"%s\" on jo käytössä. Yritä toista aliasta."
@@ -665,7 +666,7 @@ msgstr "Alias \"%s\" on jo käytössä. Yritä toista aliasta."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Alias ei voi olla sama kuin ryhmätunnus."
 
@@ -885,7 +886,6 @@ msgstr "Salasana"
 #: actions/apioauthauthorize.php:478 actions/emailsettings.php:128
 #: actions/imsettings.php:131 actions/smssettings.php:137
 #: lib/applicationeditform.php:351
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Peruuta"
@@ -1067,7 +1067,7 @@ 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:138
+#: actions/apitimelinegroup.php:134
 #, fuzzy, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Ei voitu päivittää ryhmää."
@@ -1161,30 +1161,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Hae päivityksien sisällöstä"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Ei profiilia tuolla id:llä."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1195,7 +1195,7 @@ 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/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "API-metodia ei löytynyt."
 
@@ -1286,7 +1286,6 @@ msgid "Can't delete someone else's favorite"
 msgstr "Ei voitu poistaa suosikkia."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
 msgstr "Tuota ryhmää ei ole."
 
@@ -1411,14 +1410,13 @@ msgid "Preview"
 msgstr "Esikatselu"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
-#, fuzzy
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Poista"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
@@ -1462,6 +1460,38 @@ msgstr "Profiilikuvan päivittäminen epäonnistui."
 msgid "Avatar deleted."
 msgstr "Kuva poistettu."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "Vain käyttäjä voi lukea omaa postilaatikkoaan."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Tausta"
+
+#: actions/backupaccount.php:258
+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."
@@ -1492,7 +1522,7 @@ msgstr ""
 #: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
-msgstr "Huomaa"
+msgstr "Ei"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #. TRANS: Submit button title for 'No' when deleting a user.
@@ -1509,7 +1539,6 @@ msgstr "Älä estä tätä käyttäjää"
 #: actions/block.php:161 actions/deleteapplication.php:164
 #: actions/deletegroup.php:227 actions/deletenotice.php:162
 #: actions/deleteuser.php:159 actions/groupblock.php:185
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Kyllä"
@@ -1667,6 +1696,60 @@ msgstr "Keskustelu"
 msgid "Notices"
 msgstr "Päivitykset"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "Vain käyttäjä voi lukea omaa postilaatikkoaan."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "Sinä et voi poistaa käyttäjiä."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Kuva poistettu."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Luo uusi ryhmä"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Vahvista"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1819,7 +1902,7 @@ 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:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Poista tämä päivitys"
 
@@ -2144,7 +2227,7 @@ msgstr "Käytä tätä lomaketta muokataksesi ryhmää."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Virheellinen alias: \"%s\""
@@ -2156,7 +2239,7 @@ 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:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "Ei voitu lisätä aliasta."
 
@@ -2224,7 +2307,6 @@ msgstr "Sähköpostiosoite, esimerkiksi \"käyttäjätunnus@example.org\""
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
 #: actions/emailsettings.php:144 actions/imsettings.php:151
 #: actions/smssettings.php:162
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Lisää"
@@ -3398,8 +3480,14 @@ msgstr "Ei voitu lisätä aliasta."
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Käytä tätä lomaketta luodaksesi ryhmän."
 
@@ -3725,11 +3813,6 @@ msgstr "Uusi salasana"
 msgid "6 or more characters"
 msgstr "6 tai useampia merkkejä"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Vahvista"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Sama kuin ylläoleva salasana"
@@ -3980,9 +4063,8 @@ msgstr ""
 #. TRANS: Fieldset legens in Paths admin panel.
 #. TRANS: DT element label in attachment list.
 #: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
-#, fuzzy
 msgid "Attachments"
-msgstr "Liitettä ei ole."
+msgstr "Liitteet"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 #: actions/pathsadminpanel.php:427
@@ -4276,6 +4358,11 @@ msgstr "Tageja ei voitu tallentaa."
 msgid "Settings saved."
 msgstr "Asetukset tallennettu."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Luo uusi ryhmä"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4742,7 +4829,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:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 #, fuzzy
 msgid "Repeated"
 msgstr "Luotu"
@@ -4808,6 +4895,90 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Viesti käyttäjälle %1$s, %2$s"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "Vain käyttäjä voi lukea omaa postilaatikkoaan."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, 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:130 lib/mediafile.php:194
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:136 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:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "Tiedoston lähetyksessä tapahtui järjestelmävirhe."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Kaikki jäsenet"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, 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."
@@ -4917,7 +5088,7 @@ msgid "Reset key & secret"
 msgstr ""
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Poista"
 
@@ -6181,13 +6352,13 @@ msgid "Author(s)"
 msgstr ""
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: 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."
@@ -6299,7 +6470,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6327,24 +6498,24 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -6352,7 +6523,7 @@ 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:288
+#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -6361,43 +6532,43 @@ 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:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1012
+#: classes/Notice.php:1013
 #, 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6405,14 +6576,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6486,32 +6657,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "Viesti käyttäjälle %1$s, %2$s"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 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:521
+#: classes/User_group.php:526
 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:544
+#: classes/User_group.php:549
 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:559
+#: classes/User_group.php:564
 #, fuzzy
 msgid "Could not save local group info."
 msgstr "Tilausta ei onnistuttu tallentamaan."
@@ -6686,10 +6857,9 @@ msgstr "Ohjeet"
 
 #. TRANS: Main menu option for help on the StatusNet site
 #: lib/action.php:592
-#, fuzzy
 msgctxt "MENU"
 msgid "Help"
-msgstr "Ohjeet"
+msgstr "Ohje"
 
 #. TRANS: Tooltip for main menu option "Search"
 #: lib/action.php:595
@@ -6860,10 +7030,19 @@ msgstr "Aiemmin"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Kuva"
+msgid "Unknown profile."
+msgstr "Tunnistamaton tiedoston tyyppi"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7170,6 +7349,10 @@ msgstr "Poista"
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 #, fuzzy
@@ -7569,26 +7752,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 #, 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:150
+#: lib/common.php:153
 #, 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Kirjaudu sisään palveluun"
@@ -7698,6 +7881,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: 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"
@@ -7884,11 +8075,6 @@ msgstr "Voit ladata ryhmälle logon."
 msgid "Partial upload."
 msgstr "Osittain ladattu palvelimelle."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "Tiedoston lähetyksessä tapahtui järjestelmävirhe."
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "Tuo ei ole kelvollinen kuva tai tiedosto on rikkoutunut."
@@ -8066,7 +8252,7 @@ msgstr "%s päivitys"
 #. TRANS: Subject line for SMS-by-email address confirmation message.
 #: lib/mail.php:468
 msgid "SMS confirmation"
-msgstr "SMS vahvistus"
+msgstr "SMS-vahvistus"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
@@ -8223,7 +8409,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 #, fuzzy
 msgid "from"
 msgstr " lähteestä "
@@ -8254,38 +8440,6 @@ msgstr "Kuvatiedoston formaattia ei ole tuettu."
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: lib/mediafile.php:194
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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.
-#: lib/mediafile.php:222
-msgid "File upload stopped by extension."
-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."
@@ -8306,7 +8460,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8315,7 +8469,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
@@ -8345,25 +8499,24 @@ msgid "Available characters"
 msgstr "Sallitut merkit"
 
 #: lib/messageform.php:185 lib/noticeform.php:237
-#, fuzzy
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Lähetä"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8404,58 +8557,58 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 #, fuzzy
 msgid "N"
 msgstr "Ei"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr ""
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 #, fuzzy
 msgid "in context"
 msgstr "Ei sisältöä!"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 #, fuzzy
 msgid "Repeated by"
 msgstr "Luotu"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "Vastaa tähän päivitykseen"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Vastaus"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 #, fuzzy
 msgid "Notice repeated"
 msgstr "Päivitys on poistettu."
@@ -8615,7 +8768,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:957
+#: lib/router.php:974
 #, fuzzy
 msgid "Page not found."
 msgstr "API-metodia ei löytynyt."
@@ -8976,22 +9129,10 @@ msgstr "Koko ei kelpaa."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
 #, fuzzy
-msgid "No user specified; using backup user."
-msgstr "Ryhmää ei ole määritelty."
+#~ msgid "Post"
+#~ msgstr "Kuva"
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+#~ msgid "No user specified; using backup user."
+#~ msgstr "Ryhmää ei ole määritelty."
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 32c774597d..a538a77536 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:10:42+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -290,7 +290,7 @@ msgstr "Statuts de %1$s et ses amis dans %2$s!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -337,7 +337,8 @@ msgstr "Impossible de mettre à jour l’utilisateur."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -571,7 +572,7 @@ msgstr "Impossible de trouver l’utilisateur cible."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudo déjà utilisé. Essayez-en un autre."
@@ -581,7 +582,7 @@ msgstr "Pseudo déjà utilisé. Essayez-en un autre."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Pseudo invalide."
@@ -593,7 +594,7 @@ msgstr "Pseudo invalide."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "L’adresse du site personnel n’est pas un URL valide. "
@@ -603,7 +604,7 @@ 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:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: 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)."
@@ -618,7 +619,7 @@ msgstr "Le nom complet est trop long (limité à 255 caractères maximum)."
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -630,7 +631,7 @@ 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:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "L’emplacement est trop long (limité à 255 caractères maximum)."
@@ -642,7 +643,7 @@ msgstr "L’emplacement est trop long (limité à 255 caractères maximum)."
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -661,7 +662,7 @@ msgstr "Alias invalide : « %s »."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias « %s » déjà utilisé. Essayez-en un autre."
@@ -670,7 +671,7 @@ msgstr "Alias « %s » déjà utilisé. Essayez-en un autre."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "L’alias ne peut pas être le même que le pseudo."
 
@@ -1079,7 +1080,7 @@ 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:138
+#: 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"
@@ -1173,31 +1174,31 @@ msgstr "Une publication Atom doit être une entrée « Atom »."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 #, 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:343
+#: actions/apitimelineuser.php:345
 #, 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.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, 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:404
+#: actions/apitimelineuser.php:406
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "L’avis d’URI « %s » existe déjà."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr "Publication AtomPost avec l’URI d’attention inconnu %s"
@@ -1208,7 +1209,7 @@ 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/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "Page non trouvée."
 
@@ -1300,7 +1301,6 @@ msgid "Can't delete someone else's favorite"
 msgstr "Impossible de supprimer le favori."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
 msgstr "Aucun groupe trouvé."
 
@@ -1428,13 +1428,13 @@ msgid "Preview"
 msgstr "Aperçu"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Supprimer"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Téléverser"
@@ -1475,6 +1475,38 @@ msgstr "La mise à jour de l’avatar a échoué."
 msgid "Avatar deleted."
 msgstr "Avatar supprimé."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "Seuls  les utilisateurs identifiés peuvent reprendre des avis."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Arrière plan"
+
+#: actions/backupaccount.php:258
+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."
@@ -1680,6 +1712,60 @@ msgstr "Conversation"
 msgid "Notices"
 msgstr "Avis"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "Seuls  les utilisateurs identifiés peuvent reprendre des avis."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "Vous ne pouvez pas supprimer des utilisateurs."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Avatar supprimé."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Créer un compte"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Confirmer"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1829,7 +1915,7 @@ 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:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Supprimer cet avis"
 
@@ -2134,7 +2220,7 @@ msgstr "Remplissez ce formulaire pour modifier les options du groupe."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Alias invalide : « %s »"
@@ -2146,7 +2232,7 @@ 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:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "Impossible de créer les alias."
 
@@ -3398,8 +3484,14 @@ msgstr "Impossible de créer l’application."
 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:110
+#: 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 :"
 
@@ -3723,11 +3815,6 @@ msgstr "Nouveau mot de passe"
 msgid "6 or more characters"
 msgstr "6 caractères ou plus"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Confirmer"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Identique au mot de passe ci-dessus"
@@ -4246,6 +4333,11 @@ msgstr "Impossible d’enregistrer les marques."
 msgid "Settings saved."
 msgstr "Préférences enregistrées."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Créer un compte"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4718,7 +4810,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:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Repris"
 
@@ -4786,6 +4878,92 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Réponses à %1$s sur %2$s !"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "Seuls  les utilisateurs identifiés peuvent reprendre des avis."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "Vous n’avez encore enregistré aucune application."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, 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:130 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:136 lib/mediafile.php:200
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"Le fichier importé dépasse le réglage MAX_FILE_SIZE qui a été précisé dans "
+"le formulaire HTML."
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "Erreur système lors du transfert du fichier."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr "Obtention de la sauvegarde depuis le fichier « %s »."
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Tous les membres"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, 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."
@@ -4887,7 +5065,7 @@ msgid "Reset key & secret"
 msgstr "Réinitialiser la clé et le secret"
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -6183,13 +6361,13 @@ msgid "Author(s)"
 msgstr "Auteur(s)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: 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."
@@ -6304,7 +6482,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr "Aucun nom de base de données ou DSN trouvé nulle part."
 
@@ -6331,23 +6509,23 @@ 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:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -6355,7 +6533,7 @@ msgstr ""
 "minutes."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:288
+#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -6364,42 +6542,42 @@ msgstr ""
 "dans quelques minutes."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 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:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6407,7 +6585,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:798
+#: classes/Profile.php:765
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -6416,7 +6594,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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6488,32 +6666,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "Bienvenue à %1$s, @%2$s !"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 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
+#: classes/User.php:922
 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:511
+#: classes/User_group.php:516
 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:521
+#: classes/User_group.php:526
 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:544
+#: classes/User_group.php:549
 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:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "Impossible d’enregistrer les informations du groupe local."
 
@@ -6853,10 +7031,19 @@ msgstr "Avant"
 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."
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Photo"
+msgid "Unknown profile."
+msgstr "Type de fichier inconnu"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7147,6 +7334,10 @@ msgstr "Révoquer"
 msgid "author element must contain a name element."
 msgstr "l’élément « author » doit contenir un élément « name »."
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7585,25 +7776,25 @@ msgstr ""
 "tracking - pas encore implémenté.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 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:150
+#: lib/common.php:153
 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "Aller au programme d’installation"
 
@@ -7705,6 +7896,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "Ami d’un ami"
 
+#: 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"
@@ -7890,11 +8089,6 @@ msgstr "Ce fichier est trop grand. La taille maximale est %s."
 msgid "Partial upload."
 msgstr "Transfert partiel."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "Erreur système lors du transfert du fichier."
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "Ceci n’est pas une image, ou c’est un fichier corrompu."
@@ -8318,7 +8512,7 @@ msgstr ""
 "pour démarrer des conversations avec d’autres utilisateurs. Ceux-ci peuvent "
 "vous envoyer des messages destinés à vous seul(e)."
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "de"
 
@@ -8350,40 +8544,6 @@ 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 an uploaded file is larger than set in php.ini.
-#: 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.
-#: lib/mediafile.php:200
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
-msgstr ""
-"Le fichier importé dépasse le réglage MAX_FILE_SIZE qui a été précisé dans "
-"le formulaire HTML."
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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 would cause a user to exceed a set quota.
 #: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
@@ -8404,7 +8564,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8415,7 +8575,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: 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."
@@ -8448,19 +8608,19 @@ msgid "Send"
 msgstr "Envoyer"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8501,55 +8661,55 @@ msgstr ""
 "Veuillez réessayer plus tard."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "O"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, 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:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "chez"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "dans le contexte"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "Repris par"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "Répondre à cet avis"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Répondre"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Avis repris"
 
@@ -8703,7 +8863,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:957
+#: lib/router.php:974
 msgid "Page not found."
 msgstr "Page non trouvée."
 
@@ -9063,21 +9223,15 @@ msgstr "XML invalide."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr "Obtention de la sauvegarde depuis le fichier « %s »."
+#, fuzzy
+#~ msgid "Post"
+#~ msgstr "Photo"
 
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
-msgid "No user specified; using backup user."
-msgstr "Aucun utilisateur spécifié ; utilisation de l’utilisateur de secours."
+#~ msgid "No user specified; using backup user."
+#~ msgstr ""
+#~ "Aucun utilisateur spécifié ; utilisation de l’utilisateur de secours."
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] "%d entrée dans la sauvegarde."
-msgstr[1] "%d entrées dans la sauvegarde."
+#~ msgid "%d entry in backup."
+#~ msgid_plural "%d entries in backup."
+#~ msgstr[0] "%d entrée dans la sauvegarde."
+#~ msgstr[1] "%d entrées dans la sauvegarde."
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index a576a5b953..d6edd2193d 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -9,18 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:10:43+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:04+0000\n"
 "Language-Team: Irish <http://translatewiki.net/wiki/Portal:ga>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ga\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=5; plural=(n == 1) ? 0 : ( (n == 2) ? 1 : ( (n < 7) ? "
 "2 : ( (n < 11) ? 3 : 4 ) ) );\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -279,7 +279,7 @@ msgstr "Actualizacións dende %1$s e amigos en %2$s!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -326,7 +326,8 @@ msgstr "Non se puido actualizar o usuario."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -572,7 +573,7 @@ msgstr "Non se puido actualizar o usuario."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
@@ -582,7 +583,7 @@ msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Non é un alcume válido."
@@ -594,7 +595,7 @@ msgstr "Non é un alcume válido."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "A páxina persoal semella que non é unha URL válida."
@@ -604,7 +605,7 @@ msgstr "A páxina persoal semella que non é unha URL válida."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -620,7 +621,7 @@ msgstr "O nome completo é demasiado longo (max 255 car)."
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -635,7 +636,7 @@ msgstr[4] "O teu Bio é demasiado longo (max %d car.)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -648,7 +649,7 @@ msgstr "A localización é demasiado longa (max 255 car.)."
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -670,7 +671,7 @@ msgstr "Etiqueta inválida: '%s'"
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, fuzzy, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
@@ -679,7 +680,7 @@ msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -1087,7 +1088,7 @@ msgstr "Hai %1$s chíos en resposta a chíos dende %2$s / %3$s."
 
 #. TRANS: Server error displayed when generating an Atom feed fails.
 #. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:138
+#: actions/apitimelinegroup.php:134
 #, fuzzy, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Non se puido actualizar o usuario."
@@ -1180,30 +1181,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Atopar no contido dos chíos"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Non se atopou un perfil con ese ID."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1214,7 +1215,7 @@ msgid "API method under construction."
 msgstr "Método da API en contrución."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "Método da API non atopado"
 
@@ -1304,7 +1305,6 @@ msgid "Can't delete someone else's favorite"
 msgstr "Non se puido eliminar o favorito."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
 msgstr "Non existe a etiqueta."
 
@@ -1428,14 +1428,14 @@ msgid "Preview"
 msgstr ""
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Eliminar chío"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
@@ -1479,6 +1479,37 @@ msgstr "Acounteceu un fallo ó actualizar o avatar."
 msgid "Avatar deleted."
 msgstr "Avatar actualizado."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "Só o usuario pode ler os seus propios buzóns."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr ""
+
+#: actions/backupaccount.php:258
+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."
@@ -1694,6 +1725,60 @@ msgstr "Código de confirmación."
 msgid "Notices"
 msgstr "Chíos"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "Só o usuario pode ler os seus propios buzóns."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "Non se puido actualizar o usuario."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Avatar actualizado."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Crear nova conta"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Confirmar"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently your account"
+msgstr ""
+
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 #: actions/deleteapplication.php:62
 #, fuzzy
@@ -1850,7 +1935,7 @@ msgid "Do not delete this notice"
 msgstr "Non se pode eliminar este chíos."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 #, fuzzy
 msgid "Delete this notice"
 msgstr "Eliminar chío"
@@ -2177,7 +2262,7 @@ msgstr ""
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, fuzzy, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Etiqueta inválida: '%s'"
@@ -2190,7 +2275,7 @@ msgstr "Non se puido actualizar o usuario."
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 #, fuzzy
 msgid "Could not create aliases."
 msgstr "Non se puido crear o favorito."
@@ -3455,8 +3540,14 @@ msgstr "Non se puido crear o favorito."
 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 "Non estás suscrito a ese perfil"
+
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr ""
 
@@ -3785,11 +3876,6 @@ msgstr "Nova contrasinal"
 msgid "6 or more characters"
 msgstr "6 ou máis caracteres"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Confirmar"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Igual que a contrasinal de enriba"
@@ -4333,6 +4419,11 @@ msgstr "Non se puideron gardar as etiquetas."
 msgid "Settings saved."
 msgstr "Configuracións gardadas."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Crear nova conta"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4806,7 +4897,7 @@ msgstr "Non podes rexistrarte se non estas de acordo coa licenza."
 msgid "You already repeated that notice."
 msgstr "Xa estas suscrito a estes usuarios:"
 
-#: actions/repeat.php:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Destacado"
 
@@ -4867,6 +4958,89 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Mensaxe de %1$s en %2$s"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "Só o usuario pode ler os seus propios buzóns."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "Non podes rexistrarte se non estas de acordo coa licenza."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, fuzzy
+msgid "No uploaded file."
+msgstr "Subir"
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: actions/restoreaccount.php:130 lib/mediafile.php:194
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:136 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:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "Aconteceu un erro no sistema namentras se estaba cargando o ficheiro."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+msgid "Not an atom feed."
+msgstr ""
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, fuzzy
+msgid "Upload the file"
+msgstr "Subir"
+
 #: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "Tes restrinxido o envio de chíos neste sitio."
@@ -4975,7 +5149,7 @@ msgid "Reset key & secret"
 msgstr ""
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Eliminar chío"
 
@@ -6250,13 +6424,13 @@ msgid "Author(s)"
 msgstr ""
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 msgid "Favor"
 msgstr "Gostame"
 
 #. 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:154
+#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "Enviar un correo cando alguen enganda un chío meu coma favorito."
@@ -6378,7 +6552,7 @@ msgid "Could not create login token for %s"
 msgstr "Non se puido crear o favorito."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6406,24 +6580,24 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:193
+#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Acounteceu un erro ó inserir o avatar"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:270
+#: classes/Notice.php:279
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "Aconteceu un erro ó gardar o chío."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:275
+#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "Aconteceu un erro ó gardar o chío. Usuario descoñecido."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:281
+#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -6431,7 +6605,7 @@ msgstr ""
 "duns minutos."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:288
+#: classes/Notice.php:297
 #, fuzzy
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
@@ -6441,43 +6615,43 @@ msgstr ""
 "duns minutos."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:296
+#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "Tes restrinxido o envio de chíos neste sitio."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:363 classes/Notice.php:390
+#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Aconteceu un erro ó gardar o chío."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:913
+#: classes/Notice.php:914
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1012
+#: classes/Notice.php:1013
 #, fuzzy
 msgid "Problem saving group inbox."
 msgstr "Aconteceu un erro ó gardar o chío."
 
 #. 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:1126
+#: classes/Notice.php:1127
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Non se pode gardar a subscrició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.
-#: classes/Notice.php:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6485,14 +6659,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6566,34 +6740,34 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "Mensaxe de %1$s en %2$s"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 #, fuzzy
 msgid "Could not create group."
 msgstr "Non se puido crear o favorito."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 msgid "Could not set group URI."
 msgstr "Non se poden gardar as etiquetas."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:549
 #, fuzzy
 msgid "Could not set group membership."
 msgstr "Non se pode gardar a subscrición."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:559
+#: classes/User_group.php:564
 #, fuzzy
 msgid "Could not save local group info."
 msgstr "Non se pode gardar a subscrición."
@@ -6951,8 +7125,18 @@ msgstr "Antes »"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activity.php:360
-msgid "Post"
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
+#, fuzzy
+msgid "Unknown profile."
+msgstr "tipo de ficheiro non soportado"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
 msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
@@ -7262,6 +7446,10 @@ msgstr "Recuperar"
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7713,26 +7901,26 @@ msgstr ""
 "tracking - non implementado por agora.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Sen código de confirmació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:150
+#: lib/common.php:153
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Invitación(s) enviada(s) á seguinte xente:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr ""
 
@@ -7838,6 +8026,14 @@ msgstr ""
 msgid "FOAF"
 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"
@@ -8027,11 +8223,6 @@ msgstr "Podes actualizar a túa información do perfil persoal aquí"
 msgid "Partial upload."
 msgstr "Carga parcial."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "Aconteceu un erro no sistema namentras se estaba cargando o ficheiro."
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "Non é unha imaxe ou está corrupta."
@@ -8422,7 +8613,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 #, fuzzy
 msgid "from"
 msgstr " dende "
@@ -8453,38 +8644,6 @@ msgstr "Formato de ficheiro de imaxe non soportado."
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: lib/mediafile.php:194
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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.
-#: lib/mediafile.php:222
-msgid "File upload stopped by extension."
-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."
@@ -8505,7 +8664,7 @@ msgstr "Non se puido eliminar o favorito."
 #. 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8514,7 +8673,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
@@ -8552,17 +8711,17 @@ msgid "Send"
 msgstr "Enviar"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "O alcume debe ter só letras minúsculas e números, e sen espazos."
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:176
+#: 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:189
+#: 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."
@@ -8606,59 +8765,59 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 #, fuzzy
 msgid "N"
 msgstr "No"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr ""
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 #, fuzzy
 msgid "in context"
 msgstr "Sen contido!"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 #, fuzzy
 msgid "Repeated by"
 msgstr "Crear"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 #, fuzzy
 msgid "Reply to this notice"
 msgstr "Non se pode eliminar este chíos."
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Respostas"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 #, fuzzy
 msgid "Notice repeated"
 msgstr "Chío publicado"
@@ -8824,7 +8983,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:957
+#: lib/router.php:974
 #, fuzzy
 msgid "Page not found."
 msgstr "Método da API non atopado"
@@ -9215,25 +9374,6 @@ msgstr "Tamaño inválido."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
 #, fuzzy
-msgid "No user specified; using backup user."
-msgstr "Non se especificou ningún perfil."
-
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
+#~ msgid "No user specified; using backup user."
+#~ msgstr "Non se especificou ningún perfil."
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index 23654f9d49..941234bf76 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:10:44+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:05+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 (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -279,7 +279,7 @@ msgstr "Actualizacións de %1$s e amigos en %2$s!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -326,7 +326,8 @@ msgstr "Non se puido actualizar o usuario."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -561,7 +562,7 @@ msgstr "Non se puido atopar o usuario de destino."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Ese alcume xa está en uso. Probe con outro."
@@ -571,7 +572,7 @@ msgstr "Ese alcume xa está en uso. Probe con outro."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "O formato do alcume non é correcto."
@@ -583,7 +584,7 @@ msgstr "O formato do alcume non é correcto."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "O URL da páxina persoal non é correcto."
@@ -593,7 +594,7 @@ 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:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -609,7 +610,7 @@ msgstr "O nome completo é longo de máis (o máximo son 255 caracteres)."
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -621,7 +622,7 @@ 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:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -634,7 +635,7 @@ msgstr "A localidade é longa de máis (o máximo son 255 caracteres)."
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -653,7 +654,7 @@ msgstr "Pseudónimo incorrecto: \"%s\"."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "O pseudónimo \"%s\" xa se está a usar. Proba con outro."
@@ -662,7 +663,7 @@ msgstr "O pseudónimo \"%s\" xa se está a usar. Proba con outro."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "O pseudónimo non pode coincidir co alcume."
 
@@ -1067,7 +1068,7 @@ 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:138
+#: actions/apitimelinegroup.php:134
 #, fuzzy, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Non se puido actualizar o grupo."
@@ -1160,30 +1161,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, 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:404
+#: actions/apitimelineuser.php:406
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Non hai ningunha nota con esa id."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1194,7 +1195,7 @@ 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/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 #, fuzzy
 msgid "User not found."
 msgstr "Non se atopou o método da API."
@@ -1412,13 +1413,13 @@ msgid "Preview"
 msgstr "Vista previa"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Borrar"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Cargar"
@@ -1459,6 +1460,38 @@ msgstr "Non se puido actualizar o avatar."
 msgid "Avatar deleted."
 msgstr "Borrouse o avatar."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "Só os usuarios identificados poden repetir notas."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Fondo"
+
+#: actions/backupaccount.php:258
+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."
@@ -1665,6 +1698,60 @@ msgstr "Conversa"
 msgid "Notices"
 msgstr "Notas"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "Só os usuarios identificados poden repetir notas."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "Non pode borrar usuarios."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Borrouse o avatar."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Crear unha conta"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Confirmar"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1817,7 +1904,7 @@ 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:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Borrar esta nota"
 
@@ -2126,7 +2213,7 @@ msgstr "Utilice este formulario para editar o grupo."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Pseudónimo inválido: \"%s\""
@@ -2138,7 +2225,7 @@ 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:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "Non se puideron crear os pseudónimos."
 
@@ -3384,8 +3471,14 @@ msgstr "Non se puido crear a aplicación."
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Utilice o seguinte formulario para crear un novo grupo."
 
@@ -3707,11 +3800,6 @@ msgstr "Novo contrasinal"
 msgid "6 or more characters"
 msgstr "Seis ou máis caracteres"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Confirmar"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Igual ao contrasinal anterior"
@@ -4245,6 +4333,11 @@ msgstr "Non se puideron gardar as etiquetas."
 msgid "Settings saved."
 msgstr "Gardouse a configuración."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Crear unha conta"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4720,7 +4813,7 @@ msgstr "Non pode repetir a súa propia nota."
 msgid "You already repeated that notice."
 msgstr "Xa repetiu esa nota."
 
-#: actions/repeat.php:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Repetida"
 
@@ -4786,6 +4879,92 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Respostas a %1$s en %2$s!"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "Só os usuarios identificados poden repetir notas."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "Aínda non rexistrou ningunha aplicación."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, 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:130 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:136 lib/mediafile.php:200
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"O ficheiro subido supera a directiva MAX_FILE_SIZE especificada no "
+"formulario HTML."
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "Houbo un erro no sistema ao cargar o ficheiro."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Todos os membros"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, 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."
@@ -4886,7 +5065,7 @@ msgid "Reset key & secret"
 msgstr "Restablecer o contrasinal ou a pregunta secreta"
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Borrar"
 
@@ -6177,13 +6356,13 @@ msgid "Author(s)"
 msgstr "Autores"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: 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"
@@ -6296,7 +6475,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr "Non se atopou por ningures o nome da base de datos ou DSN."
 
@@ -6323,23 +6502,23 @@ 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:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -6347,7 +6526,7 @@ 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:288
+#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -6356,43 +6535,43 @@ msgstr ""
 "publicar nuns minutos."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 #, 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:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6400,7 +6579,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:798
+#: classes/Profile.php:765
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -6408,7 +6587,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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6479,32 +6658,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "Benvido a %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 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
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 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:521
+#: classes/User_group.php:526
 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:544
+#: classes/User_group.php:549
 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:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "Non se puido gardar a información do grupo local."
 
@@ -6845,10 +7024,19 @@ 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."
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Fotografía"
+msgid "Unknown profile."
+msgstr "Non se coñece o tipo de ficheiro"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7140,6 +7328,10 @@ msgstr "Revogar"
 msgid "author element must contain a name element."
 msgstr "o elemento \"autor\" debe conter un nome."
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7575,26 +7767,26 @@ 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:147
+#: lib/common.php:150
 #, 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:150
+#: lib/common.php:153
 #, 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "Ir ao instalador."
 
@@ -7702,6 +7894,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "Amigo dun amigo"
 
+#: 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"
@@ -7890,11 +8090,6 @@ msgstr "Ese ficheiro é grande de máis. O tamaño máximo por ficheiro son %s."
 msgid "Partial upload."
 msgstr "Carga parcial."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "Houbo un erro no sistema ao cargar o ficheiro."
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "O ficheiro está mal ou non é unha imaxe."
@@ -8315,7 +8510,7 @@ 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/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "de"
 
@@ -8346,40 +8541,6 @@ 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 an uploaded file is larger than set in php.ini.
-#: 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.
-#: lib/mediafile.php:200
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
-msgstr ""
-"O ficheiro subido supera a directiva MAX_FILE_SIZE especificada no "
-"formulario HTML."
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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 would cause a user to exceed a set quota.
 #: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
@@ -8400,7 +8561,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8411,7 +8572,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: 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\"."
@@ -8446,19 +8607,19 @@ msgid "Send"
 msgstr "Enviar"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8499,55 +8660,55 @@ msgstr ""
 "intentar máis tarde"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "L"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "O"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, 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:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "en"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "no contexto"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "Repetida por"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "Responder a esta nota"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Repetiuse a nota"
 
@@ -8701,7 +8862,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:957
+#: lib/router.php:974
 #, fuzzy
 msgid "Page not found."
 msgstr "Non se atopou o método da API."
@@ -9059,21 +9220,15 @@ msgstr "Tamaño non válido."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
+#, fuzzy
+#~ msgid "Post"
+#~ msgstr "Fotografía"
 
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
-msgid "No user specified; using backup user."
-msgstr "Non se especificou ningún usuario; emprégase o usuario de reserva."
+#~ msgid "No user specified; using backup user."
+#~ msgstr "Non se especificou ningún usuario; emprégase o usuario de reserva."
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, fuzzy, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] "%d entradas na reserva."
-msgstr[1] "%d entradas na reserva."
+#, fuzzy
+#~ msgid "%d entry in backup."
+#~ msgid_plural "%d entries in backup."
+#~ msgstr[0] "%d entradas na reserva."
+#~ msgstr[1] "%d entradas na reserva."
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index f53d6917f6..8b981ac5e3 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -11,18 +11,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:10:53+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:06+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 (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hsb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || "
 "n%100==4) ? 2 : 3)\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+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 "Aktualizacije wot %1$s a přećelow na %2$s!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -317,7 +317,8 @@ msgstr "Wužiwar njeje so dał aktualizować."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -394,14 +395,14 @@ msgid "%s subscriptions"
 msgstr "%s abonementow"
 
 #: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "%s favorites"
-msgstr "Fawority"
+msgstr "%s faworitow"
 
 #: actions/apiatomservice.php:123
-#, fuzzy, php-format
+#, php-format
 msgid "%s memberships"
-msgstr "%s skupinskich čłonow"
+msgstr "%s čłonstwow"
 
 #. TRANS: Client error displayed when users try to block themselves.
 #: actions/apiblockcreate.php:104
@@ -549,7 +550,7 @@ msgstr "Cilowy wužiwar njeda so namakać."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Přimjeno so hižo wužiwa. Spytaj druhe."
@@ -559,7 +560,7 @@ msgstr "Přimjeno so hižo wužiwa. Spytaj druhe."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Žane płaćiwe přimjeno."
@@ -571,7 +572,7 @@ msgstr "Žane płaćiwe přimjeno."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Startowa strona njeje płaćiwy URL."
@@ -581,7 +582,7 @@ 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:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: 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)."
@@ -596,7 +597,7 @@ msgstr "Dospołne mjeno je předołho (maks. 255 znamješkow)."
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -610,7 +611,7 @@ 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:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Městno je předołho (maks. 255 znamješkow)."
@@ -622,7 +623,7 @@ msgstr "Městno je předołho (maks. 255 znamješkow)."
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -643,7 +644,7 @@ msgstr "Njepłaćiwy alias: \"%s\"."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias \"%s\" so hižo wužiwa. Spytaj druhi."
@@ -652,7 +653,7 @@ msgstr "Alias \"%s\" so hižo wužiwa. Spytaj druhi."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Alias njemóže samsny kaž přimjeno być."
 
@@ -1043,7 +1044,7 @@ 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:138
+#: actions/apitimelinegroup.php:134
 #, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Njebě móžno kanal za skupinu wutworić - %s"
@@ -1114,51 +1115,50 @@ 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
-#, fuzzy
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Jenož AtomPub za Atom-kanale akceptować."
 
 #: actions/apitimelineuser.php:310
 msgid "Atom post must not be empty."
-msgstr ""
+msgstr "Póst z Atoma njesmě prózdny być."
 
 #: actions/apitimelineuser.php:315
 msgid "Atom post must be well-formed XML."
-msgstr ""
+msgstr "Póst za Atom dyrbi derje sformowany XML być."
 
 #. TRANS: Client error displayed when not using an Atom entry.
 #: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
 #: actions/atompubmembershipfeed.php:228
 #: actions/atompubsubscriptionfeed.php:233
 msgid "Atom post must be an Atom entry."
-msgstr ""
+msgstr "Póst za Atom dyrbi  zapisk z Atoma być."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
-#, fuzzy, php-format
+#: actions/apitimelineuser.php:378
+#, php-format
 msgid "No content for notice %d."
-msgstr "Wobsah zdźělenkow přepytać"
+msgstr "Žadyn wobsah za zdźělenku %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Zdźělenka z URI \"%s\" hižo eksistuje."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1169,14 +1169,13 @@ 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/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "Wužiwar njenamakany."
 
 #: actions/atompubfavoritefeed.php:70
-#, fuzzy
 msgid "No such profile"
-msgstr "Profil njeeksistuje."
+msgstr "Profil njeeksistuje"
 
 #: actions/atompubfavoritefeed.php:145
 #, php-format
@@ -1184,9 +1183,8 @@ msgid "Notices %s has favorited to on %s"
 msgstr ""
 
 #: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-#, fuzzy
 msgid "Can't add someone else's subscription"
-msgstr "Nowy abonement njeda so zasunyć."
+msgstr "Nowy abonement njeda so přidać"
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
@@ -1195,19 +1193,16 @@ msgid "Can only handle Favorite activities."
 msgstr ""
 
 #: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
-#, fuzzy
 msgid "Can only fave notices."
-msgstr "Wobsah zdźělenkow přepytać"
+msgstr "Jenož zdźělenki dadźa so jako fawority składować."
 
 #: actions/atompubfavoritefeed.php:256
-#, fuzzy
 msgid "Unknown note."
-msgstr "Njeznaty"
+msgstr "Njeznata notica."
 
 #: actions/atompubfavoritefeed.php:263
-#, fuzzy
 msgid "Already a favorite."
-msgstr "K faworitam přidać"
+msgstr "Je hižo faworit."
 
 #: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
 #: actions/atompubshowmembership.php:73 actions/subscribe.php:107
@@ -1215,14 +1210,14 @@ msgid "No such profile."
 msgstr "Profil njeeksistuje."
 
 #: actions/atompubmembershipfeed.php:144
-#, fuzzy, php-format
+#, php-format
 msgid "%s group memberships"
-msgstr "%s skupinskich čłonow"
+msgstr "%s skupisnkich čłonstwow"
 
 #: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %s is a member of on %s"
-msgstr "Skupiny, w kotrychž %s je čłon"
+msgstr "Skupiny, w kotrychž %s je čłon na %s"
 
 #: actions/atompubmembershipfeed.php:217
 msgid "Can't add someone else's membership"
@@ -1235,43 +1230,36 @@ msgid "Can only handle Join activities."
 msgstr ""
 
 #: actions/atompubmembershipfeed.php:256
-#, fuzzy
 msgid "Unknown group."
-msgstr "Njeznaty"
+msgstr "Njeznata skupina"
 
 #: actions/atompubmembershipfeed.php:263
-#, fuzzy
 msgid "Already a member."
-msgstr "Wšitcy čłonojo"
+msgstr "Je hižo čłon."
 
 #: actions/atompubmembershipfeed.php:270
 msgid "Blocked by admin."
-msgstr ""
+msgstr "Wot administratora zablokowany."
 
 #: actions/atompubshowfavorite.php:89
-#, fuzzy
 msgid "No such favorite."
-msgstr "Dataja njeeksistuje."
+msgstr "Faworit njeeksistuje."
 
 #: actions/atompubshowfavorite.php:151
-#, fuzzy
 msgid "Can't delete someone else's favorite"
-msgstr "Faworit njeda so zhašeć."
+msgstr "Faworit druheho njeda so zhašeć"
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
-msgstr "Skupina njeeksistuje."
+msgstr "Skupina njeeksistuje"
 
 #: actions/atompubshowmembership.php:90
-#, fuzzy
 msgid "Not a member"
-msgstr "Wšitcy čłonojo"
+msgstr "Njeje čłon"
 
 #: actions/atompubshowmembership.php:115
-#, fuzzy
 msgid "Method not supported"
-msgstr "HTTP-metoda so njepodpěruje."
+msgstr "Metoda so njepodpěruje."
 
 #: actions/atompubshowmembership.php:150
 msgid "Can't delete someone else's membership"
@@ -1280,9 +1268,9 @@ msgstr ""
 #: actions/atompubshowsubscription.php:72
 #: actions/atompubshowsubscription.php:81
 #: actions/atompubsubscriptionfeed.php:74
-#, fuzzy, php-format
+#, php-format
 msgid "No such profile id: %d"
-msgstr "Profil njeeksistuje."
+msgstr "Profilowy ID njeeksistuje: %d"
 
 #: actions/atompubshowsubscription.php:90
 #, fuzzy, php-format
@@ -1290,14 +1278,13 @@ msgid "Profile %d not subscribed to profile %d"
 msgstr "Njejsy tón profil abonował."
 
 #: actions/atompubshowsubscription.php:154
-#, fuzzy
 msgid "Can't delete someone else's subscription"
-msgstr "Sebjeabonement njeda so zhašeć."
+msgstr "Abonement druheho njeda so zhašeć"
 
 #: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
+#, php-format
 msgid "People %s has subscribed to on %s"
-msgstr "Ludźo, kotřiž su %s abonowali"
+msgstr "Ludźo, kotřiž su %s na %s abonowali"
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
@@ -1310,9 +1297,9 @@ msgid "Can only follow people."
 msgstr ""
 
 #: actions/atompubsubscriptionfeed.php:262
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown profile %s"
-msgstr "Njeznaty datajowy typ"
+msgstr "Njeznaty profil %s"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
@@ -1385,13 +1372,13 @@ msgid "Preview"
 msgstr "Přehlad"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Zhašeć"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Nahrać"
@@ -1432,6 +1419,38 @@ msgstr "Aktualizowanje awatara je so njeporadźiło."
 msgid "Avatar deleted."
 msgstr "Awatar zničeny."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "Jeno6 přizjewjeni wužiwarjo móža zdźělenki wospjetować."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Pozadk"
+
+#: actions/backupaccount.php:258
+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."
@@ -1634,6 +1653,60 @@ msgstr "Konwersacija"
 msgid "Notices"
 msgstr "Zdźělenki"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "Jeno6 přizjewjeni wužiwarjo móža zdźělenki wospjetować."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "Njemóžeš wužiwarjow wušmórnyć."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Awatar zničeny."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Konto załožić"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Wobkrućić"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1774,7 +1847,7 @@ msgid "Do not delete this notice"
 msgstr "Tutu zdźělenku njewušmórnyć"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Tutu zdźělenku wušmórnyć"
 
@@ -2075,7 +2148,7 @@ msgstr "Wuž tutón formular, zo by skupinu wobdźěłał."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Njepłaćiwy alias: \"%s\""
@@ -2087,7 +2160,7 @@ 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:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "Aliasy njejsu so dali wutworić."
 
@@ -3258,8 +3331,14 @@ msgstr "Aplikacija njeda so wutworić."
 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
+#, fuzzy
+msgid "You are not allowed to create groups on this site."
+msgstr "Njesměš tutu skupinu zhašeć."
+
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Wužij tutón formular, zo by nowu skupinu wutworił."
 
@@ -3569,11 +3648,6 @@ msgstr "Nowe hesło"
 msgid "6 or more characters"
 msgstr "6 abo wjace znamješkow"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Wobkrućić"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Samsne hesło kaž horjeka"
@@ -3688,7 +3762,7 @@ msgstr "Zapisowa šćežka k lokalam."
 #. TRANS: Checkbox label in Paths admin panel.
 #: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
-msgstr ""
+msgstr "Šikwane URL"
 
 #: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
@@ -4088,6 +4162,11 @@ msgstr "Taflički njedadźa so składować."
 msgid "Settings saved."
 msgstr "Nastajenja składowane."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Konto załožić"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4108,15 +4187,15 @@ msgstr ""
 
 #: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
-msgstr ""
+msgstr "Kanal zjawneho pruda (RSS 1.0)"
 
 #: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
-msgstr ""
+msgstr "Kanal zjawneho pruda (RSS 2.0)"
 
 #: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
-msgstr ""
+msgstr "Kanal zjawneho pruda (Atom)"
 
 #: actions/public.php:188
 #, php-format
@@ -4509,7 +4588,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:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Wospjetowany"
 
@@ -4569,6 +4648,90 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Wotmołwy na %1$s na %2$s!"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "Jeno6 přizjewjeni wužiwarjo móža zdźělenki wospjetować."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "Hišće njejsy aplikacije zregistrował."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, fuzzy
+msgid "No uploaded file."
+msgstr "Dataju nahrać"
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: actions/restoreaccount.php:130 lib/mediafile.php:194
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:136 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:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "Systemowy zmylk při nahrawanju dataje."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Njeje čłon"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, fuzzy
+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ć."
@@ -4669,7 +4832,7 @@ msgid "Reset key & secret"
 msgstr ""
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Zničić"
 
@@ -5477,9 +5640,9 @@ msgid "%s is not listening to anyone."
 msgstr "%s na nikoho njesłucha."
 
 #: actions/subscriptions.php:178
-#, fuzzy, php-format
+#, php-format
 msgid "Subscription feed for %s (Atom)"
-msgstr "Zdźělenski kanal za %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:242
@@ -5602,7 +5765,7 @@ 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 ""
+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.
@@ -5781,7 +5944,7 @@ msgstr ""
 
 #: actions/userdesignsettings.php:282
 msgid "Enjoy your hotdog!"
-msgstr ""
+msgstr "Wjele wjesela!"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
@@ -5867,13 +6030,13 @@ msgid "Author(s)"
 msgstr "Awtorojo"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: 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ł."
@@ -5986,7 +6149,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6013,71 +6176,71 @@ 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:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: 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:288
+#: 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:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6085,14 +6248,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6162,32 +6325,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "Witaj do %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 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
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "Skupina njeda so wutowrić."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 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:544
+#: classes/User_group.php:549
 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:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "Informacije wo lokalnej skupinje njedachu so składować."
 
@@ -6474,7 +6637,7 @@ msgstr "Licenca sydłoweho wobsaha"
 #: lib/action.php:961
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
-msgstr ""
+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.
@@ -6493,7 +6656,7 @@ msgstr ""
 #: lib/action.php:1004
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
-msgstr ""
+msgstr "Wobsah a daty wot %1$s su pod licencu %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
 #: lib/action.php:1340
@@ -6517,10 +6680,19 @@ msgstr "Před"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Foto"
+msgid "Unknown profile."
+msgstr "Njeznaty profil %s"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -6806,6 +6978,10 @@ msgstr "Wotwołać"
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -6901,7 +7077,7 @@ msgstr ""
 #: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
-msgstr ""
+msgstr "Stork do %s pósłany."
 
 #. TRANS: User statistics text.
 #. TRANS: %1$s is the number of other user the user is subscribed to.
@@ -7215,24 +7391,24 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 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:150
+#: lib/common.php:153
 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "K instalaciji"
 
@@ -7334,6 +7510,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: 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"
@@ -7522,11 +7706,6 @@ msgstr "Tuta dataja je přewulka. Maksimalna datajowa wulkosć je %s."
 msgid "Partial upload."
 msgstr "Dźělne nahraće."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "Systemowy zmylk při nahrawanju dataje."
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "Žady wobraz abo žana wobškodźena dataja."
@@ -7706,7 +7885,7 @@ msgstr ""
 #: lib/mail.php:493
 #, php-format
 msgid "You've been nudged by %s"
-msgstr ""
+msgstr "Sy so wot %s 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,
@@ -7852,7 +8031,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "wot"
 
@@ -7884,38 +8063,6 @@ msgstr ""
 "Při składowanju twojeje dataje je zmylk w datowej bance wustupił. Prošu "
 "spytaj hišće raz."
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: lib/mediafile.php:194
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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.
-#: 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 would cause a user to exceed a set quota.
 #: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
@@ -7936,7 +8083,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -7945,7 +8092,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
@@ -7978,18 +8125,18 @@ msgid "Send"
 msgstr "Pósłać"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8030,55 +8177,55 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "J"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "W"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "Z"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, 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:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "w"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr "Web"
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "w konteksće"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "Wospjetowany wot"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "Na tutu zdźělenku wotmołwić"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Wotmołwić"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Zdźělenka wospjetowana"
 
@@ -8232,7 +8379,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:957
+#: lib/router.php:974
 msgid "Page not found."
 msgstr "Strona njenamakana."
 
@@ -8386,7 +8533,7 @@ msgstr ""
 #: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
-msgstr ""
+msgstr "Šat wobsahuje dataju typa '.%s', kotryž njeje dowoleny."
 
 #: lib/themeuploader.php:260
 msgid "Error opening theme archive."
@@ -8567,7 +8714,7 @@ msgstr ""
 #: lib/xmppmanager.php:287
 #, php-format
 msgid "Unknown user. Go to %s to add your address to your account"
-msgstr ""
+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.
@@ -8592,25 +8739,10 @@ msgstr "Njepłaćiwy XML."
 #. TRANS: Exception.
 #: lib/xrd.php:69
 msgid "Invalid XML, missing XRD root."
-msgstr ""
+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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
+#~ msgid "Post"
+#~ msgstr "Póst"
 
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
-msgid "No user specified; using backup user."
-msgstr "Žadyn wužiwarsk podaty; wužiwa so wužiwar ze zawěsćenja."
-
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+#~ msgid "No user specified; using backup user."
+#~ msgstr "Žadyn wužiwarsk podaty; wužiwa so wužiwar ze zawěsćenja."
diff --git a/locale/hu/LC_MESSAGES/statusnet.po b/locale/hu/LC_MESSAGES/statusnet.po
index 9d60a8c20f..3a379c6882 100644
--- a/locale/hu/LC_MESSAGES/statusnet.po
+++ b/locale/hu/LC_MESSAGES/statusnet.po
@@ -12,13 +12,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:10:54+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:08+0000\n"
 "Language-Team: Hungarian <http://translatewiki.net/wiki/Portal:hu>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hu\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -278,7 +278,7 @@ msgstr "Frissítések %1$s felhasználótól, és barátok a következő oldalon
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -323,7 +323,8 @@ msgstr "Nem sikerült frissíteni a felhasználót."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -555,7 +556,7 @@ msgstr "A cél felhasználó nem található."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: 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."
@@ -565,7 +566,7 @@ msgstr "A becenév már foglalt. Próbálj meg egy másikat."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Nem érvényes becenév."
@@ -577,7 +578,7 @@ msgstr "Nem érvényes becenév."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "A honlap érvénytelen URL-cím."
@@ -587,7 +588,7 @@ 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:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -603,7 +604,7 @@ msgstr "A teljes név túl hosszú (legfeljebb 255 karakter lehet)."
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -615,7 +616,7 @@ 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:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -628,7 +629,7 @@ msgstr "A hely túl hosszú (legfeljebb 255 karakter lehet)."
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -647,7 +648,7 @@ msgstr "Érvénytelen álnév: „%s”."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, 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."
@@ -656,7 +657,7 @@ msgstr "A(z) „%s” álnév már használatban van. Próbálj meg egy másikat
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Az álnév nem egyezhet meg a becenévvel."
 
@@ -1053,7 +1054,7 @@ msgstr ""
 
 #. TRANS: Server error displayed when generating an Atom feed fails.
 #. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:138
+#: actions/apitimelinegroup.php:134
 #, fuzzy, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Nem sikerült a csoport frissítése."
@@ -1145,30 +1146,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, 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:404
+#: actions/apitimelineuser.php:406
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1179,7 +1180,7 @@ 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/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 #, fuzzy
 msgid "User not found."
 msgstr "Az API-metódus nem található."
@@ -1269,9 +1270,8 @@ msgid "Can't delete someone else's favorite"
 msgstr "Nem sikerült törölni a kedvencet."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
-msgstr "Nincs ilyen csoport."
+msgstr "Nincs ilyen csoport"
 
 #: actions/atompubshowmembership.php:90
 #, fuzzy
@@ -1393,14 +1393,14 @@ msgid "Preview"
 msgstr "Előnézet"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Törlés"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
@@ -1443,6 +1443,38 @@ msgstr "Nem sikerült felölteni az avatart."
 msgid "Avatar deleted."
 msgstr "Avatar törölve."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "Csak a felhasználó láthatja a saját postaládáját."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Háttér"
+
+#: actions/backupaccount.php:258
+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."
@@ -1647,6 +1679,60 @@ msgstr "Beszélgetés"
 msgid "Notices"
 msgstr "Hírek"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "Csak a felhasználó láthatja a saját postaládáját."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "Nem törölhetsz felhasználókat."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Avatar törölve."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Felhasználó törlése"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Megerősítés"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1795,7 +1881,7 @@ 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:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Töröljük ezt a hírt"
 
@@ -2101,7 +2187,7 @@ msgstr "Ezen űrlap segítségével szerkesztheted a csoportot."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Érvénytelen álnév: „%s”"
@@ -2113,7 +2199,7 @@ 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:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "Nem sikerült létrehozni az álneveket."
 
@@ -3296,8 +3382,14 @@ msgstr "Nem sikerült létrehozni az alkalmazást."
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Ezen az űrlapon tudsz új csoportot létrehozni."
 
@@ -3606,11 +3698,6 @@ msgstr "Új jelszó"
 msgid "6 or more characters"
 msgstr "6 vagy több karakter"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Megerősítés"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Ugyanaz mint a fenti jelszó"
@@ -4148,6 +4235,10 @@ msgstr "Nem sikerült a címkéket elmenteni."
 msgid "Settings saved."
 msgstr "A beállításokat elmentettük."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+msgid "Restore account"
+msgstr ""
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4578,7 +4669,7 @@ msgstr ""
 msgid "You already repeated that notice."
 msgstr ""
 
-#: actions/repeat.php:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr ""
 
@@ -4638,6 +4729,90 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr ""
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "Csak a felhasználó láthatja a saját postaládáját."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "Nem törölheted más felhasználók állapotait."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, 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:130 lib/mediafile.php:194
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:136 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:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr ""
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Összes tag"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, 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 ""
@@ -4738,7 +4913,7 @@ msgid "Reset key & secret"
 msgstr ""
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Törlés"
 
@@ -5951,13 +6126,13 @@ msgid "Author(s)"
 msgstr "Szerző(k)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: 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"
@@ -6064,7 +6239,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6091,71 +6266,71 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: 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:288
+#: 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:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6163,14 +6338,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6240,32 +6415,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 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:521
+#: classes/User_group.php:526
 msgid "Could not set group URI."
 msgstr ""
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:549
 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:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr ""
 
@@ -6595,10 +6770,19 @@ msgstr "Előtte"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Fénykép"
+msgid "Unknown profile."
+msgstr "Ismeretlen fájltípus"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -6885,6 +7069,10 @@ msgstr ""
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7274,26 +7462,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 #, 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:150
+#: lib/common.php:153
 #, 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "Menj a telepítőhöz."
 
@@ -7398,6 +7586,14 @@ msgstr "Atom"
 msgid "FOAF"
 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"
@@ -7584,11 +7780,6 @@ msgstr "Az a fájl túl nagy. A maximális fájlméret %s."
 msgid "Partial upload."
 msgstr "Részleges feltöltés."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr ""
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr ""
@@ -7973,7 +8164,7 @@ msgstr ""
 "keveredj más felhasználókkal. Olyan üzenetet küldhetnek neked emberek, amit "
 "csak te láthatsz."
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "írta"
 
@@ -8003,38 +8194,6 @@ msgstr "Nem támogatott üzenet-típus: %s"
 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 an uploaded file is larger than set in php.ini.
-#: lib/mediafile.php:194
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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.
-#: 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 would cause a user to exceed a set quota.
 #: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
@@ -8055,7 +8214,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8064,7 +8223,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
@@ -8099,17 +8258,17 @@ msgid "Send"
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8148,55 +8307,55 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "É"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "D"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "K"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "Ny"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "előzmény"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "Megismételte:"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "Válaszoljunk erre a hírre"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Válasz"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "A hírt megismételtük"
 
@@ -8350,7 +8509,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:957
+#: lib/router.php:974
 #, fuzzy
 msgid "Page not found."
 msgstr "Az API-metódus nem található."
@@ -8698,21 +8857,6 @@ msgstr "Érvénytelen méret."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
-msgid "No user specified; using backup user."
-msgstr ""
-
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+#~ msgid "Post"
+#~ msgstr "Fénykép"
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index e21225d63a..2d2f28fc45 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:10:56+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -277,7 +277,7 @@ msgstr "Actualisationes de %1$s e su amicos in %2$s!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -324,7 +324,8 @@ msgstr "Non poteva actualisar le usator."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -403,14 +404,14 @@ msgid "%s subscriptions"
 msgstr "Subscriptiones de %s"
 
 #: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "%s favorites"
-msgstr "Favorites"
+msgstr "%s favorites"
 
 #: actions/apiatomservice.php:123
-#, fuzzy, php-format
+#, php-format
 msgid "%s memberships"
-msgstr "Membros del gruppo %s"
+msgstr "%s membratos"
 
 #. TRANS: Client error displayed when users try to block themselves.
 #: actions/apiblockcreate.php:104
@@ -556,7 +557,7 @@ msgstr "Non poteva trovar le usator de destination."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonymo ja in uso. Proba un altere."
@@ -566,7 +567,7 @@ msgstr "Pseudonymo ja in uso. Proba un altere."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Non un pseudonymo valide."
@@ -578,7 +579,7 @@ msgstr "Non un pseudonymo valide."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Le pagina personal non es un URL valide."
@@ -588,7 +589,7 @@ 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:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Le nomine complete es troppo longe (maximo 255 characteres)."
@@ -603,7 +604,7 @@ msgstr "Le nomine complete es troppo longe (maximo 255 characteres)."
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -615,7 +616,7 @@ 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:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Loco es troppo longe (maximo 255 characteres)."
@@ -627,7 +628,7 @@ msgstr "Loco es troppo longe (maximo 255 characteres)."
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -646,7 +647,7 @@ msgstr "Alias invalide: \"%s\"."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Le alias \"%s\" es ja in uso. Proba un altere."
@@ -655,7 +656,7 @@ msgstr "Le alias \"%s\" es ja in uso. Proba un altere."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Le alias non pote esser identic al pseudonymo."
 
@@ -1057,7 +1058,7 @@ 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:138
+#: actions/apitimelinegroup.php:134
 #, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Non poteva generar un syndication pro le gruppo %s."
@@ -1129,19 +1130,16 @@ 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
-#, fuzzy
 msgid "Only accept AtomPub for Atom feeds."
-msgstr "Solmente acceptar AtomPub pro syndicationes in Atom."
+msgstr "Solmente acceptar AtomPub pro syndicationes Atom."
 
 #: actions/apitimelineuser.php:310
-#, fuzzy
 msgid "Atom post must not be empty."
-msgstr "Message Atom debe esser un entrata Atom."
+msgstr "Le message Atom non pote esser vacue."
 
 #: actions/apitimelineuser.php:315
-#, fuzzy
 msgid "Atom post must be well-formed XML."
-msgstr "Message Atom debe esser un entrata Atom."
+msgstr "Le message Atom debe esser in XML ben formate."
 
 #. TRANS: Client error displayed when not using an Atom entry.
 #: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
@@ -1152,31 +1150,30 @@ msgstr "Message Atom debe esser un entrata Atom."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
-#, fuzzy
+#: actions/apitimelineuser.php:334
 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:343
-#, fuzzy, php-format
+#: actions/apitimelineuser.php:345
+#, php-format
 msgid "Cannot handle activity object type \"%s\"."
-msgstr "Impossibile manear le typo de objecto de activitate \"%s\""
+msgstr "Impossibile manear le typo de objecto de activitate \"%s\"."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
-#, fuzzy, php-format
+#: actions/apitimelineuser.php:378
+#, php-format
 msgid "No content for notice %d."
-msgstr "Cercar in contento de notas"
+msgstr "Nulle contento pro nota %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Un nota con le URI \"%s\" jam existe."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr "Message AtomPub con URI de attention incognite %s"
@@ -1187,46 +1184,40 @@ msgid "API method under construction."
 msgstr "Methodo API in construction."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "Usator non trovate."
 
 #: actions/atompubfavoritefeed.php:70
-#, fuzzy
 msgid "No such profile"
-msgstr "Profilo non existe."
+msgstr "Profilo non existe"
 
 #: actions/atompubfavoritefeed.php:145
 #, php-format
 msgid "Notices %s has favorited to on %s"
-msgstr ""
+msgstr "Notas que %s ha addite al favorites in %s"
 
 #: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-#, fuzzy
 msgid "Can't add someone else's subscription"
-msgstr "Non poteva inserer nove subscription."
+msgstr "Non es possibile adder le subscription de un altere persona."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
 #: actions/atompubfavoritefeed.php:239
-#, fuzzy
 msgid "Can only handle Favorite activities."
-msgstr "Solmente le activitates POST es possibile."
+msgstr "Solmente le activitates Favorite es possibile."
 
 #: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
-#, fuzzy
 msgid "Can only fave notices."
-msgstr "Solmente le activitates POST es possibile."
+msgstr "Solmente notas pote esser addite al favorites."
 
 #: actions/atompubfavoritefeed.php:256
-#, fuzzy
 msgid "Unknown note."
-msgstr "Incognite"
+msgstr "Nota incognite."
 
 #: actions/atompubfavoritefeed.php:263
-#, fuzzy
 msgid "Already a favorite."
-msgstr "Adder al favorites"
+msgstr "Es ja favorite."
 
 #: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
 #: actions/atompubshowmembership.php:73 actions/subscribe.php:107
@@ -1234,106 +1225,96 @@ msgid "No such profile."
 msgstr "Profilo non existe."
 
 #: actions/atompubmembershipfeed.php:144
-#, fuzzy, php-format
+#, php-format
 msgid "%s group memberships"
-msgstr "Membros del gruppo %s"
+msgstr "Membratos del gruppo %s"
 
 #: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %s is a member of on %s"
-msgstr "Gruppos del quales %s es membro"
+msgstr "Gruppos del quales %s es membro in %s"
 
 #: actions/atompubmembershipfeed.php:217
 msgid "Can't add someone else's membership"
-msgstr ""
+msgstr "Non pote 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:241
-#, fuzzy
 msgid "Can only handle Join activities."
-msgstr "Solmente le activitates POST es possibile."
+msgstr "Solmente le activitates \"Join\" es possibile."
 
 #: actions/atompubmembershipfeed.php:256
-#, fuzzy
 msgid "Unknown group."
-msgstr "Incognite"
+msgstr "Gruppo incognite."
 
 #: actions/atompubmembershipfeed.php:263
-#, fuzzy
 msgid "Already a member."
-msgstr "Tote le membros"
+msgstr "Ja membro."
 
 #: actions/atompubmembershipfeed.php:270
 msgid "Blocked by admin."
-msgstr ""
+msgstr "Blocate per un administrator."
 
 #: actions/atompubshowfavorite.php:89
-#, fuzzy
 msgid "No such favorite."
-msgstr "File non existe."
+msgstr "Iste favorite non existe."
 
 #: actions/atompubshowfavorite.php:151
-#, fuzzy
 msgid "Can't delete someone else's favorite"
-msgstr "Non poteva deler le favorite."
+msgstr "Non pote deler le favorite de un altere persona."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
-msgstr "Gruppo non existe."
+msgstr "Gruppo non existe"
 
 #: actions/atompubshowmembership.php:90
-#, fuzzy
 msgid "Not a member"
-msgstr "Tote le membros"
+msgstr "Non es membro"
 
 #: actions/atompubshowmembership.php:115
-#, fuzzy
 msgid "Method not supported"
-msgstr "Methodo HTTP non supportate."
+msgstr "Methodo non supportate"
 
 #: actions/atompubshowmembership.php:150
 msgid "Can't delete someone else's membership"
-msgstr ""
+msgstr "Non pote deler le membrato de un altere persona"
 
 #: actions/atompubshowsubscription.php:72
 #: actions/atompubshowsubscription.php:81
 #: actions/atompubsubscriptionfeed.php:74
-#, fuzzy, php-format
+#, php-format
 msgid "No such profile id: %d"
-msgstr "Profilo non existe."
+msgstr "Iste ID de profilo non existe: %d"
 
 #: actions/atompubshowsubscription.php:90
-#, fuzzy, php-format
+#, php-format
 msgid "Profile %d not subscribed to profile %d"
-msgstr "Tu non es subscribite a iste profilo."
+msgstr "Le profilo %d non es subscribite al profilo %d"
 
 #: actions/atompubshowsubscription.php:154
-#, fuzzy
 msgid "Can't delete someone else's subscription"
-msgstr "Non poteva deler auto-subscription."
+msgstr "Non pote deler le subscription de un altere persona"
 
 #: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
+#, php-format
 msgid "People %s has subscribed to on %s"
-msgstr "Personas qui seque %s"
+msgstr "Personas al quales %s ha subscribite in %s"
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
 #: actions/atompubsubscriptionfeed.php:246
-#, fuzzy
 msgid "Can only handle Follow activities."
-msgstr "Solmente le activitates POST es possibile."
+msgstr "Solmente le activitates \"Follow\" es possibile."
 
 #: actions/atompubsubscriptionfeed.php:253
 msgid "Can only follow people."
-msgstr ""
+msgstr "Pote solmente sequer personas."
 
 #: actions/atompubsubscriptionfeed.php:262
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown profile %s"
-msgstr "Typo de file incognite"
+msgstr "Profilo incognite: %s"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
@@ -1406,13 +1387,13 @@ msgid "Preview"
 msgstr "Previsualisation"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Deler"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Incargar"
@@ -1453,6 +1434,38 @@ msgstr "Actualisation del avatar fallite."
 msgid "Avatar deleted."
 msgstr "Avatar delite."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "Solmente usatores authenticate pote repeter notas."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Fundo"
+
+#: actions/backupaccount.php:258
+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."
@@ -1658,6 +1671,60 @@ msgstr "Conversation"
 msgid "Notices"
 msgstr "Notas"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "Solmente usatores authenticate pote repeter notas."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "Tu non pote deler usatores."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Avatar delite."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Crear un conto"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Confirmar"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1806,7 +1873,7 @@ 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:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Deler iste nota"
 
@@ -2112,7 +2179,7 @@ msgstr "Usa iste formulario pro modificar le gruppo."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Alias invalide: \"%s\""
@@ -2124,7 +2191,7 @@ 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:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "Non poteva crear aliases."
 
@@ -2224,6 +2291,8 @@ msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
 msgstr ""
+"Pro inviar notas via e-mail, es necessari crear te un adresse de e-mail unic "
+"in iste servitor:"
 
 #. 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.
@@ -3358,8 +3427,14 @@ msgstr "Non poteva crear application."
 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
+#, fuzzy
+msgid "You are not allowed to create groups on this site."
+msgstr "Tu non ha le permission de deler iste gruppo."
+
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Usa iste formulario pro crear un nove gruppo."
 
@@ -3682,11 +3757,6 @@ msgstr "Nove contrasigno"
 msgid "6 or more characters"
 msgstr "6 o plus characteres"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Confirmar"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Identic al contrasigno hic supra"
@@ -4202,6 +4272,11 @@ msgstr "Non poteva salveguardar etiquettas."
 msgid "Settings saved."
 msgstr "Preferentias confirmate."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Crear un conto"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4665,7 +4740,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:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Repetite"
 
@@ -4731,6 +4806,92 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Responsas a %1$s in %2$s!"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "Solmente usatores authenticate pote repeter notas."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "Tu non ha ancora registrate alcun application."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, fuzzy
+msgid "No uploaded file."
+msgstr "Incargar file"
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: actions/restoreaccount.php:130 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:136 lib/mediafile.php:200
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"Le file incargate excede le directiva MAX_FILE_SIZE specificate in le "
+"formulario HTML."
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "Error de systema durante le incargamento del file."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr "Obtene copia de reserva ex file '%s'."
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Non es membro"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, fuzzy
+msgid "Upload the file"
+msgstr "Incargar 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."
@@ -4831,7 +4992,7 @@ msgid "Reset key & secret"
 msgstr "Reinitialisar clave e secreto"
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Deler"
 
@@ -5691,9 +5852,9 @@ msgid "%s is not listening to anyone."
 msgstr "%s non seque alcuno."
 
 #: actions/subscriptions.php:178
-#, fuzzy, php-format
+#, php-format
 msgid "Subscription feed for %s (Atom)"
-msgstr "Syndication de notas pro %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:242
@@ -6110,13 +6271,13 @@ msgid "Author(s)"
 msgstr "Autor(es)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: 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."
@@ -6227,7 +6388,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr "Nulle nomine de base de datos o DSN trovate."
 
@@ -6254,23 +6415,23 @@ 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:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -6278,7 +6439,7 @@ 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:288
+#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -6287,42 +6448,42 @@ msgstr ""
 "novo post alcun minutas."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 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:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6330,14 +6491,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6409,32 +6570,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "Benvenite a %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 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
+#: classes/User.php:922
 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:511
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "Non poteva crear gruppo."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 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:544
+#: classes/User_group.php:549
 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:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "Non poteva salveguardar le informationes del gruppo local."
 
@@ -6772,10 +6933,19 @@ msgstr ""
 "Expectava le elemento-radice de un syndication, ma recipeva un documento XML "
 "integre."
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Photo"
+msgid "Unknown profile."
+msgstr "Profilo incognite: %s"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7067,6 +7237,10 @@ msgstr "Revocar"
 msgid "author element must contain a name element."
 msgstr "Le elemento \"author\" debe continer un elemento \"name\"."
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7495,24 +7669,24 @@ msgstr ""
 "tracking - non ancora implementate.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 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:150
+#: lib/common.php:153
 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "Ir al installator."
 
@@ -7614,6 +7788,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "Amico de un amico"
 
+#: 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"
@@ -7796,11 +7978,6 @@ msgstr "Iste file es troppo grande. Le dimension maximal es %s."
 msgid "Partial upload."
 msgstr "Incargamento partial."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "Error de systema durante le incargamento del file."
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "Le file non es un imagine o es defectuose."
@@ -8220,7 +8397,7 @@ msgstr ""
 "altere usatores in conversation. Altere personas pote inviar te messages que "
 "solmente tu pote leger."
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "via"
 
@@ -8252,40 +8429,6 @@ msgstr ""
 "Un error de base de datos occurreva durante le salveguarda de tu file. Per "
 "favor reproba."
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: 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.
-#: lib/mediafile.php:200
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
-msgstr ""
-"Le file incargate excede le directiva MAX_FILE_SIZE specificate in le "
-"formulario HTML."
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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 would cause a user to exceed a set quota.
 #: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
@@ -8306,7 +8449,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8317,7 +8460,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: 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."
@@ -8350,17 +8493,17 @@ msgid "Send"
 msgstr "Inviar"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8401,55 +8544,55 @@ msgstr ""
 "previste. Per favor reproba plus tarde."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "W"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, 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:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "in"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "in contexto"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "Repetite per"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "Responder a iste nota"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Nota repetite"
 
@@ -8603,7 +8746,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:957
+#: lib/router.php:974
 msgid "Page not found."
 msgstr "Pagina non trovate."
 
@@ -8957,21 +9100,13 @@ msgstr "XML invalide."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr "Obtene copia de reserva ex file '%s'."
+#~ msgid "Post"
+#~ msgstr "Publicar"
 
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
-msgid "No user specified; using backup user."
-msgstr "Nulle usator specificate; le usator de reserva es usate."
+#~ msgid "No user specified; using backup user."
+#~ msgstr "Nulle usator specificate; le usator de reserva es usate."
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] "%d entrata in copia de reserva."
-msgstr[1] "%d entratas in copia de reserva."
+#~ msgid "%d entry in backup."
+#~ msgid_plural "%d entries in backup."
+#~ msgstr[0] "%d entrata in copia de reserva."
+#~ msgstr[1] "%d entratas in copia de reserva."
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index b1b012969b..a515033bb2 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:10:57+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:10+0000\n"
 "Language-Team: Icelandic <http://translatewiki.net/wiki/Portal:is>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: is\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -278,7 +278,7 @@ msgstr "Færslur frá %1$s og vinum á %2$s!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -325,7 +325,8 @@ msgstr "Gat ekki uppfært notanda."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -566,7 +567,7 @@ msgstr "Gat ekki uppfært notanda."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
@@ -576,7 +577,7 @@ msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ekki tækt stuttnefni."
@@ -588,7 +589,7 @@ msgstr "Ekki tækt stuttnefni."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Heimasíða er ekki gild vefslóð."
@@ -598,7 +599,7 @@ msgstr "Heimasíða er ekki gild vefslóð."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -614,7 +615,7 @@ msgstr "Fullt nafn er of langt (í mesta lagi 255 stafir)."
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -626,7 +627,7 @@ msgstr[1] "Staðsetning er of löng (í mesta lagi %d stafir)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -639,7 +640,7 @@ msgstr "Staðsetning er of löng (í mesta lagi 255 stafir)."
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -658,7 +659,7 @@ msgstr "Ógilt merki: \"%s\""
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, fuzzy, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
@@ -667,7 +668,7 @@ msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -1071,7 +1072,7 @@ msgstr "%1$s færslur sem svara færslum frá %2$s / %3$s."
 
 #. TRANS: Server error displayed when generating an Atom feed fails.
 #. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:138
+#: actions/apitimelinegroup.php:134
 #, fuzzy, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Gat ekki uppfært hóp."
@@ -1164,30 +1165,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Finna innihald babls"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Enginn persónuleg síða með þessu einkenni."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1198,7 +1199,7 @@ msgid "API method under construction."
 msgstr "Aðferð í forritsskilum er í þróun."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "Aðferð í forritsskilum fannst ekki!"
 
@@ -1289,7 +1290,6 @@ msgid "Can't delete someone else's favorite"
 msgstr "Gat ekki eytt uppáhaldi."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
 msgstr "Enginn þannig hópur."
 
@@ -1415,14 +1415,14 @@ msgid "Preview"
 msgstr "Forsýn"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Eyða"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
@@ -1468,6 +1468,37 @@ msgstr "Mistókst að uppfæra mynd"
 msgid "Avatar deleted."
 msgstr "Mynd hefur verið uppfærð."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "Aðeins notandinn getur lesið hans eigin pósthólf."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr ""
+
+#: actions/backupaccount.php:258
+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."
@@ -1678,6 +1709,60 @@ msgstr "Staðfestingarlykill"
 msgid "Notices"
 msgstr "Babl"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "Aðeins notandinn getur lesið hans eigin pósthólf."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "Gat ekki uppfært notanda."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Mynd hefur verið uppfærð."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Búa til nýjan hóp"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Staðfesta"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1828,7 +1913,7 @@ msgid "Do not delete this notice"
 msgstr "Get ekki eytt þessu babli."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Eyða þessu babli"
 
@@ -2154,7 +2239,7 @@ msgstr "Notaðu þetta eyðublað til að breyta hópnum."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, fuzzy, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Ógilt merki: \"%s\""
@@ -2166,7 +2251,7 @@ msgstr "Gat ekki uppfært hóp."
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 #, fuzzy
 msgid "Could not create aliases."
 msgstr "Gat ekki búið til uppáhald."
@@ -3425,8 +3510,14 @@ msgstr "Gat ekki búið til uppáhald."
 msgid "New group"
 msgstr "Nýr hópur"
 
+#. 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 "Þú ert ekki meðlimur í þessum hópi."
+
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Notaðu þetta eyðublað til að búa til nýjan hóp."
 
@@ -3753,11 +3844,6 @@ msgstr "Nýtt lykilorð"
 msgid "6 or more characters"
 msgstr "6 eða fleiri tákn"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Staðfesta"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Sama og lykilorðið hér fyrir ofan"
@@ -4299,6 +4385,11 @@ msgstr "Gat ekki vistað merki."
 msgid "Settings saved."
 msgstr "Stillingar vistaðar."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Búa til nýjan hóp"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4761,7 +4852,7 @@ msgstr "Þú getur ekki nýskráð þig nema þú samþykkir leyfið."
 msgid "You already repeated that notice."
 msgstr "Þú hefur nú þegar lokað á þennan notanda."
 
-#: actions/repeat.php:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 #, fuzzy
 msgid "Repeated"
 msgstr "Í sviðsljósinu"
@@ -4822,6 +4913,90 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Skilaboð til %1$s á %2$s"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "Aðeins notandinn getur lesið hans eigin pósthólf."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "Þú getur ekki nýskráð þig nema þú samþykkir leyfið."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, fuzzy
+msgid "No uploaded file."
+msgstr "Hlaða upp"
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: actions/restoreaccount.php:130 lib/mediafile.php:194
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:136 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:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "Kerfisvilla kom upp við upphal skráar."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Allir meðlimir"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, fuzzy
+msgid "Upload the file"
+msgstr "Hlaða upp"
+
 #: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "Það hefur verið lagt bann við babli frá þér á þessari síðu."
@@ -4930,7 +5105,7 @@ msgid "Reset key & secret"
 msgstr ""
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Eyða"
 
@@ -6187,13 +6362,13 @@ msgid "Author(s)"
 msgstr ""
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 msgid "Favor"
 msgstr "Uppáhald"
 
 #. 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:154
+#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "Senda mér tölvupóst þegar einhver setur babl í mér í uppáhald hjá sér."
@@ -6305,7 +6480,7 @@ msgid "Could not create login token for %s"
 msgstr "Gat ekki búið til uppáhald."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6333,24 +6508,24 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:193
+#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Villa kom upp við að setja inn mynd"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:270
+#: classes/Notice.php:279
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "Vandamál komu upp við að vista babl."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:275
+#: classes/Notice.php:284
 msgid "Problem saving notice. Unknown user."
 msgstr "Gat ekki vistað babl. Óþekktur notandi."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:281
+#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -6358,7 +6533,7 @@ msgstr ""
 "mínútur."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:288
+#: classes/Notice.php:297
 #, fuzzy
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
@@ -6368,43 +6543,43 @@ msgstr ""
 "mínútur."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:296
+#: classes/Notice.php:305
 msgid "You are banned from posting notices on this site."
 msgstr "Það hefur verið lagt bann við babli frá þér á þessari síðu."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:363 classes/Notice.php:390
+#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Vandamál komu upp við að vista babl."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:913
+#: classes/Notice.php:914
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1012
+#: classes/Notice.php:1013
 #, fuzzy
 msgid "Problem saving group inbox."
 msgstr "Vandamál komu upp við að vista babl."
 
 #. 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:1126
+#: classes/Notice.php:1127
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Gat ekki vistað áskrift."
 
 #. 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6412,14 +6587,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6493,32 +6668,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "Skilaboð til %1$s á %2$s"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "Gat ekki búið til hóp."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 msgid "Could not set group URI."
 msgstr "Gat ekki búið til hóp."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:549
 msgid "Could not set group membership."
 msgstr "Gat ekki skráð hópmeðlimi."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:559
+#: classes/User_group.php:564
 #, fuzzy
 msgid "Could not save local group info."
 msgstr "Gat ekki vistað áskrift."
@@ -6869,10 +7044,19 @@ msgstr "Áður"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Ljósmynd"
+msgid "Unknown profile."
+msgstr "Óþekkt skráargerð"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7177,6 +7361,10 @@ msgstr "Endurheimta"
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7577,26 +7765,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Enginn staðfestingarlykill."
 
 #. 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:150
+#: lib/common.php:153
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Boðskort sent á eftirfarandi aðila:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Skrá þig inn á síðuna"
@@ -7703,6 +7891,14 @@ msgstr ""
 msgid "FOAF"
 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"
@@ -7886,11 +8082,6 @@ msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
 msgid "Partial upload."
 msgstr "Upphal að hluta til."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "Kerfisvilla kom upp við upphal skráar."
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "Annaðhvort ekki mynd eða þá að skráin er gölluð."
@@ -8215,7 +8406,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 #, fuzzy
 msgid "from"
 msgstr "frá"
@@ -8246,38 +8437,6 @@ msgstr "Skráarsnið myndar ekki stutt."
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: lib/mediafile.php:194
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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.
-#: lib/mediafile.php:222
-msgid "File upload stopped by extension."
-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."
@@ -8299,7 +8458,7 @@ msgstr "Gat ekki eytt uppáhaldi."
 #. 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8308,7 +8467,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
@@ -8344,17 +8503,17 @@ msgid "Send"
 msgstr "Senda"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Stuttnefni geta bara verið lágstafir og tölustafir en engin bil."
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:176
+#: 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:189
+#: 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."
@@ -8395,58 +8554,58 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 #, fuzzy
 msgid "N"
 msgstr "Nei"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr ""
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 #, fuzzy
 msgid "in context"
 msgstr "Ekkert innihald!"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 #, fuzzy
 msgid "Repeated by"
 msgstr "Í sviðsljósinu"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "Svara þessu babli"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Svara"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 #, fuzzy
 msgid "Notice repeated"
 msgstr "Babl sent inn"
@@ -8606,7 +8765,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:957
+#: lib/router.php:974
 #, fuzzy
 msgid "Page not found."
 msgstr "Aðferð í forritsskilum fannst ekki!"
@@ -8968,22 +9127,10 @@ msgstr "Ótæk stærð."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
 #, fuzzy
-msgid "No user specified; using backup user."
-msgstr "Engin persónuleg síða tilgreind"
+#~ msgid "Post"
+#~ msgstr "Ljósmynd"
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+#~ msgid "No user specified; using backup user."
+#~ msgstr "Engin persónuleg síða tilgreind"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 4c394f8a1e..8a0cf86c65 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:10:59+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:11+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 (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: it\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -279,7 +279,7 @@ msgstr "Messaggi da %1$s e amici su %2$s!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -326,7 +326,8 @@ msgstr "Impossibile aggiornare l'utente."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -560,7 +561,7 @@ msgstr "Impossibile trovare l'utente destinazione."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Soprannome già in uso. Prova con un altro."
@@ -570,7 +571,7 @@ msgstr "Soprannome già in uso. Prova con un altro."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Non è un soprannome valido."
@@ -582,7 +583,7 @@ msgstr "Non è un soprannome valido."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "L'indirizzo della pagina web non è valido."
@@ -592,7 +593,7 @@ 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:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -608,7 +609,7 @@ msgstr "Nome troppo lungo (max 255 caratteri)."
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -620,7 +621,7 @@ 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:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -633,7 +634,7 @@ msgstr "Ubicazione troppo lunga (max 255 caratteri)."
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -652,7 +653,7 @@ msgstr "Alias non valido: \"%s\"."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "L'alias \"%s\" è già in uso. Prova con un altro."
@@ -661,7 +662,7 @@ msgstr "L'alias \"%s\" è già in uso. Prova con un altro."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "L'alias non può essere lo stesso del soprannome."
 
@@ -1068,7 +1069,7 @@ 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:138
+#: actions/apitimelinegroup.php:134
 #, fuzzy, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Impossibile aggiornare il gruppo."
@@ -1161,30 +1162,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, 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:404
+#: actions/apitimelineuser.php:406
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Un messaggio con quel ID non esiste."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1195,7 +1196,7 @@ 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/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "Metodo delle API non trovato."
 
@@ -1285,9 +1286,8 @@ msgid "Can't delete someone else's favorite"
 msgstr "Impossibile eliminare un preferito."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
-msgstr "Nessuna gruppo."
+msgstr "Nessun gruppo"
 
 #: actions/atompubshowmembership.php:90
 #, fuzzy
@@ -1411,14 +1411,14 @@ msgid "Preview"
 msgstr "Anteprima"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Elimina"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
@@ -1461,6 +1461,38 @@ msgstr "Aggiornamento dell'immagine non riuscito."
 msgid "Avatar deleted."
 msgstr "Immagine eliminata."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "Solo gli utenti collegati possono ripetere i messaggi."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Sfondo"
+
+#: actions/backupaccount.php:258
+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."
@@ -1668,6 +1700,60 @@ msgstr "Conversazione"
 msgid "Notices"
 msgstr "Messaggi"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "Solo gli utenti collegati possono ripetere i messaggi."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "Non puoi eliminare utenti."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Immagine eliminata."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Crea un account"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Conferma"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1820,7 +1906,7 @@ 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:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Elimina questo messaggio"
 
@@ -2128,7 +2214,7 @@ msgstr "Usa questo modulo per modificare il gruppo."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Alias non valido: \"%s\""
@@ -2140,7 +2226,7 @@ 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:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "Impossibile creare gli alias."
 
@@ -3382,8 +3468,14 @@ msgstr "Impossibile creare l'applicazione."
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Usa questo modulo per creare un nuovo gruppo."
 
@@ -3704,11 +3796,6 @@ msgstr "Nuova password"
 msgid "6 or more characters"
 msgstr "6 o più caratteri"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Conferma"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Stessa password di sopra"
@@ -4246,6 +4333,11 @@ msgstr "Impossibile salvare le etichette."
 msgid "Settings saved."
 msgstr "Impostazioni salvate."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Crea un account"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4710,7 +4802,7 @@ msgstr "Non puoi ripetere i tuoi stessi messaggi."
 msgid "You already repeated that notice."
 msgstr "Hai già ripetuto quel messaggio."
 
-#: actions/repeat.php:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Ripetuti"
 
@@ -4774,6 +4866,92 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Risposte a %1$s su %2$s!"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "Solo gli utenti collegati possono ripetere i messaggi."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "Non hai ancora registrato alcuna applicazione."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, 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:130 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:136 lib/mediafile.php:200
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"Il file caricato eccede la direttiva MAX_FILE_SIZE specificata nel modulo "
+"HTML."
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "Errore di sistema nel caricare il file."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Tutti i membri"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, 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."
@@ -4874,7 +5052,7 @@ msgid "Reset key & secret"
 msgstr "Reimposta chiave e segreto"
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Elimina"
 
@@ -6157,13 +6335,13 @@ msgid "Author(s)"
 msgstr "Autori"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: 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"
@@ -6278,7 +6456,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr "Non è stato trovato un nome di database o DNS."
 
@@ -6305,23 +6483,23 @@ 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:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -6329,7 +6507,7 @@ 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:288
+#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -6338,43 +6516,43 @@ msgstr ""
 "nuovo tra qualche minuto."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 #, 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:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6382,7 +6560,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:798
+#: classes/Profile.php:765
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -6390,7 +6568,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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6462,32 +6640,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "Benvenuti su %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 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
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "Impossibile creare il gruppo."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 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:544
+#: classes/User_group.php:549
 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:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "Impossibile salvare le informazioni del gruppo locale."
 
@@ -6827,10 +7005,19 @@ msgstr "Precedenti"
 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."
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Fotografia"
+msgid "Unknown profile."
+msgstr "Tipo di file sconosciuto"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7120,6 +7307,10 @@ msgstr "Revoca"
 msgid "author element must contain a name element."
 msgstr "L'elemento author deve contenere un elemento name."
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7553,20 +7744,20 @@ msgstr ""
 "tracking - non ancora implementato\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 #, 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:150
+#: lib/common.php:153
 #, 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:153
+#: lib/common.php:156
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 "Potrebbe essere necessario lanciare il programma d'installazione per "
@@ -7574,7 +7765,7 @@ 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "Vai al programma d'installazione."
 
@@ -7682,6 +7873,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: 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"
@@ -7865,11 +8064,6 @@ msgstr "Quel file è troppo grande. La dimensione massima è %s."
 msgid "Partial upload."
 msgstr "Caricamento parziale."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "Errore di sistema nel caricare il file."
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "Non è un'immagine o il file è danneggiato."
@@ -8292,7 +8486,7 @@ msgstr ""
 "iniziare una conversazione con altri utenti. Altre persone possono mandare "
 "messaggi riservati solamente a te."
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "via"
 
@@ -8323,40 +8517,6 @@ 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 an uploaded file is larger than set in php.ini.
-#: 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.
-#: lib/mediafile.php:200
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
-msgstr ""
-"Il file caricato eccede la direttiva MAX_FILE_SIZE specificata nel modulo "
-"HTML."
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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 would cause a user to exceed a set quota.
 #: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
@@ -8377,7 +8537,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8388,7 +8548,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: 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."
@@ -8423,19 +8583,19 @@ msgid "Send"
 msgstr "Invia"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8476,55 +8636,55 @@ msgstr ""
 "previsto. Riprova più tardi."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "O"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, 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:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "presso"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "in una discussione"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "Ripetuto da"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "Rispondi a questo messaggio"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Rispondi"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Messaggio ripetuto"
 
@@ -8678,7 +8838,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:957
+#: lib/router.php:974
 #, fuzzy
 msgid "Page not found."
 msgstr "Metodo delle API non trovato."
@@ -9032,21 +9192,15 @@ msgstr "Dimensione non valida."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
+#, fuzzy
+#~ msgid "Post"
+#~ msgstr "Fotografia"
 
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
-msgid "No user specified; using backup user."
-msgstr "Nessun utente specificato: viene usato l'utente di backup."
+#~ msgid "No user specified; using backup user."
+#~ msgstr "Nessun utente specificato: viene usato l'utente di backup."
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, fuzzy, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] "%d voci nel backup."
-msgstr[1] "%d voci nel backup."
+#, fuzzy
+#~ msgid "%d entry in backup."
+#~ msgid_plural "%d entries in backup."
+#~ msgstr[0] "%d voci nel backup."
+#~ msgstr[1] "%d voci nel backup."
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 2ebba88b18..5542058183 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:00+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -45,18 +45,19 @@ msgstr "登録"
 #. TRANS: Checkbox instructions for admin setting "Private".
 #: actions/accessadminpanel.php:155
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr "匿名ユーザー(ログインしていません)がサイトを見るのを禁止しますか?"
+msgstr ""
+"匿名ユーザー（ログインしていないユーザー）がサイトを見るのを禁止しますか？"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
 #: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
-msgstr "プライバシー"
+msgstr "プライベート"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
 #: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
-msgstr "招待のみ登録する"
+msgstr "招待のみ登録させる。"
 
 #. TRANS: Checkbox label for configuring site as invite only.
 #: actions/accessadminpanel.php:166
@@ -97,7 +98,6 @@ msgstr "アクセス設定の保存"
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "保存"
@@ -107,7 +107,7 @@ msgstr "保存"
 #: actions/all.php:68 actions/public.php:98 actions/replies.php:93
 #: actions/showfavorites.php:138 actions/tag.php:52
 msgid "No such page."
-msgstr "そのようなタグはありません。"
+msgstr "そのようなページはありません。"
 
 #. TRANS: Client error when user not found for an action.
 #. TRANS: Client error when user not found for an rss related action.
@@ -160,7 +160,7 @@ msgstr "そのようなユーザはいません。"
 #: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
-msgstr "%1$s と友人、ページ %2$d"
+msgstr "%1$sとその友人、%2$dページ目"
 
 #. TRANS: Page title. %s is user nickname
 #. TRANS: H1 text for page. %s is a user nickname.
@@ -171,32 +171,32 @@ msgstr "%1$s と友人、ページ %2$d"
 #: lib/personalgroupnav.php:103
 #, php-format
 msgid "%s and friends"
-msgstr "%s と友人"
+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)"
+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)"
+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)"
+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."
-msgstr "これは %s と友人のタイムラインです。まだ誰も投稿していません。"
+msgstr "これは%sとその友人のタイムラインですが、まだ誰も投稿していません。"
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
@@ -281,7 +281,7 @@ msgstr "%2$s に %1$s と友人からの更新があります！"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -329,7 +329,8 @@ msgstr "ユーザを更新できませんでした。"
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -559,7 +560,7 @@ msgstr "ターゲットユーザーを見つけられません。"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "そのニックネームは既に使用されています。他のものを試してみて下さい。"
@@ -569,7 +570,7 @@ msgstr "そのニックネームは既に使用されています。他のもの
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "有効なニックネームではありません。"
@@ -581,7 +582,7 @@ msgstr "有効なニックネームではありません。"
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "ホームページのURLが不適切です。"
@@ -591,7 +592,7 @@ msgstr "ホームページのURLが不適切です。"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -607,7 +608,7 @@ msgstr "フルネームが長すぎます。（255字まで）"
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -618,7 +619,7 @@ msgstr[0] "記述が長すぎます。（最長%d字）"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -631,7 +632,7 @@ msgstr "場所が長すぎます。（255字まで）"
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -649,7 +650,7 @@ msgstr "不正な別名: \"%s\""
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "別名 \"%s\" は既に使用されています。他のものを試してみて下さい。"
@@ -658,7 +659,7 @@ msgstr "別名 \"%s\" は既に使用されています。他のものを試し
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "別名はニックネームと同じではいけません。"
 
@@ -1056,7 +1057,7 @@ 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:138
+#: actions/apitimelinegroup.php:134
 #, fuzzy, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "グループを更新できません。"
@@ -1149,30 +1150,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "つぶやきの内容を探す"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "その ID によるつぶやきは存在していません"
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1183,7 +1184,7 @@ msgid "API method under construction."
 msgstr "API メソッドが工事中です。"
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 #, fuzzy
 msgid "User not found."
 msgstr "API メソッドが見つかりません。"
@@ -1275,7 +1276,6 @@ msgid "Can't delete someone else's favorite"
 msgstr "お気に入りを取り消すことができません。"
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
 msgstr "そのようなグループはありません。"
 
@@ -1400,14 +1400,14 @@ msgid "Preview"
 msgstr "プレビュー"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "削除"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
@@ -1451,6 +1451,38 @@ msgstr "アバターの更新に失敗しました。"
 msgid "Avatar deleted."
 msgstr "アバターが削除されました。"
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "ログインユーザだけがつぶやきを繰り返せます。"
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "バックグラウンド"
+
+#: actions/backupaccount.php:258
+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."
@@ -1659,6 +1691,60 @@ msgstr "会話"
 msgid "Notices"
 msgstr "つぶやき"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "ログインユーザだけがつぶやきを繰り返せます。"
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "ユーザを削除できません"
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "アバターが削除されました。"
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "新しいグループを作成"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "パスワード確認"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1813,7 +1899,7 @@ msgid "Do not delete this notice"
 msgstr "このつぶやきを削除できません。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "このつぶやきを削除"
 
@@ -2122,7 +2208,7 @@ msgstr "このフォームを使ってグループを編集します。"
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "不正な別名: \"%s\""
@@ -2134,7 +2220,7 @@ msgstr "グループを更新できません。"
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "別名を作成できません。"
 
@@ -3377,8 +3463,14 @@ msgstr "アプリケーションを作成できません。"
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "このフォームを使って新しいグループを作成します。"
 
@@ -3700,11 +3792,6 @@ msgstr "新しいパスワード"
 msgid "6 or more characters"
 msgstr "6文字以上"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "パスワード確認"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "上と同じパスワード"
@@ -4237,6 +4324,11 @@ msgstr "タグを保存できません。"
 msgid "Settings saved."
 msgstr "設定が保存されました。"
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "新しいグループを作成"
+
 #: actions/public.php:83
 #, fuzzy, php-format
 msgid "Beyond the page limit (%s)."
@@ -4699,7 +4791,7 @@ msgstr "自分のつぶやきは繰り返せません。"
 msgid "You already repeated that notice."
 msgstr "すでにそのつぶやきを繰り返しています。"
 
-#: actions/repeat.php:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "繰り返された"
 
@@ -4763,6 +4855,94 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "%2$s 上の %1$s への返信!"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "ログインユーザだけがつぶやきを繰り返せます。"
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "あなたはまだなんのアプリケーションも登録していません。"
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, fuzzy
+msgid "No uploaded file."
+msgstr "ファイルアップロード"
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: actions/restoreaccount.php:130 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:136 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:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "ファイルのアップロードでシステムエラー"
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "全てのメンバー"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, fuzzy
+msgid "Upload the file"
+msgstr "ファイルアップロード"
+
 #: actions/revokerole.php:75
 #, fuzzy
 msgid "You cannot revoke user roles on this site."
@@ -4865,7 +5045,7 @@ msgid "Reset key & secret"
 msgstr "key と secret のリセット"
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "削除"
 
@@ -6152,13 +6332,13 @@ msgid "Author(s)"
 msgstr "作者"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%s (@%s) はお気に入りとしてあなたのつぶやきを加えました"
@@ -6269,7 +6449,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6296,30 +6476,30 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: 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:288
+#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -6328,42 +6508,42 @@ msgstr ""
 "い。"
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6371,14 +6551,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6449,32 +6629,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "ようこそ %1$s、@%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 msgid "No single user defined for single-user mode."
 msgstr "single-user　モードのためのシングルユーザが定義されていません。"
 
 #. TRANS: Server exception.
-#: classes/User.php:927
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "グループを作成できません。"
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 msgid "Could not set group URI."
 msgstr "グループを作成できません。"
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:549
 msgid "Could not set group membership."
 msgstr "グループメンバーシップをセットできません。"
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:559
+#: classes/User_group.php:564
 #, fuzzy
 msgid "Could not save local group info."
 msgstr "フォローを保存できません。"
@@ -6819,10 +6999,19 @@ msgstr "前>>"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "写真"
+msgid "Unknown profile."
+msgstr "不明なファイルタイプ"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7118,6 +7307,10 @@ msgstr "回復"
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7508,20 +7701,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 #, 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:150
+#: lib/common.php:153
 #, 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:153
+#: lib/common.php:156
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 "あなたは、これを修理するためにインストーラを動かしたがっているかもしれませ"
@@ -7529,7 +7722,7 @@ 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "インストーラへ。"
 
@@ -7637,6 +7830,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: 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"
@@ -7816,11 +8017,6 @@ msgstr "ファイルが大きすぎます。最大ファイルサイズは %s 
 msgid "Partial upload."
 msgstr "不完全なアップロード。"
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "ファイルのアップロードでシステムエラー"
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "画像ではないかファイルが破損しています。"
@@ -8209,7 +8405,7 @@ msgstr ""
 "に引き込むプライベートメッセージを送ることができます。人々はあなただけへの"
 "メッセージを送ることができます。"
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "from"
 
@@ -8241,42 +8437,6 @@ msgstr ""
 "データベースエラーがあなたのファイルを保存しているときにありました。 再試行し"
 "てください。"
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: 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.
-#: 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.
-#: 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.
-#: 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.
-#: 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.
-#: lib/mediafile.php:222
-msgid "File upload stopped by extension."
-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."
@@ -8297,7 +8457,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8306,7 +8466,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
@@ -8342,19 +8502,19 @@ msgid "Send"
 msgstr "投稿"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8394,59 +8554,59 @@ msgstr ""
 "度試みてください"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 #, fuzzy
 msgid "N"
 msgstr "北"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 #, fuzzy
 msgid "S"
 msgstr "南"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 #, fuzzy
 msgid "E"
 msgstr "東"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 #, fuzzy
 msgid "W"
 msgstr "西"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "at"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr ""
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr ""
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "このつぶやきへ返信"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "返信"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "つぶやきを繰り返しました"
 
@@ -8600,7 +8760,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:957
+#: lib/router.php:974
 #, fuzzy
 msgid "Page not found."
 msgstr "API メソッドが見つかりません。"
@@ -8947,21 +9107,10 @@ msgstr "不正なサイズ。"
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
 #, fuzzy
-msgid "No user specified; using backup user."
-msgstr "ユーザIDの記述がありません。"
+#~ msgid "Post"
+#~ msgstr "写真"
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
+#, fuzzy
+#~ msgid "No user specified; using backup user."
+#~ msgstr "ユーザIDの記述がありません。"
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
index adbb1df2a1..579f5d1475 100644
--- a/locale/ka/LC_MESSAGES/statusnet.po
+++ b/locale/ka/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:01+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:13+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 (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ka\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -275,7 +275,7 @@ msgstr " %1$s და მეგობრების განახლებე
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -322,7 +322,8 @@ msgstr "მომხმარებლის განახლება ვე
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -550,7 +551,7 @@ msgstr "სასურველი მომხმარებელი ვე
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "მეტსახელი უკვე გამოყენებულია. სცადე სხვა."
@@ -560,7 +561,7 @@ msgstr "მეტსახელი უკვე გამოყენებუ
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "მეტსახელი არასწორია."
@@ -572,7 +573,7 @@ msgstr "მეტსახელი არასწორია."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "სასტარტო გვერდი არასწორი URL-ია."
@@ -582,7 +583,7 @@ msgstr "სასტარტო გვერდი არასწორი URL
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -598,7 +599,7 @@ msgstr "სრული სახელი ძალიან გრძელი
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -609,7 +610,7 @@ msgstr[0] "აღწერა ძალიან გრძელია (არ
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -622,7 +623,7 @@ msgstr "ადგილმდებარეობა ძალიან გრ
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -640,7 +641,7 @@ msgstr ""
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr ""
@@ -649,7 +650,7 @@ msgstr ""
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -1044,7 +1045,7 @@ msgstr "განახლებები არჩეული %1$s-ს მი
 
 #. TRANS: Server error displayed when generating an Atom feed fails.
 #. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:138
+#: actions/apitimelinegroup.php:134
 #, fuzzy, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "ჯგუფის განახლება ვერ მოხერხდა."
@@ -1137,30 +1138,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "მოძებნე შეტყობინებებში"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "შეტყობინებები ამ ID-თ არ არსებობს."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1171,7 +1172,7 @@ msgid "API method under construction."
 msgstr "API მეთოდი დამუშავების პროცესშია."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 #, fuzzy
 msgid "User not found."
 msgstr "API მეთოდი ვერ მოიძებნა."
@@ -1386,14 +1387,14 @@ msgid "Preview"
 msgstr "წინასწარი გადახედვა"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "წაშლა"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
@@ -1436,6 +1437,38 @@ msgstr "ავატარის განახლება ვერ მოხ
 msgid "Avatar deleted."
 msgstr "ავატარი წაიშალა."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "მხოლოდ ავტორიზირებულ მომხმარებლებს შეუძლიათ შეტყობინებების გამეორება."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "ფონი"
+
+#: actions/backupaccount.php:258
+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."
@@ -1640,6 +1673,60 @@ msgstr "საუბარი"
 msgid "Notices"
 msgstr "შეტყობინებები"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "მხოლოდ ავტორიზირებულ მომხმარებლებს შეუძლიათ შეტყობინებების გამეორება."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "თქვენ ვერ შეძლებთ მომხმარებლების წაშლას."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "ავატარი წაიშალა."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "გახსენი ანგარიში"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "ვადასტურებ"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1790,7 +1877,7 @@ msgid "Do not delete this notice"
 msgstr "არ წაშალო ეს შეტყობინება"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "შეტყობინების წაშლა"
 
@@ -2099,7 +2186,7 @@ msgstr "ჯგუფის რედაქტირებისათვის 
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr ""
@@ -2111,7 +2198,7 @@ msgstr "ჯგუფის განახლება ვერ მოხერ
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr ""
 
@@ -3343,8 +3430,14 @@ msgstr "აპლიკაციის შექმნა ვერ მოხე
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "ახალი ჯგუფის შესაქმნელად გამოიყენეთ ეს ფორმა."
 
@@ -3661,11 +3754,6 @@ msgstr "ახალი პაროლი"
 msgid "6 or more characters"
 msgstr "6 ან მეტი სიმბოლო"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "ვადასტურებ"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "იგივე რაც ზედა პაროლი"
@@ -4195,6 +4283,11 @@ msgstr "სანიშნეების შენახვა ვერ მო
 msgid "Settings saved."
 msgstr "პარამეტრები შენახულია."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "გახსენი ანგარიში"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4656,7 +4749,7 @@ msgstr "საკუთარი შეტყობინების გამ
 msgid "You already repeated that notice."
 msgstr "თქვენ უკვე გაიმეორეთ ეს შეტყობინება."
 
-#: actions/repeat.php:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "გამეორებული"
 
@@ -4720,6 +4813,93 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "პასუხები %1$s–ს %2$s–ზე!"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "მხოლოდ ავტორიზირებულ მომხმარებლებს შეუძლიათ შეტყობინებების გამეორება."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "თქვენ ჯერჯერობით არცერთი აპლიკაცია არ დაგირეგისტრირებიათ."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, fuzzy
+msgid "No uploaded file."
+msgstr "ფაილის ატვირთვა"
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: actions/restoreaccount.php:130 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:136 lib/mediafile.php:200
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"ასატვირთი ფაილი სცდება MAX_FILE_SIZE დირექტივას, რომელიც მითითებული იყო HTML "
+"ფორმაში."
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "სისტემური შეცდომა ფაილის ატვირთვისას."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+msgid "Not an atom feed."
+msgstr ""
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, fuzzy
+msgid "Upload the file"
+msgstr "ფაილის ატვირთვა"
+
 #: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "თქვენ არ შეგიძლიათ მომხმარებლის როლის გაუქმება ამ საიტზე."
@@ -4820,7 +5000,7 @@ msgid "Reset key & secret"
 msgstr "გასაღების და საიდუმლოს გადაყენება"
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "წაშლა"
 
@@ -6083,13 +6263,13 @@ msgid "Author(s)"
 msgstr "ავტორი(ები)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%s-მა (@%s) დაამატა თქვენი შეტყობინება თავის რჩეულებში"
@@ -6198,7 +6378,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr "ბაზის სახელი ან DSN ვერსად ვერ მოიძებნა."
 
@@ -6225,23 +6405,23 @@ 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:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -6249,7 +6429,7 @@ msgstr ""
 "კიდევ დაპოსტეთ."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:288
+#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -6258,43 +6438,43 @@ msgstr ""
 "რამდენიმე წუთში ისევ დაპოსტეთ."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 #, fuzzy
 msgid "Bad type provided to saveKnownGroups."
 msgstr "saveKnownGroups-სათვის არასწორი ტიპია მოწოდებული"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6302,7 +6482,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:798
+#: classes/Profile.php:765
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -6310,7 +6490,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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6382,32 +6562,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "გამარჯობა @%2$s, კეთილი იყოს თქვენი მობრძანება %1$s-ზე!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 msgid "No single user defined for single-user mode."
 msgstr "ერთი მომხმარებელი არ განსაზღვრულა ერთარედთი-მომხმარებლის რეჟიმისთვის."
 
 #. TRANS: Server exception.
-#: classes/User.php:927
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "ჯგუფის შექმნა ვერ მოხერხდა."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 msgid "Could not set group URI."
 msgstr "ჯგუფის URI-ს მინიჭება ვერ მოხერხდა."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:549
 msgid "Could not set group membership."
 msgstr "ჯგუფის წევრობის მინიჭება ვერ მოხერხდა."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "ჯგუფის ლოკალური ინფორმაციის დამახსოვრება ვერ მოხერხდა."
 
@@ -6743,10 +6923,19 @@ msgstr "წინა"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "ფოტო"
+msgid "Unknown profile."
+msgstr "ფაილის ტიპი უცნობია"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7036,6 +7225,10 @@ msgstr "უკუგება"
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7426,26 +7619,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 #, 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:150
+#: lib/common.php:153
 #, 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "გადადი ამ ინსტალატორზე."
 
@@ -7553,6 +7746,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: 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"
@@ -7735,11 +7936,6 @@ msgstr "ეს ფაილი ძალიან დიდია. ფაილ
 msgid "Partial upload."
 msgstr "ნაწილობრივი ატვირთვა."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "სისტემური შეცდომა ფაილის ატვირთვისას."
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "სურათი არ არის, ან ფაილი დაზიანებულია."
@@ -8135,7 +8331,7 @@ msgstr ""
 "შეტყობინებები, რომ ჩაერთოთ საუბრებში სხვა ხალხთან. ხალხს შეუძლია "
 "გამოგიგზავნონ შეტყობინებები მხოლოდ თქვენ დასანახად."
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "ვისგან"
 
@@ -8167,42 +8363,6 @@ msgstr "შეტყობინების ტიპი არ არის 
 msgid "There was a database error while saving your file. Please try again."
 msgstr "ფაილის შენახვისას მოხდა მონაცემთა ბაზის შეცდომა. გთხოვთ კიდევ სცადოთ."
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: 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.
-#: lib/mediafile.php:200
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
-msgstr ""
-"ასატვირთი ფაილი სცდება MAX_FILE_SIZE დირექტივას, რომელიც მითითებული იყო HTML "
-"ფორმაში."
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: lib/mediafile.php:222
-msgid "File upload stopped by extension."
-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."
@@ -8223,7 +8383,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8232,7 +8392,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
@@ -8267,17 +8427,17 @@ msgid "Send"
 msgstr "გაგზავნა"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8317,55 +8477,55 @@ msgstr ""
 "სჭირდება, გთხოვთ სცადოთ მოგვიანებით"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "ჩ"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "ს"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "ა"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "დ"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, 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:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr ""
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr ""
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "უპასუხე ამ შეტყობინებას"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "პასუხი"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "შეტყობინება გამეორებულია"
 
@@ -8519,7 +8679,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:957
+#: lib/router.php:974
 #, fuzzy
 msgid "Page not found."
 msgstr "API მეთოდი ვერ მოიძებნა."
@@ -8868,21 +9028,10 @@ msgstr "ზომა არასწორია."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
 #, fuzzy
-msgid "No user specified; using backup user."
-msgstr "მომხმარებლის ID მითითებული არ არის."
+#~ msgid "Post"
+#~ msgstr "ფოტო"
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
+#, fuzzy
+#~ msgid "No user specified; using backup user."
+#~ msgstr "მომხმარებლის ID მითითებული არ არის."
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index a93947898d..1c2a5d2764 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:02+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:15+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 (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ko\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -273,7 +273,7 @@ msgstr "%2$s에 있는 %1$s 및 친구들의 업데이트!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -318,7 +318,8 @@ msgstr "이용자를 업데이트 할 수 없습니다."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -547,7 +548,7 @@ msgstr "타겟 이용자를 찾을 수 없습니다."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십시오."
@@ -557,7 +558,7 @@ msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "유효한 별명이 아닙니다"
@@ -569,7 +570,7 @@ msgstr "유효한 별명이 아닙니다"
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "홈페이지 주소형식이 올바르지 않습니다."
@@ -579,7 +580,7 @@ msgstr "홈페이지 주소형식이 올바르지 않습니다."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -595,7 +596,7 @@ msgstr "실명이 너무 깁니다. (최대 255글자)"
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -606,7 +607,7 @@ msgstr[0] "설명이 너무 깁니다. (최대 %d 글자)"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -619,7 +620,7 @@ msgstr "위치가 너무 깁니다. (최대 255글자)"
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -637,7 +638,7 @@ msgstr "사용할 수 없는 별명 : \"%s\""
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "별명 \"%s\" 이 이미 사용중 입니다. 다른 별명을 시도해 보십시오."
@@ -646,7 +647,7 @@ msgstr "별명 \"%s\" 이 이미 사용중 입니다. 다른 별명을 시도해
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -1048,7 +1049,7 @@ 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:138
+#: actions/apitimelinegroup.php:134
 #, fuzzy, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "그룹을 업데이트 할 수 없습니다."
@@ -1141,30 +1142,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "통지들의 내용 찾기"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "해당 id의 프로필이 없습니다."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1175,7 +1176,7 @@ msgid "API method under construction."
 msgstr "API 메서드를 구성중 입니다."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "API 메서드 발견 안 됨."
 
@@ -1265,7 +1266,6 @@ msgid "Can't delete someone else's favorite"
 msgstr "관심소식을 삭제할 수 없습니다."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
 msgstr "그러한 그룹이 없습니다."
 
@@ -1390,14 +1390,14 @@ msgid "Preview"
 msgstr "미리보기"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "삭제"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
@@ -1440,6 +1440,38 @@ msgstr "아바타 업데이트 실패"
 msgid "Avatar deleted."
 msgstr "아바타가 삭제되었습니다."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "오직 해당 사용자만 자신의 메일박스를 열람할 수 있습니다."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "배경"
+
+#: actions/backupaccount.php:258
+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."
@@ -1647,6 +1679,60 @@ msgstr "대화"
 msgid "Notices"
 msgstr "통지"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "오직 해당 사용자만 자신의 메일박스를 열람할 수 있습니다."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "이용자를 업데이트 할 수 없습니다."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "아바타가 삭제되었습니다."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "새 계정 만들기"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "인증"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1796,7 +1882,7 @@ msgid "Do not delete this notice"
 msgstr "이 통지를 지울 수 없습니다."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "이 게시글 삭제하기"
 
@@ -2103,7 +2189,7 @@ msgstr "다음 양식을 이용해 그룹을 편집하십시오."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "사용할 수 없는 별명 : \"%s\""
@@ -2115,7 +2201,7 @@ msgstr "그룹을 업데이트 할 수 없습니다."
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "관심소식을 생성할 수 없습니다."
 
@@ -3327,8 +3413,14 @@ msgstr "관심소식을 생성할 수 없습니다."
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "새 그룹을 만들기 위해 이 양식을 사용하세요."
 
@@ -3645,11 +3737,6 @@ msgstr "새로운 비밀 번호"
 msgid "6 or more characters"
 msgstr "6글자 이상"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "인증"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "위와 같은 비밀 번호"
@@ -4174,6 +4261,11 @@ msgstr "태그를 저장할 수 없습니다."
 msgid "Settings saved."
 msgstr "설정 저장"
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "새 계정 만들기"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4627,7 +4719,7 @@ msgstr "자신의 글은 재전송할 수 없습니다."
 msgid "You already repeated that notice."
 msgstr "이미 재전송된 소식입니다."
 
-#: actions/repeat.php:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "재전송됨"
 
@@ -4687,6 +4779,91 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "%s에 답신"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "오직 해당 사용자만 자신의 메일박스를 열람할 수 있습니다."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "응용 프로그램 수정을 위해서는 로그인해야 합니다."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, fuzzy
+msgid "No uploaded file."
+msgstr "실행 실패"
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: actions/restoreaccount.php:130 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:136 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:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "파일을 올리는데 시스템 오류 발생"
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "모든 회원"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, fuzzy
+msgid "Upload the file"
+msgstr "실행 실패"
+
 #: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "이 사이트의 이용자에 대해 권한정지 할 수 없습니다."
@@ -4787,7 +4964,7 @@ msgid "Reset key & secret"
 msgstr ""
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "삭제"
 
@@ -6040,13 +6217,13 @@ msgid "Author(s)"
 msgstr "작성자"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "누군가 내 글을 좋아하는 게시글로 추가했을 때, 메일을 보냅니다."
@@ -6153,7 +6330,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6181,24 +6358,24 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -6206,7 +6383,7 @@ msgstr ""
 "해보세요."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:288
+#: classes/Notice.php:297
 #, fuzzy
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
@@ -6216,43 +6393,43 @@ msgstr ""
 "해보세요."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1012
+#: classes/Notice.php:1013
 #, 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6260,14 +6437,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6339,32 +6516,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "%s에 답신"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "새 그룹을 만들 수 없습니다."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 msgid "Could not set group URI."
 msgstr "새 그룹을 만들 수 없습니다."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:549
 msgid "Could not set group membership."
 msgstr "그룹 맴버십을 세팅할 수 없습니다."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "새 그룹을 만들 수 없습니다."
 
@@ -6702,10 +6879,19 @@ msgstr "앞 페이지"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "사진"
+msgid "Unknown profile."
+msgstr "알 수 없는 종류의 파일입니다"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -6997,6 +7183,10 @@ msgstr "제거"
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7387,26 +7577,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 #, 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:150
+#: lib/common.php:153
 #, 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "이 사이트에 로그인"
 
@@ -7513,6 +7703,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: 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"
@@ -7692,11 +7890,6 @@ msgstr "당신그룹의 로고 이미지를 업로드할 수 있습니다."
 msgid "Partial upload."
 msgstr "불완전한 업로드."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "파일을 올리는데 시스템 오류 발생"
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "그림 파일이 아니거나 손상된 파일 입니다."
@@ -8016,7 +8209,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "방법"
 
@@ -8046,39 +8239,6 @@ msgstr "지원하지 않는 그림 파일 형식입니다."
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: 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.
-#: 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.
-#: 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.
-#: 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.
-#: 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.
-#: lib/mediafile.php:222
-msgid "File upload stopped by extension."
-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."
@@ -8099,7 +8259,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8108,7 +8268,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
@@ -8143,19 +8303,19 @@ msgid "Send"
 msgstr "보내기"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8193,55 +8353,55 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "북"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "남"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "동"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "서"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, 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:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "위치"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr "웹"
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "문맥"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "재전송됨"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "이 게시글에 대해 답장하기"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "답장하기"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 #, fuzzy
 msgid "Notice repeated"
 msgstr "게시글이 등록되었습니다."
@@ -8399,7 +8559,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:957
+#: lib/router.php:974
 #, fuzzy
 msgid "Page not found."
 msgstr "API 메서드 발견 안 됨."
@@ -8747,21 +8907,10 @@ msgstr "옳지 않은 크기"
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
 #, fuzzy
-msgid "No user specified; using backup user."
-msgstr "프로필을 지정하지 않았습니다."
+#~ msgid "Post"
+#~ msgstr "사진"
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
+#, fuzzy
+#~ msgid "No user specified; using backup user."
+#~ msgstr "프로필을 지정하지 않았습니다."
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index ab36d623bd..4f56950de9 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:04+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -279,7 +279,7 @@ msgstr "Подновувања од %1$s и пријатели на %2$s!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -326,7 +326,8 @@ msgstr "Не можев да го подновам корисникот."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -405,14 +406,14 @@ msgid "%s subscriptions"
 msgstr "Претплати на %s"
 
 #: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "%s favorites"
-msgstr "Бендисани"
+msgstr "%s бендисани"
 
 #: actions/apiatomservice.php:123
-#, 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:104
@@ -560,7 +561,7 @@ msgstr "Не можев да го пронајдам целниот корисн
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Тој прекар е во употреба. Одберете друг."
@@ -570,7 +571,7 @@ msgstr "Тој прекар е во употреба. Одберете друг.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Неправилен прекар."
@@ -582,7 +583,7 @@ msgstr "Неправилен прекар."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Главната страница не е важечка URL-адреса."
@@ -592,7 +593,7 @@ msgstr "Главната страница не е важечка URL-адрес
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Полното име е предолго (највеќе 255 знаци)."
@@ -607,7 +608,7 @@ msgstr "Полното име е предолго (највеќе 255 знаци
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -619,7 +620,7 @@ msgstr[1] "Описот е предолг (дозволено е највеќе
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Местоположбата е предолга (највеќе 255 знаци)."
@@ -631,7 +632,7 @@ msgstr "Местоположбата е предолга (највеќе 255 з
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -650,7 +651,7 @@ msgstr "Неважечки алијас: „%s“."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Алијасот „%s“ е зафатен. Одберете друг."
@@ -659,7 +660,7 @@ msgstr "Алијасот „%s“ е зафатен. Одберете друг."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Алијасот не може да биде ист како прекарот."
 
@@ -1060,7 +1061,7 @@ 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:138
+#: actions/apitimelinegroup.php:134
 #, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Не можев да создадам канал за групата - %s"
@@ -1131,19 +1132,16 @@ msgstr "Само корисникот може да ја надополнува
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #: actions/apitimelineuser.php:304
-#, fuzzy
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Прифаќај само AtomPub за Atom-канали."
 
 #: actions/apitimelineuser.php:310
-#, fuzzy
 msgid "Atom post must not be empty."
-msgstr "Забелешката преку Atom мора да биде Atom-ставка."
+msgstr "Забелешката преку Atom не смее да биде празна."
 
 #: actions/apitimelineuser.php:315
-#, fuzzy
 msgid "Atom post must be well-formed XML."
-msgstr "Забелешката преку Atom мора да биде Atom-ставка."
+msgstr "Забелешката преку Atom мора да биде добро-поставен XML."
 
 #. TRANS: Client error displayed when not using an Atom entry.
 #: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
@@ -1154,31 +1152,30 @@ msgstr "Забелешката преку Atom мора да биде Atom-ст
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
-#, fuzzy
+#: actions/apitimelineuser.php:334
 msgid "Can only handle POST activities."
-msgstr "Може да работи само со објавувања."
+msgstr "Може да работи само со POST-активности."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:343
-#, fuzzy, php-format
+#: actions/apitimelineuser.php:345
+#, php-format
 msgid "Cannot handle activity object type \"%s\"."
-msgstr "Не може да работи со предмети на активност од типот „%s“"
+msgstr "Не може да работи со предмети на активност од типот „%s“."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
-#, fuzzy, php-format
+#: actions/apitimelineuser.php:378
+#, php-format
 msgid "No content for notice %d."
-msgstr "Пронајдете содржини на забелешките"
+msgstr "Нема содржина за забелешката %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Веќе постои забелешка со URI „%s“."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr "AtomPub-објава со непознат URI за внимание %s"
@@ -1189,46 +1186,40 @@ msgid "API method under construction."
 msgstr "API-методот е во изработка."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "Корисникот не е пронајден."
 
 #: actions/atompubfavoritefeed.php:70
-#, fuzzy
 msgid "No such profile"
-msgstr "Нема таков профил."
+msgstr "Нема таков профил"
 
 #: actions/atompubfavoritefeed.php:145
 #, php-format
 msgid "Notices %s has favorited to on %s"
-msgstr ""
+msgstr "Забелешки на %s што ги бендисува %s"
 
 #: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-#, fuzzy
 msgid "Can't add someone else's subscription"
-msgstr "Не може да се внесе нова претплата."
+msgstr "Не можам да додадам туѓа претплата"
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
 #: actions/atompubfavoritefeed.php:239
-#, fuzzy
 msgid "Can only handle Favorite activities."
-msgstr "Може да работи само со објавувања."
+msgstr "Може да работи само со активности за бендисување."
 
 #: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
-#, fuzzy
 msgid "Can only fave notices."
-msgstr "Може да работи само со објавувања."
+msgstr "Може само да бендисува забелешки."
 
 #: actions/atompubfavoritefeed.php:256
-#, fuzzy
 msgid "Unknown note."
-msgstr "Непознато"
+msgstr "Непозната белешка."
 
 #: actions/atompubfavoritefeed.php:263
-#, fuzzy
 msgid "Already a favorite."
-msgstr "Додај во бендисани"
+msgstr "Веќе е бендисано."
 
 #: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
 #: actions/atompubshowmembership.php:73 actions/subscribe.php:107
@@ -1236,106 +1227,96 @@ msgid "No such profile."
 msgstr "Нема таков профил."
 
 #: actions/atompubmembershipfeed.php:144
-#, fuzzy, php-format
+#, php-format
 msgid "%s group memberships"
-msgstr "Членови на групата %s"
+msgstr "Членства на групата %s"
 
 #: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %s is a member of on %s"
-msgstr "Групи кадешто членува %s"
+msgstr "Групи на %s кадешто членува %s"
 
 #: actions/atompubmembershipfeed.php:217
 msgid "Can't add someone else's membership"
-msgstr ""
+msgstr "Не можам да додадам туѓо членство"
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
 #: actions/atompubmembershipfeed.php:241
-#, fuzzy
 msgid "Can only handle Join activities."
-msgstr "Може да работи само со објавувања."
+msgstr "Може да работи само со активности за зачленување."
 
 #: actions/atompubmembershipfeed.php:256
-#, fuzzy
 msgid "Unknown group."
-msgstr "Непознато"
+msgstr "Непозната група."
 
 #: actions/atompubmembershipfeed.php:263
-#, fuzzy
 msgid "Already a member."
-msgstr "Сите членови"
+msgstr "Веќе членувате."
 
 #: actions/atompubmembershipfeed.php:270
 msgid "Blocked by admin."
-msgstr ""
+msgstr "Блокиран од администратор."
 
 #: actions/atompubshowfavorite.php:89
-#, fuzzy
 msgid "No such favorite."
-msgstr "Нема таква податотека."
+msgstr "Нема таква бендисана ставка."
 
 #: actions/atompubshowfavorite.php:151
-#, fuzzy
 msgid "Can't delete someone else's favorite"
-msgstr "Не можам да ја избришам бендисаната забелешка."
+msgstr "Не можам да избришам туѓа бендисана ставка."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
-msgstr "Нема таква група."
+msgstr "Нема такваа група"
 
 #: actions/atompubshowmembership.php:90
-#, fuzzy
 msgid "Not a member"
-msgstr "Сите членови"
+msgstr "Не членувате"
 
 #: actions/atompubshowmembership.php:115
-#, fuzzy
 msgid "Method not supported"
-msgstr "HTML-методот не е поддржан."
+msgstr "Методот не е поддржан"
 
 #: actions/atompubshowmembership.php:150
 msgid "Can't delete someone else's membership"
-msgstr ""
+msgstr "Не можам да избришам туѓо членство"
 
 #: actions/atompubshowsubscription.php:72
 #: actions/atompubshowsubscription.php:81
 #: actions/atompubsubscriptionfeed.php:74
-#, fuzzy, php-format
+#, php-format
 msgid "No such profile id: %d"
-msgstr "Нема таков профил."
+msgstr "Нема таква назнака на профил: %d"
 
 #: actions/atompubshowsubscription.php:90
-#, fuzzy, php-format
+#, php-format
 msgid "Profile %d not subscribed to profile %d"
-msgstr "Не сте претплатени на тој профил."
+msgstr "Профилот %d не е претплатен на профилот %d"
 
 #: actions/atompubshowsubscription.php:154
-#, fuzzy
 msgid "Can't delete someone else's subscription"
-msgstr "Не можам да ја избришам самопретплатата."
+msgstr "Не можам да избришам туѓа претплата"
 
 #: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
+#, php-format
 msgid "People %s has subscribed to on %s"
-msgstr "Луѓе претплатени на %s"
+msgstr "Луѓе на %s на коишто се претплатил %s"
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
 #: actions/atompubsubscriptionfeed.php:246
-#, fuzzy
 msgid "Can only handle Follow activities."
-msgstr "Може да работи само со објавувања."
+msgstr "Може да работи само со аквитности за следење."
 
 #: actions/atompubsubscriptionfeed.php:253
 msgid "Can only follow people."
-msgstr ""
+msgstr "Може само да следи луѓе."
 
 #: actions/atompubsubscriptionfeed.php:262
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown profile %s"
-msgstr "Непознат тип на податотека"
+msgstr "Непознат профил %s"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
@@ -1409,13 +1390,13 @@ msgid "Preview"
 msgstr "Преглед"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Избриши"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Подигни"
@@ -1456,6 +1437,38 @@ msgstr "Подновата на аватарот не успеа."
 msgid "Avatar deleted."
 msgstr "Аватарот е избришан."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "Само најавени корисници можат да повторуваат забелешки."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Позадина"
+
+#: actions/backupaccount.php:258
+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."
@@ -1662,6 +1675,60 @@ msgstr "Разговор"
 msgid "Notices"
 msgstr "Забелешки"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "Само најавени корисници можат да повторуваат забелешки."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "Не можете да бришете корисници."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Аватарот е избришан."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Создај сметка"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Потврди"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1810,7 +1877,7 @@ msgid "Do not delete this notice"
 msgstr "Не ја бриши оваа забелешка"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Бриши ја оваа забелешка"
 
@@ -2114,7 +2181,7 @@ msgstr "ОБразецов служи за уредување на групат
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Неважечки алијас: „%s“"
@@ -2126,7 +2193,7 @@ msgstr "Не можев да ја подновам групата."
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "Не можеше да се создадат алијаси."
 
@@ -2226,6 +2293,8 @@ 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.
@@ -3367,8 +3436,14 @@ msgstr "Не можеше да се создаде програмот."
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Овој образец служи за создавање нова група."
 
@@ -3692,11 +3767,6 @@ msgstr "Нова лозинка"
 msgid "6 or more characters"
 msgstr "6 или повеќе знаци"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Потврди"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Исто како лозинката погоре"
@@ -4216,6 +4286,11 @@ msgstr "Не можев да ги зачувам ознаките."
 msgid "Settings saved."
 msgstr "Нагодувањата се зачувани"
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Создај сметка"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4684,7 +4759,7 @@ msgstr "Не можете да повторувате сопствена заб
 msgid "You already repeated that notice."
 msgstr "Веќе ја имате повторено таа забелешка."
 
-#: actions/repeat.php:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Повторено"
 
@@ -4750,6 +4825,94 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Одговори на %1$s на %2$s!"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "Само најавени корисници можат да повторуваат забелешки."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "Сè уште немате регистрирано ниеден програм,"
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, fuzzy
+msgid "No uploaded file."
+msgstr "Подигање"
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: actions/restoreaccount.php:130 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:136 lib/mediafile.php:200
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"Подигнатата податотека ја надминува директивата the MAX_FILE_SIZE назначена "
+"во HTML-образецот."
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "Системска грешка при подигањето на податотеката."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr "Земам резерва на податотеката „%s“."
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Не членувате"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, fuzzy
+msgid "Upload the file"
+msgstr "Подигање"
+
 #: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "На ова мрежно место не можете да одземате кориснички улоги."
@@ -4850,7 +5013,7 @@ msgid "Reset key & secret"
 msgstr "Клуч за промена и тајна"
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Бриши"
 
@@ -5715,7 +5878,7 @@ msgid "%s is not listening to anyone."
 msgstr "%s не следи никого."
 
 #: actions/subscriptions.php:178
-#, fuzzy, php-format
+#, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Канал со забелешки за %s (Atom)"
 
@@ -6134,13 +6297,13 @@ msgid "Author(s)"
 msgstr "Автор(и)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: classes/Fave.php:167
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%1$s ја бендиса забелешката %2$s."
@@ -6256,7 +6419,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr "Никаде не е пронајдено име на базата или DSN."
 
@@ -6283,23 +6446,23 @@ 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:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -6307,7 +6470,7 @@ msgstr ""
 "неколку минути."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:288
+#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -6316,42 +6479,42 @@ msgstr ""
 "неколку минути."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 msgid "Bad type provided to saveKnownGroups."
 msgstr "На saveKnownGroups му е укажан погрешен тип."
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6359,7 +6522,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:798
+#: classes/Profile.php:765
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -6368,7 +6531,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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6440,32 +6603,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "Добредојдовте на %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 msgid "No single user defined for single-user mode."
 msgstr "Не е зададен корисник за еднокорисничкиот режим."
 
 #. TRANS: Server exception.
-#: classes/User.php:927
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr "Повикан е еднокориснички режим, но не е овозможен."
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "Не можев да ја создадам групата."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 msgid "Could not set group URI."
 msgstr "Не можев да поставам URI на групата."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:549
 msgid "Could not set group membership."
 msgstr "Не можев да назначам членство во групата."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "Не можев да ги зачувам информациите за локалните групи."
 
@@ -6804,10 +6967,19 @@ msgstr "Претходно"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Се очекува коренски каналски елемент, но добив цел XML документ."
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Фото"
+msgid "Unknown profile."
+msgstr "Непознат профил %s"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7096,6 +7268,10 @@ msgstr "Одземи"
 msgid "author element must contain a name element."
 msgstr "авторскиот елемент мора да содржи елемент на име."
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7527,24 +7703,24 @@ msgstr ""
 "tracking - сè уште не е имплементирано.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 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:150
+#: lib/common.php:153
 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "Оди на инсталаторот."
 
@@ -7646,6 +7822,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: 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"
@@ -7829,11 +8013,6 @@ msgstr "Податотеката е преголема. Максималната
 msgid "Partial upload."
 msgstr "Делумно подигање."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "Системска грешка при подигањето на податотеката."
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "Не е слика или податотеката е пореметена."
@@ -8255,7 +8434,7 @@ msgstr ""
 "впуштите во разговор со други корисници. Луѓето можат да Ви испраќаат пораки "
 "што ќе можете да ги видите само Вие."
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "од"
 
@@ -8287,42 +8466,6 @@ msgstr ""
 "Се појави грешка во базата на податоци при зачувувањето на Вашата "
 "податотека. Обидете се повторно."
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: 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.
-#: lib/mediafile.php:200
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
-msgstr ""
-"Подигнатата податотека ја надминува директивата the MAX_FILE_SIZE назначена "
-"во HTML-образецот."
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: lib/mediafile.php:222
-msgid "File upload stopped by extension."
-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."
@@ -8343,7 +8486,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8354,7 +8497,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr "„%s„ не е поддржан податотечен тип на овој опслужувач."
@@ -8387,17 +8530,17 @@ msgid "Send"
 msgstr "Прати"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8438,55 +8581,55 @@ msgstr ""
 "Обидете се подоцна."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "С"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "Ј"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "И"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "З"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, 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:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "во"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr "интернет"
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "во контекст"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "Повторено од"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "Одговори на забелешкава"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Одговор"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Забелешката е повторена"
 
@@ -8640,7 +8783,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:957
+#: lib/router.php:974
 msgid "Page not found."
 msgstr "Страницата не е пронајдена."
 
@@ -8992,21 +9135,13 @@ msgstr "Неважечки XML."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr "Земам резерва на податотеката „%s“."
+#~ msgid "Post"
+#~ msgstr "Објави"
 
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
-msgid "No user specified; using backup user."
-msgstr "Нема назначено корисник. Ќе го употребам резервниот корисник."
+#~ msgid "No user specified; using backup user."
+#~ msgstr "Нема назначено корисник. Ќе го употребам резервниот корисник."
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] "Има %d резервна ставка."
-msgstr[1] "Има %d резервни ставки."
+#~ msgid "%d entry in backup."
+#~ msgid_plural "%d entries in backup."
+#~ msgstr[0] "Има %d резервна ставка."
+#~ msgstr[1] "Има %d резервни ставки."
diff --git a/locale/ml/LC_MESSAGES/statusnet.po b/locale/ml/LC_MESSAGES/statusnet.po
new file mode 100644
index 0000000000..e7fab4e024
--- /dev/null
+++ b/locale/ml/LC_MESSAGES/statusnet.po
@@ -0,0 +1,8641 @@
+# Translation of StatusNet - Core to Malayalam (മലയാളം)
+# Expored from translatewiki.net
+#
+# Author: Praveenp
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Core\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:17+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-01-12 17:31:48+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ml\n"
+"X-Message-Group: #out-statusnet-core\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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 "അഭിഗമ്യതാ സജ്ജീകരണങ്ങൾ സേവ് ചെയ്യുക"
+
+#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button text to store form data in the Paths admin panel.
+#. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
+#. TRANS: Button label to save SMS preferences.
+#. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
+#. TRANS: Button label in the "Edit application" form.
+#. TRANS: Button text on profile design page to save settings.
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/designsettings.php:270
+#: lib/groupeditform.php:207
+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:138 actions/tag.php:52
+msgid "No such page."
+msgstr "അത്തരത്തിൽ ഒരു താളില്ല."
+
+#. TRANS: Client error when user not found for an action.
+#. TRANS: Client error when user not found for an rss related action.
+#. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
+#. TRANS: Client error displayed if a user could not be found.
+#. TRANS: Client error when user not found updating a profile background image.
+#. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error when user not found for an API action to remove a block for a user.
+#. TRANS: Client error given when a user was not found (404).
+#. TRANS: Client error when user not found for an API direct message action.
+#. TRANS: Client error given when a user was not found (404).
+#. 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 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.
+#. TRANS: Client error displayed when requesting dents of a user and friends for a user that does not exist.
+#. TRANS: Client error displayed when requesting most recent dents by user and friends for a non-existing user.
+#. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
+#. TRANS: Client error displayed requesting most recent notices for a non-existing user.
+#. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
+#: 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:60
+#: actions/apiblockcreate.php:95 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/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:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
+#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:105 actions/userbyid.php:74
+#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
+msgid "No such user."
+msgstr "അങ്ങനെ ഒരു ഉപയോക്താവില്ല."
+
+#. 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"
+
+#. TRANS: Page title. %s is user nickname
+#. 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:103
+#, 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."
+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 "
+"something yourself."
+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 "
+"to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
+msgstr ""
+
+#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to them."
+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 ""
+
+#. TRANS: Client error displayed handling a non-existing API method.
+#. TRANS: Client error displayed when trying to handle an unknown API method.
+#. TRANS: Client error displayed trying to execute an unknown API method updating profile colours.
+#. TRANS: Client error displayed trying to execute an unknown API method verifying user credentials.
+#. TRANS: Client error given when an API method was not found (404).
+#. TRANS: Client error displayed when trying to handle an unknown API method.
+#. TRANS: Client error displayed trying to execute an unknown API method showing friendship.
+#. TRANS: Client error given when an API method was not found (404).
+#. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed trying to execute an unknown API method joining a group.
+#. TRANS: Client error displayed trying to execute an unknown API method leaving a group.
+#. 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 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:160
+#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: 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/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
+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/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."
+msgstr ""
+
+#. TRANS: Server error displayed when a user's delivery device cannot be updated.
+#: actions/apiaccountupdatedeliverydevice.php:130
+msgid "Could not update user."
+msgstr ""
+
+#. TRANS: Client error displayed if a user profile could not be found.
+#. TRANS: Client error displayed when a user has no profile.
+#. TRANS: Client error displayed a user has no profile updating profile colours.
+#. TRANS: Client error displayed if a user profile could not be found updating a profile image.
+#. TRANS: Client error displayed when requesting user information for a user without a profile.
+#. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#: actions/apiaccountupdateprofile.php:111
+#: actions/apiaccountupdateprofilebackgroundimage.php:199
+#: actions/apiaccountupdateprofilecolors.php:183
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
+#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
+#: lib/profileaction.php:84
+msgid "User has no profile."
+msgstr ""
+
+#. TRANS: Server error displayed if a user profile could not be saved.
+#: actions/apiaccountupdateprofile.php:147
+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:125 actions/editapplication.php:121
+#: actions/newapplication.php:104 actions/newnotice.php:95
+#: lib/designsettings.php:298
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s byte) due to its "
+"current configuration."
+msgid_plural ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Client error displayed when saving design settings fails because of an empty id.
+#. TRANS: Client error displayed when saving design settings fails because of an empty result.
+#. TRANS: Client error displayed when a database error occurs inserting profile colours.
+#. TRANS: Client error displayed when a database error occurs updating profile colours.
+#: actions/apiaccountupdateprofilebackgroundimage.php:138
+#: actions/apiaccountupdateprofilebackgroundimage.php:149
+#: actions/apiaccountupdateprofilecolors.php:160
+#: actions/apiaccountupdateprofilecolors.php:171
+#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+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
+msgid "Could not update your design."
+msgstr "താങ്കളുടെ രൂപകല്പന പുതുക്കാനായില്ല."
+
+#: actions/apiatomservice.php:86
+msgid "Main"
+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:139
+#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
+#: lib/atomusernoticefeed.php:68
+#, php-format
+msgid "%s timeline"
+msgstr "%s എന്ന ഉപയോക്താവിന്റെ സമയരേഖ"
+
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr ""
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, php-format
+msgid "%s favorites"
+msgstr ""
+
+#: actions/apiatomservice.php:123
+#, php-format
+msgid "%s memberships"
+msgstr "%s അംഗത്വങ്ങൾ"
+
+#. TRANS: Client error displayed when users try to block themselves.
+#: actions/apiblockcreate.php:104
+msgid "You cannot block yourself!"
+msgstr "താങ്കൾക്ക് താങ്കളെത്തന്നെ തടയാൻ പറ്റില്ല!"
+
+#. TRANS: Server error displayed when blocking a user has failed.
+#: actions/apiblockcreate.php:126
+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 "സന്ദേശത്തിൽ എഴുത്ത് ഇല്ല!"
+
+#. TRANS: Client error displayed when message content is too long.
+#. 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] ""
+msgstr[1] ""
+
+#. 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 "Can't 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 ""
+
+#. 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: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:294
+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.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+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: 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:189
+#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/register.php:214
+msgid "Nickname already in use. Try another one."
+msgstr "വിളിപ്പേര് മുമ്പേ ഉപയോഗത്തിലുണ്ട്. മറ്റൊരെണ്ണം ശ്രമിക്കുക."
+
+#. TRANS: Client error in form for group creation.
+#. 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:193
+#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/register.php:216
+msgid "Not a valid nickname."
+msgstr "സാധുവായ വിളിപ്പേര് അല്ല."
+
+#. TRANS: Client error in form for group creation.
+#. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/register.php:223
+msgid "Homepage is not a valid URL."
+msgstr "ഹോംപേജിന്റെ യൂ.ആർ.എൽ. സാധുവല്ല."
+
+#. TRANS: Client error in form for group creation.
+#. 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:204
+#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/register.php:226
+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: Validation error shown when providing too long a description in the "Edit application" form.
+#. TRANS: Group edit form validation error.
+#. TRANS: Form validation error in New application form.
+#. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:156
+#, php-format
+msgid "Description is too long (maximum %d character)."
+msgid_plural "Description is too long (maximum %d characters)."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Client error shown when providing too long a location during group creation.
+#. 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:216
+#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/register.php:235
+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: 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:229
+#: actions/newgroup.php:176
+#, php-format
+msgid "Too many aliases! Maximum %d allowed."
+msgid_plural "Too many aliases! Maximum %d allowed."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Client error shown when providing an invalid alias during group creation.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupcreate.php:253
+#, 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: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:191
+#, 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.
+#. TRANS: Group create form validation error.
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:198
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#. TRANS: Client error displayed when checking group membership for a non-existing group.
+#. 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 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:89
+#: 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: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+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: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
+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: 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:134 lib/command.php:350
+#, 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 "താങ്കൾ ഈ സംഘത്തിൽ അംഗമല്ല."
+
+#. TRANS: Server error displayed when leaving a group fails.
+#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. 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:129
+#: lib/command.php:398
+#, 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 ""
+
+#. 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 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:101
+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 "അഭ്യർത്ഥനാ ചീട്ട് മുമ്പേ തന്നെ അംഗീകരിക്കപ്പെട്ടതാണ്."
+
+#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
+#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/groupblock.php:66 actions/grouplogo.php:312
+#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
+#: actions/profilesettings.php:221 actions/recoverpassword.php:350
+#: actions/register.php:172 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: 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 "താങ്കളുടെ സെഷൻ ചീട്ടിൽ ഒരു ചെറിയ പ്രശ്നം. ദയവായി വീണ്ടും ശ്രമിക്കുക."
+
+#. 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 ""
+
+#. 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.
+#. TRANS: Client error displayed submitting invalid form data for edit application.
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:277 lib/designsettings.php:321
+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 "
+"account data. You should only give access to your %4$s account to third "
+"parties you trust."
+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 "
+"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 ""
+
+#. TRANS: Fieldset legend.
+#: actions/apioauthauthorize.php:455
+msgctxt "LEGEND"
+msgid "Account"
+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.
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/showgroup.php:240 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:134
+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:437 lib/accountsettingsaction.php:120
+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 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:128
+#: actions/imsettings.php:131 actions/smssettings.php:137
+#: 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."
+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 "
+"process."
+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 "മറ്റൊരു ഉപയോക്താവിന്റെ സ്ഥിതിവിവരം മായ്ക്കാൻ താങ്കൾക്ക് കഴിയില്ല."
+
+#. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
+#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
+#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
+#: actions/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:537
+msgid "Cannot repeat your own notice."
+msgstr "താങ്കൾക്ക് താങ്കളുടെ തന്നെ അറിയിപ്പ് ആവർത്തിക്കാനാവില്ല."
+
+#. TRANS: Client error displayed trying to re-repeat a notice through the API.
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:92 lib/command.php:543
+msgid "Already repeated that notice."
+msgstr "ആ അറിയിപ്പ് മുമ്പേ തന്നെ ആവർത്തിച്ചിരിക്കുന്നു."
+
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:118
+#: actions/atompubsubscriptionfeed.php:109
+msgid "HTTP method not supported."
+msgstr "എച്ച്.റ്റി.റ്റി.പി. രീതി പിന്തുണയ്ക്കുന്നില്ല."
+
+#: actions/apistatusesshow.php:141
+#, php-format
+msgid "Unsupported format: %s"
+msgstr "പിന്തുണയ്ക്കാത്തയിനം തരം: %s"
+
+#. TRANS: Client error displayed requesting a deleted status.
+#: actions/apistatusesshow.php:152
+msgid "Status deleted."
+msgstr "സ്ഥിതിവിവരക്കുറിപ്പ് മായ്ച്ചിരിക്കുന്നു."
+
+#. TRANS: Client error displayed requesting a status with an invalid ID.
+#: actions/apistatusesshow.php:159
+msgid "No status with that ID found."
+msgstr ""
+
+#: actions/apistatusesshow.php:223
+msgid "Can only delete using the Atom format."
+msgstr ""
+
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
+msgid "Can't delete this notice."
+msgstr "ഈ അറിയിപ്പ് മായ്ക്കാൻ കഴിഞ്ഞില്ല."
+
+#: actions/apistatusesshow.php:243
+#, 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
+#, 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] ""
+msgstr[1] ""
+
+#. 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."
+msgstr[0] ""
+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 ""
+
+#. 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: 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
+#, php-format
+msgid "%1$s / Updates mentioning %2$s"
+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.
+#: 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
+#, 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:108
+#, php-format
+msgid "Repeated to %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
+#, php-format
+msgid "Repeats of %s"
+msgstr "%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
+#, 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:297
+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
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
+msgstr ""
+
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
+msgid "Atom post must be an Atom entry."
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:334
+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
+#, php-format
+msgid "Cannot handle activity object type \"%s\"."
+msgstr ""
+
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:378
+#, php-format
+msgid "No content for notice %d."
+msgstr ""
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:406
+#, php-format
+msgid "Notice with URI \"%s\" already exists."
+msgstr ""
+
+#: actions/apitimelineuser.php:437
+#, php-format
+msgid "AtomPub post with unknown attention URI %s"
+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 "ഉപയോക്താവിനെ കണ്ടത്താനായില്ല."
+
+#: actions/atompubfavoritefeed.php:70
+msgid "No such profile"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+msgid "Can't add someone else's subscription"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+msgid "Can only fave notices."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:256
+msgid "Unknown note."
+msgstr "അജ്ഞാതമായ കുറിപ്പ്."
+
+#: actions/atompubfavoritefeed.php:263
+msgid "Already a favorite."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:144
+#, php-format
+msgid "%s group memberships"
+msgstr "%s സംഘ അംഗത്വങ്ങൾ"
+
+#: actions/atompubmembershipfeed.php:147
+#, php-format
+msgid "Groups %s is a member of on %s"
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr "പങ്ക് ചേരൽ പ്രക്രിയകൾ മാത്രം കൈകാര്യം ചെയ്യാനേ കഴിയൂ."
+
+#: actions/atompubmembershipfeed.php:256
+msgid "Unknown group."
+msgstr "അജ്ഞാത സംഘം."
+
+#: actions/atompubmembershipfeed.php:263
+msgid "Already a member."
+msgstr "ഇപ്പോൾ തന്നെ അംഗമാണ്."
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr "കാര്യനിർവ്വാഹകനാൽ തടയപ്പെട്ടിരിക്കുന്നു."
+
+#: actions/atompubshowfavorite.php:89
+msgid "No such favorite."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:151
+msgid "Can't delete someone else's favorite"
+msgstr ""
+
+#: actions/atompubshowmembership.php:81
+msgid "No such group"
+msgstr "അത്തരത്തിൽ ഒരു സംഘം ഇല്ല"
+
+#: actions/atompubshowmembership.php:90
+msgid "Not a member"
+msgstr "അംഗം അല്ല"
+
+#: actions/atompubshowmembership.php:115
+msgid "Method not supported"
+msgstr "പിന്തുണയില്ലാത്ത മാർഗ്ഗമാണ്"
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't delete someone else's membership"
+msgstr "മറ്റൊരാളുടെ അംഗത്വം മായ്ക്കാനാവില്ല."
+
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:81
+#: actions/atompubsubscriptionfeed.php:74
+#, php-format
+msgid "No such profile id: %d"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:90
+#, php-format
+msgid "Profile %d not subscribed to profile %d"
+msgstr ""
+
+#: actions/atompubshowsubscription.php:154
+msgid "Can't delete someone else's subscription"
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:150
+#, php-format
+msgid "People %s has subscribed to on %s"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr "പിന്തുടരൽ പ്രക്രിയകൾ മാത്രം കൈകാര്യം ചെയ്യാനേ കഴിയൂ."
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr "ഉപയോക്താക്കളെ പിന്തുടരാൻ മാത്രമേ കഴിയൂ."
+
+#: actions/atompubsubscriptionfeed.php:262
+#, php-format
+msgid "Unknown profile %s"
+msgstr ""
+
+#. TRANS: Client error displayed trying to get a non-existing attachment.
+#: actions/attachment.php:73
+msgid "No such attachment."
+msgstr ""
+
+#. TRANS: Client error displayed trying to get an avatar without providing a nickname.
+#. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
+#. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. 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:91 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.
+#. 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:224
+#: lib/accountsettingsaction.php:113
+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 ""
+
+#. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
+#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
+#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:108
+msgid "User without matching profile."
+msgstr ""
+
+#. TRANS: Avatar upload page form legend.
+#. TRANS: Avatar upload page crop form legend.
+#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
+#: actions/grouplogo.php:254
+msgid "Avatar settings"
+msgstr "അവതാരത്തിന്റെ സജ്ജീകരണം"
+
+#. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
+#. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
+#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
+#: actions/grouplogo.php:202 actions/grouplogo.php:262
+msgid "Original"
+msgstr "യഥാർത്ഥം"
+
+#. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
+#. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
+#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
+#: actions/grouplogo.php:213 actions/grouplogo.php:274
+msgid "Preview"
+msgstr "എങ്ങനെയുണ്ടെന്നു കാണുക"
+
+#. TRANS: Button on avatar upload page to delete current avatar.
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+msgctxt "BUTTON"
+msgid "Delete"
+msgstr "മായ്ക്കുക"
+
+#. TRANS: Button on avatar upload page to upload an avatar.
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+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 unstruction after uploading a file.
+#: actions/avatarsettings.php:346
+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.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+msgid "Lost our file data."
+msgstr ""
+
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
+msgid "Avatar updated."
+msgstr "അവതാരം പുതുക്കി."
+
+#. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
+#: actions/avatarsettings.php:389
+msgid "Failed updating avatar."
+msgstr "അവതാരം അപ്‌ലോഡ് ചെയ്യുന്നത് പരാജയപ്പെട്ടു."
+
+#. TRANS: Success message for deleting a user avatar.
+#: actions/avatarsettings.php:413
+msgid "Avatar deleted."
+msgstr ""
+
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "ഉപയോക്താവിനു മാത്രമേ അദ്ദേഹത്തിന്റെ സ്വന്തം സമയരേഖ ചേർക്കാൻ കഴിയൂ."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "പശ്ചാത്തലം"
+
+#: actions/backupaccount.php:258
+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.
+#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+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 "
+"will not be notified of any @-replies from them."
+msgstr ""
+
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete group form.
+#. 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:152 actions/groupblock.php:178
+msgctxt "BUTTON"
+msgid "No"
+msgstr "അല്ല"
+
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:158 actions/deleteuser.php:156
+msgid "Do not block this user"
+msgstr "ഈ ഉപയോക്താവിനെ തടയരുത്"
+
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete group form.
+#. 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:159 actions/groupblock.php:185
+msgctxt "BUTTON"
+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 "ഈ ഉപയോക്താവിനെ തടയുക"
+
+#. TRANS: Server error displayed when blocking a user fails.
+#: actions/block.php:189
+msgid "Failed to save block information."
+msgstr ""
+
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
+#: actions/deletegroup.php:87 actions/deletegroup.php:100
+#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
+#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: actions/joingroup.php:93 actions/leavegroup.php:82
+#: actions/leavegroup.php:93 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
+msgid "No such group."
+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 a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
+#: actions/confirmaddress.php:92
+#, php-format
+msgid "Unrecognized address type %s."
+msgstr "തിരിച്ചറിയാവാത്ത തരം വിലാസം %s."
+
+#. TRANS: Client error for an already confirmed email/jabber/sms address.
+#: actions/confirmaddress.php:97
+msgid "That address has already been confirmed."
+msgstr "ആ വിലാസം മുമ്പേ തന്നെ സ്ഥിരീകരിക്കപ്പെട്ടതാണ്."
+
+#. 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:184
+#: actions/profilesettings.php:326 actions/smssettings.php:308
+#: actions/smssettings.php:464
+msgid "Couldn't update user."
+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
+msgid "Could not delete address confirmation."
+msgstr ""
+
+#. TRANS: Title for the contact address confirmation action.
+#: actions/confirmaddress.php:150
+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
+#, 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).
+#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+msgid "Notices"
+msgstr "അറിയിപ്പുകൾ"
+
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "ഉപയോക്താവിനു മാത്രമേ അദ്ദേഹത്തിന്റെ സ്വന്തം സമയരേഖ ചേർക്കാൻ കഴിയൂ."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "താങ്കൾക്ക് ഉപയോക്താക്കളെ നീക്കം ചെയ്യാൻ കഴിയില്ല."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "സ്ഥിതിവിവരക്കുറിപ്പ് മായ്ച്ചിരിക്കുന്നു."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "ഒരംഗത്വമെടുക്കുക"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "സ്ഥിരീകരിക്കുക"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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: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:114 actions/showapplication.php:118
+#: lib/action.php:1409
+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
+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.
+#: actions/deletegroup.php:94 actions/joingroup.php:88
+#: actions/leavegroup.php:88
+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 "
+"will still appear in individual timelines."
+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 "ഈ സംഘത്തെ മായ്ക്കുക"
+
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
+#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: 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."
+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 lib/noticelist.php:673
+msgid "Delete this notice"
+msgstr "ഈ അറിയിപ്പ് മായ്ക്കുക"
+
+#: actions/deleteuser.php:67
+msgid "You cannot delete users."
+msgstr "താങ്കൾക്ക് ഉപയോക്താക്കളെ നീക്കം ചെയ്യാൻ കഴിയില്ല."
+
+#: actions/deleteuser.php:74
+msgid "You can only delete local users."
+msgstr "താങ്കൾക്ക് പ്രാദേശിക ഉപയോക്താക്കളെ മാത്രമേ നീക്കം ചെയ്യാൻ കഴിയൂ."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+msgid "Delete user"
+msgstr "ഉപയോക്താവിനെ നീക്കം ചെയ്യുക"
+
+#: actions/deleteuser.php:136
+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 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+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:63 lib/accountsettingsaction.php:134
+msgid "Design"
+msgstr "രൂപകല്പന"
+
+#: actions/designadminpanel.php:74
+msgid "Design settings for this StatusNet site"
+msgstr "ഈ സ്റ്റാറ്റസ്‌നെറ്റ് സൈറ്റിന്റെ രൂപകല്പനാ സജ്ജീകരണങ്ങൾ"
+
+#: actions/designadminpanel.php:335
+msgid "Invalid logo URL."
+msgstr "ലോഗോ യൂ.ആർ.എൽ. അസാധുവാണ്."
+
+#: actions/designadminpanel.php:340
+msgid "Invalid SSL logo URL."
+msgstr "അസാധുവായ എസ്.എസ്.എൽ. ലോഗോ യൂ.ആർ.എൽ."
+
+#: actions/designadminpanel.php:344
+#, php-format
+msgid "Theme not available: %s."
+msgstr "ദൃശ്യരൂപം ലഭ്യമല്ല: %s."
+
+#: actions/designadminpanel.php:448
+msgid "Change logo"
+msgstr "ലോഗോ മാറ്റുക"
+
+#: actions/designadminpanel.php:453
+msgid "Site logo"
+msgstr "സൈറ്റിന്റെ ലോഗോ"
+
+#: actions/designadminpanel.php:457
+msgid "SSL logo"
+msgstr "എസ്.എസ്.എൽ. ലോഗോ"
+
+#: actions/designadminpanel.php:469
+msgid "Change theme"
+msgstr "ദൃശ്യരൂപം മാറ്റുക"
+
+#: actions/designadminpanel.php:486
+msgid "Site theme"
+msgstr "സൈറ്റിന്റെ ദൃശ്യരൂപം"
+
+#: actions/designadminpanel.php:487
+msgid "Theme for the site."
+msgstr "ഈ സൈറ്റിന്റെ ദൃശ്യരൂപം."
+
+#: actions/designadminpanel.php:493
+msgid "Custom theme"
+msgstr "ഐച്ഛിക ദൃശ്യരൂപം"
+
+#: actions/designadminpanel.php:497
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr ""
+
+#. TRANS: Fieldset legend on profile design page.
+#: actions/designadminpanel.php:512 lib/designsettings.php:98
+msgid "Change background image"
+msgstr "പശ്ചാത്തല ചിത്രം മാറ്റുക"
+
+#. TRANS: Label on profile design page for setting a profile page background colour.
+#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: lib/designsettings.php:183
+msgid "Background"
+msgstr "പശ്ചാത്തലം"
+
+#: actions/designadminpanel.php:522
+#, php-format
+msgid ""
+"You can upload a background image for the site. The maximum file size is %1"
+"$s."
+msgstr ""
+"താങ്കൾക്ക് ഈ സൈറ്റിനുള്ള പശ്ചാത്തല ചിത്രം അപ്‌ലോഡ് ചെയ്യാവുന്നതാണ്. പ്രമാണത്തിന്റെ പരമാവധി "
+"വലിപ്പം %1$s ആയിരിക്കണം."
+
+#. TRANS: Used as radio button label to add a background image.
+#: actions/designadminpanel.php:553
+msgid "On"
+msgstr "സജ്ജം"
+
+#. TRANS: Used as radio button label to not add a background image.
+#: actions/designadminpanel.php:570
+msgid "Off"
+msgstr "രഹിതം"
+
+#. 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:571 lib/designsettings.php:159
+msgid "Turn background image on or off."
+msgstr "പശ്ചാത്തലചിത്രം പ്രവർത്തന സജ്ജമാക്കുക അല്ലെങ്കിൽ രഹിതമാക്കുക."
+
+#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
+#: actions/designadminpanel.php:576 lib/designsettings.php:165
+msgid "Tile background image"
+msgstr ""
+
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: actions/designadminpanel.php:590 lib/designsettings.php:175
+msgid "Change colours"
+msgstr "നിറങ്ങൾ മാറ്റുക"
+
+#. TRANS: Label on profile design page for setting a profile page content colour.
+#: actions/designadminpanel.php:613 lib/designsettings.php:197
+msgid "Content"
+msgstr "ഉള്ളടക്കം"
+
+#. TRANS: Label on profile design page for setting a profile page sidebar colour.
+#: actions/designadminpanel.php:626 lib/designsettings.php:211
+msgid "Sidebar"
+msgstr ""
+
+#. TRANS: Label on profile design page for setting a profile page text colour.
+#: actions/designadminpanel.php:639 lib/designsettings.php:225
+msgid "Text"
+msgstr "എഴുത്ത്"
+
+#. TRANS: Label on profile design page for setting a profile page links colour.
+#: actions/designadminpanel.php:652 lib/designsettings.php:239
+msgid "Links"
+msgstr "കണ്ണികൾ"
+
+#: actions/designadminpanel.php:677
+msgid "Advanced"
+msgstr "വിപുലം"
+
+#: actions/designadminpanel.php:681
+msgid "Custom CSS"
+msgstr ""
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: actions/designadminpanel.php:702 lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "സ്വതേയുള്ളവ ഉപയോഗിക്കുക"
+
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:703 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.
+#: actions/designadminpanel.php:709 lib/designsettings.php:267
+msgid "Reset back to default"
+msgstr "മുമ്പ് സ്വതേയുണ്ടായിരുന്നതിലേയ്ക്ക് പുനഃസ്ഥാപിക്കുക"
+
+#. TRANS: Submit button title.
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
+#: lib/applicationeditform.php:357
+msgid "Save"
+msgstr "സേവ് ചെയ്യുക"
+
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:712 lib/designsettings.php:272
+msgid "Save design"
+msgstr "രൂപകല്പന സേവ്‌ ചെയ്യുക"
+
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr ""
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr ""
+
+#: actions/doc.php:158
+#, 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:87
+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.
+#: actions/editapplication.php:184 actions/newapplication.php:163
+msgid "Name is required."
+msgstr "പേര് ആവശ്യമാണ്."
+
+#. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
+#: actions/editapplication.php:188 actions/newapplication.php:169
+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.
+#: actions/editapplication.php:192 actions/newapplication.php:166
+msgid "Name already in use. Try another one."
+msgstr "പേര് മുമ്പേ ഉപയോഗത്തിലുണ്ട്. മറ്റൊരെണ്ണം ശ്രമിക്കുക."
+
+#. TRANS: Validation error shown when not providing a description in the "Edit application" form.
+#: actions/editapplication.php:196 actions/newapplication.php:172
+msgid "Description is required."
+msgstr "വിവരണം ആവശ്യമാണ്."
+
+#. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
+#: actions/editapplication.php:208
+msgid "Source URL is too long."
+msgstr "സ്രോതസ്സ് യൂ.ആർ.എൽ. വളരെ വലുതാണ്."
+
+#. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
+#: actions/editapplication.php:215 actions/newapplication.php:193
+msgid "Source URL is not valid."
+msgstr "സ്രോതസ്സ് യൂ.ആർ.എൽ. അസാധുവാണ്."
+
+#. TRANS: Validation error shown when not providing an organisation in the "Edit application" form.
+#: actions/editapplication.php:219 actions/newapplication.php:196
+msgid "Organization is required."
+msgstr "സംഘടനയേതെന്ന് ആവശ്യമാണ്."
+
+#. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
+#: actions/editapplication.php:223 actions/newapplication.php:199
+msgid "Organization is too long (maximum 255 characters)."
+msgstr ""
+
+#: actions/editapplication.php:226 actions/newapplication.php:202
+msgid "Organization homepage is required."
+msgstr ""
+
+#. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
+#: actions/editapplication.php:237 actions/newapplication.php:214
+msgid "Callback is too long."
+msgstr ""
+
+#. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
+#: actions/editapplication.php:245 actions/newapplication.php:223
+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:282
+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 എന്ന സംഘത്തിൽ മാറ്റം വരുത്തുക"
+
+#. TRANS: Client error displayed trying to edit 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:70 actions/newgroup.php:65
+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.
+#: actions/editgroup.php:110 actions/editgroup.php:176
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
+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.
+#: actions/editgroup.php:239 actions/newgroup.php:186
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr ""
+
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/editgroup.php:272
+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:279 classes/User_group.php:534
+msgid "Could not create aliases."
+msgstr ""
+
+#. TRANS: Group edit form success message.
+#: actions/editgroup.php:296
+msgid "Options saved."
+msgstr "ഐച്ഛികങ്ങൾ സേവ് ചെയ്തിരിക്കുന്നു."
+
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
+msgid "Email settings"
+msgstr "ഇമെയിൽ സജ്ജീകരണങ്ങൾ"
+
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
+#, 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:107 actions/emailsettings.php:133
+msgid "Email address"
+msgstr "ഇമെയിൽ വിലാസം"
+
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:113
+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 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:116 actions/emailsettings.php:183
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+msgctxt "BUTTON"
+msgid "Remove"
+msgstr "നീക്കം ചെയ്യുക"
+
+#: actions/emailsettings.php:123
+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:140
+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:144 actions/imsettings.php:151
+#: actions/smssettings.php:162
+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:152 actions/smssettings.php:171
+msgid "Incoming email"
+msgstr "ഇങ്ങോട്ടുള്ള ഇമെയിൽ"
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+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:180 actions/smssettings.php:178
+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:189 actions/smssettings.php:186
+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:193
+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:199 actions/smssettings.php:189
+msgctxt "BUTTON"
+msgid "New"
+msgstr "പുതിയത്"
+
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:208
+msgid "Email preferences"
+msgstr "ഇമെയിൽ ക്രമീകരണങ്ങൾ"
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:216
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:222
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr ""
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:229
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:235
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr ""
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:241
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:247
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:368
+msgid "Email preferences saved."
+msgstr "ഇമെയിൽ ക്രമീകരണങ്ങൾ സേവ് ചെയ്തിരിക്കുന്നു."
+
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:388
+msgid "No email address."
+msgstr "ഇമെയിൽ വിലാസം ഇല്ല."
+
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:396
+msgid "Cannot normalize that email address"
+msgstr ""
+
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:401 actions/register.php:212
+#: 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:405
+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:409
+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 IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:426 actions/imsettings.php:351
+#: actions/smssettings.php:373
+msgid "Couldn't insert confirmation code."
+msgstr "സ്ഥിരീകരണ കോഡ് ഉൾപ്പെടുത്താൻ കഴിഞ്ഞില്ല."
+
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:433
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+"താങ്കൾ ചേർത്തിട്ടുള്ള ഇമെയിൽ വിലാസത്തിലേയ്ക്ക് ഒരു സ്ഥിരീകരണ കോഡ് അയച്ചിട്ടുണ്ട്. കോഡിനും "
+"അതെപ്രകാരം ഉപയോഗിക്കാമെന്ന മാർഗ്ഗനിർദ്ദേശങ്ങൾക്കും താങ്കളുടെ ഇൻബോക്സ് (ഒപ്പം സ്പാം ബോക്സും) "
+"പരിശോധിക്കുക."
+
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:454 actions/imsettings.php:386
+#: actions/smssettings.php:408
+msgid "No pending confirmation to cancel."
+msgstr "റദ്ദാക്കാനായി സ്ഥിരീകരണങ്ങളൊന്നും അവശേഷിക്കുന്നില്ല."
+
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:459
+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:468 actions/smssettings.php:422
+msgid "Couldn't delete email confirmation."
+msgstr "ഇമെയിൽ സ്ഥിരീകരണം നീക്കം ചെയ്യാൻ കഴിഞ്ഞില്ല."
+
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:473
+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:493
+msgid "That is not your email address."
+msgstr "അത് താങ്കളുടെ ഇമെയിൽ വിലാസമല്ല."
+
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:514
+msgid "The email address was removed."
+msgstr "ഇമെയിൽ വിലാസം നീക്കം ചെയ്തിരിക്കുന്നു."
+
+#: actions/emailsettings.php:528 actions/smssettings.php:568
+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:540 actions/emailsettings.php:565
+#: actions/smssettings.php:578 actions/smssettings.php:602
+msgid "Couldn't update user record."
+msgstr ""
+
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:544 actions/smssettings.php:581
+msgid "Incoming email address removed."
+msgstr "സ്വീകരിക്കാനുള്ള ഇമെയിൽ വിലാസം നീക്കം ചെയ്തിരിക്കുന്നു."
+
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:569 actions/smssettings.php:605
+msgid "New incoming email address added."
+msgstr "സ്വീകരിക്കാനുള്ള പുതിയ ഇമെയിൽ വിലാസം കൂട്ടിച്ചേർത്തിരിക്കുന്നു."
+
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr ""
+
+#: actions/favor.php:92 lib/disfavorform.php:144
+msgid "Disfavor favorite"
+msgstr ""
+
+#: actions/favorited.php:65 lib/popularnoticesection.php:62
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
+msgstr "ജനപ്രിയ അറിയിപ്പുകൾ"
+
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
+msgstr "ജനപ്രിയ അറിയിപ്പുകൾ, താൾ %d"
+
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
+msgstr "ഈ സൈറ്റിൽ ഇപ്പോഴുള്ള ഏറ്റവും ജനപ്രിയ അറിയിപ്പുകൾ."
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
+msgstr ""
+
+#: actions/favorited.php:156
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
+
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:118
+#, php-format
+msgid "%s's favorite notices"
+msgstr ""
+
+#: actions/favoritesrss.php:115
+#, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr ""
+
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr ""
+
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr ""
+
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some great users on %s"
+msgstr ""
+
+#: actions/file.php:34
+msgid "No notice ID."
+msgstr ""
+
+#: actions/file.php:38
+msgid "No notice."
+msgstr ""
+
+#: actions/file.php:42
+msgid "No attachments."
+msgstr ""
+
+#: actions/file.php:51
+msgid "No uploaded attachments."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
+msgstr "ഈ പ്രതികരണമല്ല പ്രതീക്ഷിച്ചത്!"
+
+#: actions/finishremotesubscribe.php:80
+msgid "User being listened to does not exist."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:99
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:110
+msgid "You are not authorized."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:113
+msgid "Could not convert request token to access token."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:118
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr ""
+
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+msgid "Error updating remote profile."
+msgstr ""
+
+#: actions/getfile.php:79
+msgid "No such file."
+msgstr ""
+
+#: actions/getfile.php:83
+msgid "Cannot read file."
+msgstr "പ്രമാണം വായിക്കാനാവില്ല."
+
+#: actions/grantrole.php:62 actions/revokerole.php:62
+msgid "Invalid role."
+msgstr ""
+
+#: actions/grantrole.php:66 actions/revokerole.php:66
+msgid "This role is reserved and cannot be set."
+msgstr ""
+
+#: actions/grantrole.php:75
+msgid "You cannot grant user roles on this site."
+msgstr ""
+
+#: actions/grantrole.php:82
+msgid "User already has this role."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed trying a change a subscription without providing a profile.
+#: 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 when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
+#: actions/groupblock.php:76 actions/groupunblock.php:77
+#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+msgid "No profile with that ID."
+msgstr ""
+
+#: actions/groupblock.php:81 actions/groupunblock.php:82
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr ""
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr "സംഘത്തിലെ അംഗങ്ങളെ തടയൻ കാര്യനിർവ്വാഹകനു മാത്രമേ കഴിയൂ."
+
+#: actions/groupblock.php:95
+msgid "User is already blocked from group."
+msgstr "ഉപയോക്താവ് സംഘത്തിൽ നിന്നും മുമ്പേ തന്നെ തടയപ്പെട്ടിരിക്കുന്നു."
+
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
+msgstr "ഉപയോക്താവ് സംഘത്തിലെ അംഗമല്ല."
+
+#: actions/groupblock.php:134 actions/groupmembers.php:364
+msgid "Block user from group"
+msgstr "സംഘത്തിൽ നിന്നും ഉപയോക്താവിനെ തടയുക"
+
+#: actions/groupblock.php:160
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
+"will be removed from the group, unable to post, and unable to subscribe to "
+"the group in the future."
+msgstr ""
+
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
+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:189
+msgid "Block this user from this group"
+msgstr "ഈ സംഘത്തിൽ നിന്നും ഈ ഉപയോക്താവിനെ തടയുക"
+
+#: actions/groupblock.php:206
+msgid "Database error blocking user from group."
+msgstr "സംഘത്തിൽ നിന്നും ഉപയോക്താവിനെ തടയുമ്പോൾ ഡേറ്റാബേസ് പിഴവുണ്ടായി."
+
+#: actions/groupbyid.php:74 actions/userbyid.php:70
+msgid "No ID."
+msgstr ""
+
+#: actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
+msgstr "സംഘത്തിൽ മാറ്റങ്ങൾ വരുത്താൻ താങ്കൾ ലോഗിൻ ചെയ്തിരിക്കേണ്ടതാണ്."
+
+#: actions/groupdesignsettings.php:144
+msgid "Group design"
+msgstr "സംഘത്തിന്റെ രൂപകല്പന"
+
+#: actions/groupdesignsettings.php:155
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+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".
+#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
+#: lib/designsettings.php:405 lib/designsettings.php:427
+msgid "Couldn't update your design."
+msgstr "താങ്കളുടെ രൂപകല്പന പുതുക്കാനായില്ല."
+
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+msgid "Design preferences saved."
+msgstr "രൂപകല്പനാ ക്രമീകരണങ്ങൾ സേവ് ചെയ്തിരിക്കുന്നു."
+
+#: actions/grouplogo.php:142 actions/grouplogo.php:195
+msgid "Group logo"
+msgstr "സംഘത്തിന്റെ ലോഗോ"
+
+#: actions/grouplogo.php:153
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
+
+#: actions/grouplogo.php:236
+msgid "Upload"
+msgstr "അപ്‌ലോഡ്"
+
+#: actions/grouplogo.php:289
+msgid "Crop"
+msgstr "വെട്ടിച്ചെറുതാക്കുക"
+
+#: actions/grouplogo.php:365
+msgid "Pick a square area of the image to be the logo."
+msgstr "ലോഗോ ആക്കാൻ ചിത്രത്തിന്റെ ഒരു സമചതുരത്തിലുള്ള ഭാഗം തിരഞ്ഞെടുക്കുക."
+
+#: actions/grouplogo.php:399
+msgid "Logo updated."
+msgstr "ലോഗോ പുതുക്കി."
+
+#: actions/grouplogo.php:401
+msgid "Failed updating logo."
+msgstr "ലോഗോ പുതുക്കൽ പരാജയപ്പെട്ടു."
+
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
+#, 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:107
+#, php-format
+msgid "%1$s group members, page %2$d"
+msgstr ""
+
+#: actions/groupmembers.php:122
+msgid "A list of the users in this group."
+msgstr "ഈ സംഘത്തിലെ ഉപയോക്താക്കളുടെ പട്ടിക."
+
+#: actions/groupmembers.php:186
+msgid "Admin"
+msgstr "കാര്യനിർവാഹകൻ"
+
+#. TRANS: Button text for the form that will block a user from a group.
+#: actions/groupmembers.php:399
+msgctxt "BUTTON"
+msgid "Block"
+msgstr "തടയുക"
+
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr "ഈ ഉപയോക്താവിനെ തടയുക"
+
+#: actions/groupmembers.php:498
+msgid "Make user an admin of the group"
+msgstr "ഉപയോക്താവിനെ സംഘത്തിന്റെ കാര്യനിർവ്വാഹകനാക്കുക"
+
+#. TRANS: Button text for the form that will make a user administrator.
+#: actions/groupmembers.php:533
+msgctxt "BUTTON"
+msgid "Make Admin"
+msgstr "കാര്യനിർവ്വാഹകനാക്കുക"
+
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:537
+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:142
+#, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr ""
+
+#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "സംഘങ്ങൾ"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "സംഘങ്ങൾ, താൾ %d"
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "പുതിയൊരു സംഘം സൃഷ്ടിക്കുക"
+
+#: actions/groupsearch.php:52
+#, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+
+#: actions/groupsearch.php:58
+msgid "Group search"
+msgstr "സംഘത്തിൽ തിരയുക"
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+msgid "No results."
+msgstr "ഫലങ്ങൾ ഒന്നുമില്ല"
+
+#: actions/groupsearch.php:82
+#, php-format
+msgid ""
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
+msgstr ""
+"താങ്കൾ അന്വേഷിക്കുന്ന സംഘം കണ്ടെത്താനായില്ലെങ്കിൽ, താങ്കൾ തന്നെ [അതുണ്ടാക്കുക](%%action."
+"newgroup%%)."
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+"എന്തുകൊണ്ട് താങ്കൾക്ക് തന്നെ [അംഗത്വമെടുക്കുകയും](%%action.register%%) [സംഘം സൃഷ്ടിക്കുകയും](%%"
+"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:94
+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:99
+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.
+#: actions/groupunblock.php:131 actions/unblock.php:86
+msgid "Error removing the block."
+msgstr "തടയൽ നീക്കുന്നതിൽ പിഴവുണ്ടായി."
+
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
+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:74
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+"ജാബ്ബർ/ജിറ്റോക്  [തത്സമയ സന്ദേശങ്ങൾ - instant messages] ഉപയോഗിച്ച് താങ്കൾക്ക് അറിയിപ്പുകൾ "
+"അയയ്ക്കാനും സ്വീകരിക്കാനും കഴിയുന്നതാണ് (%%doc.im%%). താങ്കളുടെ വിലാസവും സജ്ജീകരണങ്ങളും "
+"താഴെ ക്രമീകരിക്കുക."
+
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
+msgid "IM is not available."
+msgstr "ഐ.എം. ലഭ്യമല്ല."
+
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "ഐ.എം. വിലാസം"
+
+#: actions/imsettings.php:113
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "ഇപ്പോഴത്തെ സ്ഥിരീകരിക്കപ്പെട്ട ജാബ്ബർ/ജിറ്റോക് വിലാസം"
+
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
+#, php-format
+msgid ""
+"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
+"message with further instructions. (Did you add %s to your buddy list?)"
+msgstr ""
+"ഈ വിലാസം സ്ഥിരീകരണത്തിന് അവശേഷിക്കുന്നു. കൂടുതൽ നിർദ്ദേശങ്ങൾക്ക് താങ്കളുടെ ജാബ്ബർ/ജിറ്റോക് "
+"അംഗത്വത്തിലുള്ള സന്ദേശം പരിശോധിക്കുക. (%s ഒരു സുഹൃത്തായി താങ്കളുടെ പട്ടികയിലുണ്ടോ?)"
+
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM 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:143
+#, php-format
+msgid ""
+"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
+"add %s to your buddy list in your IM client or on GTalk."
+msgstr ""
+
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:158
+msgid "IM preferences"
+msgstr "ഐ.എം. ക്രമീകരണങ്ങൾ"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:163
+msgid "Send me notices through Jabber/GTalk."
+msgstr "ജാബ്ബർ/ജിറ്റോക് വഴി എനിക്ക് അറിയിപ്പുകൾ അയയ്ക്കുക."
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:169
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "എന്റെ ജാബ്ബർ/ജിറ്റോക് സ്ഥിതിവിവരം മാറുമ്പോൾ അറിയിപ്പുകൾ പ്രസിദ്ധീകരിക്കുക."
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:175
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:182
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr ""
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:290 actions/othersettings.php:190
+msgid "Preferences saved."
+msgstr "ക്രമീകരണങ്ങൾ സേവ് ചെയ്തു."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:312
+msgid "No Jabber ID."
+msgstr "ജാബ്ബർ ഐ.ഡി. അല്ല."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:320
+msgid "Cannot normalize that Jabber ID"
+msgstr ""
+
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:325
+msgid "Not a valid Jabber ID"
+msgstr "ജാബർ ഐ.ഡി. അസാധുവാണ്"
+
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:329
+msgid "That is already your Jabber ID."
+msgstr "അത് ഇപ്പോൾ തന്നെ താങ്കളുടെ ജാബ്ബർ ഐ.ഡി. ആണ്."
+
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:333
+msgid "Jabber ID already belongs to another user."
+msgstr "ജാബ്ബർ ഐ.ഡി. മുമ്പേ തന്നെ മറ്റൊരു ഉപയോക്താവിന്റേതാണ്."
+
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:361
+#, 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 canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:391
+msgid "That is the wrong IM address."
+msgstr "ഇത് തെറ്റായ ഐ.എം. വിലാസമാണ്."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:400
+msgid "Couldn't delete IM confirmation."
+msgstr ""
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:405
+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:427
+msgid "That is not your Jabber ID."
+msgstr "അത് താങ്കളുടെ ജാബ്ബർ ഐ.ഡി. അല്ല."
+
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:450
+msgid "The IM address was removed."
+msgstr "ഐ.എം. വിലാസം നീക്കം ചെയ്തിരിക്കുന്നു."
+
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr ""
+
+#: actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr ""
+
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+
+#. TRANS: Client error displayed when trying to sent invites while they have been disabled.
+#: actions/invite.php:40
+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:44
+#, 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:77
+#, php-format
+msgid "Invalid email address: %s."
+msgstr "അസാധുവായ ഇമെയിൽ വിലാസം: %s."
+
+#. TRANS: Page title when invitations have been sent.
+#: actions/invite.php:116
+msgid "Invitations sent"
+msgstr "ക്ഷണങ്ങൾ അയച്ചിരിക്കുന്നു"
+
+#. TRANS: Page title when inviting potential users.
+#: actions/invite.php:119
+msgid "Invite new users"
+msgstr "പുതിയ ഉപയോക്താക്കളെ ക്ഷണിക്കുക"
+
+#. TRANS: Message displayed inviting users to use a StatusNet site while the inviting user
+#. 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:139
+msgid "You are already subscribed to this user:"
+msgid_plural "You are already subscribed to these users:"
+msgstr[0] ""
+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:145 actions/invite.php:159
+#, php-format
+msgctxt "INVITE"
+msgid "%1$s (%2$s)"
+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:153
+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:"
+msgstr[0] ""
+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:167
+msgid "Invitation sent to the following person:"
+msgid_plural "Invitations sent to the following people:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Generic message displayed after sending out one or more invitations to
+#. TRANS: people to join a StatusNet site.
+#: actions/invite.php:177
+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:190
+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:217
+msgid "Email addresses"
+msgstr "ഇമെയിൽ വിലാസം"
+
+#. TRANS: Tooltip for field label for a list of e-mail addresses.
+#: actions/invite.php:220
+msgid "Addresses of friends to invite (one per line)"
+msgstr "ക്ഷണിക്കേണ്ട സുഹൃത്തുക്കളുടെ വിലാസം (ഒരു വരിയിൽ ഒന്നു വീതം)"
+
+#. TRANS: Field label for a personal message to send to invitees.
+#: actions/invite.php:224
+msgid "Personal message"
+msgstr "സ്വകാര്യ സന്ദേശം"
+
+#. TRANS: Tooltip for field label for a personal message to send to invitees.
+#: actions/invite.php:227
+msgid "Optionally add a personal message to the invitation."
+msgstr "ക്ഷണത്തിൽ താങ്കളുടെ സ്വന്തം സന്ദേശം കൂടി വേണമെങ്കിൽ കൂട്ടിച്ചേർക്കുക."
+
+#. TRANS: Send button for inviting friends
+#: actions/invite.php:231
+msgctxt "BUTTON"
+msgid "Send"
+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:263
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s താങ്കളെ, അവരോടൊപ്പം %2$s സൈറ്റിൽ ചേരാൻ ക്ഷണിച്ചിരിക്കുന്നു"
+
+#. TRANS: Body text 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 the
+#. 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:270
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
+msgstr "ഒരു സംഘത്തിൽ ചേരാൻ താങ്കൾ ലോഗിൻ ചെയ്തിരിക്കേണ്ടതാണ്."
+
+#: actions/joingroup.php:141
+#, php-format
+msgid "%1$s joined group %2$s"
+msgstr "%1$s %2$s എന്ന സംഘത്തിൽ ചേർന്നു"
+
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
+msgstr "ഒരു സംഘത്തിൽ നിന്നും പുറത്തുപോകാൻ താങ്കൾ ലോഗിൻ ചെയ്തിരിക്കേണ്ടതാണ്."
+
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:386
+msgid "You are not a member of that group."
+msgstr "താങ്കൾ ആ സംഘത്തിൽ അംഗമല്ല."
+
+#: actions/leavegroup.php:137
+#, php-format
+msgid "%1$s left group %2$s"
+msgstr "%1$s %2$s എന്ന സംഘത്തിൽ നിന്നും ഒഴിവായി"
+
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr "അനുമതി"
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr "ഈ സ്റ്റാറ്റസ്‌നെറ്റ് സൈറ്റിന്റെ ഉപയോഗാനുമതി"
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr "അനുമതി തിരഞ്ഞെടുക്കൽ അസാധുവാണ്."
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+"എല്ലാ അവകാശങ്ങളും സംരക്ഷിതമായ ഉള്ളടക്കമാണ് ഉപയോഗിക്കുന്നതെങ്കിൽ ഉടമയെ വ്യക്തമാക്കേണ്ടതാണ്."
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr "അസാധുവായ അനുമതി തലക്കെട്ട്. പരമാവധി നീളം 255 അക്ഷരങ്ങൾ."
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr "അനുമതിയുടെ യു.ആർ.എൽ. അസാധുവാണ്."
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr "അനുമതി ചിത്രത്തിന്റെ യു.ആർ.എൽ. അസാധുവാണ്."
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr "അനുമതി തിരഞ്ഞെടുക്കൽ"
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr "സ്വകാര്യം"
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr "എല്ലാ അവകാശങ്ങളും സംരക്ഷിതം"
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr "ക്രിയേറ്റീവ് കോമൺസ്"
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr "തരം"
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr "അനുമതി തിരഞ്ഞെടുക്കുക"
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr "അനുമതിയുടെ വിശദാംശങ്ങൾ"
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr "ഉടമ"
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr "സൈറ്റിന്റെ ഉള്ളടക്കത്തിന്റെ ഉടമയുടെ (സാദ്ധ്യമെങ്കിൽ) പേര്."
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr "അനുമതിയുടെ തലക്കെട്ട്"
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr "അനുമതിയുടെ ശീർഷകം."
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr "അനുമതിയുടെ യൂ.ആർ.എൽ."
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr "അനുമതിയെക്കുറിച്ച് കൂടുതൽ വിവരങ്ങൾ നൽകുന്ന യൂ.ആർ.എൽ."
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr "അനുമതി ചിത്ര യൂ.ആർ.എൽ."
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr "അനുമതിയോടൊപ്പം പ്രദർശിപ്പിക്കേണ്ട ചിത്രത്തിന്റെ യൂ.ആർ.എൽ.."
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr "അനുമതി സജ്ജീകരണങ്ങൾ സേവ് ചെയ്യുക"
+
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+msgid "Already logged in."
+msgstr "മുമ്പേ തന്നെ ലോഗിൻ ചെയ്തിട്ടുണ്ട്."
+
+#: actions/login.php:148
+msgid "Incorrect username or password."
+msgstr "ഉപയോക്തൃനാമമോ രഹസ്യവാക്കോ തെറ്റാണ്."
+
+#: actions/login.php:154 actions/otp.php:120
+msgid "Error setting user. You are probably not authorized."
+msgstr ""
+
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
+msgid "Login"
+msgstr "പ്രവേശിക്കുക"
+
+#: actions/login.php:249
+msgid "Login to site"
+msgstr "സൈറ്റിലേക്ക് പ്രവേശിക്കുക"
+
+#: actions/login.php:258 actions/register.php:491
+msgid "Remember me"
+msgstr "എന്നെ ഓർത്തുവെയ്ക്കുക"
+
+#: actions/login.php:259 actions/register.php:493
+msgid "Automatically login in the future; not for shared computers!"
+msgstr "ഭാവിയിൽ സ്വയം ലോഗിൻ ചെയ്യുക; പങ്ക് വെച്ച് ഉപയോഗിക്കുന്ന കമ്പ്യൂട്ടറുകളിൽ പാടില്ല!"
+
+#: actions/login.php:269
+msgid "Lost or forgotten password?"
+msgstr "രഹസ്യവാക്ക് നഷ്ടപ്പെടുകയോ മറക്കുകയോ ചെയ്തോ?"
+
+#: actions/login.php:288
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+"സുരക്ഷാകാരണങ്ങളാൽ, താങ്കളുടെ ഉപയോക്തൃനാമവും രഹസ്യവാക്കും സജ്ജീകരണങ്ങളിൽ മാറ്റം വരുത്തുന്നതിനു "
+"മുമ്പ് ഒരു പ്രാവശ്യം നൽകേണ്ടതാണ്."
+
+#: actions/login.php:292
+msgid "Login with your username and password."
+msgstr "താങ്കളുടെ ഉപയോക്തൃനാമവും രഹസ്യവാക്കും ഉപയോഗിച്ച് ലോഗിൻ ചെയ്യുക."
+
+#: actions/login.php:295
+#, php-format
+msgid ""
+"Don't have a username yet? [Register](%%action.register%%) a new account."
+msgstr "ഇതുവരെ ഒരു ഉപയോക്തൃനാമം ഇല്ലേ?? പുതിയൊരു [അംഗത്വമെടുക്കുക](%%action.register%%)."
+
+#: actions/makeadmin.php:92
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:96
+#, php-format
+msgid "%1$s is already an admin for group \"%2$s\"."
+msgstr ""
+
+#: actions/makeadmin.php:133
+#, php-format
+msgid "Can't get membership record for %1$s in group %2$s."
+msgstr ""
+
+#: actions/makeadmin.php:146
+#, php-format
+msgid "Can't make %1$s an admin for group %2$s."
+msgstr ""
+
+#: actions/microsummary.php:69
+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:65
+msgid "You must be logged in to register an application."
+msgstr ""
+
+#: actions/newapplication.php:147
+msgid "Use this form to register a new application."
+msgstr ""
+
+#: actions/newapplication.php:184
+msgid "Source URL is required."
+msgstr "സ്രോതസ്സ് യു.ആർ.എൽ. ആവശ്യമാണ്."
+
+#: actions/newapplication.php:266 actions/newapplication.php:275
+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 ""
+
+#: actions/newmessage.php:71 actions/newmessage.php:234
+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
+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
+msgid "No content!"
+msgstr "ഉള്ളടക്കമില്ല!"
+
+#: actions/newmessage.php:161
+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
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly instead."
+msgstr "താങ്കൾക്കു തന്നെ സന്ദേശം അയയ്ക്കരുത്; പകരം അത് പതുക്കെ സ്വയം പറയുക."
+
+#: actions/newmessage.php:184
+msgid "Message sent"
+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
+#, php-format
+msgid "Direct message to %s sent."
+msgstr ""
+
+#: actions/newmessage.php:213 actions/newnotice.php:264
+msgid "Ajax Error"
+msgstr "അജാക്സ് പിഴവ്"
+
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "പുതിയ അറിയിപ്പ്"
+
+#: actions/newnotice.php:230
+msgid "Notice posted"
+msgstr "അറിയിപ്പ് പ്രസിദ്ധീകരിച്ചിരിക്കുന്നു"
+
+#: actions/noticesearch.php:68
+#, php-format
+msgid ""
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
+msgstr ""
+
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "എഴുത്തുകളിലെ തിരച്ചിൽ"
+
+#: actions/noticesearch.php:91
+#, php-format
+msgid "Search results for \"%1$s\" on %2$s"
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: actions/noticesearch.php:124
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
+msgstr ""
+
+#: actions/noticesearchrss.php:96
+#, php-format
+msgid "Updates with \"%s\""
+msgstr ""
+
+#: actions/noticesearchrss.php:98
+#, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr ""
+
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set their email "
+"address yet."
+msgstr ""
+
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr ""
+
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr ""
+
+#. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
+#: actions/oauthappssettings.php:60
+msgid "You must be logged in to list your applications."
+msgstr ""
+
+#. TRANS: Page title for OAuth applications
+#: actions/oauthappssettings.php:76
+msgid "OAuth applications"
+msgstr ""
+
+#. TRANS: Page instructions for OAuth applications
+#: actions/oauthappssettings.php:88
+msgid "Applications you have registered"
+msgstr ""
+
+#. TRANS: Empty list message on page with OAuth applications.
+#: actions/oauthappssettings.php:141
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#. TRANS: Title for OAuth connection settings.
+#: actions/oauthconnectionssettings.php:71
+msgid "Connected applications"
+msgstr ""
+
+#. TRANS: Instructions for OAuth connection settings.
+#: 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: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: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:202
+#, php-format
+msgid ""
+"You have successfully revoked access for %1$s and the access token starting "
+"with %2$s."
+msgstr ""
+
+#. TRANS: Empty list message when no applications have been authorised yet.
+#: 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: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:80 actions/shownotice.php:100
+msgid "Notice has no profile."
+msgstr ""
+
+#: actions/oembed.php:83 actions/shownotice.php:172
+#, php-format
+msgid "%1$s's status on %2$s"
+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: Client error on an API request with an unsupported data format.
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1362
+msgid "Not a supported data format."
+msgstr ""
+
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "ഉപയോക്താക്കളെ തിരയുക"
+
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "അറിയിപ്പുകൾ തിരയുക"
+
+#: actions/othersettings.php: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. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
+msgid " (free service)"
+msgstr " (സൗജന്യ സേവനം)"
+
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
+msgid "Shorten URLs with"
+msgstr ""
+
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
+msgid "View profile designs"
+msgstr ""
+
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
+msgid "Show or hide profile designs."
+msgstr ""
+
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr ""
+
+#: actions/otp.php:69
+msgid "No user ID specified."
+msgstr "ഉപയോക്തൃ ഐ.ഡി. വ്യക്തമാക്കിയിട്ടില്ല."
+
+#: actions/otp.php:83
+msgid "No login token specified."
+msgstr "ലോഗിൻ ചീട്ട് വ്യക്തമാക്കിയിട്ടില്ല."
+
+#: actions/otp.php:90
+msgid "No login token requested."
+msgstr "ലോഗിൻ ചീറ്റ് ആവശ്യപ്പെട്ടിട്ടില്ല."
+
+#: actions/otp.php:95
+msgid "Invalid login token specified."
+msgstr "വ്യക്തമാക്കിയത് അസാധുവായ ലോഗിൻ ചീട്ട് ആണ്."
+
+#: actions/otp.php:104
+msgid "Login token expired."
+msgstr "ലോഗിൻ ചീട്ട് കാലഹരണപ്പെട്ടിരിക്കുന്നു."
+
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr ""
+
+#: actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
+msgstr ""
+
+#: actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "രഹസ്യവാക്ക് മാറ്റുക"
+
+#: actions/passwordsettings.php:69
+msgid "Change your password."
+msgstr "താങ്കളുടെ രഹസ്യവാക്ക് മാറ്റുക."
+
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+msgid "Password change"
+msgstr "രഹസ്യവാക്ക് മാറ്റൽ"
+
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "പഴയ രഹസ്യവാക്ക്"
+
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "പുതിയ രഹസ്യവാക്ക്"
+
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ"
+
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "മുകളിലുള്ള രഹസ്യവാക്ക് തന്നെ"
+
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "മാറ്റുക"
+
+#: actions/passwordsettings.php:154 actions/register.php:238
+msgid "Password must be 6 or more characters."
+msgstr "രഹസ്യവാക്കിന് ആറോ അതിലധികമോ അക്ഷരങ്ങളുണ്ടായിരിക്കണം."
+
+#: actions/passwordsettings.php:157 actions/register.php:241
+msgid "Passwords don't match."
+msgstr "രഹസ്യവാക്കുകൾ തമ്മിൽ യോജിക്കുന്നില്ല"
+
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "പഴയ രഹസ്യവാക്ക് തെറ്റാണ്"
+
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr ""
+
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+msgid "Can't save new password."
+msgstr "പുതിയ രഹസ്യവാക്ക് സേവ് ചെയ്യാനായില്ല."
+
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+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.
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+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 ""
+
+#: actions/peoplesearch.php:52
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr ""
+
+#: actions/peopletag.php: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 ""
+
+#: 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:61
+msgid "Profile settings"
+msgstr ""
+
+#. TRANS: Usage instructions for profile settings.
+#: actions/profilesettings.php:73
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+
+#. TRANS: Profile settings form legend.
+#: actions/profilesettings.php:102
+msgid "Profile information"
+msgstr ""
+
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:113
+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.
+#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/showgroup.php:252 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:152
+msgid "Full name"
+msgstr "പൂർണ്ണനാമം"
+
+#. TRANS: Field label in form for profile settings.
+#. TRANS: Form input field label.
+#: actions/profilesettings.php:122 actions/register.php:461
+#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "ഹോംപേജ്"
+
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:125
+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:133 actions/register.php:472
+#, php-format
+msgid "Describe yourself and your interests in %d character"
+msgid_plural "Describe yourself and your interests in %d characters"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:139 actions/register.php:477
+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:143 actions/register.php:479
+msgid "Bio"
+msgstr ""
+
+#. TRANS: Field label in form for profile settings.
+#. TRANS: Label for group location (dt). Text hidden by default.
+#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/showgroup.php:262 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: lib/userprofile.php:167
+msgid "Location"
+msgstr "സ്ഥലം"
+
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:152 actions/register.php:486
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "താങ്കളെവിടെയാണ്, അതായത് \"നഗരം, സംസ്ഥാനം (അഥവ പ്രദേശം), രാജ്യം\" എന്ന്"
+
+#. TRANS: Checkbox label in form for profile settings.
+#: actions/profilesettings.php:157
+msgid "Share my current location when posting notices"
+msgstr "അറിയിപ്പുകൾ പ്രസിദ്ധീകരിക്കുന്നതിനോടൊപ്പം എന്റെ ഇപ്പോഴത്തെ സ്ഥലവും പങ്കുവെയ്ക്കുക"
+
+#. TRANS: Field label in form for profile settings.
+#: actions/profilesettings.php:165 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:212
+msgid "Tags"
+msgstr "റ്റാഗുകൾ"
+
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:168
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#. TRANS: Dropdownlist label in form for profile settings.
+#: actions/profilesettings.php:173
+msgid "Language"
+msgstr "ഭാഷ"
+
+#. TRANS: Tooltip for dropdown list label in form for profile settings.
+#: actions/profilesettings.php:175
+msgid "Preferred language"
+msgstr "പ്രിയങ്കര ഭാഷ"
+
+#. TRANS: Dropdownlist label in form for profile settings.
+#: actions/profilesettings.php:185
+msgid "Timezone"
+msgstr "സമയ മേഖല"
+
+#. TRANS: Tooltip for dropdown list label in form for profile settings.
+#: actions/profilesettings.php:187
+msgid "What timezone are you normally in?"
+msgstr "താങ്കൾ സാധാരണയുണ്ടാകാറുള്ള സമയമേഖല ഏതാണ്?"
+
+#. TRANS: Checkbox label in form for profile settings.
+#: actions/profilesettings.php:193
+msgid ""
+"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:262 actions/register.php:229
+#, php-format
+msgid "Bio is too long (maximum %d character)."
+msgid_plural "Bio is too long (maximum %d characters)."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Validation error in form for profile settings.
+#: actions/profilesettings.php:273 actions/siteadminpanel.php:151
+msgid "Timezone not selected."
+msgstr "സമയമേഖല തിരഞ്ഞെടുത്തിട്ടില്ല."
+
+#. TRANS: Validation error in form for profile settings.
+#: actions/profilesettings.php:281
+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:295 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
+#. TRANS: automatically subscribe to any subscriber.
+#: actions/profilesettings.php:351
+msgid "Couldn't update user for autosubscribe."
+msgstr ""
+
+#. TRANS: Server error thrown when user profile location preference settings could not be updated.
+#: actions/profilesettings.php:409
+msgid "Couldn't save location prefs."
+msgstr ""
+
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/profilesettings.php:422
+msgid "Couldn't save profile."
+msgstr ""
+
+#. TRANS: Server error thrown when user profile settings tags could not be saved.
+#: actions/profilesettings.php:431
+msgid "Couldn't save tags."
+msgstr ""
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+#: actions/profilesettings.php:440 lib/adminpanelaction.php:138
+msgid "Settings saved."
+msgstr "സജ്ജീകരണങ്ങൾ സേവ് ചെയ്തിരിക്കുന്നു."
+
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, 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 ""
+
+#: 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-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
+msgstr ""
+
+#: actions/public.php:247
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANS: Message shown to a anonymous user for the public tag cloud
+#. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
+#. 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 "
+"one!"
+msgstr ""
+
+#: actions/publictagcloud.php:146
+msgid "Tag cloud"
+msgstr ""
+
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "താങ്കൾ മുമ്പേതന്നെ ലോഗിൻ ചെയ്തിട്ടുണ്ട്!"
+
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr ""
+
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr ""
+
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr ""
+
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "സ്ഥിരീകരണ കോഡിൽ പിഴവുണ്ട്."
+
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr "ഈ സ്ഥിരീകരണ കോഡ് വളരെ പഴക്കമേറിയതാണ്. ദയവായി ആദ്യം മുതൽ വീണ്ടും ശ്രമിക്കുക."
+
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
+msgstr ""
+
+#: actions/recoverpassword.php:152
+msgid ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
+msgstr ""
+"താങ്കളുടെ രഹസ്യവാക്ക് നഷ്ടപ്പെടുകയോ മറക്കുകയോ ചെയ്താൽ, താങ്കളുടെ അംഗത്വത്തിനൊപ്പം "
+"സൂക്ഷിച്ചിട്ടുള്ള ഇമെയിൽ വിലാസത്തിലേക്ക് പുതിയ ഒരെണ്ണം അയച്ചു വാങ്ങാനാകുന്നതാണ്."
+
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
+msgstr "താങ്കൾ തിരിച്ചറിയപ്പെട്ടിരിക്കുന്നു. താഴെ പുതിയ രഹസ്യവാക്ക് നൽകുക. "
+
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
+msgstr "രഹസ്യവാക്ക് വീണ്ടെടുക്കൽ"
+
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
+msgstr "വിളിപ്പേര് അല്ലെങ്കിൽ ഇമെയിൽ വിലാസം"
+
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr ""
+"ഈ സെർവറിലെ താങ്കളുടെ വിളിപ്പേര്, അഥവാ താങ്കൾ രജിസ്റ്റർ ചെയ്തിട്ടുള്ള ഇമെയിൽ വിലാസം."
+
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "വീണ്ടെടുക്കുക"
+
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "രഹസ്യവാക്ക് പുനഃക്രമീകരിക്കുക"
+
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "രഹസ്യവാക്ക് വീണ്ടെടുക്കുക"
+
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+msgid "Password recovery requested"
+msgstr "രഹസ്യവാക്ക് വീണ്ടെടുക്കൽ ആവശ്യപ്പെട്ടിരിക്കുന്നു"
+
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "അജ്ഞാതമായ പ്രവൃത്തി"
+
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ, അത് മറക്കരുത്!"
+
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "പുനഃക്രമീകരിക്കുക"
+
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "ഒരു വിളിപ്പേരോ ഇമെയിൽ വിലാസമോ നൽകുക."
+
+#: actions/recoverpassword.php:282
+msgid "No user with that email address or username."
+msgstr "ആ ഇമെയിൽ വിലാസമോ ഉപയോക്തൃനാമമോ ഉപയോഗിക്കുന്ന ഒരു ഉപയോക്താവും ഇല്ല."
+
+#: actions/recoverpassword.php:299
+msgid "No registered email address for that user."
+msgstr "ആ ഉപയോക്താവ് ഇമെയിൽ വിലാസമൊന്നും നൽകിയിട്ടില്ല."
+
+#: actions/recoverpassword.php:313
+msgid "Error saving address confirmation."
+msgstr "വിലാസത്തിന്റെ സ്ഥിരീകരണം സേവ് ചെയ്യുമ്പോൾ പിഴവുണ്ടായി."
+
+#: actions/recoverpassword.php:338
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr ""
+
+#: actions/recoverpassword.php:357
+msgid "Unexpected password reset."
+msgstr ""
+
+#: actions/recoverpassword.php:365
+msgid "Password must be 6 characters or more."
+msgstr "രഹസ്യവാക്കിന് ആറോ അതിലധികമോ അക്ഷരങ്ങളുണ്ടായിരിക്കണം."
+
+#: actions/recoverpassword.php:369
+msgid "Password and confirmation do not match."
+msgstr "രഹസ്യവാക്കും സ്ഥിരീകരണവും യോജിക്കുന്നില്ല."
+
+#: actions/recoverpassword.php:388 actions/register.php:256
+msgid "Error setting user."
+msgstr "ഉപയോക്താവിനെ സജ്ജീകരിക്കുന്നതിൽ പിഴവുണ്ടായി."
+
+#: actions/recoverpassword.php:395
+msgid "New password successfully saved. You are now logged in."
+msgstr "പുതിയ രഹസ്യവാക്ക് വിജയകരമായി സേവ് ചെയ്തു. താങ്കൾക്ക് ലോഗിൻ ചെയ്യാവുന്നതാണ്."
+
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+msgid "Sorry, only invited people can register."
+msgstr "ക്ഷമിക്കുക, ക്ഷണിക്കപ്പെട്ടവർക്കു മാത്രമേ അംഗത്വമെടുക്കാനാകൂ."
+
+#: actions/register.php:99
+msgid "Sorry, invalid invitation code."
+msgstr "ക്ഷമിക്കുക, ക്ഷണത്തിന്റെ കോഡ് അസാധുവാണ്."
+
+#: actions/register.php:119
+msgid "Registration successful"
+msgstr "അംഗത്വമെടുക്കൽ വിജയകരം"
+
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+msgid "Register"
+msgstr "അംഗത്വമെടുക്കുക"
+
+#: actions/register.php:142
+msgid "Registration not allowed."
+msgstr "അംഗത്വമെടുക്കൽ അനുവദിച്ചിട്ടില്ല."
+
+#: actions/register.php:209
+msgid "You can't register if you don't agree to the license."
+msgstr "താങ്കൾ അനുവാദ പത്രം അംഗീകരിക്കുകയില്ലെങ്കിൽ അംഗത്വമെടുക്കാനുകുകയില്ല."
+
+#: actions/register.php:218
+msgid "Email address already exists."
+msgstr "ഇമെയിൽ വിലാസം മുമ്പേ നിലവിലുണ്ട്."
+
+#: actions/register.php:251 actions/register.php:273
+msgid "Invalid username or password."
+msgstr "ഉപയോക്തൃനാമമോ രഹസ്യവാക്കോ അസാധുവാണ്."
+
+#: 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. "
+msgstr ""
+
+#: actions/register.php:433
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr ""
+
+#: actions/register.php:438
+msgid "6 or more characters. Required."
+msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ. ആവശ്യമാണ്."
+
+#: actions/register.php:442
+msgid "Same as password above. Required."
+msgstr "മുകളിൽ നിലകിയിരിക്കുന്ന രഹസ്യവാക്കിനു തുല്യമായത്. നിർബന്ധമാണ്."
+
+#. TRANS: Link description in user account settings menu.
+#: actions/register.php:446 actions/register.php:450
+#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
+msgid "Email"
+msgstr "ഇമെയിൽ"
+
+#: actions/register.php:447 actions/register.php:451
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+
+#: actions/register.php:458
+msgid "Longer name, preferably your \"real\" name"
+msgstr "വലിയ പേര്, താങ്കളുടെ \"യഥാർത്ഥ\" പേര് നൽകാൻ താത്പര്യപ്പെടുന്നു"
+
+#: actions/register.php:463
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr ""
+
+#: actions/register.php:524
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:534
+#, 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:538
+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:541
+msgid "All rights reserved."
+msgstr "എല്ലാ അവകാശങ്ങളും സംരക്ഷിതം."
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:546
+#, 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:589
+#, php-format
+msgid ""
+"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
+"\n"
+"* Go to [your profile](%2$s) and post your first message.\n"
+"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
+"notices through instant messages.\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
+"share your interests. \n"
+"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
+"others more about you. \n"
+"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
+"missed. \n"
+"\n"
+"Thanks for signing up and we hope you enjoy using this service."
+msgstr ""
+
+#: actions/register.php:613
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: actions/remotesubscribe.php:98
+#, php-format
+msgid ""
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+msgstr ""
+
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr ""
+
+#: actions/remotesubscribe.php:124
+msgid "Subscribe to a remote user"
+msgstr ""
+
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "ഉപയോക്തൃ വിളിപ്പേര്"
+
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "താങ്കൾക്ക് പിന്തുടരേണ്ട ഉപയോക്താവിന്റെ വിളിപ്പേര്"
+
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr ""
+
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr ""
+
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:411
+msgid "Subscribe"
+msgstr "വരിക്കാരാകുക"
+
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
+msgstr ""
+
+#: actions/remotesubscribe.php:176
+msgid "That’s a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/remotesubscribe.php:183
+msgid "Couldn’t get a request token."
+msgstr ""
+
+#: actions/repeat.php:57
+msgid "Only logged-in users can repeat notices."
+msgstr ""
+
+#: actions/repeat.php:64 actions/repeat.php:71
+msgid "No notice specified."
+msgstr ""
+
+#: actions/repeat.php:76
+msgid "You can't repeat your own notice."
+msgstr "താങ്കൾക്ക് താങ്കളുടെ തന്നെ അറിയിപ്പ് ആവർത്തിക്കാനാവില്ല."
+
+#: actions/repeat.php:90
+msgid "You already repeated that notice."
+msgstr "താങ്കൾ ആ അറിയിപ്പ് മുമ്പേ തന്നെ ആവർത്തിച്ചിരിക്കുന്നു."
+
+#: actions/repeat.php:114 lib/noticelist.php:692
+msgid "Repeated"
+msgstr "ആവർത്തിച്ചു"
+
+#: actions/repeat.php:119
+msgid "Repeated!"
+msgstr "ആവർത്തിച്ചു!"
+
+#: actions/replies.php:126 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:108
+#, 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."
+"newnotice%%%%?status_textarea=%3$s)."
+msgstr ""
+
+#: actions/repliesrss.php:72
+#, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr ""
+
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "ഉപയോക്താവിനു മാത്രമേ അദ്ദേഹത്തിന്റെ സ്വന്തം സമയരേഖ ചേർക്കാൻ കഴിയൂ."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "താങ്കൾക്ക് താങ്കളുടെ തന്നെ അറിയിപ്പ് ആവർത്തിക്കാനാവില്ല."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, fuzzy
+msgid "No uploaded file."
+msgstr "പ്രമാണം അപ്‌ലോഡ് ചെയ്യുക"
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: actions/restoreaccount.php:130 lib/mediafile.php:194
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:136 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:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr ""
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "അംഗം അല്ല"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, 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:146 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
+msgid "Save site settings"
+msgstr ""
+
+#: actions/showapplication.php:82
+msgid "You must be logged in to view an application."
+msgstr ""
+
+#: actions/showapplication.php:157
+msgid "Application profile"
+msgstr ""
+
+#. TRANS: Form input field label for application icon.
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
+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:175
+msgid "Description"
+msgstr "വിവരണം"
+
+#. TRANS: Header for group statistics on a group page (h2).
+#: actions/showapplication.php:192 actions/showgroup.php:448
+#: lib/profileaction.php:187
+msgid "Statistics"
+msgstr "സ്ഥിതിവിവരക്കണക്കുകൾ"
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
+msgid "Delete"
+msgstr "മായ്ക്കുക"
+
+#: actions/showapplication.php:261
+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
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr ""
+
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
+msgstr ""
+
+#: actions/showfavorites.php:171
+#, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr ""
+
+#: actions/showfavorites.php:178
+#, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr ""
+
+#: actions/showfavorites.php:185
+#, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr ""
+
+#: actions/showfavorites.php:206
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
+msgstr ""
+
+#: actions/showfavorites.php:208
+#, php-format
+msgid ""
+"%s hasn't added any favorite notices yet. Post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:212
+#, php-format
+msgid ""
+"%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
+"action.register%%%%) and then post something interesting they would add to "
+"their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:243
+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: Group profile header (h2). Text hidden by default.
+#: actions/showgroup.php:220
+msgid "Group profile"
+msgstr ""
+
+#. TRANS: Label for group URL (dt). Text hidden by default.
+#: actions/showgroup.php:270 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:180
+msgid "URL"
+msgstr "യൂ.ആർ.എൽ."
+
+#. TRANS: Label for group description or group note (dt). Text hidden by default.
+#: actions/showgroup.php:282 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:197
+msgid "Note"
+msgstr "കുറിപ്പ്"
+
+#. TRANS: Label for group aliases (dt). Text hidden by default.
+#: actions/showgroup.php:293 lib/groupeditform.php:187
+msgid "Aliases"
+msgstr ""
+
+#. TRANS: Group actions header (h2). Text hidden by default.
+#: actions/showgroup.php:304
+msgid "Group actions"
+msgstr ""
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:345
+#, 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:352
+#, 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:359
+#, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr ""
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:365
+#, php-format
+msgid "FOAF for %s group"
+msgstr ""
+
+#. TRANS: Header for mini list of group members on a group page (h2).
+#: actions/showgroup.php:402
+msgid "Members"
+msgstr "അംഗങ്ങൾ"
+
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#: actions/showgroup.php:408 lib/profileaction.php:117
+#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#: lib/subscriptionlist.php:127 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:417
+msgid "All members"
+msgstr "എല്ലാ അംഗങ്ങളും"
+
+#. TRANS: Label for creation date in statistics on group page.
+#: actions/showgroup.php:453
+msgctxt "LABEL"
+msgid "Created"
+msgstr "സൃഷ്ടിച്ചിരിക്കുന്നു"
+
+#. TRANS: Label for member count in statistics on group page.
+#: actions/showgroup.php:461
+msgctxt "LABEL"
+msgid "Members"
+msgstr ""
+
+#. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
+#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %%%%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:476
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+
+#. 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:486
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
+msgstr ""
+
+#. TRANS: Header for list of group administrators on a group page (h2).
+#: actions/showgroup.php:515
+msgid "Admins"
+msgstr "കാര്യനിർവാഹകർ"
+
+#. TRANS: Client error displayed requesting a single message that does not exist.
+#: actions/showmessage.php:79
+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:97
+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:110
+#, 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:118
+#, 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
+#, 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, %1$d is the page number.
+#: actions/showstream.php:74
+#, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr ""
+
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
+#, php-format
+msgid "%1$s, page %2$d"
+msgstr ""
+
+#. 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:211
+#, 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
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+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
+#, php-format
+msgid ""
+"You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
+"%?status_textarea=%2$s)."
+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
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
+msgstr ""
+
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
+#, php-format
+msgid "Repeat of %s"
+msgstr ""
+
+#: 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 ""
+
+#: 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:59
+msgid "SMS settings"
+msgstr ""
+
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
+#, 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:97
+msgid "SMS is not available."
+msgstr "എസ്.എം.എസ്. ലഭ്യമല്ല."
+
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+msgid "SMS address"
+msgstr "എസ്.എം.എസ്. വിലാസം"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
+msgid "Confirmation code"
+msgstr "സ്ഥിരീകരണ കോഡ്"
+
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "സ്ഥിരീകരിക്കുക"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
+msgid "SMS phone number"
+msgstr ""
+
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr ""
+
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+msgid "SMS preferences"
+msgstr ""
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
+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:315
+msgid "SMS preferences saved."
+msgstr ""
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
+msgid "No phone number."
+msgstr "ഫോൺ നമ്പർ നൽകിയിട്ടില്ല."
+
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
+msgid "No carrier selected."
+msgstr ""
+
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
+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:356
+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:384
+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:413
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+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:448
+msgid "That is not your phone number."
+msgstr ""
+
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+msgid "The SMS phone number was removed."
+msgstr ""
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
+msgid "Mobile carrier"
+msgstr ""
+
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
+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:525
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
+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 ""
+
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:117
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr ""
+
+#: actions/subscribe.php:145
+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 ""
+
+#. 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:116
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor."
+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:120
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr ""
+
+#. TRANS: Subscriber list text when looking at the subscribers for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#. 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:129
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+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 ""
+
+#. 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 ""
+
+#. 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.
+#: actions/subscriptions.php:135
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
+msgstr ""
+
+#. 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: 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:143 actions/subscriptions.php:149
+#, php-format
+msgid "%s is not listening to anyone."
+msgstr "%s ആരേയും ശ്രദ്ധിക്കുന്നില്ല."
+
+#: actions/subscriptions.php:178
+#, 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:242
+msgid "Jabber"
+msgstr "ജാബ്ബർ"
+
+#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
+#: actions/subscriptions.php:257
+msgid "SMS"
+msgstr "എസ്.എം.എസ്."
+
+#: actions/tag.php:69
+#, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr ""
+
+#: actions/tag.php:87
+#, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr ""
+
+#: actions/tag.php:93
+#, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr ""
+
+#: actions/tag.php:99
+#, 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 ""
+
+#: actions/tagother.php:77 lib/userprofile.php:76
+msgid "User profile"
+msgstr ""
+
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:107
+msgid "Photo"
+msgstr "ഛായാചിത്രം"
+
+#: actions/tagother.php:141
+msgid "Tag user"
+msgstr "ഉപയോക്താവിനെ റ്റാഗ് ചെയ്യുക"
+
+#: actions/tagother.php:151
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:193
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:200
+msgid "Could not save tags."
+msgstr ""
+
+#: actions/tagother.php:236
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:35
+msgid "No such tag."
+msgstr ""
+
+#: actions/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 actions/userauthorization.php:337
+#, php-format
+msgid ""
+"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
+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 ""
+
+#. TRANS: Link description in user account settings menu.
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: lib/personalgroupnav.php:112
+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 "ഉപയോക്തൃ സജ്ജീകരണങ്ങൾ സേവ് ചെയ്യുക"
+
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr ""
+
+#: actions/userauthorization.php:110
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
+msgstr ""
+
+#. 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
+msgid "Accept"
+msgstr "സ്വീകരിക്കുക"
+
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+msgid "Subscribe to this user"
+msgstr ""
+
+#: actions/userauthorization.php:219
+msgid "Reject"
+msgstr "നിരാകരിക്കുക"
+
+#: actions/userauthorization.php:220
+msgid "Reject this subscription"
+msgstr ""
+
+#: actions/userauthorization.php:232
+msgid "No authorization request!"
+msgstr ""
+
+#: actions/userauthorization.php:254
+msgid "Subscription authorized"
+msgstr ""
+
+#: 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 ""
+
+#: actions/userauthorization.php:266
+msgid "Subscription rejected"
+msgstr ""
+
+#: 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 ""
+
+#: actions/userauthorization.php:303
+#, php-format
+msgid "Listener URI ‘%s’ not found here."
+msgstr ""
+
+#: actions/userauthorization.php:308
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:314
+#, php-format
+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
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:350
+#, php-format
+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.
+#: actions/userdesignsettings.php:76 lib/designsettings.php:63
+msgid "Profile design"
+msgstr ""
+
+#. TRANS: Instructions for profile design page.
+#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#. 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 "%s എന്ന ഉപയോക്താവ് ഒരു സംഘത്തിലേയും അംഗമല്ല."
+
+#: actions/usergroups.php:164
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+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 in atom group notice feed.
+#. 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:75
+#, 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 "സംഭാവന ചെയ്തവർ"
+
+#: 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 "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"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 "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
+"for more details. "
+msgstr ""
+
+#: actions/version.php:182
+#, php-format
+msgid ""
+"You should have received a copy of the GNU Affero General Public License "
+"along with this program.  If not, see %s."
+msgstr ""
+
+#: actions/version.php:191
+msgid "Plugins"
+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: Activity title when marking a notice as favorite.
+#: classes/Fave.php:164 lib/favorform.php:143
+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:156
+#, php-format
+msgid "Cannot process URL '%s'"
+msgstr ""
+
+#. TRANS: Server exception thrown when... Robin thinks something is impossible!
+#: classes/File.php:188
+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:204
+#, php-format
+msgid ""
+"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
+"Try to upload a smaller version."
+msgid_plural ""
+"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
+"Try to upload a smaller version."
+msgstr[0] ""
+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:217
+#, 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."
+msgstr[0] ""
+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:229
+#, 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] ""
+msgstr[1] ""
+
+#. TRANS: Client exception thrown if a file upload does not have a valid name.
+#: classes/File.php:276 classes/File.php:291
+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:537
+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:914
+msgid "Bad type provided to saveKnownGroups."
+msgstr ""
+
+#. TRANS: Server exception thrown when an update for a group inbox fails.
+#: classes/Notice.php:1013
+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:1127
+#, 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:1646
+#, 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)"
+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:765
+#, 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:774
+#, 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 ""
+
+#. TRANS: Notice given on user registration.
+#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
+#: classes/User.php:395
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr ""
+
+#. TRANS: Server exception.
+#: classes/User.php:918
+msgid "No single user defined for single-user mode."
+msgstr ""
+
+#. TRANS: Server exception.
+#: classes/User.php:922
+msgid "Single-user mode code called when not enabled."
+msgstr ""
+
+#. TRANS: Server exception thrown when creating a group failed.
+#: classes/User_group.php:516
+msgid "Could not create group."
+msgstr ""
+
+#. TRANS: Server exception thrown when updating a group URI failed.
+#: classes/User_group.php:526
+msgid "Could not set group URI."
+msgstr ""
+
+#. TRANS: Server exception thrown when setting group membership failed.
+#: classes/User_group.php:549
+msgid "Could not set group membership."
+msgstr ""
+
+#. TRANS: Server exception thrown when saving local group information failed.
+#: classes/User_group.php:564
+msgid "Could not save local group info."
+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:148
+#, php-format
+msgid "%1$s - %2$s"
+msgstr ""
+
+#. TRANS: Page title for a page without a title set.
+#: lib/action.php:164
+msgid "Untitled page"
+msgstr "തലക്കെട്ടില്ലാത്ത താൾ"
+
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:312
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr "കൂടുതൽ പ്രദർശിപ്പിക്കുക"
+
+#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
+#: lib/action.php:531
+msgid "Primary site navigation"
+msgstr ""
+
+#. TRANS: Tooltip for main menu option "Personal"
+#: lib/action.php:537
+msgctxt "TOOLTIP"
+msgid "Personal profile and friends timeline"
+msgstr ""
+
+#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
+#: lib/action.php:540
+msgctxt "MENU"
+msgid "Personal"
+msgstr "വ്യക്തിപരം"
+
+#. TRANS: Tooltip for main menu option "Account"
+#: lib/action.php:542
+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:545
+msgid "Account"
+msgstr "അംഗത്വം"
+
+#. TRANS: Tooltip for main menu option "Services"
+#: lib/action.php:547
+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:550
+msgid "Connect"
+msgstr "ബന്ധപ്പെടുക"
+
+#. TRANS: Tooltip for menu option "Admin"
+#: lib/action.php:553
+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:556 lib/groupnav.php:117
+msgctxt "MENU"
+msgid "Admin"
+msgstr "കാര്യനിർവാഹക(ൻ)"
+
+#. TRANS: Tooltip for main menu option "Invite"
+#: lib/action.php:560
+#, 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:563
+msgctxt "MENU"
+msgid "Invite"
+msgstr "ക്ഷണിക്കുക"
+
+#. TRANS: Tooltip for main menu option "Logout"
+#: lib/action.php:569
+msgctxt "TOOLTIP"
+msgid "Logout from the site"
+msgstr "സൈറ്റിൽ നിന്നും പുറത്തുകടക്കുക"
+
+#. TRANS: Main menu option when logged in to log out the current user
+#: lib/action.php:572
+msgctxt "MENU"
+msgid "Logout"
+msgstr "ലോഗൗട്ട്"
+
+#. TRANS: Tooltip for main menu option "Register"
+#: lib/action.php:577
+msgctxt "TOOLTIP"
+msgid "Create an account"
+msgstr "ഒരംഗത്വമെടുക്കുക"
+
+#. TRANS: Main menu option when not logged in to register a new account
+#: lib/action.php:580
+msgctxt "MENU"
+msgid "Register"
+msgstr "രജിസ്റ്റർ"
+
+#. TRANS: Tooltip for main menu option "Login"
+#: lib/action.php:583
+msgctxt "TOOLTIP"
+msgid "Login to the site"
+msgstr "സൈറ്റിലേക്ക് പ്രവേശിക്കുക"
+
+#. TRANS: Main menu option when not logged in to log in
+#: lib/action.php:586
+msgctxt "MENU"
+msgid "Login"
+msgstr "ലോഗിൻ"
+
+#. TRANS: Tooltip for main menu option "Help"
+#: lib/action.php:589
+msgctxt "TOOLTIP"
+msgid "Help me!"
+msgstr "എന്നെ സഹായിക്കൂ!"
+
+#. TRANS: Main menu option for help on the StatusNet site
+#: lib/action.php:592
+msgctxt "MENU"
+msgid "Help"
+msgstr "സഹായം"
+
+#. TRANS: Tooltip for main menu option "Search"
+#: lib/action.php:595
+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:598
+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:620 lib/adminpanelaction.php:387
+msgid "Site notice"
+msgstr ""
+
+#. TRANS: DT element for local views block. String is hidden in default CSS.
+#: lib/action.php:687
+msgid "Local views"
+msgstr ""
+
+#. TRANS: DT element for page notice. String is hidden in default CSS.
+#: lib/action.php:757
+msgid "Page notice"
+msgstr ""
+
+#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
+#: lib/action.php:858
+msgid "Secondary site navigation"
+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 ""
+
+#. TRANS: DT element for StatusNet software license.
+#: lib/action.php:921
+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:928
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%)."
+msgstr ""
+
+#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
+#: lib/action.php:931
+#, php-format
+msgid "**%%site.name%%** is a microblogging service."
+msgstr ""
+
+#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
+#. 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:938
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+
+#. TRANS: DT element for StatusNet site content license.
+#: lib/action.php:954
+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:961
+#, 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:968
+#, 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:972
+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:1004
+#, 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:1340
+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:1351
+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:1361
+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 ""
+
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
+#, fuzzy
+msgid "Unknown profile."
+msgstr "അജ്ഞാതമായ കുറിപ്പ്."
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %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:118
+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 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: 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 ""
+
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: 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: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:266 lib/apiauth.php:293
+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:186
+msgid "Could not issue access token."
+msgstr ""
+
+#. TRANS: Server error displayed when a database error occurs.
+#: lib/apioauthstore.php:243
+msgid "Database error inserting OAuth application user."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:285
+msgid "Tried to revoke unknown token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/apioauthstore.php:290
+msgid "Failed to delete revoked token."
+msgstr ""
+
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:178
+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] ""
+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 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:112
+msgid "author element must contain a name element."
+msgstr ""
+
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
+#. TRANS: DT element label in attachment list item.
+#: lib/attachmentlist.php:294
+msgid "Author"
+msgstr "രചയിതാവ്"
+
+#. TRANS: DT element label in attachment list item.
+#: lib/attachmentlist.php:308
+msgid "Provider"
+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: Title for command results.
+#: lib/channel.php:160 lib/channel.php:181
+msgid "Command results"
+msgstr ""
+
+#. TRANS: Title for command results.
+#: lib/channel.php:194
+msgid "AJAX error"
+msgstr "അജാക്സ് പിഴവ്"
+
+#. TRANS: E-mail subject when a command has completed.
+#: lib/channel.php:233 lib/mailhandler.php:143
+msgid "Command complete"
+msgstr ""
+
+#. TRANS: E-mail subject when a command has failed.
+#: lib/channel.php:244
+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:630
+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 ""
+
+#. TRANS: User statistics text.
+#. 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"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:312
+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
+#, 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
+#, 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
+#, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr ""
+
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:430
+#, php-format
+msgid "Fullname: %s"
+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:278
+#, php-format
+msgid "Location: %s"
+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:282
+#, php-format
+msgid "Homepage: %s"
+msgstr "പ്രധാനതാൾ: %s"
+
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:442
+#, 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
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+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
+#, 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 sending a direct message fails with an unknown reason.
+#: lib/command.php:516
+msgid "Error sending direct message."
+msgstr ""
+
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:553
+#, php-format
+msgid "Notice from %s repeated."
+msgstr ""
+
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:556
+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
+#, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+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
+#, 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
+msgid "Error saving notice."
+msgstr ""
+
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:654
+msgid "Specify the name of the user to subscribe to."
+msgstr ""
+
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:663
+msgid "Can't subscribe to OMB profiles by command."
+msgstr ""
+
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:671
+#, php-format
+msgid "Subscribed to %s."
+msgstr ""
+
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:692 lib/command.php:803
+msgid "Specify the name of the user to unsubscribe from."
+msgstr ""
+
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:703
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr ""
+
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:723 lib/command.php:749
+msgid "Command not yet implemented."
+msgstr ""
+
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:727
+msgid "Notification off."
+msgstr ""
+
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:730
+msgid "Can't turn off notification."
+msgstr ""
+
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:753
+msgid "Notification on."
+msgstr ""
+
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:756
+msgid "Can't turn on notification."
+msgstr ""
+
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:770
+msgid "Login command is disabled."
+msgstr ""
+
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:783
+#, php-format
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
+msgstr ""
+
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:812
+#, php-format
+msgid "Unsubscribed %s."
+msgstr ""
+
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:830
+msgid "You are not subscribed to anyone."
+msgstr ""
+
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message supports plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:835
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+msgstr[0] ""
+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
+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
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:884
+msgid "You are not a member of any groups."
+msgstr ""
+
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message supports plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:889
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
+#: lib/command.php:904
+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 ""
+
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#: lib/common.php:150
+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:153
+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:156
+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:160
+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: 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:104
+msgid "Upload file"
+msgstr "പ്രമാണം അപ്‌ലോഡ് ചെയ്യുക"
+
+#. TRANS: Instructions for form on profile design page.
+#: lib/designsettings.php:109
+msgid ""
+"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
+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 "രഹിതം"
+
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: lib/designsettings.php:264
+msgctxt "BUTTON"
+msgid "Reset"
+msgstr "പുനഃക്രമീകരിക്കുക"
+
+#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
+#: lib/designsettings.php:433
+msgid "Design defaults restored."
+msgstr "സ്വതേയുള്ള രൂപകല്പന പുനഃസ്ഥാപിച്ചിരിക്കുന്നു."
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:144
+msgid "Disfavor this notice"
+msgstr ""
+
+#: lib/favorform.php:114 lib/favorform.php:143
+msgid "Favor this notice"
+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: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:121
+msgid "Filter tags"
+msgstr ""
+
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr "എല്ലാം"
+
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr ""
+
+#: lib/galleryaction.php:140
+msgid "Tag"
+msgstr "റ്റാഗ്"
+
+#: lib/galleryaction.php:141
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/galleryaction.php:143
+msgid "Go"
+msgstr "പോകൂ"
+
+#: lib/grantroleform.php:91
+#, php-format
+msgid "Grant this user the \"%s\" role"
+msgstr ""
+
+#: lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+
+#: lib/groupeditform.php:163
+msgid "URL of the homepage or blog of the group or topic."
+msgstr ""
+
+#: lib/groupeditform.php:168
+msgid "Describe the group or topic"
+msgstr "സംഘത്തെക്കുറിച്ചോ വിഷയത്തെക്കുറിച്ചോ വിവരിക്കുക"
+
+#: lib/groupeditform.php:170
+#, php-format
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/groupeditform.php:182
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
+msgstr ""
+
+#: lib/groupeditform.php:190
+#, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+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: 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"
+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 ""
+
+#: lib/imagefile.php:72
+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:90
+#, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr ""
+
+#: lib/imagefile.php:95
+msgid "Partial upload."
+msgstr ""
+
+#: lib/imagefile.php:111
+msgid "Not an image or corrupt file."
+msgstr ""
+
+#: lib/imagefile.php:160
+msgid "Lost our file."
+msgstr "ഞങ്ങളുടെ പ്രമാണം നഷ്ടപ്പെട്ടു."
+
+#: lib/imagefile.php:197 lib/imagefile.php:237
+msgid "Unknown file type"
+msgstr "അപരിചിതമായ തരം പ്രമാണം"
+
+#. TRANS: Number of megabytes. %d is the number.
+#: lib/imagefile.php:283
+#, php-format
+msgid "%dMB"
+msgid_plural "%dMB"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Number of kilobytes. %d is the number.
+#: lib/imagefile.php:287
+#, php-format
+msgid "%dkB"
+msgid_plural "%dkB"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Number of bytes. %d is the number.
+#: lib/imagefile.php:290
+#, php-format
+msgid "%dB"
+msgid_plural "%dB"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/jabber.php:387
+#, php-format
+msgid "[%s]"
+msgstr ""
+
+#: lib/jabber.php:567
+#, php-format
+msgid "Unknown inbox source %d."
+msgstr ""
+
+#: lib/leaveform.php:114
+msgid "Leave"
+msgstr "ഒഴിവായി പോവുക"
+
+#: lib/logingroupnav.php:80
+msgid "Login with a username and password"
+msgstr "ഉപയോക്തൃനാമവും രഹസ്യവാക്കും ഉപയോഗിച്ച് ലോഗിൻ ചെയ്യുക"
+
+#: lib/logingroupnav.php:86
+msgid "Sign up for a new account"
+msgstr "പുതിയൊരംഗത്വം എടുക്കുക"
+
+#. TRANS: Subject for address confirmation email.
+#: lib/mail.php:174
+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:179
+#, php-format
+msgid ""
+"Hey, %1$s.\n"
+"\n"
+"Someone just entered this email address on %2$s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%2$s\n"
+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:246
+#, 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:253
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
+#. TRANS: Main body of new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename,
+#. 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:263
+#, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%2$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %7$s\n"
+msgstr ""
+
+#. TRANS: Profile info line in new-subscriber notification e-mail.
+#. TRANS: %s is biographical information.
+#: lib/mail.php:286
+#, 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:315
+#, php-format
+msgid "New email address for posting to %s"
+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:321
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%1$s"
+msgstr ""
+
+#. TRANS: Subject line for SMS-by-email notification messages.
+#. TRANS: %s is the posting user's nickname.
+#: lib/mail.php:442
+#, php-format
+msgid "%s status"
+msgstr "%s സ്ഥിതി"
+
+#. TRANS: Subject line for SMS-by-email address confirmation message.
+#: lib/mail.php:468
+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:472
+#, 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:493
+#, php-format
+msgid "You've been nudged by %s"
+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:500
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
+
+#. TRANS: Subject for direct-message notification email.
+#. TRANS: %s is the sending user's nickname.
+#: lib/mail.php:547
+#, php-format
+msgid "New private message from %s"
+msgstr ""
+
+#. TRANS: Body for direct-message notification email.
+#. 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:555
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
+msgstr ""
+
+#. 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:607
+#, php-format
+msgid "%1$s (@%2$s) added your notice as a favorite"
+msgstr ""
+
+#. 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,
+#. 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:614
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:672
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+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:680
+#, php-format
+msgid "%1$s (@%2$s) sent a notice to your attention"
+msgstr ""
+
+#. TRANS: Body of @-reply notification e-mail.
+#. TRANS: %1$s is the sending user's long name, $2$s is the StatusNet sitename,
+#. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
+#. 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:688
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
+msgstr ""
+
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr "ഉപയോക്താവിനു മാത്രമേ അദ്ദേഹത്തിന്റെ സ്വന്തം മെയിൽബോക്സ് വായിക്കാനാകൂ."
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+"താങ്കൾക്ക് സ്വകാര്യ സന്ദേശങ്ങൾ ഇല്ല. മറ്റൂപയോക്താക്കളുമായുള്ള ആശയവിനിമയത്തിന് താങ്കൾക്ക് സ്വകാര്യ "
+"സന്ദേശങ്ങൾ അയയ്ക്കാവുന്നതാണ്. താങ്കൾക്ക് മാത്രം കാണാവുന്ന സന്ദേശങ്ങൾ അയയ്ക്കാൻ മറ്റുള്ളവർക്കും "
+"കഴിയുന്നതാണ്."
+
+#: lib/mailbox.php:228 lib/noticelist.php:522
+msgid "from"
+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 "
+"format."
+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 "സ്വീകർത്താവ്"
+
+#: lib/messageform.php:166 lib/noticeform.php:186
+msgid "Available characters"
+msgstr ""
+
+#: lib/messageform.php:185 lib/noticeform.php:237
+msgctxt "Send button for sending notice"
+msgid "Send"
+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."
+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
+msgid "Send a notice"
+msgstr "അറിയിപ്പ് അയയ്ക്കുക"
+
+#: lib/noticeform.php:174
+#, php-format
+msgid "What's up, %s?"
+msgstr "എന്തൊക്കെയുണ്ട്, %s?"
+
+#: lib/noticeform.php:193
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:197
+msgid "Attach a file"
+msgstr "പ്രമാണം ചേർത്തു വെയ്ക്കുക"
+
+#: lib/noticeform.php:213
+msgid "Share my location"
+msgstr "എന്റെ സ്ഥാനം പങ്ക് വെയ്ക്കുക"
+
+#: lib/noticeform.php:216
+msgid "Do not share my location"
+msgstr "എന്റെ സ്ഥാനം പങ്ക് വെയ്ക്കരുത്"
+
+#: lib/noticeform.php:217
+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
+msgid "N"
+msgstr "വ"
+
+#. TRANS: Used in coordinates as abbreviation of south
+#: lib/noticelist.php:454
+msgid "S"
+msgstr "തെ"
+
+#. TRANS: Used in coordinates as abbreviation of east
+#: lib/noticelist.php:456
+msgid "E"
+msgstr "കി"
+
+#. TRANS: Used in coordinates as abbreviation of west
+#: lib/noticelist.php:458
+msgid "W"
+msgstr "പ"
+
+#: lib/noticelist.php:460
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:469
+msgid "at"
+msgstr ""
+
+#: lib/noticelist.php:518
+msgid "web"
+msgstr "വെബ്"
+
+#: lib/noticelist.php:584
+msgid "in context"
+msgstr ""
+
+#: lib/noticelist.php:619
+msgid "Repeated by"
+msgstr ""
+
+#: lib/noticelist.php:646
+msgid "Reply to this notice"
+msgstr "ഈ അറിയിപ്പിന് മറുപടിയിടുക"
+
+#: lib/noticelist.php:647
+msgid "Reply"
+msgstr "മറുപടി"
+
+#: lib/noticelist.php:691
+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:102
+msgid "Personal"
+msgstr "വ്യക്തിപരം"
+
+#: lib/personalgroupnav.php:107
+msgid "Replies"
+msgstr "മറുപടികൾ"
+
+#: lib/personalgroupnav.php:117
+msgid "Favorites"
+msgstr ""
+
+#: lib/personalgroupnav.php:128
+msgid "Inbox"
+msgstr "ഇൻബോക്സ്"
+
+#: lib/personalgroupnav.php:129
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/personalgroupnav.php:133
+msgid "Outbox"
+msgstr "ഔട്ട്ബോക്സ്"
+
+#: lib/personalgroupnav.php:134
+msgid "Your sent messages"
+msgstr "താങ്കൾ അയച്ച സന്ദേശങ്ങൾ"
+
+#: 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:121
+msgid "Unknown"
+msgstr "അജ്ഞാതം"
+
+#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr ""
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr ""
+
+#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr ""
+
+#: lib/profileaction.php:161
+msgid "All subscribers"
+msgstr ""
+
+#: lib/profileaction.php:191
+msgid "User ID"
+msgstr ""
+
+#: lib/profileaction.php:196
+msgid "Member since"
+msgstr ""
+
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:235
+msgid "Daily average"
+msgstr "ദൈനിക ശരാശരി"
+
+#: lib/profileaction.php:264
+msgid "All groups"
+msgstr ""
+
+#: lib/profileformaction.php:123
+msgid "Unimplemented method."
+msgstr ""
+
+#: lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "സാർവ്വജനികം"
+
+#: lib/publicgroupnav.php:82
+msgid "User groups"
+msgstr ""
+
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
+msgid "Recent tags"
+msgstr ""
+
+#: lib/publicgroupnav.php:88
+msgid "Featured"
+msgstr "തിരഞ്ഞെടുക്കപ്പെട്ടത്"
+
+#: lib/publicgroupnav.php:92
+msgid "Popular"
+msgstr "ജനപ്രിയം"
+
+#: lib/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:974
+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 "തിരയുക"
+
+#. 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 "ജനങ്ങൾ"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr ""
+
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr ""
+
+#: lib/searchgroupnav.php:85
+msgid "Find groups on this site"
+msgstr ""
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr "തലക്കെട്ടില്ലാത്ത ഭാഗം"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr "കൂടുതൽ..."
+
+#: lib/silenceform.php:67
+msgid "Silence"
+msgstr "നിശബ്ദമാക്കുക"
+
+#: lib/silenceform.php:78
+msgid "Silence this user"
+msgstr "ഈ ഉപയോക്താവിനെ നിശബ്ദനാക്കുക"
+
+#: lib/subgroupnav.php:83
+#, php-format
+msgid "People %s subscribes to"
+msgstr ""
+
+#: lib/subgroupnav.php:91
+#, php-format
+msgid "People subscribed to %s"
+msgstr ""
+
+#: lib/subgroupnav.php:99
+#, php-format
+msgid "Groups %s is a member of"
+msgstr ""
+
+#: lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "ക്ഷണിക്കുക"
+
+#: lib/subgroupnav.php:106
+#, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr "%s-ൽ നമ്മോടൊപ്പം ചേരാൻ സുഹൃത്തുക്കളേയും സഹപ്രവർത്തകരേയും ക്ഷണിക്കുക"
+
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/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 ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+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/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:119
+msgid "Edit Avatar"
+msgstr ""
+
+#: lib/userprofile.php:236 lib/userprofile.php:250
+msgid "User actions"
+msgstr ""
+
+#: lib/userprofile.php:239
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:265
+msgid "Edit profile settings"
+msgstr ""
+
+#: lib/userprofile.php:266
+msgid "Edit"
+msgstr "തിരുത്തുക"
+
+#: lib/userprofile.php:289
+msgid "Send a direct message to this user"
+msgstr ""
+
+#: lib/userprofile.php:290
+msgid "Message"
+msgstr "സന്ദേശം"
+
+#: lib/userprofile.php:331
+msgid "Moderate"
+msgstr ""
+
+#: lib/userprofile.php:369
+msgid "User role"
+msgstr ""
+
+#: lib/userprofile.php:371
+msgctxt "role"
+msgid "Administrator"
+msgstr "കാര്യനിർവ്വാഹക(ൻ)"
+
+#: lib/userprofile.php:372
+msgctxt "role"
+msgid "Moderator"
+msgstr ""
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: 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:1309
+msgid "about a minute ago"
+msgstr "ഏകദേശം ഒരു മിനിറ്റ് മുമ്പ്"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1313
+#, php-format
+msgid "about one minute ago"
+msgid_plural "about %d minutes ago"
+msgstr[0] "ഏകദേശം ഒരു മിനിറ്റ് മുമ്പ്"
+msgstr[1] "ഏകദേശം %d മിനിറ്റ് മുമ്പ്"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: 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:1320
+#, php-format
+msgid "about one hour ago"
+msgid_plural "about %d hours ago"
+msgstr[0] "ഏകദേശം ഒരു മണിക്കൂർ മുമ്പ്"
+msgstr[1] "ഏകദേശം %d മണിക്കൂർ മുമ്പ്"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: 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:1327
+#, php-format
+msgid "about one day ago"
+msgid_plural "about %d days ago"
+msgstr[0] "ഏകദേശം ഒരു ദിവസം മുമ്പ്"
+msgstr[1] "ഏകദേശം %d ദിവസം മുമ്പ്"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: 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:1334
+#, php-format
+msgid "about one month ago"
+msgid_plural "about %d months ago"
+msgstr[0] "ഏകദേശം ഒരു മാസം മുമ്പ്"
+msgstr[1] "ഏകദേശം %d മാസം മുമ്പ്"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1337
+msgid "about a year ago"
+msgstr "ഏകദേശം ഒരു വർഷം മുമ്പ്"
+
+#: lib/webcolor.php:80
+#, php-format
+msgid "%s is not a valid color!"
+msgstr "%s ഒരു സാധുവായ നിറമല്ല!"
+
+#. TRANS: Validation error for a web colour.
+#. TRANS: %s is the provided (invalid) text for colour.
+#: lib/webcolor.php:120
+#, php-format
+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:64
+msgid "Invalid XML."
+msgstr "അസാധുവായ എക്സ്.എം.എൽ.."
+
+#. TRANS: Exception.
+#: lib/xrd.php:69
+msgid "Invalid XML, missing XRD root."
+msgstr ""
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 8c5ac55d3f..56a3bb0e98 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:07+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -277,14 +277,13 @@ msgstr "Oppdateringer fra %1$s og venner på %2$s!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
-#, fuzzy
 msgid "API method not found."
-msgstr "API-metode ikke funnet!"
+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.
@@ -311,9 +310,8 @@ 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.
 #: actions/apiaccountupdatedeliverydevice.php:130
-#, fuzzy
 msgid "Could not update user."
-msgstr "Klarte ikke å oppdatere bruker."
+msgstr "Kunne ikke oppdatere bruker."
 
 #. TRANS: Client error displayed if a user profile could not be found.
 #. TRANS: Client error displayed when a user has no profile.
@@ -324,7 +322,8 @@ msgstr "Klarte ikke å oppdatere bruker."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -333,9 +332,8 @@ msgstr "Brukeren har ingen profil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #: actions/apiaccountupdateprofile.php:147
-#, fuzzy
 msgid "Could not save profile."
-msgstr "Klarte ikke å lagre profil."
+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.
@@ -378,13 +376,12 @@ 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
-#, fuzzy
 msgid "Could not update your design."
-msgstr "Klarte ikke å oppdatere bruker."
+msgstr "Kunne ikke oppdatere din profils utseende."
 
 #: actions/apiatomservice.php:86
 msgid "Main"
-msgstr ""
+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.
@@ -400,19 +397,19 @@ msgstr "%s tidslinje"
 #. TRANS: %s is a user nickname.
 #: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
 #: actions/subscriptions.php:51
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscriptions"
-msgstr "Alle abonnementer"
+msgstr "%s abonnementer"
 
 #: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "%s favorites"
-msgstr "Favoritter"
+msgstr "%s favoritter"
 
 #: actions/apiatomservice.php:123
-#, fuzzy, php-format
+#, php-format
 msgid "%s memberships"
-msgstr "%s gruppemedlemmer"
+msgstr "%s medlemsskap"
 
 #. TRANS: Client error displayed when users try to block themselves.
 #: actions/apiblockcreate.php:104
@@ -539,9 +536,8 @@ 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
-#, fuzzy
 msgid "Two valid IDs or nick names must be supplied."
-msgstr "To gyldige ID-er eller screen_names må oppgis."
+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
@@ -558,7 +554,7 @@ msgstr "Kunne ikke finne målbruker."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Det nicket er allerede i bruk. Prøv et annet."
@@ -568,7 +564,7 @@ msgstr "Det nicket er allerede i bruk. Prøv et annet."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ugyldig nick."
@@ -580,7 +576,7 @@ msgstr "Ugyldig nick."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Hjemmesiden er ikke en gyldig URL."
@@ -590,7 +586,7 @@ 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:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Fullt navn er for langt (maks 255 tegn)."
@@ -605,7 +601,7 @@ msgstr "Fullt navn er for langt (maks 255 tegn)."
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -617,7 +613,7 @@ 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:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Plasseringen er for lang (maks 255 tegn)."
@@ -629,7 +625,7 @@ msgstr "Plasseringen er for lang (maks 255 tegn)."
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -648,7 +644,7 @@ msgstr "Ugyldig alias: «%s»."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Aliaset «%s» er allerede i bruk. Prøv et annet."
@@ -657,7 +653,7 @@ msgstr "Aliaset «%s» er allerede i bruk. Prøv et annet."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Alias kan ikke være det samme som kallenavn."
 
@@ -973,14 +969,13 @@ msgstr "Allerede gjentatt den notisen."
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
 #: actions/atompubshowsubscription.php:118
 #: actions/atompubsubscriptionfeed.php:109
-#, fuzzy
 msgid "HTTP method not supported."
-msgstr "API-metode ikke funnet!"
+msgstr "HTTP-metoden støttes ikke."
 
 #: actions/apistatusesshow.php:141
-#, fuzzy, php-format
+#, php-format
 msgid "Unsupported format: %s"
-msgstr "Formatet støttes ikke."
+msgstr "Formatet støttes ikke: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
 #: actions/apistatusesshow.php:152
@@ -994,7 +989,7 @@ msgstr "Ingen status med den ID-en funnet."
 
 #: actions/apistatusesshow.php:223
 msgid "Can only delete using the Atom format."
-msgstr ""
+msgstr "Kan bare slette med Atom-formatet."
 
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
 #: actions/apistatusesshow.php:230 actions/deletenotice.php:78
@@ -1002,9 +997,9 @@ msgid "Can't delete this notice."
 msgstr "Kan ikke slette notisen."
 
 #: actions/apistatusesshow.php:243
-#, fuzzy, php-format
+#, php-format
 msgid "Deleted notice %d"
-msgstr "Slett notis"
+msgstr "Slettet notis %d"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #: actions/apistatusesupdate.php:221
@@ -1058,7 +1053,7 @@ 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:138
+#: actions/apitimelinegroup.php:134
 #, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Kunne ikke generere mating for gruppe - %s"
@@ -1124,59 +1119,58 @@ 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
-#, fuzzy
 msgid "Only the user can add to their own timeline."
-msgstr "Bare brukeren kan lese sine egne postbokser."
+msgstr "Bare brukeren kan legge til sin egen tidslinje."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #: actions/apitimelineuser.php:304
 msgid "Only accept AtomPub for Atom feeds."
-msgstr ""
+msgstr "Aksepterer kun AtomPub for Atom-matinger."
 
 #: actions/apitimelineuser.php:310
 msgid "Atom post must not be empty."
-msgstr ""
+msgstr "Atom-innlegget kan ikke være tomt."
 
 #: actions/apitimelineuser.php:315
 msgid "Atom post must be well-formed XML."
-msgstr ""
+msgstr "Atom-innlegget må være velformatert XML."
 
 #. TRANS: Client error displayed when not using an Atom entry.
 #: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
 #: actions/atompubmembershipfeed.php:228
 #: actions/atompubsubscriptionfeed.php:233
 msgid "Atom post must be an Atom entry."
-msgstr ""
+msgstr "Atom-innlegget må være en Atom-oppføring."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 msgid "Can only handle POST activities."
-msgstr ""
+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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
-msgstr ""
+msgstr "Kan ikke håndtere handlingsobjekttype «%s»."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
-#, fuzzy, php-format
+#: actions/apitimelineuser.php:378
+#, php-format
 msgid "No content for notice %d."
-msgstr "Finn innhold i notiser"
+msgstr "Inget innhold for notis %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
-msgstr ""
+msgstr "Notis med URI «%s» finnes allerede."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
+msgstr "AtomPub-innlegg med ukjent oppmerksomhets-URI %s"
 
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
@@ -1184,24 +1178,22 @@ msgid "API method under construction."
 msgstr "API-metode under utvikling."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "Bruker ikke funnet."
 
 #: actions/atompubfavoritefeed.php:70
-#, fuzzy
 msgid "No such profile"
-msgstr "Ingen slik profil."
+msgstr "Ingen slik profil"
 
 #: actions/atompubfavoritefeed.php:145
 #, php-format
 msgid "Notices %s has favorited to on %s"
-msgstr ""
+msgstr "Notiser som %s har lagt til som favoritt på %s"
 
 #: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-#, fuzzy
 msgid "Can't add someone else's subscription"
-msgstr "Kunne ikke sette inn bekreftelseskode."
+msgstr "Kan ikke legge til noen andres abonnement"
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
@@ -1215,9 +1207,8 @@ msgid "Can only fave notices."
 msgstr "Finn innhold i notiser"
 
 #: actions/atompubfavoritefeed.php:256
-#, fuzzy
 msgid "Unknown note."
-msgstr "Ukjent"
+msgstr "Ukjent notat."
 
 #: actions/atompubfavoritefeed.php:263
 #, fuzzy
@@ -1274,7 +1265,6 @@ msgid "Can't delete someone else's favorite"
 msgstr "Kunne ikke slette favoritt."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
 msgstr "Ingen slik gruppe."
 
@@ -1399,13 +1389,13 @@ msgid "Preview"
 msgstr "Forhåndsvis"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Slett"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Last opp"
@@ -1446,6 +1436,38 @@ msgstr "Oppdatering av avatar mislyktes."
 msgid "Avatar deleted."
 msgstr "Avatar slettet."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "Bare innloggede brukere kan repetere notiser."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Bakgrunn"
+
+#: actions/backupaccount.php:258
+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."
@@ -1651,6 +1673,60 @@ msgstr "Samtale"
 msgid "Notices"
 msgstr "Notiser"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "Bare innloggede brukere kan repetere notiser."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "Du kan ikke slette brukere."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Avatar slettet."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Opprett en konto"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Bekreft"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1752,15 +1828,13 @@ msgstr ""
 
 #. 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 notisen"
+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 brukeren"
+msgstr "Slett denne gruppen"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
@@ -1802,7 +1876,7 @@ 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:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Slett denne notisen"
 
@@ -1846,9 +1920,8 @@ msgid "Invalid logo URL."
 msgstr "Ugyldig logo-URL."
 
 #: actions/designadminpanel.php:340
-#, fuzzy
 msgid "Invalid SSL logo URL."
-msgstr "Ugyldig logo-URL."
+msgstr "Ugyldig SSL-logo-URL."
 
 #: actions/designadminpanel.php:344
 #, php-format
@@ -1864,9 +1937,8 @@ msgid "Site logo"
 msgstr "Nettstedslogo"
 
 #: actions/designadminpanel.php:457
-#, fuzzy
 msgid "SSL logo"
-msgstr "Nettstedslogo"
+msgstr "SSL-logo"
 
 #: actions/designadminpanel.php:469
 msgid "Change theme"
@@ -2030,9 +2102,8 @@ msgstr "Navn kreves."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
 #: actions/editapplication.php:188 actions/newapplication.php:169
-#, fuzzy
 msgid "Name is too long (maximum 255 characters)."
-msgstr "Navn er for langt (maks 250 tegn)."
+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.
 #: actions/editapplication.php:192 actions/newapplication.php:166
@@ -2061,7 +2132,6 @@ msgstr "Organisasjon kreves."
 
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
 #: actions/editapplication.php:223 actions/newapplication.php:199
-#, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Organisasjon er for lang (maks 255 tegn)."
 
@@ -2109,7 +2179,7 @@ msgstr "Bruk dette skjemaet for å redigere gruppen."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Ugyldig alias: «%s»"
@@ -2121,7 +2191,7 @@ 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:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "Kunne ikke opprette alias."
 
@@ -2948,7 +3018,7 @@ 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:77
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid email address: %s."
 msgstr "Ugyldig e-postadresse: %s."
 
@@ -2975,7 +3045,7 @@ 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:145 actions/invite.php:159
-#, fuzzy, php-format
+#, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -3340,8 +3410,14 @@ msgstr "Kunne ikke opprette program."
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Bruk dette skjemaet for å opprette en ny gruppe."
 
@@ -3661,11 +3737,6 @@ msgstr "Nytt passord"
 msgid "6 or more characters"
 msgstr "6 eller flere tegn"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Bekreft"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Samme som passord ovenfor"
@@ -4181,6 +4252,11 @@ msgstr "Kunne ikke lagre merkelapper."
 msgid "Settings saved."
 msgstr "Innstillinger lagret."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Opprett en konto"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4409,7 +4485,6 @@ msgid "Unexpected password reset."
 msgstr "Uventet tilbakestilling av passord."
 
 #: actions/recoverpassword.php:365
-#, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "Passordet må bestå av 6 eller flere tegn."
 
@@ -4643,7 +4718,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:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Gjentatt"
 
@@ -4707,6 +4782,90 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Svar til %1$s på %2$s!"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "Bare innloggede brukere kan repetere notiser."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "Du har ikke registrert noen program ennå."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, 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:130 lib/mediafile.php:194
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:136 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:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "Systemfeil ved opplasting av fil."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Alle medlemmer"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, 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."
@@ -4807,7 +4966,7 @@ msgid "Reset key & secret"
 msgstr "Tilbakestill nøkkel & hemmelighet"
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Slett"
 
@@ -4988,14 +5147,12 @@ msgstr "Alle medlemmer"
 
 #. TRANS: Label for creation date in statistics on group page.
 #: actions/showgroup.php:453
-#, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Opprettet"
 
 #. TRANS: Label for member count in statistics on group page.
 #: actions/showgroup.php:461
-#, fuzzy
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Medlemmer"
@@ -6073,14 +6230,14 @@ msgid "Author(s)"
 msgstr "Forfatter(e)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 #, 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:154
+#: 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"
@@ -6187,7 +6344,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6215,72 +6372,72 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: 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:288
+#: 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:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6288,14 +6445,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6369,32 +6526,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "Velkommen til %1$s, @%2$s."
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "Kunne ikke opprette gruppe."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 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:544
+#: classes/User_group.php:549
 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:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "Kunne ikke lagre lokal gruppeinformasjon."
 
@@ -6731,10 +6888,19 @@ msgstr "Før"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Foto"
+msgid "Unknown profile."
+msgstr "Ukjent filtype"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7030,6 +7196,10 @@ msgstr "Tilbakekall"
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7427,26 +7597,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 #, 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:150
+#: lib/common.php:153
 #, 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Log inn på nettstedet"
@@ -7557,6 +7727,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "Venn av en venn"
 
+#: 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"
@@ -7740,11 +7918,6 @@ msgstr "Filen er for stor. Maks filstørrelse er %s."
 msgid "Partial upload."
 msgstr "Delvis opplasting."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "Systemfeil ved opplasting av fil."
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "Ikke et bilde eller en korrupt fil."
@@ -8161,7 +8334,7 @@ msgstr ""
 "engasjere andre brukere i en samtale. Personer kan sende deg meldinger som "
 "bare du kan se."
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "fra"
 
@@ -8193,38 +8366,6 @@ msgstr "Meldingstypen støttes ikke: %s"
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: lib/mediafile.php:194
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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.
-#: lib/mediafile.php:222
-msgid "File upload stopped by extension."
-msgstr "Filopplasting stoppet grunnet filendelse."
-
 #. 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."
@@ -8245,7 +8386,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8254,7 +8395,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
@@ -8289,17 +8430,17 @@ msgid "Send"
 msgstr "Send"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8340,56 +8481,56 @@ msgstr ""
 "igjen senere"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "Ø"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "V"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, 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:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "på"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 #, fuzzy
 msgid "in context"
 msgstr "Inget innhold."
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "Repetert av"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "Svar på denne notisen"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Svar"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Notis repetert"
 
@@ -8548,7 +8689,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:957
+#: lib/router.php:974
 #, fuzzy
 msgid "Page not found."
 msgstr "API-metode ikke funnet!"
@@ -8905,22 +9046,10 @@ msgstr "Ugyldig størrelse"
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
 #, fuzzy
-msgid "No user specified; using backup user."
-msgstr "Ingen bruker-ID spesifisert."
+#~ msgid "Post"
+#~ msgstr "Foto"
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+#~ msgid "No user specified; using backup user."
+#~ msgstr "Ingen bruker-ID spesifisert."
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index da3e2c4b4f..edeb89ae0e 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -12,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:05+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -281,7 +281,7 @@ msgstr "Updates van %1$s en vrienden op %2$s."
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -328,7 +328,8 @@ msgstr "Het was niet mogelijk de gebruiker bij te werken."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -407,14 +408,14 @@ msgid "%s subscriptions"
 msgstr "Abonnementen van %s"
 
 #: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "%s favorites"
-msgstr "Favorieten"
+msgstr "Favorieten van %s"
 
 #: actions/apiatomservice.php:123
-#, fuzzy, php-format
+#, php-format
 msgid "%s memberships"
-msgstr "leden van de groep %s"
+msgstr "Lidmaatschappen van %s"
 
 #. TRANS: Client error displayed when users try to block themselves.
 #: actions/apiblockcreate.php:104
@@ -563,7 +564,7 @@ msgstr "Het was niet mogelijk de doelgebruiker te vinden."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr ""
@@ -574,7 +575,7 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ongeldige gebruikersnaam!"
@@ -586,7 +587,7 @@ msgstr "Ongeldige gebruikersnaam!"
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "De thuispagina is geen geldige URL."
@@ -596,7 +597,7 @@ 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:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "De volledige naam is te lang (maximaal 255 tekens)."
@@ -611,7 +612,7 @@ msgstr "De volledige naam is te lang (maximaal 255 tekens)."
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -623,7 +624,7 @@ 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:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "De locatie is te lang (maximaal 255 tekens)."
@@ -635,7 +636,7 @@ msgstr "De locatie is te lang (maximaal 255 tekens)."
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -654,7 +655,7 @@ msgstr "Ongeldige alias: \"%s\"."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "De alias \"%s\" wordt al gebruikt. Geef een andere alias op."
@@ -663,7 +664,7 @@ msgstr "De alias \"%s\" wordt al gebruikt. Geef een andere alias op."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Een alias kan niet hetzelfde zijn als de gebruikersnaam."
 
@@ -1069,7 +1070,7 @@ msgstr ""
 
 #. TRANS: Server error displayed when generating an Atom feed fails.
 #. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:138
+#: actions/apitimelinegroup.php:134
 #, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Het was niet mogelijk een groepfeed te maken - %s"
@@ -1140,19 +1141,16 @@ msgstr "Gebruikers kunnen alleen zelf aan hun eigen tijdlijn toevoegen."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #: actions/apitimelineuser.php:304
-#, fuzzy
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Alleen AtomPub voor Atomfeeds accepteren."
 
 #: actions/apitimelineuser.php:310
-#, fuzzy
 msgid "Atom post must not be empty."
-msgstr "Het Atombericht moet een Atomopmaak hebben."
+msgstr "Het Atombericht mag niet leeg zijn."
 
 #: actions/apitimelineuser.php:315
-#, fuzzy
 msgid "Atom post must be well-formed XML."
-msgstr "Het Atombericht moet een Atomopmaak hebben."
+msgstr "Het Atombericht moet correct opgemaakte XML zijn."
 
 #. TRANS: Client error displayed when not using an Atom entry.
 #: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
@@ -1163,31 +1161,30 @@ msgstr "Het Atombericht moet een Atomopmaak hebben."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
-#, fuzzy
+#: actions/apitimelineuser.php:334
 msgid "Can only handle POST activities."
-msgstr "Het is alleen mogelijk om POST-activiteit af te handelen."
+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:343
-#, fuzzy, php-format
+#: actions/apitimelineuser.php:345
+#, php-format
 msgid "Cannot handle activity object type \"%s\"."
-msgstr "Het is niet mogelijk om het activiteitobjecttype \"%s\" te verwerken"
+msgstr "Het is niet mogelijk om het activiteitobjecttype \"%s\" te verwerken."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
-#, fuzzy, php-format
+#: actions/apitimelineuser.php:378
+#, php-format
 msgid "No content for notice %d."
-msgstr "Inhoud van mededelingen vinden"
+msgstr "Geen inhoud voor mededeling %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "De mededeling met URI \"%s\" bestaat al."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr "Het AtomPubbericht met onbekende aandachts-URI is %s"
@@ -1198,46 +1195,42 @@ 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/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "De pagina is niet aangetroffen."
 
 #: actions/atompubfavoritefeed.php:70
-#, fuzzy
 msgid "No such profile"
-msgstr "Het profiel bestaat niet."
+msgstr "Het profiel bestaat niet"
 
 #: actions/atompubfavoritefeed.php:145
 #, php-format
 msgid "Notices %s has favorited to on %s"
-msgstr ""
+msgstr "Mededelingen die %s als favoriet heeft aangemerkt op %s"
 
 #: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-#, fuzzy
 msgid "Can't add someone else's subscription"
-msgstr "Kon nieuw abonnement niet toevoegen."
+msgstr "Het is niet mogelijk het abonnement voor iemand anders toe te voegen"
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
 #: actions/atompubfavoritefeed.php:239
-#, fuzzy
 msgid "Can only handle Favorite activities."
-msgstr "Het is alleen mogelijk om POST-activiteit af te handelen."
+msgstr ""
+"Het is alleen mogelijk om activiteiten met betrekking tot favorieten af te "
+"handelen."
 
 #: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
-#, fuzzy
 msgid "Can only fave notices."
-msgstr "Het is alleen mogelijk om POST-activiteit af te handelen."
+msgstr "Het is alleen mogelijk om mededelingen als favoriet aan te merken."
 
 #: actions/atompubfavoritefeed.php:256
-#, fuzzy
 msgid "Unknown note."
-msgstr "Onbekend"
+msgstr "Onbekend mededeling."
 
 #: actions/atompubfavoritefeed.php:263
-#, fuzzy
 msgid "Already a favorite."
-msgstr "Aan favorieten toevoegen"
+msgstr "Deze mededeling is al een favoriet."
 
 #: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
 #: actions/atompubshowmembership.php:73 actions/subscribe.php:107
@@ -1245,107 +1238,100 @@ msgid "No such profile."
 msgstr "Het profiel bestaat niet."
 
 #: actions/atompubmembershipfeed.php:144
-#, fuzzy, php-format
+#, php-format
 msgid "%s group memberships"
-msgstr "leden van de groep %s"
+msgstr "groepslidmaatschappen van %s"
 
 #: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %s is a member of on %s"
-msgstr "Groepen waar %s lid van is"
+msgstr "Groepen waar %s lid van is op %s"
 
 #: actions/atompubmembershipfeed.php:217
 msgid "Can't add someone else's membership"
-msgstr ""
+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:241
-#, fuzzy
 msgid "Can only handle Join activities."
-msgstr "Het is alleen mogelijk om POST-activiteit af te handelen."
+msgstr ""
+"Het is alleen mogelijk om activiteiten met betrekking tot lidmaatschap af te "
+"handelen."
 
 #: actions/atompubmembershipfeed.php:256
-#, fuzzy
 msgid "Unknown group."
-msgstr "Onbekend"
+msgstr "Onbekende groep."
 
 #: actions/atompubmembershipfeed.php:263
-#, fuzzy
 msgid "Already a member."
-msgstr "Alle leden"
+msgstr "U bent al lid."
 
 #: actions/atompubmembershipfeed.php:270
 msgid "Blocked by admin."
-msgstr ""
+msgstr "Geblokkeerd door een beheerder."
 
 #: actions/atompubshowfavorite.php:89
-#, fuzzy
 msgid "No such favorite."
-msgstr "Het bestand bestaat niet."
+msgstr "De favoriet bestaat niet."
 
 #: actions/atompubshowfavorite.php:151
-#, fuzzy
 msgid "Can't delete someone else's favorite"
-msgstr ""
-"Het was niet mogelijk deze mededeling van uw favorietenlijst te verwijderen."
+msgstr "Het is niet mogelijk om een favoriet van een ander te verwijderen"
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
-msgstr "De opgegeven groep bestaat niet."
+msgstr "Deze groep bestaat niet"
 
 #: actions/atompubshowmembership.php:90
-#, fuzzy
 msgid "Not a member"
-msgstr "Alle leden"
+msgstr "Geen lid"
 
 #: actions/atompubshowmembership.php:115
-#, fuzzy
 msgid "Method not supported"
-msgstr "HTTP-methode wordt niet ondersteund."
+msgstr "Methode wordt niet ondersteund"
 
 #: actions/atompubshowmembership.php:150
 msgid "Can't delete someone else's membership"
-msgstr ""
+msgstr "Het is niet mogelijk om een lidmaatschap van een ander te verwijderen"
 
 #: actions/atompubshowsubscription.php:72
 #: actions/atompubshowsubscription.php:81
 #: actions/atompubsubscriptionfeed.php:74
-#, fuzzy, php-format
+#, php-format
 msgid "No such profile id: %d"
-msgstr "Het profiel bestaat niet."
+msgstr "Het profielnummer bestaat niet: %d."
 
 #: actions/atompubshowsubscription.php:90
-#, fuzzy, php-format
+#, php-format
 msgid "Profile %d not subscribed to profile %d"
-msgstr "U bent niet geabonneerd op dat profiel."
+msgstr "Profiel %d is niet geabonneerd op profiel %d."
 
 #: actions/atompubshowsubscription.php:154
-#, fuzzy
 msgid "Can't delete someone else's subscription"
-msgstr "Kon abonnement op eigen gebruiker niet verwijderen."
+msgstr "Het is niet mogelijk het abonnement van iemand anders te verwijderen"
 
 #: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
+#, php-format
 msgid "People %s has subscribed to on %s"
-msgstr "Gebruikers met een abonnement op %s"
+msgstr "Mensen waarop %s geabonneerd is op %s"
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
 #: actions/atompubsubscriptionfeed.php:246
-#, fuzzy
 msgid "Can only handle Follow activities."
-msgstr "Het is alleen mogelijk om POST-activiteit af te handelen."
+msgstr ""
+"Het is alleen mogelijk om activiteiten met betrekking tot volgen af te "
+"handelen."
 
 #: actions/atompubsubscriptionfeed.php:253
 msgid "Can only follow people."
-msgstr ""
+msgstr "Het is alleen mogelijk om mensen te volgen."
 
 #: actions/atompubsubscriptionfeed.php:262
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown profile %s"
-msgstr "Onbekend bestandstype"
+msgstr "Onbekend profiel %s"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
@@ -1418,13 +1404,13 @@ msgid "Preview"
 msgstr "Voorvertoning"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Verwijderen"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Uploaden"
@@ -1466,6 +1452,38 @@ msgstr "Het bijwerken van de avatar is mislukt."
 msgid "Avatar deleted."
 msgstr "De avatar is verwijderd."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "Alleen aangemelde gebruikers kunnen hun mededelingen herhalen."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Achtergrond"
+
+#: actions/backupaccount.php:258
+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."
@@ -1671,6 +1689,60 @@ msgstr "Dialoog"
 msgid "Notices"
 msgstr "Mededelingen"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "Alleen aangemelde gebruikers kunnen hun mededelingen herhalen."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "U kunt gebruikers niet verwijderen."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "De avatar is verwijderd."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Gebruiker aanmaken"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Bevestigen"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1820,7 +1892,7 @@ 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:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Deze mededeling verwijderen"
 
@@ -2125,7 +2197,7 @@ msgstr "Gebruik dit formulier om de groep te bewerken."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Ongeldige alias: \"%s\""
@@ -2137,7 +2209,7 @@ 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:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "Het was niet mogelijk de aliassen aan te maken."
 
@@ -2238,6 +2310,8 @@ msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
 msgstr ""
+"Om via e-mail mededelingen te kunnen sturen moet er een uniek e-mailadres "
+"voor u gemaakt worden op deze server:"
 
 #. 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.
@@ -3382,8 +3456,14 @@ msgstr "Het was niet mogelijk de applicatie aan te maken."
 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
+#, fuzzy
+msgid "You are not allowed to create groups on this site."
+msgstr "U mag deze groep niet verwijderen."
+
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Gebruik dit formulier om een nieuwe groep aan te maken."
 
@@ -3709,11 +3789,6 @@ msgstr "Nieuw wachtwoord"
 msgid "6 or more characters"
 msgstr "Zes of meer tekens"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Bevestigen"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Gelijk aan het wachtwoord hierboven"
@@ -4233,6 +4308,11 @@ msgstr "Het was niet mogelijk de labels op te slaan."
 msgid "Settings saved."
 msgstr "De instellingen zijn opgeslagen."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Gebruiker aanmaken"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4701,7 +4781,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:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Herhaald"
 
@@ -4767,6 +4847,94 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Antwoorden aan %1$s op %2$s."
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "Alleen aangemelde gebruikers kunnen hun mededelingen herhalen."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "U hebt nog geen applicaties geregistreerd."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, fuzzy
+msgid "No uploaded file."
+msgstr "Bestand uploaden"
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: actions/restoreaccount.php:130 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:136 lib/mediafile.php:200
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"Het te uploaden bestand is groter dan de ingestelde MAX_FILE_SIZE in het "
+"HTML-formulier."
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "Er is een systeemfout opgetreden tijdens het uploaden van het bestand."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr "De back-up wordt uit het bestand \"%s\" geladen."
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Geen lid"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, fuzzy
+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."
@@ -4867,7 +5035,7 @@ msgid "Reset key & secret"
 msgstr "Sleutel en wachtwoord op nieuw instellen"
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -5739,9 +5907,9 @@ msgid "%s is not listening to anyone."
 msgstr "%s volgt niemand."
 
 #: actions/subscriptions.php:178
-#, fuzzy, php-format
+#, php-format
 msgid "Subscription feed for %s (Atom)"
-msgstr "Mededelingenfeed voor %s (Atom)"
+msgstr "Abonneefeed voor %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
 #: actions/subscriptions.php:242
@@ -6161,13 +6329,13 @@ msgid "Author(s)"
 msgstr "Auteur(s)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: 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."
@@ -6281,7 +6449,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr "Geen databasenaam of DSN gevonden."
 
@@ -6308,27 +6476,27 @@ 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:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -6336,7 +6504,7 @@ 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:288
+#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -6345,24 +6513,24 @@ 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:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 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:1012
+#: classes/Notice.php:1013
 msgid "Problem saving group inbox."
 msgstr ""
 "Er is een probleem opgetreden bij het opslaan van het Postvak IN van de "
@@ -6370,20 +6538,20 @@ 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6391,7 +6559,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:798
+#: classes/Profile.php:765
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -6400,7 +6568,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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6473,33 +6641,33 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "Welkom bij %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 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
+#: classes/User.php:922
 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:511
+#: classes/User_group.php:516
 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:521
+#: classes/User_group.php:526
 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:544
+#: classes/User_group.php:549
 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:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "Het was niet mogelijk de lokale groepsinformatie op te slaan."
 
@@ -6839,10 +7007,19 @@ msgstr "Eerder"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Verwachtte een root-feed element maar kreeg een heel XML-document."
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Foto"
+msgid "Unknown profile."
+msgstr "Onbekend profiel %s"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7133,6 +7310,10 @@ msgstr "Intrekken"
 msgid "author element must contain a name element."
 msgstr "Het element author moet een element name bevatten."
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7572,25 +7753,25 @@ msgstr ""
 "tracking - nog niet beschikbaar\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 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:150
+#: lib/common.php:153
 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "Naar het installatieprogramma gaan."
 
@@ -7692,6 +7873,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "Vrienden van vrienden (FOAF)"
 
+#: 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"
@@ -7873,11 +8062,6 @@ msgstr "Dat bestand is te groot. De maximale bestandsgrootte is %s."
 msgid "Partial upload."
 msgstr "Gedeeltelijke upload."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "Er is een systeemfout opgetreden tijdens het uploaden van het bestand."
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "Het bestand is geen afbeelding of het bestand is beschadigd."
@@ -8299,7 +8483,7 @@ msgstr ""
 "U hebt geen privéberichten. U kunt privéberichten verzenden aan andere "
 "gebruikers. Mensen kunnen u privéberichten sturen die alleen u kunt lezen."
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "van"
 
@@ -8331,42 +8515,6 @@ msgstr ""
 "Er is een databasefout opgetreden tijdens het opslaan van uw bestand. "
 "Probeer het alstublieft opnieuw."
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: 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.
-#: lib/mediafile.php:200
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
-msgstr ""
-"Het te uploaden bestand is groter dan de ingestelde MAX_FILE_SIZE in het "
-"HTML-formulier."
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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 would cause a user to exceed a set quota.
 #: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
@@ -8387,7 +8535,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8398,7 +8546,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: 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."
@@ -8431,19 +8579,19 @@ msgid "Send"
 msgstr "Verzenden"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8484,55 +8632,55 @@ msgstr ""
 "nog eens"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "Z"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "O"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "W"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, 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:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "op"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "in context"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "Herhaald door"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "Op deze mededeling antwoorden"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Antwoorden"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Mededeling herhaald"
 
@@ -8686,7 +8834,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:957
+#: lib/router.php:974
 msgid "Page not found."
 msgstr "De pagina is niet aangetroffen."
 
@@ -9047,21 +9195,13 @@ msgstr "Ongeldige XML."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr "De back-up wordt uit het bestand \"%s\" geladen."
+#~ msgid "Post"
+#~ msgstr "Post"
 
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
-msgid "No user specified; using backup user."
-msgstr "Geen gebruiker opgegeven; de back-upgebruiker wordt gebruikt."
+#~ msgid "No user specified; using backup user."
+#~ msgstr "Geen gebruiker opgegeven; de back-upgebruiker wordt gebruikt."
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] "%d element in de back-up."
-msgstr[1] "%d elementen in de back-up."
+#~ msgid "%d entry in backup."
+#~ msgid_plural "%d entries in backup."
+#~ msgstr[0] "%d element in de back-up."
+#~ msgstr[1] "%d elementen in de back-up."
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 2bfd4a044a..4bd59323fe 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:06+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:19+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 (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nn\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -280,12 +280,11 @@ msgstr "Oppdateringar frå %1$s og vener på %2$s!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
-#, fuzzy
 msgid "API method not found."
 msgstr "Fann ikkje API-metode."
 
@@ -314,7 +313,6 @@ msgstr ""
 
 #. TRANS: Server error displayed when a user's delivery device cannot be updated.
 #: actions/apiaccountupdatedeliverydevice.php:130
-#, fuzzy
 msgid "Could not update user."
 msgstr "Kan ikkje oppdatera brukar."
 
@@ -327,7 +325,8 @@ msgstr "Kan ikkje oppdatera brukar."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -336,7 +335,6 @@ msgstr "Brukaren har inga profil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
 #: actions/apiaccountupdateprofile.php:147
-#, fuzzy
 msgid "Could not save profile."
 msgstr "Kan ikkje lagra profil."
 
@@ -405,9 +403,9 @@ msgid "%s subscriptions"
 msgstr "%s tingarar"
 
 #: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "%s favorites"
-msgstr "Favorittar"
+msgstr "%s favorittar"
 
 #: actions/apiatomservice.php:123
 #, fuzzy, php-format
@@ -564,7 +562,7 @@ msgstr "Kan ikkje oppdatera brukar."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
@@ -574,7 +572,7 @@ msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ikkje eit gyldig brukarnamn."
@@ -586,7 +584,7 @@ msgstr "Ikkje eit gyldig brukarnamn."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Heimesida er ikkje ei gyldig internettadresse."
@@ -596,7 +594,7 @@ 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:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -612,7 +610,7 @@ msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -624,7 +622,7 @@ 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:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -637,7 +635,7 @@ msgstr "Plassering er for lang (maksimalt 255 teikn)."
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -656,7 +654,7 @@ msgstr "Ugyldig merkelapp: %s"
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, fuzzy, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
@@ -665,7 +663,7 @@ msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -1070,7 +1068,7 @@ 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:138
+#: actions/apitimelinegroup.php:134
 #, fuzzy, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Kann ikkje oppdatera gruppa."
@@ -1163,30 +1161,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, 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:404
+#: actions/apitimelineuser.php:406
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Fann ingen profil med den IDen."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1197,14 +1195,13 @@ 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/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "Fann ikkje API-metode."
 
 #: actions/atompubfavoritefeed.php:70
-#, fuzzy
 msgid "No such profile"
-msgstr "Denne notisen finst ikkje."
+msgstr "Denne notisen finst ikkje"
 
 #: actions/atompubfavoritefeed.php:145
 #, php-format
@@ -1288,7 +1285,6 @@ msgid "Can't delete someone else's favorite"
 msgstr "Kunne ikkje slette favoritt."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
 msgstr "Denne gruppa finst ikkje."
 
@@ -1413,14 +1409,14 @@ msgid "Preview"
 msgstr "Forhandsvis"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Slett"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
@@ -1465,6 +1461,37 @@ msgstr "Feil ved oppdatering av brukarbilete."
 msgid "Avatar deleted."
 msgstr "Lasta opp brukarbilete."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "Kun brukaren kan lese sine eigne meldingar."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr ""
+
+#: actions/backupaccount.php:258
+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."
@@ -1674,6 +1701,60 @@ msgstr "Stadfestingskode"
 msgid "Notices"
 msgstr "Notisar"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "Kun brukaren kan lese sine eigne meldingar."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "Kan ikkje oppdatera brukar."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Lasta opp brukarbilete."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Opprett ei ny gruppe"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Godta"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1776,15 +1857,13 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-#, fuzzy
 msgid "Do not delete this group"
-msgstr "Kan ikkje sletta notisen."
+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 notisen"
+msgstr "Slett denne gruppa"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
@@ -1828,7 +1907,7 @@ 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:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Slett denne notisen"
 
@@ -1893,9 +1972,8 @@ msgid "Site logo"
 msgstr "Statusmelding"
 
 #: actions/designadminpanel.php:457
-#, fuzzy
 msgid "SSL logo"
-msgstr "Statusmelding"
+msgstr "SSL-logo"
 
 #: actions/designadminpanel.php:469
 #, fuzzy
@@ -2069,9 +2147,8 @@ msgstr "Samme som passord over. Påkrevd."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
 #: actions/editapplication.php:188 actions/newapplication.php:169
-#, fuzzy
 msgid "Name is too long (maximum 255 characters)."
-msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
+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.
 #: actions/editapplication.php:192 actions/newapplication.php:166
@@ -2152,7 +2229,7 @@ msgstr "Bruk dette skjemaet for å redigere gruppa"
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, fuzzy, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Ugyldig merkelapp: %s"
@@ -2164,7 +2241,7 @@ 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:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 #, fuzzy
 msgid "Could not create aliases."
 msgstr "Kunne ikkje lagre favoritt."
@@ -3000,9 +3077,9 @@ 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:77
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid email address: %s."
-msgstr "Ugyldig epostadresse: «%s»"
+msgstr "Ugyldig epostadresse: %s."
 
 #. TRANS: Page title when invitations have been sent.
 #: actions/invite.php:116
@@ -3029,7 +3106,7 @@ 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:145 actions/invite.php:159
-#, fuzzy, php-format
+#, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -3406,8 +3483,14 @@ msgstr "Kunne ikkje lagre favoritt."
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Bruk dette skjemaet for å lage ein ny gruppe."
 
@@ -3731,11 +3814,6 @@ msgstr "Nytt passord"
 msgid "6 or more characters"
 msgstr "6 eller fleire teikn"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Godta"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Samme passord som over"
@@ -4274,6 +4352,11 @@ msgstr "Kan ikkje lagra merkelapp."
 msgid "Settings saved."
 msgstr "Lagra innstillingar."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Opprett ei ny gruppe"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4497,7 +4580,6 @@ msgid "Unexpected password reset."
 msgstr "Uventa passordnullstilling."
 
 #: actions/recoverpassword.php:365
-#, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "Passord må vera 6 tekn eller meir."
 
@@ -4737,7 +4819,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:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Framheva"
 
@@ -4798,6 +4880,90 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Melding til %1$s på %2$s"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "Kun brukaren kan lese sine eigne meldingar."
+
+#: 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."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, 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:130 lib/mediafile.php:194
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:136 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:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "Systemfeil ved opplasting av fil."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Alle medlemmar"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, 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."
@@ -4906,7 +5072,7 @@ msgid "Reset key & secret"
 msgstr ""
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Slett"
 
@@ -5077,14 +5243,12 @@ msgstr "Alle medlemmar"
 
 #. TRANS: Label for creation date in statistics on group page.
 #: actions/showgroup.php:453
-#, fuzzy
 msgctxt "LABEL"
 msgid "Created"
-msgstr "Framheva"
+msgstr "Oppretta"
 
 #. TRANS: Label for member count in statistics on group page.
 #: actions/showgroup.php:461
-#, fuzzy
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Medlemmar"
@@ -6164,13 +6328,13 @@ msgid "Author(s)"
 msgstr ""
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: classes/Fave.php:167
 #, fuzzy, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr ""
@@ -6282,7 +6446,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6310,31 +6474,31 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: 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:288
+#: classes/Notice.php:297
 #, fuzzy
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
@@ -6343,43 +6507,43 @@ 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:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1012
+#: classes/Notice.php:1013
 #, 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6387,14 +6551,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6468,32 +6632,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "Melding til %1$s på %2$s"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "Kunne ikkje laga gruppa."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 msgid "Could not set group URI."
 msgstr "Kunne ikkje laga gruppa."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:549
 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:559
+#: classes/User_group.php:564
 #, fuzzy
 msgid "Could not save local group info."
 msgstr "Kunne ikkje lagra abonnement."
@@ -6842,10 +7006,19 @@ msgstr "Før »"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Bilete"
+msgid "Unknown profile."
+msgstr "Ukjend fil type"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7151,6 +7324,10 @@ msgstr "Gjenopprett"
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7546,26 +7723,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 #, 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:150
+#: lib/common.php:153
 #, 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Logg inn or sida"
@@ -7670,6 +7847,14 @@ msgstr ""
 msgid "FOAF"
 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"
@@ -7853,11 +8038,6 @@ msgstr "Du kan lasta opp ein logo for gruppa."
 msgid "Partial upload."
 msgstr "Hallvegs opplasta."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "Systemfeil ved opplasting av fil."
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "Korrupt bilete."
@@ -8188,7 +8368,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 #, fuzzy
 msgid "from"
 msgstr " frå "
@@ -8219,38 +8399,6 @@ msgstr "Støttar ikkje bileteformatet."
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: lib/mediafile.php:194
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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.
-#: lib/mediafile.php:222
-msgid "File upload stopped by extension."
-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."
@@ -8271,7 +8419,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8280,7 +8428,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
@@ -8316,17 +8464,17 @@ msgid "Send"
 msgstr "Send"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8367,58 +8515,58 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 #, fuzzy
 msgid "N"
 msgstr "Nei"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr ""
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 #, fuzzy
 msgid "in context"
 msgstr "Ingen innhald."
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 #, fuzzy
 msgid "Repeated by"
 msgstr "Lag"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "Svar på denne notisen"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Svar"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 #, fuzzy
 msgid "Notice repeated"
 msgstr "Melding lagra"
@@ -8578,7 +8726,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:957
+#: lib/router.php:974
 #, fuzzy
 msgid "Page not found."
 msgstr "Fann ikkje API-metode."
@@ -8939,22 +9087,10 @@ msgstr "Ugyldig storleik."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
 #, fuzzy
-msgid "No user specified; using backup user."
-msgstr "Ingen vald profil."
+#~ msgid "Post"
+#~ msgstr "Bilete"
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+#~ msgid "No user specified; using backup user."
+#~ msgstr "Ingen vald profil."
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index 1990b8092f..624e7be072 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:09+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:24+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 (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-core\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -282,7 +282,7 @@ msgstr "Aktualizacje z %1$s i przyjaciół na %2$s."
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -328,7 +328,8 @@ msgstr "Nie można zaktualizować użytkownika."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -410,14 +411,14 @@ msgid "%s subscriptions"
 msgstr "Subskrypcje użytkownika %s"
 
 #: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "%s favorites"
-msgstr "Ulubione"
+msgstr "%s ulubionych"
 
 #: actions/apiatomservice.php:123
-#, fuzzy, php-format
+#, php-format
 msgid "%s memberships"
-msgstr "Członkowie grupy %s"
+msgstr "%s członków"
 
 #. TRANS: Client error displayed when users try to block themselves.
 #: actions/apiblockcreate.php:104
@@ -565,7 +566,7 @@ msgstr "Nie można odnaleźć użytkownika docelowego."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonim jest już używany. Spróbuj innego."
@@ -575,7 +576,7 @@ msgstr "Pseudonim jest już używany. Spróbuj innego."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "To nie jest prawidłowy pseudonim."
@@ -587,7 +588,7 @@ msgstr "To nie jest prawidłowy pseudonim."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Strona domowa nie jest prawidłowym adresem URL."
@@ -597,7 +598,7 @@ 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:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: 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)."
@@ -612,7 +613,7 @@ msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -625,7 +626,7 @@ 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:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
@@ -637,7 +638,7 @@ msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -657,7 +658,7 @@ msgstr "Nieprawidłowy alias: \"%s\"."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias \"%s\" jest już używany. Spróbuj innego."
@@ -666,7 +667,7 @@ msgstr "Alias \"%s\" jest już używany. Spróbuj innego."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Alias nie może być taki sam jak pseudonim."
 
@@ -1068,7 +1069,7 @@ 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:138
+#: actions/apitimelinegroup.php:134
 #, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Nie można utworzyć kanału dla grupy - %s"
@@ -1139,19 +1140,16 @@ 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
-#, fuzzy
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Akceptowanie tylko AtomPub dla kanałów Atom."
 
 #: actions/apitimelineuser.php:310
-#, fuzzy
 msgid "Atom post must not be empty."
-msgstr "Wpis Atom musi być wpisem Atom."
+msgstr "Wpis Atom nie może być pusty."
 
 #: actions/apitimelineuser.php:315
-#, fuzzy
 msgid "Atom post must be well-formed XML."
-msgstr "Wpis Atom musi być wpisem Atom."
+msgstr "Wpis Atom musi być poprawnie sformatowanym kodem XML."
 
 #. TRANS: Client error displayed when not using an Atom entry.
 #: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
@@ -1162,31 +1160,30 @@ msgstr "Wpis Atom musi być wpisem Atom."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
-#, fuzzy
+#: actions/apitimelineuser.php:334
 msgid "Can only handle POST activities."
-msgstr "Można obsługiwać tylko działania wpisów."
+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:343
-#, fuzzy, php-format
+#: actions/apitimelineuser.php:345
+#, php-format
 msgid "Cannot handle activity object type \"%s\"."
-msgstr "Nie można obsłużyć typu obiektu działania \"%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.
-#: actions/apitimelineuser.php:376
-#, fuzzy, php-format
+#: actions/apitimelineuser.php:378
+#, php-format
 msgid "No content for notice %d."
-msgstr "Przeszukaj zawartość wpisów"
+msgstr "Brak zawartości dla wpisu %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Wpis z adresem URI \"%s\" już istnieje."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr "Wpis AtomPub z nieznanym adresem URI %s uwagi"
@@ -1197,46 +1194,40 @@ 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/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "Nie odnaleziono strony."
 
 #: actions/atompubfavoritefeed.php:70
-#, fuzzy
 msgid "No such profile"
-msgstr "Nie ma takiego profilu."
+msgstr "Nie ma takiego profilu"
 
 #: actions/atompubfavoritefeed.php:145
 #, php-format
 msgid "Notices %s has favorited to on %s"
-msgstr ""
+msgstr "Wpisy %s został oznaczone jako ulubione na %s"
 
 #: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-#, fuzzy
 msgid "Can't add someone else's subscription"
-msgstr "Nie można wprowadzić nowej subskrypcji."
+msgstr "Nie można dodać subskrypcji innej osoby"
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
 #: actions/atompubfavoritefeed.php:239
-#, fuzzy
 msgid "Can only handle Favorite activities."
-msgstr "Można obsługiwać tylko działania wpisów."
+msgstr "Można obsługiwać tylko działania ulubionych."
 
 #: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
-#, fuzzy
 msgid "Can only fave notices."
-msgstr "Można obsługiwać tylko działania wpisów."
+msgstr "Można tylko dodawać wpisy do ulubionych."
 
 #: actions/atompubfavoritefeed.php:256
-#, fuzzy
 msgid "Unknown note."
-msgstr "Nieznane"
+msgstr "Nieznany wpis."
 
 #: actions/atompubfavoritefeed.php:263
-#, fuzzy
 msgid "Already a favorite."
-msgstr "Dodaj do ulubionych"
+msgstr "Jest już ulubiony."
 
 #: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
 #: actions/atompubshowmembership.php:73 actions/subscribe.php:107
@@ -1244,106 +1235,96 @@ msgid "No such profile."
 msgstr "Nie ma takiego profilu."
 
 #: actions/atompubmembershipfeed.php:144
-#, fuzzy, php-format
+#, php-format
 msgid "%s group memberships"
-msgstr "Członkowie grupy %s"
+msgstr "%s członków grupy"
 
 #: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %s is a member of on %s"
-msgstr "Grupy %s są członkiem"
+msgstr "Grupy %s są członkiem w witrynie %s"
 
 #: actions/atompubmembershipfeed.php:217
 msgid "Can't add someone else's membership"
-msgstr ""
+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:241
-#, fuzzy
 msgid "Can only handle Join activities."
-msgstr "Można obsługiwać tylko działania wpisów."
+msgstr "Można obsługiwać tylko działania dołączania."
 
 #: actions/atompubmembershipfeed.php:256
-#, fuzzy
 msgid "Unknown group."
-msgstr "Nieznane"
+msgstr "Nieznana grupa."
 
 #: actions/atompubmembershipfeed.php:263
-#, fuzzy
 msgid "Already a member."
-msgstr "Wszyscy członkowie"
+msgstr "Jest już członkiem."
 
 #: actions/atompubmembershipfeed.php:270
 msgid "Blocked by admin."
-msgstr ""
+msgstr "Zablokowane przez administratora."
 
 #: actions/atompubshowfavorite.php:89
-#, fuzzy
 msgid "No such favorite."
-msgstr "Nie ma takiego pliku."
+msgstr "Nie ma takiego ulubionego wpisu."
 
 #: actions/atompubshowfavorite.php:151
-#, fuzzy
 msgid "Can't delete someone else's favorite"
-msgstr "Nie można usunąć ulubionego wpisu."
+msgstr "Nie można usunąć ulubionego wpisu innej osoby"
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
 msgstr "Nie ma takiej grupy."
 
 #: actions/atompubshowmembership.php:90
-#, fuzzy
 msgid "Not a member"
-msgstr "Wszyscy członkowie"
+msgstr "Nie jest członkiem"
 
 #: actions/atompubshowmembership.php:115
-#, fuzzy
 msgid "Method not supported"
-msgstr "Metoda HTTP nie jest obsługiwana."
+msgstr "Metoda nie jest obsługiwana"
 
 #: actions/atompubshowmembership.php:150
 msgid "Can't delete someone else's membership"
-msgstr ""
+msgstr "Nie można usunąć członkostwa innej osoby"
 
 #: actions/atompubshowsubscription.php:72
 #: actions/atompubshowsubscription.php:81
 #: actions/atompubsubscriptionfeed.php:74
-#, fuzzy, php-format
+#, php-format
 msgid "No such profile id: %d"
-msgstr "Nie ma takiego profilu."
+msgstr "Nie ma takiego identyfikatora profilu: %d"
 
 #: actions/atompubshowsubscription.php:90
-#, fuzzy, php-format
+#, php-format
 msgid "Profile %d not subscribed to profile %d"
-msgstr "Nie jesteś subskrybowany do tego profilu."
+msgstr "Profil %d nie jest subskrybowany do profilu %d"
 
 #: actions/atompubshowsubscription.php:154
-#, fuzzy
 msgid "Can't delete someone else's subscription"
-msgstr "Nie można usunąć autosubskrypcji."
+msgstr "Nie można usunąć subskrypcji innej osoby"
 
 #: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
+#, php-format
 msgid "People %s has subscribed to on %s"
-msgstr "Osoby subskrybowane do %s"
+msgstr "Osoby %s są subskrybowane w witrynie %s"
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
 #: actions/atompubsubscriptionfeed.php:246
-#, fuzzy
 msgid "Can only handle Follow activities."
-msgstr "Można obsługiwać tylko działania wpisów."
+msgstr "Można obsługiwać tylko działania obserwowania."
 
 #: actions/atompubsubscriptionfeed.php:253
 msgid "Can only follow people."
-msgstr ""
+msgstr "Można obserwować tylko osoby."
 
 #: actions/atompubsubscriptionfeed.php:262
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown profile %s"
-msgstr "Nieznany typ pliku"
+msgstr "Nieznany profil %s"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
@@ -1415,13 +1396,13 @@ msgid "Preview"
 msgstr "Podgląd"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Usuń"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Wyślij"
@@ -1462,6 +1443,38 @@ msgstr "Zaktualizowanie awatara nie powiodło się."
 msgid "Avatar deleted."
 msgstr "Usunięto awatar."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "Tylko zalogowani użytkownicy mogą powtarzać wpisy."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Tło"
+
+#: actions/backupaccount.php:258
+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."
@@ -1667,6 +1680,60 @@ msgstr "Rozmowa"
 msgid "Notices"
 msgstr "Wpisy"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "Tylko zalogowani użytkownicy mogą powtarzać wpisy."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "Nie można usuwać użytkowników."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Usunięto awatar."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Utwórz konto"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Potwierdź"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1814,7 +1881,7 @@ 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:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Usuń ten wpis"
 
@@ -2116,7 +2183,7 @@ msgstr "Użyj tego formularza, aby zmodyfikować grupę."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Nieprawidłowy alias: \"%s\""
@@ -2128,7 +2195,7 @@ 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:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "Nie można utworzyć aliasów."
 
@@ -2228,6 +2295,8 @@ msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
 msgstr ""
+"Aby wysyłać wpisy przez e-mail, należy utworzyć unikalny adres e-mail na tym "
+"serwerze:"
 
 #. 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.
@@ -3363,8 +3432,14 @@ msgstr "Nie można utworzyć aplikacji."
 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
+#, fuzzy
+msgid "You are not allowed to create groups on this site."
+msgstr "Brak uprawnienia do usunięcia tej grupy."
+
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Użyj tego formularza, aby utworzyć nową grupę."
 
@@ -3685,11 +3760,6 @@ msgstr "Nowe hasło"
 msgid "6 or more characters"
 msgstr "6 lub więcej znaków"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Potwierdź"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Takie samo jak powyższe hasło"
@@ -4208,6 +4278,11 @@ msgstr "Nie można zapisać znaczników."
 msgid "Settings saved."
 msgstr "Zapisano ustawienia."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Utwórz konto"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4670,7 +4745,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:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Powtórzono"
 
@@ -4736,6 +4811,91 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "odpowiedzi dla użytkownika %1$s na %2$s."
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "Tylko zalogowani użytkownicy mogą powtarzać wpisy."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "Nie zarejestrowano jeszcze żadnych aplikacji."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, fuzzy
+msgid "No uploaded file."
+msgstr "Wyślij plik"
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: actions/restoreaccount.php:130 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:136 lib/mediafile.php:200
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"Wysłany plik przekracza dyrektywę MAX_FILE_SIZE podaną w formularzu HTML."
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "Błąd systemu podczas wysyłania pliku."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr "Pobieranie kopii zapasowej z pliku \"%s\"."
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Nie jest członkiem"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, fuzzy
+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."
@@ -4836,7 +4996,7 @@ msgid "Reset key & secret"
 msgstr "Przywrócenie klucza i sekretu"
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Usuń"
 
@@ -5699,9 +5859,9 @@ msgid "%s is not listening to anyone."
 msgstr "Użytkownik %s nie obserwuje nikogo."
 
 #: actions/subscriptions.php:178
-#, fuzzy, php-format
+#, php-format
 msgid "Subscription feed for %s (Atom)"
-msgstr "Kanał wpisów dla %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:242
@@ -6117,13 +6277,13 @@ msgid "Author(s)"
 msgstr "Autorzy"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: 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."
@@ -6248,7 +6408,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr "Nigdzie nie odnaleziono nazwy lub DSN bazy danych."
 
@@ -6275,23 +6435,23 @@ 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:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -6299,7 +6459,7 @@ 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:288
+#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -6308,42 +6468,42 @@ msgstr ""
 "wyślij ponownie za kilka minut."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 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:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6351,14 +6511,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6429,33 +6589,33 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "Witaj w %1$s, @%2$s."
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 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
+#: classes/User.php:922
 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:511
+#: classes/User_group.php:516
 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:521
+#: classes/User_group.php:526
 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:544
+#: classes/User_group.php:549
 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:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "Nie można zapisać informacji o lokalnej grupie."
 
@@ -6796,10 +6956,19 @@ msgstr "Wcześniej"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Oczekiwano elementu kanału roota, ale otrzymano cały dokument XML."
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Zdjęcie"
+msgid "Unknown profile."
+msgstr "Nieznany profil %s"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7087,6 +7256,10 @@ msgstr "Unieważnij"
 msgid "author element must contain a name element."
 msgstr "element autora musi zawierać element nazwy."
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7521,24 +7694,24 @@ msgstr ""
 "tracking - jeszcze nie zaimplementowano\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 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:150
+#: lib/common.php:153
 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "Przejdź do instalatora."
 
@@ -7638,6 +7811,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: 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"
@@ -7826,11 +8007,6 @@ msgstr "Ten plik jest za duży. Maksymalny rozmiar pliku to %s."
 msgid "Partial upload."
 msgstr "Częściowo wysłano."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "Błąd systemu podczas wysyłania pliku."
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "To nie jest obraz lub lub plik jest uszkodzony."
@@ -8255,7 +8431,7 @@ msgstr ""
 "rozmowę z innymi użytkownikami. Inni mogą wysyłać ci wiadomości tylko dla "
 "twoich oczu."
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "z"
 
@@ -8285,39 +8461,6 @@ msgstr "Nieobsługiwany typ wiadomości: %s"
 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 an uploaded file is larger than set in php.ini.
-#: 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.
-#: lib/mediafile.php:200
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
-msgstr ""
-"Wysłany plik przekracza dyrektywę MAX_FILE_SIZE podaną w formularzu HTML."
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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 would cause a user to exceed a set quota.
 #: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
@@ -8338,7 +8481,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8349,7 +8492,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: 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."
@@ -8382,17 +8525,17 @@ msgid "Send"
 msgstr "Wyślij"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8434,55 +8577,55 @@ msgstr ""
 "ponownie później"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "Północ"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "Południe"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "Wschód"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "Zachód"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, 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:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "w"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr "WWW"
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "w rozmowie"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "Powtórzone przez"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "Odpowiedz na ten wpis"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Powtórzono wpis"
 
@@ -8636,7 +8779,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:957
+#: lib/router.php:974
 msgid "Page not found."
 msgstr "Nie odnaleziono strony."
 
@@ -9000,22 +9143,14 @@ msgstr "Nieprawidłowy kod XML."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr "Pobieranie kopii zapasowej z pliku \"%s\"."
+#~ msgid "Post"
+#~ msgstr "Wpis"
 
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
-msgid "No user specified; using backup user."
-msgstr "Nie podano użytkownika; używanie użytkownika zapasowego."
+#~ msgid "No user specified; using backup user."
+#~ msgstr "Nie podano użytkownika; używanie użytkownika zapasowego."
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] "%d wpis w kopii zapasowej."
-msgstr[1] "%d wpisy w kopii zapasowej."
-msgstr[2] "%d wpisów w kopii zapasowej."
+#~ msgid "%d entry in backup."
+#~ msgid_plural "%d entries in backup."
+#~ msgstr[0] "%d wpis w kopii zapasowej."
+#~ msgstr[1] "%d wpisy w kopii zapasowej."
+#~ msgstr[2] "%d wpisów w kopii zapasowej."
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 2cad0907c7..679aaca7a1 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -14,17 +14,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:10+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -281,7 +281,7 @@ msgstr "Actualizações de %1$s e amigos no %2$s!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -327,7 +327,8 @@ msgstr "Não foi possível actualizar o utilizador."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -561,7 +562,7 @@ msgstr "Não foi possível encontrar o utilizador de destino."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Utilizador já é usado. Tente outro."
@@ -571,7 +572,7 @@ msgstr "Utilizador já é usado. Tente outro."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Utilizador não é válido."
@@ -583,7 +584,7 @@ msgstr "Utilizador não é válido."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Página de ínicio não é uma URL válida."
@@ -593,7 +594,7 @@ 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:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -609,7 +610,7 @@ msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -621,7 +622,7 @@ 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:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -634,7 +635,7 @@ msgstr "Localidade demasiado longa (máx. 255 caracteres)."
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -653,7 +654,7 @@ msgstr "Nome alternativo inválido: \"%s\""
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Nome alternativo \"%s\" já em uso. Tente outro."
@@ -662,7 +663,7 @@ msgstr "Nome alternativo \"%s\" já em uso. Tente outro."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Um nome alternativo não pode ser igual ao nome do utilizador."
 
@@ -1066,7 +1067,7 @@ 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:138
+#: actions/apitimelinegroup.php:134
 #, fuzzy, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Não foi possível actualizar o grupo."
@@ -1159,30 +1160,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, 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:404
+#: actions/apitimelineuser.php:406
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Não existe nenhuma nota com essa identificação."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1193,7 +1194,7 @@ 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/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 #, fuzzy
 msgid "User not found."
 msgstr "Método da API não encontrado."
@@ -1284,9 +1285,8 @@ msgid "Can't delete someone else's favorite"
 msgstr "Não foi possível eliminar o favorito."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
-msgstr "Grupo não foi encontrado."
+msgstr "Grupo não existe"
 
 #: actions/atompubshowmembership.php:90
 #, fuzzy
@@ -1409,14 +1409,14 @@ msgid "Preview"
 msgstr "Antevisão"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Apagar"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
@@ -1459,6 +1459,38 @@ msgstr "Falha ao actualizar avatar."
 msgid "Avatar deleted."
 msgstr "Avatar apagado."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "Só utilizadores com sessão iniciada podem repetir notas."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Fundo"
+
+#: actions/backupaccount.php:258
+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."
@@ -1666,6 +1698,60 @@ msgstr "Conversação"
 msgid "Notices"
 msgstr "Notas"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "Só utilizadores com sessão iniciada podem repetir notas."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "Não pode apagar utilizadores."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Avatar apagado."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Criar uma conta"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Confirmação"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1819,7 +1905,7 @@ 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:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Apagar esta nota"
 
@@ -2129,7 +2215,7 @@ msgstr "Use este formulário para editar o grupo."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Nome alternativo inválido: \"%s\""
@@ -2141,7 +2227,7 @@ 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:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "Não foi possível criar os nomes alternativos."
 
@@ -3380,8 +3466,14 @@ msgstr "Não foi possível criar a aplicação."
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Use este formulário para criar um grupo novo."
 
@@ -3700,11 +3792,6 @@ msgstr "Nova"
 msgid "6 or more characters"
 msgstr "6 ou mais caracteres"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Confirmação"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Repita a senha nova"
@@ -4240,6 +4327,11 @@ msgstr "Não foi possível gravar as categorias."
 msgid "Settings saved."
 msgstr "Configurações gravadas."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Criar uma conta"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4711,7 +4803,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:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Repetida"
 
@@ -4776,6 +4868,92 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Respostas a %1$s em %2$s!"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "Só utilizadores com sessão iniciada podem repetir notas."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "Ainda não registou nenhuma aplicação."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, 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:130 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:136 lib/mediafile.php:200
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"Ficheiro carregado excede a directiva MAX_FILE_SIZE especificada no "
+"formulário HTML."
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "Ocorreu um erro de sistema ao transferir o ficheiro."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Todos os membros"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, 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."
@@ -4876,7 +5054,7 @@ msgid "Reset key & secret"
 msgstr "Reiniciar chave e segredo"
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Apagar"
 
@@ -6161,13 +6339,13 @@ msgid "Author(s)"
 msgstr "Autores"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: 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."
@@ -6282,7 +6460,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr "Não foi encontrado nenhum nome de base de dados ou DSN."
 
@@ -6309,23 +6487,23 @@ 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:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -6333,7 +6511,7 @@ 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:288
+#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -6342,43 +6520,43 @@ msgstr ""
 "publicar daqui a alguns minutos."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 #, 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:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6386,7 +6564,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:798
+#: classes/Profile.php:765
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -6394,7 +6572,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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6466,32 +6644,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "%1$s dá-lhe as boas-vindas, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 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
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 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:521
+#: classes/User_group.php:526
 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:544
+#: classes/User_group.php:549
 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:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "Não foi possível gravar a informação do grupo local."
 
@@ -6834,10 +7012,19 @@ msgstr ""
 "Era esperado um elemento raiz da fonte, mas foi recebido um documento XML "
 "inteiro."
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Foto"
+msgid "Unknown profile."
+msgstr "Tipo do ficheiro é desconhecido"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7124,6 +7311,10 @@ msgstr "Retirar"
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7553,26 +7744,26 @@ msgstr ""
 "tracking - ainda não implementado.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 #, 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:150
+#: lib/common.php:153
 #, 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "Ir para o instalador."
 
@@ -7680,6 +7871,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: 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"
@@ -7862,11 +8061,6 @@ msgstr "Esse ficheiro é demasiado grande. O tamanho máximo de ficheiro é %s."
 msgid "Partial upload."
 msgstr "Transferência parcial."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "Ocorreu um erro de sistema ao transferir o ficheiro."
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "Ficheiro não é uma imagem ou está corrompido."
@@ -8287,7 +8481,7 @@ msgstr ""
 "conversa com outros utilizadores. Outros podem enviar-lhe mensagens, a que "
 "só você terá acesso."
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "a partir de"
 
@@ -8319,40 +8513,6 @@ msgstr ""
 "Ocorreu um erro na base de dados ao gravar o seu ficheiro. Por favor, tente "
 "novamente."
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: 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.
-#: lib/mediafile.php:200
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
-msgstr ""
-"Ficheiro carregado excede a directiva MAX_FILE_SIZE especificada no "
-"formulário HTML."
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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 would cause a user to exceed a set quota.
 #: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
@@ -8373,7 +8533,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8384,7 +8544,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: 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."
@@ -8419,17 +8579,17 @@ msgid "Send"
 msgstr "Enviar"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8470,55 +8630,55 @@ msgstr ""
 "tente novamente mais tarde"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "O"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, 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:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "coords."
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "no contexto"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "Repetida por"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "Responder a esta nota"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Nota repetida"
 
@@ -8672,7 +8832,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:957
+#: lib/router.php:974
 #, fuzzy
 msgid "Page not found."
 msgstr "Método da API não encontrado."
@@ -9027,22 +9187,10 @@ msgstr "Tamanho inválido."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
 #, fuzzy
-msgid "No user specified; using backup user."
-msgstr "Não foi especificado um ID de utilizador."
+#~ msgid "Post"
+#~ msgstr "Foto"
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+#~ msgid "No user specified; using backup user."
+#~ msgstr "Não foi especificado um ID de utilizador."
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 20a0666b35..8522a5f27c 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -15,18 +15,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:11+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -284,7 +284,7 @@ msgstr "Atualizações de %1$s e amigos no %2$s!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -331,7 +331,8 @@ msgstr "Não foi possível atualizar o usuário."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -567,7 +568,7 @@ msgstr "Não foi possível encontrar usuário de destino."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Esta identificação já está em uso. Tente outro."
@@ -577,7 +578,7 @@ msgstr "Esta identificação já está em uso. Tente outro."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Não é uma identificação válida."
@@ -589,7 +590,7 @@ msgstr "Não é uma identificação válida."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "A URL informada não é válida."
@@ -599,7 +600,7 @@ 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:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "O nome completo é muito extenso (máx. 255 caracteres)"
@@ -614,7 +615,7 @@ msgstr "O nome completo é muito extenso (máx. 255 caracteres)"
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -626,7 +627,7 @@ 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:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "A localização é muito extensa (máx. 255 caracteres)."
@@ -638,7 +639,7 @@ msgstr "A localização é muito extensa (máx. 255 caracteres)."
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -657,7 +658,7 @@ msgstr "Apelido inválido: \"%s\"."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "O apelido \"%s\" já está em uso. Tente outro."
@@ -666,7 +667,7 @@ msgstr "O apelido \"%s\" já está em uso. Tente outro."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "O apelido não pode ser igual à identificação."
 
@@ -1065,7 +1066,7 @@ 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:138
+#: 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"
@@ -1159,31 +1160,31 @@ msgstr "A publicação Atom deve ser uma entrada Atom."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 #, fuzzy
 msgid "Can only handle POST activities."
 msgstr "Só é possível manipular atividades de publicação."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:343
+#: actions/apitimelineuser.php:345
 #, fuzzy, 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.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Encontre conteúdo de mensagens"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Já existe uma mensagem com a URI \"%s\"."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr "Publicação AtomPub com uma URI de atenção desconhecida %s"
@@ -1194,7 +1195,7 @@ 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/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "O método da API não foi encontrado!"
 
@@ -1286,7 +1287,6 @@ msgid "Can't delete someone else's favorite"
 msgstr "Não foi possível excluir a favorita."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
 msgstr "Esse grupo não existe."
 
@@ -1413,13 +1413,13 @@ msgid "Preview"
 msgstr "Pré-visualizar"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Excluir"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Enviar"
@@ -1460,6 +1460,38 @@ msgstr "Não foi possível atualizar o avatar."
 msgid "Avatar deleted."
 msgstr "O avatar foi excluído."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "Apenas usuários autenticados podem repetir mensagens."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Fundo"
+
+#: actions/backupaccount.php:258
+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."
@@ -1666,6 +1698,60 @@ msgstr "Conversa"
 msgid "Notices"
 msgstr "Mensagens"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "Apenas usuários autenticados podem repetir mensagens."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "Você não pode excluir usuários."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "O avatar foi excluído."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Criar uma conta"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Confirmar"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1814,7 +1900,7 @@ 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:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Excluir esta mensagem"
 
@@ -2120,7 +2206,7 @@ msgstr "Use esse formulário para editar o grupo."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Apelido inválido: \"%s\""
@@ -2132,7 +2218,7 @@ 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:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "Não foi possível criar os apelidos."
 
@@ -3379,8 +3465,14 @@ msgstr "Não foi possível criar a aplicação."
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Utilize este formulário para criar um novo grupo."
 
@@ -3704,11 +3796,6 @@ msgstr "Senha nova"
 msgid "6 or more characters"
 msgstr "No mínimo 6 caracteres"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Confirmar"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Igual à senha acima"
@@ -4224,6 +4311,11 @@ msgstr "Não foi possível salvar as etiquetas."
 msgid "Settings saved."
 msgstr "As configurações foram salvas."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Criar uma conta"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4692,7 +4784,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:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Repetida"
 
@@ -4758,6 +4850,94 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Respostas para %1$s no %2$s"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "Apenas usuários autenticados podem repetir mensagens."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "Você ainda não registrou nenhuma aplicação."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, 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:130 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:136 lib/mediafile.php:200
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"O arquivo a ser enviado é maior do que o limite definido no parâmetro "
+"MAX_FILE_SIZE do formulário HTML."
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "Erro no sistema durante o envio do arquivo."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Todos os membros"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, 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."
@@ -4858,7 +5038,7 @@ msgid "Reset key & secret"
 msgstr "Restaurar a chave e o segredo"
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Excluir"
 
@@ -6139,13 +6319,13 @@ msgid "Author(s)"
 msgstr "Autor(es)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: 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."
@@ -6256,7 +6436,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr "Não foi encontrado nenhum nome de base de dados ou DSN."
 
@@ -6283,23 +6463,23 @@ 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:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -6307,7 +6487,7 @@ 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:288
+#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -6316,43 +6496,43 @@ msgstr ""
 "publique novamente daqui a alguns minutos."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 #, 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:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6360,14 +6540,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6439,32 +6619,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "Bem vindo(a) a %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 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
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 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:521
+#: classes/User_group.php:526
 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:544
+#: classes/User_group.php:549
 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:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "Não foi possível salvar a informação do grupo local."
 
@@ -6803,10 +6983,19 @@ msgstr ""
 "Era esperado um elemento raiz da fonte, mas foi obtido o documento XML "
 "inteiro."
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Imagem"
+msgid "Unknown profile."
+msgstr "Tipo de arquivo desconhecido"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7097,6 +7286,10 @@ msgstr "Revogar"
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7534,26 +7727,26 @@ msgstr ""
 "tracking -  não implementado ainda\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 #, 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:150
+#: lib/common.php:153
 #, 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "Ir para o instalador."
 
@@ -7660,6 +7853,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: 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"
@@ -7844,11 +8045,6 @@ msgstr "O arquivo é muito grande. O tamanho máximo é de %s."
 msgid "Partial upload."
 msgstr "Envio parcial."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "Erro no sistema durante o envio do arquivo."
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "Imagem inválida ou arquivo corrompido."
@@ -8270,7 +8466,7 @@ msgstr ""
 "privadas para envolver outras pessoas em uma conversa. Você também pode "
 "receber mensagens privadas."
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "de"
 
@@ -8302,42 +8498,6 @@ msgstr ""
 "Ocorreu um erro no banco de dados durante o salvamento do seu arquivo. Por "
 "favor, tente novamente."
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: 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.
-#: lib/mediafile.php:200
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
-msgstr ""
-"O arquivo a ser enviado é maior do que o limite definido no parâmetro "
-"MAX_FILE_SIZE do formulário HTML."
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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 would cause a user to exceed a set quota.
 #: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
@@ -8358,7 +8518,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8369,7 +8529,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: 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."
@@ -8404,19 +8564,19 @@ msgid "Send"
 msgstr "Enviar"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8457,55 +8617,55 @@ msgstr ""
 "esperado. Por favor, tente novamente mais tarde."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "L"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "O"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, 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:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "em"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "no contexto"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "Repetida por"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "Responder a esta mensagem"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Mensagem repetida"
 
@@ -8659,7 +8819,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:957
+#: lib/router.php:974
 #, fuzzy
 msgid "Page not found."
 msgstr "O método da API não foi encontrado!"
@@ -9014,22 +9174,10 @@ msgstr "Tamanho inválido."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
 #, fuzzy
-msgid "No user specified; using backup user."
-msgstr "Não foi especificado nenhum ID de usuário."
+#~ msgid "Post"
+#~ msgstr "Imagem"
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+#~ msgid "No user specified; using backup user."
+#~ msgstr "Não foi especificado nenhum ID de usuário."
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 24f81e72af..19c06d43b9 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -3,6 +3,7 @@
 #
 # Author: Brion
 # Author: Eleferen
+# Author: Haffman
 # Author: Kirill
 # Author: Lockal
 # Author: Putnik
@@ -15,18 +16,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:12+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -283,7 +284,7 @@ msgstr "Обновлено от %1$s и его друзей на %2$s!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -330,7 +331,8 @@ msgstr "Не удаётся обновить пользователя."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -568,7 +570,7 @@ msgstr "Не удаётся найти целевого пользователя
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Такое имя уже используется. Попробуйте какое-нибудь другое."
@@ -578,7 +580,7 @@ msgstr "Такое имя уже используется. Попробуйте
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Неверное имя."
@@ -590,7 +592,7 @@ msgstr "Неверное имя."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "URL Главной страницы неверен."
@@ -600,7 +602,7 @@ msgstr "URL Главной страницы неверен."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Полное имя слишком длинное (максимум 255 символов)."
@@ -615,7 +617,7 @@ msgstr "Полное имя слишком длинное (максимум 255
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -628,7 +630,7 @@ msgstr[2] "Слишком длинное описание (максимум %d 
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Слишком длинное месторасположение (максимум 255 символов)."
@@ -640,7 +642,7 @@ msgstr "Слишком длинное месторасположение (мак
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -660,7 +662,7 @@ msgstr "Ошибочный псевдоним: «%s»."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Алиас «%s» уже используется. Попробуйте какой-нибудь другой."
@@ -669,7 +671,7 @@ msgstr "Алиас «%s» уже используется. Попробуйте
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Алиас не может совпадать с именем."
 
@@ -1069,7 +1071,7 @@ msgstr "Обновления %1$s, отмеченные как любимые %2
 
 #. TRANS: Server error displayed when generating an Atom feed fails.
 #. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:138
+#: actions/apitimelinegroup.php:134
 #, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Не удаётся сгенерировать информацию о группе: %s"
@@ -1163,31 +1165,31 @@ msgstr "POST-запрос Atom должен быть объектом Atom."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 #, fuzzy
 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:343
+#: actions/apitimelineuser.php:345
 #, fuzzy, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Невозможно обработать действия объекта типа «%s»"
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Найти запись по содержимому"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Запись с URI «%s» уже существует."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr "Запись AtomPub с неизвестным целевым URI %s"
@@ -1198,7 +1200,7 @@ msgid "API method under construction."
 msgstr "Метод API реконструируется."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "Метод API не найден."
 
@@ -1277,7 +1279,7 @@ msgstr "Все участники"
 
 #: actions/atompubmembershipfeed.php:270
 msgid "Blocked by admin."
-msgstr ""
+msgstr "Заблокировано администратором."
 
 #: actions/atompubshowfavorite.php:89
 #, fuzzy
@@ -1290,7 +1292,6 @@ msgid "Can't delete someone else's favorite"
 msgstr "Не удаётся удалить любимую запись."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
 msgstr "Нет такой группы."
 
@@ -1417,13 +1418,13 @@ msgid "Preview"
 msgstr "Просмотр"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Удалить"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Загрузить"
@@ -1464,6 +1465,38 @@ msgstr "Неудача при обновлении аватары."
 msgid "Avatar deleted."
 msgstr "Аватар удалён."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "Повторять записи могут только вошедшие пользователи."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Фон"
+
+#: actions/backupaccount.php:258
+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."
@@ -1669,6 +1702,60 @@ msgstr "Дискуссия"
 msgid "Notices"
 msgstr "Записи"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "Повторять записи могут только вошедшие пользователи."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "Вы не можете удалять пользователей."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Аватар удалён."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Создать новый аккаунт"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Подтверждение"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1817,7 +1904,7 @@ msgid "Do not delete this notice"
 msgstr "Не удалять эту запись"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Удалить эту запись"
 
@@ -2121,7 +2208,7 @@ msgstr "Заполните информацию о группе в следую
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Неверный алиас: «%s»"
@@ -2133,7 +2220,7 @@ msgstr "Не удаётся обновить информацию о групп
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "Не удаётся создать алиасы."
 
@@ -3383,8 +3470,14 @@ msgstr "Не удаётся создать приложение."
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Используйте эту форму для создания новой группы."
 
@@ -3705,11 +3798,6 @@ msgstr "Новый пароль"
 msgid "6 or more characters"
 msgstr "6 или больше знаков"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Подтверждение"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Тот же пароль, что и выше"
@@ -4225,6 +4313,11 @@ msgstr "Не удаётся сохранить теги."
 msgid "Settings saved."
 msgstr "Настройки сохранены."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Создать новый аккаунт"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4687,7 +4780,7 @@ msgstr "Вы не можете повторить собственную зап
 msgid "You already repeated that notice."
 msgstr "Вы уже повторили эту запись."
 
-#: actions/repeat.php:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Повторено"
 
@@ -4753,6 +4846,91 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Ответы на записи %1$s на %2$s!"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "Повторять записи могут только вошедшие пользователи."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "Вы пока не зарегистрировали ни одного приложения."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, fuzzy
+msgid "No uploaded file."
+msgstr "Загрузить файл"
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: actions/restoreaccount.php:130 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:136 lib/mediafile.php:200
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"Загружаемый файл превышает директиву MAX_FILE_SIZE, указанную в HTML-форме."
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "Системная ошибка при загрузке файла."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr "Получение резервной копии из файла «%s»."
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Все участники"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, fuzzy
+msgid "Upload the file"
+msgstr "Загрузить файл"
+
 #: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "Вы не можете снимать роли пользователей на этом сайте."
@@ -4854,7 +5032,7 @@ msgid "Reset key & secret"
 msgstr "Сбросить ключ и секретную фразу"
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Удалить"
 
@@ -6137,13 +6315,13 @@ msgid "Author(s)"
 msgstr "Автор(ы)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: classes/Fave.php:167
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%1$s добавил запись %2$s в число любимых."
@@ -6260,7 +6438,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr "Имя базы данных или DSN не найдено."
 
@@ -6287,23 +6465,23 @@ 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:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -6311,7 +6489,7 @@ msgstr ""
 "попробуйте вновь через пару минут."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:288
+#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -6320,42 +6498,42 @@ msgstr ""
 "и попробуйте вновь через пару минут."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 msgid "Bad type provided to saveKnownGroups."
 msgstr "Для saveKnownGroups указан неверный тип."
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6363,7 +6541,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:798
+#: classes/Profile.php:765
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -6372,7 +6550,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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6443,32 +6621,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "Добро пожаловать на %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 msgid "No single user defined for single-user mode."
 msgstr "Ни задан пользователь для однопользовательского режима."
 
 #. TRANS: Server exception.
-#: classes/User.php:927
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr "Вызов отключённого кода однопользовательского режима."
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "Не удаётся создать группу."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 msgid "Could not set group URI."
 msgstr "Не удаётся назначить URI группы."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:549
 msgid "Could not set group membership."
 msgstr "Не удаётся назначить членство в группе."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "Не удаётся сохранить информацию о локальной группе."
 
@@ -6807,10 +6985,19 @@ msgstr "Туда"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Ожидался корневой элемент потока, а получен XML-документ целиком."
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Фото"
+msgid "Unknown profile."
+msgstr "Неподдерживаемый тип файла"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7098,6 +7285,10 @@ msgstr "Отозвать"
 msgid "author element must contain a name element."
 msgstr "Элемент author должен содержать элемент name."
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7536,24 +7727,24 @@ msgstr ""
 "tracking — пока не реализовано.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 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:150
+#: lib/common.php:153
 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "Перейти к установщику"
 
@@ -7655,6 +7846,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: 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"
@@ -7843,11 +8042,6 @@ msgstr "Этот файл слишком большой. Максимальны
 msgid "Partial upload."
 msgstr "Частичная загрузка."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "Системная ошибка при загрузке файла."
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "Не является изображением или повреждённый файл."
@@ -8270,7 +8464,7 @@ msgstr ""
 "вовлечения других пользователей в разговор. Сообщения, получаемые от других "
 "людей, видите только вы."
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "от"
 
@@ -8302,39 +8496,6 @@ msgstr ""
 "При сохранении вашего файла возникла ошибка базы данных. Пожалуйста, "
 "попробуйте ещё раз."
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: 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.
-#: lib/mediafile.php:200
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
-msgstr ""
-"Загружаемый файл превышает директиву MAX_FILE_SIZE, указанную в HTML-форме."
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: lib/mediafile.php:222
-msgid "File upload stopped by extension."
-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."
@@ -8355,7 +8516,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8366,7 +8527,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr "Тип файла «%s» не поддерживается не этом сервере."
@@ -8399,18 +8560,18 @@ msgid "Send"
 msgstr "Отправить"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8452,55 +8613,55 @@ msgstr ""
 "времени, чем ожидалось; повторите попытку позже"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "с. ш."
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "ю. ш."
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "в. д."
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "з. д."
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, 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:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "из"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr "web"
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "переписка"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "Повторено"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "Ответить на эту запись"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Ответить"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Запись повторена"
 
@@ -8654,7 +8815,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:957
+#: lib/router.php:974
 msgid "Page not found."
 msgstr "Страница не найдена."
 
@@ -9019,22 +9180,16 @@ msgstr "Неверный XML."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr "Получение резервной копии из файла «%s»."
+#, fuzzy
+#~ msgid "Post"
+#~ msgstr "Фото"
 
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
-msgid "No user specified; using backup user."
-msgstr "Не указан пользователь; используется пользователь из резервной копии."
+#~ msgid "No user specified; using backup user."
+#~ msgstr ""
+#~ "Не указан пользователь; используется пользователь из резервной копии."
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] "%d запись в резервной копии."
-msgstr[1] "%d записи в резервной копии."
-msgstr[2] "%d записей в резервной копии."
+#~ msgid "%d entry in backup."
+#~ msgid_plural "%d entries in backup."
+#~ msgstr[0] "%d запись в резервной копии."
+#~ msgstr[1] "%d записи в резервной копии."
+#~ msgstr[2] "%d записей в резервной копии."
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 5065298b06..6a522a3610 100644
--- a/locale/statusnet.pot
+++ b/locale/statusnet.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+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"
@@ -265,7 +265,7 @@ msgstr ""
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -310,7 +310,8 @@ msgstr ""
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -536,7 +537,7 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr ""
@@ -546,7 +547,7 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr ""
@@ -558,7 +559,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr ""
@@ -568,7 +569,7 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr ""
@@ -583,7 +584,7 @@ msgstr ""
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -595,7 +596,7 @@ msgstr[1] ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr ""
@@ -607,7 +608,7 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -626,7 +627,7 @@ msgstr ""
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr ""
@@ -635,7 +636,7 @@ msgstr ""
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -1022,7 +1023,7 @@ msgstr ""
 
 #. TRANS: Server error displayed when generating an Atom feed fails.
 #. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:138
+#: actions/apitimelinegroup.php:134
 #, php-format
 msgid "Could not generate feed for group - %s"
 msgstr ""
@@ -1113,30 +1114,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, php-format
 msgid "No content for notice %d."
 msgstr ""
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1147,7 +1148,7 @@ msgid "API method under construction."
 msgstr ""
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr ""
 
@@ -1349,13 +1350,13 @@ msgid "Preview"
 msgstr ""
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr ""
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr ""
@@ -1396,6 +1397,36 @@ msgstr ""
 msgid "Avatar deleted."
 msgstr ""
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+msgid "Only logged-in users can backup their account."
+msgstr ""
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr ""
+
+#: actions/backupaccount.php:258
+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."
@@ -1598,6 +1629,56 @@ msgstr ""
 msgid "Notices"
 msgstr ""
 
+#: actions/deleteaccount.php:72
+msgid "Only logged-in users can delete their account."
+msgstr ""
+
+#: actions/deleteaccount.php:77
+msgid "You cannot delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+msgid "Account deleted."
+msgstr ""
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+msgid "Delete account"
+msgstr ""
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr ""
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1738,7 +1819,7 @@ msgid "Do not delete this notice"
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr ""
 
@@ -2038,7 +2119,7 @@ msgstr ""
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr ""
@@ -2050,7 +2131,7 @@ msgstr ""
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr ""
 
@@ -3202,8 +3283,13 @@ msgstr ""
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr ""
 
@@ -3511,11 +3597,6 @@ msgstr ""
 msgid "6 or more characters"
 msgstr ""
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr ""
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr ""
@@ -4022,6 +4103,10 @@ msgstr ""
 msgid "Settings saved."
 msgstr ""
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+msgid "Restore account"
+msgstr ""
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4439,7 +4524,7 @@ msgstr ""
 msgid "You already repeated that notice."
 msgstr ""
 
-#: actions/repeat.php:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr ""
 
@@ -4499,6 +4584,85 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr ""
 
+#: actions/restoreaccount.php:79
+msgid "Only logged-in users can restore their account."
+msgstr ""
+
+#: actions/restoreaccount.php:83
+msgid "You may not restore your account."
+msgstr ""
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+msgid "No uploaded file."
+msgstr ""
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: actions/restoreaccount.php:130 lib/mediafile.php:194
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:136 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:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr ""
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+msgid "Not an atom feed."
+msgstr ""
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+msgid "Upload the file"
+msgstr ""
+
 #: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr ""
@@ -4599,7 +4763,7 @@ msgid "Reset key & secret"
 msgstr ""
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr ""
 
@@ -5794,13 +5958,13 @@ msgid "Author(s)"
 msgstr ""
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: classes/Fave.php:167
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr ""
@@ -5907,7 +6071,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -5934,71 +6098,71 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: 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:288
+#: 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:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6006,14 +6170,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6083,32 +6247,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 msgid "Could not set group URI."
 msgstr ""
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:549
 msgid "Could not set group membership."
 msgstr ""
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr ""
 
@@ -6438,8 +6602,17 @@ msgstr ""
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activity.php:360
-msgid "Post"
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
+msgid "Unknown profile."
+msgstr ""
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
 msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
@@ -6724,6 +6897,10 @@ msgstr ""
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7107,24 +7284,24 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 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:150
+#: lib/common.php:153
 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr ""
 
@@ -7224,6 +7401,14 @@ msgstr ""
 msgid "FOAF"
 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"
@@ -7402,11 +7587,6 @@ msgstr ""
 msgid "Partial upload."
 msgstr ""
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr ""
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr ""
@@ -7723,7 +7903,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr ""
 
@@ -7753,38 +7933,6 @@ msgstr ""
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: lib/mediafile.php:194
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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.
-#: lib/mediafile.php:222
-msgid "File upload stopped by extension."
-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."
@@ -7805,7 +7953,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -7814,7 +7962,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
@@ -7847,17 +7995,17 @@ msgid "Send"
 msgstr ""
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -7896,55 +8044,55 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr ""
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr ""
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr ""
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr ""
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr ""
 
@@ -8098,7 +8246,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:957
+#: lib/router.php:974
 msgid "Page not found."
 msgstr ""
 
@@ -8441,22 +8589,3 @@ msgstr ""
 #: lib/xrd.php:69
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
-msgid "No user specified; using backup user."
-msgstr ""
-
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
-msgstr[1] ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index d56739acd1..5168ad3366 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -4,6 +4,7 @@
 # Author: Jamminjohn
 # Author: Kjell
 # 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:14+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:30+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 (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+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 "Uppdateringar från %1$s och vänner på %2$s!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -323,7 +324,8 @@ msgstr "Kunde inte uppdatera användare."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -402,9 +404,9 @@ msgid "%s subscriptions"
 msgstr "%s prenumerationer"
 
 #: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "%s favorites"
-msgstr "Favoriter"
+msgstr "%s favoriter"
 
 #: actions/apiatomservice.php:123
 #, fuzzy, php-format
@@ -556,7 +558,7 @@ msgstr "Kunde inte hitta målanvändare."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Smeknamnet används redan. Försök med ett annat."
@@ -566,7 +568,7 @@ msgstr "Smeknamnet används redan. Försök med ett annat."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Inte ett giltigt smeknamn."
@@ -578,7 +580,7 @@ msgstr "Inte ett giltigt smeknamn."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Hemsida är inte en giltig webbadress."
@@ -588,7 +590,7 @@ 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:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: 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)."
@@ -603,7 +605,7 @@ msgstr "Fullständigt namn är för långt (max 255 tecken)."
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -615,7 +617,7 @@ 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:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Beskrivning av plats är för lång (max 255 tecken)."
@@ -627,7 +629,7 @@ msgstr "Beskrivning av plats är för lång (max 255 tecken)."
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -646,7 +648,7 @@ msgstr "Ogiltigt alias: \"%s\"."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Alias \"%s\" används redan. Försök med ett annat."
@@ -655,7 +657,7 @@ msgstr "Alias \"%s\" används redan. Försök med ett annat."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Alias kan inte vara samma som smeknamn."
 
@@ -1055,7 +1057,7 @@ 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:138
+#: actions/apitimelinegroup.php:134
 #, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Kunde inte generera flöde för grupp - %s"
@@ -1147,30 +1149,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, 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:404
+#: actions/apitimelineuser.php:406
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Notis med den ID:n finns inte."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1181,14 +1183,13 @@ 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/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "API-metod hittades inte."
 
 #: actions/atompubfavoritefeed.php:70
-#, fuzzy
 msgid "No such profile"
-msgstr "Ingen sådan profil."
+msgstr "Ingen sådan profil"
 
 #: actions/atompubfavoritefeed.php:145
 #, php-format
@@ -1271,9 +1272,8 @@ msgid "Can't delete someone else's favorite"
 msgstr "Kunde inte ta bort favoriten."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
-msgstr "Ingen sådan grupp."
+msgstr "Ingen sådan grupp"
 
 #: actions/atompubshowmembership.php:90
 #, fuzzy
@@ -1397,13 +1397,13 @@ msgid "Preview"
 msgstr "Förhandsgranska"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Ta bort"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Ladda upp"
@@ -1444,6 +1444,38 @@ msgstr "Misslyckades uppdatera avatar."
 msgid "Avatar deleted."
 msgstr "Avatar borttagen."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "Bara inloggade användaren kan upprepa notiser."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Bakgrund"
+
+#: actions/backupaccount.php:258
+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."
@@ -1650,6 +1682,60 @@ msgstr "Konversationer"
 msgid "Notices"
 msgstr "Notiser"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "Bara inloggade användaren kan upprepa notiser."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "Du kan inte ta bort användare."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Avatar borttagen."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Skapa ett konto"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Bekräfta"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1798,7 +1884,7 @@ 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:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Ta bort denna notis"
 
@@ -2102,7 +2188,7 @@ msgstr "Använd detta formulär för att redigera gruppen."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Ogiltigt alias: \"%s\""
@@ -2114,7 +2200,7 @@ 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:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "Kunde inte skapa alias."
 
@@ -3348,8 +3434,14 @@ msgstr "Kunde inte skapa applikation."
 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:110
+#: 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."
 
@@ -3669,11 +3761,6 @@ msgstr "Nytt lösenord"
 msgid "6 or more characters"
 msgstr "Minst 6 tecken"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Bekräfta"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Samma som lösenordet ovan"
@@ -4202,6 +4289,11 @@ msgstr "Kunde inte spara taggar."
 msgid "Settings saved."
 msgstr "Inställningar sparade."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Skapa ett konto"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4669,7 +4761,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:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Upprepad"
 
@@ -4733,6 +4825,93 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Svar till %1$s på %2$s"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "Bara inloggade användaren kan upprepa notiser."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "Du har inte registrerat några applikationer än."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, 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:130 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:136 lib/mediafile.php:200
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"Den uppladdade filen överstiger MAX_FILE_SIZE-direktivet som var angivet i "
+"HTML-formuläret."
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "Systemfel vid uppladdning av fil."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Alla medlemmar"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, 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."
@@ -4833,7 +5012,7 @@ msgid "Reset key & secret"
 msgstr "Återställ nyckel & hemlighet"
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -6115,13 +6294,13 @@ msgid "Author(s)"
 msgstr "Författare"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: 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"
@@ -6234,7 +6413,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr "Inget databasnamn eller DSN funnen någonstans."
 
@@ -6261,23 +6440,23 @@ 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:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -6285,7 +6464,7 @@ msgstr ""
 "minuter."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:288
+#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -6294,43 +6473,43 @@ msgstr ""
 "om ett par minuter."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 #, 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:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6338,14 +6517,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, 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."
@@ -6415,32 +6594,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "Välkommen till %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 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
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "Kunde inte skapa grupp."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 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:544
+#: classes/User_group.php:549
 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:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "Kunde inte spara lokal gruppinformation."
 
@@ -6776,10 +6955,19 @@ msgstr "Tidigare"
 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."
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Foto"
+msgid "Unknown profile."
+msgstr "Okänd filtyp"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7068,6 +7256,10 @@ msgstr "Återkalla"
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7495,26 +7687,26 @@ msgstr ""
 "tracking - inte implementerat än.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 #, 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:150
+#: lib/common.php:153
 #, 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "Gå till installeraren."
 
@@ -7616,6 +7808,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: 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"
@@ -7798,11 +7998,6 @@ msgstr "Denna fil är för stor. Den maximala filstorleken är %s."
 msgid "Partial upload."
 msgstr "Bitvis uppladdad."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "Systemfel vid uppladdning av fil."
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "Inte en bildfil eller så är filen korrupt."
@@ -8221,7 +8416,7 @@ msgstr ""
 "engagera andra användare i konversationen. Folk kan skicka meddelanden till "
 "dig som bara du ser."
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "från"
 
@@ -8252,41 +8447,6 @@ 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 an uploaded file is larger than set in php.ini.
-#: 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.
-#: lib/mediafile.php:200
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
-msgstr ""
-"Den uppladdade filen överstiger MAX_FILE_SIZE-direktivet som var angivet i "
-"HTML-formuläret."
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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 would cause a user to exceed a set quota.
 #: lib/mediafile.php:238 lib/mediafile.php:281
 msgid "File exceeds user's quota."
@@ -8307,7 +8467,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8318,7 +8478,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: 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."
@@ -8353,18 +8513,18 @@ msgid "Send"
 msgstr "Skicka"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8405,55 +8565,55 @@ msgstr ""
 "god försök igen senare"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "Ö"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "V"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, 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:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "på"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr "webb"
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "i sammanhang"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "Upprepad av"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "Svara på denna notis"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Svara"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Notis upprepad"
 
@@ -8607,7 +8767,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:957
+#: lib/router.php:974
 #, fuzzy
 msgid "Page not found."
 msgstr "API-metod hittades inte."
@@ -8958,22 +9118,10 @@ msgstr "Ogiltig storlek."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
 #, fuzzy
-msgid "No user specified; using backup user."
-msgstr "Ingen användar-ID angiven."
+#~ msgid "Post"
+#~ msgstr "Foto"
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+#~ msgid "No user specified; using backup user."
+#~ msgstr "Ingen användar-ID angiven."
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 250a871739..5e24a84580 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:15+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:33+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 (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -271,7 +271,7 @@ msgstr "%2$sలో %1$s మరియు స్నేహితుల నుండ
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -318,7 +318,8 @@ msgstr "వాడుకరిని తాజాకరించలేకున
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -548,7 +549,7 @@ msgstr "లక్ష్యిత వాడుకరిని కనుగొన
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్నారు. మరోటి ప్రయత్నించండి."
@@ -558,7 +559,7 @@ msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "సరైన పేరు కాదు."
@@ -570,7 +571,7 @@ msgstr "సరైన పేరు కాదు."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "హోమ్ పేజీ URL సరైనది కాదు."
@@ -580,7 +581,7 @@ msgstr "హోమ్ పేజీ URL సరైనది కాదు."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -596,7 +597,7 @@ msgstr "పూర్తి పేరు చాలా పెద్దగా ఉ
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -608,7 +609,7 @@ msgstr[1] "వివరణ చాలా పెద్దగా ఉంది (%d 
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -621,7 +622,7 @@ msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉ
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, fuzzy, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -640,7 +641,7 @@ msgstr "తప్పుడు మారుపేరు: \"%s\"."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "\"%s\" అన్న మారుపేరుని ఇప్పటికే వాడుతున్నారు. మరొకటి ప్రయత్నించండి."
@@ -649,7 +650,7 @@ msgstr "\"%s\" అన్న మారుపేరుని ఇప్పటిక
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "మారుపేరు పేరుతో సమానంగా ఉండకూడదు."
 
@@ -1044,7 +1045,7 @@ msgstr "%s యొక్క మైక్రోబ్లాగు"
 
 #. TRANS: Server error displayed when generating an Atom feed fails.
 #. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:138
+#: actions/apitimelinegroup.php:134
 #, fuzzy, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "గుంపుని తాజాకరించలేకున్నాం."
@@ -1137,30 +1138,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "మీ నోటీసుని మీరే పునరావృతించలేరు."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "ఆ ఈమెయిలు చిరునామా లేదా వాడుకరిపేరుతో వాడుకరులెవరూ లేరు."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1172,7 +1173,7 @@ msgid "API method under construction."
 msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "వాడుకరి దొరకలేదు."
 
@@ -1263,9 +1264,8 @@ msgid "Can't delete someone else's favorite"
 msgstr "ఇష్టాంశాన్ని తొలగించలేకపోయాం."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
-msgstr "అటువంటి గుంపు లేదు."
+msgstr "అటువంటి గుంపు లేదు"
 
 #: actions/atompubshowmembership.php:90
 #, fuzzy
@@ -1389,13 +1389,13 @@ msgid "Preview"
 msgstr "మునుజూపు"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "తొలగించు"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "ఎక్కించు"
@@ -1436,6 +1436,38 @@ msgstr "అవతారపు తాజాకరణ విఫలమైంది.
 msgid "Avatar deleted."
 msgstr "అవతారాన్ని తొలగించాం."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "కేవలం ప్రవేశించిన వాడుకరులు మాత్రమే నోటీసులని పునరావృతించగలరు."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "నేపథ్యం"
+
+#: actions/backupaccount.php:258
+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."
@@ -1642,6 +1674,60 @@ msgstr "సంభాషణ"
 msgid "Notices"
 msgstr "సందేశాలు"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "కేవలం ప్రవేశించిన వాడుకరులు మాత్రమే నోటీసులని పునరావృతించగలరు."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "మీరు వాడుకరులని తొలగించలేరు."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "అవతారాన్ని తొలగించాం."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "ఖాతాని సృష్టించుకోండి"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "నిర్థారించు"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1787,7 +1873,7 @@ msgid "Do not delete this notice"
 msgstr "ఈ నోటీసుని తొలగించకు"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "ఈ నోటీసుని తొలగించు"
 
@@ -2098,7 +2184,7 @@ msgstr "గుంపుని మార్చడానికి ఈ ఫారా
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "తప్పుడు మారుపేరు: \"%s\""
@@ -2110,7 +2196,7 @@ msgstr "గుంపుని తాజాకరించలేకున్న
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "మారుపేర్లని సృష్టించలేకపోయాం."
 
@@ -3327,8 +3413,14 @@ msgstr "ఉపకరణాన్ని సృష్టించలేకపో
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "కొత్త గుంపుని సృష్టిండానికి ఈ ఫారాన్ని ఉపయోగించండి."
 
@@ -3648,11 +3740,6 @@ msgstr "కొత్త సంకేతపదం"
 msgid "6 or more characters"
 msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "నిర్థారించు"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "పై సంకేతపదం వలెనే"
@@ -4184,6 +4271,11 @@ msgstr "ట్యాగులని భద్రపరచలేకున్న
 msgid "Settings saved."
 msgstr "అమరికలు భద్రమయ్యాయి."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "ఖాతాని సృష్టించుకోండి"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4638,7 +4730,7 @@ msgstr "మీ నోటీసుని మీరే పునరావృతి
 msgid "You already repeated that notice."
 msgstr "మీరు ఇప్పటికే ఆ నోటీసుని పునరావృతించారు."
 
-#: actions/repeat.php:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 #, fuzzy
 msgid "Repeated"
 msgstr "సృష్టితం"
@@ -4702,6 +4794,90 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "%2$sలో %1$sకి స్పందనలు!"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "కేవలం ప్రవేశించిన వాడుకరులు మాత్రమే నోటీసులని పునరావృతించగలరు."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "మీరు ఇంకా ఏ ఉపకరణాన్నీ నమోదు చేసుకోలేదు."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, fuzzy
+msgid "No uploaded file."
+msgstr "ఫైలుని ఎక్కించు"
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: actions/restoreaccount.php:130 lib/mediafile.php:194
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:136 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:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr ""
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "అందరు సభ్యులూ"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, fuzzy
+msgid "Upload the file"
+msgstr "ఫైలుని ఎక్కించు"
+
 #: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "ఈ సైటులో మీరు వాడుకరలకి పాత్రలను ఇవ్వలేరు."
@@ -4805,7 +4981,7 @@ msgid "Reset key & secret"
 msgstr ""
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "తొలగించు"
 
@@ -6057,13 +6233,13 @@ msgid "Author(s)"
 msgstr "రచయిత(లు)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: classes/Fave.php:167
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%2$s నోటీసుని %1$s ఇష్టాంశంగా గుర్తించారు."
@@ -6170,7 +6346,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6199,29 +6375,29 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: 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:288
+#: classes/Notice.php:297
 #, fuzzy
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
@@ -6229,43 +6405,43 @@ msgid ""
 msgstr "చాలా ఎక్కువ నోటీసులు అంత వేగంగా; కాస్త ఊపిరి తీసుకుని మళ్ళీ కొన్ని నిమిషాల తర్వాత వ్రాయండి."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1012
+#: classes/Notice.php:1013
 #, 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6273,14 +6449,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6352,32 +6528,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "@%2$s, %1$sకి స్వాగతం!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "గుంపుని సృష్టించలేకపోయాం."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 msgid "Could not set group URI."
 msgstr "గుంపుని సృష్టించలేకపోయాం."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:549
 msgid "Could not set group membership."
 msgstr "గుంపు సభ్యత్వాన్ని అమర్చలేకపోయాం."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "స్థానిక గుంపుని తాజాకరించలేకున్నాం."
 
@@ -6714,10 +6890,19 @@ msgstr "ఇంతక్రితం"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "ఫొటో"
+msgid "Unknown profile."
+msgstr "తెలియని ఫైలు రకం"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7010,6 +7195,10 @@ msgstr "తొలగించు"
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7407,26 +7596,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 #, 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:150
+#: lib/common.php:153
 #, 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 #, fuzzy
 msgid "Go to the installer."
 msgstr "సైటు లోనికి ప్రవేశించండి"
@@ -7530,6 +7719,14 @@ msgstr "ఆటమ్"
 msgid "FOAF"
 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"
@@ -7711,11 +7908,6 @@ msgstr "ఇది చాలా పొడవుంది. గరిష్ఠ స
 msgid "Partial upload."
 msgstr "పాక్షిక ఎగుమతి."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr ""
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "బొమ్మ కాదు లేదా పాడైపోయిన ఫైలు."
@@ -8122,7 +8314,7 @@ msgstr ""
 "మీకు అంతరంగిక సందేశాలు లేవు. ఇతర వాడుకరులతో సంభాషణకై మీరు వారికి అంతరంగిక సందేశాలు "
 "పంపించవచ్చు. మీ కంటికి మాత్రమే కనబడేలా వారు మీకు సందేశాలు పంపవచ్చు."
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "నుండి"
 
@@ -8154,38 +8346,6 @@ msgstr "%s కి నేరు సందేశాలు"
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: lib/mediafile.php:194
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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.
-#: lib/mediafile.php:222
-msgid "File upload stopped by extension."
-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."
@@ -8206,7 +8366,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8215,7 +8375,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
@@ -8250,17 +8410,17 @@ msgid "Send"
 msgstr "పంపించు"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8301,55 +8461,55 @@ msgstr ""
 "కాసేపాగి ప్రయత్నించండి"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "ఉ"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "ద"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "తూ"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "ప"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, 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:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "ప్రాంతం"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr "జాలం"
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "సందర్భంలో"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "%s యొక్క పునరావృతం"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "ఈ నోటీసుపై స్పందించండి"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "స్పందించండి"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "నోటీసుని పునరావృతించారు"
 
@@ -8507,7 +8667,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:957
+#: lib/router.php:974
 #, fuzzy
 msgid "Page not found."
 msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
@@ -8857,22 +9017,10 @@ msgstr "తప్పుడు పరిమాణం."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
 #, fuzzy
-msgid "No user specified; using backup user."
-msgstr "గుంపు ఏమీ పేర్కొనలేదు."
+#~ msgid "Post"
+#~ msgstr "ఫొటో"
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
-msgstr[1] ""
+#, fuzzy
+#~ msgid "No user specified; using backup user."
+#~ msgstr "గుంపు ఏమీ పేర్కొనలేదు."
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 16d69a9718..6f78510d23 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:16+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:34+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 (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -281,7 +281,7 @@ msgstr "%2$s üzerindeki %1$s ve arkadaşlarından güncellemeler!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -328,7 +328,8 @@ msgstr "Kullanıcı güncellenemedi."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -399,19 +400,19 @@ msgstr "%s zaman çizelgesi"
 #. TRANS: %s is a user nickname.
 #: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
 #: actions/subscriptions.php:51
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscriptions"
-msgstr "Bütün abonelikler"
+msgstr "%s abonelikleri"
 
 #: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "%s favorites"
-msgstr "%s kullanıcısının favori durum mesajları"
+msgstr "%s favorileri"
 
 #: actions/apiatomservice.php:123
-#, fuzzy, php-format
+#, php-format
 msgid "%s memberships"
-msgstr "%s grup üyeleri"
+msgstr "%s üyelikleri"
 
 #. TRANS: Client error displayed when users try to block themselves.
 #: actions/apiblockcreate.php:104
@@ -556,7 +557,7 @@ msgstr "Hedef kullanıcı bulunamadı."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Takma ad kullanımda. Başka bir tane deneyin."
@@ -566,7 +567,7 @@ msgstr "Takma ad kullanımda. Başka bir tane deneyin."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Geçersiz bir takma ad."
@@ -578,7 +579,7 @@ msgstr "Geçersiz bir takma ad."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
@@ -588,7 +589,7 @@ 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:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Tam isim çok uzun (en fazla: 255 karakter)."
@@ -603,7 +604,7 @@ msgstr "Tam isim çok uzun (en fazla: 255 karakter)."
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -614,7 +615,7 @@ 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:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Yer bilgisi çok uzun (en fazla 255 karakter)."
@@ -626,7 +627,7 @@ msgstr "Yer bilgisi çok uzun (en fazla 255 karakter)."
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -644,7 +645,7 @@ msgstr "Geçersiz büyüklük."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Diğerisim \"%s\" kullanımda. Başka bir tane deneyin."
@@ -653,7 +654,7 @@ msgstr "Diğerisim \"%s\" kullanımda. Başka bir tane deneyin."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Diğerisim, kullanıcı adı ile aynı olamaz."
 
@@ -1051,7 +1052,7 @@ 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:138
+#: actions/apitimelinegroup.php:134
 #, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Grup - %s için besleme oluşturulamadı."
@@ -1143,30 +1144,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, 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:404
+#: actions/apitimelineuser.php:406
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1177,7 +1178,7 @@ 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/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 #, fuzzy
 msgid "User not found."
 msgstr "Onay kodu bulunamadı."
@@ -1269,7 +1270,6 @@ msgid "Can't delete someone else's favorite"
 msgstr "Favori silinemedi."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
 msgstr "Böyle bir kullanıcı yok."
 
@@ -1396,13 +1396,13 @@ msgid "Preview"
 msgstr "Önizleme"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Sil"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
@@ -1444,6 +1444,37 @@ msgstr "Avatar güncellemede hata."
 msgid "Avatar deleted."
 msgstr "Kullanıcı resmi silindi."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+msgid "Only logged-in users can backup their account."
+msgstr ""
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Arkaplan"
+
+#: actions/backupaccount.php:258
+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."
@@ -1652,6 +1683,59 @@ msgstr "Konuşma"
 msgid "Notices"
 msgstr "Durum mesajları"
 
+#: actions/deleteaccount.php:72
+msgid "Only logged-in users can delete their account."
+msgstr ""
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "Kullanıcıları silemezsiniz."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Kullanıcı resmi silindi."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Bir hesap oluştur"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Onayla"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1806,7 +1890,7 @@ 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:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Bu durum mesajını sil"
 
@@ -2113,7 +2197,7 @@ msgstr "Grubu düzenlemek için bu biçimi kullan."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, fuzzy, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "%s Geçersiz başlangıç sayfası"
@@ -2125,7 +2209,7 @@ 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:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "Kullanıcı güncellenemedi."
 
@@ -3330,8 +3414,14 @@ msgstr "Eposta onayı silinemedi."
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr ""
 
@@ -3647,11 +3737,6 @@ msgstr "Yeni parola"
 msgid "6 or more characters"
 msgstr "6 veya daha fazla karakter"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Onayla"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "yukarıdaki parolanın aynısı"
@@ -4189,6 +4274,11 @@ msgstr "Profil kaydedilemedi."
 msgid "Settings saved."
 msgstr "Ayarlar kaydedildi."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Bir hesap oluştur"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4636,7 +4726,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:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Sıfırla"
 
@@ -4697,6 +4787,89 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "%s için cevaplar"
 
+#: actions/restoreaccount.php:79
+msgid "Only logged-in users can restore their account."
+msgstr ""
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, 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:130 lib/mediafile.php:194
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:136 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:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "Dosya yüklemede sistem hatası."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Tüm üyeler"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, fuzzy
+msgid "Upload the file"
+msgstr "Yükle"
+
 #: actions/revokerole.php:75
 #, fuzzy
 msgid "You cannot revoke user roles on this site."
@@ -4803,7 +4976,7 @@ msgid "Reset key & secret"
 msgstr ""
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Sil"
 
@@ -6048,13 +6221,13 @@ msgid "Author(s)"
 msgstr ""
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: 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"
@@ -6163,7 +6336,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6192,72 +6365,72 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: 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:288
+#: 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:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1012
+#: classes/Notice.php:1013
 #, 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, fuzzy, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6265,14 +6438,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6344,32 +6517,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "Kullanıcı güncellenemedi."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 msgid "Could not set group URI."
 msgstr "Profil kaydedilemedi."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:549
 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:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "Profil kaydedilemedi."
 
@@ -6710,10 +6883,19 @@ msgstr "Önce"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Fotoğraf"
+msgid "Unknown profile."
+msgstr "Kullanıcının profili yok."
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7007,6 +7189,10 @@ msgstr "Geri al"
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7396,25 +7582,25 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 #, 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:150
+#: lib/common.php:153
 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr ""
 
@@ -7522,6 +7708,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: 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"
@@ -7705,11 +7899,6 @@ msgstr ""
 msgid "Partial upload."
 msgstr "Kısmi yükleme."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "Dosya yüklemede sistem hatası."
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "Bu bir resim dosyası değil ya da dosyada hata var"
@@ -8034,7 +8223,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr ""
 
@@ -8064,38 +8253,6 @@ msgstr "Desteklenmeyen mesaj türü: %s"
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: lib/mediafile.php:194
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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.
-#: lib/mediafile.php:222
-msgid "File upload stopped by extension."
-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."
@@ -8116,7 +8273,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8125,7 +8282,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
@@ -8161,19 +8318,19 @@ msgid "Send"
 msgstr "Gönder"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8214,57 +8371,57 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "K"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "G"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "D"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "B"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 #, fuzzy
 msgid "in context"
 msgstr "İçerik yok!"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 #, fuzzy
 msgid "Repeated by"
 msgstr "Yarat"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Cevaplar"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 #, fuzzy
 msgid "Notice repeated"
 msgstr "Durum mesajları"
@@ -8424,7 +8581,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:957
+#: lib/router.php:974
 #, fuzzy
 msgid "Page not found."
 msgstr "Onay kodu bulunamadı."
@@ -8780,21 +8937,10 @@ msgstr "Geçersiz büyüklük."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
 #, fuzzy
-msgid "No user specified; using backup user."
-msgstr "Yeni durum mesajı"
+#~ msgid "Post"
+#~ msgstr "Fotoğraf"
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
+#, fuzzy
+#~ msgid "No user specified; using backup user."
+#~ msgstr "Yeni durum mesajı"
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 36adfb46e8..bb3ff2b59e 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -12,18 +12,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:17+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32: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-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -281,7 +281,7 @@ msgstr "Оновлення від %1$s та друзів на %2$s!"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -327,7 +327,8 @@ msgstr "Не вдалося оновити користувача."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -409,12 +410,12 @@ msgid "%s subscriptions"
 msgstr "Підписки %s"
 
 #: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "%s favorites"
-msgstr "Обрані"
+msgstr "Обрані %s"
 
 #: actions/apiatomservice.php:123
-#, fuzzy, php-format
+#, php-format
 msgid "%s memberships"
 msgstr "Учасники спільноти %s"
 
@@ -566,7 +567,7 @@ msgstr "Не вдалося знайти цільового користувач
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Це ім’я вже використовується. Спробуйте інше."
@@ -576,7 +577,7 @@ msgstr "Це ім’я вже використовується. Спробуйт
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Це недійсне ім’я користувача."
@@ -588,7 +589,7 @@ msgstr "Це недійсне ім’я користувача."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Веб-сторінка має недійсну URL-адресу."
@@ -598,7 +599,7 @@ msgstr "Веб-сторінка має недійсну URL-адресу."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Повне ім’я надто довге (не більше 255 символів)."
@@ -613,7 +614,7 @@ msgstr "Повне ім’я надто довге (не більше 255 сим
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -626,7 +627,7 @@ msgstr[2] "Опис надто довгий (максимум — %d знакі
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Розташування надто довге (не більше 255 символів)."
@@ -638,7 +639,7 @@ msgstr "Розташування надто довге (не більше 255 с
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -658,7 +659,7 @@ msgstr "Помилкове додаткове ім’я: «%s»."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Додаткове ім’я «%s» вже використовується. Спробуйте інше."
@@ -667,7 +668,7 @@ msgstr "Додаткове ім’я «%s» вже використовуєть
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Додаткове ім’я не може бути таким самим що й основне."
 
@@ -1074,7 +1075,7 @@ 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:138
+#: actions/apitimelinegroup.php:134
 #, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "Не вдалося створити веб-стрічку для спільноти — %s"
@@ -1145,19 +1146,16 @@ msgstr "Користувач може робити доповнення тіль
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #: actions/apitimelineuser.php:304
-#, fuzzy
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Приймати лише AtomPub для веб-стрічок формату Atom."
 
 #: actions/apitimelineuser.php:310
-#, fuzzy
 msgid "Atom post must not be empty."
-msgstr "POST-запит Atom має бути записом формату Atom."
+msgstr "Запис Atom не повинен бути порожнім."
 
 #: actions/apitimelineuser.php:315
-#, fuzzy
 msgid "Atom post must be well-formed XML."
-msgstr "POST-запит Atom має бути записом формату Atom."
+msgstr "Запис Atom має бути у правильно сформованому XML."
 
 #. TRANS: Client error displayed when not using an Atom entry.
 #: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
@@ -1168,31 +1166,30 @@ msgstr "POST-запит Atom має бути записом формату Atom.
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
-#, fuzzy
+#: actions/apitimelineuser.php:334
 msgid "Can only handle POST activities."
-msgstr "Можливою є обробка лише для POST-запитів."
+msgstr "Можливою є обробка лише POST-запитів."
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:343
-#, fuzzy, php-format
+#: actions/apitimelineuser.php:345
+#, php-format
 msgid "Cannot handle activity object type \"%s\"."
-msgstr "Неможливо опрацювати дії об’єкта типу «%s»"
+msgstr "Неможливо опрацювати дії об’єкта типу «%s»."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
-#, fuzzy, php-format
+#: actions/apitimelineuser.php:378
+#, php-format
 msgid "No content for notice %d."
-msgstr "Пошук дописів за змістом"
+msgstr "Допис %d не має змісту."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Повідомлення з URI \"%s\" вже існує."
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr "Запис AtomPub з невідомим цільовим URI %s"
@@ -1203,46 +1200,40 @@ msgid "API method under construction."
 msgstr "API метод наразі знаходиться у розробці."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "Сторінку не знайдено."
 
 #: actions/atompubfavoritefeed.php:70
-#, fuzzy
 msgid "No such profile"
-msgstr "Немає такого профілю."
+msgstr "Немає такого профілю"
 
 #: actions/atompubfavoritefeed.php:145
 #, php-format
 msgid "Notices %s has favorited to on %s"
-msgstr ""
+msgstr "Дописи, що їх %s позначив як обрані на %s"
 
 #: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-#, fuzzy
 msgid "Can't add someone else's subscription"
-msgstr "Не вдалося додати нову підписку."
+msgstr "Не вдається додати чиюсь підписку"
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
 #: actions/atompubfavoritefeed.php:239
-#, fuzzy
 msgid "Can only handle Favorite activities."
-msgstr "Можливою є обробка лише для POST-запитів."
+msgstr "Можливою є обробка лише стрічки обраних дописів."
 
 #: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
-#, fuzzy
 msgid "Can only fave notices."
-msgstr "Можливою є обробка лише для POST-запитів."
+msgstr "Можна лише додавати дописи до обраних."
 
 #: actions/atompubfavoritefeed.php:256
-#, fuzzy
 msgid "Unknown note."
-msgstr "Невідомо"
+msgstr "Невідома примітка"
 
 #: actions/atompubfavoritefeed.php:263
-#, fuzzy
 msgid "Already a favorite."
-msgstr "Додати до обраних"
+msgstr "Вже у списку обраних."
 
 #: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
 #: actions/atompubshowmembership.php:73 actions/subscribe.php:107
@@ -1250,106 +1241,96 @@ msgid "No such profile."
 msgstr "Немає такого профілю."
 
 #: actions/atompubmembershipfeed.php:144
-#, fuzzy, php-format
+#, php-format
 msgid "%s group memberships"
 msgstr "Учасники спільноти %s"
 
 #: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %s is a member of on %s"
-msgstr "Спільноти, до яких залучений %s"
+msgstr "Спільноти, до яких залучений %s на %s"
 
 #: actions/atompubmembershipfeed.php:217
 msgid "Can't add someone else's membership"
-msgstr ""
+msgstr "Не вдається надати комусь членство"
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
 #: actions/atompubmembershipfeed.php:241
-#, fuzzy
 msgid "Can only handle Join activities."
-msgstr "Можливою є обробка лише для POST-запитів."
+msgstr "Можливою є обробка активності лише щодо приєднання нових членів."
 
 #: actions/atompubmembershipfeed.php:256
-#, fuzzy
 msgid "Unknown group."
-msgstr "Невідомо"
+msgstr "Невідома спільнота."
 
 #: actions/atompubmembershipfeed.php:263
-#, fuzzy
 msgid "Already a member."
-msgstr "Всі учасники"
+msgstr "Вже є учасником."
 
 #: actions/atompubmembershipfeed.php:270
 msgid "Blocked by admin."
-msgstr ""
+msgstr "Заблоковано адміністратором."
 
 #: actions/atompubshowfavorite.php:89
-#, fuzzy
 msgid "No such favorite."
-msgstr "Такого файлу немає."
+msgstr "Немає такого обраного допису."
 
 #: actions/atompubshowfavorite.php:151
-#, fuzzy
 msgid "Can't delete someone else's favorite"
-msgstr "Не можна видалити зі списку обраних."
+msgstr "Не вдається видалити допис з чийогось списку обраних."
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
 msgstr "Такої спільноти не існує."
 
 #: actions/atompubshowmembership.php:90
-#, fuzzy
 msgid "Not a member"
-msgstr "Всі учасники"
+msgstr "Не є учасником"
 
 #: actions/atompubshowmembership.php:115
-#, fuzzy
 msgid "Method not supported"
-msgstr "HTTP спосіб не підтримується."
+msgstr "Метод не підтримується"
 
 #: actions/atompubshowmembership.php:150
 msgid "Can't delete someone else's membership"
-msgstr ""
+msgstr "Неможливо позбавити когось членства"
 
 #: actions/atompubshowsubscription.php:72
 #: actions/atompubshowsubscription.php:81
 #: actions/atompubsubscriptionfeed.php:74
-#, fuzzy, php-format
+#, php-format
 msgid "No such profile id: %d"
-msgstr "Немає такого профілю."
+msgstr "Немає такого ідентифікатора профілю: %d"
 
 #: actions/atompubshowsubscription.php:90
-#, fuzzy, php-format
+#, php-format
 msgid "Profile %d not subscribed to profile %d"
-msgstr "Ви не підписані до цього профілю."
+msgstr "Профіль %d не є підписаним до профілю %d"
 
 #: actions/atompubshowsubscription.php:154
-#, fuzzy
 msgid "Can't delete someone else's subscription"
-msgstr "Не можу видалити самопідписку."
+msgstr "Не вдається видалити чиюсь підписку"
 
 #: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
+#, php-format
 msgid "People %s has subscribed to on %s"
-msgstr "Люди підписані до %s"
+msgstr "Люди, до яких підписався %s на %s"
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
 #: actions/atompubsubscriptionfeed.php:246
-#, fuzzy
 msgid "Can only handle Follow activities."
-msgstr "Можливою є обробка лише для POST-запитів."
+msgstr "Можливою є обробка активності лише щодо підписок."
 
 #: actions/atompubsubscriptionfeed.php:253
 msgid "Can only follow people."
-msgstr ""
+msgstr "Можливе лише слідування людьми."
 
 #: actions/atompubsubscriptionfeed.php:262
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown profile %s"
-msgstr "Тип файлу не підтримується"
+msgstr "Невідомий профіль %s"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
@@ -1421,13 +1402,13 @@ msgid "Preview"
 msgstr "Перегляд"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Видалити"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Завантажити"
@@ -1468,6 +1449,38 @@ msgstr "Оновлення аватари невдале."
 msgid "Avatar deleted."
 msgstr "Аватару видалено."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "Лише користувачі, що знаходяться у системі, можуть повторювати дописи."
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Фон"
+
+#: actions/backupaccount.php:258
+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."
@@ -1673,6 +1686,60 @@ msgstr "Розмова"
 msgid "Notices"
 msgstr "Дописи"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "Лише користувачі, що знаходяться у системі, можуть повторювати дописи."
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "Ви не можете видаляти користувачів."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Аватару видалено."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Створити новий акаунт"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Підтвердити"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1819,7 +1886,7 @@ msgid "Do not delete this notice"
 msgstr "Не видаляти цей допис"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "Видалити допис"
 
@@ -2125,7 +2192,7 @@ msgstr "Скористайтесь цією формою, щоб відреда
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Помилкове додаткове ім’я: «%s»"
@@ -2137,7 +2204,7 @@ msgstr "Не вдалося оновити спільноту."
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "Неможна призначити додаткові імена."
 
@@ -2236,6 +2303,8 @@ 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.
@@ -3380,8 +3449,14 @@ msgstr "Не вдалося створити додаток."
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "Скористайтесь цією формою для створення нової спільноти."
 
@@ -3704,11 +3779,6 @@ msgstr "Новий пароль"
 msgid "6 or more characters"
 msgstr "6 або більше знаків"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Підтвердити"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Такий само, як і пароль вище"
@@ -4224,6 +4294,11 @@ msgstr "Не вдалося зберегти теґи."
 msgid "Settings saved."
 msgstr "Налаштування збережено."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Створити новий акаунт"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4686,7 +4761,7 @@ msgstr "Ви не можете повторювати власні дописи.
 msgid "You already repeated that notice."
 msgstr "Ви вже повторили цей допис."
 
-#: actions/repeat.php:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Повторено"
 
@@ -4752,6 +4827,92 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Відповіді до %1$s на %2$s!"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "Лише користувачі, що знаходяться у системі, можуть повторювати дописи."
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "Поки що ви не зареєстрували жодних додатків."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, fuzzy
+msgid "No uploaded file."
+msgstr "Завантажити файл"
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: actions/restoreaccount.php:130 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:136 lib/mediafile.php:200
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+"Завантажений файл перевищив MAX_FILE_SIZE котрий було встановлено для форми "
+"HTML."
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "Система відповіла помилкою при завантаженні цього файла."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr "Отримання резервної копії файлу «%s»."
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Не є учасником"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, fuzzy
+msgid "Upload the file"
+msgstr "Завантажити файл"
+
 #: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "Ви не можете позбавляти користувачів ролей на цьому сайті."
@@ -4852,7 +5013,7 @@ msgid "Reset key & secret"
 msgstr "Призначити новий ключ і таємне слово"
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Видалити"
 
@@ -5714,9 +5875,9 @@ msgid "%s is not listening to anyone."
 msgstr "%s не відслідковує нічого"
 
 #: actions/subscriptions.php:178
-#, fuzzy, php-format
+#, php-format
 msgid "Subscription feed for %s (Atom)"
-msgstr "Стрічка дописів для %s (Atom)"
+msgstr "Стрічка підписок %s (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
 #: actions/subscriptions.php:242
@@ -6133,13 +6294,13 @@ msgid "Author(s)"
 msgstr "Автор(и)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: classes/Fave.php:167
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%1$s додав(ла) ваш допис %2$s до обраних."
@@ -6255,7 +6416,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr "Немає імені бази даних або DSN ніде не знайдено"
 
@@ -6282,23 +6443,23 @@ 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:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: classes/Notice.php:290
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -6306,7 +6467,7 @@ msgstr ""
 "повертайтесь за кілька хвилин."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:288
+#: classes/Notice.php:297
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -6315,42 +6476,42 @@ msgstr ""
 "повертайтесь за кілька хвилин."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 msgid "Bad type provided to saveKnownGroups."
 msgstr "Вказано невірний тип для saveKnownGroups."
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6358,14 +6519,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6436,32 +6597,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "Вітаємо на %1$s, @%2$s!"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 msgid "No single user defined for single-user mode."
 msgstr "Користувача для однокористувацького режиму не визначено."
 
 #. TRANS: Server exception.
-#: classes/User.php:927
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr "Код для однокористувацького режиму називається, коли не ввімкнуто."
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "Не вдалося створити нову спільноту."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 msgid "Could not set group URI."
 msgstr "Не вдалося встановити URI спільноти."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:549
 msgid "Could not set group membership."
 msgstr "Не вдалося встановити членство."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "Не вдалося зберегти інформацію про локальну спільноту."
 
@@ -6532,7 +6693,7 @@ msgstr "Персональний профіль і стрічка друзів"
 #: lib/action.php:540
 msgctxt "MENU"
 msgid "Personal"
-msgstr "Особисте"
+msgstr "Стрічка"
 
 #. TRANS: Tooltip for main menu option "Account"
 #: lib/action.php:542
@@ -6798,10 +6959,19 @@ msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 "В очікуванні кореневого елементу веб-стрічки, отримали цілий документ XML."
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "Фото"
+msgid "Unknown profile."
+msgstr "Невідомий профіль %s"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7089,6 +7259,10 @@ msgstr "Відкликати"
 msgid "author element must contain a name element."
 msgstr "елемент author повинен містити елемент name."
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7527,24 +7701,24 @@ msgstr ""
 "tracking — наразі не виконується\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 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:150
+#: lib/common.php:153
 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "Іти до файлу інсталяції."
 
@@ -7646,6 +7820,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: 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"
@@ -7834,11 +8016,6 @@ msgstr "Цей файл завеликий. Максимальний розмі
 msgid "Partial upload."
 msgstr "Часткове завантаження."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "Система відповіла помилкою при завантаженні цього файла."
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "Це не зображення, або файл зіпсовано."
@@ -8263,7 +8440,7 @@ msgstr ""
 "повідомлення аби долучити користувачів до розмови. Такі повідомлення бачите "
 "лише ви."
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "з"
 
@@ -8294,40 +8471,6 @@ msgstr "Формат повідомлення не підтримується: %
 msgid "There was a database error while saving your file. Please try again."
 msgstr "Виникла помилка під час завантаження вашого файлу. Спробуйте ще."
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: 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.
-#: lib/mediafile.php:200
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
-msgstr ""
-"Завантажений файл перевищив MAX_FILE_SIZE котрий було встановлено для форми "
-"HTML."
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: lib/mediafile.php:222
-msgid "File upload stopped by extension."
-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."
@@ -8348,7 +8491,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8359,7 +8502,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr "Тип файлів «%s» тепер не підтримується на даному сервері."
@@ -8392,19 +8535,19 @@ msgid "Send"
 msgstr "Так"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8446,55 +8589,55 @@ msgstr ""
 "ніж очікувалось; будь ласка, спробуйте пізніше"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "Півн."
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "Півд."
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "Сх."
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "Зах."
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, 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:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "в"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr "вебу"
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "у контексті"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "Повторено"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "Відповісти на цей допис"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Відповісти"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Допис повторили"
 
@@ -8648,7 +8791,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:957
+#: lib/router.php:974
 msgid "Page not found."
 msgstr "Сторінку не знайдено."
 
@@ -9015,24 +9158,16 @@ msgstr "Непрацездатний XML."
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr "Отримання резервної копії файлу «%s»."
+#~ msgid "Post"
+#~ msgstr "Допис"
 
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
-msgid "No user specified; using backup user."
-msgstr ""
-"Користувача не зазначено; для створення резервної копії потрібно зазначити "
-"користувача."
+#~ msgid "No user specified; using backup user."
+#~ msgstr ""
+#~ "Користувача не зазначено; для створення резервної копії потрібно "
+#~ "зазначити користувача."
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] "У резервному файлі збережено %d допис."
-msgstr[1] "У резервному файлі збережено %d дописів."
-msgstr[2] "У резервному файлі збережено %d дописів."
+#~ msgid "%d entry in backup."
+#~ msgid_plural "%d entries in backup."
+#~ msgstr[0] "У резервному файлі збережено %d допис."
+#~ msgstr[1] "У резервному файлі збережено %d дописів."
+#~ msgstr[2] "У резервному файлі збережено %d дописів."
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index 2a50598415..0c87407e08 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:20+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:36+0000\n"
 "Language-Team: Vietnamese <http://translatewiki.net/wiki/Portal:vi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: vi\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -273,7 +273,7 @@ msgstr "Dòng tin nhắn cho %s"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -320,7 +320,8 @@ msgstr "Không thể cập nhật thành viên."
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -556,7 +557,7 @@ msgstr "Không thể cập nhật thành viên."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Biệt hiệu này đã dùng rồi. Hãy nhập biệt hiệu khác."
@@ -566,7 +567,7 @@ msgstr "Biệt hiệu này đã dùng rồi. Hãy nhập biệt hiệu khác."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Biệt hiệu không hợp lệ."
@@ -578,7 +579,7 @@ msgstr "Biệt hiệu không hợp lệ."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Trang chủ không phải là URL"
@@ -588,7 +589,7 @@ msgstr "Trang chủ không phải là URL"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr ""
@@ -603,7 +604,7 @@ msgstr ""
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -614,7 +615,7 @@ msgstr[0] ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr ""
@@ -626,7 +627,7 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -644,7 +645,7 @@ msgstr "Địa chỉ email không đúng:%s"
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, fuzzy, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Biệt hiệu này đã dùng rồi. Hãy nhập biệt hiệu khác."
@@ -653,7 +654,7 @@ msgstr "Biệt hiệu này đã dùng rồi. Hãy nhập biệt hiệu khác."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -1044,7 +1045,7 @@ msgstr ""
 
 #. TRANS: Server error displayed when generating an Atom feed fails.
 #. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:138
+#: actions/apitimelinegroup.php:134
 #, php-format
 msgid "Could not generate feed for group - %s"
 msgstr ""
@@ -1135,30 +1136,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Tìm theo nội dung của tin nhắn"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1169,7 +1170,7 @@ msgid "API method under construction."
 msgstr "Phương thức API dưới cấu trúc có sẵn."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "Không tìm thấy user."
 
@@ -1387,13 +1388,13 @@ msgid "Preview"
 msgstr "Xem trước"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr ""
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr ""
@@ -1436,6 +1437,37 @@ msgstr "Cập nhật hình đại diện không thành công."
 msgid "Avatar deleted."
 msgstr "Hình đại diện đã được cập nhật."
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+msgid "Only logged-in users can backup their account."
+msgstr ""
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "Background Theme:"
+
+#: actions/backupaccount.php:258
+msgid "Backup your account"
+msgstr ""
+
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 #: actions/block.php:68
 #, fuzzy
@@ -1643,6 +1675,59 @@ msgstr "Thành phố"
 msgid "Notices"
 msgstr "Tin nhắn"
 
+#: actions/deleteaccount.php:72
+msgid "Only logged-in users can delete their account."
+msgstr ""
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "Không thể cập nhật thành viên."
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "Hình đại diện đã được cập nhật."
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "Mở tài khoản mới"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "Xác nhận"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently your account"
+msgstr ""
+
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 #: actions/deleteapplication.php:62
 #, fuzzy
@@ -1792,7 +1877,7 @@ msgid "Do not delete this notice"
 msgstr "Không thể xóa tin nhắn này."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 #, fuzzy
 msgid "Delete this notice"
 msgstr "Xóa tin nhắn"
@@ -2121,7 +2206,7 @@ msgstr ""
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Địa chỉ email không đúng:%s"
@@ -2134,7 +2219,7 @@ msgstr "Không thể cập nhật thành viên."
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 #, fuzzy
 msgid "Could not create aliases."
 msgstr "Không thể tạo favorite."
@@ -3395,8 +3480,14 @@ msgstr "Không thể tạo favorite."
 msgid "New group"
 msgstr "Tạo nhóm"
 
+#. 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 "Bạn đã theo những người này:"
+
 #. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr ""
 
@@ -3721,11 +3812,6 @@ msgstr "Mật khẩu mới"
 msgid "6 or more characters"
 msgstr "Nhiều hơn 6 ký tự"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "Xác nhận"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "Cùng mật khẩu ở trên"
@@ -4251,6 +4337,11 @@ msgstr "Không thể lưu hồ sơ cá nhân."
 msgid "Settings saved."
 msgstr "Đã lưu các điều chỉnh."
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "Mở tài khoản mới"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4707,7 +4798,7 @@ msgstr "Bạn không thể đăng ký nếu không đồng ý các điều kho
 msgid "You already repeated that notice."
 msgstr "Bạn đã theo những người này:"
 
-#: actions/repeat.php:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Khởi tạo"
 
@@ -4768,6 +4859,89 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "%s chào mừng bạn "
 
+#: actions/restoreaccount.php:79
+msgid "Only logged-in users can restore their account."
+msgstr ""
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "Bạn không thể đăng ký nếu không đồng ý các điều khoản."
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, fuzzy
+msgid "No uploaded file."
+msgstr "Tải tập tin lên"
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: actions/restoreaccount.php:130 lib/mediafile.php:194
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:136 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:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "Hệ thống xảy ra lỗi trong khi tải file."
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr ""
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Thành viên"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, fuzzy
+msgid "Upload the file"
+msgstr "Tải tập tin lên"
+
 #: actions/revokerole.php:75
 #, fuzzy
 msgid "You cannot revoke user roles on this site."
@@ -4877,7 +5051,7 @@ msgid "Reset key & secret"
 msgstr ""
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Xóa"
 
@@ -6133,14 +6307,14 @@ msgid "Author(s)"
 msgstr ""
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 #, fuzzy
 msgid "Favor"
 msgstr "Ưa thích"
 
 #. 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:154
+#: classes/Fave.php:167
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr ""
@@ -6249,7 +6423,7 @@ msgid "Could not create login token for %s"
 msgstr "Không thể tạo favorite."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6277,74 +6451,74 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:193
+#: classes/Notice.php:199
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Lỗi xảy ra khi thêm mới hình đại diện"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:270
+#: classes/Notice.php:279
 #, fuzzy
 msgid "Problem saving notice. Too long."
 msgstr "Có lỗi xảy ra khi lưu tin nhắn."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:275
+#: classes/Notice.php:284
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "Có lỗi xảy ra khi lưu tin nhắn."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:281
+#: 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:288
+#: 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:296
+#: 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:363 classes/Notice.php:390
+#: classes/Notice.php:372 classes/Notice.php:399
 msgid "Problem saving notice."
 msgstr "Có lỗi xảy ra khi lưu tin nhắn."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:913
+#: classes/Notice.php:914
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1012
+#: classes/Notice.php:1013
 #, fuzzy
 msgid "Problem saving group inbox."
 msgstr "Có lỗi xảy ra khi lưu tin nhắn."
 
 #. 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6352,14 +6526,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6434,33 +6608,33 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "%s chào mừng bạn "
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 msgid "No single user defined for single-user mode."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/User.php:927
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 #, fuzzy
 msgid "Could not create group."
 msgstr "Không thể tạo favorite."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 msgid "Could not set group URI."
 msgstr "Không thể lưu hồ sơ cá nhân."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:549
 msgid "Could not set group membership."
 msgstr "Không thể cập nhật thành viên."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "Không thể lưu hồ sơ cá nhân."
 
@@ -6604,10 +6778,9 @@ msgstr "Thoát"
 
 #. TRANS: Tooltip for main menu option "Register"
 #: lib/action.php:577
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Create an account"
-msgstr "Tạo tài khoản mới"
+msgstr "Mở tài khoản mới"
 
 #. TRANS: Main menu option when not logged in to register a new account
 #: lib/action.php:580
@@ -6816,8 +6989,18 @@ msgstr "Trước"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activity.php:360
-msgid "Post"
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
+#, fuzzy
+msgid "Unknown profile."
+msgstr "Không hỗ trợ kiểu file ảnh này."
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
 msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
@@ -7117,6 +7300,10 @@ msgstr "Khôi phục"
 msgid "author element must contain a name element."
 msgstr ""
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7507,24 +7694,24 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 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:150
+#: lib/common.php:153
 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr ""
 
@@ -7627,6 +7814,14 @@ msgstr ""
 msgid "FOAF"
 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"
@@ -7809,11 +8004,6 @@ msgstr ""
 msgid "Partial upload."
 msgstr "Upload từng phần."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "Hệ thống xảy ra lỗi trong khi tải file."
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "File hỏng hoặc không phải là file ảnh."
@@ -8158,7 +8348,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 #, fuzzy
 msgid "from"
 msgstr " từ "
@@ -8190,38 +8380,6 @@ msgstr "Không hỗ trợ kiểu file ảnh này."
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: lib/mediafile.php:194
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
-
-#. TRANS: Client exception.
-#: 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.
-#: 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.
-#: 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.
-#: 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.
-#: lib/mediafile.php:222
-msgid "File upload stopped by extension."
-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."
@@ -8243,7 +8401,7 @@ msgstr "Không thể lấy lại các tin nhắn ưa thích"
 #. 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8252,7 +8410,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
@@ -8288,17 +8446,17 @@ msgid "Send"
 msgstr "Gửi"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: lib/nickname.php:165
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "Biệt hiệu phải là chữ viết thường hoặc số và không có khoảng trắng."
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:176
+#: 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:189
+#: 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."
@@ -8339,58 +8497,58 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 #, fuzzy
 msgid "N"
 msgstr "Không"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr ""
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 #, fuzzy
 msgid "in context"
 msgstr "Không có nội dung!"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 #, fuzzy
 msgid "Repeated by"
 msgstr "Tạo"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "Không thể xóa tin nhắn này."
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "Trả lời"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Tìm kiếm thông báo"
 
@@ -8553,7 +8711,7 @@ msgid "Revoke the \"%s\" role from this user"
 msgstr "Ban user"
 
 #. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:957
+#: lib/router.php:974
 msgid "Page not found."
 msgstr ""
 
@@ -8909,21 +9067,3 @@ msgstr ""
 #: lib/xrd.php:69
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
-msgid "No user specified; using backup user."
-msgstr ""
-
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] ""
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 30b5f63bd7..ce2c792567 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -14,18 +14,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:21+0000\n"
+"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"PO-Revision-Date: 2011-01-14 10:32:38+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 (r78478); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2010-11-30 20:43:14+0000\n"
+"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -279,7 +279,7 @@ msgstr "%2$s上%1$s和好友们的更新！"
 #: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
 #: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
 #: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: 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
@@ -325,7 +325,8 @@ msgstr "无法更新用户。"
 #: actions/apiaccountupdateprofile.php:111
 #: actions/apiaccountupdateprofilebackgroundimage.php:199
 #: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
@@ -399,9 +400,9 @@ msgid "%s subscriptions"
 msgstr "%s 关注的用户"
 
 #: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "%s favorites"
-msgstr "收藏夹"
+msgstr "%s 收藏夹"
 
 #: actions/apiatomservice.php:123
 #, fuzzy, php-format
@@ -549,7 +550,7 @@ msgstr "无法找到目标用户。"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:277
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "昵称已被使用，换一个吧。"
@@ -559,7 +560,7 @@ msgstr "昵称已被使用，换一个吧。"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:247
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "不是有效的昵称。"
@@ -571,7 +572,7 @@ msgstr "不是有效的昵称。"
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:252
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "主页的URL不正确。"
@@ -581,7 +582,7 @@ msgstr "主页的URL不正确。"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:256
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "全名过长(不能超过 255 个字符)。"
@@ -596,7 +597,7 @@ msgstr "全名过长(不能超过 255 个字符)。"
 #. TRANS: %d is the maximum number of allowed characters.
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
@@ -607,7 +608,7 @@ 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:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:269
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "位置过长(不能超过255个字符)。"
@@ -619,7 +620,7 @@ msgstr "位置过长(不能超过255个字符)。"
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/newgroup.php:176
 #, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
@@ -637,7 +638,7 @@ msgstr "无效的别名：“%s”。"
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#: actions/newgroup.php:191
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "%s这个别名已被使用，换一个吧。"
@@ -646,7 +647,7 @@ msgstr "%s这个别名已被使用，换一个吧。"
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "别名不能和昵称相同。"
 
@@ -1035,7 +1036,7 @@ 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:138
+#: actions/apitimelinegroup.php:134
 #, php-format
 msgid "Could not generate feed for group - %s"
 msgstr "无法生成小组的 feed - %s"
@@ -1127,30 +1128,30 @@ msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:332
+#: actions/apitimelineuser.php:334
 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:343
+#: actions/apitimelineuser.php:345
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:376
+#: actions/apitimelineuser.php:378
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "搜索消息内容"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:404
+#: actions/apitimelineuser.php:406
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "已存在使用 URI \"%s\" 的消息了。"
 
-#: actions/apitimelineuser.php:435
+#: actions/apitimelineuser.php:437
 #, php-format
 msgid "AtomPub post with unknown attention URI %s"
 msgstr ""
@@ -1161,7 +1162,7 @@ msgid "API method under construction."
 msgstr "API 方法尚未实现。"
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
 msgid "User not found."
 msgstr "API方法没有找到。"
 
@@ -1251,7 +1252,6 @@ msgid "Can't delete someone else's favorite"
 msgstr "无法删除收藏。"
 
 #: actions/atompubshowmembership.php:81
-#, fuzzy
 msgid "No such group"
 msgstr "没有这个组。"
 
@@ -1376,13 +1376,13 @@ msgid "Preview"
 msgstr "预览"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "删除"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "上传"
@@ -1423,6 +1423,38 @@ msgstr "更新头像失败。"
 msgid "Avatar deleted."
 msgstr "头像已删除。"
 
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+#, fuzzy
+msgid "Only logged-in users can backup their account."
+msgstr "只有登录的用户才能重复发消息。"
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "背景"
+
+#: actions/backupaccount.php:258
+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."
@@ -1627,6 +1659,60 @@ msgstr "对话"
 msgid "Notices"
 msgstr "消息"
 
+#: actions/deleteaccount.php:72
+#, fuzzy
+msgid "Only logged-in users can delete their account."
+msgstr "只有登录的用户才能重复发消息。"
+
+#: actions/deleteaccount.php:77
+#, fuzzy
+msgid "You cannot delete your account."
+msgstr "你不能删除用户。"
+
+#: actions/deleteaccount.php:164
+msgid "I am sure."
+msgstr ""
+
+#: actions/deleteaccount.php:165
+msgid "You must write  \"I am sure.\" exactly in the box."
+msgstr ""
+
+#: actions/deleteaccount.php:207
+#, fuzzy
+msgid "Account deleted."
+msgstr "头像已删除。"
+
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#, fuzzy
+msgid "Delete account"
+msgstr "创建一个账户"
+
+#: actions/deleteaccount.php:282
+msgid ""
+"<p>This will <strong>permanently delete</strong> your account data from this "
+"server. </p>"
+msgstr ""
+
+#: actions/deleteaccount.php:286
+#, php-format
+msgid ""
+"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion.</p>"
+msgstr ""
+
+#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+msgid "Confirm"
+msgstr "密码确认"
+
+#: actions/deleteaccount.php:299
+msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+msgstr ""
+
+#: actions/deleteaccount.php:317
+msgid "Permanently 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."
@@ -1771,7 +1857,7 @@ msgid "Do not delete this notice"
 msgstr "不要删除这个消息"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr "删除"
 
@@ -2072,7 +2158,7 @@ msgstr "通过这个表单来编辑小组"
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "无效的别名：“%s”。"
@@ -2084,7 +2170,7 @@ msgstr "无法更新小组"
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:529
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "无法创建别名。"
 
@@ -3275,8 +3361,14 @@ msgstr "无法创建应用。"
 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:110
+#: actions/newgroup.php:117
 msgid "Use this form to create a new group."
 msgstr "通过此表单创建小组。"
 
@@ -3591,11 +3683,6 @@ msgstr "新密码"
 msgid "6 or more characters"
 msgstr "6 个或更多字符"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "密码确认"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "与上面相同的密码"
@@ -4102,6 +4189,11 @@ msgstr "无法保存标签。"
 msgid "Settings saved."
 msgstr "设置已保存。"
 
+#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#, fuzzy
+msgid "Restore account"
+msgstr "创建一个账户"
+
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
@@ -4543,7 +4635,7 @@ msgstr "你不能重复自己的消息。"
 msgid "You already repeated that notice."
 msgstr "你已转发过了那个消息。"
 
-#: actions/repeat.php:114 lib/noticelist.php:691
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "已转发"
 
@@ -4606,6 +4698,90 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "在%2$s上对%1$s的回复!"
 
+#: actions/restoreaccount.php:79
+#, fuzzy
+msgid "Only logged-in users can restore their account."
+msgstr "只有登录的用户才能重复发消息。"
+
+#: actions/restoreaccount.php:83
+#, fuzzy
+msgid "You may not restore your account."
+msgstr "你还没登记任何程序。"
+
+#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#, fuzzy
+msgid "No uploaded file."
+msgstr "上传文件"
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: actions/restoreaccount.php:130 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:136 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:142 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:151 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:155 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:159 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.
+#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "上传文件时出错。"
+
+#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
+#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
+#, php-format
+msgid "Getting backup from file '%s'."
+msgstr "从文件'%s'获取备份。"
+
+#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "所有成员"
+
+#: actions/restoreaccount.php:238
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr ""
+
+#: actions/restoreaccount.php:241
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr ""
+
+#: actions/restoreaccount.php:344
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+
+#: actions/restoreaccount.php:374
+#, fuzzy
+msgid "Upload the file"
+msgstr "上传文件"
+
 #: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "你不能在这个网站移除用户角色。"
@@ -4706,7 +4882,7 @@ msgid "Reset key & secret"
 msgstr "重置key和secret"
 
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
 msgid "Delete"
 msgstr "删除"
 
@@ -5942,13 +6118,13 @@ msgid "Author(s)"
 msgstr "作者"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:151 lib/favorform.php:143
+#: classes/Fave.php:164 lib/favorform.php:143
 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:154
+#: classes/Fave.php:167
 #, php-format
 msgid "%1$s marked notice %2$s as a favorite."
 msgstr "%1$s 收藏了消息 %2$s 。"
@@ -6052,7 +6228,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:533
+#: classes/Memcached_DataObject.php:537
 msgid "No database name or DSN found anywhere."
 msgstr "没有找到数据库名称或者 DSN。"
 
@@ -6079,71 +6255,71 @@ 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:193
+#: 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:270
+#: 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:275
+#: 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:281
+#: 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:288
+#: 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:296
+#: 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:363 classes/Notice.php:390
+#: 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:913
+#: classes/Notice.php:914
 msgid "Bad type provided to saveKnownGroups."
 msgstr "对 saveKnownGroups 提供的类型无效。"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1012
+#: classes/Notice.php:1013
 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:1126
+#: classes/Notice.php:1127
 #, 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:1645
+#: classes/Notice.php:1646
 #, 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:247
+#: classes/Profile.php:172 classes/User_group.php:242
 #, php-format
 msgctxt "FANCYNAME"
 msgid "%1$s (%2$s)"
@@ -6151,14 +6327,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:798
+#: classes/Profile.php:765
 #, 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:807
+#: classes/Profile.php:774
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr "无法取消用户#%2$d的\\\"%1$s\\\"权限，数据库错误。"
@@ -6228,32 +6404,32 @@ msgid "Welcome to %1$s, @%2$s!"
 msgstr "欢迎来到 %1$s，@%2$s！"
 
 #. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
 msgid "No single user defined for single-user mode."
 msgstr "没有单独的用户被定义为单用户模式。"
 
 #. TRANS: Server exception.
-#: classes/User.php:927
+#: classes/User.php:922
 msgid "Single-user mode code called when not enabled."
 msgstr "没启用单用户模式的代码。"
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "无法创建小组。"
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:526
 msgid "Could not set group URI."
 msgstr "无法设置小组 URI。"
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:549
 msgid "Could not set group membership."
 msgstr "无法设置小组成员。"
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:559
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "无法保存本地小组信息。"
 
@@ -6587,10 +6763,19 @@ msgstr "之前"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "只期待一个 root feed 元素但收到了整个的 XML 文档。"
 
-#: lib/activity.php:360
+#: lib/activityimporter.php:109
+msgid "Can't force subscription for untrusted user."
+msgstr ""
+
+#: lib/activityimporter.php:133
 #, fuzzy
-msgid "Post"
-msgstr "相片"
+msgid "Unknown profile."
+msgstr "未知文件类型"
+
+#: lib/activityimporter.php:197
+#, php-format
+msgid "Already know about notice %s and  it's got a different author %s."
+msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -6873,6 +7058,10 @@ msgstr "取消"
 msgid "author element must contain a name element."
 msgstr "作者元素必须包含一个名称元素。"
 
+#: lib/atom10feed.php:158
+msgid "Don't use this method!"
+msgstr ""
+
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
 msgid "Author"
@@ -7292,24 +7481,24 @@ msgstr ""
 "tracking - 尚未实现。\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:150
 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:150
+#: lib/common.php:153
 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:153
+#: lib/common.php:156
 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:157
+#: lib/common.php:160
 msgid "Go to the installer."
 msgstr "去安装程序。"
 
@@ -7409,6 +7598,14 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: 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"
@@ -7585,11 +7782,6 @@ msgstr "文件太大。文件大小限制在%s以下。"
 msgid "Partial upload."
 msgstr "部分上传。"
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "上传文件时出错。"
-
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "不是图片文件或文件已损坏。"
@@ -8003,7 +8195,7 @@ msgstr ""
 "你没有任何私信。你可以试着发送私信给其他用户鼓励他们用私信和你交流。其他用户"
 "发给你你私信只有你看得到。"
 
-#: lib/mailbox.php:228 lib/noticelist.php:521
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "通过"
 
@@ -8033,38 +8225,6 @@ msgstr "不支持的信息格式：%s"
 msgid "There was a database error while saving your file. Please try again."
 msgstr "保存你的文件时数据库出现了一个错误。请重试。"
 
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: 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.
-#: 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.
-#: 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.
-#: 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.
-#: 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.
-#: lib/mediafile.php:222
-msgid "File upload stopped by extension."
-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."
@@ -8085,7 +8245,7 @@ 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:394
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -8094,7 +8254,7 @@ 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:399
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr "这个服务器不支持 %s 的文件格式。"
@@ -8127,17 +8287,17 @@ msgid "Send"
 msgstr "发布"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:163
+#: 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:176
+#: 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:189
+#: 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."
@@ -8175,55 +8335,55 @@ msgid ""
 msgstr "抱歉，获取你的地理位置时间过长，请稍候重试"
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
 msgid "W"
 msgstr "W"
 
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
 #, 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:468
+#: lib/noticelist.php:469
 msgid "at"
 msgstr "位于"
 
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
 msgid "web"
 msgstr "网页"
 
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr "查看对话"
 
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "转发来自"
 
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr "回复"
 
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "回复"
 
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "消息已转发"
 
@@ -8377,7 +8537,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:957
+#: lib/router.php:974
 msgid "Page not found."
 msgstr "没有找到页面。"
 
@@ -8716,20 +8876,13 @@ msgstr "无效的 XML。"
 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:61
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr "从文件'%s'获取备份。"
+#, fuzzy
+#~ msgid "Post"
+#~ msgstr "相片"
 
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
-msgid "No user specified; using backup user."
-msgstr "没有用户被指定；使用备份用户。"
+#~ msgid "No user specified; using backup user."
+#~ msgstr "没有用户被指定；使用备份用户。"
 
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] "备份中有 %d 个条目。"
+#~ msgid "%d entry in backup."
+#~ msgid_plural "%d entries in backup."
+#~ msgstr[0] "备份中有 %d 个条目。"

From 6e1dfab1b97ed8cbb1d03b1174366e4428482019 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Fri, 14 Jan 2011 20:48:17 +0100
Subject: [PATCH 047/314] * change i18n for confirmation string to make a bit
 more certain that the confirmation string is consistent in all messages where
 it is used. * add translator documentation. * remove superfluous whitespace.

---
 actions/deleteaccount.php | 74 +++++++++++++++++++++------------------
 1 file changed, 40 insertions(+), 34 deletions(-)

diff --git a/actions/deleteaccount.php b/actions/deleteaccount.php
index 9abe2fcdb6..dd587d0445 100644
--- a/actions/deleteaccount.php
+++ b/actions/deleteaccount.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2010, StatusNet, Inc.
  *
  * Delete your own account
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -36,7 +36,7 @@ if (!defined('STATUSNET')) {
 
 /**
  * Action to delete your own account
- * 
+ *
  * Note that this is distinct from DeleteuserAction, which see. I thought
  * that making that action do both things (delete another user and delete the
  * current user) would open a lot of holes. I'm open to refactoring, however.
@@ -48,7 +48,6 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class DeleteaccountAction extends Action
 {
     private $_complete = false;
@@ -61,19 +60,20 @@ class DeleteaccountAction extends Action
      *
      * @return boolean true
      */
-
     function prepare($argarray)
     {
         parent::prepare($argarray);
-        
+
         $cur = common_current_user();
 
         if (empty($cur)) {
+            // TRANS: Client exception displayed trying to delete a user account while not logged in.
             throw new ClientException(_("Only logged-in users ".
                                         "can delete their account."), 403);
         }
 
         if (!$cur->hasRight(Right::DELETEACCOUNT)) {
+            // TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
             throw new ClientException(_("You cannot delete your account."), 403);
         }
 
@@ -87,7 +87,6 @@ class DeleteaccountAction extends Action
      *
      * @return void
      */
-
     function handle($argarray=null)
     {
         parent::handle($argarray);
@@ -109,7 +108,6 @@ class DeleteaccountAction extends Action
      *
      * @return boolean is read only action?
      */
-
     function isReadOnly($args)
     {
         return false;
@@ -122,7 +120,6 @@ class DeleteaccountAction extends Action
      *
      * @return string last modified http header
      */
-
     function lastModified()
     {
         // For comparison with If-Last-Modified
@@ -137,7 +134,6 @@ class DeleteaccountAction extends Action
      *
      * @return string etag http header
      */
-
     function etag()
     {
         return null;
@@ -145,7 +141,7 @@ class DeleteaccountAction extends Action
 
     /**
      * Delete the current user's account
-     * 
+     *
      * Checks for the "I am sure." string to make sure the user really
      * wants to delete their account.
      *
@@ -156,13 +152,16 @@ class DeleteaccountAction extends Action
      *
      * @return void
      */
-
     function deleteAccount()
     {
         $this->checkSessionToken();
-
-        if ($this->trimmed('iamsure') != _('I am sure.')) {
-            $this->_error = _('You must write  "I am sure." exactly in the box.');
+        // !!! If this string is changed, it also needs to be changed in DeleteAccountForm::formData()
+        // TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
+        $iamsure = _('I am sure.');
+        if ($this->trimmed('iamsure') != $iamsure ) {
+            // 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.
+            $this->_error = sprintf(_('You must write  "%s" exactly in the box.', $iamsure));
             $this->showPage();
             return;
         }
@@ -191,7 +190,7 @@ class DeleteaccountAction extends Action
 
     /**
      * Shows the page content.
-     * 
+     *
      * If the deletion is complete, just shows a completion message.
      *
      * Otherwise, shows the deletion form.
@@ -199,11 +198,11 @@ class DeleteaccountAction extends Action
      * @return void
      *
      */
-
     function showContent()
     {
         if ($this->_complete) {
-            $this->element('p', 'confirmation', 
+            $this->element('p', 'confirmation',
+                           // TRANS: Confirmation that a user account has been deleted.
                            _('Account deleted.'));
             return;
         }
@@ -216,7 +215,7 @@ class DeleteaccountAction extends Action
         $form = new DeleteAccountForm($this);
         $form->show();
     }
-    
+
     /**
      * Show the title of the page
      *
@@ -225,13 +224,14 @@ class DeleteaccountAction extends Action
 
     function title()
     {
+        // TRANS: Page title for page on which a user account can be deleted.
         return _('Delete account');
     }
 }
 
 /**
  * Form for deleting your account
- * 
+ *
  * Note that this mostly is here to keep you from accidentally deleting your
  * account.
  *
@@ -242,7 +242,6 @@ class DeleteaccountAction extends Action
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class DeleteAccountForm extends Form
 {
     /**
@@ -250,7 +249,6 @@ class DeleteAccountForm extends Form
      *
      * @return string the form's class
      */
-
     function formClass()
     {
         return 'form_profile_delete';
@@ -261,7 +259,6 @@ class DeleteAccountForm extends Form
      *
      * @return string the form's action URL
      */
-
     function action()
     {
         return common_local_url('deleteaccount');
@@ -269,51 +266,60 @@ class DeleteAccountForm extends Form
 
     /**
      * Output form data
-     * 
+     *
      * Instructions plus an 'i am sure' entry box.
      *
      * @return void
      */
-
     function formData()
     {
         $cur = common_current_user();
 
-        $msg = _('<p>This will <strong>permanently delete</strong> '.
-                 'your account data from this server. </p>');
+        // TRANS: Form text for user deletion form.
+        $msg = '<p>' . _('This will <strong>permanently delete</strong> '.
+                 'your account data from this server.') . '</p>';
 
         if ($cur->hasRight(Right::BACKUPACCOUNT)) {
-            $msg .= sprintf(_('<p>You are strongly advised to '.
+            // 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.
+            $msg .= '<p>' . sprintf(_('You are strongly advised to '.
                               '<a href="%s">back up your data</a>'.
-                              ' before deletion.</p>'),
-                           common_local_url('backupaccount'));
+                              ' before deletion.'),
+                           common_local_url('backupaccount')) . '</p>';
         }
 
         $this->out->elementStart('p');
         $this->out->raw($msg);
         $this->out->elementEnd('p');
 
+        // !!! If this string is changed, it also needs to be changed in class DeleteaccountAction.
+        // TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
+        $iamsure = _("I am sure.");
         $this->out->input('iamsure',
+                          // TRANS: Field label for delete account confirmation entry.
                           _('Confirm'),
                           null,
-                          _('Enter "I am sure." to confirm that '.
-                            'you want to delete your account.'));
+                          // TRANS: Input title for the delete account field.
+                          // TRANS: %s is the text that needs to be input.
+                          sprintf(_('Enter "%s" to confirm that '.
+                            'you want to delete your account.'),$iamsure ));
     }
 
     /**
      * Buttons for the form
-     * 
+     *
      * In this case, a single submit button
      *
      * @return void
      */
-
     function formActions()
     {
         $this->out->submit('submit',
+                           // TRANS: Button text for user account deletion.
                            _m('BUTTON', 'Delete'),
                            'submit',
                            null,
-                           _('Permanently your account'));
+                           // TRANS: Button title for user account deletion.
+                           _('Permanently delete your account'));
     }
 }

From 7903a2504f8cd98b4daaf631c4aae482644cd0a7 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Fri, 14 Jan 2011 21:25:46 +0100
Subject: [PATCH 048/314] * remove i18n for debug message. * add i18n for some
 server exceptions. * add translator documentation. * L10n updates. * remove
 superfluous whitespace.

---
 actions/restoreaccount.php | 59 +++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/actions/restoreaccount.php b/actions/restoreaccount.php
index 8cf220a424..b32553a68d 100644
--- a/actions/restoreaccount.php
+++ b/actions/restoreaccount.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2010, StatusNet, Inc.
  *
  * Restore a backup of your own account from the browser
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -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 RestoreaccountAction extends Action
 {
     private $success = false;
@@ -52,12 +51,12 @@ class RestoreaccountAction extends Action
 
     /**
      * Returns the title of the page
-     * 
+     *
      * @return string page title
      */
-
     function title()
     {
+        // TRANS: Page title for page where a user account can be restored from backup.
         return _("Restore account");
     }
 
@@ -68,7 +67,6 @@ class RestoreaccountAction extends Action
      *
      * @return boolean true
      */
-
     function prepare($argarray)
     {
         parent::prepare($argarray);
@@ -76,10 +74,12 @@ class RestoreaccountAction extends Action
         $cur = common_current_user();
 
         if (empty($cur)) {
+            // TRANS: Client exception displayed when trying to restore an account while not logged in.
             throw new ClientException(_('Only logged-in users can restore their account.'), 403);
         }
 
         if (!$cur->hasRight(Right::RESTOREACCOUNT)) {
+            // TRANS: Client exception displayed when trying to restore an account without having restore rights.
             throw new ClientException(_('You may not restore your account.'), 403);
         }
 
@@ -93,7 +93,6 @@ class RestoreaccountAction extends Action
      *
      * @return void
      */
-
     function handle($argarray=null)
     {
         parent::handle($argarray);
@@ -108,17 +107,17 @@ class RestoreaccountAction extends Action
 
     /**
      * Queue a file for restoration
-     * 
+     *
      * Uses the UserActivityStream class; may take a long time!
      *
      * @return void
      */
-
     function restoreAccount()
     {
         $this->checkSessionToken();
 
         if (!isset($_FILES['restorefile']['error'])) {
+            // TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
             throw new ClientException(_('No uploaded file.'));
         }
 
@@ -143,7 +142,7 @@ class RestoreaccountAction extends Action
                 ' partially uploaded.'));
             return;
         case UPLOAD_ERR_NO_FILE:
-            // No file; probably just a non-AJAX submission.
+            // TRANS: Client exception. No file; probably just a non-AJAX submission.
             throw new ClientException(_('No uploaded file.'));
             return;
         case UPLOAD_ERR_NO_TMP_DIR:
@@ -170,18 +169,21 @@ class RestoreaccountAction extends Action
 
         try {
             if (!file_exists($filename)) {
-                throw new ServerException("No such file '$filename'.");
+                // TRANS: Server exception thrown when an expected file upload could not be found.
+                throw new ServerException(_("No such file '$filename'."));
             }
-        
+
             if (!is_file($filename)) {
-                throw new ServerException("Not a regular file: '$filename'.");
+                // TRANS: Server exception thrown when an expected file upload is not an actual file.
+                throw new ServerException(_("Not a regular file: '$filename'."));
             }
-        
+
             if (!is_readable($filename)) {
-                throw new ServerException("File '$filename' not readable.");
+                // TRANS: Server exception thrown when an expected file upload could not be read.
+                throw new ServerException(_("File '$filename' not readable."));
             }
-        
-            common_debug(sprintf(_("Getting backup from file '%s'."), $filename));
+
+            common_debug(sprintf("Getting backup from file '%s'.", $filename));
 
             $xml = file_get_contents($filename);
 
@@ -201,7 +203,8 @@ class RestoreaccountAction extends Action
             if (!$feed ||
                 $feed->namespaceURI != Activity::ATOM ||
                 $feed->localName != 'feed') {
-                throw new ClientException(_("Not an atom feed."));
+                // TRANS: Client exception thrown when a feed is not an Atom feed.
+                throw new ClientException(_("Not an Atom feed."));
             }
 
             // Enqueue for processing.
@@ -230,21 +233,22 @@ class RestoreaccountAction extends Action
      *
      * @return void
      */
-    
     function showContent()
     {
         if ($this->success) {
             $this->element('p', null,
+                           // TRANS: Success message when a feed has been restored.
                            _('Feed has been restored. Your old posts should now appear in search and your profile page.'));
         } else if ($this->inprogress) {
             $this->element('p', null,
+                           // TRANS: Message when a feed restore is in progress.
                            _('Feed will be restored. Please wait a few minutes for results.'));
         } else {
             $form = new RestoreAccountForm($this);
             $form->show();
         }
     }
- 
+
     /**
      * Return true if read only.
      *
@@ -254,7 +258,6 @@ class RestoreaccountAction extends Action
      *
      * @return boolean is read only action?
      */
-
     function isReadOnly($args)
     {
         return false;
@@ -267,7 +270,6 @@ class RestoreaccountAction extends Action
      *
      * @return string last modified http header
      */
-
     function lastModified()
     {
         // For comparison with If-Last-Modified
@@ -282,7 +284,6 @@ class RestoreaccountAction extends Action
      *
      * @return string etag http header
      */
-
     function etag()
     {
         return null;
@@ -299,7 +300,6 @@ class RestoreaccountAction extends Action
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class RestoreAccountForm extends Form
 {
     function __construct($out=null) {
@@ -312,7 +312,6 @@ class RestoreAccountForm extends Form
      *
      * @return string the form's class
      */
-
     function formClass()
     {
         return 'form_profile_restore';
@@ -323,7 +322,6 @@ class RestoreAccountForm extends Form
      *
      * @return string the form's action URL
      */
-
     function action()
     {
         return common_local_url('restoreaccount');
@@ -331,19 +329,19 @@ class RestoreAccountForm extends Form
 
     /**
      * Output form data
-     * 
+     *
      * Really, just instructions for doing a backup.
      *
      * @return void
      */
-
     function formData()
     {
         $this->out->elementStart('p', 'instructions');
 
+        // TRANS: Form instructions for feed restore.
         $this->out->raw(_('You can upload a backed-up stream in '.
                           '<a href="http://activitystrea.ms/">Activity Streams</a> format.'));
-        
+
         $this->out->elementEnd('p');
 
         $this->out->elementStart('ul', 'form_data');
@@ -359,18 +357,19 @@ class RestoreAccountForm extends Form
 
     /**
      * Buttons for the form
-     * 
+     *
      * In this case, a single submit button
      *
      * @return void
      */
-
     function formActions()
     {
         $this->out->submit('submit',
+                           // TRANS: Submit button to confirm upload of a user backup file for account restore.
                            _m('BUTTON', 'Upload'),
                            'submit',
                            null,
+                           // TRANS: Title for submit button to confirm upload of a user backup file for account restore.
                            _('Upload the file'));
     }
 }

From bf40b3e6942ccd5266988ecd13f45343a5a7e9b8 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Fri, 14 Jan 2011 21:41:36 +0100
Subject: [PATCH 049/314] * remove i18n for debug message. * add i18n for some
 exceptions. * add translator documentation. * L10n updates. * remove
 superfluous whitespace.

---
 lib/activityimporter.php | 54 ++++++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/lib/activityimporter.php b/lib/activityimporter.php
index b3b7ffb066..0bd7620da3 100644
--- a/lib/activityimporter.php
+++ b/lib/activityimporter.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2010, StatusNet, Inc.
  *
  * class to import activities as part of a user's timeline
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -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 ActivityImporter extends QueueHandler
 {
     private $trusted = false;
@@ -56,7 +55,6 @@ class ActivityImporter extends QueueHandler
      *
      * @return
      */
-
     function handle($data)
     {
         list($user, $author, $activity, $trusted) = $data;
@@ -65,9 +63,8 @@ class ActivityImporter extends QueueHandler
 
         $done = null;
 
-        if (Event::handle('StartImportActivity', 
+        if (Event::handle('StartImportActivity',
                           array($user, $author, $activity, $trusted, &$done))) {
-
             try {
                 switch ($activity->verb) {
                 case ActivityVerb::FOLLOW:
@@ -80,9 +77,10 @@ class ActivityImporter extends QueueHandler
                     $this->postNote($user, $author, $activity);
                     break;
                 default:
-                    throw new ClientException("Unknown verb: {$activity->verb}");
+                    // TRANS: Client exception thrown when using an unknown verb for the activity importer.
+                    throw new ClientException(sprintf(_("Unknown verb: \"%s\"."),$activity->verb));
                 }
-                Event::handle('EndImportActivity', 
+                Event::handle('EndImportActivity',
                               array($user, $author, $activity, $trusted));
                 $done = true;
             } catch (ClientException $ce) {
@@ -98,31 +96,31 @@ class ActivityImporter extends QueueHandler
         }
         return $done;
     }
-    
+
     function subscribeProfile($user, $author, $activity)
     {
         $profile = $user->getProfile();
 
         if ($activity->objects[0]->id == $author->id) {
-
             if (!$this->trusted) {
-                throw new ClientException(_("Can't force subscription for untrusted user."));
+                // TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
+                throw new ClientException(_("Cannot force subscription for untrusted user."));
             }
 
             $other = $activity->actor;
             $otherUser = User::staticGet('uri', $other->id);
-            
+
             if (!empty($otherUser)) {
                 $otherProfile = $otherUser->getProfile();
             } else {
-                throw new Exception("Can't force remote user to subscribe.");
+                // TRANS: Client exception thrown when trying to for a remote user to subscribe.
+                throw new Exception(_("Cannot force remote user to subscribe."));
             }
 
             // XXX: don't do this for untrusted input!
 
             Subscription::start($otherProfile, $profile);
-
-        } else if (empty($activity->actor) 
+        } else if (empty($activity->actor)
                    || $activity->actor->id == $author->id) {
 
             $other = $activity->objects[0];
@@ -130,12 +128,14 @@ class ActivityImporter extends QueueHandler
             $otherProfile = Profile::fromUri($other->id);
 
             if (empty($otherProfile)) {
+                // TRANS: Client exception thrown when trying to subscribe to an unknown profile.
                 throw new ClientException(_("Unknown profile."));
             }
 
             Subscription::start($profile, $otherProfile);
         } else {
-            throw new Exception("This activity seems unrelated to our user.");
+            // TRANS: Client exception thrown when trying to import an event not related to the importing user.
+            throw new Exception(_("This activity seems unrelated to our user."));
         }
     }
 
@@ -150,7 +150,8 @@ class ActivityImporter extends QueueHandler
         if (empty($group)) {
             $oprofile = Ostatus_profile::ensureActivityObjectProfile($activity->objects[0]);
             if (!$oprofile->isGroup()) {
-                throw new ClientException("Remote profile is not a group!");
+                // TRANS: Client exception thrown when trying to join a remote group that is not a group.
+                throw new ClientException(_("Remote profile is not a group!"));
             }
             $group = $oprofile->localGroup();
         }
@@ -158,7 +159,8 @@ class ActivityImporter extends QueueHandler
         assert(!empty($group));
 
         if ($user->isMember($group)) {
-            throw new ClientException("User is already a member of this group.");
+            // TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
+            throw new ClientException(_("User is already a member of this group."));
         }
 
         if (Event::handle('StartJoinGroup', array($group, $user))) {
@@ -178,7 +180,7 @@ class ActivityImporter extends QueueHandler
         $notice = Notice::staticGet('uri', $sourceUri);
 
         if (!empty($notice)) {
-            
+
             common_log(LOG_INFO, "Notice {$sourceUri} already exists.");
 
             if ($this->trusted) {
@@ -194,12 +196,15 @@ class ActivityImporter extends QueueHandler
                     $notice->update($orig);
                     return;
                 } else {
-                    throw new ClientException(sprintf(_("Already know about notice %s and ".
-                                                        " it's got a different author %s."),
+                    // 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.
+                    throw new ClientException(sprintf(_("Already know about notice %1$s and ".
+                                                        " it has a different author %2$s."),
                                                       $sourceUri, $uri));
                 }
             } else {
-                throw new ClientException("Not overwriting author info for non-trusted user.");
+                // TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
+                throw new ClientException(_("Not overwriting author info for non-trusted user."));
             }
         }
 
@@ -213,8 +218,9 @@ class ActivityImporter extends QueueHandler
             $sourceContent = $note->title;
         } else {
             // @fixme fetch from $sourceUrl?
-            // @todo i18n FIXME: use sprintf and add i18n.
-            throw new ClientException("No content for notice {$sourceUri}.");
+            // TRANS: Client exception thrown when trying to import a notice without content.
+            // TRANS: %s is the notice URI.
+            throw new ClientException(sprintf(_("No content for notice %s."),$sourceUri));
         }
 
         // Get (safe!) HTML and text versions of the content
@@ -345,7 +351,7 @@ class ActivityImporter extends QueueHandler
 
         return array($groups, $replies);
     }
- 
+
 
     function purify($content)
     {

From 2460301d2499329dfd43f42b988afe6040df57b5 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Fri, 14 Jan 2011 21:53:01 +0100
Subject: [PATCH 050/314] Add punctuation for consistency.

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

diff --git a/plugins/SQLProfile/SQLProfilePlugin.php b/plugins/SQLProfile/SQLProfilePlugin.php
index 1e49d9005e..c17646f042 100644
--- a/plugins/SQLProfile/SQLProfilePlugin.php
+++ b/plugins/SQLProfile/SQLProfilePlugin.php
@@ -38,7 +38,7 @@ class SQLProfilePlugin extends Plugin
                             'author' => 'Brion Vibber',
                             'homepage' => 'http://status.net/wiki/Plugin:SQLProfile',
                             'rawdescription' =>
-                            _m('Debug tool to watch for poorly indexed DB queries'));
+                            _m('Debug tool to watch for poorly indexed DB queries.'));
 
         return true;
     }

From 02f005fe5f932d3cf7677842d724cf3da76817b1 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Fri, 14 Jan 2011 21:53:39 +0100
Subject: [PATCH 051/314] * L10n updates * translator documentation added

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

diff --git a/lib/atom10feed.php b/lib/atom10feed.php
index 881df6605f..8d4b66d8b8 100644
--- a/lib/atom10feed.php
+++ b/lib/atom10feed.php
@@ -108,8 +108,9 @@ class Atom10Feed extends XMLStringer
         if (!empty($name)) {
             $xs->element('name', null, $name);
         } else {
+            // TRANS: Atom feed exception thrown when an author element does not contain a name element.
             throw new Atom10FeedException(
-                _('author element must contain a name element.')
+                _('Author element must contain a name element.')
             );
         }
 
@@ -155,7 +156,8 @@ class Atom10Feed extends XMLStringer
 
     function setActivitySubject($xmlSubject)
     {
-        throw new ServerException(_('Don\'t use this method!'));
+        // TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
+        throw new ServerException(_('Do not use this method!'));
     }
 
     function getNamespaces()

From 573925c52a814d576212f92d33c44439c41b7abd Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sat, 15 Jan 2011 00:24:06 +0100
Subject: [PATCH 052/314] * number parameters in messages * add translator
 documentation * remove superfluous whitespace * small L10n update

---
 actions/atompubshowsubscription.php | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/actions/atompubshowsubscription.php b/actions/atompubshowsubscription.php
index 55ba68adc5..6274f8f922 100644
--- a/actions/atompubshowsubscription.php
+++ b/actions/atompubshowsubscription.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2010, StatusNet, Inc.
  *
  * Single subscription
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -46,21 +46,19 @@ require_once INSTALLDIR . '/lib/apiauth.php';
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class AtompubshowsubscriptionAction extends ApiAuthAction
 {
     private $_subscriber   = null;
     private $_subscribed   = null;
     private $_subscription = null;
 
-    /** 
+    /**
      * For initializing members of the class.
      *
      * @param array $argarray misc. arguments
      *
      * @return boolean true
      */
-
     function prepare($argarray)
     {
         parent::prepare($argarray);
@@ -69,6 +67,8 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
         $this->_subscriber = Profile::staticGet('id', $subscriberId);
 
         if (empty($this->_subscriber)) {
+            // 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.
             throw new ClientException(sprintf(_('No such profile id: %d'),
                                               $subscriberId), 404);
         }
@@ -78,16 +78,20 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
         $this->_subscribed = Profile::staticGet('id', $subscribedId);
 
         if (empty($this->_subscribed)) {
+            // 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.
             throw new ClientException(sprintf(_('No such profile id: %d'),
                                               $subscribedId), 404);
         }
 
-        $this->_subscription = 
+        $this->_subscription =
             Subscription::pkeyGet(array('subscriber' => $subscriberId,
                                         'subscribed' => $subscribedId));
 
         if (empty($this->_subscription)) {
-            $msg = sprintf(_('Profile %d not subscribed to profile %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.
+            $msg = sprintf(_('Profile %1$d not subscribed to profile %2$d'),
                            $subscriberId, $subscribedId);
             throw new ClientException($msg, 404);
         }
@@ -102,7 +106,6 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
      *
      * @return void
      */
-
     function handle($argarray=null)
     {
         parent::handle($argarray);
@@ -115,6 +118,7 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
             $this->deleteSubscription();
             break;
         default:
+            // TRANS: Client error shown when using a non-supported HTTP method.
             $this->clientError(_('HTTP method not supported.'), 405);
             return;
         }
@@ -127,7 +131,6 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
      *
      * @return void
      */
-
     function showSubscription()
     {
         $activity = $this->_subscription->asActivity();
@@ -146,13 +149,13 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
      *
      * @return void
      */
-
     function deleteSubscription()
     {
         if (empty($this->auth_user) ||
             $this->auth_user->id != $this->_subscriber->id) {
-            throw new ClientException(_("Can't delete someone else's".
-                                        " subscription"), 403);
+            // TRANS: Client exception thrown when trying to delete a subscription of another user.
+            throw new ClientException(_("Cannot delete someone else's ".
+                                        "subscription"), 403);
         }
 
         Subscription::cancel($this->_subscriber,
@@ -168,7 +171,6 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
      *
      * @return boolean true
      */
-    
     function isReadOnly($args)
     {
         if ($_SERVER['REQUEST_METHOD'] == 'DELETE') {
@@ -183,7 +185,6 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
      *
      * @return string last modified http header
      */
-
     function lastModified()
     {
         return max(strtotime($this->_subscriber->modified),
@@ -196,7 +197,6 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
      *
      * @return string etag http header
      */
-
     function etag()
     {
         $mtime = strtotime($this->_subscription->modified);
@@ -212,7 +212,6 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
      *
      * @return boolean true if delete, else false
      */
-
     function requiresAuth()
     {
         if ($_SERVER['REQUEST_METHOD'] == 'DELETE') {

From b59bc2f48ba7d91c6e165dbb0ec97455c661e11c Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sat, 15 Jan 2011 00:31:26 +0100
Subject: [PATCH 053/314] Add translator comments.

---
 plugins/Disqus/DisqusPlugin.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/Disqus/DisqusPlugin.php b/plugins/Disqus/DisqusPlugin.php
index 51be78362b..add089e77f 100644
--- a/plugins/Disqus/DisqusPlugin.php
+++ b/plugins/Disqus/DisqusPlugin.php
@@ -139,6 +139,7 @@ ENDOFSCRIPT;
                 $action->elementStart('div', $attrs);
                 $action->elementStart('noscript');
 
+                // TRANS: User notification that JavaScript is required for Disqus comment display.
                 $noScriptMsg = sprintf(_m("Please enable JavaScript to view the [comments powered by Disqus](http://disqus.com/?ref_noscript=%s)."), $this->shortname);
                 $output = common_markup_to_html($noScriptMsg);
                 $action->raw($output);
@@ -146,6 +147,7 @@ ENDOFSCRIPT;
                 $action->elementEnd('noscript');
 
                 $action->elementStart('a', array('href' => 'http://disqus.com', 'class' => 'dsq-brlink'));
+                // TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
                 $action->raw(_m('Comments powered by '));
                 $action->element('span', array('class' => 'logo-disqus'), 'Disqus');
                 $action->elementEnd('a');
@@ -198,6 +200,7 @@ ENDOFSCRIPT;
             $noticeListItem->out->element(
                 'a',
                 array('href' => $noticeUrl, 'class' => 'disqus_count'),
+                // TRANS: Plugin supplied feature for Disqus comments to notices.
                 _m('Comments')
             );
         }
@@ -238,6 +241,7 @@ ENDOFSCRIPT;
                             'author' => 'Zach Copley',
                             'homepage' => 'http://status.net/wiki/Plugin:Disqus',
                             'rawdescription' =>
+                            // TRANS: Plugin description.
                             _m('Use <a href="http://disqus.com/">Disqus</a>'.
                                ' to add commenting to notice pages.'));
         return true;

From 89727549a67bda3e5535dad465ce7146dda493e9 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sat, 15 Jan 2011 00:47:49 +0100
Subject: [PATCH 054/314] Localisation updates from http://translatewiki.net.

---
 locale/af/LC_MESSAGES/statusnet.po            | 211 ++++++++----
 locale/ar/LC_MESSAGES/statusnet.po            | 211 ++++++++----
 locale/arz/LC_MESSAGES/statusnet.po           | 211 ++++++++----
 locale/bg/LC_MESSAGES/statusnet.po            | 211 ++++++++----
 locale/br/LC_MESSAGES/statusnet.po            | 211 ++++++++----
 locale/ca/LC_MESSAGES/statusnet.po            | 218 ++++++++-----
 locale/cs/LC_MESSAGES/statusnet.po            | 211 ++++++++----
 locale/da/LC_MESSAGES/statusnet.po            | 204 ++++++++----
 locale/de/LC_MESSAGES/statusnet.po            | 216 ++++++++-----
 locale/en_GB/LC_MESSAGES/statusnet.po         | 210 ++++++++----
 locale/eo/LC_MESSAGES/statusnet.po            | 211 ++++++++----
 locale/es/LC_MESSAGES/statusnet.po            | 211 ++++++++----
 locale/fa/LC_MESSAGES/statusnet.po            | 211 ++++++++----
 locale/fi/LC_MESSAGES/statusnet.po            | 211 ++++++++----
 locale/fr/LC_MESSAGES/statusnet.po            | 217 ++++++++-----
 locale/ga/LC_MESSAGES/statusnet.po            | 206 ++++++++----
 locale/gl/LC_MESSAGES/statusnet.po            | 217 ++++++++-----
 locale/hsb/LC_MESSAGES/statusnet.po           | 280 +++++++++-------
 locale/hu/LC_MESSAGES/statusnet.po            | 210 ++++++++----
 locale/ia/LC_MESSAGES/statusnet.po            | 220 ++++++++-----
 locale/is/LC_MESSAGES/statusnet.po            | 211 ++++++++----
 locale/it/LC_MESSAGES/statusnet.po            | 217 ++++++++-----
 locale/ja/LC_MESSAGES/statusnet.po            | 211 ++++++++----
 locale/ka/LC_MESSAGES/statusnet.po            | 210 ++++++++----
 locale/ko/LC_MESSAGES/statusnet.po            | 211 ++++++++----
 locale/mk/LC_MESSAGES/statusnet.po            | 218 ++++++++-----
 locale/ml/LC_MESSAGES/statusnet.po            | 235 +++++++++-----
 locale/nb/LC_MESSAGES/statusnet.po            | 211 ++++++++----
 locale/nl/LC_MESSAGES/statusnet.po            | 300 +++++++++++-------
 locale/nn/LC_MESSAGES/statusnet.po            | 211 ++++++++----
 locale/pl/LC_MESSAGES/statusnet.po            | 219 ++++++++-----
 locale/pt/LC_MESSAGES/statusnet.po            | 211 ++++++++----
 locale/pt_BR/LC_MESSAGES/statusnet.po         | 211 ++++++++----
 locale/ru/LC_MESSAGES/statusnet.po            | 218 ++++++++-----
 locale/statusnet.pot                          | 186 +++++++----
 locale/sv/LC_MESSAGES/statusnet.po            | 211 ++++++++----
 locale/te/LC_MESSAGES/statusnet.po            | 211 ++++++++----
 locale/tr/LC_MESSAGES/statusnet.po            | 211 ++++++++----
 locale/uk/LC_MESSAGES/statusnet.po            | 221 ++++++++-----
 locale/vi/LC_MESSAGES/statusnet.po            | 205 ++++++++----
 locale/zh_CN/LC_MESSAGES/statusnet.po         | 215 ++++++++-----
 plugins/Awesomeness/locale/Awesomeness.pot    |   4 +-
 .../be-tarask/LC_MESSAGES/Awesomeness.po      |  11 +-
 .../locale/fr/LC_MESSAGES/Awesomeness.po      |  11 +-
 .../locale/ia/LC_MESSAGES/Awesomeness.po      |  11 +-
 .../locale/mk/LC_MESSAGES/Awesomeness.po      |  11 +-
 .../locale/nl/LC_MESSAGES/Awesomeness.po      |  11 +-
 .../locale/ru/LC_MESSAGES/Awesomeness.po      |  11 +-
 .../locale/uk/LC_MESSAGES/Awesomeness.po      |  11 +-
 .../locale/nl/LC_MESSAGES/Bookmark.po         |  36 +++
 plugins/Disqus/locale/Disqus.pot              |  14 +-
 .../locale/be-tarask/LC_MESSAGES/Disqus.po    |  20 +-
 .../Disqus/locale/br/LC_MESSAGES/Disqus.po    |  20 +-
 .../Disqus/locale/de/LC_MESSAGES/Disqus.po    |  20 +-
 .../Disqus/locale/es/LC_MESSAGES/Disqus.po    |  20 +-
 .../Disqus/locale/fr/LC_MESSAGES/Disqus.po    |  20 +-
 .../Disqus/locale/gl/LC_MESSAGES/Disqus.po    |  20 +-
 .../Disqus/locale/ia/LC_MESSAGES/Disqus.po    |  20 +-
 .../Disqus/locale/lb/LC_MESSAGES/Disqus.po    |  20 +-
 .../Disqus/locale/mk/LC_MESSAGES/Disqus.po    |  20 +-
 .../Disqus/locale/nb/LC_MESSAGES/Disqus.po    |  20 +-
 .../Disqus/locale/nl/LC_MESSAGES/Disqus.po    |  20 +-
 .../Disqus/locale/ru/LC_MESSAGES/Disqus.po    |  20 +-
 .../Disqus/locale/te/LC_MESSAGES/Disqus.po    |  20 +-
 .../Disqus/locale/tl/LC_MESSAGES/Disqus.po    |  20 +-
 .../Disqus/locale/uk/LC_MESSAGES/Disqus.po    |  20 +-
 .../Disqus/locale/zh_CN/LC_MESSAGES/Disqus.po |  20 +-
 .../locale/nl/LC_MESSAGES/Facebook.po         |  10 +-
 .../NewMenu/locale/nl/LC_MESSAGES/NewMenu.po  |  98 ++++++
 plugins/SQLProfile/locale/SQLProfile.pot      |   4 +-
 .../locale/nl/LC_MESSAGES/SQLProfile.po       |  27 ++
 .../Sitemap/locale/ia/LC_MESSAGES/Sitemap.po  |  12 +-
 72 files changed, 6302 insertions(+), 3162 deletions(-)
 create mode 100644 plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po
 create mode 100644 plugins/NewMenu/locale/nl/LC_MESSAGES/NewMenu.po
 create mode 100644 plugins/SQLProfile/locale/nl/LC_MESSAGES/SQLProfile.po

diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po
index e2ccd61446..4b004e3c3c 100644
--- a/locale/af/LC_MESSAGES/statusnet.po
+++ b/locale/af/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:31:28+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34:31+0000\n"
 "Language-Team: Afrikaans <http://translatewiki.net/wiki/Portal:af>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: af\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -958,9 +958,10 @@ msgstr "U kan nie u eie kennisgewings herhaal nie."
 msgid "Already repeated that notice."
 msgstr "U het reeds die kennisgewing herhaal."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
@@ -1285,21 +1286,26 @@ msgstr "Die API-funksie is nie gevind nie."
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "Die lêer bestaan nie."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "U volg hierdie gebruiker:"
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr ""
 "Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
 
@@ -1394,14 +1400,16 @@ msgid "Preview"
 msgstr "Voorskou"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. TRANS: Button text for user account deletion.
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Skrap"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1683,58 +1691,75 @@ msgstr "Gesprek"
 msgid "Notices"
 msgstr "Kennisgewings"
 
-#: actions/deleteaccount.php:72
+#. 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 "U kan nie gebruikers verwyder nie."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. TRANS: Confirmation that a user account has been deleted.
+#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "Die avatar is verwyder."
 
+#. TRANS: Page title for page on which a user account can be deleted.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Skep 'n gebruiker"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Bevestig"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "U kan nie gebruikers verwyder nie."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
-msgstr ""
+#. TRANS: Button title for user account deletion.
+#: actions/deleteaccount.php:323
+#, fuzzy
+msgid "Permanently delete your account"
+msgstr "U kan nie gebruikers verwyder nie."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 #: actions/deleteapplication.php:62
@@ -4248,7 +4273,8 @@ msgstr "Kon nie gebruiker opdateer nie."
 msgid "Settings saved."
 msgstr "Voorkeure is gestoor."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Skep 'n gebruiker"
@@ -4760,85 +4786,88 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Opdaterings van %1$s op %2$s."
 
-#: actions/restoreaccount.php:79
+#. 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 "Dit was nie moontlik om die applikasie te skep nie."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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 "Oplaai"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr ""
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "Alle lede"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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 "Oplaai"
@@ -6868,20 +6897,57 @@ msgstr "Voor"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 "Onbekende taal \"%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 ""
 
-#: lib/activityimporter.php:133
+#. 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 "Kon nie gebruikersdata opdateer nie."
+
+#. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
+#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "Onbekende lêertipe"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 "U is reeds 'n lid van die groep."
+
+#. 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 "U kan nie u eie kennisgewings herhaal nie."
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7181,13 +7247,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Verwyder"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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 "Moenie hierdie kennisgewing verwyder nie"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7721,6 +7789,11 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "Vriende van vriende (FOAF)"
 
+#: lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Alle lede"
+
 #: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
@@ -8959,10 +9032,8 @@ msgstr "Ongeldige grootte."
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "Foto"
-
-#, fuzzy
-#~ msgid "No user specified; using backup user."
-#~ msgstr "Geen groep verskaf nie."
+#. 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 ""
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index 4af3e36a6a..2c4a22665d 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -11,19 +11,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:31:29+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34:32+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 (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
 "2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
 "99) ? 4 : 5 ) ) ) );\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -979,9 +979,10 @@ msgstr "لا يمكنك تكرار ملحوظتك الخاصة."
 msgid "Already repeated that notice."
 msgstr "كرر بالفعل هذه الملاحظة."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
@@ -1312,21 +1313,26 @@ msgstr "لم يتم العثور على وسيلة API."
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "لا ملف كهذا."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "لست مُشتركًا بأي أحد."
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "تعذّر حفظ الاشتراك."
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1419,14 +1425,16 @@ msgid "Preview"
 msgstr "معاينة"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1706,59 +1714,76 @@ msgstr "محادثة"
 msgid "Notices"
 msgstr "الإشعارات"
 
-#: actions/deleteaccount.php:72
+#. 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 "لا يمكنك حذف المستخدمين."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "أنشئ حسابًا"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "أكّد"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "لا يمكنك حذف المستخدمين."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently 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
@@ -4274,7 +4299,8 @@ msgstr "تعذّر حفظ الوسوم."
 msgid "Settings saved."
 msgstr "حُفظت الإعدادات."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "أنشئ حسابًا"
@@ -4771,86 +4797,89 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "الردود على %1$s، الصفحة %2$d"
 
-#: actions/restoreaccount.php:79
+#. 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 "يجب أن تكون مسجل الدخول لتسجل تطبيقا."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr ""
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "جميع الأعضاء"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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 "ارفع ملفًا"
@@ -6872,20 +6901,57 @@ msgstr "قبل"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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 "نوع ملف غير معروف"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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 "ابحث عن محتويات في الإشعارات"
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7176,13 +7242,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "أزل"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7762,6 +7830,11 @@ msgstr "أتوم"
 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 ""
@@ -9039,10 +9112,8 @@ msgstr "حجم غير صالح."
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "صورة"
-
-#, fuzzy
-#~ msgid "No user specified; using backup user."
-#~ 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 ""
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index e291d49190..ae0912c5b0 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:31:31+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34:33+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 (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: arz\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -987,9 +987,10 @@ msgstr "مش نافعه تتكرر الملاحظتك بتاعتك."
 msgid "Already repeated that notice."
 msgstr "الملاحظه اتكررت فعلا."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
@@ -1323,21 +1324,26 @@ msgstr "الـ API method مش موجوده."
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "لا ملف كهذا."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "لست مُشتركًا بأى أحد."
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "تعذّر حفظ الاشتراك."
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1430,14 +1436,16 @@ msgid "Preview"
 msgstr "عاين"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1720,59 +1728,76 @@ msgstr "محادثة"
 msgid "Notices"
 msgstr "الإشعارات"
 
-#: actions/deleteaccount.php:72
+#. 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 "لا يمكنك حذف المستخدمين."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "أنشئ مجموعه جديدة"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "أكّد"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "لا يمكنك حذف المستخدمين."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently 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
@@ -4303,7 +4328,8 @@ msgstr "تعذّر حفظ الوسوم."
 msgid "Settings saved."
 msgstr "حُفظت الإعدادات."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "أنشئ مجموعه جديدة"
@@ -4800,86 +4826,89 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "أهلا بكم فى %1$s يا @%2$s!"
 
-#: actions/restoreaccount.php:79
+#. 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."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr ""
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "جميع الأعضاء"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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 "ارفع ملفًا"
@@ -6924,20 +6953,57 @@ msgstr "قبل"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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 "نوع ملف غير معروف"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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 "ابحث عن محتويات فى الإشعارات"
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7236,13 +7302,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "استرجع"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7787,6 +7855,11 @@ msgstr "أتوم"
 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 ""
@@ -9046,10 +9119,8 @@ msgstr "حجم غير صالح."
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "صورة"
-
-#, fuzzy
-#~ msgid "No user specified; using backup user."
-#~ msgstr "ما فيش ID متحدد لليوزر."
+#. 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 ""
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 4a710964e5..024dae0acc 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:31:33+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34:34+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 (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: bg\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -960,9 +960,10 @@ msgstr "Не можете да повтаряте собствени бележ
 msgid "Already repeated that notice."
 msgstr "Вече сте повторили тази бележка."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
@@ -1284,21 +1285,26 @@ msgstr "Не е открит методът в API."
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "Няма такъв профил."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "Не сте абонирани за този профил"
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "Грешка при добавяне на нов абонамент."
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1392,14 +1398,16 @@ msgid "Preview"
 msgstr "Преглед"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1679,59 +1687,76 @@ msgstr "Разговор"
 msgid "Notices"
 msgstr "Бележки"
 
-#: actions/deleteaccount.php:72
+#. 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 "Не можете да изтривате потребители."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Създаване на нова сметка"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Потвърждаване"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "Не можете да изтривате потребители."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently 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
@@ -4299,7 +4324,8 @@ msgstr "Грешка при запазване етикетите."
 msgid "Settings saved."
 msgstr "Настройките са запазени."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Създаване на нова сметка"
@@ -4813,86 +4839,89 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Отговори до %1$s в %2$s!"
 
-#: actions/restoreaccount.php:79
+#. 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 "Не сте собственик на това приложение."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Системна грешка при качване на файл."
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "Всички членове"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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 "Качване на файл"
@@ -6912,20 +6941,57 @@ msgstr "Преди"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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 "Неподдържан вид файл"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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 "Търсене в съдържанието на бележките"
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7222,13 +7288,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Премахване"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7760,6 +7828,11 @@ msgstr "Atom"
 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 ""
@@ -8983,10 +9056,8 @@ msgstr "Неправилен размер."
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "Снимка"
-
-#, fuzzy
-#~ msgid "No user specified; using backup user."
-#~ 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 ""
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 52395c6a46..186a2a5670 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:31:38+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34:35+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 (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -960,9 +960,10 @@ msgstr "Ne c'helloc'h ket adlavar ho alioù."
 msgid "Already repeated that notice."
 msgstr "Kemenn bet adkemeret dija."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
@@ -1285,21 +1286,26 @@ msgstr "N'eo ket bet kavet an hentenn API !"
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "N'eus ket eus ar profil-se."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "N'oc'h ket koumanantet d'ar profil-se."
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "Dibosupl eo dilemel ar c'houmanant."
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1392,13 +1398,15 @@ msgid "Preview"
 msgstr "Rakwelet"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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ñ"
@@ -1675,59 +1683,76 @@ msgstr "Kaozeadenn"
 msgid "Notices"
 msgstr "Ali"
 
-#: actions/deleteaccount.php:72
+#. 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 "N'eus nemet an implijerien kevreet hag a c'hell adkemer alioù."
 
+#. 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'hallit ket diverkañ implijerien."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. TRANS: Confirmation that a user account has been deleted.
+#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "Dilammet eo bet an Avatar."
 
+#. TRANS: Page title for page on which a user account can be deleted.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Krouiñ ur gont"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Kadarnaat"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "N'hallit ket diverkañ implijerien."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
-msgstr ""
+#. TRANS: Button title for user account deletion.
+#: actions/deleteaccount.php:323
+#, fuzzy
+msgid "Permanently delete your account"
+msgstr "N'hallit ket diverkañ implijerien."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 #: actions/deleteapplication.php:62
@@ -4241,7 +4266,8 @@ msgstr "Dibosupl eo enrollañ ar balizennoù."
 msgid "Settings saved."
 msgstr "Enrollet eo bet an arventennoù."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Krouiñ ur gont"
@@ -4749,86 +4775,89 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Respontoù da %1$s war %2$s !"
 
-#: actions/restoreaccount.php:79
+#. 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."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr ""
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "An holl izili"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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"
@@ -6825,20 +6854,57 @@ msgstr "Kent"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 "Yezh \"%s\" dizanv."
+
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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 "Klask alioù en danvez"
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7121,13 +7187,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Disteuler"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7658,6 +7726,11 @@ msgstr "Atom"
 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 ""
@@ -8882,10 +8955,8 @@ msgstr "Ment direizh."
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "Skeudenn"
-
-#, fuzzy
-#~ msgid "No user specified; using backup user."
-#~ msgstr "N'eus bet diferet ID implijer ebet."
+#. 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 ""
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index 1c71bbb421..7d05968301 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:31:46+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34:37+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 (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -975,9 +975,10 @@ msgstr "No podeu repetir els vostres propis avisos."
 msgid "Already repeated that notice."
 msgstr "Avís duplicat."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "El mètode HTTP no està implementat."
@@ -1286,20 +1287,26 @@ msgstr "El mètode no està implementat"
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, php-format
 msgid "No such profile id: %d"
 msgstr "No existeix l'id de perfil: %d"
 
-#: actions/atompubshowsubscription.php:90
-#, php-format
-msgid "Profile %d not subscribed to profile %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 "El perfil %d no està subscrit al perfil %d"
 
-#: actions/atompubshowsubscription.php:154
-msgid "Can't delete someone else's subscription"
+#. 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 es pot eliminar la subscripció d'algú altre"
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1393,13 +1400,15 @@ msgid "Preview"
 msgstr "Vista prèvia"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1679,59 +1688,76 @@ msgstr "Conversa"
 msgid "Notices"
 msgstr "Avisos"
 
-#: actions/deleteaccount.php:72
+#. 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 "Només els usuaris que han iniciat una sessió poden enviar avisos."
 
+#. 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 podeu eliminar els usuaris."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. TRANS: Confirmation that a user account has been deleted.
+#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "S'ha eliminat l'avatar."
 
+#. TRANS: Page title for page on which a user account can be deleted.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Crea un compte"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Confirma"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "No podeu eliminar els usuaris."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
-msgstr ""
+#. TRANS: Button title for user account deletion.
+#: actions/deleteaccount.php:323
+#, fuzzy
+msgid "Permanently delete your account"
+msgstr "No podeu eliminar els usuaris."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 #: actions/deleteapplication.php:62
@@ -4285,7 +4311,8 @@ msgstr "No s'han pogut desar les etiquetes."
 msgid "Settings saved."
 msgstr "S'ha desat la configuració."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Crea un compte"
@@ -4822,30 +4849,34 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Respostes a %1$s el %2$s!"
 
-#: actions/restoreaccount.php:79
+#. 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 "Només els usuaris que han iniciat una sessió poden enviar avisos."
 
+#. 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 "No teniu cap aplicació registrada encara."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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 "Puja un fitxer"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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."
@@ -4854,58 +4885,57 @@ msgstr ""
 "en el formulari HTML."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Error del sistema en pujar el fitxer."
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr "Es recupera la còpia de seguretat del fitxer '%s'."
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "No és un membre"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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 "Puja un fitxer"
@@ -6965,20 +6995,57 @@ msgstr ""
 "S'esperava un element del canal arrel, però se n'ha obtingut tot un document "
 "XML sencer."
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 "Llengua desconeguda «%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 ""
 
-#: lib/activityimporter.php:133
+#. 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 "Especifiqueu el nom de l'usuari al qual voleu subscriure-us."
+
+#. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
+#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "Perfil desconegut %s"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 "Ja sou membre del grup."
+
+#. 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 "No hi ha contingut de l'avís %d"
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7262,13 +7329,16 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revoca"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+#, fuzzy
+msgid "Author element must contain a name element."
 msgstr "l'element autor ha de contenir un element nom."
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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 eliminis aquest grup"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7821,6 +7891,11 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "No és un membre"
+
 #: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
@@ -9133,13 +9208,8 @@ msgstr "L'XML no és vàlid."
 msgid "Invalid XML, missing XRD root."
 msgstr "L'XML no és vàlid, hi manca l'arrel XRD."
 
-#~ msgid "Post"
-#~ msgstr "Enviament"
-
-#~ msgid "No user specified; using backup user."
-#~ msgstr "No s'ha especificat cap usuari; s'utilitza l'usuari de reserva."
-
-#~ msgid "%d entry in backup."
-#~ msgid_plural "%d entries in backup."
-#~ msgstr[0] "%d entrada a la còpia de seguretat."
-#~ msgstr[1] "%d entrades a la còpia de seguretat."
+#. 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'."
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 54062efb31..a299248211 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:31:50+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34:38+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 (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: cs\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n >= 2 && n <= 4) ? 1 : "
 "2 );\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -980,9 +980,10 @@ msgstr "Nelze opakovat své vlastní oznámení."
 msgid "Already repeated that notice."
 msgstr "Již jste zopakoval toto oznámení."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
@@ -1307,21 +1308,26 @@ msgstr " API metoda nebyla nalezena."
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "Žádný takový profil."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "Nejste přihlášen k tomuto profilu."
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "Nelze smazat odebírání sebe sama"
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1414,14 +1420,16 @@ msgid "Preview"
 msgstr "Náhled"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. TRANS: Button text for user account deletion.
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Odstranit"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1703,59 +1711,76 @@ msgstr "Konverzace"
 msgid "Notices"
 msgstr "Sdělení"
 
-#: actions/deleteaccount.php:72
+#. 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."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Zaregistrujte se"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Potvrdit"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "Nemůžete odstranit uživatele."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
-msgstr ""
+#. 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
@@ -4324,7 +4349,8 @@ msgstr "Nelze uložit tagy."
 msgid "Settings saved."
 msgstr "Nastavení uloženo"
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Zaregistrujte se"
@@ -4852,29 +4878,33 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Odpovědi na %1$s na %2$s!"
 
-#: actions/restoreaccount.php:79
+#. 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."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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."
@@ -4883,58 +4913,57 @@ msgstr ""
 "uvedeno v HTML formuláři."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Chyba systému při nahrávání souboru"
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "Všichni členové"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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"
@@ -6980,20 +7009,57 @@ msgstr "Před"
 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."
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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í"
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7278,13 +7344,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Obnovit"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7847,6 +7915,11 @@ msgstr "Atom"
 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 ""
@@ -9169,10 +9242,8 @@ msgstr "Neplatná velikost"
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "Fotka"
-
-#, fuzzy
-#~ msgid "No user specified; using backup user."
-#~ msgstr "Nebylo zadáno uživatelské ID."
+#. 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 ""
diff --git a/locale/da/LC_MESSAGES/statusnet.po b/locale/da/LC_MESSAGES/statusnet.po
index 720d70c260..763a419712 100644
--- a/locale/da/LC_MESSAGES/statusnet.po
+++ b/locale/da/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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:31:52+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34:39+0000\n"
 "Language-Team: Danish <http://translatewiki.net/wiki/Portal:da>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: da\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -954,9 +954,10 @@ msgstr "Kan ikke gentage din egen meddelelse."
 msgid "Already repeated that notice."
 msgstr "Allerede gentaget denne medelelse."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr ""
@@ -1272,21 +1273,26 @@ msgstr ""
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "Ingen sådan fil."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "Du er ikke medlem af denne gruppe."
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "Kunne ikke slette favorit."
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1380,13 +1386,15 @@ msgid "Preview"
 msgstr "Forhåndsvisning"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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 ""
@@ -1663,58 +1671,75 @@ msgstr "Samtale"
 msgid "Notices"
 msgstr "Bekendtgørelser"
 
-#: actions/deleteaccount.php:72
+#. 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 "Du kan ikke slette brugere."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Slet program"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Bekræft"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "Du kan ikke slette brugere."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
-msgstr ""
+#. TRANS: Button title for user account deletion.
+#: actions/deleteaccount.php:323
+#, fuzzy
+msgid "Permanently delete your account"
+msgstr "Du kan ikke slette brugere."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 #: actions/deleteapplication.php:62
@@ -4259,7 +4284,8 @@ msgstr "Kunne ikke opdatere brugeren."
 msgid "Settings saved."
 msgstr "Valg gemt."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr ""
 
@@ -4774,84 +4800,87 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Opdateringer markeret som favorit af %1$s på %2$s!"
 
-#: actions/restoreaccount.php:79
+#. 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 "Du har ikke registreret nogen programmer endnu."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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 "Oplægge"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr ""
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
+msgid "Not an Atom feed."
 msgstr ""
 
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
-msgid "Not an atom feed."
-msgstr ""
-
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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 "Oplægge"
@@ -6911,20 +6940,57 @@ msgstr ""
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 "Brugeren har ingen profil."
+
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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 opdatere bruger oplysninger."
+
+#. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
+#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "Brugeren har ingen profil."
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 af denne gruppe."
+
+#. 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 "Kan ikke gentage din egen meddelelse."
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7218,13 +7284,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Fjern"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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 "Slet ikke denne meddelelse"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7748,6 +7816,10 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#: lib/feedimporter.php:75
+msgid "Not an atom feed."
+msgstr ""
+
 #: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
@@ -8986,3 +9058,9 @@ msgstr ""
 #: lib/xrd.php:69
 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 ""
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index f8cf8e6cbc..763be8a28e 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -19,17 +19,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:31:53+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34: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-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -982,9 +982,10 @@ msgstr "Du kannst deine eigenen Nachrichten nicht wiederholen."
 msgid "Already repeated that notice."
 msgstr "Nachricht bereits wiederholt"
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTTP-Methode wird nicht unterstützt."
@@ -1304,21 +1305,26 @@ msgstr "Methode wird nicht unterstützt"
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, php-format
 msgid "No such profile id: %d"
 msgstr "Keine Profil-Id: %d"
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "Du hast dieses Profil nicht abonniert."
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "Konnte Selbst-Abonnement nicht löschen."
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1412,13 +1418,15 @@ msgid "Preview"
 msgstr "Vorschau"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1697,59 +1705,76 @@ msgstr "Unterhaltung"
 msgid "Notices"
 msgstr "Nachrichten"
 
-#: actions/deleteaccount.php:72
+#. 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
 #, fuzzy
 msgid "You cannot delete your account."
 msgstr "Du kannst keine Benutzer löschen."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. TRANS: Confirmation that a user account has been deleted.
+#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "Avatar gelöscht."
 
+#. TRANS: Page title for page on which a user account can be deleted.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Neues Benutzerkonto erstellen"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "Du kannst keine Benutzer löschen."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
-msgstr ""
+#. 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
@@ -4310,7 +4335,8 @@ msgstr "Konnte Tags nicht speichern."
 msgid "Settings saved."
 msgstr "Einstellungen gespeichert."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Neues Benutzerkonto erstellen"
@@ -4850,30 +4876,34 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Antworten an %1$s auf %2$s!"
 
-#: actions/restoreaccount.php:79
+#. 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"
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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."
@@ -4882,58 +4912,57 @@ msgstr ""
 "die im HTML-Formular angegeben wurde."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Systemfehler beim Hochladen der Datei."
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr "Hole Backup von der Datei „%s“."
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "Kein Mitglied"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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 "Datei hochladen"
@@ -6994,20 +7023,57 @@ msgstr "Vorher"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Root-Element eines Feeds erwartet, aber ganzes XML-Dokument erhalten."
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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."
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7289,13 +7355,16 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Widerrufen"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+#, fuzzy
+msgid "Author element must contain a name element."
 msgstr "Das „author“-Element muss ein „name“-Element erhaten."
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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 "Diese Gruppe nicht löschen"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7846,6 +7915,11 @@ msgstr "Atom"
 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 ""
@@ -9162,14 +9236,8 @@ msgstr "Ungültiges XML."
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "Foto"
-
-#~ msgid "No user specified; using backup user."
-#~ msgstr "Kein Benutzer angegeben; hole Backup-Benutzer."
-
-#~ msgid "%d entry in backup."
-#~ msgid_plural "%d entries in backup."
-#~ msgstr[0] "Ein Eintrag im Backup."
-#~ msgstr[1] "%d Einträge im Backup."
+#. 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“."
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 27fbcb5784..e4634df86c 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:31:55+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34:41+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 (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: en-gb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -971,9 +971,10 @@ msgstr "Cannot repeat your own notice."
 msgid "Already repeated that notice."
 msgstr "Already repeated that notice."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
@@ -1295,21 +1296,26 @@ msgstr "API method not found."
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "No such profile."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "You are not subscribed to that profile."
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "Could not delete self-subscription."
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1402,14 +1408,16 @@ msgid "Preview"
 msgstr "Preview"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. TRANS: Button text for user account deletion.
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Delete"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1691,59 +1699,76 @@ msgstr "Conversation"
 msgid "Notices"
 msgstr "Notices"
 
-#: actions/deleteaccount.php:72
+#. 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."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Create an account"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Confirm"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "You cannot delete users."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
-msgstr ""
+#. 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
@@ -4287,7 +4312,8 @@ msgstr "Couldn't save tags."
 msgid "Settings saved."
 msgstr "Settings saved."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Create an account"
@@ -4811,86 +4837,89 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Replies to %1$s on %2$s!"
 
-#: actions/restoreaccount.php:79
+#. 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."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "System error uploading file."
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "All members"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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"
@@ -6906,20 +6935,57 @@ msgstr "Before"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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"
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7201,13 +7267,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revoke"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7753,6 +7821,11 @@ msgstr ""
 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 ""
@@ -8969,9 +9042,8 @@ msgstr "Invalid size."
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "Photo"
-
-#~ msgid "No user specified; using backup user."
-#~ msgstr "No user specified; using backup user."
+#. 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 ""
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index 54af3721c3..1b69f13b35 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:31:57+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34:42+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 (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: eo\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -971,9 +971,10 @@ msgstr "Vi ne povas ripeti vian propran avizon."
 msgid "Already repeated that notice."
 msgstr "La avizo jam ripetiĝis."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
@@ -1299,21 +1300,26 @@ msgstr "Metodo de API ne troviĝas."
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "Ne ekzistas tia profilo."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "Vi ne abonis tiun profilon."
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "Ne eblas forigi abonon al vi mem."
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1406,14 +1412,16 @@ msgid "Preview"
 msgstr "Antaŭrigardo"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. TRANS: Button text for user account deletion.
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Forigi"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1694,59 +1702,76 @@ msgstr "Konversacio"
 msgid "Notices"
 msgstr "Avizoj"
 
-#: actions/deleteaccount.php:72
+#. 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."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Krei konton"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Konfirmi"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "Vi ne povas forigi uzantojn."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
-msgstr ""
+#. 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
@@ -4278,7 +4303,8 @@ msgstr "Malsukcesis konservi markilojn."
 msgid "Settings saved."
 msgstr "Agordo konservitas."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Krei konton"
@@ -4804,30 +4830,34 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Respondoj al %1$s ĉe %2$s!"
 
-#: actions/restoreaccount.php:79
+#. 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."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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."
@@ -4836,58 +4866,57 @@ msgstr ""
 "difinitan per HTML formo."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Sisteme eraris alŝuti dosieron."
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "Ĉiuj grupanoj"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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"
@@ -6911,20 +6940,57 @@ msgstr "Antaŭe"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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"
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7206,13 +7272,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revoki"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7773,6 +7841,11 @@ msgstr "Atom"
 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 ""
@@ -9085,10 +9158,8 @@ msgstr "Grando nevalida."
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "Foto"
-
-#, fuzzy
-#~ msgid "No user specified; using backup user."
-#~ msgstr "Neniu uzanto-ID specifiĝas."
+#. 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 ""
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index b58a46ce19..e0fe7a83df 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -16,17 +16,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:31:58+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34:43+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 (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -980,9 +980,10 @@ msgstr "No puedes repetir tus propios mensajes"
 msgid "Already repeated that notice."
 msgstr "Este mensaje ya se ha repetido."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
@@ -1306,21 +1307,26 @@ msgstr "Método de API no encontrado."
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "No existe tal perfil."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "No te has suscrito a ese perfil."
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "No se pudo eliminar la auto-suscripción."
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1413,14 +1419,16 @@ msgid "Preview"
 msgstr "Vista previa"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. TRANS: Button text for user account deletion.
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Borrar"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1703,59 +1711,76 @@ msgstr "Conversación"
 msgid "Notices"
 msgstr "Mensajes"
 
-#: actions/deleteaccount.php:72
+#. 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."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. TRANS: Confirmation that a user account has been deleted.
+#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "Imagen borrada."
 
+#. TRANS: Page title for page on which a user account can be deleted.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Crear una cuenta"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "No puedes borrar usuarios."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
-msgstr ""
+#. TRANS: Button title for user account deletion.
+#: actions/deleteaccount.php:323
+#, fuzzy
+msgid "Permanently delete your account"
+msgstr "No puedes borrar usuarios."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 #: actions/deleteapplication.php:62
@@ -4339,7 +4364,8 @@ msgstr "No se pudo guardar las etiquetas."
 msgid "Settings saved."
 msgstr "Se guardó configuración."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Crear una cuenta"
@@ -4885,29 +4911,33 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Respuestas a %1$s en %2$s!"
 
-#: actions/restoreaccount.php:79
+#. 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."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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."
@@ -4916,58 +4946,57 @@ msgstr ""
 "el formulario HTML."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Error del sistema subir el archivo"
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "Todos los miembros"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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"
@@ -7032,20 +7061,57 @@ msgstr ""
 "A espera de un elemento de alimentación de raíz, pero se obtuvo un documento "
 "XML entero."
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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"
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7330,13 +7396,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revocar"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7899,6 +7967,11 @@ msgstr "Atom"
 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 ""
@@ -9221,10 +9294,8 @@ msgstr "Tamaño inválido."
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "Foto"
-
-#, fuzzy
-#~ msgid "No user specified; using backup user."
-#~ msgstr "No se ha especificado ID de usuario."
+#. 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 ""
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index 59588dee35..01c7edf568 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:00+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34:45+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 (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -972,9 +972,10 @@ msgstr "نمی توانید پیام خود را تکرار کنید."
 msgid "Already repeated that notice."
 msgstr "قبلا آن پیام تکرار شده است."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
@@ -1295,21 +1296,26 @@ msgstr "رابط مورد نظر پیدا نشد."
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "چنین نمایه‌ای وجود ندارد."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "شما مشترک آن نمایه نیستید."
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "نمی‌توان اشتراک را ذخیره کرد."
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1403,14 +1409,16 @@ msgid "Preview"
 msgstr "پیش‌نمایش"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1694,59 +1702,76 @@ msgstr "مکالمه"
 msgid "Notices"
 msgstr "پیام‌ها"
 
-#: actions/deleteaccount.php:72
+#. 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 "شما نمی‌توانید کاربران را پاک کنید."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "ساختن یک جساب‌کاربری"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "تایید"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "شما نمی‌توانید کاربران را پاک کنید."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently 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
@@ -4306,7 +4331,8 @@ msgstr "نمی‌توان نشان را ذخیره کرد."
 msgid "Settings saved."
 msgstr "تنظیمات ذخیره شد."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "ساختن یک جساب‌کاربری"
@@ -4835,86 +4861,89 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "پاسخ‌های به %1$s در %2$s!"
 
-#: actions/restoreaccount.php:79
+#. 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 "شما هنوز هیچ برنامه‌ای را ثبت نکرده‌اید."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "هنگام بارگذاری پرونده خطای سیستمی رخ داد."
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "همهٔ اعضا"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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 "بارگذاری پرونده"
@@ -6958,20 +6987,57 @@ msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 "در حال انتظار برای یک عامل خوراک ریشه‌ای، اما یک سند XML کامل دریافت شد."
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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 "نوع فایل پشتیبانی نشده"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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 "پیدا کردن محتوای پیام‌ها"
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7254,13 +7320,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "لغو کردن"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7820,6 +7888,11 @@ msgstr "مؤلف"
 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 ""
@@ -9120,10 +9193,8 @@ msgstr "اندازه نادرست است."
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "تصویر"
-
-#, fuzzy
-#~ msgid "No user specified; using backup user."
-#~ 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 ""
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 7f78676be0..6d6904e95a 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -14,17 +14,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:01+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34:46+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 (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -977,9 +977,10 @@ msgstr "Ilmoituksia ei voi pistää päälle."
 msgid "Already repeated that notice."
 msgstr "Tätä päivitystä ei voi poistaa."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
@@ -1303,21 +1304,26 @@ msgstr "API-metodia ei löytynyt."
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "Tiedostoa ei ole."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "Tilausta ei onnistuttu tallentamaan."
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1410,13 +1416,15 @@ msgid "Preview"
 msgstr "Esikatselu"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1696,59 +1704,76 @@ msgstr "Keskustelu"
 msgid "Notices"
 msgstr "Päivitykset"
 
-#: actions/deleteaccount.php:72
+#. 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
 #, fuzzy
 msgid "You cannot delete your account."
 msgstr "Sinä et voi poistaa käyttäjiä."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. TRANS: Confirmation that a user account has been deleted.
+#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "Kuva poistettu."
 
+#. TRANS: Page title for page on which a user account can be deleted.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Luo uusi ryhmä"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Vahvista"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "Sinä et voi poistaa käyttäjiä."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
-msgstr ""
+#. TRANS: Button title for user account deletion.
+#: actions/deleteaccount.php:323
+#, fuzzy
+msgid "Permanently delete your account"
+msgstr "Sinä et voi poistaa käyttäjiä."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 #: actions/deleteapplication.php:62
@@ -4358,7 +4383,8 @@ msgstr "Tageja ei voitu tallentaa."
 msgid "Settings saved."
 msgstr "Asetukset tallennettu."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Luo uusi ryhmä"
@@ -4895,86 +4921,89 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Viesti käyttäjälle %1$s, %2$s"
 
-#: actions/restoreaccount.php:79
+#. 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."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Tiedoston lähetyksessä tapahtui järjestelmävirhe."
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "Kaikki jäsenet"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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"
@@ -7030,20 +7059,57 @@ msgstr "Aiemmin"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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ä"
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7345,13 +7411,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Poista"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7881,6 +7949,11 @@ msgstr "Atom"
 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 ""
@@ -9129,10 +9202,8 @@ msgstr "Koko ei kelpaa."
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "Kuva"
-
-#, fuzzy
-#~ msgid "No user specified; using backup user."
-#~ msgstr "Ryhmää ei ole määritelty."
+#. 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 ""
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index a538a77536..4a62098d98 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:02+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34: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-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -986,9 +986,10 @@ msgstr "Vous ne pouvez pas reprendre votre propre avis."
 msgid "Already repeated that notice."
 msgstr "Vous avez déjà repris cet avis."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "Méthode HTTP non trouvée !"
@@ -1318,21 +1319,26 @@ msgstr "Méthode HTTP non trouvée !"
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "Profil non-trouvé."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "Vous n’êtes pas abonné(e) à ce profil."
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "Impossible de supprimer l’abonnement à soi-même."
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1428,13 +1434,15 @@ msgid "Preview"
 msgstr "Aperçu"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1712,59 +1720,76 @@ msgstr "Conversation"
 msgid "Notices"
 msgstr "Avis"
 
-#: actions/deleteaccount.php:72
+#. 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."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Créer un compte"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Confirmer"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "Vous ne pouvez pas supprimer des utilisateurs."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
-msgstr ""
+#. 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
@@ -4333,7 +4358,8 @@ msgstr "Impossible d’enregistrer les marques."
 msgid "Settings saved."
 msgstr "Préférences enregistrées."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Créer un compte"
@@ -4878,28 +4904,32 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Réponses à %1$s sur %2$s !"
 
-#: actions/restoreaccount.php:79
+#. 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."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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."
@@ -4908,58 +4938,57 @@ msgstr ""
 "le formulaire HTML."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Erreur système lors du transfert du fichier."
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr "Obtention de la sauvegarde depuis le fichier « %s »."
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "Tous les membres"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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"
@@ -7031,20 +7060,57 @@ msgstr "Avant"
 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."
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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"
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7330,13 +7396,16 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Révoquer"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+#, fuzzy
+msgid "Author element must contain a name element."
 msgstr "l’élément « author » doit contenir un élément « name »."
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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 pas supprimer ce groupe"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7896,6 +7965,11 @@ msgstr "Atom"
 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 ""
@@ -9223,15 +9297,8 @@ msgstr "XML invalide."
 msgid "Invalid XML, missing XRD root."
 msgstr "XML invalide, racine XRD manquante."
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "Photo"
-
-#~ msgid "No user specified; using backup user."
-#~ msgstr ""
-#~ "Aucun utilisateur spécifié ; utilisation de l’utilisateur de secours."
-
-#~ msgid "%d entry in backup."
-#~ msgid_plural "%d entries in backup."
-#~ msgstr[0] "%d entrée dans la sauvegarde."
-#~ msgstr[1] "%d entrées dans la sauvegarde."
+#. 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 »."
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index d6edd2193d..e91f62d901 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -9,18 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:04+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34:48+0000\n"
 "Language-Team: Irish <http://translatewiki.net/wiki/Portal:ga>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ga\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=5; plural=(n == 1) ? 0 : ( (n == 2) ? 1 : ( (n < 7) ? "
 "2 : ( (n < 11) ? 3 : 4 ) ) );\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -990,9 +990,10 @@ msgstr "Non se pode activar a notificación."
 msgid "Already repeated that notice."
 msgstr "Non se pode eliminar este chíos."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
@@ -1321,21 +1322,26 @@ msgstr "Método da API non atopado"
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "Ningún chío."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "Non estás suscrito a ese perfil"
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "Non se pode gardar a subscrición."
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1428,14 +1434,16 @@ msgid "Preview"
 msgstr ""
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. TRANS: Button text for user account deletion.
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Eliminar chío"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1725,59 +1733,76 @@ msgstr "Código de confirmación."
 msgid "Notices"
 msgstr "Chíos"
 
-#: actions/deleteaccount.php:72
+#. 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ó o usuario pode ler os seus propios buzóns."
 
+#. 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 se puido actualizar o usuario."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. TRANS: Confirmation that a user account has been deleted.
+#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "Avatar actualizado."
 
+#. TRANS: Page title for page on which a user account can be deleted.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Crear nova conta"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "Non se puido actualizar o usuario."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
-msgstr ""
+#. TRANS: Button title for user account deletion.
+#: actions/deleteaccount.php:323
+#, fuzzy
+msgid "Permanently delete your account"
+msgstr "Non se puido actualizar o usuario."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 #: actions/deleteapplication.php:62
@@ -4419,7 +4444,8 @@ msgstr "Non se puideron gardar as etiquetas."
 msgid "Settings saved."
 msgstr "Configuracións gardadas."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Crear nova conta"
@@ -4958,85 +4984,88 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Mensaxe de %1$s en %2$s"
 
-#: actions/restoreaccount.php:79
+#. 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ó o usuario pode ler os seus propios buzóns."
 
+#. 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 podes rexistrarte se non estas de acordo coa licenza."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Aconteceu un erro no sistema namentras se estaba cargando o ficheiro."
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
+msgid "Not an Atom feed."
 msgstr ""
 
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
-msgid "Not an atom feed."
-msgstr ""
-
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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"
@@ -7125,20 +7154,57 @@ msgstr "Antes »"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 "tipo de ficheiro non soportado"
+
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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 "Especifica o nome do usuario ó que queres suscribirte"
+
+#. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
+#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "tipo de ficheiro non soportado"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 estas suscrito a estes usuarios:"
+
+#. 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 "Atopar no contido dos chíos"
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7442,13 +7508,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Recuperar"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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 "Non se pode eliminar este chíos."
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -8026,6 +8094,10 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#: lib/feedimporter.php:75
+msgid "Not an atom feed."
+msgstr ""
+
 #: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
@@ -9374,6 +9446,8 @@ msgstr "Tamaño inválido."
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "No user specified; using backup user."
-#~ msgstr "Non se especificou ningún perfil."
+#. 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 ""
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index 941234bf76..4481b116de 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:05+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34:49+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 (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -974,9 +974,10 @@ msgstr "Non pode repetir a súa propia nota."
 msgid "Already repeated that notice."
 msgstr "Xa repetiu esa nota."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
@@ -1304,21 +1305,26 @@ msgstr "Non se atopou o método da API."
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "Non existe ese perfil."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "Non está subscrito a ese perfil."
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "Non se puido borrar a subscrición a si mesmo."
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1413,13 +1419,15 @@ msgid "Preview"
 msgstr "Vista previa"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1698,59 +1706,76 @@ msgstr "Conversa"
 msgid "Notices"
 msgstr "Notas"
 
-#: actions/deleteaccount.php:72
+#. 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."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Crear unha conta"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "Non pode borrar usuarios."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
-msgstr ""
+#. 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
@@ -4333,7 +4358,8 @@ msgstr "Non se puideron gardar as etiquetas."
 msgid "Settings saved."
 msgstr "Gardouse a configuración."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Crear unha conta"
@@ -4879,28 +4905,32 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Respostas a %1$s en %2$s!"
 
-#: actions/restoreaccount.php:79
+#. 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."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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."
@@ -4909,58 +4939,57 @@ msgstr ""
 "formulario HTML."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Houbo un erro no sistema ao cargar o ficheiro."
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "Todos os membros"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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"
@@ -7024,20 +7053,57 @@ 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."
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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"
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7324,13 +7390,16 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revogar"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+#, fuzzy
+msgid "Author element must contain a name element."
 msgstr "o elemento \"autor\" debe conter un nome."
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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 "Non borrar esta nota"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7894,6 +7963,11 @@ msgstr "Atom"
 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 ""
@@ -9220,15 +9294,8 @@ msgstr "Tamaño non válido."
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "Fotografía"
-
-#~ msgid "No user specified; using backup user."
-#~ msgstr "Non se especificou ningún usuario; emprégase o usuario de reserva."
-
-#, fuzzy
-#~ msgid "%d entry in backup."
-#~ msgid_plural "%d entries in backup."
-#~ msgstr[0] "%d entradas na reserva."
-#~ msgstr[1] "%d entradas na reserva."
+#. 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 ""
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index 8b981ac5e3..7dfca01f6f 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:06+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34:50+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 (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hsb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || "
 "n%100==4) ? 2 : 3)\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -54,7 +54,7 @@ msgstr "Priwatny"
 #. TRANS: Checkbox instructions for admin setting "Invite only".
 #: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
-msgstr ""
+msgstr "Registrowanje jenož po přeprošenju móžno."
 
 #. TRANS: Checkbox label for configuring site as invite only.
 #: actions/accessadminpanel.php:166
@@ -952,9 +952,10 @@ msgstr "Njemóžno twoju zdźělenku wospjetować."
 msgid "Already repeated that notice."
 msgstr "Tuta zdźělenka bu hižo wospjetowana."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTTP-metoda so njepodpěruje."
@@ -976,7 +977,7 @@ msgstr "Žadyn status z tym ID namakany."
 
 #: actions/apistatusesshow.php:223
 msgid "Can only delete using the Atom format."
-msgstr ""
+msgstr "Zhašenje je jenož z Atomowym formatom móžno."
 
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
 #: actions/apistatusesshow.php:230 actions/deletenotice.php:78
@@ -1265,20 +1266,26 @@ msgstr "Metoda so njepodpěruje."
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, php-format
 msgid "No such profile id: %d"
 msgstr "Profilowy ID njeeksistuje: %d"
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "Njejsy tón profil abonował."
 
-#: actions/atompubshowsubscription.php:154
-msgid "Can't delete someone else's subscription"
+#. 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 "Abonement druheho njeda so zhašeć"
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1372,13 +1379,15 @@ msgid "Preview"
 msgstr "Přehlad"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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ć"
@@ -1421,12 +1430,11 @@ msgstr "Awatar zničeny."
 
 #: actions/backupaccount.php:62 actions/profilesettings.php:467
 msgid "Backup account"
-msgstr ""
+msgstr "Konto zawěsćić"
 
 #: actions/backupaccount.php:80
-#, fuzzy
 msgid "Only logged-in users can backup their account."
-msgstr "Jeno6 přizjewjeni wužiwarjo móža zdźělenki wospjetować."
+msgstr "Jenož přizjewjeni wužiwarjo móža swoje konto zawěsćić."
 
 #: actions/backupaccount.php:84
 msgid "You may not backup your account."
@@ -1442,14 +1450,13 @@ msgid ""
 msgstr ""
 
 #: actions/backupaccount.php:255
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
-msgstr "Pozadk"
+msgstr "Zawěsćenje"
 
 #: actions/backupaccount.php:258
 msgid "Backup your account"
-msgstr ""
+msgstr "Twoje konto zawěsćić"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 #: actions/block.php:68
@@ -1653,59 +1660,72 @@ msgstr "Konwersacija"
 msgid "Notices"
 msgstr "Zdźělenki"
 
-#: actions/deleteaccount.php:72
-#, fuzzy
+#. 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 "Jeno6 přizjewjeni wužiwarjo móža zdźělenki wospjetować."
+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
-#, fuzzy
 msgid "You cannot delete your account."
-msgstr "Njemóžeš wužiwarjow wušmórnyć."
+msgstr "Njemóžeš swoje konto zhašeć."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
-#, fuzzy
+#. TRANS: Confirmation that a user account has been deleted.
+#: actions/deleteaccount.php:206
 msgid "Account deleted."
-msgstr "Awatar zničeny."
+msgstr "Konto zhašene."
 
+#. TRANS: Page title for page on which a user account can be deleted.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
-#, fuzzy
 msgid "Delete account"
-msgstr "Konto załožić"
+msgstr "Konto zhašeć"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Wobkrućić"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "Njemóžeš swoje konto zhašeć."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
-msgstr ""
+#. TRANS: Button title for user account deletion.
+#: actions/deleteaccount.php:323
+#, fuzzy
+msgid "Permanently delete your account"
+msgstr "Njemóžeš swoje konto zhašeć."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 #: actions/deleteapplication.php:62
@@ -2850,7 +2870,7 @@ msgstr "Pósćel mi zdźělenki přez Jabber/GTalk."
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:169
 msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr ""
+msgstr "Powěsć pósłac, hdyž so status Jabber/GTalk změni."
 
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:175
@@ -3200,7 +3220,7 @@ msgstr "Wobsedźer"
 
 #: actions/licenseadminpanel.php:275
 msgid "Name of the owner of the site's content (if applicable)."
-msgstr ""
+msgstr "Mjeno wobsedźerja wobsaha tutoho sydła (jeli trěbne)"
 
 #: actions/licenseadminpanel.php:283
 msgid "License Title"
@@ -3333,9 +3353,8 @@ 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
-#, fuzzy
 msgid "You are not allowed to create groups on this site."
-msgstr "Njesměš tutu skupinu zhašeć."
+msgstr "Njesměš skupiny na tutym sydle zhašeć."
 
 #. TRANS: Form instructions for group create form.
 #: actions/newgroup.php:117
@@ -4162,10 +4181,10 @@ msgstr "Taflički njedadźa so składować."
 msgid "Settings saved."
 msgstr "Nastajenja składowane."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
-#, fuzzy
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 msgid "Restore account"
-msgstr "Konto załožić"
+msgstr "Konto wobnowić"
 
 #: actions/public.php:83
 #, php-format
@@ -4541,7 +4560,7 @@ msgstr "Wužiwarske přimjeno"
 
 #: actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
-msgstr ""
+msgstr "Přimjeno wužiwarja, kotremuž chceš slědować."
 
 #: actions/remotesubscribe.php:133
 msgid "Profile URL"
@@ -4648,87 +4667,86 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Wotmołwy na %1$s na %2$s!"
 
-#: actions/restoreaccount.php:79
-#, fuzzy
+#. 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 "Jeno6 přizjewjeni wužiwarjo móža zdźělenki wospjetować."
+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
-#, fuzzy
 msgid "You may not restore your account."
-msgstr "Hišće njejsy aplikacije zregistrował."
+msgstr "NJemóžeš swoje konto wobnowić."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
-#, fuzzy
+#. 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 "Dataju nahrać"
+msgstr "Žana nahrata dataja."
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Systemowy zmylk při nahrawanju dataje."
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
-msgstr "Njeje čłon"
+msgid "Not an Atom feed."
+msgstr "To Atomowy kanal njeje."
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
-#, fuzzy
+#. 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ć"
 
@@ -4760,7 +4778,7 @@ msgstr "Posedźenja"
 
 #: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
-msgstr ""
+msgstr "Nastajenja posedźenja za tute sydło StatusNet."
 
 #: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
@@ -5187,7 +5205,7 @@ msgstr "Zakładne nastajenja za tute sydło StatusNet."
 
 #: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
-msgstr ""
+msgstr "Sydłowe mjeno njesmě prózdne być."
 
 #: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
@@ -6680,20 +6698,56 @@ msgstr "Před"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 "Njeznata rěč \"%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 ""
 
-#: lib/activityimporter.php:133
+#. TRANS: Client exception thrown when trying to for a remote user to subscribe.
+#: lib/activityimporter.php:117
 #, fuzzy
-msgid "Unknown profile."
-msgstr "Njeznaty profil %s"
+msgid "Cannot force remote user to subscribe."
+msgstr "Podaj mjeno wužiwarja, kotrehož chceš abonować"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 ""
 
+#. 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 "Sy hižo čłon teje skupiny."
+
+#. 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 "Žadyn wobsah za zdźělenku %d."
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -6943,7 +6997,7 @@ msgstr "Přetorhnyć"
 
 #: lib/applicationlist.php:247
 msgid " by "
-msgstr ""
+msgstr "wot "
 
 #. TRANS: Application access type
 #: lib/applicationlist.php:260
@@ -6974,13 +7028,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Wotwołać"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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 "Njewužij tutu metodu!"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7510,13 +7566,17 @@ msgstr "Atom"
 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 ""
+msgstr "Žadyn awtor w kanalu njeje."
 
 #: lib/feedimporter.php:89
 msgid "Can't import without a user."
-msgstr ""
+msgstr "Import bjez wužiwarja njemóžno."
 
 #. TRANS: Header for feed links (h2).
 #: lib/feedlist.php:66
@@ -7550,7 +7610,7 @@ msgstr "Start"
 #: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
-msgstr ""
+msgstr "Tutomu wužiwarjej rólu \"%s\" dać"
 
 #: lib/groupeditform.php:154
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
@@ -8089,13 +8149,15 @@ msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
 "format."
 msgstr ""
+"\"%1$s\" njeje podpěrany datajowy typ na tutym serwerje. Spytaj druhi format "
+"%2$s wužiwać."
 
 #. 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 ""
+msgstr "\"%s\" njeje podpěrany datajowy typ na tutym serwerje."
 
 #: lib/messageform.php:120
 msgid "Send a direct notice"
@@ -8518,7 +8580,7 @@ msgstr[3] ""
 
 #: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
-msgstr ""
+msgstr "Njepłaćiwy šatowy archiw: falowaca css-dataja/display.css"
 
 #: lib/themeuploader.php:219
 msgid ""
@@ -8741,8 +8803,8 @@ msgstr "Njepłaćiwy XML."
 msgid "Invalid XML, missing XRD root."
 msgstr "Njepłaćiwy XML, korjeń XRD faluje."
 
-#~ msgid "Post"
-#~ msgstr "Póst"
-
-#~ msgid "No user specified; using backup user."
-#~ msgstr "Žadyn wužiwarsk podaty; wužiwa so wužiwar ze zawěsćenja."
+#. 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 ""
diff --git a/locale/hu/LC_MESSAGES/statusnet.po b/locale/hu/LC_MESSAGES/statusnet.po
index 3a379c6882..c51fb8e3c8 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:08+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34:51+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-01-12 17:31:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hu\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -962,9 +962,10 @@ msgstr "Nem ismételheted meg a saját híredet."
 msgid "Already repeated that notice."
 msgstr "Már megismételted azt a hírt."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
@@ -1287,21 +1288,27 @@ msgstr "Az API-metódus nem található."
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "Nincs ilyen profil."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "Senkinek sem iratkoztál fel a híreire."
 
-#: actions/atompubshowsubscription.php:154
-msgid "Can't delete someone else's subscription"
-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 "Nem sikerült törölni a kedvencet."
 
 #: actions/atompubsubscriptionfeed.php:150
 #, fuzzy, php-format
@@ -1393,14 +1400,16 @@ msgid "Preview"
 msgstr "Előnézet"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. TRANS: Button text for user account deletion.
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Törlés"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1679,59 +1688,76 @@ msgstr "Beszélgetés"
 msgid "Notices"
 msgstr "Hírek"
 
-#: actions/deleteaccount.php:72
+#. 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."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Felhasználó törlése"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Megerősítés"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "Nem törölhetsz felhasználókat."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
-msgstr ""
+#. 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
@@ -4235,7 +4261,8 @@ msgstr "Nem sikerült a címkéket elmenteni."
 msgid "Settings saved."
 msgstr "A beállításokat elmentettük."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr ""
 
@@ -4729,86 +4756,89 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr ""
 
-#: actions/restoreaccount.php:79
+#. 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."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr ""
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "Összes tag"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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"
@@ -6770,20 +6800,57 @@ msgstr "Előtte"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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"
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7065,13 +7132,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr ""
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7586,6 +7655,11 @@ msgstr "Atom"
 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 ""
@@ -8857,6 +8931,8 @@ msgstr "Érvénytelen méret."
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "Fénykép"
+#. 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 ""
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index 2d2f28fc45..3f07a3a471 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:09+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34: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-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -966,9 +966,10 @@ msgstr "Non pote repeter tu proprie nota."
 msgid "Already repeated that notice."
 msgstr "Iste nota ha ja essite repetite."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "Methodo HTTP non supportate."
@@ -1280,20 +1281,26 @@ msgstr "Methodo non supportate"
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, php-format
 msgid "No such profile id: %d"
 msgstr "Iste ID de profilo non existe: %d"
 
-#: actions/atompubshowsubscription.php:90
-#, php-format
-msgid "Profile %d not subscribed to profile %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 "Le profilo %d non es subscribite al profilo %d"
 
-#: actions/atompubshowsubscription.php:154
-msgid "Can't delete someone else's subscription"
+#. 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 pote deler le subscription de un altere persona"
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1387,13 +1394,15 @@ msgid "Preview"
 msgstr "Previsualisation"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1436,7 +1445,7 @@ msgstr "Avatar delite."
 
 #: actions/backupaccount.php:62 actions/profilesettings.php:467
 msgid "Backup account"
-msgstr ""
+msgstr "Facer un copia de reserva del conto"
 
 #: actions/backupaccount.php:80
 #, fuzzy
@@ -1671,59 +1680,76 @@ msgstr "Conversation"
 msgid "Notices"
 msgstr "Notas"
 
-#: actions/deleteaccount.php:72
+#. 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 "Solmente usatores authenticate pote repeter 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 "Tu non pote deler usatores."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. TRANS: Confirmation that a user account has been deleted.
+#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "Avatar delite."
 
+#. TRANS: Page title for page on which a user account can be deleted.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Crear un conto"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "Tu non pote deler usatores."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
-msgstr ""
+#. TRANS: Button title for user account deletion.
+#: actions/deleteaccount.php:323
+#, fuzzy
+msgid "Permanently delete your account"
+msgstr "Tu non pote deler usatores."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 #: actions/deleteapplication.php:62
@@ -4272,7 +4298,8 @@ msgstr "Non poteva salveguardar etiquettas."
 msgid "Settings saved."
 msgstr "Preferentias confirmate."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Crear un conto"
@@ -4806,28 +4833,32 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Responsas a %1$s in %2$s!"
 
-#: actions/restoreaccount.php:79
+#. 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 "Solmente usatores authenticate pote repeter 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 "Tu non ha ancora registrate alcun application."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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 "Incargar file"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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."
@@ -4836,58 +4867,57 @@ msgstr ""
 "formulario HTML."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Error de systema durante le incargamento del file."
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr "Obtene copia de reserva ex file '%s'."
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "Non es membro"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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 "Incargar file"
@@ -6933,20 +6963,57 @@ msgstr ""
 "Expectava le elemento-radice de un syndication, ma recipeva un documento XML "
 "integre."
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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\" incognite."
+
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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 le nomine del usator al qual subscriber te."
+
+#. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
+#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "Profilo incognite: %s"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 "Tu es ja membro de iste gruppo."
+
+#. 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 "Nulle contento pro nota %d."
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7233,13 +7300,16 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revocar"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+#, fuzzy
+msgid "Author element must contain a name element."
 msgstr "Le elemento \"author\" debe continer un elemento \"name\"."
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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 "Non deler iste gruppo"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7788,6 +7858,11 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "Amico de un amico"
 
+#: lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Non es membro"
+
 #: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
@@ -9100,13 +9175,8 @@ msgstr "XML invalide."
 msgid "Invalid XML, missing XRD root."
 msgstr "XML invalide, radice XRD mancante."
 
-#~ msgid "Post"
-#~ msgstr "Publicar"
-
-#~ msgid "No user specified; using backup user."
-#~ msgstr "Nulle usator specificate; le usator de reserva es usate."
-
-#~ msgid "%d entry in backup."
-#~ msgid_plural "%d entries in backup."
-#~ msgstr[0] "%d entrata in copia de reserva."
-#~ msgstr[1] "%d entratas in copia de reserva."
+#. 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'."
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index a515033bb2..24ee84e74c 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:10+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34:55+0000\n"
 "Language-Team: Icelandic <http://translatewiki.net/wiki/Portal:is>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: is\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -981,9 +981,10 @@ msgstr "Get ekki kveikt á tilkynningum."
 msgid "Already repeated that notice."
 msgstr "Get ekki eytt þessu babli."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
@@ -1307,21 +1308,26 @@ msgstr "Aðferð í forritsskilum fannst ekki!"
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "Ekkert svoleiðis babl."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "Þú ert ekki áskrifandi."
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "Gat ekki vistað áskrift."
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1415,14 +1421,16 @@ msgid "Preview"
 msgstr "Forsýn"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. TRANS: Button text for user account deletion.
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Eyða"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1709,59 +1717,76 @@ msgstr "Staðfestingarlykill"
 msgid "Notices"
 msgstr "Babl"
 
-#: actions/deleteaccount.php:72
+#. 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 "Aðeins notandinn getur lesið hans eigin pósthólf."
 
+#. 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 "Gat ekki uppfært notanda."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. TRANS: Confirmation that a user account has been deleted.
+#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "Mynd hefur verið uppfærð."
 
+#. TRANS: Page title for page on which a user account can be deleted.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Búa til nýjan hóp"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Staðfesta"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "Gat ekki uppfært notanda."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
-msgstr ""
+#. TRANS: Button title for user account deletion.
+#: actions/deleteaccount.php:323
+#, fuzzy
+msgid "Permanently delete your account"
+msgstr "Gat ekki uppfært notanda."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 #: actions/deleteapplication.php:62
@@ -4385,7 +4410,8 @@ msgstr "Gat ekki vistað merki."
 msgid "Settings saved."
 msgstr "Stillingar vistaðar."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Búa til nýjan hóp"
@@ -4913,86 +4939,89 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Skilaboð til %1$s á %2$s"
 
-#: actions/restoreaccount.php:79
+#. 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 "Aðeins notandinn getur lesið hans eigin pósthólf."
 
+#. 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 "Þú getur ekki nýskráð þig nema þú samþykkir leyfið."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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 "Hlaða upp"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Kerfisvilla kom upp við upphal skráar."
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "Allir meðlimir"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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 "Hlaða upp"
@@ -7044,20 +7073,57 @@ msgstr "Áður"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 "Óþekkt skráargerð"
+
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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 "Tilgreindu nafn notandans sem þú vilt gerast áskrifandi að"
+
+#. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
+#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "Óþekkt skráargerð"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 "Þú ert nú þegar meðlimur í þessum hópi"
+
+#. 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 "Finna innihald babls"
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7357,13 +7423,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Endurheimta"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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 "Get ekki eytt þessu babli."
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7891,6 +7959,11 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#: lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Allir meðlimir"
+
 #: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
@@ -9127,10 +9200,8 @@ msgstr "Ótæk stærð."
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "Ljósmynd"
-
-#, fuzzy
-#~ msgid "No user specified; using backup user."
-#~ msgstr "Engin persónuleg síða tilgreind"
+#. 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 ""
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 8a0cf86c65..90f53271fd 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:11+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34:55+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 (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: it\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -977,9 +977,10 @@ msgstr "Non puoi ripetere un tuo messaggio."
 msgid "Already repeated that notice."
 msgstr "Hai già ripetuto quel messaggio."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
@@ -1303,21 +1304,26 @@ msgstr "Metodo delle API non trovato."
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "Nessun profilo."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "Non hai una abbonamento a quel profilo."
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "Impossibile salvare l'abbonamento."
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1411,14 +1417,16 @@ msgid "Preview"
 msgstr "Anteprima"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. TRANS: Button text for user account deletion.
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Elimina"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1700,59 +1708,76 @@ msgstr "Conversazione"
 msgid "Notices"
 msgstr "Messaggi"
 
-#: actions/deleteaccount.php:72
+#. 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."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Crea un account"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Conferma"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "Non puoi eliminare utenti."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
-msgstr ""
+#. 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
@@ -4333,7 +4358,8 @@ msgstr "Impossibile salvare le etichette."
 msgid "Settings saved."
 msgstr "Impostazioni salvate."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Crea un account"
@@ -4866,28 +4892,32 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Risposte a %1$s su %2$s!"
 
-#: actions/restoreaccount.php:79
+#. 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."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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."
@@ -4896,58 +4926,57 @@ msgstr ""
 "HTML."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Errore di sistema nel caricare il file."
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "Tutti i membri"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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"
@@ -7005,20 +7034,57 @@ msgstr "Precedenti"
 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."
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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"
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7303,13 +7369,16 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revoca"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+#, fuzzy
+msgid "Author element must contain a name element."
 msgstr "L'elemento author deve contenere un elemento name."
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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 "Non eliminare il messaggio"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7873,6 +7942,11 @@ msgstr "Atom"
 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 ""
@@ -9192,15 +9266,8 @@ msgstr "Dimensione non valida."
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "Fotografia"
-
-#~ msgid "No user specified; using backup user."
-#~ msgstr "Nessun utente specificato: viene usato l'utente di backup."
-
-#, fuzzy
-#~ msgid "%d entry in backup."
-#~ msgid_plural "%d entries in backup."
-#~ msgstr[0] "%d voci nel backup."
-#~ msgstr[1] "%d voci nel backup."
+#. 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 ""
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 5542058183..37e3467bea 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:12+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34:57+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 (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -969,9 +969,10 @@ msgstr "あなたのつぶやきを繰り返せません。"
 msgid "Already repeated that notice."
 msgstr "すでにつぶやきを繰り返しています。"
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
@@ -1293,21 +1294,26 @@ msgstr "API メソッドが見つかりません。"
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "そのようなファイルはありません。"
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "あなたはそのプロファイルにフォローされていません。"
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "フォローを保存できません。"
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1400,14 +1406,16 @@ msgid "Preview"
 msgstr "プレビュー"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1691,59 +1699,76 @@ msgstr "会話"
 msgid "Notices"
 msgstr "つぶやき"
 
-#: actions/deleteaccount.php:72
+#. 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 "ユーザを削除できません"
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "新しいグループを作成"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "パスワード確認"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "ユーザを削除できません"
 
-#: actions/deleteaccount.php:317
-msgid "Permanently 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
@@ -4324,7 +4349,8 @@ msgstr "タグを保存できません。"
 msgid "Settings saved."
 msgstr "設定が保存されました。"
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "新しいグループを作成"
@@ -4855,30 +4881,34 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "%2$s 上の %1$s への返信!"
 
-#: actions/restoreaccount.php:79
+#. 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 "あなたはまだなんのアプリケーションも登録していません。"
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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."
@@ -4887,58 +4917,57 @@ msgstr ""
 "ティブを超えています。"
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "ファイルのアップロードでシステムエラー"
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "全てのメンバー"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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 "ファイルアップロード"
@@ -6999,20 +7028,57 @@ msgstr "前>>"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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 "不明なファイルタイプ"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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 "つぶやきの内容を探す"
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7303,13 +7369,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "回復"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7830,6 +7898,11 @@ msgstr "Atom"
 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 ""
@@ -9107,10 +9180,8 @@ msgstr "不正なサイズ。"
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "写真"
-
-#, fuzzy
-#~ msgid "No user specified; using backup user."
-#~ msgstr "ユーザIDの記述がありません。"
+#. 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 ""
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
index 579f5d1475..ed7d20767d 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:13+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34:58+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 (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ka\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -957,9 +957,10 @@ msgstr "საკუთარი შეტყობინების გამ
 msgid "Already repeated that notice."
 msgstr "ეს შეტყობინება უკვე გამეორებულია."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
@@ -1279,21 +1280,26 @@ msgstr "API მეთოდი ვერ მოიძებნა."
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "ასეთი პროფილი არ არსებობს."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "თქვენ არ გაქვთ გამოწერილი ამ პროფილის განახლებები."
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "საკუთარი გამოწერის წაშლა ვერ ხერხდება."
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1387,14 +1393,16 @@ msgid "Preview"
 msgstr "წინასწარი გადახედვა"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1673,59 +1681,76 @@ msgstr "საუბარი"
 msgid "Notices"
 msgstr "შეტყობინებები"
 
-#: actions/deleteaccount.php:72
+#. 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 "თქვენ ვერ შეძლებთ მომხმარებლების წაშლას."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "გახსენი ანგარიში"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "ვადასტურებ"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "თქვენ ვერ შეძლებთ მომხმარებლების წაშლას."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently 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
@@ -4283,7 +4308,8 @@ msgstr "სანიშნეების შენახვა ვერ მო
 msgid "Settings saved."
 msgstr "პარამეტრები შენახულია."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "გახსენი ანგარიში"
@@ -4813,30 +4839,34 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "პასუხები %1$s–ს %2$s–ზე!"
 
-#: actions/restoreaccount.php:79
+#. 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 "თქვენ ჯერჯერობით არცერთი აპლიკაცია არ დაგირეგისტრირებიათ."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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."
@@ -4845,57 +4875,56 @@ msgstr ""
 "ფორმაში."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "სისტემური შეცდომა ფაილის ატვირთვისას."
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
+msgid "Not an Atom feed."
 msgstr ""
 
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
-msgid "Not an atom feed."
-msgstr ""
-
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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 "ფაილის ატვირთვა"
@@ -6923,20 +6952,57 @@ msgstr "წინა"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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 "ფაილის ტიპი უცნობია"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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 "მოძებნე შეტყობინებებში"
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7221,13 +7287,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "უკუგება"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7746,6 +7814,10 @@ msgstr "Atom"
 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 ""
@@ -9028,10 +9100,8 @@ msgstr "ზომა არასწორია."
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "ფოტო"
-
-#, fuzzy
-#~ msgid "No user specified; using backup user."
-#~ msgstr "მომხმარებლის ID მითითებული არ არის."
+#. 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 ""
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 1c2a5d2764..62347deb7d 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:15+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:34: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 (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ko\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -961,9 +961,10 @@ msgstr "자기 자신의 소식은 재전송할 수 없습니다."
 msgid "Already repeated that notice."
 msgstr "이미 재전송된 소식입니다."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
@@ -1283,21 +1284,26 @@ msgstr "API 메서드 발견 안 됨."
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "해당하는 파일이 없습니다."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "구독을 저장할 수 없습니다."
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1390,14 +1396,16 @@ msgid "Preview"
 msgstr "미리보기"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1679,59 +1687,76 @@ msgstr "대화"
 msgid "Notices"
 msgstr "통지"
 
-#: actions/deleteaccount.php:72
+#. 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 "이용자를 업데이트 할 수 없습니다."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "새 계정 만들기"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "인증"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "이용자를 업데이트 할 수 없습니다."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently 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
@@ -4261,7 +4286,8 @@ msgstr "태그를 저장할 수 없습니다."
 msgid "Settings saved."
 msgstr "설정 저장"
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "새 계정 만들기"
@@ -4779,87 +4805,90 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "%s에 답신"
 
-#: actions/restoreaccount.php:79
+#. 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 "응용 프로그램 수정을 위해서는 로그인해야 합니다."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "파일을 올리는데 시스템 오류 발생"
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "모든 회원"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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 "실행 실패"
@@ -6879,20 +6908,57 @@ msgstr "앞 페이지"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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 "알 수 없는 종류의 파일입니다"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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 "통지들의 내용 찾기"
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7179,13 +7245,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "제거"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7703,6 +7771,11 @@ msgstr "Atom"
 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 ""
@@ -8907,10 +8980,8 @@ msgstr "옳지 않은 크기"
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "사진"
-
-#, fuzzy
-#~ msgid "No user specified; using backup user."
-#~ 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 ""
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 4f56950de9..477837ac3f 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:16+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -969,9 +969,10 @@ msgstr "Не можете да ја повторувате сопственат
 msgid "Already repeated that notice."
 msgstr "Забелешката е веќе повторена."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTML-методот не е поддржан."
@@ -1282,20 +1283,26 @@ msgstr "Методот не е поддржан"
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, php-format
 msgid "No such profile id: %d"
 msgstr "Нема таква назнака на профил: %d"
 
-#: actions/atompubshowsubscription.php:90
-#, php-format
-msgid "Profile %d not subscribed to profile %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 "Профилот %d не е претплатен на профилот %d"
 
-#: actions/atompubshowsubscription.php:154
-msgid "Can't delete someone else's subscription"
+#. 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 "Не можам да избришам туѓа претплата"
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1390,13 +1397,15 @@ msgid "Preview"
 msgstr "Преглед"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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 "Подигни"
@@ -1675,59 +1684,76 @@ msgstr "Разговор"
 msgid "Notices"
 msgstr "Забелешки"
 
-#: actions/deleteaccount.php:72
+#. 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 "Не можете да бришете корисници."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Создај сметка"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Потврди"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "Не можете да бришете корисници."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently 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
@@ -4286,7 +4312,8 @@ msgstr "Не можев да ги зачувам ознаките."
 msgid "Settings saved."
 msgstr "Нагодувањата се зачувани"
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Создај сметка"
@@ -4825,30 +4852,34 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Одговори на %1$s на %2$s!"
 
-#: actions/restoreaccount.php:79
+#. 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 "Сè уште немате регистрирано ниеден програм,"
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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."
@@ -4857,58 +4888,57 @@ msgstr ""
 "во HTML-образецот."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Системска грешка при подигањето на податотеката."
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr "Земам резерва на податотеката „%s“."
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "Не членувате"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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 "Подигање"
@@ -6967,20 +6997,57 @@ msgstr "Претходно"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Се очекува коренски каналски елемент, но добив цел XML документ."
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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 "Непознат профил %s"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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 "Нема содржина за забелешката %d."
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7264,13 +7331,16 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Одземи"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+#, fuzzy
+msgid "Author element must contain a name element."
 msgstr "авторскиот елемент мора да содржи елемент на име."
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7822,6 +7892,11 @@ msgstr "Atom"
 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 ""
@@ -9135,13 +9210,8 @@ msgstr "Неважечки XML."
 msgid "Invalid XML, missing XRD root."
 msgstr "Неважечки XML. Нема XRD-корен."
 
-#~ msgid "Post"
-#~ msgstr "Објави"
-
-#~ msgid "No user specified; using backup user."
-#~ msgstr "Нема назначено корисник. Ќе го употребам резервниот корисник."
-
-#~ msgid "%d entry in backup."
-#~ msgid_plural "%d entries in backup."
-#~ msgstr[0] "Има %d резервна ставка."
-#~ msgstr[1] "Има %d резервни ставки."
+#. 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“."
diff --git a/locale/ml/LC_MESSAGES/statusnet.po b/locale/ml/LC_MESSAGES/statusnet.po
index e7fab4e024..7f694bd6b3 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:17+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35:05+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-01-12 17:31:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ml\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -939,9 +939,10 @@ msgstr "താങ്കൾക്ക് താങ്കളുടെ തന്ന
 msgid "Already repeated that notice."
 msgstr "ആ അറിയിപ്പ് മുമ്പേ തന്നെ ആവർത്തിച്ചിരിക്കുന്നു."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "എച്ച്.റ്റി.റ്റി.പി. രീതി പിന്തുണയ്ക്കുന്നില്ല."
@@ -1248,21 +1249,27 @@ msgstr "പിന്തുണയില്ലാത്ത മാർഗ്ഗമ
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, php-format
 msgid "No such profile id: %d"
 msgstr ""
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr ""
 
-#: actions/atompubshowsubscription.php:154
-msgid "Can't delete someone else's subscription"
-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 "മറ്റൊരാളുടെ അംഗത്വം മായ്ക്കാനാവില്ല."
 
 #: actions/atompubsubscriptionfeed.php:150
 #, php-format
@@ -1354,13 +1361,15 @@ msgid "Preview"
 msgstr "എങ്ങനെയുണ്ടെന്നു കാണുക"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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 "അപ്‌ലോഡ്"
@@ -1635,59 +1644,76 @@ msgstr "സംഭാഷണം"
 msgid "Notices"
 msgstr "അറിയിപ്പുകൾ"
 
-#: actions/deleteaccount.php:72
+#. 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 "താങ്കൾക്ക് ഉപയോക്താക്കളെ നീക്കം ചെയ്യാൻ കഴിയില്ല."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "ഒരംഗത്വമെടുക്കുക"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "സ്ഥിരീകരിക്കുക"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "താങ്കൾക്ക് ഉപയോക്താക്കളെ നീക്കം ചെയ്യാൻ കഴിയില്ല."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently 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
@@ -1969,7 +1995,7 @@ msgstr "ഉള്ളടക്കം"
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
 #: actions/designadminpanel.php:626 lib/designsettings.php:211
 msgid "Sidebar"
-msgstr ""
+msgstr "പാർശ്വഭിത്തി"
 
 #. TRANS: Label on profile design page for setting a profile page text colour.
 #: actions/designadminpanel.php:639 lib/designsettings.php:225
@@ -1987,7 +2013,7 @@ msgstr "വിപുലം"
 
 #: actions/designadminpanel.php:681
 msgid "Custom CSS"
-msgstr ""
+msgstr "സ്വന്തം സി.എസ്.എസ്."
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
 #: actions/designadminpanel.php:702 lib/designsettings.php:257
@@ -2093,7 +2119,7 @@ msgstr ""
 
 #: actions/editapplication.php:226 actions/newapplication.php:202
 msgid "Organization homepage is required."
-msgstr ""
+msgstr "സംഘടനയുടെ പ്രധാനതാൾ ആവശ്യമാണ്."
 
 #. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
 #: actions/editapplication.php:237 actions/newapplication.php:214
@@ -2238,7 +2264,7 @@ msgstr "പുതിയ അറിയിപ്പുകൾ പ്രസിദ്
 #. TRANS: Instructions for incoming SMS e-mail address input form.
 #: actions/emailsettings.php:189 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
+msgstr "പ്രസിദ്ധീകരിക്കാനായി പുതിയൊരു ഇമെയിൽ വിലാസം സൃഷ്ടിക്കുക; പഴയതു റദ്ദാക്കപ്പെടും."
 
 #. TRANS: Instructions for incoming e-mail address input form.
 #: actions/emailsettings.php:193
@@ -2246,6 +2272,8 @@ 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.
@@ -2272,12 +2300,12 @@ msgstr ""
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:229
 msgid "Send me email when someone sends me a private message."
-msgstr ""
+msgstr "ആരെങ്കിലും എനിക്കൊരു സ്വകാര്യ സന്ദേശമയച്ചാൽ എനിക്ക് ഇമെയിൽ അയയ്ക്കുക."
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:235
 msgid "Send me email when someone sends me an \"@-reply\"."
-msgstr ""
+msgstr "ആരെങ്കിലും എനിക്കൊരു \"@-reply\" അയച്ചാൽ എനിക്ക് ഇമെയിൽ അയയ്ക്കുക."
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:241
@@ -3229,7 +3257,7 @@ msgstr "ഉപയോക്തൃനാമമോ രഹസ്യവാക്ക
 
 #: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
-msgstr ""
+msgstr "ഉപയോക്തൃ സജ്ജീകരണത്തിൽ പിഴവുണ്ടായി. താങ്കൾക്ക് മിക്കവാറും അനുമതിയുണ്ടാവില്ല."
 
 #: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
 msgid "Login"
@@ -3271,12 +3299,12 @@ msgstr "ഇതുവരെ ഒരു ഉപയോക്തൃനാമം ഇല
 
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
-msgstr ""
+msgstr "ഒരു കാര്യനിർവ്വാഹകനു മാത്രമേ മറ്റൊരുപയോക്താവിനെ കാര്യനിർവ്വാഹകനാക്കാൻ കഴിയൂ."
 
 #: actions/makeadmin.php:96
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr ""
+msgstr "%1$s എന്ന ഉപയോക്താവ് \"%2$s\" എന്ന സംഘത്തിൽ മുമ്പേ തന്നെ കാര്യനിർവ്വാഹകനാണ്."
 
 #: actions/makeadmin.php:133
 #, php-format
@@ -3286,7 +3314,7 @@ msgstr ""
 #: actions/makeadmin.php:146
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
-msgstr ""
+msgstr "%1$s എന്ന ഉപയോക്താവിനെ %2$s എന്ന സംഘത്തിലെ കാര്യനിർവ്വാഹകനാക്കാൻ കഴിയില്ല."
 
 #: actions/microsummary.php:69
 msgid "No current status."
@@ -3328,7 +3356,7 @@ msgstr "ഈ സൈറ്റിലെ ഉപയോക്താക്കളെ ത
 #. TRANS: Form instructions for group create form.
 #: actions/newgroup.php:117
 msgid "Use this form to create a new group."
-msgstr ""
+msgstr "പുതിയൊരു സംഘം സൃഷ്ടിക്കാൻ ഈ ഫോം ഉപയോഗിക്കുക."
 
 #: actions/newmessage.php:71 actions/newmessage.php:234
 msgid "New message"
@@ -3348,7 +3376,7 @@ msgstr "ഉള്ളടക്കമില്ല!"
 
 #: actions/newmessage.php:161
 msgid "No recipient specified."
-msgstr ""
+msgstr "സ്വീകർത്താവിനെ വ്യക്തമാക്കിയിട്ടില്ല."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
 #: actions/newmessage.php:167 lib/command.php:505
@@ -3365,7 +3393,7 @@ msgstr "സന്ദേശം അയച്ചു"
 #: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
-msgstr ""
+msgstr "%s എന്ന ഉപയോക്താവിന് നേരിട്ട് അയച്ച സന്ദേശങ്ങൾ."
 
 #: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
@@ -4140,7 +4168,8 @@ msgstr ""
 msgid "Settings saved."
 msgstr "സജ്ജീകരണങ്ങൾ സേവ് ചെയ്തിരിക്കുന്നു."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "ഒരംഗത്വമെടുക്കുക"
@@ -4625,86 +4654,89 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr ""
 
-#: actions/restoreaccount.php:79
+#. 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 "താങ്കൾക്ക് താങ്കളുടെ തന്നെ അറിയിപ്പ് ആവർത്തിക്കാനാവില്ല."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr ""
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "അംഗം അല്ല"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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 "പ്രമാണം അപ്‌ലോഡ് ചെയ്യുക"
@@ -6648,20 +6680,56 @@ msgstr "മുമ്പ്"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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 "അജ്ഞാതമായ കുറിപ്പ്."
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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 "താങ്കൾക്ക് താങ്കളുടെ തന്നെ അറിയിപ്പ് ആവർത്തിക്കാനാവില്ല."
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -6940,13 +7008,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "തിരിച്ചെടുക്കുക"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7448,6 +7518,11 @@ msgstr "ആറ്റം"
 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 ""
@@ -8639,3 +8714,9 @@ msgstr "അസാധുവായ എക്സ്.എം.എൽ.."
 #: lib/xrd.php:69
 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 ""
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 56a3bb0e98..c9511b5886 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:20+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -965,9 +965,10 @@ msgstr "Kan ikke gjenta din egen notis."
 msgid "Already repeated that notice."
 msgstr "Allerede gjentatt den notisen."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTTP-metoden støttes ikke."
@@ -1282,21 +1283,26 @@ msgstr "API-metode ikke funnet!"
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "Ingen slik profil."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "Ikke autorisert."
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "Kunne ikke slette favoritt."
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1389,13 +1395,15 @@ msgid "Preview"
 msgstr "Forhåndsvis"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1673,59 +1681,76 @@ msgstr "Samtale"
 msgid "Notices"
 msgstr "Notiser"
 
-#: actions/deleteaccount.php:72
+#. 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."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Opprett en konto"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Bekreft"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "Du kan ikke slette brukere."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
-msgstr ""
+#. 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
@@ -4252,7 +4277,8 @@ msgstr "Kunne ikke lagre merkelapper."
 msgid "Settings saved."
 msgstr "Innstillinger lagret."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Opprett en konto"
@@ -4782,86 +4808,89 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Svar til %1$s på %2$s!"
 
-#: actions/restoreaccount.php:79
+#. 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å."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Systemfeil ved opplasting av fil."
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "Alle medlemmer"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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"
@@ -6888,20 +6917,57 @@ msgstr "Før"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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."
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7192,13 +7258,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Tilbakekall"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7727,6 +7795,11 @@ msgstr "Atom"
 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 ""
@@ -9046,10 +9119,8 @@ msgstr "Ugyldig størrelse"
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "Foto"
-
-#, fuzzy
-#~ msgid "No user specified; using backup user."
-#~ msgstr "Ingen bruker-ID spesifisert."
+#. 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 ""
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index edeb89ae0e..6cb1944ed1 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:18+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -977,9 +977,10 @@ msgstr "U kunt uw eigen mededeling niet herhalen."
 msgid "Already repeated that notice."
 msgstr "U hebt die mededeling al herhaald."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTTP-methode wordt niet ondersteund."
@@ -1295,20 +1296,26 @@ msgstr "Methode wordt niet ondersteund"
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, php-format
 msgid "No such profile id: %d"
 msgstr "Het profielnummer bestaat niet: %d."
 
-#: actions/atompubshowsubscription.php:90
-#, php-format
-msgid "Profile %d not subscribed to profile %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 "Profiel %d is niet geabonneerd op profiel %d."
 
-#: actions/atompubshowsubscription.php:154
-msgid "Can't delete someone else's subscription"
+#. 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 "Het is niet mogelijk het abonnement van iemand anders te verwijderen"
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1404,13 +1411,15 @@ msgid "Preview"
 msgstr "Voorvertoning"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1454,16 +1463,15 @@ msgstr "De avatar is verwijderd."
 
 #: actions/backupaccount.php:62 actions/profilesettings.php:467
 msgid "Backup account"
-msgstr ""
+msgstr "Reservekopie van account maken"
 
 #: actions/backupaccount.php:80
-#, fuzzy
 msgid "Only logged-in users can backup their account."
-msgstr "Alleen aangemelde gebruikers kunnen hun mededelingen herhalen."
+msgstr "Alleen aangemelde gebruikers kunnen hun gebruiker back-uppen."
 
 #: actions/backupaccount.php:84
 msgid "You may not backup your account."
-msgstr ""
+msgstr "U kunt geen back-up van uw gebruiker maken."
 
 #: actions/backupaccount.php:232
 msgid ""
@@ -1473,16 +1481,21 @@ msgid ""
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
+"U kunt een back-up van uw gebruikersgegevens maken in de indeling <a href="
+"\"http://activitystrea.ms/\">Activity Streams</a>. Dit is een experimentele "
+"functie en deze lervert een onvolledige back-up; privégegevens van de "
+"gebruiker zoals e-mailadres en IM-adres worden niet in de back-up "
+"meegenomen. Daarnaast maken geüploade bestanden en directe berichten geen "
+"onderdeel van de back-up uit."
 
 #: actions/backupaccount.php:255
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
-msgstr "Achtergrond"
+msgstr "Back-up"
 
 #: actions/backupaccount.php:258
 msgid "Backup your account"
-msgstr ""
+msgstr "Uw gebruiker back-uppen"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 #: actions/block.php:68
@@ -1689,59 +1702,79 @@ msgstr "Dialoog"
 msgid "Notices"
 msgstr "Mededelingen"
 
-#: actions/deleteaccount.php:72
-#, fuzzy
+#. 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 mededelingen herhalen."
+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
-#, fuzzy
 msgid "You cannot delete your account."
-msgstr "U kunt gebruikers niet verwijderen."
+msgstr "U kunt uw gebruiker niet verwijderen."
 
-#: actions/deleteaccount.php:164
+#. 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 "Ik weet het zeker."
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
-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
+#, fuzzy, php-format
+msgid "You must write  \"%s\" exactly in the box."
+msgstr "U moet \"Ik weet het zeker\" in het veld invoeren."
 
-#: actions/deleteaccount.php:207
-#, fuzzy
+#. TRANS: Confirmation that a user account has been deleted.
+#: actions/deleteaccount.php:206
 msgid "Account deleted."
-msgstr "De avatar is verwijderd."
+msgstr "De gebruiker is verwijderd."
 
+#. TRANS: Page title for page on which a user account can be deleted.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
-#, fuzzy
 msgid "Delete account"
-msgstr "Gebruiker aanmaken"
+msgstr "Gebruiker verwijderen"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
+#, fuzzy
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
+"<p>Hiermee wordt uw gebruiker <strong>permanent verwijderd</strong> van deze "
+"server.</p>"
 
-#: actions/deleteaccount.php:286
-#, php-format
+#. 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
+#, fuzzy, php-format
 msgid ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
+"We adviseren u om een <a href=\"%s\">back-up van uw gegevens te maken</a> "
+"alvorens uw gebruiker te verwijderen."
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Bevestigen"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+#. 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 ""
+"Voer \"Ik weet het zeker.\" in om te bevestigen dat u uw gebruiker wilt "
+"verwijderen."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
-msgstr ""
+#. TRANS: Button title for user account deletion.
+#: actions/deleteaccount.php:323
+#, fuzzy
+msgid "Permanently delete your account"
+msgstr "Uw gebruikers permanent verwijderen"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 #: actions/deleteapplication.php:62
@@ -3458,9 +3491,8 @@ 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
-#, fuzzy
 msgid "You are not allowed to create groups on this site."
-msgstr "U mag deze groep niet verwijderen."
+msgstr "U mag geen groepen aanmaken op deze site."
 
 #. TRANS: Form instructions for group create form.
 #: actions/newgroup.php:117
@@ -4308,10 +4340,10 @@ msgstr "Het was niet mogelijk de labels op te slaan."
 msgid "Settings saved."
 msgstr "De instellingen zijn opgeslagen."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
-#, fuzzy
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 msgid "Restore account"
-msgstr "Gebruiker aanmaken"
+msgstr "Gebruiker terugladen van back-up"
 
 #: actions/public.php:83
 #, php-format
@@ -4847,30 +4879,32 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Antwoorden aan %1$s op %2$s."
 
-#: actions/restoreaccount.php:79
-#, fuzzy
+#. 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 mededelingen herhalen."
+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
-#, fuzzy
 msgid "You may not restore your account."
-msgstr "U hebt nog geen applicaties geregistreerd."
+msgstr "U mag uw gebruiker niet terugladen van back-up."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
-#, fuzzy
+#. 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 "Bestand uploaden"
+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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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."
@@ -4879,59 +4913,61 @@ msgstr ""
 "HTML-formulier."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Er is een systeemfout opgetreden tijdens het uploaden van het bestand."
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr "De back-up wordt uit het bestand \"%s\" geladen."
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
-msgstr "Geen lid"
+msgid "Not an Atom feed."
+msgstr "Dit is geen Atomfeed."
 
-#: actions/restoreaccount.php:238
+#. 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 ""
+"De feed is teruggeplaatst. Uw oude berichten worden nu in zoekopdrachten "
+"weergegeven en op uw profielpagina."
 
-#: actions/restoreaccount.php:241
+#. 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 ""
+msgstr "De feed wordt teruggeplaatst. Een paar minuten geduld, alstublieft."
 
-#: actions/restoreaccount.php:344
+#. 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 ""
+"U kunt een back-up van een tijdlijn uploaden in het formaat <a href=\"http://"
+"activitystrea.ms/\">Activity Streams</a>."
 
-#: actions/restoreaccount.php:374
-#, fuzzy
+#. 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"
 
@@ -7007,19 +7043,59 @@ msgstr "Eerder"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Verwachtte een root-feed element maar kreeg een heel XML-document."
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
-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 "De taal \"%s\" is niet bekend."
 
-#: lib/activityimporter.php:133
+#. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
+#: lib/activityimporter.php:107
 #, fuzzy
-msgid "Unknown profile."
-msgstr "Onbekend profiel %s"
-
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+msgid "Cannot force subscription for untrusted user."
 msgstr ""
+"Het is niet mogelijk een niet-vertrouwde gebruiker te dwingen te abonneren."
+
+#. 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 "Geef de naam op van de gebruiker waarop u zich wilt 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 ""
+
+#. 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 "U bent al lid van die groep."
+
+#. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
+#: lib/activityimporter.php:207
+#, fuzzy
+msgid "Not overwriting author info for non-trusted user."
+msgstr ""
+"Het is niet mogelijk een niet-vertrouwde gebruiker te dwingen te abonneren."
+
+#. 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 "Geen inhoud voor mededeling %d."
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7306,13 +7382,16 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Intrekken"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+#, fuzzy
+msgid "Author element must contain a name element."
 msgstr "Het element author moet een element name bevatten."
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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 "Gebruik deze methode niet!"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7873,13 +7952,17 @@ msgstr "Atom"
 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 ""
+msgstr "Er staat geen auteur in de feed."
 
 #: lib/feedimporter.php:89
 msgid "Can't import without a user."
-msgstr ""
+msgstr "Het is niet mogelijk te importeren zonder gebruiker."
 
 #. TRANS: Header for feed links (h2).
 #: lib/feedlist.php:66
@@ -9195,13 +9278,12 @@ msgstr "Ongeldige XML."
 msgid "Invalid XML, missing XRD root."
 msgstr "Ongeldige XML. De XRD-root mist."
 
-#~ msgid "Post"
-#~ msgstr "Post"
+#. 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 "No user specified; using backup user."
-#~ msgstr "Geen gebruiker opgegeven; de back-upgebruiker wordt gebruikt."
-
-#~ msgid "%d entry in backup."
-#~ msgid_plural "%d entries in backup."
-#~ msgstr[0] "%d element in de back-up."
-#~ msgstr[1] "%d elementen in de back-up."
+#, fuzzy
+#~ msgid "Already know about notice %s and  it's got a different author %s."
+#~ msgstr "De mededeling %1$s is al bekend en heeft een andere auteur %2$s."
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 4bd59323fe..7a10a06487 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:19+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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 (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nn\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -976,9 +976,10 @@ msgstr "Kan ikkje slå på notifikasjon."
 msgid "Already repeated that notice."
 msgstr "Kan ikkje sletta notisen."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
@@ -1302,21 +1303,26 @@ msgstr "Fann ikkje API-metode."
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "Denne notisen finst ikkje."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "Du tingar ikkje oppdateringar til den profilen."
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "Kunne ikkje lagra abonnement."
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1409,14 +1415,16 @@ msgid "Preview"
 msgstr "Forhandsvis"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. TRANS: Button text for user account deletion.
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Slett"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1701,59 +1709,76 @@ msgstr "Stadfestingskode"
 msgid "Notices"
 msgstr "Notisar"
 
-#: actions/deleteaccount.php:72
+#. 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."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Opprett ei ny gruppe"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Godta"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "Kan ikkje oppdatera brukar."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
-msgstr ""
+#. 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
@@ -4352,7 +4377,8 @@ msgstr "Kan ikkje lagra merkelapp."
 msgid "Settings saved."
 msgstr "Lagra innstillingar."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Opprett ei ny gruppe"
@@ -4880,86 +4906,89 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Melding til %1$s på %2$s"
 
-#: actions/restoreaccount.php:79
+#. 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."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Systemfeil ved opplasting av fil."
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "Alle medlemmar"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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"
@@ -7006,20 +7035,57 @@ msgstr "Før »"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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"
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7320,13 +7386,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Gjenopprett"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7847,6 +7915,11 @@ msgstr ""
 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 ""
@@ -9087,10 +9160,8 @@ msgstr "Ugyldig storleik."
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "Bilete"
-
-#, fuzzy
-#~ msgid "No user specified; using backup user."
-#~ msgstr "Ingen vald profil."
+#. 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 ""
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index 624e7be072..3d586a4f84 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:24+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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 (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-core\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -976,9 +976,10 @@ msgstr "Nie można powtórzyć własnego wpisu."
 msgid "Already repeated that notice."
 msgstr "Już powtórzono ten wpis."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "Metoda HTTP nie jest obsługiwana."
@@ -1290,20 +1291,26 @@ msgstr "Metoda nie jest obsługiwana"
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, php-format
 msgid "No such profile id: %d"
 msgstr "Nie ma takiego identyfikatora profilu: %d"
 
-#: actions/atompubshowsubscription.php:90
-#, php-format
-msgid "Profile %d not subscribed to profile %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 "Profil %d nie jest subskrybowany do profilu %d"
 
-#: actions/atompubshowsubscription.php:154
-msgid "Can't delete someone else's subscription"
+#. 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 "Nie można usunąć subskrypcji innej osoby"
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1396,13 +1403,15 @@ msgid "Preview"
 msgstr "Podgląd"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1680,59 +1689,76 @@ msgstr "Rozmowa"
 msgid "Notices"
 msgstr "Wpisy"
 
-#: actions/deleteaccount.php:72
+#. 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 "Tylko zalogowani użytkownicy mogą powtarzać wpisy."
 
+#. 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 "Nie można usuwać użytkowników."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. TRANS: Confirmation that a user account has been deleted.
+#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "Usunięto awatar."
 
+#. TRANS: Page title for page on which a user account can be deleted.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Utwórz konto"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Potwierdź"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "Nie można usuwać użytkowników."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
-msgstr ""
+#. TRANS: Button title for user account deletion.
+#: actions/deleteaccount.php:323
+#, fuzzy
+msgid "Permanently delete your account"
+msgstr "Nie można usuwać użytkowników."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 #: actions/deleteapplication.php:62
@@ -4278,7 +4304,8 @@ msgstr "Nie można zapisać znaczników."
 msgid "Settings saved."
 msgstr "Zapisano ustawienia."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Utwórz konto"
@@ -4811,28 +4838,32 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "odpowiedzi dla użytkownika %1$s na %2$s."
 
-#: actions/restoreaccount.php:79
+#. 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 "Tylko zalogowani użytkownicy mogą powtarzać wpisy."
 
+#. 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 "Nie zarejestrowano jeszcze żadnych aplikacji."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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 "Wyślij plik"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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."
@@ -4840,58 +4871,57 @@ msgstr ""
 "Wysłany plik przekracza dyrektywę MAX_FILE_SIZE podaną w formularzu HTML."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Błąd systemu podczas wysyłania pliku."
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr "Pobieranie kopii zapasowej z pliku \"%s\"."
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "Nie jest członkiem"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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 "Wyślij plik"
@@ -6956,20 +6986,57 @@ msgstr "Wcześniej"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Oczekiwano elementu kanału roota, ale otrzymano cały dokument XML."
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 "Nieznany język \"%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 ""
 
-#: lib/activityimporter.php:133
+#. 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 "Podaj nazwę użytkownika do subskrybowania."
+
+#. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
+#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "Nieznany profil %s"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 "Jesteś już członkiem tej grupy."
+
+#. 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 "Brak zawartości dla wpisu %d."
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7252,13 +7319,16 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Unieważnij"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+#, fuzzy
+msgid "Author element must contain a name element."
 msgstr "element autora musi zawierać element nazwy."
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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 "Nie usuwaj tej grupy"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7811,6 +7881,11 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
+#: lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Nie jest członkiem"
+
 #: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
@@ -9143,14 +9218,8 @@ msgstr "Nieprawidłowy kod XML."
 msgid "Invalid XML, missing XRD root."
 msgstr "Nieprawidłowy kod XML, brak głównego XRD."
 
-#~ msgid "Post"
-#~ msgstr "Wpis"
-
-#~ msgid "No user specified; using backup user."
-#~ msgstr "Nie podano użytkownika; używanie użytkownika zapasowego."
-
-#~ msgid "%d entry in backup."
-#~ msgid_plural "%d entries in backup."
-#~ msgstr[0] "%d wpis w kopii zapasowej."
-#~ msgstr[1] "%d wpisy w kopii zapasowej."
-#~ msgstr[2] "%d wpisów w kopii zapasowej."
+#. 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\"."
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 679aaca7a1..aeb55870b5 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -14,17 +14,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:26+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -977,9 +977,10 @@ msgstr "Não pode repetir a sua própria nota."
 msgid "Already repeated that notice."
 msgstr "Já repetiu essa nota."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
@@ -1302,21 +1303,26 @@ msgstr "Método da API não encontrado."
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "Perfil não foi encontrado."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "Não subscreveu esse perfil."
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "Não foi possível apagar a auto-subscrição."
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1409,14 +1415,16 @@ msgid "Preview"
 msgstr "Antevisão"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. TRANS: Button text for user account deletion.
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Apagar"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1698,59 +1706,76 @@ msgstr "Conversação"
 msgid "Notices"
 msgstr "Notas"
 
-#: actions/deleteaccount.php:72
+#. 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."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Criar uma conta"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Confirmação"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "Não pode apagar utilizadores."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
-msgstr ""
+#. 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
@@ -4327,7 +4352,8 @@ msgstr "Não foi possível gravar as categorias."
 msgid "Settings saved."
 msgstr "Configurações gravadas."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Criar uma conta"
@@ -4868,28 +4894,32 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Respostas a %1$s em %2$s!"
 
-#: actions/restoreaccount.php:79
+#. 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."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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."
@@ -4898,58 +4928,57 @@ msgstr ""
 "formulário HTML."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Ocorreu um erro de sistema ao transferir o ficheiro."
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "Todos os membros"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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"
@@ -7012,20 +7041,57 @@ msgstr ""
 "Era esperado um elemento raiz da fonte, mas foi recebido um documento XML "
 "inteiro."
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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"
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7307,13 +7373,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Retirar"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7871,6 +7939,11 @@ msgstr "Atom"
 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 ""
@@ -9187,10 +9260,8 @@ msgstr "Tamanho inválido."
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "Foto"
-
-#, fuzzy
-#~ msgid "No user specified; using backup user."
-#~ msgstr "Não foi especificado um ID de utilizador."
+#. 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 ""
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 8522a5f27c..b19d55525d 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:27+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35:19+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 (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -978,9 +978,10 @@ msgstr "Você não pode repetir a sua própria mensagem."
 msgid "Already repeated that notice."
 msgstr "Você já repetiu essa mensagem."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "O método HTTP não é suportado."
@@ -1304,21 +1305,26 @@ msgstr "O método HTTP não é suportado."
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "Este perfil não existe."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "Você não está assinando esse perfil."
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "Não foi possível salvar a assinatura."
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1413,13 +1419,15 @@ msgid "Preview"
 msgstr "Pré-visualizar"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1698,59 +1706,76 @@ msgstr "Conversa"
 msgid "Notices"
 msgstr "Mensagens"
 
-#: actions/deleteaccount.php:72
+#. 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."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Criar uma conta"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "Você não pode excluir usuários."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
-msgstr ""
+#. 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
@@ -4311,7 +4336,8 @@ msgstr "Não foi possível salvar as etiquetas."
 msgid "Settings saved."
 msgstr "As configurações foram salvas."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Criar uma conta"
@@ -4850,30 +4876,34 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Respostas para %1$s no %2$s"
 
-#: actions/restoreaccount.php:79
+#. 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."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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."
@@ -4882,58 +4912,57 @@ msgstr ""
 "MAX_FILE_SIZE do formulário HTML."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Erro no sistema durante o envio do arquivo."
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "Todos os membros"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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"
@@ -6983,20 +7012,57 @@ msgstr ""
 "Era esperado um elemento raiz da fonte, mas foi obtido o documento XML "
 "inteiro."
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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"
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7282,13 +7348,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revogar"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7853,6 +7921,11 @@ msgstr "Atom"
 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 ""
@@ -9174,10 +9247,8 @@ msgstr "Tamanho inválido."
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "Imagem"
-
-#, fuzzy
-#~ msgid "No user specified; using backup user."
-#~ msgstr "Não foi especificado nenhum ID de usuário."
+#. 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 ""
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 19c06d43b9..fb8300a0fe 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -16,18 +16,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:29+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -981,9 +981,10 @@ msgstr "Невозможно повторить собственную запи
 msgid "Already repeated that notice."
 msgstr "Запись уже повторена."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTTP-метод не поддерживается."
@@ -1309,21 +1310,26 @@ msgstr "HTTP-метод не поддерживается."
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "Нет такого профиля."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "Вы не подписаны на этот профиль."
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "Невозможно удалить подписку на самого себя."
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1418,13 +1424,15 @@ msgid "Preview"
 msgstr "Просмотр"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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 "Загрузить"
@@ -1702,59 +1710,76 @@ msgstr "Дискуссия"
 msgid "Notices"
 msgstr "Записи"
 
-#: actions/deleteaccount.php:72
+#. 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 "Вы не можете удалять пользователей."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Создать новый аккаунт"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Подтверждение"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "Вы не можете удалять пользователей."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently 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
@@ -4313,7 +4338,8 @@ msgstr "Не удаётся сохранить теги."
 msgid "Settings saved."
 msgstr "Настройки сохранены."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Создать новый аккаунт"
@@ -4846,28 +4872,32 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Ответы на записи %1$s на %2$s!"
 
-#: actions/restoreaccount.php:79
+#. 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 "Вы пока не зарегистрировали ни одного приложения."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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."
@@ -4875,58 +4905,57 @@ msgstr ""
 "Загружаемый файл превышает директиву MAX_FILE_SIZE, указанную в HTML-форме."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Системная ошибка при загрузке файла."
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr "Получение резервной копии из файла «%s»."
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "Все участники"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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 "Загрузить файл"
@@ -6985,20 +7014,57 @@ msgstr "Туда"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Ожидался корневой элемент потока, а получен XML-документ целиком."
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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 "Неподдерживаемый тип файла"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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 "Найти запись по содержимому"
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7281,13 +7347,16 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Отозвать"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+#, fuzzy
+msgid "Author element must contain a name element."
 msgstr "Элемент author должен содержать элемент name."
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7846,6 +7915,11 @@ msgstr "Atom"
 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 ""
@@ -9180,16 +9254,8 @@ msgstr "Неверный XML."
 msgid "Invalid XML, missing XRD root."
 msgstr "Неверный XML, отсутствует корень XRD."
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "Фото"
-
-#~ msgid "No user specified; using backup user."
-#~ msgstr ""
-#~ "Не указан пользователь; используется пользователь из резервной копии."
-
-#~ msgid "%d entry in backup."
-#~ msgid_plural "%d entries in backup."
-#~ msgstr[0] "%d запись в резервной копии."
-#~ msgstr[1] "%d записи в резервной копии."
-#~ msgstr[2] "%d записей в резервной копии."
+#. 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»."
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 6a522a3610..8722900213 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-01-14 10:29+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+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"
@@ -935,9 +935,10 @@ msgstr ""
 msgid "Already repeated that notice."
 msgstr ""
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr ""
@@ -1244,20 +1245,25 @@ msgstr ""
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, php-format
 msgid "No such profile id: %d"
 msgstr ""
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr ""
 
-#: actions/atompubshowsubscription.php:154
-msgid "Can't delete someone else's subscription"
+#. 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 ""
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1350,13 +1356,15 @@ msgid "Preview"
 msgstr ""
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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 ""
@@ -1629,54 +1637,70 @@ msgstr ""
 msgid "Notices"
 msgstr ""
 
-#: actions/deleteaccount.php:72
+#. 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 ""
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 msgid "Delete account"
 msgstr ""
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr ""
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
+#. 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 ""
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
+#. 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.
@@ -4103,7 +4127,8 @@ msgstr ""
 msgid "Settings saved."
 msgstr ""
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr ""
 
@@ -4584,82 +4609,85 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr ""
 
-#: actions/restoreaccount.php:79
+#. 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 ""
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr ""
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
+msgid "Not an Atom feed."
 msgstr ""
 
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
-msgid "Not an atom feed."
-msgstr ""
-
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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 ""
 
@@ -6602,17 +6630,52 @@ msgstr ""
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. TRANS: Client exception thrown when using an unknown verb for the activity importer.
+#: lib/activityimporter.php:81
+#, php-format
+msgid "Unknown verb: \"%s\"."
 msgstr ""
 
-#: lib/activityimporter.php:133
+#. 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 ""
 
-#: lib/activityimporter.php:197
+#. 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 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 "Already know about notice %s and  it's got a different author %s."
+msgid "No content for notice %s."
 msgstr ""
 
 #. TRANS: Client exception thrown when there is no source attribute.
@@ -6893,12 +6956,13 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr ""
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
+#. 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: DT element label in attachment list item.
@@ -7401,6 +7465,10 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#: lib/feedimporter.php:75
+msgid "Not an atom feed."
+msgstr ""
+
 #: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
@@ -8589,3 +8657,9 @@ msgstr ""
 #: lib/xrd.php:69
 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 ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 5168ad3366..feea4eb123 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:30+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35:22+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 (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -967,9 +967,10 @@ msgstr "Kan inte upprepa din egen notis."
 msgid "Already repeated that notice."
 msgstr "Redan upprepat denna notis."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
@@ -1289,21 +1290,26 @@ msgstr "API-metod hittades inte."
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "Ingen sådan profil."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "Du är inte prenumerat hos den profilen."
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "Kunde inte spara prenumeration."
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1397,13 +1403,15 @@ msgid "Preview"
 msgstr "Förhandsgranska"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1682,59 +1690,76 @@ msgstr "Konversationer"
 msgid "Notices"
 msgstr "Notiser"
 
-#: actions/deleteaccount.php:72
+#. 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."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Skapa ett konto"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Bekräfta"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "Du kan inte ta bort användare."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
-msgstr ""
+#. 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
@@ -4289,7 +4314,8 @@ msgstr "Kunde inte spara taggar."
 msgid "Settings saved."
 msgstr "Inställningar sparade."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Skapa ett konto"
@@ -4825,29 +4851,33 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Svar till %1$s på %2$s"
 
-#: actions/restoreaccount.php:79
+#. 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."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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."
@@ -4856,58 +4886,57 @@ msgstr ""
 "HTML-formuläret."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Systemfel vid uppladdning av fil."
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "Alla medlemmar"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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"
@@ -6955,20 +6984,57 @@ msgstr "Tidigare"
 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."
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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"
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7252,13 +7318,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Återkalla"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7808,6 +7876,11 @@ msgstr "Atom"
 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 ""
@@ -9118,10 +9191,8 @@ msgstr "Ogiltig storlek."
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "Foto"
-
-#, fuzzy
-#~ msgid "No user specified; using backup user."
-#~ msgstr "Ingen användar-ID angiven."
+#. 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 ""
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 5e24a84580..5aaee51359 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:33+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35:23+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 (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -955,9 +955,10 @@ msgstr "మీ నోటీసుని మీరే పునరావృతి
 msgid "Already repeated that notice."
 msgstr "ఇప్పటికే ఆ నోటీసుని పునరావృతించారు."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
@@ -1281,21 +1282,26 @@ msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "అటువంటి ఫైలు లేదు."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "మీరు ఎవరికీ చందాచేరలేదు."
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "కొత్త చందాని చేర్చలేకపోయాం."
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1389,13 +1395,15 @@ msgid "Preview"
 msgstr "మునుజూపు"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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 "ఎక్కించు"
@@ -1674,59 +1682,76 @@ msgstr "సంభాషణ"
 msgid "Notices"
 msgstr "సందేశాలు"
 
-#: actions/deleteaccount.php:72
+#. 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 "మీరు వాడుకరులని తొలగించలేరు."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "ఖాతాని సృష్టించుకోండి"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "నిర్థారించు"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "మీరు వాడుకరులని తొలగించలేరు."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently 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
@@ -4271,7 +4296,8 @@ msgstr "ట్యాగులని భద్రపరచలేకున్న
 msgid "Settings saved."
 msgstr "అమరికలు భద్రమయ్యాయి."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "ఖాతాని సృష్టించుకోండి"
@@ -4794,86 +4820,89 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "%2$sలో %1$sకి స్పందనలు!"
 
-#: actions/restoreaccount.php:79
+#. 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 "మీరు ఇంకా ఏ ఉపకరణాన్నీ నమోదు చేసుకోలేదు."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr ""
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "అందరు సభ్యులూ"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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 "ఫైలుని ఎక్కించు"
@@ -6890,20 +6919,57 @@ msgstr "ఇంతక్రితం"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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 "తెలియని ఫైలు రకం"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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 "మీ నోటీసుని మీరే పునరావృతించలేరు."
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7191,13 +7257,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "తొలగించు"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7719,6 +7787,11 @@ msgstr "ఆటమ్"
 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 ""
@@ -9017,10 +9090,8 @@ msgstr "తప్పుడు పరిమాణం."
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "ఫొటో"
-
-#, fuzzy
-#~ msgid "No user specified; using backup user."
-#~ 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 ""
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 6f78510d23..cd22b059e6 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:34+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35:24+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 (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -965,9 +965,10 @@ msgstr "Kendi durum mesajınızı tekrarlayamazsınız."
 msgid "Already repeated that notice."
 msgstr "Bu durum mesajı zaten tekrarlanmış."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTTP yöntemi desteklenmiyor."
@@ -1287,21 +1288,26 @@ msgstr "HTTP yöntemi desteklenmiyor."
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "Böyle bir durum mesajı yok."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "Bize o profili yollamadınız"
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "Yeni abonelik eklenemedi."
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1396,13 +1402,15 @@ msgid "Preview"
 msgstr "Önizleme"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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"
@@ -1683,58 +1691,75 @@ msgstr "Konuşma"
 msgid "Notices"
 msgstr "Durum mesajları"
 
-#: actions/deleteaccount.php:72
+#. 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."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Bir hesap oluştur"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Onayla"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "Kullanıcıları silemezsiniz."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
-msgstr ""
+#. 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
@@ -4274,7 +4299,8 @@ msgstr "Profil kaydedilemedi."
 msgid "Settings saved."
 msgstr "Ayarlar kaydedildi."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Bir hesap oluştur"
@@ -4787,85 +4813,88 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "%s için cevaplar"
 
-#: actions/restoreaccount.php:79
+#. 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."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Dosya yüklemede sistem hatası."
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "Tüm üyeler"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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"
@@ -6883,20 +6912,57 @@ msgstr "Önce"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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."
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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."
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7185,13 +7251,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Geri al"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7708,6 +7776,11 @@ msgstr "Atom"
 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 ""
@@ -8937,10 +9010,8 @@ msgstr "Geçersiz büyüklük."
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "Fotoğraf"
-
-#, fuzzy
-#~ msgid "No user specified; using backup user."
-#~ msgstr "Yeni durum mesajı"
+#. 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 ""
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index bb3ff2b59e..7837653ccc 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:35+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -979,9 +979,10 @@ msgstr "Не можна повторювати власні дописи."
 msgid "Already repeated that notice."
 msgstr "Цей допис вже повторено."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTTP спосіб не підтримується."
@@ -1296,20 +1297,26 @@ msgstr "Метод не підтримується"
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, php-format
 msgid "No such profile id: %d"
 msgstr "Немає такого ідентифікатора профілю: %d"
 
-#: actions/atompubshowsubscription.php:90
-#, php-format
-msgid "Profile %d not subscribed to profile %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 "Профіль %d не є підписаним до профілю %d"
 
-#: actions/atompubshowsubscription.php:154
-msgid "Can't delete someone else's subscription"
+#. 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 "Не вдається видалити чиюсь підписку"
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1402,13 +1409,15 @@ msgid "Preview"
 msgstr "Перегляд"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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 "Завантажити"
@@ -1686,59 +1695,76 @@ msgstr "Розмова"
 msgid "Notices"
 msgstr "Дописи"
 
-#: actions/deleteaccount.php:72
+#. 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 "Ви не можете видаляти користувачів."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Створити новий акаунт"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Підтвердити"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "Ви не можете видаляти користувачів."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently 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
@@ -4294,7 +4320,8 @@ msgstr "Не вдалося зберегти теґи."
 msgid "Settings saved."
 msgstr "Налаштування збережено."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Створити новий акаунт"
@@ -4827,28 +4854,32 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Відповіді до %1$s на %2$s!"
 
-#: actions/restoreaccount.php:79
+#. 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 "Поки що ви не зареєстрували жодних додатків."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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."
@@ -4857,58 +4888,57 @@ msgstr ""
 "HTML."
 
 #. TRANS: Client exception.
-#: actions/restoreaccount.php:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Система відповіла помилкою при завантаженні цього файла."
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr "Отримання резервної копії файлу «%s»."
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "Не є учасником"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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 "Завантажити файл"
@@ -6959,20 +6989,57 @@ msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 "В очікуванні кореневого елементу веб-стрічки, отримали цілий документ XML."
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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 "Невідомий профіль %s"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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 "Допис %d не має змісту."
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7255,13 +7322,16 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Відкликати"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+#, fuzzy
+msgid "Author element must contain a name element."
 msgstr "елемент author повинен містити елемент name."
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7820,6 +7890,11 @@ msgstr "Atom"
 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 ""
@@ -9158,16 +9233,8 @@ msgstr "Непрацездатний XML."
 msgid "Invalid XML, missing XRD root."
 msgstr "Неправильний XML, корінь XRD відсутній."
 
-#~ msgid "Post"
-#~ msgstr "Допис"
-
-#~ msgid "No user specified; using backup user."
-#~ msgstr ""
-#~ "Користувача не зазначено; для створення резервної копії потрібно "
-#~ "зазначити користувача."
-
-#~ msgid "%d entry in backup."
-#~ msgid_plural "%d entries in backup."
-#~ msgstr[0] "У резервному файлі збережено %d допис."
-#~ msgstr[1] "У резервному файлі збережено %d дописів."
-#~ msgstr[2] "У резервному файлі збережено %d дописів."
+#. 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»."
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index 0c87407e08..87c85f17ae 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:36+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35:26+0000\n"
 "Language-Team: Vietnamese <http://translatewiki.net/wiki/Portal:vi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: vi\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -957,9 +957,10 @@ msgstr "Không thể xóa tin nhắn này."
 msgid "Already repeated that notice."
 msgstr "Không thể xóa tin nhắn này."
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr ""
@@ -1279,21 +1280,26 @@ msgstr "Kết nối"
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "Không có tin nhắn nào."
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "Bạn đã theo những người này:"
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "Không thể chèn thêm vào đăng nhận."
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1388,13 +1394,15 @@ msgid "Preview"
 msgstr "Xem trước"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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 ""
@@ -1675,58 +1683,75 @@ msgstr "Thành phố"
 msgid "Notices"
 msgstr "Tin nhắn"
 
-#: actions/deleteaccount.php:72
+#. 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 "Không thể cập nhật thành viên."
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. TRANS: Confirmation that a user account has been deleted.
+#: actions/deleteaccount.php:206
 #, fuzzy
 msgid "Account deleted."
 msgstr "Hình đại diện đã được cập nhật."
 
+#. TRANS: Page title for page on which a user account can be deleted.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "Mở tài khoản mới"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "Xác nhận"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "Không thể cập nhật thành viên."
 
-#: actions/deleteaccount.php:317
-msgid "Permanently your account"
-msgstr ""
+#. TRANS: Button title for user account deletion.
+#: actions/deleteaccount.php:323
+#, fuzzy
+msgid "Permanently delete your account"
+msgstr "Không thể cập nhật thành viên."
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 #: actions/deleteapplication.php:62
@@ -4337,7 +4362,8 @@ msgstr "Không thể lưu hồ sơ cá nhân."
 msgid "Settings saved."
 msgstr "Đã lưu các điều chỉnh."
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Mở tài khoản mới"
@@ -4859,85 +4885,88 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "%s chào mừng bạn "
 
-#: actions/restoreaccount.php:79
+#. 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 "Bạn không thể đăng ký nếu không đồng ý các điều khoản."
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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 "Tải tập tin lên"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: actions/restoreaccount.php:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "Hệ thống xảy ra lỗi trong khi tải file."
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr ""
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "Thành viên"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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 "Tải tập tin lên"
@@ -6989,20 +7018,57 @@ msgstr "Trước"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr ""
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 "Không hỗ trợ kiểu file ảnh này."
+
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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 "Không thể cập nhật thành viên."
+
+#. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
+#: lib/activityimporter.php:132
 #, fuzzy
 msgid "Unknown profile."
 msgstr "Không hỗ trợ kiểu file ảnh này."
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 "Bạn chưa cập nhật thông tin riêng"
+
+#. 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 "Tìm theo nội dung của tin nhắn"
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7296,13 +7362,15 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Khôi phục"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
 msgstr ""
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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 "Không thể xóa tin nhắn này."
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7814,6 +7882,11 @@ msgstr ""
 msgid "FOAF"
 msgstr ""
 
+#: lib/feedimporter.php:75
+#, fuzzy
+msgid "Not an atom feed."
+msgstr "Thành viên"
+
 #: lib/feedimporter.php:82
 msgid "No author in the feed."
 msgstr ""
@@ -9067,3 +9140,9 @@ msgstr ""
 #: lib/xrd.php:69
 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 ""
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index ce2c792567..8f0025cdc3 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -14,18 +14,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:38+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-12 17:31:48+0000\n"
+"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -950,9 +950,10 @@ msgstr "不能转发你自己的消息。"
 msgid "Already repeated that notice."
 msgstr "已转发了该消息。"
 
+#. TRANS: Client error shown when using a non-supported HTTP method.
 #: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
 #: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
-#: actions/atompubshowsubscription.php:118
+#: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTTP 方法不支持。"
@@ -1269,21 +1270,26 @@ msgstr "HTTP 方法不支持。"
 msgid "Can't 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:81
+#: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d"
 msgstr "没有这个文件。"
 
-#: actions/atompubshowsubscription.php:90
+#. 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 %d not subscribed to profile %d"
+msgid "Profile %1$d not subscribed to profile %2$d"
 msgstr "你没有关注这个用户"
 
-#: actions/atompubshowsubscription.php:154
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
 #, fuzzy
-msgid "Can't delete someone else's subscription"
+msgid "Cannot delete someone else's subscription"
 msgstr "无法删除自我关注。"
 
 #: actions/atompubsubscriptionfeed.php:150
@@ -1376,13 +1382,15 @@ msgid "Preview"
 msgstr "预览"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155 actions/deleteaccount.php:314
+#. 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.
-#: actions/avatarsettings.php:173 actions/restoreaccount.php:371
+#. 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 "上传"
@@ -1659,59 +1667,76 @@ msgstr "对话"
 msgid "Notices"
 msgstr "消息"
 
-#: actions/deleteaccount.php:72
+#. 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 "你不能删除用户。"
 
-#: actions/deleteaccount.php:164
+#. 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 ""
 
-#: actions/deleteaccount.php:165
-msgid "You must write  \"I am sure.\" exactly in the box."
+#. 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 ""
 
-#: actions/deleteaccount.php:207
+#. 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.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
 #, fuzzy
 msgid "Delete account"
 msgstr "创建一个账户"
 
-#: actions/deleteaccount.php:282
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
 msgid ""
-"<p>This will <strong>permanently delete</strong> your account data from this "
-"server. </p>"
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
 msgstr ""
 
-#: actions/deleteaccount.php:286
+#. 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 ""
-"<p>You are strongly advised to <a href=\"%s\">back up your data</a> before "
-"deletion.</p>"
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
 msgstr ""
 
-#: actions/deleteaccount.php:297 actions/passwordsettings.php:112
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
 #: actions/recoverpassword.php:239 actions/register.php:441
 msgid "Confirm"
 msgstr "密码确认"
 
-#: actions/deleteaccount.php:299
-msgid "Enter \"I am sure.\" to confirm that you want to delete your account."
-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 "你不能删除用户。"
 
-#: actions/deleteaccount.php:317
-msgid "Permanently 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
@@ -4189,7 +4214,8 @@ msgstr "无法保存标签。"
 msgid "Settings saved."
 msgstr "设置已保存。"
 
-#: actions/profilesettings.php:481 actions/restoreaccount.php:61
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "创建一个账户"
@@ -4698,86 +4724,89 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "在%2$s上对%1$s的回复!"
 
-#: actions/restoreaccount.php:79
+#. 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 "你还没登记任何程序。"
 
-#: actions/restoreaccount.php:122 actions/restoreaccount.php:147
+#. 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:130 lib/mediafile.php:194
+#: 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:136 lib/mediafile.php:200
+#: 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:142 lib/mediafile.php:206
+#: 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:151 lib/mediafile.php:214
+#: 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:155 lib/mediafile.php:218
+#: 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:159 lib/mediafile.php:222
+#: 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.
-#: actions/restoreaccount.php:165 lib/imagefile.php:103 lib/mediafile.php:228
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
 msgstr "上传文件时出错。"
 
-#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: actions/restoreaccount.php:184 scripts/restoreuser.php:62
-#, php-format
-msgid "Getting backup from file '%s'."
-msgstr "从文件'%s'获取备份。"
-
-#: actions/restoreaccount.php:204 lib/feedimporter.php:75
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
 #, fuzzy
-msgid "Not an atom feed."
+msgid "Not an Atom feed."
 msgstr "所有成员"
 
-#: actions/restoreaccount.php:238
+#. 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 ""
 
-#: actions/restoreaccount.php:241
+#. 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 ""
 
-#: actions/restoreaccount.php:344
+#. 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 ""
 
-#: actions/restoreaccount.php:374
+#. 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 "上传文件"
@@ -6763,20 +6792,57 @@ msgstr "之前"
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "只期待一个 root feed 元素但收到了整个的 XML 文档。"
 
-#: lib/activityimporter.php:109
-msgid "Can't force subscription for untrusted user."
+#. 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 ""
 
-#: lib/activityimporter.php:133
+#. 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 "未知文件类型"
 
-#: lib/activityimporter.php:197
-#, php-format
-msgid "Already know about notice %s and  it's got a different author %s."
+#. 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 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 "搜索消息内容"
+
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
@@ -7054,13 +7120,16 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "取消"
 
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+#, fuzzy
+msgid "Author element must contain a name element."
 msgstr "作者元素必须包含一个名称元素。"
 
-#: lib/atom10feed.php:158
-msgid "Don't use this method!"
-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: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7598,6 +7667,11 @@ msgstr "Atom"
 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 ""
@@ -8876,13 +8950,8 @@ msgstr "无效的 XML。"
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
-#, fuzzy
-#~ msgid "Post"
-#~ msgstr "相片"
-
-#~ msgid "No user specified; using backup user."
-#~ msgstr "没有用户被指定；使用备份用户。"
-
-#~ msgid "%d entry in backup."
-#~ msgid_plural "%d entries in backup."
-#~ msgstr[0] "备份中有 %d 个条目。"
+#. 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'获取备份。"
diff --git a/plugins/Awesomeness/locale/Awesomeness.pot b/plugins/Awesomeness/locale/Awesomeness.pot
index 0ff3732de3..d86062c0c8 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+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"
 
-#: AwesomenessPlugin.php:55
+#: AwesomenessPlugin.php:56
 msgid ""
 "The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
diff --git a/plugins/Awesomeness/locale/be-tarask/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/be-tarask/LC_MESSAGES/Awesomeness.po
index 55bc46c747..ea7166d3d2 100644
--- a/plugins/Awesomeness/locale/be-tarask/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/be-tarask/LC_MESSAGES/Awesomeness.po
@@ -9,23 +9,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:45+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35:35+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-10 18:25:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:18:30+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\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
-#, fuzzy
 msgid ""
-"The Awesomeness plugin adds aditional awesomeness to a StatusNet "
+"The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
 msgstr ""
 "Дапаўненьне Awesomeness дадае незвычайныя магчымасьці ў усталяваньне "
diff --git a/plugins/Awesomeness/locale/fr/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/fr/LC_MESSAGES/Awesomeness.po
index 9e75b27bd8..8b4fc2b09a 100644
--- a/plugins/Awesomeness/locale/fr/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/fr/LC_MESSAGES/Awesomeness.po
@@ -9,22 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:45+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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:25:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:18:30+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: AwesomenessPlugin.php:56
-#, fuzzy
 msgid ""
-"The Awesomeness plugin adds aditional awesomeness to a StatusNet "
+"The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
 msgstr ""
 "Le plugin Awesomeness ajoute des suppléments impressionnants à une "
diff --git a/plugins/Awesomeness/locale/ia/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/ia/LC_MESSAGES/Awesomeness.po
index e4954f4299..7cdbe4226b 100644
--- a/plugins/Awesomeness/locale/ia/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/ia/LC_MESSAGES/Awesomeness.po
@@ -9,22 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:45+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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:25:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:18:30+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: AwesomenessPlugin.php:56
-#, fuzzy
 msgid ""
-"The Awesomeness plugin adds aditional awesomeness to a StatusNet "
+"The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
 msgstr ""
 "Le plug-in Awesomeness rende un installation de StatusNet plus "
diff --git a/plugins/Awesomeness/locale/mk/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/mk/LC_MESSAGES/Awesomeness.po
index 8894e66a5a..3a17783e0c 100644
--- a/plugins/Awesomeness/locale/mk/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/mk/LC_MESSAGES/Awesomeness.po
@@ -9,22 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:45+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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:25:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:18:30+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
 #: AwesomenessPlugin.php:56
-#, fuzzy
 msgid ""
-"The Awesomeness plugin adds aditional awesomeness to a StatusNet "
+"The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
 msgstr ""
 "Приклучокот „Феноменалност“ ѝ дава дополнителна феноменалност на "
diff --git a/plugins/Awesomeness/locale/nl/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/nl/LC_MESSAGES/Awesomeness.po
index 390202bf99..439a0b5db3 100644
--- a/plugins/Awesomeness/locale/nl/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/nl/LC_MESSAGES/Awesomeness.po
@@ -9,22 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:45+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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:25:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:18:30+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: AwesomenessPlugin.php:56
-#, fuzzy
 msgid ""
-"The Awesomeness plugin adds aditional awesomeness to a StatusNet "
+"The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
 msgstr ""
 "De Awesomenessplug-in voegt extra awesomeness toe aan een "
diff --git a/plugins/Awesomeness/locale/ru/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/ru/LC_MESSAGES/Awesomeness.po
index 772da076cb..035f8a445e 100644
--- a/plugins/Awesomeness/locale/ru/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/ru/LC_MESSAGES/Awesomeness.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:45+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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:25:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:18:30+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
@@ -23,8 +23,7 @@ msgstr ""
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
 #: AwesomenessPlugin.php:56
-#, fuzzy
 msgid ""
-"The Awesomeness plugin adds aditional awesomeness to a StatusNet "
+"The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
 msgstr "Потрясающий плагин добавляет потрясающие вещи в StatusNet."
diff --git a/plugins/Awesomeness/locale/uk/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/uk/LC_MESSAGES/Awesomeness.po
index 853595785c..865442ddc2 100644
--- a/plugins/Awesomeness/locale/uk/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/uk/LC_MESSAGES/Awesomeness.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:45+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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:25:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:18:30+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
@@ -23,9 +23,8 @@ msgstr ""
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
 
 #: AwesomenessPlugin.php:56
-#, fuzzy
 msgid ""
-"The Awesomeness plugin adds aditional awesomeness to a StatusNet "
+"The Awesomeness plugin adds additional awesomeness to a StatusNet "
 "installation."
 msgstr ""
 "Напрочуд дивовижний додаток додає додаткову напрочуд дивовижну "
diff --git a/plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po
new file mode 100644
index 0000000000..91bc2a567a
--- /dev/null
+++ b/plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po
@@ -0,0 +1,36 @@
+# Translation of StatusNet - Bookmark to Dutch (Nederlands)
+# Expored from translatewiki.net
+#
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Bookmark\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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-14 14:17:56+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-bookmark\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: bookmarkform.php:162
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Opslaan"
+
+#: 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."
diff --git a/plugins/Disqus/locale/Disqus.pot b/plugins/Disqus/locale/Disqus.pot
index debe3c17e7..602fc24119 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+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,22 +16,26 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: DisqusPlugin.php:142
+#. 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://"
 "disqus.com/?ref_noscript=%s)."
 msgstr ""
 
-#: DisqusPlugin.php:149
+#. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
+#: DisqusPlugin.php:151
 msgid "Comments powered by "
 msgstr ""
 
-#: DisqusPlugin.php:201
+#. TRANS: Plugin supplied feature for Disqus comments to notices.
+#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr ""
 
-#: DisqusPlugin.php:241
+#. 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/be-tarask/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/be-tarask/LC_MESSAGES/Disqus.po
index 65e52609c7..95ded0c7ce 100644
--- a/plugins/Disqus/locale/be-tarask/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/be-tarask/LC_MESSAGES/Disqus.po
@@ -10,20 +10,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:55+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:21:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\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"
 
-#: DisqusPlugin.php:142
+#. 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,15 +33,18 @@ msgstr ""
 "Калі ласка, дазвольце JavaScript каб праглядзець [камэнтары Disqus](http://"
 "disqus.com/?ref_noscript=%s)."
 
-#: DisqusPlugin.php:149
+#. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
+#: DisqusPlugin.php:151
 msgid "Comments powered by "
 msgstr "Камэнтары працуюць з дапамогай "
 
-#: DisqusPlugin.php:201
+#. TRANS: Plugin supplied feature for Disqus comments to notices.
+#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "Камэнтары"
 
-#: DisqusPlugin.php:241
+#. 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 167e9dd07c..5b2f49638e 100644
--- a/plugins/Disqus/locale/br/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/br/LC_MESSAGES/Disqus.po
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:55+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:21:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: DisqusPlugin.php:142
+#. 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://"
@@ -30,15 +31,18 @@ msgstr ""
 "Mar plij gweredekait JavaScript evit gwelet an [evezhiadennoù enlusket gant "
 "Disqus] (http://disqus.com/?ref_noscript=%s)."
 
-#: DisqusPlugin.php:149
+#. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
+#: DisqusPlugin.php:151
 msgid "Comments powered by "
 msgstr "Evezhiadennoù enlusket gant "
 
-#: DisqusPlugin.php:201
+#. TRANS: Plugin supplied feature for Disqus comments to notices.
+#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "Evezhiadennoù"
 
-#: DisqusPlugin.php:241
+#. 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 1cc9eb1b60..6427b5d86a 100644
--- a/plugins/Disqus/locale/de/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/de/LC_MESSAGES/Disqus.po
@@ -10,19 +10,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:55+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:21:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: DisqusPlugin.php:142
+#. 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://"
@@ -31,15 +32,18 @@ msgstr ""
 "Bitte aktiviere JavaScript, um die [von Disqus bereitgestellten Kommentare]"
 "(http://disqus.com/?ref_noscript=%s) anzuzeigen."
 
-#: DisqusPlugin.php:149
+#. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
+#: DisqusPlugin.php:151
 msgid "Comments powered by "
 msgstr ""
 
-#: DisqusPlugin.php:201
+#. TRANS: Plugin supplied feature for Disqus comments to notices.
+#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "Kommentare"
 
-#: DisqusPlugin.php:241
+#. 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 0701dd7bd4..fe3190a704 100644
--- a/plugins/Disqus/locale/es/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/es/LC_MESSAGES/Disqus.po
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:55+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:21:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: DisqusPlugin.php:142
+#. 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://"
@@ -30,15 +31,18 @@ msgstr ""
 "Por favor, habilita JavaScript para ver los [comentarios con tecnología de "
 "Disqus](http://disqus.com/?ref_noscript=%s)."
 
-#: DisqusPlugin.php:149
+#. 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 "
 
-#: DisqusPlugin.php:201
+#. TRANS: Plugin supplied feature for Disqus comments to notices.
+#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "Comentarios"
 
-#: DisqusPlugin.php:241
+#. 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 eb6e26b749..8bc2ac31fc 100644
--- a/plugins/Disqus/locale/fr/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/fr/LC_MESSAGES/Disqus.po
@@ -10,19 +10,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:55+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:21:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: DisqusPlugin.php:142
+#. 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://"
@@ -31,15 +32,18 @@ msgstr ""
 "Veuillez activer JavaScript pour voir les [commentaires propulsés par "
 "Disqus] (http://disqus.com/?ref_noscript=%s)."
 
-#: DisqusPlugin.php:149
+#. 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 "
 
-#: DisqusPlugin.php:201
+#. TRANS: Plugin supplied feature for Disqus comments to notices.
+#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "Commentaires"
 
-#: DisqusPlugin.php:241
+#. 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/gl/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/gl/LC_MESSAGES/Disqus.po
index 363e6c9929..1252b0997e 100644
--- a/plugins/Disqus/locale/gl/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/gl/LC_MESSAGES/Disqus.po
@@ -9,34 +9,38 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:55+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:21:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: DisqusPlugin.php:142
+#. 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://"
 "disqus.com/?ref_noscript=%s)."
 msgstr ""
 
-#: DisqusPlugin.php:149
+#. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
+#: DisqusPlugin.php:151
 msgid "Comments powered by "
 msgstr ""
 
-#: DisqusPlugin.php:201
+#. TRANS: Plugin supplied feature for Disqus comments to notices.
+#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "Comentarios"
 
-#: DisqusPlugin.php:241
+#. 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 1773bc3cd2..9f7f9ef831 100644
--- a/plugins/Disqus/locale/ia/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/ia/LC_MESSAGES/Disqus.po
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:55+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:21:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: DisqusPlugin.php:142
+#. 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://"
@@ -30,15 +31,18 @@ msgstr ""
 "Per favor activa JavaScript pro vider le [commentos actionate per Disqus]"
 "(http://disqus.com/?ref_noscript=%s)."
 
-#: DisqusPlugin.php:149
+#. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
+#: DisqusPlugin.php:151
 msgid "Comments powered by "
 msgstr "Commentos actionate per "
 
-#: DisqusPlugin.php:201
+#. TRANS: Plugin supplied feature for Disqus comments to notices.
+#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "Commentos"
 
-#: DisqusPlugin.php:241
+#. 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/lb/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/lb/LC_MESSAGES/Disqus.po
index 5c7b26d301..5d04646f23 100644
--- a/plugins/Disqus/locale/lb/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/lb/LC_MESSAGES/Disqus.po
@@ -9,34 +9,38 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:55+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35:47+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:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:21:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: lb\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: DisqusPlugin.php:142
+#. 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://"
 "disqus.com/?ref_noscript=%s)."
 msgstr ""
 
-#: DisqusPlugin.php:149
+#. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
+#: DisqusPlugin.php:151
 msgid "Comments powered by "
 msgstr ""
 
-#: DisqusPlugin.php:201
+#. TRANS: Plugin supplied feature for Disqus comments to notices.
+#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "Bemierkungen"
 
-#: DisqusPlugin.php:241
+#. 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 f155e4fe8f..b6c79488c8 100644
--- a/plugins/Disqus/locale/mk/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/mk/LC_MESSAGES/Disqus.po
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:55+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:21:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: DisqusPlugin.php:142
+#. 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://"
@@ -30,15 +31,18 @@ msgstr ""
 "Вклучете го JavaScript за да можете да ги прегледувате [коментарите "
 "овозможени од Disqus](http://disqus.com/?ref_noscript=%s)."
 
-#: DisqusPlugin.php:149
+#. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
+#: DisqusPlugin.php:151
 msgid "Comments powered by "
 msgstr "Коментарите ги овозможува "
 
-#: DisqusPlugin.php:201
+#. TRANS: Plugin supplied feature for Disqus comments to notices.
+#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "Коментари"
 
-#: DisqusPlugin.php:241
+#. 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 bbe0067ebe..338a777dae 100644
--- a/plugins/Disqus/locale/nb/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/nb/LC_MESSAGES/Disqus.po
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:55+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:21:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: DisqusPlugin.php:142
+#. 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://"
@@ -30,15 +31,18 @@ msgstr ""
 "Aktiver JavaScript for å vise [kommentarene levert av Disqus](http://disqus."
 "com/?ref_noscript=%s)."
 
-#: DisqusPlugin.php:149
+#. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
+#: DisqusPlugin.php:151
 msgid "Comments powered by "
 msgstr "Kommentarer levert av "
 
-#: DisqusPlugin.php:201
+#. TRANS: Plugin supplied feature for Disqus comments to notices.
+#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "Kommentarer"
 
-#: DisqusPlugin.php:241
+#. 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 1ec14913a0..8b89d830be 100644
--- a/plugins/Disqus/locale/nl/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/nl/LC_MESSAGES/Disqus.po
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:55+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:21:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: DisqusPlugin.php:142
+#. 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://"
@@ -30,15 +31,18 @@ msgstr ""
 "Schakel JavaScript in om de [reacties via Disqus](http://disqus.com/?"
 "ref_noscript=%s) te kunnen bekijken."
 
-#: DisqusPlugin.php:149
+#. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
+#: DisqusPlugin.php:151
 msgid "Comments powered by "
 msgstr "Reacties powered by "
 
-#: DisqusPlugin.php:201
+#. TRANS: Plugin supplied feature for Disqus comments to notices.
+#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "Reacties"
 
-#: DisqusPlugin.php:241
+#. 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 efeb1cf1fb..fe94a9f2d9 100644
--- a/plugins/Disqus/locale/ru/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/ru/LC_MESSAGES/Disqus.po
@@ -10,20 +10,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:55+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:21:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\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"
 
-#: DisqusPlugin.php:142
+#. 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,15 +33,18 @@ msgstr ""
 "Пожалуйста, включите JavaScript для просмотра [комментариев, работающих с "
 "помощью Disqus](http://disqus.com/?ref_noscript=%s)."
 
-#: DisqusPlugin.php:149
+#. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
+#: DisqusPlugin.php:151
 msgid "Comments powered by "
 msgstr "Комментарии работают с помощью "
 
-#: DisqusPlugin.php:201
+#. TRANS: Plugin supplied feature for Disqus comments to notices.
+#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "Комментарии"
 
-#: DisqusPlugin.php:241
+#. 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/te/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/te/LC_MESSAGES/Disqus.po
index 77524735f1..0da9864b22 100644
--- a/plugins/Disqus/locale/te/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/te/LC_MESSAGES/Disqus.po
@@ -9,34 +9,38 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:55+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35:48+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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:21:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: DisqusPlugin.php:142
+#. 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://"
 "disqus.com/?ref_noscript=%s)."
 msgstr ""
 
-#: DisqusPlugin.php:149
+#. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
+#: DisqusPlugin.php:151
 msgid "Comments powered by "
 msgstr ""
 
-#: DisqusPlugin.php:201
+#. TRANS: Plugin supplied feature for Disqus comments to notices.
+#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "వ్యాఖ్యలు"
 
-#: DisqusPlugin.php:241
+#. 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 c93c1de672..cfb75a6806 100644
--- a/plugins/Disqus/locale/tl/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/tl/LC_MESSAGES/Disqus.po
@@ -9,19 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:55+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:21:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\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"
 
-#: DisqusPlugin.php:142
+#. 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://"
@@ -30,15 +31,18 @@ msgstr ""
 "Mangyaring paganahin ang JavaScript upang matingnan ang [mga punang "
 "pinapatakbo ng Disqus](http://disqus.com/?ref_noscript=%s)."
 
-#: DisqusPlugin.php:149
+#. 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 "
 
-#: DisqusPlugin.php:201
+#. TRANS: Plugin supplied feature for Disqus comments to notices.
+#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "Mga puna"
 
-#: DisqusPlugin.php:241
+#. 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 0ff85249c8..22b213ccdc 100644
--- a/plugins/Disqus/locale/uk/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/uk/LC_MESSAGES/Disqus.po
@@ -9,20 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:55+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:21:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\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"
 
-#: DisqusPlugin.php:142
+#. 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://"
@@ -31,15 +32,18 @@ msgstr ""
 "Будь ласка, увімкніть JavaScript для перегляду [коментарів Disqus](http://"
 "disqus.com/?ref_noscript=%s)."
 
-#: DisqusPlugin.php:149
+#. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
+#: DisqusPlugin.php:151
 msgid "Comments powered by "
 msgstr "Коментування можливе завдяки сервісу "
 
-#: DisqusPlugin.php:201
+#. TRANS: Plugin supplied feature for Disqus comments to notices.
+#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "Коментарі"
 
-#: DisqusPlugin.php:241
+#. 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 3507e1be9d..e667285b6a 100644
--- a/plugins/Disqus/locale/zh_CN/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/zh_CN/LC_MESSAGES/Disqus.po
@@ -9,20 +9,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:55+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:21:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: DisqusPlugin.php:142
+#. 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://"
@@ -31,15 +32,18 @@ msgstr ""
 "请启用 JavaScript 来查看 [通过 Disqus 的评论](http://disqus.com/?"
 "ref_noscript=%s)。"
 
-#: DisqusPlugin.php:149
+#. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
+#: DisqusPlugin.php:151
 msgid "Comments powered by "
 msgstr "通过 Disqus 的评论"
 
-#: DisqusPlugin.php:201
+#. TRANS: Plugin supplied feature for Disqus comments to notices.
+#: DisqusPlugin.php:204
 msgid "Comments"
 msgstr "评论"
 
-#: DisqusPlugin.php:241
+#. 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/Facebook/locale/nl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
index 9802bfa379..794c5db7e4 100644
--- a/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:06+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:35: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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:21:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -405,7 +405,7 @@ msgstr " een nieuwe gebruiker."
 
 #: facebookaction.php:242
 msgid "Register"
-msgstr "Registreer"
+msgstr "Registreren"
 
 #: facebookaction.php:274
 msgid "Nickname"
diff --git a/plugins/NewMenu/locale/nl/LC_MESSAGES/NewMenu.po b/plugins/NewMenu/locale/nl/LC_MESSAGES/NewMenu.po
new file mode 100644
index 0000000000..4bbaa0867e
--- /dev/null
+++ b/plugins/NewMenu/locale/nl/LC_MESSAGES/NewMenu.po
@@ -0,0 +1,98 @@
+# Translation of StatusNet - NewMenu to Dutch (Nederlands)
+# Expored from translatewiki.net
+#
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - NewMenu\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:36: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-14 14:18:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-newmenu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: NewMenuPlugin.php:99
+msgid "Home"
+msgstr "Hoofdmenu"
+
+#: NewMenuPlugin.php:100
+msgid "Friends timeline"
+msgstr "Tijdlijn van vrienden"
+
+#: NewMenuPlugin.php:105
+msgid "Profile"
+msgstr "Profiel"
+
+#: NewMenuPlugin.php:106
+msgid "Your profile"
+msgstr "Uw profiel"
+
+#: NewMenuPlugin.php:110 NewMenuPlugin.php:133
+msgid "Public"
+msgstr "Publiek"
+
+#: NewMenuPlugin.php:111 NewMenuPlugin.php:134
+msgid "Everyone on this site"
+msgstr "Iedereen binnen deze site"
+
+#: NewMenuPlugin.php:115
+msgid "Settings"
+msgstr "Instellingen"
+
+#: NewMenuPlugin.php:116
+msgid "Change your personal settings"
+msgstr "Uw persoonlijke instellingen wijzigen"
+
+#: NewMenuPlugin.php:121
+msgid "Admin"
+msgstr "Beheer"
+
+#: NewMenuPlugin.php:122
+msgid "Site configuration"
+msgstr "Siteinstellingen"
+
+#: NewMenuPlugin.php:127
+msgid "Logout"
+msgstr "Afmelden"
+
+#: NewMenuPlugin.php:128
+msgid "Logout from the site"
+msgstr "Afmelden van de site"
+
+#: NewMenuPlugin.php:138
+msgid "Login"
+msgstr "Aanmelden"
+
+#: NewMenuPlugin.php:139
+msgid "Login to the site"
+msgstr "Aanmelden bij deze site"
+
+#: NewMenuPlugin.php:146
+msgid "Search"
+msgstr "Zoeken"
+
+#: NewMenuPlugin.php:147
+msgid "Search the site"
+msgstr "De site doorzoeken"
+
+#: NewMenuPlugin.php:332
+msgid "IM"
+msgstr "IM"
+
+#: NewMenuPlugin.php:339
+msgid "SMS"
+msgstr "SMS"
+
+#: NewMenuPlugin.php:431
+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/SQLProfile/locale/SQLProfile.pot b/plugins/SQLProfile/locale/SQLProfile.pot
index f0e58516b6..c4f85c6fa1 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-14 10:29+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+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,5 +17,5 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: SQLProfilePlugin.php:41
-msgid "Debug tool to watch for poorly indexed DB queries"
+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
new file mode 100644
index 0000000000..d1c1c8e5e1
--- /dev/null
+++ b/plugins/SQLProfile/locale/nl/LC_MESSAGES/SQLProfile.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - SQLProfile to Dutch (Nederlands)
+# Expored from translatewiki.net
+#
+# Author: Siebrand
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SQLProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23:37: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-14 14:17:53+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: nl\n"
+"X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: SQLProfilePlugin.php:41
+#, fuzzy
+msgid "Debug tool to watch for poorly indexed DB queries."
+msgstr "Debughulpmiddel om slecht geïndexeerde databasequery's te ontdekken."
diff --git a/plugins/Sitemap/locale/ia/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/ia/LC_MESSAGES/Sitemap.po
index b2a2dddf1e..0ed373cc5f 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:56+0000\n"
+"POT-Creation-Date: 2011-01-14 23:32+0000\n"
+"PO-Revision-Date: 2011-01-14 23: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: 2010-11-07 21:21:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:22+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-sitemap\n"
@@ -24,7 +24,7 @@ msgstr ""
 #. TRANS: Title for sitemap.
 #: sitemapadminpanel.php:53
 msgid "Sitemap"
-msgstr "Mappa de sito"
+msgstr "Mappa del sito"
 
 #. TRANS: Instructions for sitemap.
 #: sitemapadminpanel.php:64
@@ -81,7 +81,7 @@ msgstr "Configuration de mappa de sito"
 #: SitemapPlugin.php:213
 msgctxt "MENU"
 msgid "Sitemap"
-msgstr "Mappa de sito"
+msgstr "Mappa del sito"
 
 #. TRANS: Plugin description.
 #: SitemapPlugin.php:238

From f1820459a8bb66236392b53c29276c5bba9177dc Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sat, 15 Jan 2011 01:30:01 +0100
Subject: [PATCH 055/314] Localisation updates from http://translatewiki.net.

---
 locale/el/LC_MESSAGES/statusnet.po            | 5544 ++++++++++++---
 locale/he/LC_MESSAGES/statusnet.po            | 6036 ++++++++++++++---
 locale/ia/LC_MESSAGES/statusnet.po            |   38 +-
 locale/nl/LC_MESSAGES/statusnet.po            |   85 +-
 .../Adsense/locale/he/LC_MESSAGES/Adsense.po  |  101 +
 .../Adsense/locale/pl/LC_MESSAGES/Adsense.po  |  102 +
 .../locale/br/LC_MESSAGES/Gravatar.po         |   72 +
 .../locale/gl/LC_MESSAGES/Gravatar.po         |   72 +
 .../locale/te/LC_MESSAGES/Gravatar.po         |   72 +
 .../locale/zh_CN/LC_MESSAGES/OStatus.po       |  758 +++
 plugins/OpenX/locale/lb/LC_MESSAGES/OpenX.po  |  109 +
 plugins/OpenX/locale/tr/LC_MESSAGES/OpenX.po  |  109 +
 .../locale/ru/LC_MESSAGES/Realtime.po         |   59 +
 .../locale/br/LC_MESSAGES/SubMirror.po        |  135 +
 .../locale/ru/LC_MESSAGES/TwitterBridge.po    |  372 +
 15 files changed, 11805 insertions(+), 1859 deletions(-)
 create mode 100644 plugins/Adsense/locale/he/LC_MESSAGES/Adsense.po
 create mode 100644 plugins/Adsense/locale/pl/LC_MESSAGES/Adsense.po
 create mode 100644 plugins/Gravatar/locale/br/LC_MESSAGES/Gravatar.po
 create mode 100644 plugins/Gravatar/locale/gl/LC_MESSAGES/Gravatar.po
 create mode 100644 plugins/Gravatar/locale/te/LC_MESSAGES/Gravatar.po
 create mode 100644 plugins/OStatus/locale/zh_CN/LC_MESSAGES/OStatus.po
 create mode 100644 plugins/OpenX/locale/lb/LC_MESSAGES/OpenX.po
 create mode 100644 plugins/OpenX/locale/tr/LC_MESSAGES/OpenX.po
 create mode 100644 plugins/Realtime/locale/ru/LC_MESSAGES/Realtime.po
 create mode 100644 plugins/SubMirror/locale/br/LC_MESSAGES/SubMirror.po
 create mode 100644 plugins/TwitterBridge/locale/ru/LC_MESSAGES/TwitterBridge.po

diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po
index 5543c1f24c..260bdbdfd3 100644
--- a/locale/el/LC_MESSAGES/statusnet.po
+++ b/locale/el/LC_MESSAGES/statusnet.po
@@ -3,6 +3,7 @@
 #
 # Author: Crazymadlover
 # Author: Dead3y3
+# Author: Evropi
 # Author: Omnipaedista
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -11,149 +12,185 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:07:34+0000\n"
+"POT-Creation-Date: 2011-01-15 00:20+0000\n"
+"PO-Revision-Date: 2011-01-15 00:22:28+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-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80364); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: el\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 2011-01-15 00:06:50+0000\n"
 
-#. TRANS: Page title
+#. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
+#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
 msgid "Access"
 msgstr "Πρόσβαση"
 
-#. TRANS: Page notice
-#: actions/accessadminpanel.php:67
+#. TRANS: Page notice.
+#: actions/accessadminpanel.php:64
 msgid "Site access settings"
 msgstr "Ρυθμίσεις πρόσβασης ιστοτόπου"
 
 #. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:161
+#: actions/accessadminpanel.php:151
 msgid "Registration"
 msgstr "Εγγραφή"
 
-#. TRANS: Checkbox instructions for admin setting "Private"
-#: actions/accessadminpanel.php:165
+#. 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:167
+#: actions/accessadminpanel.php:157
 msgctxt "LABEL"
 msgid "Private"
 msgstr "Ιδιωτικό"
 
-#. TRANS: Checkbox instructions for admin setting "Invite only"
-#: actions/accessadminpanel.php:174
+#. 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:176
+#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr "Μόνο με πρόσκληση"
 
-#. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations)
-#: actions/accessadminpanel.php:183
+#. 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:185
+#: actions/accessadminpanel.php:175
 msgid "Closed"
 msgstr "Κλειστό"
 
-#. TRANS: Title / tooltip for button to save access settings in site admin panel
-#: actions/accessadminpanel.php:202
+#. TRANS: Title for button to save access settings in site admin panel.
+#: actions/accessadminpanel.php:191
 msgid "Save access settings"
 msgstr "Αποθήκευση ρυθμίσεων πρόσβασης"
 
+#. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button text to store form data in the Paths admin panel.
+#. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
 #. TRANS: Button label to save SMS preferences.
+#. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
 #. TRANS: Button label in the "Edit application" form.
-#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
-#: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#. TRANS: Button text on profile design page to save settings.
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/designsettings.php:270
+#: lib/groupeditform.php:207
 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:138 actions/tag.php:52
 msgid "No such page."
 msgstr "Κανένας τέτοιος χρήστης."
 
+#. TRANS: Client error when user not found for an action.
+#. TRANS: Client error when user not found for an rss related action.
+#. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
+#. TRANS: Client error displayed if a user could not be found.
+#. TRANS: Client error when user not found updating a profile background image.
+#. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error when user not found for an API action to remove a block for a user.
+#. TRANS: Client error given when a user was not found (404).
+#. TRANS: Client error when user not found for an API direct message action.
+#. TRANS: Client error given when a user was not found (404).
+#. 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 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.
+#. TRANS: Client error displayed when requesting dents of a user and friends for a user that does not exist.
+#. TRANS: Client error displayed when requesting most recent dents by user and friends for a non-existing user.
+#. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
+#. TRANS: Client error displayed requesting most recent notices for a non-existing user.
+#. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
-#: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:115
-#: actions/apiaccountupdateprofile.php:106
-#: actions/apiaccountupdateprofilebackgroundimage.php:117
-#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
-#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
-#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
-#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
-#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
-#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:76 actions/remotesubscribe.php:145
-#: actions/remotesubscribe.php:154 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
-#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
+#: 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:60
+#: actions/apiblockcreate.php:95 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/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:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
+#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:105 actions/userbyid.php:74
+#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Κανένας τέτοιος χρήστης."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:90
+#: actions/all.php:91
 #, php-format
 msgid "%1$s and friends, page %2$d"
 msgstr "%1$s και φίλοι, σελίδα 2%$d"
 
-#. TRANS: Page title. %1$s is user nickname
-#. TRANS: H1 text. %1$s is user nickname
+#. TRANS: Page title. %s is user nickname
+#. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
-#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
-#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
-#: lib/personalgroupnav.php:100
+#. 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:103
 #, php-format
 msgid "%s and friends"
 msgstr "%s και οι φίλοι του/της"
 
-#. TRANS: %1$s is user nickname
-#: actions/all.php:107
+#. 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: %1$s is user nickname
-#: actions/all.php:116
+#. 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: %1$s is user nickname
-#: actions/all.php:125
+#. TRANS: %s is user nickname.
+#: actions/all.php:126
 #, php-format
 msgid "Feed for friends of %s (Atom)"
 msgstr "Ροή φίλων του/της %s (Atom)"
 
-#. TRANS: %1$s is user nickname
-#: actions/all.php:138
+#. 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."
@@ -161,315 +198,643 @@ msgstr ""
 "Αυτό είναι το χρονοδιάγραμμα για %s και φίλους, αλλά κανείς δεν έχει κάνει "
 "καμία αποστολή ακόμα."
 
-#: actions/all.php:143
+#. 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%%) ή αποστείλετε κάτι ο ίδιος."
+"Δοκιμάστε την εγγραφή σε περισσότερους ανθρώπους, [ενταχθείτε σε μια ομάδα](%"
+"%action.groups%%) ή αποστείλετε κάτι ο ίδιος."
 
-#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:146
+#. 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 "
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
+#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. 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
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 "post a notice to them."
 msgstr ""
 
-#. TRANS: H1 text
-#: actions/all.php:182
+#. 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"
+
+#. TRANS: Client error displayed handling a non-existing API method.
+#. TRANS: Client error displayed when trying to handle an unknown API method.
+#. TRANS: Client error displayed trying to execute an unknown API method updating profile colours.
+#. TRANS: Client error displayed trying to execute an unknown API method verifying user credentials.
+#. TRANS: Client error given when an API method was not found (404).
+#. TRANS: Client error displayed when trying to handle an unknown API method.
+#. TRANS: Client error displayed trying to execute an unknown API method showing friendship.
+#. TRANS: Client error given when an API method was not found (404).
+#. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed trying to execute an unknown API method joining a group.
+#. TRANS: Client error displayed trying to execute an unknown API method leaving a group.
+#. 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 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:160
+#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: 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/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
+#, fuzzy
+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:87
-#: actions/apiaccountupdateprofile.php:90
-#: actions/apiaccountupdateprofilebackgroundimage.php:87
-#: actions/apiaccountupdateprofilecolors.php:111
-#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
-#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
-#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
-#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
-#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
-#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
-#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
+#: 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/apimediaupload.php:66
+#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:107
+#. 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."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:109
-#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:123 actions/editapplication.php:118
-#: actions/newapplication.php:101 actions/newnotice.php:94
-#: lib/designsettings.php:283
+#. TRANS: Server error displayed when a user's delivery device cannot be updated.
+#: actions/apiaccountupdatedeliverydevice.php:130
+#, fuzzy
+msgid "Could not update user."
+msgstr "Απέτυχε η ενημέρωση του χρήστη."
+
+#. TRANS: Client error displayed if a user profile could not be found.
+#. TRANS: Client error displayed when a user has no profile.
+#. TRANS: Client error displayed a user has no profile updating profile colours.
+#. TRANS: Client error displayed if a user profile could not be found updating a profile image.
+#. TRANS: Client error displayed when requesting user information for a user without a profile.
+#. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#: actions/apiaccountupdateprofile.php:111
+#: actions/apiaccountupdateprofilebackgroundimage.php:199
+#: actions/apiaccountupdateprofilecolors.php:183
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
+#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
+#: lib/profileaction.php:84
+#, fuzzy
+msgid "User has no profile."
+msgstr "Προφίλ χρήστη"
+
+#. TRANS: Server error displayed if a user profile could not be saved.
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+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:125 actions/editapplication.php:121
+#: actions/newapplication.php:104 actions/newnotice.php:95
+#: lib/designsettings.php:298
 #, php-format
 msgid ""
+"The server was unable to handle that much POST data (%s byte) due to its "
+"current configuration."
+msgid_plural ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
 "current configuration."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:137
-#: actions/apiaccountupdateprofilebackgroundimage.php:147
-#: actions/apiaccountupdateprofilecolors.php:165
-#: actions/apiaccountupdateprofilecolors.php:175
+#. TRANS: Client error displayed when saving design settings fails because of an empty id.
+#. TRANS: Client error displayed when saving design settings fails because of an empty result.
+#. TRANS: Client error displayed when a database error occurs inserting profile colours.
+#. TRANS: Client error displayed when a database error occurs updating profile colours.
+#: actions/apiaccountupdateprofilebackgroundimage.php:138
+#: actions/apiaccountupdateprofilebackgroundimage.php:149
+#: actions/apiaccountupdateprofilecolors.php:160
+#: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr ""
 
-#: actions/apiblockcreate.php:106
+#. 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
+#, fuzzy
+msgid "Could not update your design."
+msgstr "Απέτυχε η ενημέρωση του χρήστη."
+
+#: actions/apiatomservice.php:86
+msgid "Main"
+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:139
+#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
+#: lib/atomusernoticefeed.php:68
+#, php-format
+msgid "%s timeline"
+msgstr "χρονοδιάγραμμα του χρήστη %s"
+
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "Όλες οι συνδρομές"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, php-format
+msgid "%s favorites"
+msgstr ""
+
+#: actions/apiatomservice.php:123
+#, php-format
+msgid "%s memberships"
+msgstr ""
+
+#. TRANS: Client error displayed when users try to block themselves.
+#: actions/apiblockcreate.php:104
 msgid "You cannot block yourself!"
 msgstr "Δεν μπορείτε να κάνετε φραγή στον εαυτό σας!"
 
-#: actions/apiblockcreate.php:127
+#. TRANS: Server error displayed when blocking a user has failed.
+#: actions/apiblockcreate.php:126
 msgid "Block user failed."
 msgstr ""
 
-#: actions/apiblockdestroy.php:115
+#. TRANS: Server error displayed when unblocking a user has failed.
+#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr ""
 
-#: actions/apidirectmessage.php:89
+#. TRANS: Title. %s is a user nickname.
+#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr ""
 
+#. TRANS: Subtitle. %s is a user nickname.
 #: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
-#: actions/apidirectmessage.php:101
+#. TRANS: Title. %s is a user nickname.
+#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
-#: actions/apidirectmessage.php:105
+#. TRANS: Subtitle. %s is a user nickname.
+#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/apidirectmessagenew.php:119
+#. TRANS: Client error displayed when no message text was submitted (406).
+#: actions/apidirectmessagenew.php:117
 msgid "No message text!"
 msgstr ""
 
-#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
+#. TRANS: Client error displayed when message content is too long.
+#. 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. Max message size is %d chars."
-msgstr ""
+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] ""
 
-#: actions/apidirectmessagenew.php:143
+#. TRANS: Client error displayed if a recipient user could not be found (403).
+#: actions/apidirectmessagenew.php:139
+#, fuzzy
+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 "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
+#. 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 ""
+
+#. 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 ""
 
-#: actions/apifavoritecreate.php:121
+#. 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 ""
 
-#: actions/apifavoritedestroy.php:124
+#. TRANS: Client error displayed when marking a notice as favourite fails.
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:294
+#, fuzzy
+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 ""
 
-#: actions/apifriendshipscreate.php:110
+#. TRANS: Client error displayed when removing a favourite has failed.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#, fuzzy
+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 είναι ήδη στη λίστα σου."
 
-#: actions/apifriendshipscreate.php:119
+#. 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 είναι ήδη στη λίστα σου."
 
-#: actions/apifriendshipsdestroy.php:110
+#. 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 "Δεν μπορείτε να κάνετε φραγή στον εαυτό σας!"
 
-#: actions/apifriendshipsexists.php:91
-msgid "Two valid IDs or screen_names must be supplied."
+#. 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 ""
 
-#: actions/apifriendshipsshow.php:142
+#. 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 "Απέτυχε η ενημέρωση του χρήστη."
 
-#: actions/apigroupcreate.php:168 actions/editgroup.php:186
-#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:212
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "Το ψευδώνυμο πρέπει να έχει μόνο πεζούς χαρακτήρες και χωρίς κενά."
-
-#: actions/apigroupcreate.php:177 actions/editgroup.php:190
-#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:215
+#. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. 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:189
+#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Το ψευδώνυμο είναι ήδη σε χρήση. Δοκιμάστε κάποιο άλλο."
 
-#: actions/apigroupcreate.php:184 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:217
+#. TRANS: Client error in form for group creation.
+#. 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:193
+#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr ""
 
-#: actions/apigroupcreate.php:200 actions/editapplication.php:215
-#: actions/editgroup.php:199 actions/newapplication.php:203
-#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:224
+#. TRANS: Client error in form for group creation.
+#. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL."
 
-#: actions/apigroupcreate.php:209 actions/editgroup.php:202
-#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:227
-msgid "Full name is too long (max 255 chars)."
-msgstr "Το ονοματεπώνυμο είναι πολύ μεγάλο (μέγιστο 255 χαρακτ.)."
-
-#: actions/apigroupcreate.php:217 actions/editapplication.php:190
-#: actions/newapplication.php:172
-#, php-format
-msgid "Description is too long (max %d chars)."
-msgstr "Η περιγραφή είναι πολύ μεγάλη (μέγιστο %d χαρακτ.)."
-
-#: actions/apigroupcreate.php:228 actions/editgroup.php:208
-#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:234
-msgid "Location is too long (max 255 chars)."
-msgstr "Η τοποθεσία είναι πολύ μεγάλη (μέγιστο 255 χαρακτ.)."
-
-#: actions/apigroupcreate.php:247 actions/editgroup.php:219
-#: actions/newgroup.php:159
-#, php-format
-msgid "Too many aliases! Maximum %d."
+#. TRANS: Client error in form for group creation.
+#. 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:204
+#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/register.php:226
+msgid "Full name is too long (maximum 255 characters)."
 msgstr ""
 
-#: actions/apigroupcreate.php:290 actions/editgroup.php:238
-#: actions/newgroup.php:178
+#. TRANS: Client error shown when providing too long a description during group creation.
+#. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
+#. TRANS: Group edit form validation error.
+#. TRANS: Form validation error in New application form.
+#. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:156
+#, php-format
+msgid "Description is too long (maximum %d character)."
+msgid_plural "Description is too long (maximum %d characters)."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Client error shown when providing too long a location during group creation.
+#. 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:216
+#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/register.php:235
+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: 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:229
+#: actions/newgroup.php:176
+#, php-format
+msgid "Too many aliases! Maximum %d allowed."
+msgid_plural "Too many aliases! Maximum %d allowed."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Client error shown when providing an invalid alias during group creation.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupcreate.php:253
+#, fuzzy, 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: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:191
+#, 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.
+#. TRANS: Group create form validation error.
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
-#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
-#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
+#. TRANS: Client error displayed when checking group membership for a non-existing group.
+#. 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 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:89
+#: 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: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#, fuzzy
+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: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
 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: 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:140 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:142 actions/joingroup.php:134 lib/command.php:350
 #, 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
+#, fuzzy
+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: 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:126 actions/leavegroup.php:129
-#: lib/command.php:401
+#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Δεν ήταν δυνατή η δημιουργία ομάδας."
 
-#. TRANS: %s is a user name
-#: actions/apigrouplist.php:98
+#. 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"
 
-#: actions/apigrouplistall.php:96
+#. 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 "Δεν είστε μέλος καμίας ομάδας."
+
+#. 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
+#, fuzzy, 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"
 
-#: actions/apioauthauthorize.php:101
+#. 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:101
+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 ""
 
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
+#. 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 ""
+
+#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
+#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:230
-#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:350
+#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
+#: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
+#: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: actions/apioauthauthorize.php:135
+#. 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 ""
 
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
+#. TRANS: Server error displayed when a database action fails.
+#: actions/apioauthauthorize.php:217
+msgid "Database error inserting oauth_token_association."
 msgstr ""
 
+#. 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.
+#. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
-#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:290 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:121
+#. TRANS: Unknown form validation error in design settings form.
+#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
+#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr ""
 
-#: actions/apioauthauthorize.php:259
+#. 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 ""
 
-#: actions/apioauthauthorize.php:276
+#. TRANS: Fieldset legend.
+#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr ""
 
-#: actions/apioauthauthorize.php:292
+#. 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 "
+"account data. You should only give access to your %4$s account to third "
+"parties you trust."
+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 "
@@ -477,194 +842,647 @@ msgid ""
 "give access to your %4$s account to third parties you trust."
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:463
+#. TRANS: Fieldset legend.
+#: actions/apioauthauthorize.php:455
+msgctxt "LEGEND"
 msgid "Account"
-msgstr "Λογαριασμός"
+msgstr ""
 
-#: actions/apioauthauthorize.php:313 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:431
-#: actions/showgroup.php:245 actions/tagother.php:94
+#. 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.
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:132
+#: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Ψευδώνυμο"
 
+#. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:437 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Κωδικός"
 
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-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 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:128
+#: actions/imsettings.php:131 actions/smssettings.php:137
+#: lib/applicationeditform.php:351
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "Ακύρωση"
 
-#: actions/apioauthauthorize.php:334
+#. 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 "Να επιτραπεί"
-
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
 msgstr ""
 
-#: actions/apistatusesdestroy.php:112
+#. 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."
+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 "
+"process."
+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 ""
 
-#: actions/apistatusesdestroy.php:135
+#. 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 ""
 
-#: actions/apistatusesshow.php:139
+#. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
+#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
+#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
+#, fuzzy
+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:537
+#, fuzzy
+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
+#, fuzzy
+msgid "Already repeated that notice."
+msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
+
+#. TRANS: Client error shown when using a non-supported HTTP method.
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:122
+#: actions/atompubsubscriptionfeed.php:109
+msgid "HTTP method not supported."
+msgstr ""
+
+#: actions/apistatusesshow.php:141
+#, php-format
+msgid "Unsupported format: %s"
+msgstr ""
+
+#. TRANS: Client error displayed requesting a deleted status.
+#: actions/apistatusesshow.php:152
 msgid "Status deleted."
 msgstr "Η κατάσταση διεγράφη."
 
-#: actions/apistatusesshow.php:145
+#. TRANS: Client error displayed requesting a status with an invalid ID.
+#: actions/apistatusesshow.php:159
 msgid "No status with that ID found."
 msgstr ""
 
-#: actions/apistatusesupdate.php:222
+#: actions/apistatusesshow.php:223
+msgid "Can only delete using the Atom format."
+msgstr ""
+
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
+msgid "Can't delete this notice."
+msgstr "Είσαι σίγουρος ότι θες να διαγράψεις αυτό το μήνυμα;"
+
+#: actions/apistatusesshow.php:243
+#, 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 ""
 
-#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
+#. 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. Max notice size is %d chars."
+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] ""
+msgstr[1] ""
+
+#. TRANS: Client error displayed when replying to a non-existing notice.
+#: actions/apistatusesupdate.php:284
+msgid "Parent notice not found."
 msgstr ""
 
-#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
-msgid "Not found."
-msgstr ""
-
-#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
+#. 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 "Max notice size is %d chars, including attachment URL."
-msgstr ""
+msgid "Maximum notice size is %d character, including attachment URL."
+msgid_plural "Maximum notice size is %d characters, including attachment URL."
+msgstr[0] ""
+msgstr[1] ""
 
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#. 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 ""
 
-#: actions/apitimelinefavorites.php:110
+#. 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 ""
 
-#: actions/apitimelinefavorites.php:119
+#. 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 / %2$s."
+msgid "%1$s updates favorited by %2$s / %3$s."
 msgstr ""
 
-#: actions/apitimelinementions.php:118
+#. 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
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 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 ""
 
-#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
+#. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
+#, fuzzy, 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
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: actions/apitimelineretweetsofme.php:114
+#. 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:108
+#, fuzzy, php-format
+msgid "Repeated to %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
 #, php-format
 msgid "Repeats of %s"
 msgstr ""
 
-#: actions/apitimelinetag.php:105 actions/tag.php:67
+#. TRANS: Title for timeline with lastest notices with a given tag.
+#. TRANS: %s is the tag.
+#: actions/apitimelinetag.php:101 actions/tag.php:67
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:65
+#. 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 ""
 
-#: actions/apitrends.php:87
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
+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
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
+msgstr ""
+
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
+msgid "Atom post must be an Atom entry."
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:334
+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
+#, php-format
+msgid "Cannot handle activity object type \"%s\"."
+msgstr ""
+
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:378
+#, php-format
+msgid "No content for notice %d."
+msgstr ""
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:406
+#, php-format
+msgid "Notice with URI \"%s\" already exists."
+msgstr ""
+
+#: actions/apitimelineuser.php:437
+#, php-format
+msgid "AtomPub post with unknown attention URI %s"
+msgstr ""
+
+#. TRANS: Server error for unfinished API method showTrends.
+#: actions/apitrends.php:85
 msgid "API method under construction."
 msgstr "Η μέθοδος του ΑΡΙ είναι υπό κατασκευή."
 
-#: actions/avatarbynickname.php:64
+#. 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 ""
+
+#: actions/atompubfavoritefeed.php:70
+msgid "No such profile"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+msgid "Can't add someone else's subscription"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+msgid "Can only fave notices."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:256
+msgid "Unknown note."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:263
+msgid "Already a favorite."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+msgid "No such profile."
+msgstr "Κανένας τέτοιος χρήστης."
+
+#: actions/atompubmembershipfeed.php:144
+#, php-format
+msgid "%s group memberships"
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:147
+#, php-format
+msgid "Groups %s is a member of on %s"
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+msgid "Unknown group."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:263
+msgid "Already a member."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+msgid "No such favorite."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:151
+msgid "Can't delete someone else's favorite"
+msgstr ""
+
+#: actions/atompubshowmembership.php:81
+msgid "No such group"
+msgstr "Δεν υπάρχει τέτοια ομάδα"
+
+#: actions/atompubshowmembership.php:90
+msgid "Not a member"
+msgstr ""
+
+#: actions/atompubshowmembership.php:115
+msgid "Method not supported"
+msgstr ""
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't 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 ""
+
+#. 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 ""
+
+#: actions/atompubsubscriptionfeed.php:150
+#, php-format
+msgid "People %s has subscribed to on %s"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, php-format
+msgid "Unknown profile %s"
+msgstr ""
+
+#. TRANS: Client error displayed trying to get a non-existing attachment.
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "Κανένας τέτοιος χρήστης."
+
+#. TRANS: Client error displayed trying to get an avatar without providing a nickname.
+#. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
+#. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. 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:91 actions/showgroup.php:116
+#, fuzzy
+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 ""
 
-#: actions/avatarbynickname.php:69
+#. 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.
+#. TRANS: Label for group avatar (dt). Text hidden by default.
 #. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:67 actions/showgroup.php:230
-#: lib/accountsettingsaction.php:118
+#: actions/avatarsettings.php:66 actions/showgroup.php:224
+#: lib/accountsettingsaction.php:113
 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 ""
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
+#. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
+#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
 #: actions/grouplogo.php:181 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr ""
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
+#. TRANS: Avatar upload page form legend.
+#. TRANS: Avatar upload page crop form legend.
+#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
 #: actions/grouplogo.php:254
 msgid "Avatar settings"
 msgstr "Ρυθμίσεις του άβαταρ"
 
-#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
+#. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
+#. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
+#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
 #: actions/grouplogo.php:202 actions/grouplogo.php:262
 msgid "Original"
 msgstr ""
 
-#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
+#. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
+#. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
+#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
 #: actions/grouplogo.php:213 actions/grouplogo.php:274
 msgid "Preview"
 msgstr ""
 
-#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:657
+#. 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 "Διαγραφή"
+msgstr ""
 
-#: actions/avatarsettings.php:166 actions/grouplogo.php:236
+#. 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 ""
 
-#: actions/avatarsettings.php:305
+#. 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 ""
 
-#: actions/avatarsettings.php:332
+#. TRANS: Avatar upload form unstruction after uploading a file.
+#: actions/avatarsettings.php:346
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: actions/avatarsettings.php:347 actions/grouplogo.php:380
+#. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:380
 msgid "Lost our file data."
 msgstr ""
 
-#: actions/avatarsettings.php:370
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr ""
 
-#: actions/avatarsettings.php:373
+#. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr ""
 
-#: actions/avatarsettings.php:397
+#. TRANS: Success message for deleting a user avatar.
+#: actions/avatarsettings.php:413
 msgid "Avatar deleted."
 msgstr "Η κατάσταση διεγράφη."
 
-#: actions/block.php:138
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+msgid "Only logged-in users can backup their account."
+msgstr ""
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr ""
+
+#: actions/backupaccount.php:258
+msgid "Backup your account"
+msgstr ""
+
+#. TRANS: Client error displayed when blocking a user that has already been blocked.
+#: actions/block.php:68
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
+
+#. TRANS: Title for block user page.
+#. TRANS: Legend for block user form.
+#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#, fuzzy
+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 "
@@ -673,156 +1491,415 @@ msgstr ""
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete group form.
 #. 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:153 actions/deleteapplication.php:154
-#: actions/deletenotice.php:147 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/block.php:154 actions/deleteapplication.php:157
+#: actions/deletegroup.php:220 actions/deletenotice.php:155
+#: actions/deleteuser.php:152 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Κανένα"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:157 actions/deleteuser.php:156
+#: actions/block.php:158 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "Διαγράψτε αυτόν τον χρήστη"
 
-#: actions/block.php:187
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete group form.
+#. 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:159 actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
+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
+#, 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: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. 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/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
-#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
+#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
+#: actions/deletegroup.php:87 actions/deletegroup.php:100
+#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
 #: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:86 actions/joingroup.php:82
+#: actions/groupunblock.php:88 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
-#: lib/command.php:383
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
 msgid "No such group."
 msgstr "Κανένας τέτοιος χρήστης."
 
-#: actions/blockedfromgroup.php:97
+#. 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 "Προφίλ χρήστη"
 
-#: actions/blockedfromgroup.php:100
+#. 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"
 
-#: actions/blockedfromgroup.php:115
+#. 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 ""
 
-#: actions/blockedfromgroup.php:288
+#. TRANS: Form legend for unblocking a user from a group.
+#: actions/blockedfromgroup.php:291
 msgid "Unblock user from group"
 msgstr ""
 
-#. TRANS: Title for the form to unblock a user.
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
+#. 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
+#, fuzzy
+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
+#, fuzzy
+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: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
-#: actions/confirmaddress.php:91
+#. TRANS: Client error displayed when not providing a confirmation code for another user in the contact address confirmation action.
+#: actions/confirmaddress.php:86
+#, fuzzy
+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: Client error for an already confirmed email/jabber/sms address.
+#: actions/confirmaddress.php:97
+#, fuzzy
+msgid "That address has already been confirmed."
+msgstr "Η διεύθυνση email υπάρχει ήδη."
+
+#. 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 IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:116 actions/emailsettings.php:331
-#: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:184
+#: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
 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/confirmaddress.php:128 actions/emailsettings.php:437
-#: actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
-msgstr "Απέτυχε η διαγραφή email επιβεβαίωσης."
+#. 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
+msgid "Could not delete address confirmation."
+msgstr ""
 
-#: actions/confirmaddress.php:146
+#. TRANS: Title for the contact address confirmation action.
+#: actions/confirmaddress.php:150
 msgid "Confirm address"
 msgstr "Τρέχουσα επιβεβαιωμένη email διεύθυνση."
 
-#: actions/confirmaddress.php:161
+#. TRANS: Success message for the contact address confirmation action.
+#. TRANS: %s can be 'email', 'jabber', or 'sms'.
+#: actions/confirmaddress.php:166
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
 
-#: actions/conversation.php:99
+#. TRANS: Title for page with a conversion (multiple notices in context).
+#: actions/conversation.php:96
 msgid "Conversation"
 msgstr "Συζήτηση"
 
-#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
 #: lib/profileaction.php:229 lib/searchgroupnav.php:82
 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 ""
+
+#. 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.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+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."
+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 "
+"deletion."
+msgstr ""
+
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+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 ""
+
+#. 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
+#, fuzzy
+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
+#, 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:94
+#, fuzzy
+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:127
-#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1315
+#: actions/deleteapplication.php:102 actions/editapplication.php:131
+#: actions/newapplication.php:114 actions/showapplication.php:118
+#: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/deleteapplication.php:149
+#. 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 "Δεν υπάρχει τέτοιο σελίδα."
+
+#. 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 "Αδυναμία διαγραφής αυτού του μηνύματος."
+
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
+#: actions/deleteapplication.php:167
 msgid "Delete this application"
 msgstr "Διαγράψτε αυτόν τον χρήστη"
 
-#: actions/deletenotice.php:71
-msgid "Can't delete this notice."
-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 ""
 
-#: actions/deletenotice.php:103
+#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
+#: actions/deletegroup.php:94 actions/joingroup.php:88
+#: actions/leavegroup.php:88
+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 ""
+
+#. 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 "
+"will still appear in individual timelines."
+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 ""
+
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying a change a subscription while not logged in.
+#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
+#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/settingsaction.php:72
+#, fuzzy
+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."
 msgstr ""
 
-#: actions/deletenotice.php:109 actions/deletenotice.php:141
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
 msgstr "Διαγραφή μηνύματος"
 
-#: actions/deletenotice.php:144
+#. 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:151
+#: 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 lib/noticelist.php:673
+#, fuzzy
+msgid "Delete this notice"
+msgstr "Διαγραφή μηνύματος"
+
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "Απέτυχε η ενημέρωση του χρήστη."
+
 #: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr ""
@@ -840,48 +1917,78 @@ msgstr ""
 #. TRANS: Submit button title for 'Yes' when deleting a user.
 #: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
-msgstr "Διαγράψτε αυτόν τον χρήστη"
+msgstr "Διαγραφή αυτού του χρήστη"
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
+#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr ""
 
 #: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
+msgid "Design settings for this StatusNet site"
 msgstr ""
 
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:335
 msgid "Invalid logo URL."
 msgstr ""
 
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:340
+msgid "Invalid SSL logo URL."
+msgstr ""
+
+#: actions/designadminpanel.php:344
+#, fuzzy, php-format
+msgid "Theme not available: %s."
+msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL."
+
+#: actions/designadminpanel.php:448
 msgid "Change logo"
 msgstr "Αλλαγή χρωμάτων"
 
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:453
 msgid "Site logo"
 msgstr ""
 
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:457
+msgid "SSL logo"
+msgstr ""
+
+#: actions/designadminpanel.php:469
+#, fuzzy
+msgid "Change theme"
+msgstr "Αλλαγή"
+
+#: actions/designadminpanel.php:486
+#, fuzzy
+msgid "Site theme"
+msgstr "Αλλαγή"
+
+#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr ""
 
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:493
+#, fuzzy
+msgid "Custom theme"
+msgstr "Αλλαγή"
+
+#: actions/designadminpanel.php:497
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#. TRANS: Fieldset legend on profile design page.
+#: actions/designadminpanel.php:512 lib/designsettings.php:98
 msgid "Change background image"
 msgstr ""
 
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
-#: lib/designsettings.php:178
+#. TRANS: Label on profile design page for setting a profile page background colour.
+#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: lib/designsettings.php:183
 msgid "Background"
 msgstr ""
 
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:522
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -889,64 +1996,85 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:553
 msgid "On"
 msgstr ""
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:570
 msgid "Off"
 msgstr ""
 
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#. 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:571 lib/designsettings.php:159
 msgid "Turn background image on or off."
 msgstr ""
 
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
+#: actions/designadminpanel.php:576 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr ""
 
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: actions/designadminpanel.php:590 lib/designsettings.php:175
 msgid "Change colours"
 msgstr "Αλλαγή χρωμάτων"
 
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#. TRANS: Label on profile design page for setting a profile page content colour.
+#: actions/designadminpanel.php:613 lib/designsettings.php:197
 msgid "Content"
 msgstr "Περιεχόμενο"
 
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#. TRANS: Label on profile design page for setting a profile page sidebar colour.
+#: actions/designadminpanel.php:626 lib/designsettings.php:211
 msgid "Sidebar"
 msgstr ""
 
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#. TRANS: Label on profile design page for setting a profile page text colour.
+#: actions/designadminpanel.php:639 lib/designsettings.php:225
 msgid "Text"
 msgstr ""
 
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#. TRANS: Label on profile design page for setting a profile page links colour.
+#: actions/designadminpanel.php:652 lib/designsettings.php:239
 msgid "Links"
 msgstr "Σύνδεσμοι"
 
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:677
 msgid "Advanced"
 msgstr ""
 
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:681
 msgid "Custom CSS"
 msgstr ""
 
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: actions/designadminpanel.php:702 lib/designsettings.php:257
 msgid "Use defaults"
 msgstr ""
 
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:703 lib/designsettings.php:259
 msgid "Restore default designs"
 msgstr ""
 
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:709 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr ""
 
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#. TRANS: Submit button title.
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
+#: lib/applicationeditform.php:357
+#, fuzzy
+msgid "Save"
+msgstr "Αποθήκευση"
+
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:712 lib/designsettings.php:272
 msgid "Save design"
 msgstr ""
 
@@ -963,71 +2091,134 @@ msgstr ""
 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 ""
 
-#: actions/editapplication.php:161
+#. TRANS: Client error displayed trying to edit an application that does not exist.
+#: actions/editapplication.php:83 actions/showapplication.php:87
+#, fuzzy
+msgid "No such application."
+msgstr "Δεν υπάρχει τέτοιο σελίδα."
+
+#. TRANS: Instructions for "Edit application" form.
+#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr ""
 
-#: actions/editapplication.php:177 actions/newapplication.php:159
+#. TRANS: Validation error shown when not providing a name in the "Edit application" form.
+#: actions/editapplication.php:184 actions/newapplication.php:163
 msgid "Name is required."
 msgstr ""
 
-#: actions/editapplication.php:194
+#. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
+#: actions/editapplication.php:188 actions/newapplication.php:169
+msgid "Name is too long (maximum 255 characters)."
+msgstr ""
+
+#. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
+#: actions/editapplication.php:192 actions/newapplication.php:166
+#, fuzzy
+msgid "Name already in use. Try another one."
+msgstr "Το ψευδώνυμο είναι ήδη σε χρήση. Δοκιμάστε κάποιο άλλο."
+
+#. TRANS: Validation error shown when not providing a description in the "Edit application" form.
+#: actions/editapplication.php:196 actions/newapplication.php:172
+#, fuzzy
+msgid "Description is required."
+msgstr "Περιγραφή"
+
+#. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
+#: actions/editapplication.php:208
 msgid "Source URL is too long."
 msgstr ""
 
-#: actions/editapplication.php:203 actions/newapplication.php:188
+#. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
+#: actions/editapplication.php:215 actions/newapplication.php:193
+#, fuzzy
+msgid "Source URL is not valid."
+msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL."
+
+#. TRANS: Validation error shown when not providing an organisation in the "Edit application" form.
+#: actions/editapplication.php:219 actions/newapplication.php:196
 msgid "Organization is required."
 msgstr ""
 
-#: actions/editapplication.php:209 actions/newapplication.php:194
+#. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
+#: actions/editapplication.php:223 actions/newapplication.php:199
+msgid "Organization is too long (maximum 255 characters)."
+msgstr ""
+
+#: actions/editapplication.php:226 actions/newapplication.php:202
 msgid "Organization homepage is required."
 msgstr ""
 
-#: actions/editapplication.php:218 actions/newapplication.php:206
+#. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
+#: actions/editapplication.php:237 actions/newapplication.php:214
 msgid "Callback is too long."
 msgstr ""
 
-#: actions/editapplication.php:225 actions/newapplication.php:215
+#. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
+#: actions/editapplication.php:245 actions/newapplication.php:223
 msgid "Callback URL is not valid."
 msgstr ""
 
-#: actions/editapplication.php:258
+#. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
+#: actions/editapplication.php:282
 msgid "Could not update application."
 msgstr "Απέτυχε η ενημέρωση του χρήστη."
 
-#: actions/editgroup.php:107 actions/editgroup.php:172
+#. TRANS: Title for form to edit a group. %s is a group nickname.
+#: actions/editgroup.php:55
+#, fuzzy, php-format
+msgid "Edit %s group"
+msgstr "Επεξεργασία ιδιοτήτων της ομάδας %s"
+
+#. TRANS: Client error displayed trying to edit 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:70 actions/newgroup.php:65
+#, fuzzy
+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.
+#: actions/editgroup.php:110 actions/editgroup.php:176
 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
 msgid "You must be an admin to edit the group."
 msgstr ""
 
-#: actions/editgroup.php:158
+#. TRANS: Form instructions for group edit form.
+#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr ""
 
-#: actions/editgroup.php:205 actions/newgroup.php:145
-#, php-format
-msgid "description is too long (max %d chars)."
-msgstr "Η περιγραφή είναι πολύ μεγάλη (μέγιστο %d χαρακτ.)."
-
-#: actions/editgroup.php:228 actions/newgroup.php:168
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#: actions/editgroup.php:239 actions/newgroup.php:186
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr ""
 
-#: actions/editgroup.php:258
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/editgroup.php:272
 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:264 classes/User_group.php:514
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "Δεν ήταν δυνατή η δημιουργία ομάδας."
 
-#: actions/editgroup.php:280
+#. TRANS: Group edit form success message.
+#: actions/editgroup.php:296
 msgid "Options saved."
 msgstr ""
 
@@ -1043,8 +2234,14 @@ msgstr "Ρυθμίσεις του άβαταρ"
 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:107 actions/emailsettings.php:133
+msgid "Email address"
+msgstr "Διεύθυνση ηλεκτρονικού ταχυδρομείου"
+
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:113
 msgid "Current confirmed email address."
 msgstr "Τρέχουσα επιβεβαιωμένη email διεύθυνση."
 
@@ -1053,14 +2250,14 @@ msgstr "Τρέχουσα επιβεβαιωμένη email διεύθυνση."
 #. 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:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr ""
 
-#: actions/emailsettings.php:122
+#: actions/emailsettings.php:123
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1074,85 +2271,139 @@ 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:139
+#: actions/emailsettings.php:140
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Διεύθυνση email, π.χ: \"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:144 actions/imsettings.php:151
+#: actions/smssettings.php:162
+#, fuzzy
+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:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Εισερχόμενο email"
 
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+msgid "I want to post notices by email."
+msgstr "Θέλω να δημοσιεύω ενημερώσεις μέσω 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:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr ""
 
-#. TRANS: Instructions for incoming e-mail address input form.
+#. 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:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
 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:193
+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:172 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
 msgstr ""
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:208
 msgid "Email preferences"
 msgstr "Διευθύνσεις email"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:184
+#: actions/emailsettings.php:216
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:190
+#: actions/emailsettings.php:222
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:197
+#: actions/emailsettings.php:229
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:203
+#: actions/emailsettings.php:235
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:209
+#: actions/emailsettings.php:241
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
-msgid "I want to post notices by email."
-msgstr "Θέλω να δημοσιεύω ενημερώσεις μέσω email"
+#: actions/emailsettings.php:247
+#, fuzzy
+msgid "Publish a MicroID for my email address."
+msgstr "Εισάγετε ψευδώνυμο ή διεύθυνση email."
+
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:368
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Οι προτιμήσεις αποθηκεύτηκαν"
+
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:388
+#, fuzzy
+msgid "No email address."
+msgstr "Διευθύνσεις email"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:365
+#: actions/emailsettings.php:396
 msgid "Cannot normalize that email address"
 msgstr "Αδυναμία κανονικοποίησης αυτής της email διεύθυνσης"
 
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:401 actions/register.php:212
+#: actions/siteadminpanel.php:144
+#, fuzzy
+msgid "Not a valid email address."
+msgstr "Εισάγετε ψευδώνυμο ή διεύθυνση email."
+
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:405
+#, fuzzy
+msgid "That is already your email address."
+msgstr "Εισάγετε ψευδώνυμο ή διεύθυνση email."
+
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:409
+#, fuzzy
+msgid "That email address already belongs to another user."
+msgstr "Η διεύθυνση email υπάρχει ήδη."
+
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:395 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Απέτυχε η εισαγωγή κωδικού επιβεβαίωσης."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:402
+#: actions/emailsettings.php:433
 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."
@@ -1161,31 +2412,82 @@ msgstr ""
 "προσθέσατε. Ελέγξτε τα εισερχόμενα (και τον φάκελο ανεπιθύμητης "
 "αλληλογραφίας) για τον κωδικό και για το πως να τον χρησιμοποιήσετε."
 
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:454 actions/imsettings.php:386
+#: actions/smssettings.php:408
+#, 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:459
+#, fuzzy
+msgid "That is the wrong email address."
+msgstr "Εισάγετε ψευδώνυμο ή διεύθυνση email."
+
+#. 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:468 actions/smssettings.php:422
+msgid "Couldn't delete email confirmation."
+msgstr "Απέτυχε η διαγραφή email επιβεβαίωσης."
+
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:442
+#: actions/emailsettings.php:473
 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:493
+#, fuzzy
+msgid "That is not your email address."
+msgstr "Εισάγετε ψευδώνυμο ή διεύθυνση email."
+
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:514
+#, fuzzy
+msgid "The email address was removed."
+msgstr "Η διεύθυνση του εισερχόμενου email αφαιρέθηκε."
+
+#: actions/emailsettings.php:528 actions/smssettings.php:568
+#, fuzzy
+msgid "No incoming email address."
+msgstr "Η διεύθυνση του εισερχόμενου email αφαιρέθηκε."
+
 #. 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:508 actions/emailsettings.php:532
+#: actions/emailsettings.php:540 actions/emailsettings.php:565
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Απέτυχε η ενημέρωση εγγραφής του χρήστη."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:512 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Η διεύθυνση του εισερχόμενου email αφαιρέθηκε."
 
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:569 actions/smssettings.php:605
+#, fuzzy
+msgid "New incoming email address added."
+msgstr "Η διεύθυνση του εισερχόμενου email αφαιρέθηκε."
+
 #: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr ""
 
-#: actions/favor.php:92 lib/disfavorform.php:140
+#: actions/favor.php:92 lib/disfavorform.php:144
 msgid "Disfavor favorite"
 msgstr ""
 
+#: actions/favorited.php:65 lib/popularnoticesection.php:62
+#: lib/publicgroupnav.php:93
+#, fuzzy
+msgid "Popular notices"
+msgstr "Δημοφιλή"
+
 #: actions/favorited.php:67
 #, php-format
 msgid "Popular notices, page %d"
@@ -1213,7 +2515,7 @@ msgid ""
 msgstr ""
 
 #: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:115
+#: lib/personalgroupnav.php:118
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
@@ -1223,6 +2525,12 @@ msgstr ""
 msgid "Updates favored by %1$s on %2$s!"
 msgstr ""
 
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+#, fuzzy
+msgid "Featured users"
+msgstr "Προτεινόμενα"
+
 #: actions/featured.php:71
 #, php-format
 msgid "Featured users, page %d"
@@ -1233,6 +2541,11 @@ msgstr ""
 msgid "A selection of some great users on %s"
 msgstr ""
 
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice ID."
+msgstr "Μήνυμα"
+
 #: actions/file.php:38
 msgid "No notice."
 msgstr "Διαγραφή μηνύματος"
@@ -1253,6 +2566,11 @@ msgstr ""
 msgid "User being listened to does not exist."
 msgstr ""
 
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#, fuzzy
+msgid "You can use the local subscription!"
+msgstr "Απέτυχε η εισαγωγή νέας συνδρομής."
+
 #: actions/finishremotesubscribe.php:99
 msgid "That user has blocked you from subscribing."
 msgstr ""
@@ -1261,10 +2579,20 @@ msgstr ""
 msgid "You are not authorized."
 msgstr ""
 
+#: actions/finishremotesubscribe.php:113
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "Απέτυχε η μετατροπή αιτούμενων tokens σε tokens πρόσβασης."
+
 #: actions/finishremotesubscribe.php:118
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#, fuzzy
+msgid "Error updating remote profile."
+msgstr "Απέτυχε η αποθήκευση του προφίλ."
+
 #: actions/getfile.php:79
 msgid "No such file."
 msgstr "Κανένας τέτοιος χρήστης."
@@ -1273,27 +2601,41 @@ msgstr "Κανένας τέτοιος χρήστης."
 msgid "Cannot read file."
 msgstr "Απέτυχε η αποθήκευση του προφίλ."
 
+#: actions/grantrole.php:62 actions/revokerole.php:62
+#, fuzzy
+msgid "Invalid role."
+msgstr "Μήνυμα"
+
 #: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
+#: actions/grantrole.php:75
+#, fuzzy
+msgid "You cannot grant user roles on this site."
+msgstr "Ομάδες με τα περισσότερα μέλη"
+
 #: actions/grantrole.php:82
 msgid "User already has this role."
 msgstr ""
 
+#. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46
+#: actions/makeadmin.php:71 actions/subedit.php:49
 #: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr ""
 
-#: actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
+#: actions/groupblock.php:76 actions/groupunblock.php:77
+#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
 #: actions/unsubscribe.php:84 lib/profileformaction.php:86
 msgid "No profile with that ID."
 msgstr ""
 
-#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/groupblock.php:81 actions/groupunblock.php:82
 #: actions/makeadmin.php:81
 msgid "No group specified."
 msgstr ""
@@ -1306,6 +2648,11 @@ msgstr ""
 msgid "User is already blocked from group."
 msgstr ""
 
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "Δεν είστε μέλος καμίας ομάδας."
+
 #: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
 msgstr ""
@@ -1350,20 +2697,66 @@ msgid ""
 "palette of your choice."
 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".
+#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
+#: lib/designsettings.php:405 lib/designsettings.php:427
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Απέτυχε η ενημέρωση του χρήστη."
+
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "Οι προτιμήσεις αποθηκεύτηκαν"
+
+#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#, fuzzy
+msgid "Group logo"
+msgstr "Ομάδα"
+
 #: actions/grouplogo.php:153
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
 
+#: actions/grouplogo.php:236
+msgid "Upload"
+msgstr ""
+
+#: actions/grouplogo.php:289
+#, fuzzy
+msgid "Crop"
+msgstr "Ομάδα"
+
 #: actions/grouplogo.php:365
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
+#: actions/grouplogo.php:399
+#, fuzzy
+msgid "Logo updated."
+msgstr "Αποσύνδεση"
+
 #: actions/grouplogo.php:401
 msgid "Failed updating logo."
 msgstr ""
 
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
+#, fuzzy, 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:107
+#, fuzzy, php-format
+msgid "%1$s group members, page %2$d"
+msgstr "%1$s και φίλοι, σελίδα 2%$d"
+
 #: actions/groupmembers.php:122
 msgid "A list of the users in this group."
 msgstr ""
@@ -1378,6 +2771,12 @@ msgctxt "BUTTON"
 msgid "Block"
 msgstr ""
 
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
 #: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr ""
@@ -1394,21 +2793,18 @@ msgctxt "TOOLTIP"
 msgid "Make this user an admin"
 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/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
-#, php-format
-msgid "%s timeline"
-msgstr "χρονοδιάγραμμα του χρήστη %s"
-
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #: actions/grouprss.php:142
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr ""
 
+#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#, fuzzy
+msgid "Groups"
+msgstr "Ομάδα"
+
 #: actions/groups.php:64
 #, php-format
 msgid "Groups, page %d"
@@ -1424,6 +2820,11 @@ msgid ""
 "%%%%)"
 msgstr ""
 
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "Δημιουργία νέου λογαριασμού"
+
 #: actions/groupsearch.php:52
 #, php-format
 msgid ""
@@ -1454,15 +2855,18 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groupunblock.php:91
+#. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
+#: actions/groupunblock.php:94
 msgid "Only an admin can unblock group members."
 msgstr ""
 
-#: actions/groupunblock.php:95
+#. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
+#: actions/groupunblock.php:99
 msgid "User is not blocked from group."
 msgstr ""
 
-#: actions/groupunblock.php:128 actions/unblock.php:86
+#. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
+#: actions/groupunblock.php:131 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr ""
 
@@ -1481,6 +2885,12 @@ msgid ""
 "doc.im%%). Configure your address and settings below."
 msgstr ""
 
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
+#, fuzzy
+msgid "IM is not available."
+msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL."
+
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
 #: actions/imsettings.php:106 actions/imsettings.php:136
@@ -1491,6 +2901,18 @@ msgstr "Διευθύνσεις email"
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Τρέχουσα επιβεβαιωμένη Jabber/GTalk διεύθυνση."
 
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
+#, fuzzy, php-format
+msgid ""
+"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
+"message with further instructions. (Did you add %s to your buddy list?)"
+msgstr ""
+"Αναμένωντας επιβεβαίωση σε αυτή τη διεύθυνση. Έλεγξε το Jabber/GTalk "
+"λογαριασμό σου για μήνυμα με περαιτέρω οδηγίες. (Πρόσθεσες το χρήστη %s στη "
+"λίστα φίλων?)"
+
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
 #. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
@@ -1523,8 +2945,14 @@ msgstr ""
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:182
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Τρέχουσα επιβεβαιωμένη Jabber/GTalk διεύθυνση."
+
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Οι προτιμήσεις αποθηκεύτηκαν"
 
@@ -1538,11 +2966,23 @@ msgstr ""
 msgid "Cannot normalize that Jabber ID"
 msgstr "Αδυναμία κανονικοποίησης του Jabber ID"
 
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:325
+#, fuzzy
+msgid "Not a valid Jabber ID"
+msgstr "Αδυναμία κανονικοποίησης του Jabber ID"
+
 #. TRANS: Message given saving IM address that is already set.
 #: actions/imsettings.php:329
 msgid "That is already your Jabber ID."
 msgstr ""
 
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:333
+#, fuzzy
+msgid "Jabber ID already belongs to another user."
+msgstr "Το ψευδώνυμο είναι ήδη σε χρήση. Δοκιμάστε κάποιο άλλο."
+
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.
 #: actions/imsettings.php:361
@@ -1559,12 +2999,30 @@ msgstr ""
 msgid "That is the wrong IM address."
 msgstr ""
 
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:400
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Απέτυχε η διαγραφή email επιβεβαίωσης."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:405
+#, fuzzy
+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:427
 msgid "That is not your Jabber ID."
 msgstr ""
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:450
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Η διεύθυνση του εισερχόμενου email αφαιρέθηκε."
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -1579,58 +3037,129 @@ msgstr ""
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 
-#: actions/invite.php:39
+#. TRANS: Client error displayed when trying to sent invites while they have been disabled.
+#: actions/invite.php:40
 msgid "Invites have been disabled."
 msgstr ""
 
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
+#. TRANS: Client error displayed when trying to sent invites while not logged in.
+#. TRANS: %s is the StatusNet site name.
+#: actions/invite.php:44
+#, 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:77
 #, php-format
+msgid "Invalid email address: %s."
+msgstr ""
+
+#. TRANS: Page title when invitations have been sent.
+#: actions/invite.php:116
+msgid "Invitations sent"
+msgstr ""
+
+#. TRANS: Page title when inviting potential users.
+#: actions/invite.php:119
+#, fuzzy
+msgid "Invite new users"
+msgstr "Νέοι χρήστες"
+
+#. TRANS: Message displayed inviting users to use a StatusNet site while the inviting user
+#. 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:139
+msgid "You are already subscribed to this user:"
+msgid_plural "You are already subscribed to these users:"
+msgstr[0] ""
+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:145 actions/invite.php:159
+#, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr ""
 
-#: actions/invite.php:136
-msgid ""
+#. 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:153
+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:"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: actions/invite.php:144
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
+#. 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:167
+msgid "Invitation sent to the following person:"
+msgid_plural "Invitations sent to the following people:"
+msgstr[0] ""
+msgstr[1] ""
 
-#: actions/invite.php:150
+#. TRANS: Generic message displayed after sending out one or more invitations to
+#. TRANS: people to join a StatusNet site.
+#: actions/invite.php:177
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgstr ""
 
-#: actions/invite.php:187
-msgid "Email addresses"
-msgstr "Διευθύνσεις email"
+#. TRANS: Form instructions.
+#: actions/invite.php:190
+#, fuzzy
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr "Προσκάλεσε φίλους και συναδέλφους σου να γίνουν μέλη στο %s"
 
-#: actions/invite.php:189
+#. TRANS: Field label for a list of e-mail addresses.
+#: actions/invite.php:217
+msgid "Email addresses"
+msgstr "Διευθύνσεις ηλεκτρονικού ταχυδρομείου:"
+
+#. TRANS: Tooltip for field label for a list of e-mail addresses.
+#: actions/invite.php:220
 msgid "Addresses of friends to invite (one per line)"
 msgstr "Διευθύνσεις φίλων σου που θες να προσκαλέσεις (μία ανά γραμμή)"
 
-#: actions/invite.php:194
+#. TRANS: Field label for a personal message to send to invitees.
+#: actions/invite.php:224
+#, fuzzy
+msgid "Personal message"
+msgstr "Προσωπικά"
+
+#. TRANS: Tooltip for field label for a personal message to send to invitees.
+#: actions/invite.php:227
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:198
+#: actions/invite.php:231
 msgctxt "BUTTON"
 msgid "Send"
 msgstr ""
 
-#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
-#: actions/invite.php:228
+#. 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:263
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
 
-#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
-#: actions/invite.php:231
+#. TRANS: Body text 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 the
+#. 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:270
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -1665,10 +3194,6 @@ msgstr ""
 msgid "You must be logged in to join a group."
 msgstr ""
 
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "Ψευδώνυμο"
-
 #: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
@@ -1678,11 +3203,121 @@ msgstr ""
 msgid "You must be logged in to leave a group."
 msgstr ""
 
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:386
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "Δεν είστε μέλος καμίας ομάδας."
+
 #: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr ""
 
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr ""
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
 #: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Ήδη συνδεδεμένος."
@@ -1697,13 +3332,18 @@ msgstr ""
 
 #: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
 msgid "Login"
-msgstr "Σύνδεση"
+msgstr "Είσοδος"
 
 #: actions/login.php:249
 msgid "Login to site"
 msgstr ""
 
-#: actions/login.php:259 actions/register.php:487
+#: actions/login.php:258 actions/register.php:491
+#, fuzzy
+msgid "Remember me"
+msgstr "Μέλος από"
+
+#: actions/login.php:259 actions/register.php:493
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Αυτόματη σύνδεση στο μέλλον. ΟΧΙ για κοινόχρηστους υπολογιστές!"
 
@@ -1719,6 +3359,20 @@ msgstr ""
 "Για λόγους ασφαλείας, παρακαλώ εισάγετε ξανά το όνομα χρήστη και τον κωδικό "
 "σας, πριν αλλάξετε τις ρυθμίσεις σας."
 
+#: actions/login.php:292
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "Σύνδεση με όνομα χρήστη και κωδικό"
+
+#: actions/login.php:295
+#, fuzzy, php-format
+msgid ""
+"Don't have a username yet? [Register](%%action.register%%) a new account."
+msgstr ""
+"Συνδεθείτε με το όνομα χρήστη και τον κωδικό σας. Δεν έχετε όνομα χρήστη "
+"ακόμα; Κάντε [εγγραφή](%%action.register%%) για ένα νέο λογαριασμό ή "
+"δοκιμάστε το [OpenID](%%action.openidlogin%%). "
+
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
 msgstr ""
@@ -1728,52 +3382,109 @@ msgstr ""
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr ""
 
+#: actions/makeadmin.php:133
+#, fuzzy, php-format
+msgid "Can't get membership record for %1$s in group %2$s."
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
+
+#: actions/makeadmin.php:146
+#, fuzzy, php-format
+msgid "Can't make %1$s an admin for group %2$s."
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
+
 #: actions/microsummary.php:69
 msgid "No current status."
 msgstr ""
 
-#: actions/newapplication.php:64
+#. 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:65
 msgid "You must be logged in to register an application."
 msgstr ""
 
-#: actions/newapplication.php:143
+#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr ""
 
-#: actions/newapplication.php:176
+#: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr ""
 
-#: actions/newapplication.php:258 actions/newapplication.php:267
+#: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "Δεν ήταν δυνατή η δημιουργία ομάδας."
 
-#: actions/newgroup.php:110
+#. TRANS: Title for form to create a group.
+#: actions/newgroup.php:53
+#, fuzzy
+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 ""
 
-#: actions/newmessage.php:158
+#: actions/newmessage.php:71 actions/newmessage.php:234
+#, fuzzy
+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
+#, 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
+#, fuzzy
+msgid "No content!"
+msgstr "Περιεχόμενο"
+
+#: actions/newmessage.php:161
 msgid "No recipient specified."
 msgstr ""
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:164 lib/command.php:506
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
+#: actions/newmessage.php:184
+#, fuzzy
+msgid "Message sent"
+msgstr "Μήνυμα"
+
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:185 lib/command.php:514
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr ""
 
-#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr ""
 
-#: actions/newnotice.php:227
+#: actions/newnotice.php:69
+#, fuzzy
+msgid "New notice"
+msgstr "Διαγραφή μηνύματος"
+
+#: actions/newnotice.php:230
 msgid "Notice posted"
 msgstr ""
 
@@ -1788,6 +3499,11 @@ msgstr ""
 msgid "Text search"
 msgstr ""
 
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%1$s\" on %2$s"
+msgstr "Αναζήτηση ροής για \"%s\""
+
 #: actions/noticesearch.php:121
 #, php-format
 msgid ""
@@ -1807,9 +3523,15 @@ msgstr ""
 msgid "Updates with \"%s\""
 msgstr ""
 
+#: actions/noticesearchrss.php:98
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Όλες οι ενημερώσεις που ταιριάζουν με τον όρο αναζήτησης \"%s\""
+
 #: actions/nudge.php:85
 msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set their email yet."
+"This user doesn't allow nudges or hasn't confirmed or set their email "
+"address yet."
 msgstr ""
 
 #: actions/nudge.php:94
@@ -1820,88 +3542,172 @@ msgstr ""
 msgid "Nudge sent!"
 msgstr ""
 
-#: actions/oauthappssettings.php:59
+#. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
+#: actions/oauthappssettings.php:60
 msgid "You must be logged in to list your applications."
 msgstr ""
 
-#: actions/oauthappssettings.php:74
+#. TRANS: Page title for OAuth applications
+#: actions/oauthappssettings.php:76
 msgid "OAuth applications"
 msgstr ""
 
-#: actions/oauthappssettings.php:85
+#. TRANS: Page instructions for OAuth applications
+#: actions/oauthappssettings.php:88
 msgid "Applications you have registered"
 msgstr ""
 
-#: actions/oauthappssettings.php:135
+#. TRANS: Empty list message on page with OAuth applications.
+#: actions/oauthappssettings.php:141
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr ""
 
-#: actions/oauthconnectionssettings.php:72
+#. TRANS: Title for OAuth connection settings.
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr ""
 
+#. TRANS: Instructions for OAuth connection settings.
 #: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
+msgid "The following connections exist for your account."
 msgstr ""
 
-#: actions/oauthconnectionssettings.php:186
+#. TRANS: Client error when trying to revoke access for an application while not being a user of it.
+#: 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:183
 #, php-format
-msgid "Unable to revoke access for app: %s."
+msgid "Unable to revoke access for application: %s."
 msgstr ""
 
-#: actions/oauthconnectionssettings.php:198
+#. 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
+#, php-format
+msgid ""
+"You have successfully revoked access for %1$s and the access token starting "
+"with %2$s."
+msgstr ""
+
+#. TRANS: Empty list message when no applications have been authorised yet.
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
-#: actions/oauthconnectionssettings.php:211
-msgid "Developers can edit the registration settings for their applications "
+#. 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
+#, php-format
+msgid ""
+"Are you a developer? [Register an OAuth client application](%s) to use with "
+"this instance of StatusNet."
 msgstr ""
 
+#: actions/oembed.php:80 actions/shownotice.php:100
+#, fuzzy
+msgid "Notice has no profile."
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
+
+#: actions/oembed.php:83 actions/shownotice.php:172
+#, fuzzy, php-format
+msgid "%1$s's status on %2$s"
+msgstr "Κατάσταση του/της %s"
+
+#. 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:163
+#: actions/oembed.php:172
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1356
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1362
 msgid "Not a supported data format."
 msgstr ""
 
+#: actions/opensearch.php:64
+#, fuzzy
+msgid "People Search"
+msgstr "Δημοφιλή"
+
 #: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr ""
 
-#: actions/othersettings.php:60
+#: actions/othersettings.php:59
 msgid "Other settings"
 msgstr "Ρυθμίσεις του άβαταρ"
 
+#. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr ""
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr ""
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr ""
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/othersettings.php:123
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
+#, fuzzy
+msgid "View profile designs"
+msgstr "Επεξεργασία ρυθμίσεων προφίλ"
+
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr ""
 
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr ""
+
+#: actions/otp.php:69
+#, fuzzy
+msgid "No user ID specified."
+msgstr "Μήνυμα"
+
+#: actions/otp.php:83
+#, fuzzy
+msgid "No login token specified."
+msgstr "Μήνυμα"
+
 #: actions/otp.php:90
 msgid "No login token requested."
 msgstr ""
 
+#: actions/otp.php:95
+#, fuzzy
+msgid "Invalid login token specified."
+msgstr "Μήνυμα"
+
 #: actions/otp.php:104
 msgid "Login token expired."
 msgstr ""
@@ -1928,6 +3734,16 @@ msgstr "Αλλαγή κωδικού"
 msgid "Change your password."
 msgstr "Αλλάξτε τον κωδικό σας"
 
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#, fuzzy
+msgid "Password change"
+msgstr "Ο κωδικός αποθηκεύτηκε."
+
+#: actions/passwordsettings.php:104
+#, fuzzy
+msgid "Old password"
+msgstr "Νέος κωδικός"
+
 #: actions/passwordsettings.php:108 actions/recoverpassword.php:235
 msgid "New password"
 msgstr "Νέος κωδικός"
@@ -1936,11 +3752,6 @@ msgstr "Νέος κωδικός"
 msgid "6 or more characters"
 msgstr "6 ή περισσότεροι χαρακτήρες"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:440
-msgid "Confirm"
-msgstr "Επιβεβαίωση"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr ""
@@ -1949,7 +3760,12 @@ msgstr ""
 msgid "Change"
 msgstr "Αλλαγή"
 
-#: actions/passwordsettings.php:157 actions/register.php:240
+#: actions/passwordsettings.php:154 actions/register.php:238
+#, fuzzy
+msgid "Password must be 6 or more characters."
+msgstr "Ο κωδικός πρέπει να είναι 6 χαρακτήρες ή περισσότεροι."
+
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "Οι κωδικοί δεν ταυτίζονται."
 
@@ -1969,120 +3785,277 @@ msgstr "Αδύνατη η αποθήκευση του νέου κωδικού"
 msgid "Password saved."
 msgstr "Ο κωδικός αποθηκεύτηκε."
 
+#. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
+#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr ""
 
-#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
+#. TRANS: Form instructions for Path admin panel.
+#: actions/pathsadminpanel.php:69
+msgid "Path and server settings for this StatusNet site"
 msgstr ""
 
-#: actions/pathsadminpanel.php:183
+#. 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 "Η αρχική σελίδα δεν είναι έγκυρο URL."
+
+#. 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 "Η αρχική σελίδα δεν είναι έγκυρο URL."
+
+#. 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 "Η αρχική σελίδα δεν είναι έγκυρο URL."
+
+#. 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
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#. TRANS: Fieldset legend in Paths admin panel.
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr ""
 
-#: actions/pathsadminpanel.php:238
+#. 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 "Αποχώρηση"
+
+#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr ""
 
-#: actions/pathsadminpanel.php:242
+#. 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:242
-msgid "Site path"
+#: actions/pathsadminpanel.php:249
+msgid "Site path."
 msgstr ""
 
-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:255
+msgid "Locale directory"
 msgstr ""
 
-#: actions/pathsadminpanel.php:246
-msgid "Directory path to locales"
+#: actions/pathsadminpanel.php:256
+msgid "Directory path to locales."
 msgstr ""
 
-#: actions/pathsadminpanel.php:250
+#. TRANS: Checkbox label in Paths admin panel.
+#: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
 msgstr ""
 
-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr ""
 
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr ""
 
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:281
+msgid "Server for themes."
 msgstr ""
 
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:290
+msgid "Web path to themes."
 msgstr ""
 
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#. 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 "Αποχώρηση"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:299
+msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
-#: actions/pathsadminpanel.php:279
+#. 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 "Ρυθμίσεις του άβαταρ"
 
-#: actions/pathsadminpanel.php:284
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "Ρυθμίσεις του άβαταρ"
 
-#: actions/pathsadminpanel.php:288
+#. 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 "Ρυθμίσεις του άβαταρ"
 
-#: actions/pathsadminpanel.php:301
+#. 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
+#, fuzzy
+msgid "Avatar directory"
+msgstr "Ρυθμίσεις OpenID"
+
+#. 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 ""
 
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:372
+msgid "Server for backgrounds."
 msgstr ""
 
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:381
+msgid "Web path to backgrounds."
 msgstr ""
 
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:390
+msgid "Server for backgrounds on SSL pages."
 msgstr ""
 
-#: actions/pathsadminpanel.php:320
+#. 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.
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+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 ""
 
-#: actions/pathsadminpanel.php:324
+#. 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 "Αποχώρηση"
+
+#. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
+#: actions/pathsadminpanel.php:479
 msgid "Sometimes"
 msgstr ""
 
-#: actions/pathsadminpanel.php:325
+#. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
+#: actions/pathsadminpanel.php:481
 msgid "Always"
 msgstr ""
 
-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr ""
 
-#: actions/pathsadminpanel.php:330
-msgid "When to use SSL"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:487
+msgid "When to use SSL."
 msgstr ""
 
-#: actions/pathsadminpanel.php:336
-msgid "Server to direct SSL requests to"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:497
+msgid "Server to direct SSL requests to."
 msgstr ""
 
-#: actions/pathsadminpanel.php:352
+#. TRANS: Button title text to store form data in the Paths admin panel.
+#: actions/pathsadminpanel.php:514
 msgid "Save paths"
 msgstr ""
 
@@ -2093,6 +4066,11 @@ msgid ""
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
+#: actions/peoplesearch.php:58
+#, fuzzy
+msgid "People search"
+msgstr "Δημοφιλή"
+
 #: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
@@ -2103,127 +4081,222 @@ msgstr ""
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
 
+#: actions/postnotice.php:95
+#, fuzzy
+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 ""
 
-#: actions/profilesettings.php:71
+#. TRANS: Page title for profile settings.
+#: actions/profilesettings.php:61
+#, fuzzy
+msgid "Profile settings"
+msgstr "Επεξεργασία ρυθμίσεων προφίλ"
+
+#. TRANS: Usage instructions for profile settings.
+#: actions/profilesettings.php:73
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
 
-#: actions/profilesettings.php:99
+#. TRANS: Profile settings form legend.
+#: actions/profilesettings.php:102
 msgid "Profile information"
 msgstr ""
 
-#: actions/profilesettings.php:108 lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 μικρά γράμματα ή αριθμοί, χωρίς σημεία στίξης ή κενά"
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:113
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr ""
 
-#: actions/profilesettings.php:111 actions/register.php:455
-#: actions/showgroup.php:256 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:150
+#. TRANS: Field label in form for profile settings.
+#. TRANS: Label for full group name (dt). Text hidden by default.
+#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/showgroup.php:252 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
 msgstr "Ονοματεπώνυμο"
 
+#. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:235 lib/groupeditform.php:161
+#: actions/profilesettings.php:122 actions/register.php:461
+#: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Αρχική σελίδα"
 
-#: actions/profilesettings.php:117 actions/register.php:462
-msgid "URL of your homepage, blog, or profile on another site"
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:125
+msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
 
-#: actions/profilesettings.php:122 actions/register.php:468
+#. 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:133 actions/register.php:472
 #, php-format
-msgid "Describe yourself and your interests in %d chars"
-msgstr "Περιγράψτε την ομάδα ή το θέμα χρησιμοποιώντας μέχρι %d χαρακτήρες"
+msgid "Describe yourself and your interests in %d character"
+msgid_plural "Describe yourself and your interests in %d characters"
+msgstr[0] ""
+msgstr[1] ""
 
-#: actions/profilesettings.php:127 actions/register.php:473
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:139 actions/register.php:477
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "Περιέγραψε τον εαυτό σου και τα ενδιαφέροντά σου σε 140 χαρακτήρες"
+
+#. TRANS: Text area label in form for profile settings where users can provide.
+#. TRANS: their biography.
+#: actions/profilesettings.php:143 actions/register.php:479
 msgid "Bio"
 msgstr "Βιογραφικό"
 
-#: actions/profilesettings.php:132 actions/register.php:478
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:165
+#. TRANS: Field label in form for profile settings.
+#. TRANS: Label for group location (dt). Text hidden by default.
+#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/showgroup.php:262 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: lib/userprofile.php:167
 msgid "Location"
 msgstr "Τοποθεσία"
 
-#: actions/profilesettings.php:138
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:152 actions/register.php:486
+#, fuzzy
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "Τοποθεσία της ομάδας (εάν υπάρχει), πχ: \"Πόλη, Περιοχή, Χώρα)"
+
+#. TRANS: Checkbox label in form for profile settings.
+#: actions/profilesettings.php:157
 msgid "Share my current location when posting notices"
 msgstr ""
 
-#: actions/profilesettings.php:145 actions/tagother.php:149
+#. TRANS: Field label in form for profile settings.
+#: actions/profilesettings.php:165 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:210
+#: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr ""
 
-#: actions/profilesettings.php:147
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:168
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
-#: actions/profilesettings.php:151
+#. TRANS: Dropdownlist label in form for profile settings.
+#: actions/profilesettings.php:173
 msgid "Language"
 msgstr ""
 
-#: actions/profilesettings.php:152
+#. TRANS: Tooltip for dropdown list label in form for profile settings.
+#: actions/profilesettings.php:175
 msgid "Preferred language"
 msgstr ""
 
-#: actions/profilesettings.php:161
+#. TRANS: Dropdownlist label in form for profile settings.
+#: actions/profilesettings.php:185
 msgid "Timezone"
 msgstr ""
 
-#: actions/profilesettings.php:162
+#. TRANS: Tooltip for dropdown list label in form for profile settings.
+#: actions/profilesettings.php:187
 msgid "What timezone are you normally in?"
 msgstr ""
 
-#: actions/profilesettings.php:228 actions/register.php:230
-#, php-format
-msgid "Bio is too long (max %d chars)."
-msgstr "Η περιγραφή είναι πολύ μεγάλη (μέγιστο %d χαρακτ.)."
+#. TRANS: Checkbox label in form for profile settings.
+#: actions/profilesettings.php:193
+#, fuzzy
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr ""
+"Αυτόματα γίνε συνδρομητής σε όσους γίνονται συνδρομητές σε μένα  (χρήση "
+"κυρίως από λογισμικό και όχι ανθρώπους)"
 
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:151
+#. 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:262 actions/register.php:229
+#, php-format
+msgid "Bio is too long (maximum %d character)."
+msgid_plural "Bio is too long (maximum %d characters)."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Validation error in form for profile settings.
+#: actions/profilesettings.php:273 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr ""
 
-#: actions/profilesettings.php:253 actions/tagother.php:178
+#. TRANS: Validation error in form for profile settings.
+#: actions/profilesettings.php:281
+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:295 actions/tagother.php:178
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr ""
 
-#: actions/profilesettings.php:306
+#. TRANS: Server error thrown when user profile settings could not be updated to
+#. TRANS: automatically subscribe to any subscriber.
+#: actions/profilesettings.php:351
 msgid "Couldn't update user for autosubscribe."
 msgstr "Απέτυχε η ενημέρωση του χρήστη για την αυτόματη συνδρομή."
 
-#: actions/profilesettings.php:363
+#. TRANS: Server error thrown when user profile location preference settings could not be updated.
+#: actions/profilesettings.php:409
 msgid "Couldn't save location prefs."
 msgstr "Απέτυχε η αποθήκευση του προφίλ."
 
-#: actions/profilesettings.php:375
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/profilesettings.php:422
 msgid "Couldn't save profile."
 msgstr "Απέτυχε η αποθήκευση του προφίλ."
 
-#: actions/profilesettings.php:383
+#. TRANS: Server error thrown when user profile settings tags could not be saved.
+#: actions/profilesettings.php:431
 msgid "Couldn't save tags."
 msgstr "Απέτυχε η αποθήκευση του προφίλ."
 
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+#: actions/profilesettings.php:440 lib/adminpanelaction.php:138
+#, fuzzy
+msgid "Settings saved."
+msgstr "Οι προτιμήσεις αποθηκεύτηκαν"
+
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 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
+#, fuzzy
+msgid "Could not retrieve public stream."
+msgstr "Απέτυχε η ενημέρωση του χρήστη."
+
 #: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr ""
 
+#: actions/public.php:132 lib/publicgroupnav.php:79
+#, fuzzy
+msgid "Public timeline"
+msgstr "χρονοδιάγραμμα του χρήστη %s"
+
 #: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr ""
@@ -2232,6 +4305,20 @@ msgstr ""
 msgid "Public Stream Feed (RSS 2.0)"
 msgstr ""
 
+#: actions/public.php:168
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "Δημόσια ροή %s"
+
+#: 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 ""
@@ -2259,31 +4346,59 @@ msgid ""
 "tool."
 msgstr ""
 
+#. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr ""
 
-#: actions/publictagcloud.php:63
+#. 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 "
+msgid "These are most popular recent tags on %s"
 msgstr ""
 
-#: actions/publictagcloud.php:69
+#. 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 ""
 
-#: actions/publictagcloud.php:72
+#. 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 ""
 
-#: actions/publictagcloud.php:75
+#. TRANS: Message shown to a anonymous user for the public tag cloud
+#. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
+#. 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 "
 "one!"
 msgstr ""
 
+#: actions/publictagcloud.php:146
+#, fuzzy
+msgid "Tag cloud"
+msgstr "Αλλαγή χρωμάτων"
+
+#: actions/recoverpassword.php:36
+#, fuzzy
+msgid "You are already logged in!"
+msgstr "Ήδη συνδεδεμένος."
+
+#: actions/recoverpassword.php:62
+#, fuzzy
+msgid "No such recovery code."
+msgstr "Κανένας τέτοιος χρήστης."
+
 #: actions/recoverpassword.php:66
 msgid "Not a recovery code."
 msgstr ""
@@ -2292,6 +4407,11 @@ msgstr ""
 msgid "Recovery code for unknown user."
 msgstr ""
 
+#: actions/recoverpassword.php:86
+#, fuzzy
+msgid "Error with confirmation code."
+msgstr "Απέτυχε η εισαγωγή κωδικού επιβεβαίωσης."
+
 #: actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr ""
@@ -2300,10 +4420,29 @@ msgstr ""
 msgid "Could not update user with confirmed email address."
 msgstr "Απέτυχε η ενημέρωση χρήστη μέσω επιβεβαιωμένης email διεύθυνσης."
 
+#: actions/recoverpassword.php:152
+#, 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 ""
+"Οδηγίες για την ανάκτηση του κωδικού σας έχουν σταλεί στην διεύθυνση email "
+"που έχετε καταχωρίσει στον λογαριασμό σας."
+
 #: actions/recoverpassword.php:158
 msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recovery"
+msgstr "Ο κωδικός αποθηκεύτηκε."
+
+#: actions/recoverpassword.php:191
+#, fuzzy
+msgid "Nickname or email address"
+msgstr "Εισάγετε ψευδώνυμο ή διεύθυνση email."
+
 #: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
@@ -2312,6 +4451,16 @@ msgstr ""
 msgid "Recover"
 msgstr ""
 
+#: actions/recoverpassword.php:208
+#, fuzzy
+msgid "Reset password"
+msgstr "Νέος κωδικός"
+
+#: actions/recoverpassword.php:209
+#, fuzzy
+msgid "Recover password"
+msgstr "Νέος κωδικός"
+
 #: actions/recoverpassword.php:210 actions/recoverpassword.php:335
 msgid "Password recovery requested"
 msgstr ""
@@ -2340,6 +4489,11 @@ msgstr ""
 msgid "No registered email address for that user."
 msgstr ""
 
+#: actions/recoverpassword.php:313
+#, fuzzy
+msgid "Error saving address confirmation."
+msgstr "Επιβεβαίωση διεύθυνσης email"
+
 #: actions/recoverpassword.php:338
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -2353,18 +4507,23 @@ msgid "Unexpected password reset."
 msgstr ""
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
-msgstr "Ο κωδικός πρέπει να είναι 6 χαρακτήρες ή περισσότεροι."
+msgid "Password must be 6 characters or more."
+msgstr ""
 
 #: actions/recoverpassword.php:369
 msgid "Password and confirmation do not match."
 msgstr "Ο κωδικός και η επιβεβαίωση του δεν ταυτίζονται."
 
+#: actions/recoverpassword.php:388 actions/register.php:256
+#, fuzzy
+msgid "Error setting user."
+msgstr "Επεξεργασία ρυθμίσεων προφίλ"
+
 #: actions/recoverpassword.php:395
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:412
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr ""
 
@@ -2372,68 +4531,136 @@ msgstr ""
 msgid "Sorry, invalid invitation code."
 msgstr ""
 
-#: actions/register.php:205
+#: actions/register.php:119
+#, fuzzy
+msgid "Registration successful"
+msgstr "Εγγραφή"
+
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#, fuzzy
+msgid "Register"
+msgstr "Εγγραφή"
+
+#: actions/register.php:142
+#, fuzzy
+msgid "Registration not allowed."
+msgstr "Εγγραφή"
+
+#: actions/register.php:209
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
-#: actions/register.php:219
+#: actions/register.php:218
 msgid "Email address already exists."
 msgstr "Η διεύθυνση email υπάρχει ήδη."
 
-#: actions/register.php:350
+#: actions/register.php:251 actions/register.php:273
+#, fuzzy
+msgid "Invalid username or password."
+msgstr "Λάθος όνομα χρήστη ή κωδικός"
+
+#: 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. "
 msgstr ""
 
-#: actions/register.php:432
+#: actions/register.php:433
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr "1-64 μικρά γράμματα ή αριθμοί, χωρίς σημεία στίξης ή κενά. Απαραίτητο."
 
-#: actions/register.php:437
+#: actions/register.php:438
 msgid "6 or more characters. Required."
 msgstr "6 ή περισσότεροι χαρακτήρες. Απαραίτητο."
 
-#: actions/register.php:441
+#: actions/register.php:442
 msgid "Same as password above. Required."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
+#: actions/register.php:446 actions/register.php:450
+#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Email"
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:447 actions/register.php:451
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
-#: actions/register.php:457
+#: actions/register.php:458
 msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
-#: actions/register.php:518
+#: actions/register.php:463
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr ""
+
+#: actions/register.php:524
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:528
+#: actions/register.php:534
 #, 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:532
+#: actions/register.php:538
 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:535
+#: actions/register.php:541
 msgid "All rights reserved."
 msgstr ""
 
-#: actions/register.php:607
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:546
+#, 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 ""
+"εκτός από τα εξής προσωπικά δεδομένα: κωδικός πρόσβασης, διεύθυνση email, "
+"διεύθυνση IM, τηλεφωνικό νούμερο."
+
+#: actions/register.php:589
+#, fuzzy, php-format
+msgid ""
+"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
+"\n"
+"* Go to [your profile](%2$s) and post your first message.\n"
+"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
+"notices through instant messages.\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
+"share your interests. \n"
+"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
+"others more about you. \n"
+"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
+"missed. \n"
+"\n"
+"Thanks for signing up and we hope you enjoy using this service."
+msgstr ""
+"Συγχαρητήρια, %s! και καλωσήρθες στο %%%%site.name%%%%. Από εδώ μπορείς "
+"να...\n"
+"\n"
+"* Πας στο [your profile](%s) και να στείλεις το πρώτο σου μήνυμα.\n"
+"* Προσθέσεις ένα [Jabber/GTalk address](%%%%action.imsettings%%%%) ώστε να "
+"δέχεσε μηνύματα στο instant messager σου.\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) που μπορεί να ξέρεις ή "
+"που έχουν τα ίδια ενδιαφέροντα με σένα. \n"
+"* Ενημερώσεις το προφίλ σου [profile settings](%%%%action.profilesettings%%%"
+"%) για να μάθουν οι άλλοι περισσότερα για σένα. \n"
+"* Διαβάσεις τα [online docs](%%%%doc.help%%%%) για λειτουργίες που μπορεί να "
+"μην έχεις μάθει ακόμα. \n"
+"\n"
+"Ευχαριστούμε που εγγράφηκες και ευχόμαστε να περάσεις καλά με την υπηρεσία "
+"μας."
+
+#: actions/register.php:613
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -2449,6 +4676,21 @@ msgid ""
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 
+#: actions/remotesubscribe.php:112
+#, fuzzy
+msgid "Remote subscribe"
+msgstr "Απέτυχε η συνδρομή."
+
+#: actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "Γίνε συνδρομητής αυτού του χρήστη"
+
+#: actions/remotesubscribe.php:129
+#, fuzzy
+msgid "User nickname"
+msgstr "Ψευδώνυμο"
+
 #: actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "Το ψευδώνυμο του χρήστη που θέλετε να παρακολουθήσετε"
@@ -2461,6 +4703,12 @@ msgstr ""
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:411
+#, fuzzy
+msgid "Subscribe"
+msgstr "Απέτυχε η συνδρομή."
+
 #: actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr ""
@@ -2473,15 +4721,30 @@ msgstr ""
 msgid "That’s a local profile! Login to subscribe."
 msgstr ""
 
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Απέτυχε η μετατροπή αιτούμενων tokens σε tokens πρόσβασης."
+
 #: actions/repeat.php:57
 msgid "Only logged-in users can repeat notices."
 msgstr ""
 
+#: actions/repeat.php:64 actions/repeat.php:71
+#, fuzzy
+msgid "No notice specified."
+msgstr "Μήνυμα"
+
 #: actions/repeat.php:76
 msgid "You can't repeat your own notice."
 msgstr ""
 
-#: actions/repeat.php:114 lib/noticelist.php:676
+#: actions/repeat.php:90
+#, fuzzy
+msgid "You already repeated that notice."
+msgstr "Αδυναμία διαγραφής αυτού του μηνύματος."
+
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Επαναλαμβάνεται από"
 
@@ -2490,7 +4753,7 @@ msgid "Repeated!"
 msgstr "Επαναλαμβάνεται από"
 
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
+#: lib/personalgroupnav.php:108
 #, php-format
 msgid "Replies to %s"
 msgstr ""
@@ -2515,6 +4778,15 @@ msgstr "Ροή φίλων του/της %s (RSS 2.0)"
 msgid "Replies feed for %s (Atom)"
 msgstr "Ροή φίλων του/της %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 "
+"notice to them yet."
+msgstr ""
+"Αυτό είναι το χρονοδιάγραμμα για %s και φίλους, αλλά κανείς δεν έχει κάνει "
+"καμία αποστολή ακόμα."
+
 #: actions/replies.php:204
 #, php-format
 msgid ""
@@ -2534,6 +4806,93 @@ msgstr ""
 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
+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.
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 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
+#, fuzzy
+msgid "You cannot revoke user roles on this site."
+msgstr "Απέτυχε η ενημέρωση του χρήστη."
+
 #: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr ""
@@ -2557,7 +4916,7 @@ msgid "Sessions"
 msgstr ""
 
 #: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
+msgid "Session settings for this StatusNet site"
 msgstr ""
 
 #: actions/sessionsadminpanel.php:175
@@ -2577,7 +4936,6 @@ msgid "Turn on debugging output for sessions."
 msgstr ""
 
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
 msgid "Save site settings"
 msgstr "Αποθήκευση ρυθμίσεων πρόσβασης"
 
@@ -2594,13 +4952,27 @@ msgstr ""
 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 "Ψευδώνυμο"
+
+#. TRANS: Form input field label.
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
+#, fuzzy
+msgid "Organization"
+msgstr "Προσκλήσεις"
+
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:207 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#. TRANS: Header for group statistics on a group page (h2).
+#: actions/showapplication.php:192 actions/showgroup.php:448
 #: lib/profileaction.php:187
 msgid "Statistics"
 msgstr ""
@@ -2618,6 +4990,11 @@ msgstr ""
 msgid "Reset key & secret"
 msgstr ""
 
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
+msgid "Delete"
+msgstr "Διαγραφή"
+
 #: actions/showapplication.php:261
 msgid "Application info"
 msgstr ""
@@ -2648,11 +5025,21 @@ msgid ""
 "signature method."
 msgstr ""
 
+#: actions/showapplication.php:309
+#, fuzzy
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "Είσαι σίγουρος ότι θες να διαγράψεις αυτό το μήνυμα;"
+
 #: actions/showfavorites.php:79
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "%1$s και φίλοι, σελίδα 2%$d"
 
+#: actions/showfavorites.php:132
+#, fuzzy
+msgid "Could not retrieve favorite notices."
+msgstr "Απέτυχε η αποθήκευση του προφίλ."
+
 #: actions/showfavorites.php:171
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -2693,33 +5080,108 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/showgroup.php:84
+#. TRANS: Page title for first group page. %s is a group name.
+#: actions/showgroup.php:75
+#, fuzzy, 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"
 
-#: actions/showgroup.php:227
+#. TRANS: Group profile header (h2). Text hidden by default.
+#: actions/showgroup.php:220
 msgid "Group profile"
 msgstr "Προφίλ χρήστη"
 
-#: actions/showgroup.php:272 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:178
+#. TRANS: Label for group URL (dt). Text hidden by default.
+#: actions/showgroup.php:270 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:180
 msgid "URL"
 msgstr ""
 
-#: actions/showgroup.php:293 lib/groupeditform.php:184
+#. TRANS: Label for group description or group note (dt). Text hidden by default.
+#: actions/showgroup.php:282 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:197
+#, fuzzy
+msgid "Note"
+msgstr "Κανένα"
+
+#. TRANS: Label for group aliases (dt). Text hidden by default.
+#: actions/showgroup.php:293 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr ""
 
-#: actions/showgroup.php:393 actions/showgroup.php:445
+#. TRANS: Group actions header (h2). Text hidden by default.
+#: actions/showgroup.php:304
+#, fuzzy
+msgid "Group actions"
+msgstr "ομάδες του χρήστη %s"
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:345
+#, fuzzy, 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:352
+#, fuzzy, 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:359
+#, fuzzy, 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:365
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
+
+#. TRANS: Header for mini list of group members on a group page (h2).
+#: actions/showgroup.php:402
 msgid "Members"
 msgstr "Μέλη"
 
-#: actions/showgroup.php:439
-msgid "Created"
-msgstr "Δημιουργημένος"
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#: actions/showgroup.php:408 lib/profileaction.php:117
+#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#, fuzzy
+msgid "(None)"
+msgstr "Κανένα"
 
-#: actions/showgroup.php:455
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+#: actions/showgroup.php:417
+#, fuzzy
+msgid "All members"
+msgstr "Μέλη"
+
+#. TRANS: Label for creation date in statistics on group page.
+#: actions/showgroup.php:453
+msgctxt "LABEL"
+msgid "Created"
+msgstr ""
+
+#. TRANS: Label for member count in statistics on group page.
+#: actions/showgroup.php:461
+msgctxt "LABEL"
+msgid "Members"
+msgstr ""
+
+#. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
+#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %%%%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:476
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -2729,7 +5191,10 @@ msgid ""
 "of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/showgroup.php:461
+#. 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:486
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -2738,20 +5203,32 @@ msgid ""
 "their life and interests. "
 msgstr ""
 
-#: actions/showgroup.php:489
+#. TRANS: Header for list of group administrators on a group page (h2).
+#: actions/showgroup.php:515
 msgid "Admins"
 msgstr "Διαχειριστές"
 
-#: actions/showmessage.php:98
+#. TRANS: Client error displayed requesting a single message that does not exist.
+#: actions/showmessage.php:79
+#, fuzzy
+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:97
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: actions/showmessage.php:108
+#. 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:110
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: actions/showmessage.php:113
+#. TRANS: Page title for single message display.
+#. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
+#: actions/showmessage.php:118
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr ""
@@ -2760,40 +5237,84 @@ msgstr ""
 msgid "Notice deleted."
 msgstr "Η κατάσταση διεγράφη."
 
-#: actions/showstream.php:73
+#. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
+#: actions/showstream.php:70
 #, php-format
-msgid " tagged %s"
+msgid "%1$s tagged %2$s"
 msgstr ""
 
-#: actions/showstream.php:79
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr ""
+
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s και φίλοι, σελίδα 2%$d"
 
-#: actions/showstream.php:122
+#. TRANS: Title for link to notice feed.
+#. TRANS: %1$s is a user nickname, %2$s is a hashtag.
+#: actions/showstream.php:127
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Ροή φίλων του/της %s (RSS 1.0)"
 
-#: actions/showstream.php:148
+#. 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 (RSS 1.0)"
+
+#. 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 (RSS 2.0)"
+
+#: actions/showstream.php:152
+#, fuzzy, 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 ""
 
-#: actions/showstream.php:205
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
+#, php-format
+msgid "This is the timeline for %1$s, but %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
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
-#: actions/showstream.php:207
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -2802,7 +5323,9 @@ msgid ""
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -2810,6 +5333,12 @@ msgid ""
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
 
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
+#, fuzzy, php-format
+msgid "Repeat of %s"
+msgstr "Επαναλαμβάνεται από"
+
 #: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr ""
@@ -2871,6 +5400,11 @@ msgstr ""
 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 "Η διεύθυνση του εισερχόμενου email αφαιρέθηκε."
+
 #: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Τοπικός"
@@ -2911,23 +5445,40 @@ msgstr ""
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:67
+#. 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
 msgid "Edit site-wide message"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:103
+#. TRANS: Server error displayed when saving a site-wide notice was impossible.
+#: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. TRANS: Client error displayed when a site-wide notice was longer than allowed.
+#: actions/sitenoticeadminpanel.php:112
+msgid "Maximum length for the site-wide notice is 255 characters."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. 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 ""
 
-#: actions/sitenoticeadminpanel.php:198
+#. TRANS: Title for button to save site notice in admin panel.
+#: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
 msgstr "Διαγραφή μηνύματος"
 
@@ -2943,6 +5494,12 @@ msgstr "Ρυθμίσεις του άβαταρ"
 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:97
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Η αρχική σελίδα δεν είναι έγκυρο URL."
+
 #. TRANS: Form legend for SMS settings form.
 #: actions/smssettings.php:111
 msgid "SMS address"
@@ -2958,16 +5515,34 @@ msgstr "Τρέχων επιβεβαιωμένο, μέσω SMS, νούμερο κ
 msgid "Awaiting confirmation on this phone number."
 msgstr "Αναμένωντας επιβεβαίωση σ' αυτό το νούμερο τηλεφώνου."
 
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
+#, fuzzy
+msgid "Confirmation code"
+msgstr "Ο κωδικός επιβεβαίωσης δεν βρέθηκε."
+
 #. TRANS: Form field instructions in SMS settings form.
 #: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr ""
 
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Επιβεβαίωση"
+
 #. TRANS: Field label for SMS phone number input in SMS settings form.
 #: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr ""
 
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
+#, fuzzy
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "1-64 μικρά γράμματα ή αριθμοί, χωρίς σημεία στίξης ή κενά. Απαραίτητο."
+
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:195
 msgid "SMS preferences"
@@ -2980,6 +5555,18 @@ msgid ""
 "from my carrier."
 msgstr ""
 
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Οι προτιμήσεις αποθηκεύτηκαν"
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
+#, fuzzy
+msgid "No phone number."
+msgstr "Κανένας τέτοιος χρήστης."
+
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
 #: actions/smssettings.php:344
 msgid "No carrier selected."
@@ -3005,6 +5592,25 @@ msgstr ""
 "προσθέσατε. Ελέγξτε τα εισερχόμενα (και τον φάκελο ανεπιθύμητης "
 "αλληλογραφίας) για τον κωδικό και για το πως να τον χρησιμοποιήσετε."
 
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
+#, fuzzy
+msgid "That is the wrong confirmation number."
+msgstr "Αναμένωντας επιβεβαίωση σ' αυτό το νούμερο τηλεφώνου."
+
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+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:448
+#, fuzzy
+msgid "That is not your phone number."
+msgstr "Αναμένωντας επιβεβαίωση σ' αυτό το νούμερο τηλεφώνου."
+
 #. TRANS: Message given after successfully removing a registered SMS phone number.
 #: actions/smssettings.php:470
 msgid "The SMS phone number was removed."
@@ -3040,6 +5646,11 @@ msgstr ""
 msgid "Snapshots"
 msgstr ""
 
+#: actions/snapshotadminpanel.php:65
+#, fuzzy
+msgid "Manage snapshot configuration"
+msgstr "Επιβεβαίωση διεύθυνσης email"
+
 #: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr ""
@@ -3088,8 +5699,15 @@ msgstr ""
 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:83 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "Απέτυχε η εισαγωγή νέας συνδρομής."
 
@@ -3097,66 +5715,93 @@ msgstr "Απέτυχε η εισαγωγή νέας συνδρομής."
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Κανένας τέτοιος χρήστης."
-
 #: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
-#: actions/subscribers.php:52
+#: actions/subscribe.php:145
+#, 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
+#, fuzzy, 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"
 
-#: actions/subscribers.php:63
+#. 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 ""
 
-#: actions/subscribers.php:67
+#. 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 ""
 
-#: actions/subscribers.php:108
+#. TRANS: Subscriber list text when the logged in user has no subscribers.
+#: actions/subscribers.php:116
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
-"return the favor"
+"return the favor."
 msgstr ""
 
-#: actions/subscribers.php:110
+#. 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:120
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
 
-#: actions/subscribers.php:114
+#. TRANS: Subscriber list text when looking at the subscribers for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#. 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:129
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
 "%) and be the first?"
 msgstr ""
 
-#: actions/subscriptions.php:52
-#, php-format
-msgid "%s subscriptions"
-msgstr "Όλες οι συνδρομές"
-
-#: actions/subscriptions.php:54
+#. 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"
 
-#: actions/subscriptions.php:65
+#. 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 ""
 
-#: actions/subscriptions.php:69
+#. 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 ""
 
-#: actions/subscriptions.php:126
+#. 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.
+#: actions/subscriptions.php:135
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -3166,16 +5811,27 @@ msgid ""
 "automatically subscribe to people you already follow there."
 msgstr ""
 
-#: actions/subscriptions.php:128 actions/subscriptions.php:132
+#. 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: 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:143 actions/subscriptions.php:149
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr ""
 
-#: actions/subscriptions.php:208
+#: actions/subscriptions.php:178
+#, 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:242
 msgid "Jabber"
 msgstr ""
 
-#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
+#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
+#: actions/subscriptions.php:257
 msgid "SMS"
 msgstr ""
 
@@ -3184,11 +5840,21 @@ msgstr ""
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr ""
 
+#: actions/tag.php:87
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Ροή φίλων του/της %s (RSS 1.0)"
+
 #: actions/tag.php:93
 #, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "Ροή φίλων του/της %s (RSS 2.0)"
 
+#: actions/tag.php:99
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Ροή φίλων του/της %s (Atom)"
+
 #: actions/tagother.php:39
 msgid "No ID argument."
 msgstr ""
@@ -3203,7 +5869,7 @@ msgid "User profile"
 msgstr "Προφίλ χρήστη"
 
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:103
+#: lib/userprofile.php:107
 msgid "Photo"
 msgstr ""
 
@@ -3230,6 +5896,11 @@ msgstr "Απέτυχε η αποθήκευση του προφίλ."
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
+#: actions/tagrss.php:35
+#, fuzzy
+msgid "No such tag."
+msgstr "Κανένας τέτοιος χρήστης."
+
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Δεν μπορείτε να κάνετε φραγή στον εαυτό σας!"
@@ -3246,6 +5917,11 @@ msgstr ""
 msgid "No profile ID in request."
 msgstr ""
 
+#: actions/unsubscribe.php:98
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Απέτυχε η συνδρομή."
+
 #: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
@@ -3253,56 +5929,98 @@ msgid ""
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:58
 msgctxt "TITLE"
 msgid "User"
 msgstr ""
 
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
+#. TRANS: Instruction for user admin panel.
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site"
 msgstr ""
 
-#: actions/useradminpanel.php:149
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
-#: actions/useradminpanel.php:155
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 
-#: actions/useradminpanel.php:165
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
+#: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
-#: actions/useradminpanel.php:222
+#. TRANS: Link description in user account settings menu.
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: lib/personalgroupnav.php:112
+#, fuzzy
+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 ""
 
-#: actions/useradminpanel.php:223
+#. 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 "Welcome text for new users (Max 255 chars)."
+#, fuzzy
+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 ""
 
-#: actions/useradminpanel.php:242
+#. TRANS: Field label in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:244
+#, fuzzy
+msgid "Default subscription"
+msgstr "Όλες οι συνδρομές"
+
+#. TRANS: Tooltip in user admin panel for setting default subscription for new users.
+#: actions/useradminpanel.php:246
 msgid "Automatically subscribe new users to this user."
 msgstr "Γίνε συνδρομητής αυτού του χρήστη"
 
-#: actions/useradminpanel.php:251
+#. TRANS: Form legend in user admin panel.
+#: actions/useradminpanel.php:256
 msgid "Invitations"
 msgstr "Προσκλήσεις"
 
-#: actions/useradminpanel.php:258
+#. 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
+msgid "Save user settings"
+msgstr ""
+
 #: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Εξουσιοδοτημένη συνδρομή"
@@ -3314,6 +6032,13 @@ msgid ""
 "click “Reject”."
 msgstr ""
 
+#. TRANS: Menu item for site administration
+#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
+#, fuzzy
+msgid "License"
+msgstr "Σύνδεσμοι"
+
 #: actions/userauthorization.php:217
 msgid "Accept"
 msgstr "Αποδοχή"
@@ -3335,6 +6060,11 @@ msgstr "Εξουσιοδοτημένη συνδρομή"
 msgid "No authorization request!"
 msgstr ""
 
+#: actions/userauthorization.php:254
+#, fuzzy
+msgid "Subscription authorized"
+msgstr "Γίνε συνδρομητής αυτού του χρήστη"
+
 #: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
@@ -3388,11 +6118,13 @@ msgstr ""
 msgid "Wrong image type for avatar URL ‘%s’."
 msgstr ""
 
-#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#. TRANS: Page title for profile design page.
+#: actions/userdesignsettings.php:76 lib/designsettings.php:63
 msgid "Profile design"
 msgstr ""
 
-#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+#. TRANS: Instructions for profile design page.
+#: actions/userdesignsettings.php:87 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -3412,6 +6144,11 @@ msgstr "%1$s και φίλοι, σελίδα 2%$d"
 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."
@@ -3423,7 +6160,7 @@ msgstr ""
 #. 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:76
+#: lib/atomusernoticefeed.php:75
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
@@ -3471,42 +6208,119 @@ msgstr ""
 msgid "Plugins"
 msgstr ""
 
+#. 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 "Προσωπικά"
+
 #: actions/version.php:199
 msgid "Author(s)"
 msgstr ""
 
+#. TRANS: Activity title when marking a notice as favorite.
+#: classes/Fave.php:164 lib/favorform.php:143
+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:143
+#: classes/File.php:156
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr ""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:175
+#: classes/File.php:188
 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.
-#: classes/File.php:190
+#. TRANS: %1$s is used for plural.
+#: classes/File.php:204
 #, php-format
 msgid ""
+"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
+"Try to upload a smaller version."
+msgid_plural ""
 "No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
 "Try to upload a smaller version."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
-#. TRANS: %d (number) is the user quota in bytes.
-#: classes/File.php:202
+#. TRANS: %d (number) is the user quota in bytes and is used for plural.
+#: classes/File.php:217
 #, php-format
-msgid "A file this large would exceed your user quota of %d bytes."
-msgstr ""
+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."
+msgstr[0] ""
+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.
-#: classes/File.php:211
+#. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
+#: classes/File.php:229
 #, php-format
-msgid "A file this large would exceed your monthly quota of %d bytes."
+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] ""
+msgstr[1] ""
+
+#. TRANS: Client exception thrown if a file upload does not have a valid name.
+#: classes/File.php:276 classes/File.php:291
+#, 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
+#, 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.
@@ -3522,15 +6336,27 @@ 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:533
+#: classes/Memcached_DataObject.php:537
 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:46
+#: 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
@@ -3538,155 +6364,221 @@ msgstr ""
 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 "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s"
+
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: 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:270
+#: 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:276
+#: 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:283
+#: 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:291
+#: 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:358 classes/Notice.php:385
+#: 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:899
-msgid "Bad type provided to saveKnownGroups"
+#: classes/Notice.php:914
+msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1013
 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:1127
+#, 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:1759
+#: classes/Notice.php:1646
 #, 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)"
+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:737
+#: classes/Profile.php:765
 #, 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:746
+#: classes/Profile.php:774
 #, 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:75 lib/oauthstore.php:466
+#: 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:85
+#: 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:178
+#: 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:206
+#: 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:218
+#: 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 ""
+
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:395
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
+#. TRANS: Server exception.
+#: classes/User.php:918
+msgid "No single user defined for single-user mode."
+msgstr ""
+
+#. TRANS: Server exception.
+#: classes/User.php:922
+msgid "Single-user mode code called when not enabled."
+msgstr ""
+
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:496
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "Δεν ήταν δυνατή η δημιουργία ομάδας."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:506
+#: classes/User_group.php:526
 msgid "Could not set group URI."
 msgstr "Δεν ήταν δυνατή η δημιουργία ομάδας."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:529
+#: classes/User_group.php:549
 msgid "Could not set group membership."
 msgstr "Δεν ήταν δυνατή η δημιουργία ομάδας."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "Απέτυχε η αποθήκευση του προφίλ."
 
 #. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:109
+#: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
 msgstr "Αλλάξτε τις ρυθμίσεις του προφίλ σας"
 
 #. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:116
+#: lib/accountsettingsaction.php:111
 msgid "Upload an avatar"
 msgstr ""
 
 #. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:118
 msgid "Change your password"
 msgstr "Αλλάξτε τον κωδικό σας"
 
 #. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:130
+#: lib/accountsettingsaction.php:125
 msgid "Change email handling"
 msgstr ""
 
 #. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:137
+#: lib/accountsettingsaction.php:132
 msgid "Design your profile"
 msgstr "Σχεδιάστε το προφίλ σας"
 
 #. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:144
+#: lib/accountsettingsaction.php:139
 msgid "Other options"
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:146
+#: lib/accountsettingsaction.php:141
 msgid "Other"
 msgstr ""
 
@@ -3696,115 +6588,235 @@ msgstr ""
 msgid "%1$s - %2$s"
 msgstr ""
 
+#. TRANS: Page title for a page without a title set.
+#: lib/action.php:164
+#, fuzzy
+msgid "Untitled page"
+msgstr "Ενότητα χωρίς τίτλο"
+
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:312
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:449
+#: lib/action.php:531
 msgid "Primary site navigation"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:455
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
+#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
+#: lib/action.php:540
+#, fuzzy
+msgctxt "MENU"
+msgid "Personal"
+msgstr "Προσωπικά"
+
+#. TRANS: Tooltip for main menu option "Account"
+#: lib/action.php:542
+#, 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:545
+msgid "Account"
+msgstr "Λογαριασμός"
+
+#. TRANS: Tooltip for main menu option "Services"
+#: lib/action.php:547
+#, fuzzy
+msgctxt "TOOLTIP"
+msgid "Connect to services"
+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:468
+#: lib/action.php:550
 msgid "Connect"
 msgstr "Σύνδεση"
 
+#. TRANS: Tooltip for menu option "Admin"
+#: lib/action.php:553
+#, fuzzy
+msgctxt "TOOLTIP"
+msgid "Change site configuration"
+msgstr "Επιβεβαίωση διεύθυνσης email"
+
+#. 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:556 lib/groupnav.php:117
+#, fuzzy
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Διαχειριστής"
+
+#. TRANS: Tooltip for main menu option "Invite"
+#: lib/action.php:560
+#, 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:481
+#: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Μόνο με πρόσκληση"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:487
+#: lib/action.php:569
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr ""
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:490
+#: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
-msgstr "Λογότυπο"
+msgstr "Έξοδος"
+
+#. TRANS: Tooltip for main menu option "Register"
+#: lib/action.php:577
+#, fuzzy
+msgctxt "TOOLTIP"
+msgid "Create an account"
+msgstr "Δημιουργία ενός λογαριασμού"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:498
+#: lib/action.php:580
 msgctxt "MENU"
 msgid "Register"
 msgstr "Εγγραφή"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:501
+#: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr ""
 
+#. TRANS: Main menu option when not logged in to log in
+#: lib/action.php:586
+msgctxt "MENU"
+msgid "Login"
+msgstr "Είσοδος"
+
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:507
+#: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Βοήθεια"
 
+#. TRANS: Main menu option for help on the StatusNet site
+#: lib/action.php:592
+msgctxt "MENU"
+msgid "Help"
+msgstr "Βοήθεια"
+
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:513
+#: lib/action.php:595
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr ""
 
-#: lib/action.php:516
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#: lib/action.php:598
 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:620 lib/adminpanelaction.php:387
+#, fuzzy
+msgid "Site notice"
+msgstr "Διαγραφή μηνύματος"
+
+#. TRANS: DT element for local views block. String is hidden in default CSS.
+#: lib/action.php:687
+#, fuzzy
+msgid "Local views"
+msgstr "Τοπικός"
+
+#. TRANS: DT element for page notice. String is hidden in default CSS.
+#: lib/action.php:757
+#, fuzzy
+msgid "Page notice"
+msgstr "Διαγραφή μηνύματος"
+
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:778
+#: lib/action.php:858
 msgid "Secondary site navigation"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:784
+#: lib/action.php:864
 msgid "Help"
 msgstr "Βοήθεια"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:787
+#: lib/action.php:867
 msgid "About"
 msgstr "Περί"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:790
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "Συχνές ερωτήσεις"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:795
+#: lib/action.php:875
 msgid "TOS"
 msgstr ""
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:802
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+#: lib/action.php:879
+#, fuzzy
+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 contact information on the StatusNet site.
-#: lib/action.php:808
+#. 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 "Επικοινωνία"
 
-#: lib/action.php:810
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:892
 msgid "Badge"
 msgstr ""
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:839
+#: lib/action.php:921
 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:928
+#, fuzzy, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%)."
+msgstr ""
+"To **%%site.name%%** είναι μία υπηρεσία microblogging (μικρο-ιστολογίου) που "
+"έφερε κοντά σας το  [%%site.broughtby%%](%%site.broughtbyurl%%). "
+
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:849
+#: lib/action.php:931
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -3814,7 +6826,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:856
+#: lib/action.php:938
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3823,65 +6835,119 @@ msgid ""
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:872
+#: lib/action.php:954
 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:879
+#: lib/action.php:961
 #, 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:886
+#: lib/action.php:968
 #, 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:890
+#: lib/action.php:972
 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:904
+#: lib/action.php:1004
 #, 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:1340
+#, 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:1254
+#: lib/action.php:1351
 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:1264
+#: lib/action.php:1361
 msgid "Before"
 msgstr ""
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:122
+#: 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 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 ""
+
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:203
+#: 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:240
+#: 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:245
+#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
@@ -3911,220 +6977,357 @@ msgstr ""
 msgid "Unable to delete design setting."
 msgstr ""
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:337
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "Επιβεβαίωση διεύθυνσης email"
+
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:339
 msgctxt "MENU"
 msgid "Site"
 msgstr ""
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:345
+#, fuzzy
+msgid "Design configuration"
+msgstr "Επιβεβαίωση διεύθυνσης email"
+
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
+#. 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 "Επιβεβαίωση διεύθυνσης email"
+
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
 msgid "User"
 msgstr ""
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:361
+#, fuzzy
+msgid "Access configuration"
+msgstr "Επιβεβαίωση διεύθυνσης email"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:369
+#, fuzzy
+msgid "Paths configuration"
+msgstr "Επιβεβαίωση διεύθυνσης email"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:377
+#, fuzzy
+msgid "Sessions configuration"
+msgstr "Επιβεβαίωση διεύθυνσης email"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:385
+#, fuzzy
+msgid "Edit site notice"
+msgstr "Διαγραφή μηνύματος"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:393
+#, fuzzy
+msgid "Snapshots configuration"
+msgstr "Επιβεβαίωση διεύθυνσης email"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+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:175
+#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:212
+#: 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:217
+#: 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:258 lib/apiauth.php:290
+#: lib/apiauth.php:266 lib/apiauth.php:293
 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:186
+msgid "Could not issue access token."
+msgstr ""
+
+#. TRANS: Server error displayed when a database error occurs.
+#: lib/apioauthstore.php:243
+#, fuzzy
+msgid "Database error inserting OAuth application user."
+msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s"
+
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:285
 msgid "Tried to revoke unknown token."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:182
+#: lib/apioauthstore.php:290
 msgid "Failed to delete revoked token."
 msgstr ""
 
-#. TRANS: Form legend.
-#: lib/applicationeditform.php:129
-msgid "Edit application"
-msgstr ""
-
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:200
+#. TRANS: %d is the number of available characters for the description.
+#: lib/applicationeditform.php:201
 #, php-format
-msgid "Describe your application in %d characters"
-msgstr "Περιγράψτε την ομάδα ή το θέμα χρησιμοποιώντας μέχρι %d χαρακτήρες"
+msgid "Describe your application in %d character"
+msgid_plural "Describe your application in %d characters"
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:215
+#: lib/applicationeditform.php:205
+#, fuzzy
+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:217
+#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Ακύρωση"
 
+#: lib/applicationlist.php:247
+msgid " by "
+msgstr ""
+
 #. TRANS: Application access type
-#: lib/applicationlist.php:135
+#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:137
+#: 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:143
+#. 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:158
+#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr ""
 
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:88
-msgid "Attachments"
+#: 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: DT element label in attachment list item.
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:294
 msgid "Author"
 msgstr ""
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:279
+#: lib/attachmentlist.php:308
 msgid "Provider"
 msgstr ""
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:68
+#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr ""
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:49
+#: 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:70
+#: lib/blockform.php:68
 msgid "Block"
 msgstr ""
 
-#: lib/channel.php:157 lib/channel.php:177
+#. TRANS: Title for command results.
+#: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
 msgstr ""
 
-#: lib/channel.php:229 lib/mailhandler.php:142
+#. TRANS: Title for command results.
+#: lib/channel.php:194
+msgid "AJAX error"
+msgstr ""
+
+#. TRANS: E-mail subject when a command has completed.
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr ""
 
+#. TRANS: E-mail subject when a command has failed.
+#: lib/channel.php:244
+#, fuzzy
+msgid "Command failed"
+msgstr "Εσείς και οι φίλοι σας"
+
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:84 lib/command.php:108
+#: 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:101 lib/command.php:630
+#: lib/command.php:99 lib/command.php:630
 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:150
+#: 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:185
+#: 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:231
+#: 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:240
+#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr ""
@@ -4133,7 +7336,7 @@ 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:270
+#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -4142,156 +7345,217 @@ msgid ""
 msgstr ""
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:314
+#: lib/command.php:312
 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:360
+#: lib/command.php:357
 #, 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:408
+#: lib/command.php:405
 #, 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
+#, 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
+#, fuzzy, php-format
+msgid "Fullname: %s"
+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:278
+#, fuzzy, php-format
+msgid "Location: %s"
+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:282
+#, fuzzy, php-format
+msgid "Homepage: %s"
+msgstr "Αρχική σελίδα"
+
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:442
+#, fuzzy, 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).
-#: lib/command.php:474
+#. TRANS: %s is a remote profile.
+#: lib/command.php:471
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:491 lib/xmppmanager.php:403
+#: lib/command.php:488
 #, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:517
+#: lib/command.php:516
 msgid "Error sending direct message."
 msgstr ""
 
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:553
+#, fuzzy, php-format
+msgid "Notice from %s repeated."
+msgstr "Ρυθμίσεις OpenID"
+
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:557
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr ""
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:592
+#: lib/command.php:591
 #, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:603
+#: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
 msgstr ""
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:606
+#: lib/command.php:607
 msgid "Error saving notice."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:655
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:664
+#: lib/command.php:663
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:672
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:694 lib/command.php:804
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:705
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:724 lib/command.php:750
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:728
+#: lib/command.php:727
 msgid "Notification off."
 msgstr ""
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:731
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr ""
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:754
+#: lib/command.php:753
 msgid "Notification on."
 msgstr ""
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:757
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:771
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:784
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:813
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:830
+#, fuzzy
+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:836
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
 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
+#, fuzzy
+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:863
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
@@ -4299,21 +7563,21 @@ msgstr[1] "Δεν επιτρέπεται να κάνεις συνδρομητέ
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:885
+#: lib/command.php:884
 msgid "You are not a member of any groups."
 msgstr "Δεν είστε μέλος καμίας ομάδας."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:890
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Ομάδες με τα περισσότερα μέλη"
 msgstr[1] "Ομάδες με τα περισσότερα μέλη"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:905
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -4355,87 +7619,150 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:136
-msgid "I looked for configuration files in the following places: "
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#: lib/common.php:150
+msgid "No configuration file found."
 msgstr ""
 
-#: lib/common.php:138
+#. 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:153
+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:156
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:139
+#. 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:160
 msgid "Go to the installer."
 msgstr ""
 
-#: lib/connectsettingsaction.php:110
+#. TRANS: Menu item for Instant Messaging settings.
+#: lib/connectsettingsaction.php:106
+msgctxt "MENU"
 msgid "IM"
-msgstr "ΙΜ"
+msgstr ""
 
-#: lib/connectsettingsaction.php:111
+#. TRANS: Tooltip for Instant Messaging menu item.
+#: lib/connectsettingsaction.php:108
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: lib/connectsettingsaction.php:116
+#. 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 ""
 
-#: lib/connectsettingsaction.php:121
+#. 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:60
+#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr ""
 
-#: lib/designsettings.php:105
+#. 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:104
 msgid "Upload file"
 msgstr "Προφίλ χρήστη"
 
+#. TRANS: Instructions for form on profile design page.
 #: lib/designsettings.php:109
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
 
-#: lib/designsettings.php:418
+#. 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 ""
+
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: lib/designsettings.php:264
+msgctxt "BUTTON"
+msgid "Reset"
+msgstr ""
+
+#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
+#: lib/designsettings.php:433
 msgid "Design defaults restored."
 msgstr ""
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr ""
 
-#: lib/favorform.php:114 lib/favorform.php:140
+#: lib/favorform.php:114 lib/favorform.php:143
 msgid "Favor this notice"
 msgstr ""
 
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr ""
-
-#: lib/feed.php:85
+#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr ""
 
-#: lib/feed.php:87
+#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr ""
 
-#: lib/feed.php:89
+#: lib/feed.php:88
 msgid "Atom"
 msgstr ""
 
-#: lib/feed.php:91
+#: lib/feed.php:90
 msgid "FOAF"
 msgstr ""
 
-#: lib/feedlist.php:64
-msgid "Export data"
+#: 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:121
 msgid "Filter tags"
 msgstr ""
 
+#: lib/galleryaction.php:131
+#, fuzzy
+msgid "All"
+msgstr "Να επιτραπεί"
+
 #: lib/galleryaction.php:139
 msgid "Select tag to filter"
 msgstr ""
@@ -4457,8 +7784,12 @@ msgstr ""
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
+#: lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64 μικρά γράμματα ή αριθμοί, χωρίς σημεία στίξης ή κενά"
+
 #: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
+msgid "URL of the homepage or blog of the group or topic."
 msgstr ""
 
 #: lib/groupeditform.php:168
@@ -4467,19 +7798,27 @@ msgstr "Περιγράψτε την ομάδα ή το θέμα"
 
 #: lib/groupeditform.php:170
 #, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Περιγράψτε την ομάδα ή το θέμα χρησιμοποιώντας μέχρι %d χαρακτήρες"
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
+msgstr[0] ""
+msgstr[1] ""
 
-#: lib/groupeditform.php:179
+#: lib/groupeditform.php:182
 msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "Τοποθεσία της ομάδας (εάν υπάρχει), πχ: \"Πόλη, Περιοχή, Χώρα)"
-
-#: lib/groupeditform.php:187
-#, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+"Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 
+#: lib/groupeditform.php:190
+#, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+msgstr[1] ""
+
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86
 msgctxt "MENU"
@@ -4552,14 +7891,23 @@ 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"
@@ -4569,39 +7917,52 @@ msgstr ""
 msgid "Unsupported image file format."
 msgstr ""
 
-#: lib/imagefile.php:88
+#. 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:90
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr ""
 
-#: lib/imagefile.php:93
+#: lib/imagefile.php:95
 msgid "Partial upload."
 msgstr ""
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:101 lib/mediafile.php:179
-msgid "System error uploading file."
-msgstr ""
-
-#: lib/imagefile.php:109
+#: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr ""
 
-#: lib/imagefile.php:122
+#: lib/imagefile.php:160
 msgid "Lost our file."
 msgstr "Σχεδιάστε το προφίλ σας"
 
-#: lib/imagefile.php:163 lib/imagefile.php:224
+#: lib/imagefile.php:197 lib/imagefile.php:237
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/imagefile.php:244
-msgid "MB"
-msgstr ""
+#. TRANS: Number of megabytes. %d is the number.
+#: lib/imagefile.php:283
+#, php-format
+msgid "%dMB"
+msgid_plural "%dMB"
+msgstr[0] ""
+msgstr[1] ""
 
-#: lib/imagefile.php:246
-msgid "kB"
-msgstr ""
+#. TRANS: Number of kilobytes. %d is the number.
+#: lib/imagefile.php:287
+#, php-format
+msgid "%dkB"
+msgid_plural "%dkB"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Number of bytes. %d is the number.
+#: lib/imagefile.php:290
+#, php-format
+msgid "%dB"
+msgid_plural "%dB"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/jabber.php:387
 #, php-format
@@ -4613,10 +7974,6 @@ msgstr ""
 msgid "Unknown inbox source %d."
 msgstr ""
 
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Συμμετοχή"
-
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Αποχώρηση"
@@ -4629,44 +7986,53 @@ msgstr "Σύνδεση με όνομα χρήστη και κωδικό"
 msgid "Sign up for a new account"
 msgstr "Εγγραφή για ένα νέο λογαριασμό"
 
-#. TRANS: Subject for address confirmation email
+#. TRANS: Subject for address confirmation email.
 #: lib/mail.php:174
 msgid "Email address confirmation"
 msgstr "Επιβεβαίωση διεύθυνσης email"
 
 #. TRANS: Body for address confirmation email.
-#: lib/mail.php:177
+#. 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:179
 #, php-format
 msgid ""
-"Hey, %s.\n"
+"Hey, %1$s.\n"
 "\n"
-"Someone just entered this email address on %s.\n"
+"Someone just entered this email address on %2$s.\n"
 "\n"
 "If it was you, and you want to confirm your entry, use the URL below:\n"
 "\n"
-"\t%s\n"
+"\t%3$s\n"
 "\n"
 "If not, just ignore this message.\n"
 "\n"
 "Thanks for your time, \n"
-"%s\n"
+"%2$s\n"
 msgstr ""
 
-#. TRANS: Subject of new-subscriber notification e-mail
-#: lib/mail.php:243
+#. 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:246
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr ""
 
-#: lib/mail.php:248
+#. 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:253
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
 "your subscribers list and report as spam to site administrators at %s"
 msgstr ""
 
-#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:254
+#. TRANS: Main body of new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename,
+#. 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:263
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -4675,26 +8041,30 @@ msgid ""
 "\n"
 "%4$s%5$s%6$s\n"
 "Faithfully yours,\n"
-"%7$s.\n"
+"%2$s.\n"
 "\n"
 "----\n"
-"Change your email address or notification options at %8$s\n"
+"Change your email address or notification options at %7$s\n"
 msgstr ""
 
-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:274
+#. TRANS: Profile info line in new-subscriber notification e-mail.
+#. TRANS: %s is biographical information.
+#: lib/mail.php:286
 #, php-format
 msgid "Bio: %s"
 msgstr "Βιογραφικό"
 
-#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:304
+#. TRANS: Subject of notification mail for new posting email address.
+#. TRANS: %s is the StatusNet sitename.
+#: lib/mail.php:315
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 
-#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:308
+#. 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:321
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -4704,23 +8074,40 @@ msgid ""
 "More email instructions at %3$s.\n"
 "\n"
 "Faithfully yours,\n"
-"%4$s"
+"%1$s"
 msgstr ""
 
-#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:433
+#. TRANS: Subject line for SMS-by-email notification messages.
+#. TRANS: %s is the posting user's nickname.
+#: lib/mail.php:442
 #, php-format
 msgid "%s status"
 msgstr "Κατάσταση του/της %s"
 
-#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:484
+#. TRANS: Subject line for SMS-by-email address confirmation message.
+#: lib/mail.php:468
+#, fuzzy
+msgid "SMS confirmation"
+msgstr "Επιβεβαίωση διεύθυνσης email"
+
+#. TRANS: Main body heading for SMS-by-email address confirmation message.
+#. TRANS: %s is the addressed user's nickname.
+#: lib/mail.php:472
+#, 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:493
 #, php-format
 msgid "You've been nudged by %s"
 msgstr ""
 
-#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:489
+#. 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:500
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4736,14 +8123,18 @@ msgid ""
 "%4$s\n"
 msgstr ""
 
-#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:536
+#. TRANS: Subject for direct-message notification email.
+#. TRANS: %s is the sending user's nickname.
+#: lib/mail.php:547
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#. TRANS: Body for direct-message notification email
-#: lib/mail.php:541
+#. TRANS: Body for direct-message notification email.
+#. 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:555
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -4762,14 +8153,19 @@ msgid ""
 "%5$s\n"
 msgstr ""
 
-#. TRANS: Subject for favorite notification email
-#: lib/mail.php:589
+#. 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:607
 #, php-format
-msgid "%s (@%s) added your notice as a favorite"
+msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr ""
 
-#. TRANS: Body for favorite notification email
-#: lib/mail.php:592
+#. 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,
+#. 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:614
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4791,7 +8187,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:651
+#: lib/mail.php:672
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -4799,13 +8195,20 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: lib/mail.php:657
+#. 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:680
 #, php-format
-msgid "%s (@%s) sent a notice to your attention"
+msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
 
 #. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:660
+#. TRANS: %1$s is the sending user's long name, $2$s is the StatusNet sitename,
+#. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
+#. 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:688
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4842,10 +8245,15 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:228 lib/noticelist.php:506
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr "από"
 
+#: lib/mailhandler.php:37
+#, fuzzy
+msgid "Could not parse message."
+msgstr "Απέτυχε η ενημέρωση του χρήστη."
+
 #: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr ""
@@ -4858,63 +8266,38 @@ msgstr ""
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
-#: lib/mailhandler.php:228
+#: 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:99 lib/mediafile.php:125
+#: 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 an uploaded file is larger than set in php.ini.
-#: lib/mediafile.php:145
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
-
-#. TRANS: Client exception.
-#: lib/mediafile.php:151
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
-msgstr ""
-
-#. TRANS: Client exception.
-#: lib/mediafile.php:157
-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.
-#: lib/mediafile.php:165
-msgid "Missing a temporary folder."
-msgstr ""
-
-#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: lib/mediafile.php:169
-msgid "Failed to write file to disk."
-msgstr ""
-
-#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: lib/mediafile.php:173
-msgid "File upload stopped by extension."
-msgstr ""
-
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:189 lib/mediafile.php:232
+#: 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:209 lib/mediafile.php:251
+#: 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 "Απέτυχε η ενημέρωση του χρήστη."
+
 #. 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:340
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -4923,24 +8306,62 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:345
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
 
-#: lib/messageform.php:146
+#: 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
+msgid "No mutual subscribers."
+msgstr ""
+
+#: lib/messageform.php:153
 msgid "To"
 msgstr ""
 
-#: lib/messageform.php:159 lib/noticeform.php:186
+#: lib/messageform.php:166 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "Διαθέσιμοι χαρακτήρες"
 
-#: lib/messageform.php:178 lib/noticeform.php:237
+#: lib/messageform.php:185 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 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."
+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
+#, fuzzy
+msgid "Send a notice"
+msgstr "Διαγραφή μηνύματος"
+
 #: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
@@ -4954,6 +8375,16 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
+#: lib/noticeform.php:213
+#, fuzzy
+msgid "Share my location"
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
+
+#: lib/noticeform.php:216
+#, fuzzy
+msgid "Do not share my location"
+msgstr "Αδύνατη η αποθήκευση του προφίλ."
+
 #: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
@@ -4961,100 +8392,120 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:436
+#: lib/noticelist.php:452
 msgid "N"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:438
+#: lib/noticelist.php:454
 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:440
+#: lib/noticelist.php:456
 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:442
+#: lib/noticelist.php:458
 msgid "W"
 msgstr ""
 
-#: lib/noticelist.php:444
+#: lib/noticelist.php:460
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:453
+#: lib/noticelist.php:469
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:518
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:568
+#: lib/noticelist.php:584
 msgid "in context"
 msgstr ""
 
-#: lib/noticelist.php:603
+#: lib/noticelist.php:619
 msgid "Repeated by"
 msgstr "Επαναλαμβάνεται από"
 
-#: lib/noticelist.php:631
+#: lib/noticelist.php:646
+#, fuzzy
+msgid "Reply to this notice"
+msgstr "Διαγραφή μηνύματος"
+
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr ""
 
+#: lib/noticelist.php:691
+#, fuzzy
+msgid "Notice repeated"
+msgstr "Ρυθμίσεις OpenID"
+
+#: lib/nudgeform.php:116
+#, fuzzy
+msgid "Nudge this user"
+msgstr "Διαγράψτε αυτόν τον χρήστη"
+
 #: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr ""
 
-#: lib/oauthstore.php:283
+#: 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:291
+#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr ""
 
-#: lib/oauthstore.php:311
+#: 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:346
+#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr ""
 
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "Απέτυχε η εισαγωγή νέας συνδρομής."
 
-#: lib/personalgroupnav.php:99
+#: lib/personalgroupnav.php:102
 msgid "Personal"
 msgstr "Προσωπικά"
 
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:107
 msgid "Replies"
 msgstr ""
 
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:117
 msgid "Favorites"
 msgstr ""
 
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:128
 msgid "Inbox"
 msgstr ""
 
-#: lib/personalgroupnav.php:126
+#: lib/personalgroupnav.php:129
 msgid "Your incoming messages"
 msgstr ""
 
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:133
 msgid "Outbox"
 msgstr ""
 
-#: lib/personalgroupnav.php:131
+#: lib/personalgroupnav.php:134
 msgid "Your sent messages"
 msgstr ""
 
@@ -5064,14 +8515,29 @@ msgid "Tags in %s's notices"
 msgstr ""
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:116
+#: lib/plugin.php:121
 msgid "Unknown"
 msgstr ""
 
+#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#, fuzzy
+msgid "Subscriptions"
+msgstr "Όλες οι συνδρομές"
+
 #: lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "Όλες οι συνδρομές"
 
+#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#, fuzzy
+msgid "Subscribers"
+msgstr "Απέτυχε η συνδρομή."
+
+#: lib/profileaction.php:161
+#, fuzzy
+msgid "All subscribers"
+msgstr "Όλες οι συνδρομές"
+
 #: lib/profileaction.php:191
 msgid "User ID"
 msgstr ""
@@ -5085,6 +8551,11 @@ msgstr "Μέλος από"
 msgid "Daily average"
 msgstr ""
 
+#: lib/profileaction.php:264
+#, fuzzy
+msgid "All groups"
+msgstr "ομάδες των χρηστών %s"
+
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
@@ -5130,8 +8601,9 @@ msgstr "Διαγραφή μηνύματος"
 msgid "Revoke the \"%s\" role from this user"
 msgstr ""
 
-#: lib/router.php:709
-msgid "No single user defined for single-user mode."
+#. TRANS: Client error on action trying to visit a non-existing page.
+#: lib/router.php:974
+msgid "Page not found."
 msgstr ""
 
 #: lib/sandboxform.php:67
@@ -5143,16 +8615,17 @@ msgid "Sandbox this user"
 msgstr "Γίνε συνδρομητής αυτού του χρήστη"
 
 #. TRANS: Fieldset legend for the search form.
-#: lib/searchaction.php:121
+#: lib/searchaction.php:120
 msgid "Search site"
 msgstr ""
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr ""
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
@@ -5163,6 +8636,16 @@ msgstr ""
 msgid "Search help"
 msgstr ""
 
+#: lib/searchgroupnav.php:80
+#, fuzzy
+msgid "People"
+msgstr "Δημοφιλή"
+
+#: lib/searchgroupnav.php:81
+#, fuzzy
+msgid "Find people on this site"
+msgstr "Βρες ομάδες στο site"
+
 #: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr ""
@@ -5187,6 +8670,26 @@ msgstr ""
 msgid "Silence this user"
 msgstr "Διαγράψτε αυτόν τον χρήστη"
 
+#: lib/subgroupnav.php:83
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
+
+#: lib/subgroupnav.php:91
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "Απέτυχε η συνδρομή."
+
+#: lib/subgroupnav.php:99
+#, fuzzy, php-format
+msgid "Groups %s is a member of"
+msgstr "Ομάδες με τα περισσότερα μέλη"
+
+#: lib/subgroupnav.php:105
+#, fuzzy
+msgid "Invite"
+msgstr "Μόνο με πρόσκληση"
+
 #: lib/subgroupnav.php:106
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
@@ -5206,6 +8709,11 @@ msgstr ""
 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 ""
@@ -5215,8 +8723,8 @@ msgid "The theme file is missing or the upload failed."
 msgstr ""
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:278 lib/themeuploader.php:282
-#: lib/themeuploader.php:290 lib/themeuploader.php:297
+#: lib/themeuploader.php:279 lib/themeuploader.php:283
+#: lib/themeuploader.php:291 lib/themeuploader.php:298
 msgid "Failed saving theme."
 msgstr ""
 
@@ -5226,32 +8734,46 @@ msgstr ""
 
 #: lib/themeuploader.php:166
 #, php-format
-msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+msgstr[1] ""
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
+#: lib/themeuploader.php:260
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "Απέτυχε η αποθήκευση του προφίλ."
+
 #: 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 ""
@@ -5268,52 +8790,84 @@ msgstr ""
 msgid "Unsilence this user"
 msgstr "Διαγράψτε αυτόν τον χρήστη"
 
-#: lib/userprofile.php:117
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+#, fuzzy
+msgid "Unsubscribe from this user"
+msgstr "Γίνε συνδρομητής αυτού του χρήστη"
+
+#: lib/unsubscribeform.php:137
+#, fuzzy
+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:119
 msgid "Edit Avatar"
 msgstr ""
 
-#: lib/userprofile.php:237
+#: lib/userprofile.php:236 lib/userprofile.php:250
+#, fuzzy
+msgid "User actions"
+msgstr "Ομάδες χρηστών"
+
+#: lib/userprofile.php:239
 msgid "User deletion in progress..."
 msgstr ""
 
-#: lib/userprofile.php:263
+#: lib/userprofile.php:265
 msgid "Edit profile settings"
 msgstr "Επεξεργασία ρυθμίσεων προφίλ"
 
-#: lib/userprofile.php:264
+#: lib/userprofile.php:266
 msgid "Edit"
 msgstr "Επεξεργασία"
 
-#: lib/userprofile.php:287
+#: lib/userprofile.php:289
 msgid "Send a direct message to this user"
 msgstr ""
 
-#: lib/userprofile.php:288
+#: lib/userprofile.php:290
 msgid "Message"
 msgstr "Μήνυμα"
 
-#: lib/userprofile.php:366
+#: lib/userprofile.php:331
+#, fuzzy
+msgid "Moderate"
+msgstr "Συντονιστής"
+
+#: lib/userprofile.php:369
+#, fuzzy
+msgid "User role"
+msgstr "Προφίλ χρήστη"
+
+#: lib/userprofile.php:371
 msgctxt "role"
 msgid "Administrator"
 msgstr "Διαχειριστής"
 
-#: lib/userprofile.php:367
+#: lib/userprofile.php:372
 msgctxt "role"
 msgid "Moderator"
 msgstr "Συντονιστής"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: 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:1106
+#: 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:1110
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -5321,12 +8875,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: 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:1117
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -5334,12 +8888,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: 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:1124
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -5347,12 +8901,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: 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:1131
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -5360,11 +8914,49 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr ""
 
-#: lib/webcolor.php:82
+#: lib/webcolor.php:80
 #, php-format
 msgid "%s is not a valid color!"
 msgstr "Το %s δεν είναι ένα έγκυρο χρώμα!"
+
+#. TRANS: Validation error for a web colour.
+#. TRANS: %s is the provided (invalid) text for colour.
+#: lib/webcolor.php:120
+#, php-format
+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:64
+msgid "Invalid XML."
+msgstr ""
+
+#. TRANS: Exception.
+#: lib/xrd.php:69
+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 ""
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index ce4ca83ffc..37977510c6 100644
--- a/locale/he/LC_MESSAGES/statusnet.po
+++ b/locale/he/LC_MESSAGES/statusnet.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - Core to Hebrew (עברית)
 # Expored from translatewiki.net
 #
+# Author: YaronSh
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -8,364 +9,831 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:07:55+0000\n"
+"POT-Creation-Date: 2011-01-15 00:20+0000\n"
+"PO-Revision-Date: 2011-01-15 00:22:37+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-Generator: MediaWiki 1.17alpha (r73298); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80364); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 1284-74-75 38::+0000\n"
+"X-POT-Import-Date: 2011-01-15 00:06:50+0000\n"
 
-#. TRANS: Page notice
-#: actions/accessadminpanel.php:67
+#. 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: Checkbox instructions for admin setting "Private"
-#: actions/accessadminpanel.php:165
+#. 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 instructions for admin setting "Invite only"
-#: actions/accessadminpanel.php:174
+#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
+#: actions/accessadminpanel.php:157
+#, fuzzy
+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:176
+#: actions/accessadminpanel.php:166
 msgid "Invite only"
 msgstr ""
 
-#. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations)
-#: actions/accessadminpanel.php:183
+#. 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 "אין משתמש כזה."
+
+#. TRANS: Title for button to save access settings in site admin panel.
+#: actions/accessadminpanel.php:191
+#, fuzzy
+msgid "Save access settings"
+msgstr "הגדרות"
+
+#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button text for saving "Other settings" in profile.
+#. TRANS: Button text to store form data in the Paths admin panel.
+#. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
+#. TRANS: Button label to save SMS preferences.
+#. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
+#. TRANS: Button label in the "Edit application" form.
+#. TRANS: Button text on profile design page to save settings.
+#: actions/accessadminpanel.php:193 actions/emailsettings.php:254
+#: actions/imsettings.php:187 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/subscriptions.php:262 actions/useradminpanel.php:298
+#: lib/applicationeditform.php:355 lib/designsettings.php:270
+#: lib/groupeditform.php:207
+#, fuzzy
+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:138 actions/tag.php:52
 msgid "No such page."
 msgstr "אין משתמש כזה."
 
+#. TRANS: Client error when user not found for an action.
+#. TRANS: Client error when user not found for an rss related action.
+#. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
+#. TRANS: Client error displayed if a user could not be found.
+#. TRANS: Client error when user not found updating a profile background image.
+#. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error when user not found for an API action to remove a block for a user.
+#. TRANS: Client error given when a user was not found (404).
+#. TRANS: Client error when user not found for an API direct message action.
+#. TRANS: Client error given when a user was not found (404).
+#. 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 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.
+#. TRANS: Client error displayed when requesting dents of a user and friends for a user that does not exist.
+#. TRANS: Client error displayed when requesting most recent dents by user and friends for a non-existing user.
+#. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
+#. TRANS: Client error displayed requesting most recent notices for a non-existing user.
+#. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
-#: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:115
-#: actions/apiaccountupdateprofile.php:106
-#: actions/apiaccountupdateprofilebackgroundimage.php:117
-#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
-#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
-#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
-#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
-#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
-#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
-#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
-#: actions/otp.php:76 actions/remotesubscribe.php:145
-#: actions/remotesubscribe.php:154 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
-#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
+#: 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:60
+#: actions/apiblockcreate.php:95 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/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:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
+#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
+#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
+#: actions/showfavorites.php:105 actions/userbyid.php:74
+#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
+#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "אין משתמש כזה."
 
-#. TRANS: Page title. %1$s is user nickname
-#. TRANS: H1 text. %1$s is user nickname
+#. TRANS: Page title. %1$s is user nickname, %2$d is page number
+#: actions/all.php:91
+#, fuzzy, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%s וחברים"
+
+#. TRANS: Page title. %s is user nickname
+#. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
-#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
-#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
-#: lib/personalgroupnav.php:100
+#. 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:103
 #, php-format
 msgid "%s and friends"
 msgstr "%s וחברים"
 
-#. TRANS: %1$s is user nickname
-#: actions/all.php:138
+#. TRANS: %s is user nickname.
+#: actions/all.php:108
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "הזנות החברים של %s"
+
+#. TRANS: %s is user nickname.
+#: actions/all.php:117
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "הזנות החברים של %s"
+
+#. TRANS: %s is user nickname.
+#: actions/all.php:126
+#, fuzzy, 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 ""
 
-#: actions/all.php:143
+#. 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 ""
 
-#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:146
+#. 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 "
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
+#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. 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
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 "post a notice to them."
 msgstr ""
 
+#. TRANS: H1 text for page when viewing a list for self.
+#: actions/all.php:188
+#, fuzzy
+msgid "You and friends"
+msgstr "%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:121 actions/apitimelinefriends.php:216
-#: actions/apitimelinehome.php:122
+#: 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 ""
 
+#. TRANS: Client error displayed handling a non-existing API method.
+#. TRANS: Client error displayed when trying to handle an unknown API method.
+#. TRANS: Client error displayed trying to execute an unknown API method updating profile colours.
+#. TRANS: Client error displayed trying to execute an unknown API method verifying user credentials.
+#. TRANS: Client error given when an API method was not found (404).
+#. TRANS: Client error displayed when trying to handle an unknown API method.
+#. TRANS: Client error displayed trying to execute an unknown API method showing friendship.
+#. TRANS: Client error given when an API method was not found (404).
+#. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed trying to execute an unknown API method joining a group.
+#. TRANS: Client error displayed trying to execute an unknown API method leaving a group.
+#. 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 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:160
+#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: 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/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
+#, fuzzy
+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:87
-#: actions/apiaccountupdateprofile.php:90
-#: actions/apiaccountupdateprofilebackgroundimage.php:87
-#: actions/apiaccountupdateprofilecolors.php:111
-#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
-#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
-#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
-#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
-#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
-#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
-#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
+#: 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/apimediaupload.php:66
+#: actions/apistatusesretweet.php:63 actions/apistatusesupdate.php:194
 msgid "This method requires a POST."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:107
+#. 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."
 msgstr ""
 
-#: actions/apiaccountupdateprofile.php:113
-#: actions/apiaccountupdateprofilebackgroundimage.php:195
-#: actions/apiaccountupdateprofilecolors.php:186
-#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
+#. TRANS: Server error displayed when a user's delivery device cannot be updated.
+#: actions/apiaccountupdatedeliverydevice.php:130
+#, fuzzy
+msgid "Could not update user."
+msgstr "עידכון המשתמש נכשל."
+
+#. TRANS: Client error displayed if a user profile could not be found.
+#. TRANS: Client error displayed when a user has no profile.
+#. TRANS: Client error displayed a user has no profile updating profile colours.
+#. TRANS: Client error displayed if a user profile could not be found updating a profile image.
+#. TRANS: Client error displayed when requesting user information for a user without a profile.
+#. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#: actions/apiaccountupdateprofile.php:111
+#: actions/apiaccountupdateprofilebackgroundimage.php:199
+#: actions/apiaccountupdateprofilecolors.php:183
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "למשתמש אין פרופיל."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:109
-#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
-#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:123 actions/editapplication.php:118
-#: actions/newapplication.php:101 actions/newnotice.php:94
-#: lib/designsettings.php:283
+#. TRANS: Server error displayed if a user profile could not be saved.
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+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:125 actions/editapplication.php:121
+#: actions/newapplication.php:104 actions/newnotice.php:95
+#: lib/designsettings.php:298
 #, php-format
 msgid ""
+"The server was unable to handle that much POST data (%s byte) due to its "
+"current configuration."
+msgid_plural ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
 "current configuration."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:137
-#: actions/apiaccountupdateprofilebackgroundimage.php:147
-#: actions/apiaccountupdateprofilecolors.php:165
-#: actions/apiaccountupdateprofilecolors.php:175
+#. TRANS: Client error displayed when saving design settings fails because of an empty id.
+#. TRANS: Client error displayed when saving design settings fails because of an empty result.
+#. TRANS: Client error displayed when a database error occurs inserting profile colours.
+#. TRANS: Client error displayed when a database error occurs updating profile colours.
+#: actions/apiaccountupdateprofilebackgroundimage.php:138
+#: actions/apiaccountupdateprofilebackgroundimage.php:149
+#: actions/apiaccountupdateprofilecolors.php:160
+#: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 msgstr ""
 
-#: actions/apiblockcreate.php:127
+#. 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
+#, fuzzy
+msgid "Could not update your design."
+msgstr "עידכון המשתמש נכשל."
+
+#: actions/apiatomservice.php:86
+msgid "Main"
+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:139
+#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
+#: lib/atomusernoticefeed.php:68
+#, fuzzy, php-format
+msgid "%s timeline"
+msgstr "קו זמן ציבורי"
+
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:103 actions/atompubsubscriptionfeed.php:147
+#: actions/subscriptions.php:51
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "כל המנויים"
+
+#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#, php-format
+msgid "%s favorites"
+msgstr ""
+
+#: actions/apiatomservice.php:123
+#, php-format
+msgid "%s memberships"
+msgstr ""
+
+#. TRANS: Client error displayed when users try to block themselves.
+#: actions/apiblockcreate.php:104
+#, fuzzy
+msgid "You cannot block yourself!"
+msgstr "עידכון המשתמש נכשל."
+
+#. TRANS: Server error displayed when blocking a user has failed.
+#: actions/apiblockcreate.php:126
 msgid "Block user failed."
 msgstr ""
 
-#: actions/apiblockdestroy.php:115
+#. TRANS: Server error displayed when unblocking a user has failed.
+#: actions/apiblockdestroy.php:113
 msgid "Unblock user failed."
 msgstr ""
 
-#: actions/apidirectmessage.php:89
+#. TRANS: Title. %s is a user nickname.
+#: actions/apidirectmessage.php:88
 #, php-format
 msgid "Direct messages from %s"
 msgstr ""
 
+#. TRANS: Subtitle. %s is a user nickname.
 #: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr ""
 
-#: actions/apidirectmessage.php:101
+#. TRANS: Title. %s is a user nickname.
+#: actions/apidirectmessage.php:102
 #, php-format
 msgid "Direct messages to %s"
 msgstr ""
 
-#: actions/apidirectmessage.php:105
+#. TRANS: Subtitle. %s is a user nickname.
+#: actions/apidirectmessage.php:107
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/apidirectmessagenew.php:143
+#. TRANS: Client error displayed when no message text was submitted (406).
+#: actions/apidirectmessagenew.php:117
+#, fuzzy
+msgid "No message text!"
+msgstr "הודעה חדשה"
+
+#. TRANS: Client error displayed when message content is too long.
+#. 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] ""
+msgstr[1] ""
+
+#. TRANS: Client error displayed if a recipient user could not be found (403).
+#: actions/apidirectmessagenew.php:139
+#, fuzzy
+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 "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
+#. 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 ""
+
+#. 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 ""
 
-#: actions/apifavoritedestroy.php:124
+#. 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 "זהו כבר זיהוי ה-Jabber שלך."
+
+#. TRANS: Client error displayed when marking a notice as favourite fails.
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:294
+#, fuzzy
+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 ""
 
-#: actions/apifriendshipscreate.php:110
+#. TRANS: Client error displayed when removing a favourite has failed.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#, fuzzy
+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 "שמירת הפרופיל נכשלה."
 
-#: actions/apifriendshipscreate.php:119
+#. 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 ""
 
-#: actions/apifriendshipsexists.php:91
-msgid "Two valid IDs or screen_names must be supplied."
+#. 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 "נכשלה ההפניה לשרת: %s"
+
+#. TRANS: Client error displayed when trying to unfollow self.
+#: actions/apifriendshipsdestroy.php:121
+#, fuzzy
+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 ""
 
-#: actions/apigroupcreate.php:168 actions/editgroup.php:186
-#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:212
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-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 "עידכון המשתמש נכשל."
 
-#: actions/apigroupcreate.php:177 actions/editgroup.php:190
-#: actions/newgroup.php:130 actions/profilesettings.php:238
-#: actions/register.php:215
+#. TRANS: Client error displayed when a target user could not be determined showing friendship.
+#: actions/apifriendshipsshow.php:140
+#, fuzzy
+msgid "Could not find target user."
+msgstr "עידכון המשתמש נכשל."
+
+#. TRANS: Client error trying to create a group with a nickname this is already in use.
+#. 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:189
+#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "כינוי זה כבר תפוס. נסה כינוי אחר."
 
-#: actions/apigroupcreate.php:184 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:217
+#. TRANS: Client error in form for group creation.
+#. 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:193
+#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "שם משתמש לא חוקי."
 
-#: actions/apigroupcreate.php:200 actions/editapplication.php:215
-#: actions/editgroup.php:199 actions/newapplication.php:203
-#: actions/newgroup.php:139 actions/profilesettings.php:222
-#: actions/register.php:224
+#. TRANS: Client error in form for group creation.
+#. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#. TRANS: Validation error in form for profile settings.
+#: actions/apigroupcreate.php:181 actions/editapplication.php:233
+#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "לאתר הבית יש כתובת לא חוקית."
 
-#: actions/apigroupcreate.php:209 actions/editgroup.php:202
-#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:227
-msgid "Full name is too long (max 255 chars)."
-msgstr "השם המלא ארוך מידי (מותרות 255 אותיות בלבד)"
-
-#: actions/apigroupcreate.php:217 actions/editapplication.php:190
-#: actions/newapplication.php:172
-#, php-format
-msgid "Description is too long (max %d chars)."
-msgstr "שם המיקום ארוך מידי (מותר עד %d אותיות)."
-
-#: actions/apigroupcreate.php:228 actions/editgroup.php:208
-#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:234
-msgid "Location is too long (max 255 chars)."
-msgstr "שם המיקום ארוך מידי (מותר עד 255 אותיות)."
-
-#: actions/apigroupcreate.php:247 actions/editgroup.php:219
-#: actions/newgroup.php:159
-#, php-format
-msgid "Too many aliases! Maximum %d."
+#. TRANS: Client error in form for group creation.
+#. 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:204
+#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/register.php:226
+msgid "Full name is too long (maximum 255 characters)."
 msgstr ""
 
-#: actions/apigroupcreate.php:268
+#. TRANS: Client error shown when providing too long a description during group creation.
+#. TRANS: %d is the maximum number of allowed characters.
+#. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
+#. TRANS: Group edit form validation error.
+#. TRANS: Form validation error in New application form.
+#. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
+#: actions/apigroupcreate.php:201 actions/editapplication.php:201
+#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/newgroup.php:156
+#, php-format
+msgid "Description is too long (maximum %d character)."
+msgid_plural "Description is too long (maximum %d characters)."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Client error shown when providing too long a location during group creation.
+#. 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:216
+#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/register.php:235
+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: 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:229
+#: actions/newgroup.php:176
+#, php-format
+msgid "Too many aliases! Maximum %d allowed."
+msgid_plural "Too many aliases! Maximum %d allowed."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Client error shown when providing an invalid alias during group creation.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupcreate.php:253
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "גודל לא חוקי."
 
-#: actions/apigroupcreate.php:290 actions/editgroup.php:238
-#: actions/newgroup.php:178
+#. 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: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#: actions/apigroupcreate.php:264 actions/editgroup.php:244
+#: actions/newgroup.php:191
+#, 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.
+#. TRANS: Group create form validation error.
+#: actions/apigroupcreate.php:278 actions/editgroup.php:251
+#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
-#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
-#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
+#. TRANS: Client error displayed when checking group membership for a non-existing group.
+#. 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 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:89
+#: 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: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
 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: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
-#: actions/apigrouplistall.php:96
+#. TRANS: Server error displayed when joining a group fails.
+#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. 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:134 lib/command.php:350
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s."
+msgstr "נכשלה ההפניה לשרת: %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 "לא שלחנו אלינו את הפרופיל הזה"
+
+#. TRANS: Server error displayed when leaving a group fails.
+#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. 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:129
+#: lib/command.php:398
+#, fuzzy, php-format
+msgid "Could not remove user %1$s from group %2$s."
+msgstr "נכשלה יצירת OpenID מתוך: %s"
+
+#. 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 "פרופיל"
+
+#. 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 "לא שלחנו אלינו את הפרופיל הזה"
+
+#. 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
+#, fuzzy, php-format
+msgid "%s groups"
+msgstr "קבוצות"
+
+#. 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 ""
 
-#: actions/apioauthauthorize.php:101
+#. 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:101
+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 ""
 
-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
+#. 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 ""
+
+#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
+#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:230
-#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
-#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
-#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
-#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:350
+#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
+#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
+#: actions/othersettings.php:153 actions/passwordsettings.php:138
+#: actions/profilesettings.php:221 actions/recoverpassword.php:350
 #: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
-#: lib/designsettings.php:294
+#: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr ""
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
+#. 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 "שם המשתמש או הסיסמה לא חוקיים"
+
+#. TRANS: Server error displayed when a database action fails.
+#: actions/apioauthauthorize.php:217
+msgid "Database error inserting oauth_token_association."
 msgstr ""
 
+#. 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.
+#. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
-#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:290 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:121
+#. TRANS: Unknown form validation error in design settings form.
+#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
+#: actions/designadminpanel.php:104 actions/editapplication.php:144
+#: actions/emailsettings.php:316 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "הגשת טופס לא צפויה."
 
-#: actions/apioauthauthorize.php:259
+#. 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 ""
 
-#: actions/apioauthauthorize.php:276
+#. TRANS: Fieldset legend.
+#: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
 msgstr ""
 
-#: actions/apioauthauthorize.php:292
+#. 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 "
+"account data. You should only give access to your %4$s account to third "
+"parties you trust."
+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 "
@@ -373,357 +841,1253 @@ msgid ""
 "give access to your %4$s account to third parties you trust."
 msgstr ""
 
-#: actions/apioauthauthorize.php:313 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:431
-#: actions/showgroup.php:245 actions/tagother.php:94
+#. TRANS: Fieldset legend.
+#: actions/apioauthauthorize.php:455
+msgctxt "LEGEND"
+msgid "Account"
+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.
+#: actions/apioauthauthorize.php:459 actions/login.php:252
+#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:132
+#: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "כינוי"
 
+#. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:463 actions/login.php:255
+#: actions/register.php:437 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "סיסמה"
 
-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-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 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:128
+#: actions/imsettings.php:131 actions/smssettings.php:137
+#: lib/applicationeditform.php:351
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "בטל"
 
-#: actions/apioauthauthorize.php:334
+#. 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 ""
 
-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#. TRANS: Form instructions.
+#: actions/apioauthauthorize.php:502
+msgid "Authorize access to your account information."
 msgstr ""
 
-#: actions/apistatusesdestroy.php:112
+#. 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."
+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 "
+"process."
+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 ""
 
-#: actions/apistatusesdestroy.php:135
+#. 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 ""
 
-#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
-#: actions/deletenotice.php:52 actions/shownotice.php:92
+#. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
+#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Error message displayed trying to delete a non-existing notice.
+#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "אין הודעה כזו."
 
-#: actions/apistatusesshow.php:145
+#. 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
+#, fuzzy
+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
+#, fuzzy
+msgid "Already repeated that notice."
+msgstr "כבר נכנסת למערכת!"
+
+#. TRANS: Client error shown when using a non-supported HTTP method.
+#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
+#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#: actions/atompubshowsubscription.php:122
+#: actions/atompubsubscriptionfeed.php:109
+msgid "HTTP method not supported."
+msgstr ""
+
+#: actions/apistatusesshow.php:141
+#, php-format
+msgid "Unsupported format: %s"
+msgstr ""
+
+#. TRANS: Client error displayed requesting a deleted status.
+#: actions/apistatusesshow.php:152
+#, fuzzy
+msgid "Status deleted."
+msgstr "התמונה עודכנה."
+
+#. TRANS: Client error displayed requesting a status with an invalid ID.
+#: actions/apistatusesshow.php:159
 msgid "No status with that ID found."
 msgstr ""
 
-#: actions/apistatusesupdate.php:222
+#: actions/apistatusesshow.php:223
+msgid "Can only delete using the Atom format."
+msgstr ""
+
+#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
+#: actions/apistatusesshow.php:230 actions/deletenotice.php:78
+msgid "Can't delete this notice."
+msgstr ""
+
+#: actions/apistatusesshow.php:243
+#, 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 ""
 
-#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
+#. 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 "Max notice size is %d chars, including attachment URL."
+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] ""
+msgstr[1] ""
+
+#. 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."
+msgstr[0] ""
+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 "פורמט התמונה אינו נתמך."
+
+#. 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 "
+
+#. 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: 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
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %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 ""
 
-#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
+#. TRANS: Title for site timeline. %s is the StatusNet sitename.
+#: actions/apitimelinepublic.php:193 actions/publicrss.php:103
+#, fuzzy, 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
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: actions/apitimelinetag.php:105 actions/tag.php:67
+#. 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:108
+#, fuzzy, php-format
+msgid "Repeated to %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
+#, fuzzy, php-format
+msgid "Repeats of %s"
+msgstr "תגובת עבור %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
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
+#. 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:297
+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
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#: actions/apitimelineuser.php:310
+msgid "Atom post must not be empty."
+msgstr ""
+
+#: actions/apitimelineuser.php:315
+msgid "Atom post must be well-formed XML."
+msgstr ""
+
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
+#: actions/atompubmembershipfeed.php:228
+#: actions/atompubsubscriptionfeed.php:233
+msgid "Atom post must be an Atom entry."
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/apitimelineuser.php:334
+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
+#, php-format
+msgid "Cannot handle activity object type \"%s\"."
+msgstr ""
+
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#: actions/apitimelineuser.php:378
+#, php-format
+msgid "No content for notice %d."
+msgstr ""
+
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:406
+#, php-format
+msgid "Notice with URI \"%s\" already exists."
+msgstr ""
+
+#: actions/apitimelineuser.php:437
+#, php-format
+msgid "AtomPub post with unknown attention URI %s"
+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 ""
+
+#: actions/atompubfavoritefeed.php:70
+msgid "No such profile"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:145
+#, php-format
+msgid "Notices %s has favorited to on %s"
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+msgid "Can't add someone else's subscription"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubfavoritefeed.php:239
+msgid "Can only handle Favorite activities."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+msgid "Can only fave notices."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:256
+msgid "Unknown note."
+msgstr ""
+
+#: actions/atompubfavoritefeed.php:263
+msgid "Already a favorite."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
+#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "אין הודעה כזו."
+
+#: actions/atompubmembershipfeed.php:144
+#, php-format
+msgid "%s group memberships"
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:147
+#, php-format
+msgid "Groups %s is a member of on %s"
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:217
+msgid "Can't add someone else's membership"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:241
+msgid "Can only handle Join activities."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:256
+msgid "Unknown group."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:263
+msgid "Already a member."
+msgstr ""
+
+#: actions/atompubmembershipfeed.php:270
+msgid "Blocked by admin."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:89
+msgid "No such favorite."
+msgstr ""
+
+#: actions/atompubshowfavorite.php:151
+msgid "Can't delete someone else's favorite"
+msgstr ""
+
+#: actions/atompubshowmembership.php:81
+#, fuzzy
+msgid "No such group"
+msgstr "אין הודעה כזו."
+
+#: actions/atompubshowmembership.php:90
+msgid "Not a member"
+msgstr ""
+
+#: actions/atompubshowmembership.php:115
+msgid "Method not supported"
+msgstr ""
+
+#: actions/atompubshowmembership.php:150
+msgid "Can't 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 ""
+
+#. 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 ""
+
+#: actions/atompubsubscriptionfeed.php:150
+#, php-format
+msgid "People %s has subscribed to on %s"
+msgstr ""
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubsubscriptionfeed.php:246
+msgid "Can only handle Follow activities."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:253
+msgid "Can only follow people."
+msgstr ""
+
+#: actions/atompubsubscriptionfeed.php:262
+#, php-format
+msgid "Unknown profile %s"
+msgstr ""
+
+#. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "אין הודעה כזו."
 
-#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#. TRANS: Client error displayed trying to get an avatar without providing a nickname.
+#. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
+#. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. 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:91 actions/showgroup.php:121
+#: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "אין כינוי"
 
-#: actions/avatarbynickname.php:64
+#. TRANS: Client error displayed trying to get an avatar without providing an avatar size.
+#: actions/avatarbynickname.php:66
 msgid "No size."
 msgstr "אין גודל."
 
-#: actions/avatarbynickname.php:69
+#. 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.
+#. TRANS: Label for group avatar (dt). Text hidden by default.
 #. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:67 actions/showgroup.php:230
-#: lib/accountsettingsaction.php:118
+#: actions/avatarsettings.php:66 actions/showgroup.php:224
+#: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "תמונה"
 
-#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
+#. 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 "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות."
+
+#. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
+#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
+#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:108
+#, fuzzy
+msgid "User without matching profile."
+msgstr "למשתמש אין פרופיל."
+
+#. TRANS: Avatar upload page form legend.
+#. TRANS: Avatar upload page crop form legend.
+#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
 #: actions/grouplogo.php:254
 msgid "Avatar settings"
 msgstr "הגדרות הפרופיל"
 
-#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
+#. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
+#. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
+#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
 #: actions/grouplogo.php:202 actions/grouplogo.php:262
 msgid "Original"
 msgstr ""
 
-#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
+#. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
+#. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
+#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
 #: actions/grouplogo.php:213 actions/grouplogo.php:274
 msgid "Preview"
 msgstr ""
 
-#: actions/avatarsettings.php:166 actions/grouplogo.php:236
-msgid "Upload"
-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 ""
 
-#: actions/avatarsettings.php:332
+#. 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
+#, fuzzy
+msgid "No file uploaded."
+msgstr "העלאה חלקית."
+
+#. TRANS: Avatar upload form unstruction after uploading a file.
+#: actions/avatarsettings.php:346
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: actions/avatarsettings.php:347 actions/grouplogo.php:380
+#. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:380
 msgid "Lost our file data."
 msgstr ""
 
-#: actions/avatarsettings.php:370
+#. TRANS: Success message for having updated a user avatar.
+#: actions/avatarsettings.php:385
 msgid "Avatar updated."
 msgstr "התמונה עודכנה."
 
-#: actions/avatarsettings.php:373
+#. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
+#: actions/avatarsettings.php:389
 msgid "Failed updating avatar."
 msgstr "עדכון התמונה נכשל."
 
-#: actions/block.php:69
+#. TRANS: Success message for deleting a user avatar.
+#: actions/avatarsettings.php:413
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "התמונה עודכנה."
+
+#: actions/backupaccount.php:62 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr ""
+
+#: actions/backupaccount.php:80
+msgid "Only logged-in users can backup their account."
+msgstr ""
+
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr ""
+
+#: actions/backupaccount.php:232
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format.  This is an experimental feature and "
+"provides an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#: actions/backupaccount.php:255
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr ""
+
+#: actions/backupaccount.php:258
+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 כבר שייך למשתמש אחר."
 
-#: actions/block.php:138
+#. TRANS: Title for block user page.
+#. TRANS: Legend for block user form.
+#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#, fuzzy
+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 "
 "will not be notified of any @-replies from them."
 msgstr ""
 
-#: actions/block.php:187
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete group form.
+#. 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:152 actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
+msgid "No"
+msgstr "לא"
+
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:158 actions/deleteuser.php:156
+#, fuzzy
+msgid "Do not block this user"
+msgstr "אין משתמש כזה."
+
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete group form.
+#. 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:159 actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
+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
+#, 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: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. 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/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
-#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
+#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
+#: actions/deletegroup.php:87 actions/deletegroup.php:100
+#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
 #: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:86 actions/joingroup.php:82
+#: actions/groupunblock.php:88 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
-#: lib/command.php:383
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:380
 msgid "No such group."
 msgstr "אין משתמש כזה."
 
-#: actions/blockedfromgroup.php:115
+#. 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 "למשתמש אין פרופיל."
+
+#. 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 וחברים"
+
+#. 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: Title for the form to unblock a user.
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
+#. TRANS: Form legend for unblocking a user from a group.
+#: actions/blockedfromgroup.php:291
+#, fuzzy
+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 ""
 
-#: actions/confirmaddress.php:75
+#. 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
+#, fuzzy
+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 "קוד האישור לא נמצא."
 
-#: actions/confirmaddress.php:85
+#. 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: Client error for an already confirmed email/jabbel/sms address.
-#: actions/confirmaddress.php:96
+#. TRANS: Server error for a unknow address type %s, which can be 'email', 'jabber', or 'sms'.
+#: actions/confirmaddress.php:92
+#, 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
 msgid "That address has already been confirmed."
 msgstr "כתובת זו כבר אושרה."
 
+#. 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 IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:116 actions/emailsettings.php:331
-#: actions/emailsettings.php:477 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:184
+#: actions/profilesettings.php:326 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "עידכון המשתמש נכשל."
 
-#: actions/confirmaddress.php:146
+#. 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
+msgid "Could not delete address confirmation."
+msgstr ""
+
+#. TRANS: Title for the contact address confirmation action.
+#: actions/confirmaddress.php:150
 msgid "Confirm address"
 msgstr "אשר"
 
-#: actions/confirmaddress.php:161
+#. TRANS: Success message for the contact address confirmation action.
+#. TRANS: %s can be 'email', 'jabber', or 'sms'.
+#: actions/confirmaddress.php:166
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "הכתובת \"%s\" אושרה עבור חשבונך."
 
-#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#. TRANS: Title for page with a conversion (multiple notices in context).
+#: actions/conversation.php:96
+#, fuzzy
+msgid "Conversation"
+msgstr "מיקום"
+
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
 #: lib/profileaction.php:229 lib/searchgroupnav.php:82
 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 ""
+
+#. 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.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+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."
+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 "
+"deletion."
+msgstr ""
+
+#. TRANS: Field label for delete account confirmation entry.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:239 actions/register.php:441
+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 ""
+
+#. 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
+#, fuzzy
+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:94
+#, fuzzy
+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:127
-#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1315
+#: actions/deleteapplication.php:102 actions/editapplication.php:131
+#: actions/newapplication.php:114 actions/showapplication.php:118
+#: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/deleteapplication.php:149
+#. 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 "אין הודעה כזו."
+
+#. 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 "אין הודעה כזו."
+
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:167
+#, fuzzy
+msgid "Delete this application"
+msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אותיות"
+
+#. 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.
+#: actions/deletegroup.php:94 actions/joingroup.php:88
+#: actions/leavegroup.php:88
+#, 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
+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 ""
+
+#. 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 "
+"will still appear in individual timelines."
+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 ""
+
+#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
+#. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
+#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
+#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:71 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "לא מחובר."
 
-#: actions/deletenotice.php:71
-msgid "Can't delete this notice."
-msgstr ""
-
-#: actions/deletenotice.php:103
+#. TRANS: Instructions for deleting a notice.
+#: actions/deletenotice.php:110
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgstr ""
 
-#: actions/deletenotice.php:144
+#. TRANS: Page title when deleting a notice.
+#. TRANS: Fieldset legend for the delete notice form.
+#: actions/deletenotice.php:117 actions/deletenotice.php:148
+#, fuzzy
+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:158 lib/noticelist.php:657
+#: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
 msgstr ""
 
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "עידכון המשתמש נכשל."
+
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "ניתן להשתמש במנוי המקומי!"
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+msgstr "מחק"
+
 #: actions/deleteuser.php:136
 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 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#, 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:63 lib/accountsettingsaction.php:139
+#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr ""
 
 #: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
+msgid "Design settings for this StatusNet site"
 msgstr ""
 
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:335
+#, fuzzy
+msgid "Invalid logo URL."
+msgstr "גודל לא חוקי."
+
+#: actions/designadminpanel.php:340
+msgid "Invalid SSL logo URL."
+msgstr ""
+
+#: actions/designadminpanel.php:344
+#, fuzzy, php-format
+msgid "Theme not available: %s."
+msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל"
+
+#: actions/designadminpanel.php:448
 msgid "Change logo"
 msgstr "שנה"
 
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:453
+#, fuzzy
+msgid "Site logo"
+msgstr "הודעה חדשה"
+
+#: actions/designadminpanel.php:457
+msgid "SSL logo"
+msgstr ""
+
+#: actions/designadminpanel.php:469
+#, fuzzy
+msgid "Change theme"
+msgstr "שנה"
+
+#: actions/designadminpanel.php:486
+#, fuzzy
+msgid "Site theme"
+msgstr "הודעה חדשה"
+
+#: actions/designadminpanel.php:487
 msgid "Theme for the site."
 msgstr ""
 
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:493
+#, fuzzy
+msgid "Custom theme"
+msgstr "הודעה חדשה"
+
+#: actions/designadminpanel.php:497
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#. TRANS: Fieldset legend on profile design page.
+#: actions/designadminpanel.php:512 lib/designsettings.php:98
 msgid "Change background image"
 msgstr ""
 
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
-#: lib/designsettings.php:178
+#. TRANS: Label on profile design page for setting a profile page background colour.
+#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: lib/designsettings.php:183
 msgid "Background"
 msgstr ""
 
+#: actions/designadminpanel.php:522
+#, fuzzy, php-format
+msgid ""
+"You can upload a background image for the site. The maximum file size is %1"
+"$s."
+msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות."
+
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:553
 msgid "On"
 msgstr ""
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:570
 msgid "Off"
 msgstr ""
 
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#. 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:571 lib/designsettings.php:159
 msgid "Turn background image on or off."
 msgstr ""
 
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
+#: actions/designadminpanel.php:576 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr ""
 
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: actions/designadminpanel.php:590 lib/designsettings.php:175
+#, fuzzy
+msgid "Change colours"
+msgstr "שנה סיסמה"
+
+#. TRANS: Label on profile design page for setting a profile page content colour.
+#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#, fuzzy
+msgid "Content"
+msgstr "התחבר"
+
+#. TRANS: Label on profile design page for setting a profile page sidebar colour.
+#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#, fuzzy
+msgid "Sidebar"
+msgstr "חיפוש"
+
+#. TRANS: Label on profile design page for setting a profile page text colour.
+#: actions/designadminpanel.php:639 lib/designsettings.php:225
 msgid "Text"
 msgstr "טקסט"
 
-#: actions/designadminpanel.php:651
+#. TRANS: Label on profile design page for setting a profile page links colour.
+#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#, fuzzy
+msgid "Links"
+msgstr "היכנס"
+
+#: actions/designadminpanel.php:677
 msgid "Advanced"
 msgstr ""
 
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:681
 msgid "Custom CSS"
 msgstr ""
 
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: actions/designadminpanel.php:702 lib/designsettings.php:257
 msgid "Use defaults"
 msgstr ""
 
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#. TRANS: Title for button on profile design page to reset all colour settings to default.
+#: actions/designadminpanel.php:703 lib/designsettings.php:259
 msgid "Restore default designs"
 msgstr ""
 
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
+#: actions/designadminpanel.php:709 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
+#: lib/applicationeditform.php:357
 msgid "Save"
 msgstr "שמור"
 
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#. TRANS: Title for button on profile design page to save settings.
+#: actions/designadminpanel.php:712 lib/designsettings.php:272
 msgid "Save design"
 msgstr ""
 
@@ -731,75 +2095,154 @@ msgstr ""
 msgid "This notice is not a favorite!"
 msgstr ""
 
+#: actions/disfavor.php:94
+#, fuzzy
+msgid "Add to favorites"
+msgstr "מועדפים"
+
 #: actions/doc.php:158
 #, 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 ""
 
-#: actions/editapplication.php:161
+#. TRANS: Client error displayed trying to edit an application that does not exist.
+#: actions/editapplication.php:83 actions/showapplication.php:87
+#, fuzzy
+msgid "No such application."
+msgstr "אין הודעה כזו."
+
+#. TRANS: Instructions for "Edit application" form.
+#: actions/editapplication.php:167
 msgid "Use this form to edit your application."
 msgstr ""
 
-#: actions/editapplication.php:177 actions/newapplication.php:159
+#. TRANS: Validation error shown when not providing a name in the "Edit application" form.
+#: actions/editapplication.php:184 actions/newapplication.php:163
 msgid "Name is required."
 msgstr ""
 
-#: actions/editapplication.php:186 actions/newapplication.php:168
+#. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
+#: actions/editapplication.php:188 actions/newapplication.php:169
+msgid "Name is too long (maximum 255 characters)."
+msgstr ""
+
+#. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
+#: actions/editapplication.php:192 actions/newapplication.php:166
+#, fuzzy
+msgid "Name already in use. Try another one."
+msgstr "כינוי זה כבר תפוס. נסה כינוי אחר."
+
+#. TRANS: Validation error shown when not providing a description in the "Edit application" form.
+#: actions/editapplication.php:196 actions/newapplication.php:172
 msgid "Description is required."
 msgstr "ההרשמה נדחתה"
 
-#: actions/editapplication.php:194
+#. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
+#: actions/editapplication.php:208
 msgid "Source URL is too long."
 msgstr ""
 
-#: actions/editapplication.php:203 actions/newapplication.php:188
+#. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
+#: actions/editapplication.php:215 actions/newapplication.php:193
+#, fuzzy
+msgid "Source URL is not valid."
+msgstr "לאתר הבית יש כתובת לא חוקית."
+
+#. TRANS: Validation error shown when not providing an organisation in the "Edit application" form.
+#: actions/editapplication.php:219 actions/newapplication.php:196
 msgid "Organization is required."
 msgstr ""
 
-#: actions/editapplication.php:209 actions/newapplication.php:194
+#. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
+#: actions/editapplication.php:223 actions/newapplication.php:199
+msgid "Organization is too long (maximum 255 characters)."
+msgstr ""
+
+#: actions/editapplication.php:226 actions/newapplication.php:202
 msgid "Organization homepage is required."
 msgstr ""
 
-#: actions/editapplication.php:218 actions/newapplication.php:206
+#. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
+#: actions/editapplication.php:237 actions/newapplication.php:214
 msgid "Callback is too long."
 msgstr ""
 
-#: actions/editapplication.php:225 actions/newapplication.php:215
+#. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
+#: actions/editapplication.php:245 actions/newapplication.php:223
 msgid "Callback URL is not valid."
 msgstr ""
 
-#: actions/editgroup.php:56
+#. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
+#: actions/editapplication.php:282
+#, 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 ""
 
+#. TRANS: Client error displayed trying to edit 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:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr ""
 
-#: actions/editgroup.php:107 actions/editgroup.php:172
+#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#: actions/editgroup.php:110 actions/editgroup.php:176
 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
 msgid "You must be an admin to edit the group."
 msgstr ""
 
-#: actions/editgroup.php:158
+#. TRANS: Form instructions for group edit form.
+#: actions/editgroup.php:161
 msgid "Use this form to edit the group."
 msgstr ""
 
-#: actions/editgroup.php:205 actions/newgroup.php:145
-#, php-format
-msgid "description is too long (max %d chars)."
-msgstr "שם המיקום ארוך מידי (מותר עד 255 אותיות)."
+#. TRANS: Group edit form validation error.
+#. TRANS: Group create form validation error.
+#: actions/editgroup.php:239 actions/newgroup.php:186
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "כתובת אתר הבית '%s' אינה חוקית"
 
+#. TRANS: Server error displayed when editing a group fails.
+#: actions/editgroup.php:272
+#, fuzzy
+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:264 classes/User_group.php:514
+#: actions/editgroup.php:279 classes/User_group.php:534
 msgid "Could not create aliases."
 msgstr "עידכון המשתמש נכשל."
 
+#. TRANS: Group edit form success message.
+#: actions/editgroup.php:296
+#, fuzzy
+msgid "Options saved."
+msgstr "ההגדרות נשמרו."
+
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
+#, fuzzy
+msgid "Email settings"
+msgstr "הגדרות הפרופיל"
+
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
 #: actions/emailsettings.php:76
@@ -807,117 +2250,245 @@ msgstr "עידכון המשתמש נכשל."
 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:107 actions/emailsettings.php:133
+#, fuzzy
+msgid "Email address"
+msgstr "כתובת מסרים מידיים"
+
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:113
+#, fuzzy
+msgid "Current confirmed email address."
+msgstr "כתובת מאושרת נוכחית של Jabber/GTalk."
+
 #. 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 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:115 actions/emailsettings.php:162
+#: actions/emailsettings.php:116 actions/emailsettings.php:183
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "שיחזור"
 
+#: actions/emailsettings.php:123
+#, fuzzy
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+"מחכה לאישור כתובת זו. בדוק את חשבון ה-Jabber/GTalk שלך לקבלת מסר עם הוראות "
+"נוספותץ (האם הוספת את %s לרשימת החברים שלך?)"
+
 #. 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:139
+#: actions/emailsettings.php:140
 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 IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:144 actions/imsettings.php:151
+#: actions/smssettings.php:162
+#, fuzzy
+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:151 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr ""
 
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:158
+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:159 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr ""
 
-#. TRANS: Instructions for incoming e-mail address input form.
+#. 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:168 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:186
 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:193
+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:199 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
+msgid "New"
+msgstr "חדש"
+
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:208
+#, fuzzy
+msgid "Email preferences"
+msgstr "העדפות"
+
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:190
+#: actions/emailsettings.php:216
+#, fuzzy
+msgid "Send me notices of new subscriptions through email."
+msgstr "שלח לי הודעות דרך Jabber/GTalk."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:222
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:197
+#: actions/emailsettings.php:229
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:203
+#: actions/emailsettings.php:235
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:209
+#: actions/emailsettings.php:241
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
-msgid "I want to post notices by email."
-msgstr ""
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:223
+#: actions/emailsettings.php:247
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:368
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "העדפות נשמרו."
+
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:357
+#: actions/emailsettings.php:388
 msgid "No email address."
 msgstr ""
 
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:396
+#, fuzzy
+msgid "Cannot normalize that email address"
+msgstr "לא ניתן לנרמל את זהות ה-Jabber הזה"
+
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:401 actions/register.php:212
+#: actions/siteadminpanel.php:144
+#, fuzzy
+msgid "Not a valid email address."
+msgstr "שם משתמש לא חוקי."
+
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:405
+#, fuzzy
+msgid "That is already your email address."
+msgstr "זהו כבר זיהוי ה-Jabber שלך."
+
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:409
+#, fuzzy
+msgid "That email address already belongs to another user."
+msgstr "זיהוי ה-Jabber כבר שייך למשתמש אחר."
+
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:395 actions/imsettings.php:351
+#: actions/emailsettings.php:426 actions/imsettings.php:351
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "הכנסת קוד האישור נכשלה."
 
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:433
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+"קוד אישור נשלח אל כתובת המסרים המידיים שהוספת. עליך לאשר את %s לשליחת מסרים "
+"מידיים אליך."
+
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:423 actions/imsettings.php:386
+#: actions/emailsettings.php:454 actions/imsettings.php:386
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "אין אישור ממתין שניתן לבטל."
 
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:459
+#, 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:468 actions/smssettings.php:422
+#, fuzzy
+msgid "Couldn't delete email confirmation."
+msgstr "הכנסת קוד האישור נכשלה."
+
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:442
+#: actions/emailsettings.php:473
 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:493
+#, fuzzy
+msgid "That is not your email address."
+msgstr "זוהי כתובת מסרים מידיים שגויה."
+
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:483
+#: actions/emailsettings.php:514
 msgid "The email address was removed."
 msgstr "כתובת זו כבר אושרה."
 
-#: actions/emailsettings.php:497 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:568
 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:540 actions/emailsettings.php:565
+#: actions/smssettings.php:578 actions/smssettings.php:602
+#, fuzzy
+msgid "Couldn't update user record."
+msgstr "עידכון המשתמש נכשל."
+
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:512 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr ""
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:536 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr ""
 
@@ -925,10 +2496,21 @@ msgstr ""
 msgid "This notice is already a favorite!"
 msgstr ""
 
-#: actions/favor.php:92 lib/disfavorform.php:140
+#: actions/favor.php:92 lib/disfavorform.php:144
 msgid "Disfavor favorite"
 msgstr ""
 
+#: actions/favorited.php:65 lib/popularnoticesection.php:62
+#: lib/publicgroupnav.php:93
+#, fuzzy
+msgid "Popular notices"
+msgstr "אין הודעה כזו."
+
+#: actions/favorited.php:67
+#, fuzzy, php-format
+msgid "Popular notices, page %d"
+msgstr "אין הודעה כזו."
+
 #: actions/favorited.php:79
 msgid "The most popular notices on the site right now."
 msgstr ""
@@ -951,11 +2533,16 @@ msgid ""
 msgstr ""
 
 #: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:115
+#: lib/personalgroupnav.php:118
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
 
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "מיקרובלוג מאת %s"
+
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -979,10 +2566,25 @@ msgstr "אין הודעה כזו."
 msgid "No notice."
 msgstr "אין הודעה כזו."
 
+#: actions/file.php:42
+#, fuzzy
+msgid "No attachments."
+msgstr "אין מסמך כזה."
+
+#: actions/file.php:51
+#, fuzzy
+msgid "No uploaded attachments."
+msgstr "אין מסמך כזה."
+
 #: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "זו תגובה לא צפויה!"
 
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "המשתמש אליו אתה מאזין אינו קיים."
+
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "ניתן להשתמש במנוי המקומי!"
@@ -995,27 +2597,66 @@ msgstr ""
 msgid "You are not authorized."
 msgstr "ההרשמה אושרה"
 
+#: actions/finishremotesubscribe.php:113
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "המרת אסימון הבקשה לאסימון גישה לא הצליחה."
+
+#: actions/finishremotesubscribe.php:118
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "גירסה לא מוכרת של פרוטוקול OMB"
+
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#, fuzzy
+msgid "Error updating remote profile."
+msgstr "שגיאה בעדכון פרופיל מרוחק"
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "No such file."
+msgstr "אין הודעה כזו."
+
 #: actions/getfile.php:83
 msgid "Cannot read file."
 msgstr "שמירת הפרופיל נכשלה."
 
+#: actions/grantrole.php:62 actions/revokerole.php:62
+#, fuzzy
+msgid "Invalid role."
+msgstr "גודל לא חוקי."
+
 #: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
+#: actions/grantrole.php:75
+#, fuzzy
+msgid "You cannot grant user roles on this site."
+msgstr "לא שלחנו אלינו את הפרופיל הזה"
+
+#: actions/grantrole.php:82
+#, fuzzy
+msgid "User already has this role."
+msgstr "למשתמש אין פרופיל."
+
+#. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
+#. TRANS: Client error displayed trying a change a subscription without providing a profile.
 #: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46
+#: actions/makeadmin.php:71 actions/subedit.php:49
 #: lib/profileformaction.php:79
 msgid "No profile specified."
 msgstr ""
 
-#: actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
+#. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
+#: actions/groupblock.php:76 actions/groupunblock.php:77
+#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
 #: actions/unsubscribe.php:84 lib/profileformaction.php:86
 msgid "No profile with that ID."
 msgstr ""
 
-#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/groupblock.php:81 actions/groupunblock.php:82
 #: actions/makeadmin.php:81
 msgid "No group specified."
 msgstr ""
@@ -1024,6 +2665,21 @@ msgstr ""
 msgid "Only an admin can block group members."
 msgstr ""
 
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "למשתמש אין פרופיל."
+
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "לא שלחנו אלינו את הפרופיל הזה"
+
+#: actions/groupblock.php:134 actions/groupmembers.php:364
+#, fuzzy
+msgid "Block user from group"
+msgstr "אין משתמש כזה."
+
 #: actions/groupblock.php:160
 #, php-format
 msgid ""
@@ -1032,6 +2688,18 @@ msgid ""
 "the group in the future."
 msgstr ""
 
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "נכשלה ההפניה לשרת: %s"
+
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "אין משתמש כזה."
+
 #: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
@@ -1044,16 +2712,64 @@ msgstr "אין זיהוי Jabber כזה."
 msgid "You must be logged in to edit a group."
 msgstr ""
 
+#: actions/groupdesignsettings.php:144
+#, fuzzy
+msgid "Group design"
+msgstr "קבוצות"
+
 #: actions/groupdesignsettings.php:155
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 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".
+#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
+#: lib/designsettings.php:405 lib/designsettings.php:427
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "עידכון המשתמש נכשל."
+
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "העדפות נשמרו."
+
+#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#, fuzzy
+msgid "Group logo"
+msgstr "קבוצות"
+
+#: actions/grouplogo.php:153
+#, fuzzy, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות."
+
+#: actions/grouplogo.php:236
+msgid "Upload"
+msgstr "העלאה"
+
+#: actions/grouplogo.php:289
+#, fuzzy
+msgid "Crop"
+msgstr "קבוצות"
+
 #: actions/grouplogo.php:365
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
+#: actions/grouplogo.php:399
+#, fuzzy
+msgid "Logo updated."
+msgstr "התמונה עודכנה."
+
+#: actions/grouplogo.php:401
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "עדכון התמונה נכשל."
+
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
 #: actions/groupmembers.php:102
@@ -1082,6 +2798,12 @@ msgctxt "BUTTON"
 msgid "Block"
 msgstr ""
 
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr ""
+
 #: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr ""
@@ -1098,6 +2820,12 @@ 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:142
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "מיקרובלוג מאת %s"
+
 #: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
@@ -1118,6 +2846,31 @@ msgid ""
 "%%%%)"
 msgstr ""
 
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "צור חשבון חדש"
+
+#: actions/groupsearch.php:52
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"חפש אנשים ב-%%site.name%% לפי שם, מיקום, או תחומי עניין. הפרד בעזרת רווחים "
+"בין הביטויים; עליהם להיות בני לפחות 3 אותיות."
+
+#: actions/groupsearch.php:58
+#, fuzzy
+msgid "Group search"
+msgstr "חיפוש סיסמה"
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "אין תוצאות"
+
 #: actions/groupsearch.php:82
 #, php-format
 msgid ""
@@ -1132,10 +2885,23 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groupunblock.php:91
+#. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
+#: actions/groupunblock.php:94
 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:99
+#, fuzzy
+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.
+#: actions/groupunblock.php:131 actions/unblock.php:86
+#, fuzzy
+msgid "Error removing the block."
+msgstr "שגיאה בשמירת המשתמש."
+
 #. TRANS: Title for instance messaging settings.
 #: actions/imsettings.php:60
 msgid "IM settings"
@@ -1153,6 +2919,19 @@ msgstr ""
 "אפשר לשלוח ולקבל בודעות דרך Jabber/GTalk [instant messages](%%doc.im%%) הגדר "
 "את כתובתך והעדפותיך למטה."
 
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
+#, fuzzy
+msgid "IM is not available."
+msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל"
+
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "כתובת מסרים מידיים"
+
 #: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "כתובת מאושרת נוכחית של Jabber/GTalk."
@@ -1197,8 +2976,20 @@ msgstr "שלח לי הודעות דרך Jabber/GTalk."
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "פרסם הודעה כששורת הסטטוס שלי ב-Jabber/GTalk מתעדכנת."
 
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:175
+#, fuzzy
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr "שלח לי הודעות דרך Jabber/GTalk."
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:182
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "כתובת מאושרת נוכחית של Jabber/GTalk."
+
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "העדפות נשמרו."
 
@@ -1243,6 +3034,12 @@ msgstr ""
 msgid "That is the wrong IM address."
 msgstr "זוהי כתובת מסרים מידיים שגויה."
 
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:400
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "הכנסת קוד האישור נכשלה."
+
 #. TRANS: Message given after successfully canceling IM address confirmation.
 #: actions/imsettings.php:405
 msgid "IM confirmation cancelled."
@@ -1254,6 +3051,12 @@ msgstr "אין קוד אישור."
 msgid "That is not your Jabber ID."
 msgstr "זהו לא זיהוי ה-Jabber שלך."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:450
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "הכתובת הוסרה."
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -1268,64 +3071,128 @@ msgstr ""
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 
-#: actions/invite.php:39
+#. TRANS: Client error displayed when trying to sent invites while they have been disabled.
+#: actions/invite.php:40
 msgid "Invites have been disabled."
 msgstr ""
 
-#: actions/invite.php:72
+#. TRANS: Client error displayed when trying to sent invites while not logged in.
+#. TRANS: %s is the StatusNet site name.
+#: actions/invite.php:44
+#, 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:77
 #, php-format
-msgid "Invalid email address: %s"
+msgid "Invalid email address: %s."
 msgstr ""
 
-#: actions/invite.php:110
-msgid "Invitation(s) sent"
+#. TRANS: Page title when invitations have been sent.
+#: actions/invite.php:116
+msgid "Invitations sent"
 msgstr ""
 
-#: actions/invite.php:112
+#. TRANS: Page title when inviting potential users.
+#: actions/invite.php:119
 msgid "Invite new users"
 msgstr ""
 
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
+#. TRANS: Message displayed inviting users to use a StatusNet site while the inviting user
+#. 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:139
+msgid "You are already subscribed to this user:"
+msgid_plural "You are already subscribed to these users:"
+msgstr[0] ""
+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:145 actions/invite.php:159
 #, php-format
+msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr ""
 
-#: actions/invite.php:136
-msgid ""
+#. 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:153
+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:"
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: actions/invite.php:144
-msgid "Invitation(s) sent to the following people:"
-msgstr ""
+#. 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:167
+msgid "Invitation sent to the following person:"
+msgid_plural "Invitations sent to the following people:"
+msgstr[0] ""
+msgstr[1] ""
 
-#: actions/invite.php:150
+#. TRANS: Generic message displayed after sending out one or more invitations to
+#. TRANS: people to join a StatusNet site.
+#: actions/invite.php:177
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgstr ""
 
-#: actions/invite.php:162
+#. TRANS: Form instructions.
+#: actions/invite.php:190
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
-#: actions/invite.php:187
+#. TRANS: Field label for a list of e-mail addresses.
+#: actions/invite.php:217
 msgid "Email addresses"
 msgstr ""
 
-#: actions/invite.php:189
+#. TRANS: Tooltip for field label for a list of e-mail addresses.
+#: actions/invite.php:220
 msgid "Addresses of friends to invite (one per line)"
 msgstr ""
 
-#: actions/invite.php:194
+#. TRANS: Field label for a personal message to send to invitees.
+#: actions/invite.php:224
+#, fuzzy
+msgid "Personal message"
+msgstr "הודעה חדשה"
+
+#. TRANS: Tooltip for field label for a personal message to send to invitees.
+#: actions/invite.php:227
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
-#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#. TRANS: Send button for inviting friends
 #: actions/invite.php:231
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Send"
+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:263
+#, fuzzy, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s כעת מאזין להודעות שלך ב-%2$s"
+
+#. TRANS: Body text 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 the
+#. 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:270
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -1369,6 +3236,122 @@ msgstr ""
 msgid "You must be logged in to leave a group."
 msgstr ""
 
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:386
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "לא שלחנו אלינו את הפרופיל הזה"
+
+#: actions/leavegroup.php:137
+#, fuzzy, php-format
+msgid "%1$s left group %2$s"
+msgstr "הסטטוס של %1$s ב-%2$s "
+
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr ""
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr ""
+
+#: actions/licenseadminpanel.php:245
+#, fuzzy
+msgid "Private"
+msgstr "פרטיות"
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr ""
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr ""
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr ""
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr ""
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr ""
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr ""
+
 #: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "כבר מחובר."
@@ -1377,6 +3360,11 @@ msgstr "כבר מחובר."
 msgid "Incorrect username or password."
 msgstr "שם משתמש או סיסמה לא נכונים."
 
+#: actions/login.php:154 actions/otp.php:120
+#, fuzzy
+msgid "Error setting user. You are probably not authorized."
+msgstr "לא מורשה."
+
 #: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
 msgid "Login"
 msgstr "היכנס"
@@ -1385,11 +3373,11 @@ msgstr "היכנס"
 msgid "Login to site"
 msgstr ""
 
-#: actions/login.php:258 actions/register.php:485
+#: actions/login.php:258 actions/register.php:491
 msgid "Remember me"
 msgstr "זכור אותי"
 
-#: actions/login.php:259 actions/register.php:487
+#: actions/login.php:259 actions/register.php:493
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "בעתיד התחבר אוטומטית; לא לשימוש במחשבים ציבוריים!"
 
@@ -1407,63 +3395,115 @@ msgstr "לצרכי אבטחה, הכנס מחדש את שם המשתמש והסי
 msgid "Login with your username and password."
 msgstr "שם משתמש או סיסמה לא נכונים."
 
+#: actions/login.php:295
+#, fuzzy, php-format
+msgid ""
+"Don't have a username yet? [Register](%%action.register%%) a new account."
+msgstr ""
+"היכנס בעזרת שם המשתמש והסיסמה שלך. עדיין אין לך שם משתמש? [הרשם](%%action."
+"register%%) לחשבון "
+
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: actions/newapplication.php:64
+#: actions/makeadmin.php:96
+#, fuzzy, php-format
+msgid "%1$s is already an admin for group \"%2$s\"."
+msgstr "למשתמש אין פרופיל."
+
+#: actions/makeadmin.php:133
+#, fuzzy, php-format
+msgid "Can't get membership record for %1$s in group %2$s."
+msgstr "נכשלה יצירת OpenID מתוך: %s"
+
+#: actions/makeadmin.php:146
+#, fuzzy, php-format
+msgid "Can't make %1$s an admin for group %2$s."
+msgstr "למשתמש אין פרופיל."
+
+#: actions/microsummary.php:69
+#, fuzzy
+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:65
 msgid "You must be logged in to register an application."
 msgstr ""
 
-#: actions/newapplication.php:143
+#: actions/newapplication.php:147
 msgid "Use this form to register a new application."
 msgstr ""
 
-#: actions/newapplication.php:176
+#: actions/newapplication.php:184
 msgid "Source URL is required."
 msgstr ""
 
-#: actions/newapplication.php:258 actions/newapplication.php:267
+#: actions/newapplication.php:266 actions/newapplication.php:275
 msgid "Could not create application."
 msgstr "שמירת הפרופיל נכשלה."
 
+#. TRANS: Title for form to create a group.
 #: actions/newgroup.php:53
 msgid "New group"
 msgstr ""
 
-#: actions/newgroup.php:110
+#. 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 ""
 
-#: actions/newmessage.php:71 actions/newmessage.php:231
+#: actions/newmessage.php:71 actions/newmessage.php:234
 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
+#, 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:138 lib/command.php:481
-#: lib/command.php:582
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:478
+#: lib/command.php:581
 msgid "No content!"
 msgstr "אין תוכן!"
 
-#: actions/newmessage.php:158
+#: actions/newmessage.php:161
 msgid "No recipient specified."
 msgstr ""
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:164 lib/command.php:506
+#: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
+#: actions/newmessage.php:184
+#, fuzzy
+msgid "Message sent"
+msgstr "הודעה חדשה"
+
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:185 lib/command.php:514
+#: actions/newmessage.php:188 lib/command.php:513
 #, php-format
 msgid "Direct message to %s sent."
 msgstr ""
 
-#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
+#: actions/newmessage.php:213 actions/newnotice.php:264
 msgid "Ajax Error"
 msgstr ""
 
@@ -1471,6 +3511,11 @@ msgstr ""
 msgid "New notice"
 msgstr "הודעה חדשה"
 
+#: actions/newnotice.php:230
+#, fuzzy
+msgid "Notice posted"
+msgstr "הודעות"
+
 #: actions/noticesearch.php:68
 #, php-format
 msgid ""
@@ -1484,6 +3529,11 @@ msgstr ""
 msgid "Text search"
 msgstr "חיפוש טקסט"
 
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%1$s\" on %2$s"
+msgstr "חיפוש ברצף אחרי \"%s\""
+
 #: actions/noticesearch.php:121
 #, php-format
 msgid ""
@@ -1498,9 +3548,20 @@ msgid ""
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
 
+#: actions/noticesearchrss.php:96
+#, fuzzy, 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!"
+msgstr "כל העידכונים התואמים את החיפוש אחרי \"%s\""
+
 #: actions/nudge.php:85
 msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set their email yet."
+"This user doesn't allow nudges or hasn't confirmed or set their email "
+"address yet."
 msgstr ""
 
 #: actions/nudge.php:94
@@ -1511,91 +3572,172 @@ msgstr ""
 msgid "Nudge sent!"
 msgstr ""
 
-#: actions/oauthappssettings.php:59
+#. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
+#: actions/oauthappssettings.php:60
 msgid "You must be logged in to list your applications."
 msgstr ""
 
-#: actions/oauthappssettings.php:74
+#. TRANS: Page title for OAuth applications
+#: actions/oauthappssettings.php:76
 msgid "OAuth applications"
 msgstr ""
 
-#: actions/oauthappssettings.php:85
+#. TRANS: Page instructions for OAuth applications
+#: actions/oauthappssettings.php:88
 msgid "Applications you have registered"
 msgstr ""
 
-#: actions/oauthappssettings.php:135
+#. TRANS: Empty list message on page with OAuth applications.
+#: actions/oauthappssettings.php:141
 #, php-format
 msgid "You have not registered any applications yet."
 msgstr ""
 
-#: actions/oauthconnectionssettings.php:72
+#. TRANS: Title for OAuth connection settings.
+#: actions/oauthconnectionssettings.php:71
 msgid "Connected applications"
 msgstr ""
 
+#. TRANS: Instructions for OAuth connection settings.
 #: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
+msgid "The following connections exist for your account."
 msgstr ""
 
-#: actions/oauthconnectionssettings.php:186
+#. TRANS: Client error when trying to revoke access for an application while not being a user of it.
+#: 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:183
 #, php-format
-msgid "Unable to revoke access for app: %s."
+msgid "Unable to revoke access for application: %s."
 msgstr ""
 
-#: actions/oauthconnectionssettings.php:198
+#. 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
+#, php-format
+msgid ""
+"You have successfully revoked access for %1$s and the access token starting "
+"with %2$s."
+msgstr ""
+
+#. TRANS: Empty list message when no applications have been authorised yet.
+#: actions/oauthconnectionssettings.php:213
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 
-#: actions/oauthconnectionssettings.php:211
-msgid "Developers can edit the registration settings for their applications "
+#. 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
+#, php-format
+msgid ""
+"Are you a developer? [Register an OAuth client application](%s) to use with "
+"this instance of StatusNet."
 msgstr ""
 
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "למשתמש אין פרופיל."
 
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:83 actions/shownotice.php:172
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "הסטטוס של %1$s ב-%2$s "
 
+#. 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:163
+#: actions/oembed.php:172
 #, php-format
 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:1206
+#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#, fuzzy
+msgid "Not a supported data format."
+msgstr "פורמט התמונה אינו נתמך."
+
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "חיפוש אנשים"
 
-#: actions/othersettings.php:60
+#: actions/opensearch.php:67
+#, fuzzy
+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 ""
 
-#: actions/othersettings.php:108
+#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+#. TRANS: user's profile settings. This message has one space at the beginning. Use your
+#. TRANS: language's word separator here if it has one (most likely a single space).
+#: actions/othersettings.php:111
 msgid " (free service)"
 msgstr ""
 
-#: actions/othersettings.php:116
+#. TRANS: Label for dropdown with URL shortener services.
+#: actions/othersettings.php:120
 msgid "Shorten URLs with"
 msgstr ""
 
-#: actions/othersettings.php:117
+#. TRANS: Tooltip for for dropdown with URL shortener services.
+#: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/othersettings.php:123
+#. TRANS: Label for checkbox.
+#: actions/othersettings.php:128
+#, fuzzy
+msgid "View profile designs"
+msgstr "הגדרות הפרופיל"
+
+#. TRANS: Tooltip for checkbox.
+#: actions/othersettings.php:130
 msgid "Show or hide profile designs."
 msgstr ""
 
+#. TRANS: Form validation error for form "Other settings" in user profile.
+#: actions/othersettings.php:162
+msgid "URL shortening service is too long (maximum 50 characters)."
+msgstr ""
+
+#: actions/otp.php:69
+#, fuzzy
+msgid "No user ID specified."
+msgstr "הודעה חדשה"
+
+#: actions/otp.php:83
+#, fuzzy
+msgid "No login token specified."
+msgstr "הודעה חדשה"
+
 #: actions/otp.php:90
 msgid "No login token requested."
 msgstr "לא התבקש אישור!"
 
+#: actions/otp.php:95
+#, fuzzy
+msgid "Invalid login token specified."
+msgstr "תוכן ההודעה לא חוקי"
+
 #: actions/otp.php:104
 msgid "Login token expired."
 msgstr ""
@@ -1618,6 +3760,16 @@ msgstr ""
 msgid "Change password"
 msgstr "שנה סיסמה"
 
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "שנה סיסמה"
+
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#, fuzzy
+msgid "Password change"
+msgstr "הסיסמה נשמרה."
+
 #: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "סיסמה ישנה"
@@ -1630,11 +3782,6 @@ msgstr "סיסמה חדשה"
 msgid "6 or more characters"
 msgstr "לפחות 6 אותיות"
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:440
-msgid "Confirm"
-msgstr "אשר"
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "זהה לסיסמה למעלה"
@@ -1643,7 +3790,12 @@ msgstr "זהה לסיסמה למעלה"
 msgid "Change"
 msgstr "שנה"
 
-#: actions/passwordsettings.php:157 actions/register.php:240
+#: actions/passwordsettings.php:154 actions/register.php:238
+#, fuzzy
+msgid "Password must be 6 or more characters."
+msgstr "הסיסמה חייבת להיות בת לפחות 6 אותיות."
+
+#: actions/passwordsettings.php:157 actions/register.php:241
 msgid "Passwords don't match."
 msgstr "הסיסמאות לא תואמות."
 
@@ -1663,99 +3815,285 @@ msgstr "לא ניתן לשמור את הסיסמה"
 msgid "Password saved."
 msgstr "הסיסמה נשמרה."
 
+#. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
+#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
 msgid "Paths"
 msgstr ""
 
-#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
+#. TRANS: Form instructions for Path admin panel.
+#: actions/pathsadminpanel.php:69
+msgid "Path and server settings for this StatusNet site"
 msgstr ""
 
-#: actions/pathsadminpanel.php:183
+#. 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
+#, fuzzy, 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 ""
 
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#. TRANS: Fieldset legend in Paths admin panel.
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr ""
 
-#: actions/pathsadminpanel.php:238
+#. 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 "שיחזור"
+
+#: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
 msgstr ""
 
-#: actions/pathsadminpanel.php:242
+#. 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:246
-msgid "Path to locales"
+#: actions/pathsadminpanel.php:249
+msgid "Site path."
 msgstr ""
 
-#: actions/pathsadminpanel.php:246
-msgid "Directory path to locales"
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:255
+msgid "Locale directory"
 msgstr ""
 
-#: actions/pathsadminpanel.php:250
+#: 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:252
+#: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr ""
 
-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:272
 msgid "Theme"
 msgstr ""
 
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:281
+msgid "Server for themes."
 msgstr ""
 
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:290
+msgid "Web path to themes."
 msgstr ""
 
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#. 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 "שיחזור"
+
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:299
+msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
-#: actions/pathsadminpanel.php:284
+#. 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
+#, fuzzy
+msgid "Avatars"
+msgstr "תמונה"
+
+#. TRANS: Field label in Paths admin panel.
+#: actions/pathsadminpanel.php:333
 msgid "Avatar server"
 msgstr "תמונה"
 
-#: actions/pathsadminpanel.php:301
+#. 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
+#, fuzzy
+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
+#, fuzzy
+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 ""
 
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:372
+msgid "Server for backgrounds."
 msgstr ""
 
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:381
+msgid "Web path to backgrounds."
 msgstr ""
 
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:390
+msgid "Server for backgrounds on SSL pages."
 msgstr ""
 
-#: actions/pathsadminpanel.php:325
+#. 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.
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+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
+#, fuzzy
+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
+#, fuzzy
+msgid "Never"
+msgstr "שיחזור"
+
+#. TRANS: Drop down option in Paths admin panel (option for "When to use SSL").
+#: actions/pathsadminpanel.php:479
+#, fuzzy
+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:329
+#: actions/pathsadminpanel.php:485
 msgid "Use SSL"
 msgstr ""
 
-#: actions/pathsadminpanel.php:330
-msgid "When to use SSL"
+#. TRANS: Tooltip for field label in Paths admin panel.
+#: actions/pathsadminpanel.php:487
+msgid "When to use SSL."
 msgstr ""
 
-#: actions/pathsadminpanel.php:336
-msgid "Server to direct SSL requests to"
+#. 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 "הודעה חדשה"
+
 #: actions/peoplesearch.php:52
 #, php-format
 msgid ""
@@ -1769,6 +4107,16 @@ msgstr ""
 msgid "People search"
 msgstr "חיפוש סיסמה"
 
+#: actions/peopletag.php:68
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s."
+msgstr "לא עומד בכללים ל-OpenID."
+
+#: actions/peopletag.php:142
+#, fuzzy, php-format
+msgid "Users self-tagged with %1$s - page %2$d"
+msgstr "מיקרובלוג מאת %s"
+
 #: actions/postnotice.php:95
 msgid "Invalid notice content."
 msgstr "גודל לא חוקי."
@@ -1778,122 +4126,223 @@ msgstr "גודל לא חוקי."
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
-#: actions/profilesettings.php:60
+#. TRANS: Page title for profile settings.
+#: actions/profilesettings.php:61
 msgid "Profile settings"
 msgstr "הגדרות הפרופיל"
 
-#: actions/profilesettings.php:71
+#. TRANS: Usage instructions for profile settings.
+#: actions/profilesettings.php:73
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr "עדכן את הפרופיל האישי שלך כאן, על מנת שאנשים יוכלו לדעת עליך יותר."
 
-#: actions/profilesettings.php:99
+#. TRANS: Profile settings form legend.
+#: actions/profilesettings.php:102
 msgid "Profile information"
 msgstr "הגדרות הפרופיל"
 
-#: actions/profilesettings.php:108 lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1 עד 64 אותיות אנגליות קטנות או מספרים, ללא סימני פיסוק או רווחים."
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:113
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
+msgstr ""
 
-#: actions/profilesettings.php:111 actions/register.php:455
-#: actions/showgroup.php:256 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:150
+#. TRANS: Field label in form for profile settings.
+#. TRANS: Label for full group name (dt). Text hidden by default.
+#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/showgroup.php:252 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
 msgstr "שם מלא"
 
+#. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:235 lib/groupeditform.php:161
+#: actions/profilesettings.php:122 actions/register.php:461
+#: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "אתר בית"
 
-#: actions/profilesettings.php:117 actions/register.php:462
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "הכתובת של אתר הבית שלך, בלוג, או פרופיל באתר אחר "
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:125
+msgid "URL of your homepage, blog, or profile on another site."
+msgstr ""
 
-#: actions/profilesettings.php:127 actions/register.php:473
+#. 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:133 actions/register.php:472
+#, php-format
+msgid "Describe yourself and your interests in %d character"
+msgid_plural "Describe yourself and your interests in %d characters"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:139 actions/register.php:477
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אותיות"
+
+#. TRANS: Text area label in form for profile settings where users can provide.
+#. TRANS: their biography.
+#: actions/profilesettings.php:143 actions/register.php:479
 msgid "Bio"
 msgstr "ביוגרפיה"
 
-#: actions/profilesettings.php:132 actions/register.php:478
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:165
+#. TRANS: Field label in form for profile settings.
+#. TRANS: Label for group location (dt). Text hidden by default.
+#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/showgroup.php:262 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: lib/userprofile.php:167
 msgid "Location"
 msgstr "מיקום"
 
-#: actions/profilesettings.php:134 actions/register.php:480
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:152 actions/register.php:486
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "מיקומך, למשל \"עיר, מדינה או מחוז, ארץ\""
 
-#: actions/profilesettings.php:138
+#. TRANS: Checkbox label in form for profile settings.
+#: actions/profilesettings.php:157
 msgid "Share my current location when posting notices"
 msgstr ""
 
-#: actions/profilesettings.php:145 actions/tagother.php:149
+#. TRANS: Field label in form for profile settings.
+#: actions/profilesettings.php:165 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:210
+#: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr ""
 
-#: actions/profilesettings.php:147
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:168
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
-#: actions/profilesettings.php:151
+#. TRANS: Dropdownlist label in form for profile settings.
+#: actions/profilesettings.php:173
 msgid "Language"
 msgstr "שפה"
 
-#: actions/profilesettings.php:152
+#. TRANS: Tooltip for dropdown list label in form for profile settings.
+#: actions/profilesettings.php:175
 msgid "Preferred language"
 msgstr ""
 
-#: actions/profilesettings.php:161
+#. TRANS: Dropdownlist label in form for profile settings.
+#: actions/profilesettings.php:185
 msgid "Timezone"
 msgstr ""
 
-#: actions/profilesettings.php:162
+#. TRANS: Tooltip for dropdown list label in form for profile settings.
+#: actions/profilesettings.php:187
 msgid "What timezone are you normally in?"
 msgstr ""
 
-#: actions/profilesettings.php:167
+#. TRANS: Checkbox label in form for profile settings.
+#: actions/profilesettings.php:193
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 
-#: actions/profilesettings.php:228 actions/register.php:230
+#. 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:262 actions/register.php:229
 #, php-format
-msgid "Bio is too long (max %d chars)."
-msgstr "שם המיקום ארוך מידי (מותר עד %d אותיות)."
+msgid "Bio is too long (maximum %d character)."
+msgid_plural "Bio is too long (maximum %d characters)."
+msgstr[0] ""
+msgstr[1] ""
 
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:151
+#. TRANS: Validation error in form for profile settings.
+#: actions/profilesettings.php:273 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr ""
 
-#: actions/profilesettings.php:253 actions/tagother.php:178
+#. TRANS: Validation error in form for profile settings.
+#: actions/profilesettings.php:281
+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:295 actions/tagother.php:178
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "גודל לא חוקי."
 
-#: actions/profilesettings.php:375
+#. TRANS: Server error thrown when user profile settings could not be updated to
+#. TRANS: automatically subscribe to any subscriber.
+#: actions/profilesettings.php:351
+#, fuzzy
+msgid "Couldn't update user for autosubscribe."
+msgstr "עידכון המשתמש נכשל."
+
+#. TRANS: Server error thrown when user profile location preference settings could not be updated.
+#: actions/profilesettings.php:409
+#, fuzzy
+msgid "Couldn't save location prefs."
+msgstr "שמירת הפרופיל נכשלה."
+
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/profilesettings.php:422
 msgid "Couldn't save profile."
 msgstr "שמירת הפרופיל נכשלה."
 
+#. TRANS: Server error thrown when user profile settings tags could not be saved.
+#: actions/profilesettings.php:431
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "שמירת הפרופיל נכשלה."
+
+#. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:440 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "ההגדרות נשמרו."
 
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:481 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
+#, fuzzy
+msgid "Could not retrieve public stream."
+msgstr "עידכון המשתמש נכשל."
+
+#: actions/public.php:130
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "קו זמן ציבורי"
+
 #: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "קו זמן ציבורי"
 
+#: actions/public.php:160
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "הזנת זרם הציבורי"
+
+#: actions/public.php:164
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "הזנת זרם הציבורי"
+
+#: actions/public.php:168
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "הזנת זרם הציבורי"
+
 #: actions/public.php:188
 #, php-format
 msgid ""
@@ -1928,28 +4377,46 @@ msgid ""
 "tool."
 msgstr ""
 
-#: actions/publictagcloud.php:63
+#. TRANS: Title for public tag cloud.
+#: actions/publictagcloud.php:57
+#, fuzzy
+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 "
+msgid "These are most popular recent tags on %s"
 msgstr ""
 
-#: actions/publictagcloud.php:69
+#. 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 ""
 
-#: actions/publictagcloud.php:72
+#. 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 ""
 
-#: actions/publictagcloud.php:75
+#. TRANS: Message shown to a anonymous user for the public tag cloud
+#. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
+#. 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 "
 "one!"
 msgstr ""
 
-#: actions/publictagcloud.php:134
+#: actions/publictagcloud.php:146
 msgid "Tag cloud"
 msgstr ""
 
@@ -1977,6 +4444,11 @@ msgstr "שגיאה באישור הקוד."
 msgid "This confirmation code is too old. Please start again."
 msgstr "קוד אישור זה ישן מידי. אנא התחל מחדש."
 
+#: actions/recoverpassword.php:111
+#, fuzzy
+msgid "Could not update user with confirmed email address."
+msgstr "עידכון המשתמש נכשל."
+
 #: actions/recoverpassword.php:152
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
@@ -1987,6 +4459,11 @@ msgstr ""
 msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recovery"
+msgstr "התבקש שיחזור סיסמה"
+
 #: actions/recoverpassword.php:191
 msgid "Nickname or email address"
 msgstr ""
@@ -2050,14 +4527,14 @@ msgid "Unexpected password reset."
 msgstr "איפוס סיסמה לא צפוי."
 
 #: actions/recoverpassword.php:365
-msgid "Password must be 6 chars or more."
-msgstr "הסיסמה חייבת להיות בת לפחות 6 אותיות."
+msgid "Password must be 6 characters or more."
+msgstr ""
 
 #: actions/recoverpassword.php:369
 msgid "Password and confirmation do not match."
 msgstr "הסיסמה ואישורה אינן תואמות."
 
-#: actions/recoverpassword.php:388 actions/register.php:255
+#: actions/recoverpassword.php:388 actions/register.php:256
 msgid "Error setting user."
 msgstr "שגיאה ביצירת שם המשתמש."
 
@@ -2065,15 +4542,20 @@ msgstr "שגיאה ביצירת שם המשתמש."
 msgid "New password successfully saved. You are now logged in."
 msgstr "הסיסמה החדשה נשמרה בהצלחה. אתה מחובר למערכת."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:412
+#: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
 msgstr ""
 
+#: actions/register.php:99
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "שגיאה באישור הקוד."
+
 #: actions/register.php:119
 msgid "Registration successful"
 msgstr ""
 
-#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "הירשם"
 
@@ -2081,68 +4563,87 @@ msgstr "הירשם"
 msgid "Registration not allowed."
 msgstr ""
 
-#: actions/register.php:205
+#: actions/register.php:209
 msgid "You can't register if you don't agree to the license."
 msgstr "לא ניתן להירשם ללא הסכמה לרשיון"
 
-#: actions/register.php:250 actions/register.php:272
+#: actions/register.php:218
+#, fuzzy
+msgid "Email address already exists."
+msgstr "כתובת זו כבר אושרה."
+
+#: actions/register.php:251 actions/register.php:273
 msgid "Invalid username or password."
 msgstr "שם המשתמש או הסיסמה לא חוקיים"
 
-#: actions/register.php:350
+#: 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. "
 msgstr ""
 
-#: actions/register.php:437
+#: actions/register.php:433
+#, fuzzy
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr "1 עד 64 אותיות אנגליות קטנות או מספרים, ללא סימני פיסוק או רווחים."
+
+#: actions/register.php:438
 msgid "6 or more characters. Required."
 msgstr " לפחות 6 אותיות. שדה חובה."
 
+#: actions/register.php:442
+#, fuzzy
+msgid "Same as password above. Required."
+msgstr "זהה לסיסמה למעלה"
+
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
+#: actions/register.php:446 actions/register.php:450
+#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr ""
 
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:447 actions/register.php:451
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "לשימוש רק במקרים של עידכונים, הודעות מערכת, ושיחזורי סיסמאות"
 
-#: actions/register.php:457
+#: actions/register.php:458
 msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
-#: actions/register.php:518
+#: actions/register.php:463
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "הכתובת של אתר הבית שלך, בלוג, או פרופיל באתר אחר "
+
+#: actions/register.php:524
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:528
+#: actions/register.php:534
 #, 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:532
+#: actions/register.php:538
 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:535
+#: actions/register.php:541
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:540
+#: actions/register.php:546
 #, 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:583
+#: actions/register.php:589
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -2161,7 +4662,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:607
+#: actions/register.php:613
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -2182,6 +4683,11 @@ msgstr ""
 msgid "Remote subscribe"
 msgstr "הרשמה מרוחקת"
 
+#: actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "ההרשמה אושרה"
+
 #: actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "כינוי משתמש"
@@ -2199,7 +4705,7 @@ msgid "URL of your profile on another compatible microblogging service"
 msgstr "כתובת הפרופיל שלך בשרות ביקרובלוג תואם אחר"
 
 #: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:406
+#: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "הירשם כמנוי"
 
@@ -2207,24 +4713,69 @@ msgstr "הירשם כמנוי"
 msgid "Invalid profile URL (bad format)"
 msgstr "כתובת פרופיל לא חוקית (פורמט לא תקין)"
 
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
+msgstr "Not a valid profile URL (no YADIS document)."
+
 #: actions/remotesubscribe.php:176
 msgid "That’s a local profile! Login to subscribe."
 msgstr ""
 
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "אסימון הבקשה לא התקבל."
+
 #: actions/repeat.php:57
 msgid "Only logged-in users can repeat notices."
 msgstr ""
 
-#: actions/repeat.php:114 lib/noticelist.php:676
+#: actions/repeat.php:64 actions/repeat.php:71
+#, fuzzy
+msgid "No notice specified."
+msgstr "הודעה חדשה"
+
+#: actions/repeat.php:76
+#, fuzzy
+msgid "You can't repeat your own notice."
+msgstr "לא ניתן להירשם ללא הסכמה לרשיון"
+
+#: actions/repeat.php:90
+#, fuzzy
+msgid "You already repeated that notice."
+msgstr "כבר נכנסת למערכת!"
+
+#: actions/repeat.php:114 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "איפוס"
 
+#: actions/repeat.php:119
+#, fuzzy
+msgid "Repeated!"
+msgstr "צור"
+
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
+#: lib/personalgroupnav.php:108
 #, 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
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "הזנת הודעות של %s"
+
+#: actions/replies.php:152
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "הזנת הודעות של %s"
+
 #: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
@@ -2251,10 +4802,117 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
+#: actions/repliesrss.php:72
+#, 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
+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.
+#: actions/restoreaccount.php:164 lib/imagefile.php:103 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
+#, 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:146 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
@@ -2262,7 +4920,7 @@ msgid "Sessions"
 msgstr ""
 
 #: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
+msgid "Session settings for this StatusNet site"
 msgstr ""
 
 #: actions/sessionsadminpanel.php:175
@@ -2282,7 +4940,6 @@ msgid "Turn on debugging output for sessions."
 msgstr ""
 
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
 msgid "Save site settings"
 msgstr "הגדרות הפרופיל"
 
@@ -2290,12 +4947,38 @@ msgstr "הגדרות הפרופיל"
 msgid "You must be logged in to view an application."
 msgstr ""
 
+#: actions/showapplication.php:157
+#, fuzzy
+msgid "Application profile"
+msgstr "להודעה אין פרופיל"
+
 #. TRANS: Form input field label for application icon.
 #: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
 msgstr ""
 
-#: actions/showapplication.php:192 actions/showgroup.php:436
+#. TRANS: Form input field label for application name.
+#: actions/showapplication.php:169 actions/version.php:197
+#: lib/applicationeditform.php:190
+#, fuzzy
+msgid "Name"
+msgstr "כינוי"
+
+#. TRANS: Form input field label.
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
+#, fuzzy
+msgid "Organization"
+msgstr "מיקום"
+
+#. TRANS: Form input field label.
+#: actions/showapplication.php:187 actions/version.php:200
+#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#, fuzzy
+msgid "Description"
+msgstr "הרשמות"
+
+#. TRANS: Header for group statistics on a group page (h2).
+#: actions/showapplication.php:192 actions/showgroup.php:448
 #: lib/profileaction.php:187
 msgid "Statistics"
 msgstr "סטטיסטיקה"
@@ -2313,6 +4996,12 @@ msgstr ""
 msgid "Reset key & secret"
 msgstr ""
 
+#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#, fuzzy
+msgid "Delete"
+msgstr "מחק"
+
 #: actions/showapplication.php:261
 msgid "Application info"
 msgstr ""
@@ -2347,6 +5036,31 @@ msgstr ""
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "%s וחברים"
+
+#: actions/showfavorites.php:132
+#, fuzzy
+msgid "Could not retrieve favorite notices."
+msgstr "שמירת הפרופיל נכשלה."
+
+#: actions/showfavorites.php:171
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "הזנות החברים של %s"
+
+#: actions/showfavorites.php:178
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "הזנות החברים של %s"
+
+#: actions/showfavorites.php:185
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "הזנות החברים של %s"
+
 #: actions/showfavorites.php:206
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
@@ -2372,35 +5086,107 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/showgroup.php:82
+#. TRANS: Page title for first group page. %s is a group name.
+#: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
 msgstr ""
 
-#: actions/showgroup.php:227
+#. 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 "כל המנויים"
+
+#. TRANS: Group profile header (h2). Text hidden by default.
+#: actions/showgroup.php:220
 msgid "Group profile"
 msgstr "למשתמש אין פרופיל."
 
-#: actions/showgroup.php:272 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:178
+#. TRANS: Label for group URL (dt). Text hidden by default.
+#: actions/showgroup.php:270 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:180
 msgid "URL"
 msgstr ""
 
-#: actions/showgroup.php:293 lib/groupeditform.php:184
+#. TRANS: Label for group description or group note (dt). Text hidden by default.
+#: actions/showgroup.php:282 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:197
+#, fuzzy
+msgid "Note"
+msgstr "הודעות"
+
+#. TRANS: Label for group aliases (dt). Text hidden by default.
+#: actions/showgroup.php:293 lib/groupeditform.php:187
 msgid "Aliases"
 msgstr ""
 
-#: actions/showgroup.php:398 lib/profileaction.php:117
+#. TRANS: Group actions header (h2). Text hidden by default.
+#: actions/showgroup.php:304
+#, fuzzy
+msgid "Group actions"
+msgstr "קבוצות"
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "הזנת הודעות של %s"
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:352
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "הזנת הודעות של %s"
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:359
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "הזנת הודעות של %s"
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:365
+#, 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:402
+#, fuzzy
+msgid "Members"
+msgstr "חבר מאז"
+
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#: actions/showgroup.php:408 lib/profileaction.php:117
 #: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr ""
 
-#: actions/showgroup.php:404
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+#: actions/showgroup.php:417
 msgid "All members"
 msgstr ""
 
-#: actions/showgroup.php:455
+#. TRANS: Label for creation date in statistics on group page.
+#: actions/showgroup.php:453
+msgctxt "LABEL"
+msgid "Created"
+msgstr ""
+
+#. TRANS: Label for member count in statistics on group page.
+#: actions/showgroup.php:461
+msgctxt "LABEL"
+msgid "Members"
+msgstr ""
+
+#. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
+#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %%%%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:476
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -2410,7 +5196,10 @@ msgid ""
 "of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/showgroup.php:461
+#. 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:486
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -2419,53 +5208,119 @@ msgid ""
 "their life and interests. "
 msgstr ""
 
-#: actions/showgroup.php:489
+#. TRANS: Header for list of group administrators on a group page (h2).
+#: actions/showgroup.php:515
 msgid "Admins"
 msgstr ""
 
-#: actions/showmessage.php:98
+#. TRANS: Client error displayed requesting a single message that does not exist.
+#: actions/showmessage.php:79
+#, fuzzy
+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:97
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: actions/showmessage.php:108
+#. 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:110
 #, php-format
 msgid "Message to %1$s on %2$s"
 msgstr ""
 
-#: actions/showmessage.php:113
+#. TRANS: Page title for single message display.
+#. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
+#: actions/showmessage.php:118
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/showstream.php:73
+#: 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
 #, php-format
-msgid " tagged %s"
+msgid "%1$s tagged %2$s"
 msgstr ""
 
-#: actions/showstream.php:148
+#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$s is the hash tag, %1$d is the page number.
+#: actions/showstream.php:74
+#, php-format
+msgid "%1$s tagged %2$s, page %3$d"
+msgstr ""
+
+#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: %1$s is the username, %2$d is the page number.
+#: actions/showstream.php:82
+#, fuzzy, php-format
+msgid "%1$s, page %2$d"
+msgstr "%s וחברים"
+
+#. 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"
+
+#. 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"
+
+#. 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"
+
+#: actions/showstream.php:152
+#, fuzzy, 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
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
-#: actions/showstream.php:200
+#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#: actions/showstream.php:211
 #, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr ""
 
-#: actions/showstream.php:205
+#. TRANS: Second sentence of empty list message for a stream for the user themselves.
+#: actions/showstream.php:217
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
 
-#: actions/showstream.php:207
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
 
-#: actions/showstream.php:243
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -2474,7 +5329,9 @@ msgid ""
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
 
-#: actions/showstream.php:248
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -2482,10 +5339,21 @@ msgid ""
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
 
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
+#, fuzzy, php-format
+msgid "Repeat of %s"
+msgstr "תגובת עבור %s"
+
 #: 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 "למשתמש אין פרופיל."
+
 #: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr ""
@@ -2515,6 +5383,11 @@ msgstr ""
 msgid "General"
 msgstr ""
 
+#: actions/siteadminpanel.php:224
+#, fuzzy
+msgid "Site name"
+msgstr "הודעה חדשה"
+
 #: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr ""
@@ -2539,6 +5412,11 @@ msgstr ""
 msgid "Contact email address for your site"
 msgstr ""
 
+#: actions/siteadminpanel.php:245
+#, fuzzy
+msgid "Local"
+msgstr "מיקום"
+
 #: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr ""
@@ -2575,18 +5453,45 @@ msgstr ""
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:56
+#. TRANS: Page title for site-wide notice tab in admin panel.
+#: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
 msgstr "הודעות"
 
-#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars."
+#. 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 ""
 
-#: actions/sitenoticeadminpanel.php:178
-msgid "Site-wide notice text (255 chars max; HTML okay)"
+#. 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:59
 msgid "SMS settings"
@@ -2599,6 +5504,18 @@ msgstr "הגדרות הפרופיל"
 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:97
+#, fuzzy
+msgid "SMS is not available."
+msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לקבל"
+
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "כתובת מסרים מידיים"
+
 #. TRANS: Form guide in SMS settings form.
 #: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
@@ -2609,16 +5526,35 @@ msgstr ""
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
+#, fuzzy
+msgid "Confirmation code"
+msgstr "אין קוד אישור."
+
 #. TRANS: Form field instructions in SMS settings form.
 #: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr ""
 
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "אשר"
+
 #. TRANS: Field label for SMS phone number input in SMS settings form.
 #: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr ""
 
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
+#, fuzzy
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "1 עד 64 אותיות אנגליות קטנות או מספרים, ללא סימני פיסוק או רווחים."
+
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:195
 msgid "SMS preferences"
@@ -2631,11 +5567,35 @@ msgid ""
 "from my carrier."
 msgstr ""
 
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "העדפות נשמרו."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
+#, fuzzy
+msgid "No phone number."
+msgstr "אין משתמש כזה."
+
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
 #: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr ""
 
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
+#, fuzzy
+msgid "That is already your phone number."
+msgstr "זהו כבר זיהוי ה-Jabber שלך."
+
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
+#, fuzzy
+msgid "That phone number already belongs to another user."
+msgstr "זיהוי ה-Jabber כבר שייך למשתמש אחר."
+
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
 #: actions/smssettings.php:384
 msgid ""
@@ -2645,11 +5605,30 @@ msgstr ""
 "קוד אישור נשלח אל כתובת המסרים המידיים שהוספת. עליך לאשר את %s לשליחת מסרים "
 "מידיים אליך."
 
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
+#, fuzzy
+msgid "That is the wrong confirmation number."
+msgstr "זוהי כתובת מסרים מידיים שגויה."
+
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 #: actions/smssettings.php:427
 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:448
+#, fuzzy
+msgid "That is not your phone number."
+msgstr "זהו לא זיהוי ה-Jabber שלך."
+
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "הכתובת הוסרה."
+
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
 #: actions/smssettings.php:511
 msgid "Mobile carrier"
@@ -2669,12 +5648,23 @@ msgid ""
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
+#, 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 ""
@@ -2719,8 +5709,20 @@ msgstr ""
 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:83 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
 msgid "Could not save subscription."
 msgstr "הכנסת מנוי חדש נכשלה."
 
@@ -2728,43 +5730,94 @@ msgstr "הכנסת מנוי חדש נכשלה."
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/subscribers.php:63
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "לא שלחנו אלינו את הפרופיל הזה"
+
+#: actions/subscribe.php:145
+#, 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
+#, fuzzy, 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
+#, fuzzy, 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 "אלה האנשים המאזינים להודעות שלך."
 
-#: actions/subscribers.php:67
+#. 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."
 
-#: actions/subscribers.php:108
+#. TRANS: Subscriber list text when the logged in user has no subscribers.
+#: actions/subscribers.php:116
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
-"return the favor"
+"return the favor."
 msgstr ""
 
-#: actions/subscribers.php:110
+#. 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:120
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
 
-#: actions/subscribers.php:114
+#. TRANS: Subscriber list text when looking at the subscribers for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#. 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:129
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
 "%) and be the first?"
 msgstr ""
 
-#: actions/subscriptions.php:65
+#. 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 "כל המנויים"
+
+#. 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 "אלה האנשים שלהודעות שלהם אתה מאזין."
 
-#: actions/subscriptions.php:69
+#. 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 מאזין להודעות שלהם."
 
-#: actions/subscriptions.php:126
+#. 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.
+#: actions/subscriptions.php:135
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -2774,17 +5827,68 @@ msgid ""
 "automatically subscribe to people you already follow there."
 msgstr ""
 
-#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
+#. 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: 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:143 actions/subscriptions.php:149
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s כעת מאזין להודעות שלך ב-%2$s"
+
+#: actions/subscriptions.php:178
+#, 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:242
+#, fuzzy
+msgid "Jabber"
+msgstr "אין זיהוי Jabber כזה."
+
+#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
+#: actions/subscriptions.php:257
 msgid "SMS"
 msgstr "סמס"
 
+#: actions/tag.php:69
+#, fuzzy, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "מיקרובלוג מאת %s"
+
+#: actions/tag.php:87
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "הזנת הודעות של %s"
+
+#: actions/tag.php:93
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "הזנת הודעות של %s"
+
+#: actions/tag.php:99
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "הזנת הודעות של %s"
+
+#: actions/tagother.php:39
+#, fuzzy
+msgid "No ID argument."
+msgstr "אין מסמך כזה."
+
 #: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr ""
 
+#: actions/tagother.php:77 lib/userprofile.php:76
+#, fuzzy
+msgid "User profile"
+msgstr "למשתמש אין פרופיל."
+
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:103
+#: lib/userprofile.php:107
 msgid "Photo"
 msgstr ""
 
@@ -2811,72 +5915,150 @@ msgstr "שמירת הפרופיל נכשלה."
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
+#: actions/tagrss.php:35
+#, fuzzy
+msgid "No such tag."
+msgstr "אין הודעה כזו."
+
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "כבר נכנסת למערכת!"
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "למשתמש אין פרופיל."
+
+#: actions/unsilence.php:72
+#, fuzzy
+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 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
+#. 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 ""
 
-#: actions/useradminpanel.php:149
+#. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
+#: actions/useradminpanel.php:147
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
-#: actions/useradminpanel.php:155
-msgid "Invalid welcome text. Max length is 255 characters."
+#. TRANS: Form validation error in user admin panel when welcome text is too long.
+#: actions/useradminpanel.php:154
+msgid "Invalid welcome text. Maximum length is 255 characters."
 msgstr ""
 
-#: actions/useradminpanel.php:165
+#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
+#. TRANS: users in user admin panel. %1$s is the invalid nickname.
+#: actions/useradminpanel.php:166
 #, php-format
-msgid "Invalid default subscripton: '%1$s' is not user."
+msgid "Invalid default subscripton: '%1$s' is not a user."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
-#: lib/personalgroupnav.php:109
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "פרופיל"
 
-#: actions/useradminpanel.php:222
+#. TRANS: Field label in user admin panel for setting the character limit for the bio field.
+#: actions/useradminpanel.php:220
 msgid "Bio Limit"
 msgstr ""
 
-#: actions/useradminpanel.php:223
+#. 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 "הודעה חדשה"
 
-#: actions/useradminpanel.php:235
+#. TRANS: Field label in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr ""
 
-#: actions/useradminpanel.php:236
-msgid "Welcome text for new users (Max 255 chars)."
+#. TRANS: Tooltip in user admin panel for setting new user welcome text.
+#: actions/useradminpanel.php:238
+msgid "Welcome text for new users (maximum 255 characters)."
 msgstr ""
 
+#. 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
 msgid "Invitations enabled"
 msgstr ""
 
-#: actions/useradminpanel.php:258
+#. 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 ""
+
 #: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "אשר מנוי"
 
+#: actions/userauthorization.php:110
+#, fuzzy
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
+msgstr ""
+"בדוק את הפרטים כדי לוודא שברצונך להירשם כמנוי להודעות משתמש זה. אם אינך רוצה "
+"להירשם, לחץ \"בטל\"."
+
+#. TRANS: Menu item for site administration
 #: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
 msgid "License"
 msgstr ""
 
@@ -2905,10 +6087,30 @@ msgstr "לא התבקש אישור!"
 msgid "Subscription authorized"
 msgstr "ההרשמה אושרה"
 
+#: actions/userauthorization.php:256
+#, fuzzy
+msgid ""
+"The subscription has been authorized, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to authorize the "
+"subscription. Your subscription token is:"
+msgstr ""
+"המנוי אושר, אבל לא התקבלה כתובת אליה ניתן לחזור. בדוק את הוראות האתר וחפש "
+"כיצד לאשר מנוי. אסימון המנוי שלך הוא:"
+
 #: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "ההרשמה נדחתה"
 
+#: actions/userauthorization.php:268
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+"המנוי נדחה, אבל לא התקבלה כתובת לחזרה. בדוק את הוראות האתר וחפש כיצד להשלים "
+"דחיית מנוי."
+
 #: actions/userauthorization.php:303
 #, php-format
 msgid "Listener URI ‘%s’ not found here."
@@ -2934,7 +6136,24 @@ msgstr ""
 msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
-#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+#: actions/userauthorization.php:350
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "לא ניתן לקרוא את ה-URL '%s' של התמונה"
+
+#: actions/userauthorization.php:355
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "סוג התמונה של '%s' אינו מתאים"
+
+#. TRANS: Page title for profile design page.
+#: actions/userdesignsettings.php:76 lib/designsettings.php:63
+#, fuzzy
+msgid "Profile design"
+msgstr "הגדרות הפרופיל"
+
+#. TRANS: Instructions for profile design page.
+#: actions/userdesignsettings.php:87 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -2944,10 +6163,21 @@ msgstr ""
 msgid "Enjoy your hotdog!"
 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
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "כל המנויים"
+
 #: 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."
@@ -2959,11 +6189,16 @@ msgstr ""
 #. 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:76
+#: lib/atomusernoticefeed.php:75
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
+#: actions/version.php:75
+#, fuzzy, php-format
+msgid "StatusNet %s"
+msgstr "סטטיסטיקה"
+
 #: actions/version.php:155
 #, php-format
 msgid ""
@@ -3002,54 +6237,158 @@ msgstr ""
 msgid "Plugins"
 msgstr ""
 
+#. 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 "אישי"
+
 #: actions/version.php:199
 msgid "Author(s)"
 msgstr ""
 
+#. TRANS: Activity title when marking a notice as favorite.
+#: classes/Fave.php:164 lib/favorform.php:143
+#, fuzzy
+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:143
+#: classes/File.php:156
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr ""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:175
+#: classes/File.php:188
 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.
-#: classes/File.php:190
+#. TRANS: %1$s is used for plural.
+#: classes/File.php:204
 #, php-format
 msgid ""
+"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
+"Try to upload a smaller version."
+msgid_plural ""
 "No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
 "Try to upload a smaller version."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANS: Message given if an upload would exceed user quota.
-#. TRANS: %d (number) is the user quota in bytes.
-#: classes/File.php:202
+#. TRANS: %d (number) is the user quota in bytes and is used for plural.
+#: classes/File.php:217
 #, php-format
-msgid "A file this large would exceed your user quota of %d bytes."
-msgstr ""
+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."
+msgstr[0] ""
+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.
-#: classes/File.php:211
+#. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
+#: classes/File.php:229
 #, php-format
-msgid "A file this large would exceed your monthly quota of %d bytes."
+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] ""
+msgstr[1] ""
+
+#. TRANS: Client exception thrown if a file upload does not have a valid name.
+#: classes/File.php:276 classes/File.php:291
+#, 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
+#, php-format
+msgid "Group ID %s is invalid."
+msgstr ""
+
+#. TRANS: Activity title.
+#: classes/Group_member.php:147 lib/joinform.php:114
+#, fuzzy
+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:533
+#: classes/Memcached_DataObject.php:537
 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:46
+#: 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
@@ -3058,227 +6397,471 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:193
+#: 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
+#, fuzzy
+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:276
+#: 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:283
+#: 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:291
+#: 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:358 classes/Notice.php:385
+#: 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:899
-msgid "Bad type provided to saveKnownGroups"
+#: classes/Notice.php:914
+msgid "Bad type provided to saveKnownGroups."
+msgstr ""
+
+#. TRANS: Server exception thrown when an update for a group inbox fails.
+#: classes/Notice.php:1013
+#, 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:1127
+#, 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:1759
+#: classes/Notice.php:1646
 #, 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)"
+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:737
+#: classes/Profile.php:765
 #, 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:746
+#: classes/Profile.php:774
 #, 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:75 lib/oauthstore.php:466
+#: 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
+#, fuzzy
+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:178
+#: 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:206
+#: 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:218
+#: 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 ""
+
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:395
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
+#. TRANS: Server exception.
+#: classes/User.php:918
+msgid "No single user defined for single-user mode."
+msgstr ""
+
+#. TRANS: Server exception.
+#: classes/User.php:922
+msgid "Single-user mode code called when not enabled."
+msgstr ""
+
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:496
+#: classes/User_group.php:516
 msgid "Could not create group."
 msgstr "עידכון המשתמש נכשל."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:506
+#: classes/User_group.php:526
 msgid "Could not set group URI."
 msgstr "שמירת הפרופיל נכשלה."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:529
+#: classes/User_group.php:549
 msgid "Could not set group membership."
 msgstr "עידכון המשתמש נכשל."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:564
 msgid "Could not save local group info."
 msgstr "שמירת הפרופיל נכשלה."
 
 #. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:130
+#: lib/accountsettingsaction.php:104
+#, fuzzy
+msgid "Change your profile settings"
+msgstr "הגדרות הפרופיל"
+
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:111
+#, fuzzy
+msgid "Upload an avatar"
+msgstr "עדכון התמונה נכשל."
+
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:118
+#, fuzzy
+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:144
+#: 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:146
+#: lib/accountsettingsaction.php:141
 msgid "Other"
 msgstr ""
 
+#. TRANS: Page title. %1$s is the title, %2$s is the site name.
+#: lib/action.php:148
+#, 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:164
 msgid "Untitled page"
 msgstr ""
 
+#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
+#: lib/action.php:312
+msgctxt "TOOLTIP"
+msgid "Show more"
+msgstr ""
+
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:449
+#: lib/action.php:531
 msgid "Primary site navigation"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:455
+#: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
+#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
+#: lib/action.php:540
+#, fuzzy
+msgctxt "MENU"
+msgid "Personal"
+msgstr "אישי"
+
+#. TRANS: Tooltip for main menu option "Account"
+#: lib/action.php:542
+#, 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:545
+#, fuzzy
+msgid "Account"
+msgstr "אודות"
+
+#. TRANS: Tooltip for main menu option "Services"
+#: lib/action.php:547
+#, fuzzy
+msgctxt "TOOLTIP"
+msgid "Connect to services"
+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:468
+#: lib/action.php:550
 msgid "Connect"
 msgstr "התחבר"
 
+#. TRANS: Tooltip for menu option "Admin"
+#: lib/action.php:553
+#, fuzzy
+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:474 lib/groupnav.php:117
+#: lib/action.php:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:478
+#: lib/action.php:560
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#: lib/action.php:563
+#, fuzzy
+msgctxt "MENU"
+msgid "Invite"
+msgstr "גודל לא חוקי."
+
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:487
+#: lib/action.php:569
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr ""
 
+#. TRANS: Main menu option when logged in to log out the current user
+#: lib/action.php:572
+#, fuzzy
+msgctxt "MENU"
+msgid "Logout"
+msgstr "צא"
+
+#. TRANS: Tooltip for main menu option "Register"
+#: lib/action.php:577
+#, fuzzy
+msgctxt "TOOLTIP"
+msgid "Create an account"
+msgstr "צור חשבון חדש"
+
+#. TRANS: Main menu option when not logged in to register a new account
+#: lib/action.php:580
+#, fuzzy
+msgctxt "MENU"
+msgid "Register"
+msgstr "הירשם"
+
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:501
+#: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr ""
 
+#. TRANS: Main menu option when not logged in to log in
+#: lib/action.php:586
+#, fuzzy
+msgctxt "MENU"
+msgid "Login"
+msgstr "היכנס"
+
+#. TRANS: Tooltip for main menu option "Help"
+#: lib/action.php:589
+#, fuzzy
+msgctxt "TOOLTIP"
+msgid "Help me!"
+msgstr "עזרה"
+
+#. TRANS: Main menu option for help on the StatusNet site
+#: lib/action.php:592
+#, fuzzy
+msgctxt "MENU"
+msgid "Help"
+msgstr "עזרה"
+
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:513
+#: lib/action.php:595
 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:598
+#, 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:620 lib/adminpanelaction.php:387
+#, fuzzy
+msgid "Site notice"
+msgstr "הודעה חדשה"
+
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:605
+#: lib/action.php:687
 msgid "Local views"
 msgstr ""
 
+#. TRANS: DT element for page notice. String is hidden in default CSS.
+#: lib/action.php:757
+#, fuzzy
+msgid "Page notice"
+msgstr "הודעה חדשה"
+
+#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
+#: lib/action.php:858
+#, fuzzy
+msgid "Secondary site navigation"
+msgstr "הרשמות"
+
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:784
+#: lib/action.php:864
 msgid "Help"
 msgstr "עזרה"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:787
+#: lib/action.php:867
 msgid "About"
 msgstr "אודות"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:790
+#: lib/action.php:870
 msgid "FAQ"
 msgstr "רשימת שאלות נפוצות"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:795
+#: lib/action.php:875
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:799
+#: lib/action.php:879
 msgid "Privacy"
 msgstr "פרטיות"
 
-#. TRANS: Secondary navigation menu option.
-#: lib/action.php:802
+#. 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 contact information on the StatusNet site.
-#: lib/action.php:808
+#. 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 "צור קשר"
 
-#: lib/action.php:810
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:892
 msgid "Badge"
 msgstr ""
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:839
+#: lib/action.php:921
 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:928
+#, fuzzy, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%)."
+msgstr ""
+"**%%site.name%%** הוא שרות ביקרובלוג הניתן על ידי [%%site.broughtby%%](%%"
+"site.broughtbyurl%%)."
+
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:849
+#: lib/action.php:931
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** הוא שרות ביקרובלוג."
@@ -3287,7 +6870,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:856
+#: lib/action.php:938
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -3298,54 +6881,122 @@ 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:954
+#, fuzzy
+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:879
+#: lib/action.php:961
 #, 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:886
+#: lib/action.php:968
 #, 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:890
+#: lib/action.php:972
 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:904
+#: lib/action.php:1004
 #, 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:1243
+#: lib/action.php:1340
 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:1351
+#, fuzzy
+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:1361
+#, fuzzy
+msgid "Before"
+msgstr "לפני >>"
+
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:122
+#: 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 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 ""
+
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:203
+#: 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:240
+#: 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:245
+#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
@@ -3375,20 +7026,47 @@ msgstr ""
 msgid "Unable to delete design setting."
 msgstr ""
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:337
+#, fuzzy
+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:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
 msgid "User"
-msgstr "מתשמש"
+msgstr "משתמש"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:361
+#, fuzzy
+msgid "Access configuration"
+msgstr "הרשמות"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:369
@@ -3400,176 +7078,307 @@ msgstr "אין קוד אישור."
 msgid "Sessions configuration"
 msgstr "אין קוד אישור."
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:385
+#, fuzzy
+msgid "Edit 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: 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:175
+#: lib/apiauth.php:177
 msgid "No application for that consumer key."
 msgstr ""
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
-#: lib/apiauth.php:212
+#: 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:217
+#: 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:258 lib/apiauth.php:290
+#: lib/apiauth.php:266 lib/apiauth.php:293
 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:186
+msgid "Could not issue access token."
+msgstr ""
+
+#. TRANS: Server error displayed when a database error occurs.
+#: lib/apioauthstore.php:243
+#, fuzzy
+msgid "Database error inserting OAuth application user."
+msgstr "שגיאת מסד נתונים בהכנסת התגובה: %s"
+
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:285
 msgid "Tried to revoke unknown token."
 msgstr ""
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:182
+#: lib/apioauthstore.php:290
 msgid "Failed to delete revoked token."
 msgstr ""
 
-#. TRANS: Form legend.
-#: lib/applicationeditform.php:129
-msgid "Edit application"
-msgstr ""
-
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:178
 msgid "Icon for this application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#. 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] ""
+msgstr[1] ""
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:205
+#, fuzzy
+msgid "Describe your application"
+msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אותיות"
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:216
+#, fuzzy
+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
 msgid "Organization responsible for this application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: 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:269
+#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr ""
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr ""
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "בטל"
 
+#: lib/applicationlist.php:247
+msgid " by "
+msgstr ""
+
 #. TRANS: Application access type
-#: lib/applicationlist.php:135
+#: lib/applicationlist.php:260
 msgid "read-write"
 msgstr ""
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:137
+#: 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:143
+#. 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:158
+#: lib/applicationlist.php:298
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "שיחזור"
 
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:88
-msgid "Attachments"
+#: 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: DT element label in attachment list item.
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:294
 msgid "Author"
 msgstr ""
 
+#. TRANS: DT element label in attachment list item.
+#: lib/attachmentlist.php:308
+#, fuzzy
+msgid "Provider"
+msgstr "פרופיל"
+
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:68
+#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr ""
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:49
+#: 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:70
+#: lib/blockform.php:68
 msgid "Block"
 msgstr ""
 
-#: lib/channel.php:157 lib/channel.php:177
+#. TRANS: Title for command results.
+#: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
 msgstr ""
 
-#: lib/channel.php:229 lib/mailhandler.php:142
+#. TRANS: Title for command results.
+#: lib/channel.php:194
+msgid "AJAX error"
+msgstr ""
+
+#. TRANS: E-mail subject when a command has completed.
+#: lib/channel.php:233 lib/mailhandler.php:143
 msgid "Command complete"
 msgstr ""
 
-#: lib/channel.php:240
+#. TRANS: E-mail subject when a command has failed.
+#: lib/channel.php:244
 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:630
+#, 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:150
+#: 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:185
+#: 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:231
+#: 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:240
+#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr ""
@@ -3578,7 +7387,7 @@ 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:270
+#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -3587,146 +7396,245 @@ msgid ""
 msgstr ""
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:314
+#: lib/command.php:312
 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:360
+#: lib/command.php:357
 #, 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:408
+#: lib/command.php:405
 #, 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
+#, 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
+#, fuzzy, php-format
+msgid "Fullname: %s"
+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:278
+#, fuzzy, php-format
+msgid "Location: %s"
+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:282
+#, fuzzy, php-format
+msgid "Homepage: %s"
+msgstr "אתר בית"
+
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:446
+#: lib/command.php:442
 #, 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).
-#: lib/command.php:474
+#. TRANS: %s is a remote profile.
+#: lib/command.php:471
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#. TRANS: Message given if content is too long.
+#. TRANS: Message given if content is too long. %1$sd is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:491 lib/xmppmanager.php:403
+#: lib/command.php:488
 #, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+msgid "Message too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:516
+#, fuzzy
+msgid "Error sending direct message."
+msgstr "שגיאה ביצירת שם המשתמש."
+
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:553
+#, fuzzy, php-format
+msgid "Notice from %s repeated."
+msgstr "הודעות"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:557
+#: lib/command.php:556
 msgid "Error repeating notice."
 msgstr "שגיאה ביצירת שם המשתמש."
 
-#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:592
+#: lib/command.php:591
 #, php-format
-msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:604
+#, fuzzy, php-format
+msgid "Reply to %s sent."
+msgstr "תגובת עבור %s"
+
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:607
+#, fuzzy
+msgid "Error saving notice."
+msgstr "בעיה בשמירת ההודעה."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:655
+#: lib/command.php:654
 msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:663
+#, fuzzy
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "לא שלחנו אלינו את הפרופיל הזה"
+
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:672
+#: lib/command.php:671
 #, php-format
 msgid "Subscribed to %s."
 msgstr ""
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:694 lib/command.php:804
+#: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:705
+#: lib/command.php:703
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:724 lib/command.php:750
+#: lib/command.php:723 lib/command.php:749
 msgid "Command not yet implemented."
 msgstr ""
 
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:727
+#, fuzzy
+msgid "Notification off."
+msgstr "אין קוד אישור."
+
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:731
+#: lib/command.php:730
 msgid "Can't turn off notification."
 msgstr ""
 
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:753
+#, fuzzy
+msgid "Notification on."
+msgstr "אין קוד אישור."
+
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:757
+#: lib/command.php:756
 msgid "Can't turn on notification."
 msgstr ""
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:771
+#: lib/command.php:770
 msgid "Login command is disabled."
 msgstr ""
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:784
+#: lib/command.php:783
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:813
+#: lib/command.php:812
 #, php-format
 msgid "Unsubscribed %s."
 msgstr ""
 
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:830
+#, fuzzy
+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:836
+#: lib/command.php:835
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "לא שלחנו אלינו את הפרופיל הזה"
 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
+#, fuzzy
+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:863
+#: lib/command.php:862
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "הרשמה מרוחקת"
 msgstr[1] "הרשמה מרוחקת"
 
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:884
+#, fuzzy
+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:890
+#: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "לא שלחנו אלינו את הפרופיל הזה"
 msgstr[1] "לא שלחנו אלינו את הפרופיל הזה"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
-#: lib/command.php:905
+#: lib/command.php:904
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -3768,64 +7676,142 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:136
-msgid "I looked for configuration files in the following places: "
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#: lib/common.php:150
+msgid "No configuration file found."
 msgstr ""
 
-#: lib/common.php:138
+#. 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:153
+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:156
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:139
+#. 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:160
 msgid "Go to the installer."
 msgstr ""
 
-#: lib/connectsettingsaction.php:110
+#. TRANS: Menu item for Instant Messaging settings.
+#: lib/connectsettingsaction.php:106
+msgctxt "MENU"
 msgid "IM"
 msgstr ""
 
-#: lib/connectsettingsaction.php:111
+#. TRANS: Tooltip for Instant Messaging menu item.
+#: lib/connectsettingsaction.php:108
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: lib/connectsettingsaction.php:116
+#. 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 ""
 
-#: lib/connectsettingsaction.php:121
+#. 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:60
+#: lib/dberroraction.php:59
 msgid "Database error"
 msgstr ""
 
-#: lib/designsettings.php:418
+#. 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:104
+#, fuzzy
+msgid "Upload file"
+msgstr "ההעלה"
+
+#. TRANS: Instructions for form on profile design page.
+#: lib/designsettings.php:109
+#, fuzzy
+msgid ""
+"You can upload your personal background image. The maximum file size is 2MB."
+msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות."
+
+#. 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 ""
+
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: lib/designsettings.php:264
+msgctxt "BUTTON"
+msgid "Reset"
+msgstr ""
+
+#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
+#: lib/designsettings.php:433
 msgid "Design defaults restored."
 msgstr ""
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr ""
 
-#: lib/feed.php:85
+#: lib/favorform.php:114 lib/favorform.php:143
+#, fuzzy
+msgid "Favor this notice"
+msgstr "אין הודעה כזו."
+
+#: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr ""
 
-#: lib/feed.php:87
+#: lib/feed.php:86
 msgid "RSS 2.0"
 msgstr ""
 
-#: lib/feed.php:89
+#: lib/feed.php:88
 msgid "Atom"
 msgstr ""
 
-#: lib/feed.php:91
+#: lib/feed.php:90
 msgid "FOAF"
 msgstr ""
 
-#: lib/feedlist.php:64
-msgid "Export data"
+#: 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:121
@@ -3857,11 +7843,42 @@ msgstr ""
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:187
-#, php-format
-msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+#: lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1 עד 64 אותיות אנגליות קטנות או מספרים, ללא סימני פיסוק או רווחים."
+
+#: lib/groupeditform.php:163
+msgid "URL of the homepage or blog of the group or topic."
 msgstr ""
 
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "תאר את עצמך ואת נושאי העניין שלך ב-140 אותיות"
+
+#: lib/groupeditform.php:170
+#, 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:182
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\"."
+msgstr ""
+
+#: lib/groupeditform.php:190
+#, php-format
+msgid ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+msgstr[1] ""
+
 #. TRANS: Menu item in the group navigation page.
 #: lib/groupnav.php:86
 msgctxt "MENU"
@@ -3934,15 +7951,19 @@ 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 ""
 
-#: lib/grouptagcloudsection.php:56
+#. 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 ""
@@ -3956,30 +7977,53 @@ msgstr "עמוד זה אינו זמין בסוג מדיה שאתה יכול לק
 msgid "Unsupported image file format."
 msgstr "פורמט התמונה אינו נתמך."
 
-#: lib/imagefile.php:93
+#. 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:90
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "זה ארוך מידי. אורך מירבי להודעה הוא 140 אותיות."
+
+#: lib/imagefile.php:95
 msgid "Partial upload."
 msgstr "העלאה חלקית."
 
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:101 lib/mediafile.php:179
-msgid "System error uploading file."
-msgstr "שגיאת מערכת בהעלאת הקובץ."
-
-#: lib/imagefile.php:109
+#: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
 msgstr "זהו לא קובץ תמונה, או שחל בו שיבוש."
 
-#: lib/imagefile.php:163 lib/imagefile.php:224
+#: lib/imagefile.php:160
+#, fuzzy
+msgid "Lost our file."
+msgstr "אין הודעה כזו."
+
+#: lib/imagefile.php:197 lib/imagefile.php:237
 msgid "Unknown file type"
 msgstr ""
 
-#: lib/imagefile.php:244
-msgid "MB"
-msgstr ""
+#. TRANS: Number of megabytes. %d is the number.
+#: lib/imagefile.php:283
+#, php-format
+msgid "%dMB"
+msgid_plural "%dMB"
+msgstr[0] ""
+msgstr[1] ""
 
-#: lib/imagefile.php:246
-msgid "kB"
-msgstr ""
+#. TRANS: Number of kilobytes. %d is the number.
+#: lib/imagefile.php:287
+#, php-format
+msgid "%dkB"
+msgid_plural "%dkB"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Number of bytes. %d is the number.
+#: lib/imagefile.php:290
+#, php-format
+msgid "%dB"
+msgid_plural "%dB"
+msgstr[0] ""
+msgstr[1] ""
 
 #: lib/jabber.php:387
 #, php-format
@@ -3991,45 +8035,101 @@ msgstr ""
 msgid "Unknown inbox source %d."
 msgstr ""
 
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "שמור"
+
+#: lib/logingroupnav.php:80
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "שם המשתמש או הסיסמה לא חוקיים"
+
+#: lib/logingroupnav.php:86
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "צור חשבון חדש"
+
+#. TRANS: Subject for address confirmation email.
+#: lib/mail.php:174
+#, fuzzy
+msgid "Email address confirmation"
+msgstr "שגיאה בשמירת אישור הכתובת."
+
 #. TRANS: Body for address confirmation email.
-#: lib/mail.php:177
+#. 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:179
 #, php-format
 msgid ""
-"Hey, %s.\n"
+"Hey, %1$s.\n"
 "\n"
-"Someone just entered this email address on %s.\n"
+"Someone just entered this email address on %2$s.\n"
 "\n"
 "If it was you, and you want to confirm your entry, use the URL below:\n"
 "\n"
-"\t%s\n"
+"\t%3$s\n"
 "\n"
 "If not, just ignore this message.\n"
 "\n"
 "Thanks for your time, \n"
-"%s\n"
+"%2$s\n"
 msgstr ""
 
-#. TRANS: Subject of new-subscriber notification e-mail
-#: lib/mail.php:243
+#. 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:246
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s כעת מאזין להודעות שלך ב-%2$s"
 
-#: lib/mail.php:248
+#. 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:253
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
 "your subscribers list and report as spam to site administrators at %s"
 msgstr ""
 
-#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:304
+#. TRANS: Main body of new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename,
+#. 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:263
+#, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%2$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %7$s\n"
+msgstr ""
+
+#. TRANS: Profile info line in new-subscriber notification e-mail.
+#. TRANS: %s is biographical information.
+#: lib/mail.php:286
+#, fuzzy, 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:315
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
 
-#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:308
+#. 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:321
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -4039,23 +8139,40 @@ msgid ""
 "More email instructions at %3$s.\n"
 "\n"
 "Faithfully yours,\n"
-"%4$s"
+"%1$s"
 msgstr ""
 
-#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:463
+#. TRANS: Subject line for SMS-by-email notification messages.
+#. TRANS: %s is the posting user's nickname.
+#: lib/mail.php:442
+#, fuzzy, php-format
+msgid "%s status"
+msgstr "הסטטוס של %1$s ב-%2$s "
+
+#. TRANS: Subject line for SMS-by-email address confirmation message.
+#: lib/mail.php:468
+#, 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:472
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
 
-#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:484
+#. TRANS: Subject for 'nudge' notification email.
+#. TRANS: %s is the nudging user.
+#: lib/mail.php:493
 #, php-format
 msgid "You've been nudged by %s"
 msgstr ""
 
-#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:489
+#. 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:500
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -4071,14 +8188,18 @@ msgid ""
 "%4$s\n"
 msgstr ""
 
-#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:536
+#. TRANS: Subject for direct-message notification email.
+#. TRANS: %s is the sending user's nickname.
+#: lib/mail.php:547
 #, php-format
 msgid "New private message from %s"
 msgstr ""
 
-#. TRANS: Body for direct-message notification email
-#: lib/mail.php:541
+#. TRANS: Body for direct-message notification email.
+#. 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:555
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -4097,8 +8218,19 @@ msgid ""
 "%5$s\n"
 msgstr ""
 
-#. TRANS: Body for favorite notification email
-#: lib/mail.php:592
+#. 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:607
+#, php-format
+msgid "%1$s (@%2$s) added your notice as a favorite"
+msgstr ""
+
+#. 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,
+#. 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:614
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -4120,7 +8252,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:651
+#: lib/mail.php:672
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -4128,13 +8260,20 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: lib/mail.php:657
+#. 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:680
 #, php-format
-msgid "%s (@%s) sent a notice to your attention"
+msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
 
 #. TRANS: Body of @-reply notification e-mail.
-#: lib/mail.php:660
+#. TRANS: %1$s is the sending user's long name, $2$s is the StatusNet sitename,
+#. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
+#. 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:688
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -4171,66 +8310,61 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:228 lib/noticelist.php:506
+#: lib/mailbox.php:228 lib/noticelist.php:522
 msgid "from"
 msgstr ""
 
+#: lib/mailhandler.php:37
+#, fuzzy
+msgid "Could not parse message."
+msgstr "עידכון המשתמש נכשל."
+
+#: lib/mailhandler.php:42
+#, fuzzy
+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
+#, 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:99 lib/mediafile.php:125
+#: 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 an uploaded file is larger than set in php.ini.
-#: lib/mediafile.php:145
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
-
-#. TRANS: Client exception.
-#: lib/mediafile.php:151
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
-msgstr ""
-
-#. TRANS: Client exception.
-#: lib/mediafile.php:157
-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.
-#: lib/mediafile.php:165
-msgid "Missing a temporary folder."
-msgstr ""
-
-#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: lib/mediafile.php:169
-msgid "Failed to write file to disk."
-msgstr ""
-
-#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: lib/mediafile.php:173
-msgid "File upload stopped by extension."
-msgstr ""
-
 #. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
-#: lib/mediafile.php:189 lib/mediafile.php:232
+#: 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:209 lib/mediafile.php:251
+#: 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 "עידכון המשתמש נכשל."
+
 #. 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:340
+#: lib/mediafile.php:396
 #, php-format
 msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
@@ -4239,7 +8373,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown trying to upload a forbidden MIME type.
 #. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:345
+#: lib/mediafile.php:401
 #, php-format
 msgid "\"%s\" is not a supported file type on this server."
 msgstr ""
@@ -4248,10 +8382,54 @@ msgstr ""
 msgid "Send a direct notice"
 msgstr ""
 
-#: lib/messageform.php:146
+#. 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:166 lib/noticeform.php:186
+#, fuzzy
+msgid "Available characters"
+msgstr "לפחות 6 אותיות"
+
+#: lib/messageform.php:185 lib/noticeform.php:237
+#, fuzzy
+msgctxt "Send button for sending notice"
+msgid "Send"
+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."
+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
+#, fuzzy
+msgid "Send a notice"
+msgstr "הודעה חדשה"
+
 #: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
@@ -4265,48 +8443,79 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
+#: lib/noticeform.php:213
+#, fuzzy
+msgid "Share my location"
+msgstr "שמירת הפרופיל נכשלה."
+
+#: lib/noticeform.php:216
+#, fuzzy
+msgid "Do not share my location"
+msgstr "שמירת הפרופיל נכשלה."
+
 #: lib/noticeform.php:217
 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
+#, fuzzy
+msgid "N"
+msgstr "לא"
+
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:438
+#: lib/noticelist.php:454
 msgid "S"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:440
+#: lib/noticelist.php:456
 msgid "E"
 msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:442
+#: lib/noticelist.php:458
 msgid "W"
 msgstr ""
 
-#: lib/noticelist.php:444
+#: lib/noticelist.php:460
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:453
+#: lib/noticelist.php:469
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:518
 msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:584
+#, fuzzy
+msgid "in context"
+msgstr "אין תוכן!"
+
+#: lib/noticelist.php:619
+#, fuzzy
+msgid "Repeated by"
+msgstr "צור"
+
+#: lib/noticelist.php:646
 msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:631
+#: lib/noticelist.php:647
 msgid "Reply"
 msgstr "תגובות"
 
+#: lib/noticelist.php:691
+#, fuzzy
+msgid "Notice repeated"
+msgstr "הודעות"
+
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr ""
@@ -4319,58 +8528,63 @@ msgstr ""
 msgid "Send a nudge to this user"
 msgstr ""
 
-#: lib/oauthstore.php:283
+#: lib/oauthstore.php:294
 msgid "Error inserting new profile."
 msgstr ""
 
-#: lib/oauthstore.php:291
+#: lib/oauthstore.php:302
 msgid "Error inserting avatar."
 msgstr ""
 
-#: lib/oauthstore.php:311
+#: 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:346
+#: lib/oauthstore.php:362
 msgid "Duplicate notice."
 msgstr ""
 
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
 msgstr "הכנסת מנוי חדש נכשלה."
 
-#: lib/personalgroupnav.php:99
+#: lib/personalgroupnav.php:102
 msgid "Personal"
 msgstr "אישי"
 
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:107
 msgid "Replies"
 msgstr "תגובות"
 
-#: lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:117
 msgid "Favorites"
 msgstr "מועדפים"
 
-#: lib/personalgroupnav.php:125
+#: lib/personalgroupnav.php:128
 msgid "Inbox"
 msgstr ""
 
-#: lib/personalgroupnav.php:126
+#: lib/personalgroupnav.php:129
 msgid "Your incoming messages"
 msgstr ""
 
-#: lib/personalgroupnav.php:130
+#: lib/personalgroupnav.php:133
 msgid "Outbox"
 msgstr ""
 
+#: lib/personalgroupnav.php:134
+#, fuzzy
+msgid "Your sent messages"
+msgstr "הודעה חדשה"
+
 #: 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:116
+#: lib/plugin.php:121
 msgid "Unknown"
 msgstr ""
 
@@ -4386,6 +8600,16 @@ msgstr "כל המנויים"
 msgid "Subscribers"
 msgstr "מנויים"
 
+#: lib/profileaction.php:161
+#, fuzzy
+msgid "All subscribers"
+msgstr "מנויים"
+
+#: lib/profileaction.php:191
+#, fuzzy
+msgid "User ID"
+msgstr "מתשמש"
+
 #: lib/profileaction.php:196
 msgid "Member since"
 msgstr "חבר מאז"
@@ -4395,6 +8619,11 @@ msgstr "חבר מאז"
 msgid "Daily average"
 msgstr ""
 
+#: lib/profileaction.php:264
+#, fuzzy
+msgid "All groups"
+msgstr "קבוצות"
+
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
@@ -4415,29 +8644,73 @@ msgstr ""
 msgid "Featured"
 msgstr ""
 
+#: lib/publicgroupnav.php:92
+#, fuzzy
+msgid "Popular"
+msgstr "אנשים"
+
+#: lib/redirectingaction.php:95
+#, fuzzy
+msgid "No return-to arguments."
+msgstr "אין מסמך כזה."
+
+#: lib/repeatform.php:107
+#, fuzzy
+msgid "Repeat this notice?"
+msgstr "אין הודעה כזו."
+
 #: lib/repeatform.php:132
 msgid "Yes"
 msgstr "כן"
 
-#: lib/router.php:709
-msgid "No single user defined for single-user mode."
+#: lib/repeatform.php:132
+#, fuzzy
+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:974
+msgid "Page not found."
 msgstr ""
 
 #: lib/sandboxform.php:67
 msgid "Sandbox"
 msgstr ""
 
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "אין משתמש כזה."
+
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "חיפוש"
+
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
-#: lib/searchaction.php:129
+#: lib/searchaction.php:128
 msgid "Keyword(s)"
 msgstr ""
 
+#. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
 msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
+#, fuzzy
+msgid "Search help"
+msgstr "חיפוש"
+
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "אנשים"
@@ -4462,6 +8735,26 @@ msgstr ""
 msgid "More..."
 msgstr ""
 
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "הודעה חדשה"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "אין משתמש כזה."
+
+#: lib/subgroupnav.php:83
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "הרשמה מרוחקת"
+
+#: lib/subgroupnav.php:91
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "הרשמה מרוחקת"
+
 #: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
@@ -4486,6 +8779,16 @@ msgstr ""
 msgid "People Tagcloud as tagged"
 msgstr ""
 
+#: lib/tagcloudsection.php:56
+#, fuzzy
+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 ""
@@ -4494,92 +8797,155 @@ msgstr ""
 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 bytes uncompressed."
-msgstr ""
+msgid "Uploaded theme is too large; must be less than %d byte uncompressed."
+msgid_plural ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr[0] ""
+msgstr[1] ""
 
-#: lib/themeuploader.php:178
+#: lib/themeuploader.php:179
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr ""
 
-#: lib/themeuploader.php:218
+#: lib/themeuploader.php:219
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 
-#: lib/themeuploader.php:224
+#: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
 msgstr ""
 
-#: lib/themeuploader.php:241
+#: lib/themeuploader.php:242
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
+#: lib/themeuploader.php:260
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "שגיאה בעדכון פרופיל מרוחק"
+
 #: 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
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "אין משתמש כזה."
+
 #: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr ""
 
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "אין משתמש כזה."
+
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+#, fuzzy
+msgid "Unsubscribe from this user"
+msgstr "לא שלחנו אלינו את הפרופיל הזה"
+
 #: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "בטל מנוי"
 
-#: lib/userprofile.php:234 lib/userprofile.php:248
+#. 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:119
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "תמונה"
+
+#: lib/userprofile.php:236 lib/userprofile.php:250
 msgid "User actions"
 msgstr ""
 
-#: lib/userprofile.php:237
+#: lib/userprofile.php:239
 msgid "User deletion in progress..."
 msgstr ""
 
-#: lib/userprofile.php:264
+#: lib/userprofile.php:265
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "הגדרות הפרופיל"
+
+#: lib/userprofile.php:266
 msgid "Edit"
 msgstr ""
 
-#: lib/userprofile.php:287
+#: lib/userprofile.php:289
 msgid "Send a direct message to this user"
 msgstr ""
 
-#: lib/userprofile.php:326
+#: lib/userprofile.php:290
+#, fuzzy
+msgid "Message"
+msgstr "הודעה חדשה"
+
+#: lib/userprofile.php:331
 msgid "Moderate"
 msgstr ""
 
-#: lib/userprofile.php:366
+#: lib/userprofile.php:369
+#, fuzzy
+msgid "User role"
+msgstr "למשתמש אין פרופיל."
+
+#: lib/userprofile.php:371
 msgctxt "role"
 msgid "Administrator"
 msgstr ""
 
-#: lib/userprofile.php:367
+#: lib/userprofile.php:372
 msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: 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:1106
+#: 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:1110
+#: lib/util.php:1313
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -4587,12 +8953,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1113
+#: 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:1117
+#: lib/util.php:1320
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -4600,12 +8966,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1120
+#: 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:1124
+#: lib/util.php:1327
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -4613,12 +8979,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1127
+#: 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:1131
+#: lib/util.php:1334
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -4626,11 +8992,49 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1134
+#: lib/util.php:1337
 msgid "about a year ago"
 msgstr "לפני כשנה"
 
-#: lib/webcolor.php:123
+#: lib/webcolor.php:80
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "לאתר הבית יש כתובת לא חוקית."
+
+#. TRANS: Validation error for a web colour.
+#. TRANS: %s is the provided (invalid) text for colour.
+#: lib/webcolor.php:120
 #, php-format
-msgid "%s is not a valid color! Use 3 or 6 hex chars."
+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:64
+msgid "Invalid XML."
+msgstr ""
+
+#. TRANS: Exception.
+#: lib/xrd.php:69
+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 ""
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index 3f07a3a471..e2af6f23a3 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-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:34:53+0000\n"
+"POT-Creation-Date: 2011-01-15 00:20+0000\n"
+"PO-Revision-Date: 2011-01-15 00:22: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 (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80364); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 00:06:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1448,13 +1448,13 @@ msgid "Backup account"
 msgstr "Facer un copia de reserva del conto"
 
 #: actions/backupaccount.php:80
-#, fuzzy
 msgid "Only logged-in users can backup their account."
-msgstr "Solmente usatores authenticate pote repeter notas."
+msgstr ""
+"Solmente usatores authenticate pote facer un copia de reserva de lor conto."
 
 #: actions/backupaccount.php:84
 msgid "You may not backup your account."
-msgstr ""
+msgstr "Tu non pote facer un copia de reserva de tu conto."
 
 #: actions/backupaccount.php:232
 msgid ""
@@ -1464,16 +1464,20 @@ msgid ""
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
+"Tu pote facer un copia de reserva de tu conto in le formato <a href=\"http://"
+"activitystrea.ms/\">Activity Streams</a>. Isto es un function experimental "
+"que forni un copia de reserva incomplete; le informationes private del conto "
+"como adresses de e-mail e de messageria instantanee non es copiate. In "
+"addition, le files incargate e le messages directe non es copiate."
 
 #: actions/backupaccount.php:255
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
-msgstr "Fundo"
+msgstr "Copia de reserva"
 
 #: actions/backupaccount.php:258
 msgid "Backup your account"
-msgstr ""
+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
@@ -1682,20 +1686,18 @@ 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 "Solmente usatores authenticate pote repeter notas."
+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
-#, fuzzy
 msgid "You cannot delete your account."
-msgstr "Tu non pote deler usatores."
+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 ""
+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.
@@ -1706,15 +1708,13 @@ msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
 #: actions/deleteaccount.php:206
-#, fuzzy
 msgid "Account deleted."
-msgstr "Avatar delite."
+msgstr "Conto delite."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #: actions/deleteaccount.php:228 actions/profilesettings.php:474
-#, fuzzy
 msgid "Delete account"
-msgstr "Crear un conto"
+msgstr "Deler conto"
 
 #. TRANS: Form text for user deletion form.
 #: actions/deleteaccount.php:279
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 6cb1944ed1..8d606109ec 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-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:11+0000\n"
+"POT-Creation-Date: 2011-01-15 00:20+0000\n"
+"PO-Revision-Date: 2011-01-15 00:22: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-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80364); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 00:06:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1308,15 +1308,15 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Profile %1$d not subscribed to profile %2$d"
-msgstr "Profiel %d is niet geabonneerd op profiel %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
-#, fuzzy
 msgid "Cannot delete someone else's subscription"
-msgstr "Het is niet mogelijk het abonnement van iemand anders te verwijderen"
+msgstr ""
+"Het is niet mogelijk het abonnement van een andere gebruiker op te zeggen."
 
 #: actions/atompubsubscriptionfeed.php:150
 #, php-format
@@ -1481,17 +1481,16 @@ msgid ""
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
-"U kunt een back-up van uw gebruikersgegevens maken in de indeling <a href="
-"\"http://activitystrea.ms/\">Activity Streams</a>. Dit is een experimentele "
-"functie en deze lervert een onvolledige back-up; privégegevens van de "
-"gebruiker zoals e-mailadres en IM-adres worden niet in de back-up "
-"meegenomen. Daarnaast maken geüploade bestanden en directe berichten geen "
-"onderdeel van de back-up uit."
+"U kunt een reservekopie van uw gebruikersgegevens maken in de indeling <a "
+"href=\"http://activitystrea.ms/\">Activity Streams</a>. Dit is een "
+"experimentele functie en levert een onvolledige reservekopie op; "
+"privégegevens van de gebruiker zoals e-mailadres en IM-adres worden niet "
+"meegenomen. Hetzelfde geldt voor geüploade bestanden en directe berichten."
 
 #: actions/backupaccount.php:255
 msgctxt "BUTTON"
 msgid "Backup"
-msgstr "Back-up"
+msgstr "Reservekopie"
 
 #: actions/backupaccount.php:258
 msgid "Backup your account"
@@ -1720,9 +1719,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "You must write  \"%s\" exactly in the box."
-msgstr "U moet \"Ik weet het zeker\" in het veld invoeren."
+msgstr "U moet de tekst \"%s\" precies in het veld overnemen."
 
 #. TRANS: Confirmation that a user account has been deleted.
 #: actions/deleteaccount.php:206
@@ -1736,23 +1735,22 @@ msgstr "Gebruiker verwijderen"
 
 #. TRANS: Form text for user deletion form.
 #: actions/deleteaccount.php:279
-#, fuzzy
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
 msgstr ""
-"<p>Hiermee wordt uw gebruiker <strong>permanent verwijderd</strong> van deze "
-"server.</p>"
+"Hiermee wordt uw gebruiker <strong>permanent verwijderd</strong> van deze "
+"server."
 
 #. 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
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
 "deletion."
 msgstr ""
-"We adviseren u om een <a href=\"%s\">back-up van uw gegevens te maken</a> "
+"We raden u aan een <a href=\"%s\">reservekopie van uw gegevens te maken</a> "
 "alvorens uw gebruiker te verwijderen."
 
 #. TRANS: Field label for delete account confirmation entry.
@@ -1764,17 +1762,16 @@ msgstr "Bevestigen"
 #. 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 ""
-"Voer \"Ik weet het zeker.\" in om te bevestigen dat u uw gebruiker wilt "
-"verwijderen."
+"Voer de volgende tekst in om aan te geven dat u uw gebruiker wilt "
+"verwijderen: \"%s\"."
 
 #. TRANS: Button title for user account deletion.
 #: actions/deleteaccount.php:323
-#, fuzzy
 msgid "Permanently delete your account"
-msgstr "Uw gebruikers permanent verwijderen"
+msgstr "Uw gebruiker permanent verwijderen"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 #: actions/deleteapplication.php:62
@@ -4939,7 +4936,6 @@ 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
-#, fuzzy
 msgid "Not an Atom feed."
 msgstr "Dit is geen Atomfeed."
 
@@ -7045,22 +7041,22 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown verb: \"%s\"."
-msgstr "De taal \"%s\" is niet bekend."
+msgstr "Onbekend werkwoord: \"%s\"."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
 #: lib/activityimporter.php:107
-#, fuzzy
 msgid "Cannot force subscription for untrusted user."
 msgstr ""
-"Het is niet mogelijk een niet-vertrouwde gebruiker te dwingen te abonneren."
+"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
-#, fuzzy
 msgid "Cannot force remote user to subscribe."
-msgstr "Geef de naam op van de gebruiker waarop u zich wilt abonneren."
+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
@@ -7070,32 +7066,31 @@ 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 ""
+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 ""
+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
-#, fuzzy
 msgid "User is already a member of this group."
-msgstr "U bent al lid van die groep."
+msgstr "De gebruiker is al lid van deze groep."
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
 #: lib/activityimporter.php:207
-#, fuzzy
 msgid "Not overwriting author info for non-trusted user."
 msgstr ""
-"Het is niet mogelijk een niet-vertrouwde gebruiker te dwingen te abonneren."
+"De auteursgegevens voor de niet-vertrouwde gebruiker worden niet "
+"overschreven."
 
 #. 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 "Geen inhoud voor mededeling %d."
+msgstr "Geen inhoud voor mededeling %s."
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7383,13 +7378,11 @@ msgid "Revoke"
 msgstr "Intrekken"
 
 #: lib/atom10feed.php:113
-#, fuzzy
 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
-#, fuzzy
 msgid "Do not use this method!"
 msgstr "Gebruik deze methode niet!"
 
@@ -9283,7 +9276,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."
-
-#, fuzzy
-#~ msgid "Already know about notice %s and  it's got a different author %s."
-#~ msgstr "De mededeling %1$s is al bekend en heeft een andere auteur %2$s."
diff --git a/plugins/Adsense/locale/he/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/he/LC_MESSAGES/Adsense.po
new file mode 100644
index 0000000000..e636877490
--- /dev/null
+++ b/plugins/Adsense/locale/he/LC_MESSAGES/Adsense.po
@@ -0,0 +1,101 @@
+# Translation of StatusNet - Adsense to Hebrew (עברית)
+# Expored from translatewiki.net
+#
+# Author: YaronSh
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Adsense\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-15 00:20+0000\n"
+"PO-Revision-Date: 2011-01-15 00:23: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:18:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80364); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: he\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 ""
+
+#: AdsensePlugin.php:209
+msgid "Plugin to add Google AdSense to StatusNet sites."
+msgstr ""
+
+#: adsenseadminpanel.php:52
+msgctxt "TITLE"
+msgid "AdSense"
+msgstr ""
+
+#: adsenseadminpanel.php:62
+msgid "AdSense settings for this StatusNet site"
+msgstr ""
+
+#: adsenseadminpanel.php:164
+msgid "Client ID"
+msgstr ""
+
+#: adsenseadminpanel.php:165
+msgid "Google client ID"
+msgstr ""
+
+#: 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 ""
+
+#: 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/pl/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/pl/LC_MESSAGES/Adsense.po
new file mode 100644
index 0000000000..9dcd7a99fa
--- /dev/null
+++ b/plugins/Adsense/locale/pl/LC_MESSAGES/Adsense.po
@@ -0,0 +1,102 @@
+# Translation of StatusNet - Adsense to Polish (Polski)
+# Expored from translatewiki.net
+#
+# Author: Raven
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Adsense\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-15 00:20+0000\n"
+"PO-Revision-Date: 2011-01-15 00:23:05+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:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80364); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pl\n"
+"X-Message-Group: #out-statusnet-plugin-adsense\n"
+"Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 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 ""
+
+#. 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 ""
+
+#: adsenseadminpanel.php:164
+msgid "Client ID"
+msgstr ""
+
+#: adsenseadminpanel.php:165
+msgid "Google client ID"
+msgstr ""
+
+#: 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 ""
+
+#: 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 "Skyscraper"
+
+#: 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/Gravatar/locale/br/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/br/LC_MESSAGES/Gravatar.po
new file mode 100644
index 0000000000..a78d768666
--- /dev/null
+++ b/plugins/Gravatar/locale/br/LC_MESSAGES/Gravatar.po
@@ -0,0 +1,72 @@
+# Translation of StatusNet - Gravatar to Breton (Brezhoneg)
+# Expored 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 - Gravatar\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-15 00:20+0000\n"
+"PO-Revision-Date: 2011-01-15 00:23: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-10 18:26:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80364); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: br\n"
+"X-Message-Group: #out-statusnet-plugin-gravatar\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: GravatarPlugin.php:60
+msgid "Set Gravatar"
+msgstr ""
+
+#: GravatarPlugin.php:63
+msgid "If you want to use your Gravatar image, click \"Add\"."
+msgstr ""
+
+#: GravatarPlugin.php:68
+msgid "Add"
+msgstr "Ouzhpennañ"
+
+#: GravatarPlugin.php:78
+msgid "Remove Gravatar"
+msgstr ""
+
+#: GravatarPlugin.php:81
+msgid "If you want to remove your Gravatar image, click \"Remove\"."
+msgstr ""
+
+#: GravatarPlugin.php:86
+msgid "Remove"
+msgstr "Dilemel"
+
+#: GravatarPlugin.php:91
+msgid "To use a Gravatar first enter in an email address."
+msgstr ""
+
+#: 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 ""
+
+#: GravatarPlugin.php:162
+msgid "Gravatar added."
+msgstr ""
+
+#: GravatarPlugin.php:180
+msgid "Gravatar removed."
+msgstr ""
+
+#: GravatarPlugin.php:200
+msgid ""
+"The Gravatar plugin allows users to use their <a href=\"http://www.gravatar."
+"com/\">Gravatar</a> with StatusNet."
+msgstr ""
diff --git a/plugins/Gravatar/locale/gl/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/gl/LC_MESSAGES/Gravatar.po
new file mode 100644
index 0000000000..534e5eb6bf
--- /dev/null
+++ b/plugins/Gravatar/locale/gl/LC_MESSAGES/Gravatar.po
@@ -0,0 +1,72 @@
+# Translation of StatusNet - Gravatar to Galician (Galego)
+# Expored from translatewiki.net
+#
+# Author: Toliño
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Gravatar\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-15 00:20+0000\n"
+"PO-Revision-Date: 2011-01-15 00:23: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-10 18:26:02+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80364); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: gl\n"
+"X-Message-Group: #out-statusnet-plugin-gravatar\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: GravatarPlugin.php:60
+msgid "Set Gravatar"
+msgstr ""
+
+#: GravatarPlugin.php:63
+msgid "If you want to use your Gravatar image, click \"Add\"."
+msgstr ""
+
+#: GravatarPlugin.php:68
+msgid "Add"
+msgstr "Engadir"
+
+#: GravatarPlugin.php:78
+msgid "Remove Gravatar"
+msgstr ""
+
+#: GravatarPlugin.php:81
+msgid "If you want to remove your Gravatar image, click \"Remove\"."
+msgstr ""
+
+#: GravatarPlugin.php:86
+msgid "Remove"
+msgstr "Eliminar"
+
+#: GravatarPlugin.php:91
+msgid "To use a Gravatar first enter in an email address."
+msgstr ""
+
+#: 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 ""
+
+#: GravatarPlugin.php:162
+msgid "Gravatar added."
+msgstr ""
+
+#: GravatarPlugin.php:180
+msgid "Gravatar removed."
+msgstr ""
+
+#: GravatarPlugin.php:200
+msgid ""
+"The Gravatar plugin allows users to use their <a href=\"http://www.gravatar."
+"com/\">Gravatar</a> with StatusNet."
+msgstr ""
diff --git a/plugins/Gravatar/locale/te/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/te/LC_MESSAGES/Gravatar.po
new file mode 100644
index 0000000000..f2e4d6eb4c
--- /dev/null
+++ b/plugins/Gravatar/locale/te/LC_MESSAGES/Gravatar.po
@@ -0,0 +1,72 @@
+# Translation of StatusNet - Gravatar to Telugu (తెలుగు)
+# Expored from translatewiki.net
+#
+# Author: Veeven
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Gravatar\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-15 00:20+0000\n"
+"PO-Revision-Date: 2011-01-15 00:23:49+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 (r80364); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: te\n"
+"X-Message-Group: #out-statusnet-plugin-gravatar\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: GravatarPlugin.php:60
+msgid "Set Gravatar"
+msgstr ""
+
+#: GravatarPlugin.php:63
+msgid "If you want to use your Gravatar image, click \"Add\"."
+msgstr ""
+
+#: GravatarPlugin.php:68
+msgid "Add"
+msgstr "చేర్చు"
+
+#: GravatarPlugin.php:78
+msgid "Remove Gravatar"
+msgstr ""
+
+#: GravatarPlugin.php:81
+msgid "If you want to remove your Gravatar image, click \"Remove\"."
+msgstr ""
+
+#: GravatarPlugin.php:86
+msgid "Remove"
+msgstr "తొలగించు"
+
+#: GravatarPlugin.php:91
+msgid "To use a Gravatar first enter in an email address."
+msgstr ""
+
+#: 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 ""
+
+#: GravatarPlugin.php:162
+msgid "Gravatar added."
+msgstr ""
+
+#: GravatarPlugin.php:180
+msgid "Gravatar removed."
+msgstr ""
+
+#: GravatarPlugin.php:200
+msgid ""
+"The Gravatar plugin allows users to use their <a href=\"http://www.gravatar."
+"com/\">Gravatar</a> with StatusNet."
+msgstr ""
diff --git a/plugins/OStatus/locale/zh_CN/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/zh_CN/LC_MESSAGES/OStatus.po
new file mode 100644
index 0000000000..cb9d05aaa2
--- /dev/null
+++ b/plugins/OStatus/locale/zh_CN/LC_MESSAGES/OStatus.po
@@ -0,0 +1,758 @@
+# Translation of StatusNet - OStatus to Simplified Chinese (‪中文(简体)‬)
+# Expored from translatewiki.net
+#
+# Author: ZhengYiFeng
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OStatus\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-15 00:20+0000\n"
+"PO-Revision-Date: 2011-01-15 00:24: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-01-14 13:21:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80364); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: zh-hans\n"
+"X-Message-Group: #out-statusnet-plugin-ostatus\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. 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 ""
+
+#. 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 ""
+
+#: 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>."
+msgstr ""
+
+#: classes/FeedSub.php:252
+msgid "Attempting to start PuSH subscription for feed with no hub."
+msgstr ""
+
+#: classes/FeedSub.php:282
+msgid "Attempting to end PuSH subscription for feed with no hub."
+msgstr ""
+
+#. TRANS: Server exception. %s is a URI.
+#: classes/Ostatus_profile.php:192
+#, php-format
+msgid "Invalid ostatus_profile state: both group and profile IDs set for %s."
+msgstr ""
+
+#. TRANS: Server exception. %s is a URI.
+#: classes/Ostatus_profile.php:195
+#, 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
+#, php-format
+msgid "Invalid actor passed to %1$s: %2$s."
+msgstr ""
+
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:378
+msgid ""
+"Invalid type passed to Ostatus_profile::notify. It must be XML string or "
+"Activity entry."
+msgstr ""
+
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:409
+msgid "Unknown feed format."
+msgstr ""
+
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:433
+msgid "RSS feed without a channel."
+msgstr ""
+
+#. TRANS: Client exception.
+#: classes/Ostatus_profile.php:479
+msgid "Can't handle that kind of post."
+msgstr ""
+
+#. TRANS: Client exception. %s is a source URI.
+#: classes/Ostatus_profile.php:537
+#, 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:572
+msgid "Show more"
+msgstr ""
+
+#. TRANS: Exception. %s is a profile URL.
+#: classes/Ostatus_profile.php:765
+#, php-format
+msgid "Could not reach profile page %s."
+msgstr ""
+
+#. TRANS: Exception. %s is a URL.
+#: classes/Ostatus_profile.php:823
+#, php-format
+msgid "Could not find a feed URL for profile page %s."
+msgstr ""
+
+#. TRANS: Feed sub exception.
+#: classes/Ostatus_profile.php:922
+msgid "Can't find enough profile information to make a feed."
+msgstr ""
+
+#. TRANS: Server exception. %s is a URL.
+#: classes/Ostatus_profile.php:986
+#, php-format
+msgid "Invalid avatar URL %s."
+msgstr ""
+
+#. TRANS: Server exception. %s is a URI.
+#: classes/Ostatus_profile.php:997
+#, php-format
+msgid "Tried to update avatar for unsaved remote profile %s."
+msgstr ""
+
+#. TRANS: Server exception. %s is a URL.
+#: classes/Ostatus_profile.php:1007
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr ""
+
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:1233
+msgid "Local user can't be referenced as remote."
+msgstr ""
+
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:1238
+msgid "Local group can't be referenced as remote."
+msgstr ""
+
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1290 classes/Ostatus_profile.php:1301
+msgid "Can't save local profile."
+msgstr ""
+
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1309
+msgid "Can't save OStatus profile."
+msgstr ""
+
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:1573 classes/Ostatus_profile.php:1601
+msgid "Not a valid webfinger address."
+msgstr ""
+
+#. TRANS: Exception. %s is a webfinger address.
+#: classes/Ostatus_profile.php:1683
+#, php-format
+msgid "Couldn't save profile for \"%s\"."
+msgstr ""
+
+#. TRANS: Exception. %s is a webfinger address.
+#: classes/Ostatus_profile.php:1702
+#, php-format
+msgid "Couldn't save ostatus_profile for \"%s\"."
+msgstr ""
+
+#. TRANS: Exception. %s is a webfinger address.
+#: classes/Ostatus_profile.php:1710
+#, php-format
+msgid "Couldn't find a valid profile for \"%s\"."
+msgstr ""
+
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1753
+msgid "Could not store HTML content of long post as file."
+msgstr ""
+
+#. TRANS: Client exception. %s is a HTTP status code.
+#: classes/HubSub.php:212
+#, php-format
+msgid "Hub subscriber verification returned HTTP %s."
+msgstr ""
+
+#. 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 ""
+
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: lib/salmonaction.php:43
+msgid "This method requires a POST."
+msgstr ""
+
+#. TRANS: Client error. Do not translate "application/magic-envelope+xml"
+#: lib/salmonaction.php:48
+msgid "Salmon requires \"application/magic-envelope+xml\"."
+msgstr ""
+
+#. TRANS: Client error.
+#: lib/salmonaction.php:58
+msgid "Salmon signature verification failed."
+msgstr ""
+
+#. TRANS: Client error.
+#: lib/salmonaction.php:70
+msgid "Salmon post must be an Atom entry."
+msgstr ""
+
+#. 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 ""
+
+#. TRANS: Exception.
+#: lib/discovery.php:110
+#, php-format
+msgid "Unable to find services for %s."
+msgstr ""
+
+#. TRANS: Exception.
+#: lib/magicenvelope.php:80
+msgid "Unable to locate signer public key."
+msgstr ""
+
+#. TRANS: Exception.
+#: lib/salmon.php:93
+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 "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 ""
+
+#. 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 ""
+"OStatus 用户的地址，例如 nickname@example.com 或 http://example.net/nickname"
+
+#. 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 ""
+
+#: 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
+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
+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
+msgid "Already subscribed!"
+msgstr ""
+
+#. TRANS: OStatus remote subscription dialog error.
+#: actions/ostatussub.php:322
+msgid "Remote subscription failed!"
+msgstr ""
+
+#: actions/ostatussub.php:369 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
+msgid "Subscribe to user"
+msgstr ""
+
+#. TRANS: Page title for OStatus remote subscription form
+#: actions/ostatussub.php:417
+msgid "Confirm"
+msgstr ""
+
+#. TRANS: Instructions.
+#: actions/ostatussub.php:429
+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:118
+msgid "User nickname"
+msgstr ""
+
+#: actions/ostatusinit.php:119
+msgid "Nickname of the user you want to follow."
+msgstr ""
+
+#. TRANS: Field label.
+#: actions/ostatusinit.php:124
+msgid "Profile Account"
+msgstr ""
+
+#. TRANS: Tooltip for field label "Profile Account".
+#: actions/ostatusinit.php:126
+msgid "Your account id (e.g. user@identi.ca)."
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/ostatusinit.php:148
+msgid "Must provide a remote profile."
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/ostatusinit.php:160
+msgid "Couldn't look up OStatus account profile."
+msgstr ""
+
+#. TRANS: Client error.
+#: actions/ostatusinit.php:173
+msgid "Couldn't confirm remote profile address."
+msgstr ""
+
+#. TRANS: Page title.
+#: actions/ostatusinit.php:218
+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/OpenX/locale/lb/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/lb/LC_MESSAGES/OpenX.po
new file mode 100644
index 0000000000..dfaa53f807
--- /dev/null
+++ b/plugins/OpenX/locale/lb/LC_MESSAGES/OpenX.po
@@ -0,0 +1,109 @@
+# Translation of StatusNet - OpenX to Luxembourgish (Lëtzebuergesch)
+# Expored from translatewiki.net
+#
+# Author: Robby
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OpenX\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-15 00:20+0000\n"
+"PO-Revision-Date: 2011-01-15 00:24:21+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:26:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80364); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: lb\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 ""
+
+#. TRANS: Menu item for site administration
+#: OpenXPlugin.php:203
+msgid "OpenX"
+msgstr ""
+
+#. TRANS: Plugin description.
+#: OpenXPlugin.php:224
+msgid "Plugin for <a href=\"http://www.openx.org/\">OpenX Ad Server</a>."
+msgstr ""
+
+#. TRANS: Page title for OpenX admin panel.
+#: openxadminpanel.php:53
+msgctxt "TITLE"
+msgid "OpenX"
+msgstr ""
+
+#. TRANS: Instructions for OpenX admin panel.
+#: openxadminpanel.php:64
+msgid "OpenX settings for this StatusNet site"
+msgstr ""
+
+#. TRANS: Form label in OpenX admin panel.
+#: openxadminpanel.php:167
+msgid "Ad script URL"
+msgstr ""
+
+#. 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 "Rechteck"
+
+#. 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 "Vertikale Banner"
+
+#. 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 "Späicheren"
+
+#. TRANS: Submit button title in OpenX admin panel.
+#: openxadminpanel.php:220
+msgid "Save OpenX settings"
+msgstr ""
diff --git a/plugins/OpenX/locale/tr/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/tr/LC_MESSAGES/OpenX.po
new file mode 100644
index 0000000000..0a45460c91
--- /dev/null
+++ b/plugins/OpenX/locale/tr/LC_MESSAGES/OpenX.po
@@ -0,0 +1,109 @@
+# Translation of StatusNet - OpenX to Turkish (Türkçe)
+# Expored from translatewiki.net
+#
+# Author: Maidis
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - OpenX\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-15 00:20+0000\n"
+"PO-Revision-Date: 2011-01-15 00:24: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-10 18:26:06+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80364); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: tr\n"
+"X-Message-Group: #out-statusnet-plugin-openx\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANS: Menu item title/tooltip
+#: OpenXPlugin.php:201
+msgid "OpenX configuration"
+msgstr "OpenX yapılandırması"
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANS: Form label in OpenX admin panel.
+#: openxadminpanel.php:167
+msgid "Ad script URL"
+msgstr ""
+
+#. 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 ""
+
+#. 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/Realtime/locale/ru/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/ru/LC_MESSAGES/Realtime.po
new file mode 100644
index 0000000000..48bdc20875
--- /dev/null
+++ b/plugins/Realtime/locale/ru/LC_MESSAGES/Realtime.po
@@ -0,0 +1,59 @@
+# Translation of StatusNet - Realtime to Russian (Русский)
+# Expored from translatewiki.net
+#
+# Author: Haffman
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Realtime\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-15 00:20+0000\n"
+"PO-Revision-Date: 2011-01-15 00:24:36+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 (r80364); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ru\n"
+"X-Message-Group: #out-statusnet-plugin-realtime\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: Text label for realtime view "play" button, usually replaced by an icon.
+#: RealtimePlugin.php:339
+msgctxt "BUTTON"
+msgid "Play"
+msgstr ""
+
+#. TRANS: Tooltip for realtime view "play" button.
+#: RealtimePlugin.php:341
+msgctxt "TOOLTIP"
+msgid "Play"
+msgstr ""
+
+#. TRANS: Text label for realtime view "pause" button
+#: RealtimePlugin.php:343
+msgctxt "BUTTON"
+msgid "Pause"
+msgstr ""
+
+#. TRANS: Tooltip for realtime view "pause" button
+#: RealtimePlugin.php:345
+msgctxt "TOOLTIP"
+msgid "Pause"
+msgstr "Пауза"
+
+#. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
+#: RealtimePlugin.php:347
+msgctxt "BUTTON"
+msgid "Pop up"
+msgstr ""
+
+#. TRANS: Tooltip for realtime view "popup" button.
+#: RealtimePlugin.php:349
+msgctxt "TOOLTIP"
+msgid "Pop up in a window"
+msgstr ""
diff --git a/plugins/SubMirror/locale/br/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/br/LC_MESSAGES/SubMirror.po
new file mode 100644
index 0000000000..989cb7c6f4
--- /dev/null
+++ b/plugins/SubMirror/locale/br/LC_MESSAGES/SubMirror.po
@@ -0,0 +1,135 @@
+# Translation of StatusNet - SubMirror to Breton (Brezhoneg)
+# Expored 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 - SubMirror\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-15 00:20+0000\n"
+"PO-Revision-Date: 2011-01-15 00:24: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:22:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80364); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: br\n"
+"X-Message-Group: #out-statusnet-plugin-submirror\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: SubMirrorPlugin.php:90
+msgid "Pull feeds into your timeline!"
+msgstr ""
+
+#. TRANS: SubMirror plugin menu item on user settings page.
+#: SubMirrorPlugin.php:109
+msgctxt "MENU"
+msgid "Mirroring"
+msgstr ""
+
+#. TRANS: SubMirror plugin tooltip for user settings menu item.
+#: SubMirrorPlugin.php:111
+msgid "Configure mirroring of posts from other feeds"
+msgstr ""
+
+#: lib/editmirrorform.php:83
+msgctxt "LABEL"
+msgid "Remote feed:"
+msgstr ""
+
+#: lib/editmirrorform.php:87
+msgctxt "LABEL"
+msgid "Local user"
+msgstr "Implijer lec'hel"
+
+#: 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 "Enrollañ"
+
+#: 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 ""
+
+#. 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 ""
+
+#: actions/basemirror.php:115
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: 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 "Nann-kevreet."
+
+#: actions/basemirror.php:156
+msgid "Subscribed"
+msgstr "Koumanantet"
+
+#: 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 ""
diff --git a/plugins/TwitterBridge/locale/ru/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/ru/LC_MESSAGES/TwitterBridge.po
new file mode 100644
index 0000000000..caeed05bdf
--- /dev/null
+++ b/plugins/TwitterBridge/locale/ru/LC_MESSAGES/TwitterBridge.po
@@ -0,0 +1,372 @@
+# Translation of StatusNet - TwitterBridge to Russian (Русский)
+# Expored from translatewiki.net
+#
+# Author: Lockal
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - TwitterBridge\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-15 00:20+0000\n"
+"PO-Revision-Date: 2011-01-15 00:24:58+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 (r80364); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ru\n"
+"X-Message-Group: #out-statusnet-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 ""
+
+#: twitter.php:407
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: twitter.php:411
+#, 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"
+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 "Войти или зарегистрироваться с помощью 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 ""
+
+#: 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:200
+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 ""
+
+#: twitterlogin.php:69
+msgid "Login with your Twitter account"
+msgstr "Войти с помощью учётной записи Twitter"
+
+#: twitterlogin.php:87
+msgid "Sign in with Twitter"
+msgstr ""
+
+#: twitterauthorization.php:120 twittersettings.php:226
+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
+#, 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 ""
+
+#: 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:386
+msgid "New nickname"
+msgstr ""
+
+#: twitterauthorization.php:388
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+
+#: twitterauthorization.php:391
+msgid "Create"
+msgstr ""
+
+#: twitterauthorization.php:396
+msgid "Connect existing account"
+msgstr ""
+
+#: twitterauthorization.php:398
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Twitter account."
+msgstr ""
+
+#: twitterauthorization.php:401
+msgid "Existing nickname"
+msgstr ""
+
+#: twitterauthorization.php:404
+msgid "Password"
+msgstr ""
+
+#: twitterauthorization.php:407
+msgid "Connect"
+msgstr ""
+
+#: twitterauthorization.php:423 twitterauthorization.php:432
+msgid "Registration not allowed."
+msgstr ""
+
+#: twitterauthorization.php:439
+msgid "Not a valid invitation code."
+msgstr ""
+
+#: twitterauthorization.php:452
+msgid "Nickname not allowed."
+msgstr ""
+
+#: twitterauthorization.php:457
+msgid "Nickname already in use. Try another one."
+msgstr ""
+
+#: twitterauthorization.php:472
+msgid "Error registering user."
+msgstr ""
+
+#: twitterauthorization.php:483 twitterauthorization.php:521
+#: twitterauthorization.php:541
+msgid "Error connecting user to Twitter."
+msgstr ""
+
+#: twitterauthorization.php:503
+msgid "Invalid username or password."
+msgstr ""
+
+#: twittersettings.php:58
+msgid "Twitter settings"
+msgstr ""
+
+#: twittersettings.php:69
+msgid ""
+"Connect your Twitter account to share your updates with your Twitter friends "
+"and vice-versa."
+msgstr ""
+
+#: twittersettings.php:116
+msgid "Twitter account"
+msgstr ""
+
+#: twittersettings.php:121
+msgid "Connected Twitter account"
+msgstr ""
+
+#: twittersettings.php:126
+msgid "Disconnect my account from Twitter"
+msgstr ""
+
+#: twittersettings.php:132
+msgid "Disconnecting your Twitter could make it impossible to log in! Please "
+msgstr ""
+
+#: twittersettings.php:136
+msgid "set a password"
+msgstr ""
+
+#: twittersettings.php:138
+msgid " first."
+msgstr ""
+
+#. TRANS: %1$s is the current website name.
+#: twittersettings.php:142
+#, 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
+msgid "Disconnect"
+msgstr ""
+
+#: twittersettings.php:157
+msgid "Preferences"
+msgstr ""
+
+#: twittersettings.php:161
+msgid "Automatically send my notices to Twitter."
+msgstr ""
+
+#: twittersettings.php:168
+msgid "Send local \"@\" replies to Twitter."
+msgstr ""
+
+#: twittersettings.php:175
+msgid "Subscribe to my Twitter friends here."
+msgstr ""
+
+#: twittersettings.php:184
+msgid "Import my friends timeline."
+msgstr ""
+
+#: twittersettings.php:202
+msgid "Add"
+msgstr "Добавить"
+
+#: twittersettings.php:236
+msgid "Unexpected form submission."
+msgstr ""
+
+#: twittersettings.php:251
+msgid "No Twitter connection to remove."
+msgstr ""
+
+#: twittersettings.php:259
+msgid "Couldn't remove Twitter user."
+msgstr "Ошибка при удалении пользователя Twitter."
+
+#: twittersettings.php:263
+msgid "Twitter account disconnected."
+msgstr "Учётная запись в Twitter отключена."
+
+#: twittersettings.php:283 twittersettings.php:294
+msgid "Couldn't save Twitter preferences."
+msgstr "Ошибка при сохранении настроек Twitter."
+
+#: twittersettings.php:302
+msgid "Twitter preferences saved."
+msgstr "Настройки Twitter сохранены."

From 7d1f609bf03c85371ee79ff3c87fffc0d30c5597 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 2 Jan 2011 10:21:52 -0800
Subject: [PATCH 056/314] Move discovery library from OStatus plugin to core

---
 {plugins/OStatus/lib => lib}/discovery.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {plugins/OStatus/lib => lib}/discovery.php (100%)

diff --git a/plugins/OStatus/lib/discovery.php b/lib/discovery.php
similarity index 100%
rename from plugins/OStatus/lib/discovery.php
rename to lib/discovery.php

From abf694ae5b7c9c0fc09dc60eb940f4210d9f8c78 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 2 Jan 2011 10:49:44 -0800
Subject: [PATCH 057/314] move linkheader.php to core

---
 lib/linkheader.php | 66 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 lib/linkheader.php

diff --git a/lib/linkheader.php b/lib/linkheader.php
new file mode 100644
index 0000000000..efa3f65ff3
--- /dev/null
+++ b/lib/linkheader.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * @todo Add file header and documentation.
+ */
+
+class LinkHeader
+{
+    var $href;
+    var $rel;
+    var $type;
+
+    function __construct($str)
+    {
+        preg_match('/^<[^>]+>/', $str, $uri_reference);
+        //if (empty($uri_reference)) return;
+
+        $this->href = trim($uri_reference[0], '<>');
+        $this->rel = array();
+        $this->type = null;
+
+        // remove uri-reference from header
+        $str = substr($str, strlen($uri_reference[0]));
+
+        // parse link-params
+        $params = explode(';', $str);
+
+        foreach ($params as $param) {
+            if (empty($param)) continue;
+            list($param_name, $param_value) = explode('=', $param, 2);
+            $param_name = trim($param_name);
+            $param_value = preg_replace('(^"|"$)', '', trim($param_value));
+
+            // for now we only care about 'rel' and 'type' link params
+            // TODO do something with the other links-params
+            switch ($param_name) {
+            case 'rel':
+                $this->rel = trim($param_value);
+                break;
+
+            case 'type':
+                $this->type = trim($param_value);
+            }
+        }
+    }
+
+    static function getLink($response, $rel=null, $type=null)
+    {
+        $headers = $response->getHeader('Link');
+        if ($headers) {
+            // Can get an array or string, so try to simplify the path
+            if (!is_array($headers)) {
+                $headers = array($headers);
+            }
+
+            foreach ($headers as $header) {
+                $lh = new LinkHeader($header);
+
+                if ((is_null($rel) || $lh->rel == $rel) &&
+                    (is_null($type) || $lh->type == $type)) {
+                    return $lh->href;
+                }
+            }
+        }
+        return null;
+    }
+}

From 0fa57948f221df7f42df3527da761f501719e336 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 2 Jan 2011 11:01:01 -0800
Subject: [PATCH 058/314] move linkheader.php to core

---
 plugins/OStatus/lib/linkheader.php | 66 ------------------------------
 1 file changed, 66 deletions(-)
 delete mode 100644 plugins/OStatus/lib/linkheader.php

diff --git a/plugins/OStatus/lib/linkheader.php b/plugins/OStatus/lib/linkheader.php
deleted file mode 100644
index efa3f65ff3..0000000000
--- a/plugins/OStatus/lib/linkheader.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * @todo Add file header and documentation.
- */
-
-class LinkHeader
-{
-    var $href;
-    var $rel;
-    var $type;
-
-    function __construct($str)
-    {
-        preg_match('/^<[^>]+>/', $str, $uri_reference);
-        //if (empty($uri_reference)) return;
-
-        $this->href = trim($uri_reference[0], '<>');
-        $this->rel = array();
-        $this->type = null;
-
-        // remove uri-reference from header
-        $str = substr($str, strlen($uri_reference[0]));
-
-        // parse link-params
-        $params = explode(';', $str);
-
-        foreach ($params as $param) {
-            if (empty($param)) continue;
-            list($param_name, $param_value) = explode('=', $param, 2);
-            $param_name = trim($param_name);
-            $param_value = preg_replace('(^"|"$)', '', trim($param_value));
-
-            // for now we only care about 'rel' and 'type' link params
-            // TODO do something with the other links-params
-            switch ($param_name) {
-            case 'rel':
-                $this->rel = trim($param_value);
-                break;
-
-            case 'type':
-                $this->type = trim($param_value);
-            }
-        }
-    }
-
-    static function getLink($response, $rel=null, $type=null)
-    {
-        $headers = $response->getHeader('Link');
-        if ($headers) {
-            // Can get an array or string, so try to simplify the path
-            if (!is_array($headers)) {
-                $headers = array($headers);
-            }
-
-            foreach ($headers as $header) {
-                $lh = new LinkHeader($header);
-
-                if ((is_null($rel) || $lh->rel == $rel) &&
-                    (is_null($type) || $lh->type == $type)) {
-                    return $lh->href;
-                }
-            }
-        }
-        return null;
-    }
-}

From 02cf7d47f8d70978d6c370141b15a79c08f87fef Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 2 Jan 2011 11:01:28 -0800
Subject: [PATCH 059/314] PHPCS discovery.php

---
 lib/discovery.php | 219 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 205 insertions(+), 14 deletions(-)

diff --git a/lib/discovery.php b/lib/discovery.php
index 905ece2ca5..c66790c1d9 100644
--- a/lib/discovery.php
+++ b/lib/discovery.php
@@ -3,7 +3,7 @@
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2010, StatusNet, Inc.
  *
- * A sample module to show best practices for StatusNet plugins
+ * Use Hammer discovery stack to find out interesting things about an URI
  *
  * PHP version 5
  *
@@ -20,6 +20,7 @@
  * 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  Discovery
  * @package   StatusNet
  * @author    James Walker <james@status.net>
  * @copyright 2010 StatusNet, Inc.
@@ -31,18 +32,33 @@
  * This class implements LRDD-based service discovery based on the "Hammer Draft"
  * (including webfinger)
  *
- * @see http://groups.google.com/group/webfinger/browse_thread/thread/9f3d93a479e91bbf
+ * @category  Discovery
+ * @package   StatusNet
+ * @author    James Walker <james@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ *
+ * @see       http://groups.google.com/group/webfinger/browse_thread/thread/9f3d93a479e91bbf
  */
+
 class Discovery
 {
-
-    const LRDD_REL = 'lrdd';
+    const LRDD_REL    = 'lrdd';
     const PROFILEPAGE = 'http://webfinger.net/rel/profile-page';
     const UPDATESFROM = 'http://schemas.google.com/g/2010#updates-from';
-    const HCARD = 'http://microformats.org/profile/hcard';
+    const HCARD       = 'http://microformats.org/profile/hcard';
 
     public $methods = array();
 
+    /**
+     * Constructor for a discovery object
+     *
+     * Registers different discovery methods.
+     *
+     * @return Discovery this
+     */
+
     public function __construct()
     {
         $this->registerMethod('Discovery_LRDD_Host_Meta');
@@ -50,6 +66,14 @@ class Discovery
         $this->registerMethod('Discovery_LRDD_Link_HTML');
     }
 
+    /**
+     * Register a discovery class
+     * 
+     * @param string $class Class name
+     *
+     * @return void
+     */
+
     public function registerMethod($class)
     {
         $this->methods[] = $class;
@@ -58,7 +82,12 @@ class Discovery
     /**
      * Given a "user id" make sure it's normalized to either a webfinger
      * acct: uri or a profile HTTP URL.
+     *
+     * @param string $user_id User ID to normalize
+     *
+     * @return string normalized acct: or http(s)?: URI
      */
+
     public static function normalize($user_id)
     {
         if (substr($user_id, 0, 5) == 'http:' ||
@@ -67,13 +96,23 @@ class Discovery
             return $user_id;
         }
 
-        if (strpos($user_id, '@') !== FALSE) {
+        if (strpos($user_id, '@') !== false) {
             return 'acct:' . $user_id;
         }
 
         return 'http://' . $user_id;
     }
 
+    /**
+     * Determine if a string is a Webfinger ID
+     *
+     * Webfinger IDs look like foo@example.com or acct:foo@example.com
+     *
+     * @param string $user_id ID to check
+     *
+     * @return boolean true if $user_id is a Webfinger, else false
+     */
+     
     public static function isWebfinger($user_id)
     {
         $uri = Discovery::normalize($user_id);
@@ -82,8 +121,13 @@ class Discovery
     }
 
     /**
-     * This implements the actual lookup procedure
+     * Given a user ID, return the first available XRD
+     *
+     * @param string $id User ID URI
+     *
+     * @return XRD XRD object for the user
      */
+
     public function lookup($id)
     {
         // Normalize the incoming $id to make sure we have a uri
@@ -107,10 +151,20 @@ class Discovery
         }
 
         // TRANS: Exception.
-        throw new Exception(sprintf(_m('Unable to find services for %s.'),$id));
+        throw new Exception(sprintf(_('Unable to find services for %s.'), $id));
     }
 
-    public static function getService($links, $service) {
+    /**
+     * Given an array of links, returns the matching service
+     *
+     * @param array  $links   Links to check
+     * @param string $service Service to find
+     *
+     * @return array $link assoc array representing the link
+     */
+
+    public static function getService($links, $service)
+    {
         if (!is_array($links)) {
             return false;
         }
@@ -122,6 +176,17 @@ class Discovery
         }
     }
 
+    /**
+     * Apply a template using an ID
+     *
+     * Replaces {uri} in template string with the ID given.
+     *
+     * @param string $template Template to match
+     * @param string $id       User ID to replace with
+     *
+     * @return string replaced values
+     */
+
     public static function applyTemplate($template, $id)
     {
         $template = str_replace('{uri}', urlencode($id), $template);
@@ -129,10 +194,18 @@ class Discovery
         return $template;
     }
 
+    /**
+     * Fetch an XRD file and parse
+     *
+     * @param string $url URL of the XRD
+     * 
+     * @return XRD object representing the XRD file
+     */
+
     public static function fetchXrd($url)
     {
         try {
-            $client = new HTTPClient();
+            $client   = new HTTPClient();
             $response = $client->get($url);
         } catch (HTTP_Request2_Exception $e) {
             return false;
@@ -146,13 +219,60 @@ class Discovery
     }
 }
 
+/**
+ * Abstract interface for discovery
+ *
+ * Objects that implement this interface can retrieve an array of
+ * XRD links for the URI.
+ *
+ * @category  Discovery
+ * @package   StatusNet
+ * @author    James Walker <james@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
 interface Discovery_LRDD
 {
+    /**
+     * Discover interesting info about the URI
+     *
+     * @param string $uri URI to inquire about
+     *
+     * @return array Links in the XRD file
+     */
+
     public function discover($uri);
 }
 
+/**
+ * Implementation of discovery using host-meta file
+ *
+ * Discovers XRD file for a user by going to the organization's
+ * host-meta file and trying to find a template for LRDD.
+ *
+ * @category  Discovery
+ * @package   StatusNet
+ * @author    James Walker <james@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 Discovery_LRDD_Host_Meta implements Discovery_LRDD
 {
+    /**
+     * Discovery core method
+     *
+     * For Webfinger and HTTP URIs, fetch the host-meta file
+     * and look for LRDD templates
+     *
+     * @param string $uri URI to inquire about
+     *
+     * @return array Links in the XRD file
+     */
+
     public function discover($uri)
     {
         if (Discovery::isWebfinger($uri)) {
@@ -176,12 +296,38 @@ class Discovery_LRDD_Host_Meta implements Discovery_LRDD
     }
 }
 
+/**
+ * Implementation of discovery using HTTP Link header
+ *
+ * Discovers XRD file for a user by fetching the URL and reading any
+ * Link: headers in the HTTP response.
+ *
+ * @category  Discovery
+ * @package   StatusNet
+ * @author    James Walker <james@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 Discovery_LRDD_Link_Header implements Discovery_LRDD
 {
+    /**
+     * Discovery core method
+     *
+     * For HTTP IDs fetch the URL and look for Link headers.
+     *
+     * @param string $uri URI to inquire about
+     *
+     * @return array Links in the XRD file
+     *
+     * @todo fail out of Webfinger URIs faster 
+     */
+
     public function discover($uri)
     {
         try {
-            $client = new HTTPClient();
+            $client   = new HTTPClient();
             $response = $client->get($uri);
         } catch (HTTP_Request2_Exception $e) {
             return false;
@@ -199,6 +345,14 @@ class Discovery_LRDD_Link_Header implements Discovery_LRDD
         return array(Discovery_LRDD_Link_Header::parseHeader($link_header));
     }
 
+    /**
+     * Given a string or array of headers, returns XRD-like assoc array
+     *
+     * @param string|array $header string or array of strings for headers
+     * 
+     * @return array Link header in XRD-like format
+     */
+
     protected static function parseHeader($header)
     {
         $lh = new LinkHeader($header);
@@ -209,12 +363,39 @@ class Discovery_LRDD_Link_Header implements Discovery_LRDD
     }
 }
 
+/**
+ * Implementation of discovery using HTML <link> element
+ *
+ * Discovers XRD file for a user by fetching the URL and reading any
+ * <link> elements in the HTML response.
+ *
+ * @category  Discovery
+ * @package   StatusNet
+ * @author    James Walker <james@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 Discovery_LRDD_Link_HTML implements Discovery_LRDD
 {
+    /**
+     * Discovery core method
+     *
+     * For HTTP IDs, fetch the URL and look for <link> elements
+     * in the HTML response.
+     *
+     * @param string $uri URI to inquire about
+     *
+     * @return array Links in XRD-ish assoc array
+     *
+     * @todo fail out of Webfinger URIs faster 
+     */
+
     public function discover($uri)
     {
         try {
-            $client = new HTTPClient();
+            $client   = new HTTPClient();
             $response = $client->get($uri);
         } catch (HTTP_Request2_Exception $e) {
             return false;
@@ -227,6 +408,16 @@ class Discovery_LRDD_Link_HTML implements Discovery_LRDD
         return Discovery_LRDD_Link_HTML::parse($response->getBody());
     }
 
+    /**
+     * Parse HTML and return <link> elements
+     *
+     * Given an HTML string, scans the string for <link> elements
+     *
+     * @param string $html HTML to scan
+     *
+     * @return array array of associative arrays in XRD-ish format
+     */
+
     public function parse($html)
     {
         $links = array();
@@ -237,8 +428,8 @@ class Discovery_LRDD_Link_HTML implements Discovery_LRDD
         preg_match_all('/<link\s[^>]*>/i', $head_html, $link_matches);
 
         foreach ($link_matches[0] as $link_html) {
-            $link_url = null;
-            $link_rel = null;
+            $link_url  = null;
+            $link_rel  = null;
             $link_type = null;
 
             preg_match('/\srel=(("|\')([^\\2]*?)\\2|[^"\'\s]+)/i', $link_html, $rel_matches);

From 0649b96e9b86e538c37c866fdc4b54b162f96932 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 2 Jan 2011 11:08:32 -0800
Subject: [PATCH 060/314] PHPCS linkheader.php

---
 lib/linkheader.php | 74 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 70 insertions(+), 4 deletions(-)

diff --git a/lib/linkheader.php b/lib/linkheader.php
index efa3f65ff3..a08fb67116 100644
--- a/lib/linkheader.php
+++ b/lib/linkheader.php
@@ -1,6 +1,51 @@
 <?php
 /**
- * @todo Add file header and documentation.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * Parse HTTP response for interesting Link: headers
+ *
+ * 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  Discovery
+ * @package   StatusNet
+ * @author    James Walker <james@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')) {
+    exit(1);
+}
+
+/**
+ * Class to represent Link: headers in an HTTP response
+ *
+ * Since these are a fairly important part of Hammer-stack discovery, they're
+ * reified and implemented here.
+ *
+ * @category  Discovery
+ * @package   StatusNet
+ * @author    James Walker <james@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ *
+ * @see       Discovery
  */
 
 class LinkHeader
@@ -9,13 +54,21 @@ class LinkHeader
     var $rel;
     var $type;
 
+    /**
+     * Initialize from a string
+     *
+     * @param string $str Link: header value
+     *
+     * @return LinkHeader self
+     */
+
     function __construct($str)
     {
         preg_match('/^<[^>]+>/', $str, $uri_reference);
         //if (empty($uri_reference)) return;
 
         $this->href = trim($uri_reference[0], '<>');
-        $this->rel = array();
+        $this->rel  = array();
         $this->type = null;
 
         // remove uri-reference from header
@@ -25,9 +78,12 @@ class LinkHeader
         $params = explode(';', $str);
 
         foreach ($params as $param) {
-            if (empty($param)) continue;
+            if (empty($param)) { 
+                continue;
+            }
             list($param_name, $param_value) = explode('=', $param, 2);
-            $param_name = trim($param_name);
+
+            $param_name  = trim($param_name);
             $param_value = preg_replace('(^"|"$)', '', trim($param_value));
 
             // for now we only care about 'rel' and 'type' link params
@@ -43,6 +99,16 @@ class LinkHeader
         }
     }
 
+    /**
+     * Given an HTTP response, return the requested Link: header
+     *
+     * @param HTTP_Request2_Response $response response to check
+     * @param string                 $rel      relationship to look for
+     * @param string                 $type     media type to look for
+     *
+     * @return LinkHeader discovered header, or null on failure
+     */
+
     static function getLink($response, $rel=null, $type=null)
     {
         $headers = $response->getHeader('Link');

From 2a54919d1f32d936d108b166b0b61ec31fbbb172 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 2 Jan 2011 11:10:46 -0800
Subject: [PATCH 061/314] execution protection on discovery.php

---
 lib/discovery.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/discovery.php b/lib/discovery.php
index c66790c1d9..d67ec94f00 100644
--- a/lib/discovery.php
+++ b/lib/discovery.php
@@ -28,6 +28,10 @@
  * @link      http://status.net/
  */
 
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
 /**
  * This class implements LRDD-based service discovery based on the "Hammer Draft"
  * (including webfinger)

From e433e559f8310d405afdce20a591e0d9f6d6642c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 2 Jan 2011 15:21:56 -0800
Subject: [PATCH 062/314] let callers pass in an XMLOutputter to output to

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

diff --git a/lib/activity.php b/lib/activity.php
index 8d7ae1540b..b77d53427c 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -322,6 +322,7 @@ class Activity
      *
      * @return DOMElement Atom entry
      */
+
     function toAtomEntry()
     {
         return null;
@@ -330,7 +331,12 @@ class Activity
     function asString($namespace=false, $author=true, $source=false)
     {
         $xs = new XMLStringer(true);
+        $this->outputTo($xs, $namespace, $author, $source);
+        return $xs->getString();
+    }
 
+    function outputTo($xs, $namespace=false, $author=true, $source=false)
+    {
         if ($namespace) {
             $attrs = array('xmlns' => 'http://www.w3.org/2005/Atom',
                            'xmlns:thr' => 'http://purl.org/syndication/thread/1.0',
@@ -518,9 +524,7 @@ class Activity
 
         $xs->elementEnd('entry');
 
-        $str = $xs->getString();
-	
-        return $str;
+        return;
     }
 
     private function _child($element, $tag, $namespace=self::SPEC)

From aa9137ca71a2e7e4c9e00ba60be637530dc94c2b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 2 Jan 2011 15:22:12 -0800
Subject: [PATCH 063/314] preserve activities in object

---
 lib/useractivitystream.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/useractivitystream.php b/lib/useractivitystream.php
index 0fc315e26e..7d9b02ded8 100644
--- a/lib/useractivitystream.php
+++ b/lib/useractivitystream.php
@@ -28,6 +28,8 @@
 
 class UserActivityStream extends AtomUserNoticeFeed
 {
+    public $activities = array();
+
     function __construct($user, $indent = true)
     {
         parent::__construct($user, null, $indent);
@@ -45,10 +47,15 @@ class UserActivityStream extends AtomUserNoticeFeed
         usort($objs, 'UserActivityStream::compareObject');
 
         foreach ($objs as $obj) {
-            $act = $obj->asActivity();
+            $this->activities[] = $obj->asActivity();
+        }
+    }
+    
+    function renderEntries()
+    {
+        foreach ($this->activities as $act) {
             // Only show the author sub-element if it's different from default user
-            $str = $act->asString(false, ($act->actor->id != $this->user->uri));
-            $this->addEntryRaw($str);
+            $act->outputTo($this, false, ($act->actor->id != $this->user->uri));
         }
     }
 

From 8653d8a2521f9d7165a13bcb997832ef027e5081 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 3 Jan 2011 07:40:57 -0800
Subject: [PATCH 064/314] Add the Atom username to the XRD output

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

diff --git a/lib/xrdaction.php b/lib/xrdaction.php
index 855ed1ea89..b59e0f78a4 100644
--- a/lib/xrdaction.php
+++ b/lib/xrdaction.php
@@ -99,7 +99,9 @@ class XrdAction extends Action
 	    
             $xrd->links[] = array('rel' => 'http://apinamespace.org/atom',
                                   'type' => 'application/atomsvc+xml',
-                                  'href' => common_local_url('ApiAtomService', array('id' => $nick)));
+                                  'href' => common_local_url('ApiAtomService', array('id' => $nick)),
+                                  'property' => array(array('type' => 'http://apinamespace.org/atom/username',
+                                                            'value' => $nick)));
 
             if (common_config('site', 'fancy')) {
                 $apiRoot = common_path('api/', true);

From fd7dd9b10f1b83f7016f0013714c79fae36eaa99 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 3 Jan 2011 07:41:13 -0800
Subject: [PATCH 065/314] Parse properties of links in XRD files

---
 lib/xrd.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/xrd.php b/lib/xrd.php
index 9c6d9f3ab7..40372b9d7a 100644
--- a/lib/xrd.php
+++ b/lib/xrd.php
@@ -173,6 +173,13 @@ class XRD
                 switch($node->tagName) {
                 case 'Title':
                     $link['title'][] = $node->nodeValue;
+                    break;
+                case 'Property':
+                    $link['property'][] = array('type' => $node->getAttribute('type'),
+                                                'value' => $node->nodeValue);
+                    break;
+                default:
+                    common_log(LOG_NOTICE, "Unexpected tag name {$node->tagName} found in XRD file.");
                 }
             }
         }

From 7f7dc1393065326b7e12c72c7178b63df2dde834 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 3 Jan 2011 14:59:28 -0800
Subject: [PATCH 066/314] first example of moving a user

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

diff --git a/scripts/moveuser.php b/scripts/moveuser.php
new file mode 100644
index 0000000000..feaca15103
--- /dev/null
+++ b/scripts/moveuser.php
@@ -0,0 +1,296 @@
+<?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/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+$shortoptions = 'i:n:r:w:';
+$longoptions = array('id=', 'nickname=', 'remote=', 'password=');
+
+$helptext = <<<END_OF_MOVEUSER_HELP
+moveuser.php [options]
+Move a local user to a remote account.
+
+  -i --id       ID of user to move
+  -n --nickname nickname of the user to move
+  -r --remote   Full ID of remote users
+  -w --password Password of remote user
+
+Remote user identity must be a Webfinger (nickname@example.com) or 
+an HTTP or HTTPS URL (http://example.com/social/site/user/nickname).
+
+END_OF_MOVEUSER_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
+
+class ActivitySink
+{
+    protected $svcDocUrl   = null;
+    protected $username    = null;
+    protected $password    = null;
+    protected $collections = array();
+
+    function __construct($svcDocUrl, $username, $password)
+    {
+        $this->svcDocUrl = $svcDocUrl;
+        $this->username  = $username;
+        $this->password  = $password;
+
+        $this->_parseSvcDoc();
+    }
+
+    private function _parseSvcDoc()
+    {
+        $client   = new HTTPClient();
+        $response = $client->get($this->svcDocUrl);
+
+        if ($response->getStatus() != 200) {
+            throw new Exception("Can't get {$this->svcDocUrl}; response status " . $response->getStatus());
+        }
+
+        $xml = $response->getBody();
+
+        $dom = new DOMDocument();
+
+        // We don't want to bother with white spaces
+        $dom->preserveWhiteSpace = false;
+
+        // Don't spew XML warnings to output
+        $old = error_reporting();
+        error_reporting($old & ~E_WARNING);
+        $ok = $dom->loadXML($xml);
+        error_reporting($old);
+
+        $path = new DOMXPath($dom);
+
+        $path->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
+        $path->registerNamespace('app', 'http://www.w3.org/2007/app');
+        $path->registerNamespace('activity', 'http://activitystrea.ms/spec/1.0/');
+
+        $collections = $path->query('//app:collection');
+
+        for ($i = 0; $i < $collections->length; $i++) {
+            $collection = $collections->item($i);
+            $url = $collection->getAttribute('href');
+            $takesEntries = false;
+            $accepts = $path->query('app:accept', $collection);
+            for ($j = 0; $j < $accepts->length; $j++) {
+                $accept = $accepts->item($j);
+                $acceptValue = $accept->nodeValue;
+                if (preg_match('#application/atom\+xml(;\s*type=entry)?#', $acceptValue)) {
+                    $takesEntries = true;
+                    break;
+                }
+            }
+            if (!$takesEntries) {
+                continue;
+            }
+            $verbs = $path->query('activity:verb', $collection);
+            if ($verbs->length == 0) {
+                $this->_addCollection(ActivityVerb::POST, $url);
+            } else {
+                for ($k = 0; $k < $verbs->length; $k++) {
+                    $verb = $verbs->item($k);
+                    $this->_addCollection($verb->nodeValue, $url);
+                }
+            }
+        }
+    }
+
+    private function _addCollection($verb, $url)
+    {
+        if (array_key_exists($verb, $this->collections)) {
+            $this->collections[$verb][] = $url;
+        } else {
+            $this->collections[$verb] = array($url);
+        }
+        return;
+    }
+
+    function postActivity($activity)
+    {
+        if (!array_key_exists($activity->verb, $this->collections)) {
+            throw new Exception("No collection for verb {$activity->verb}");
+        } else {
+            if (count($this->collections[$activity->verb]) > 1) {
+                common_log(LOG_NOTICE, "More than one collection for verb {$activity->verb}");
+            }
+            $this->postToCollection($this->collections[$activity->verb][0], $activity);
+        }
+    }
+
+    function postToCollection($url, $activity)
+    {
+        $client = new HTTPClient($url);
+
+        $client->setMethod('POST');
+        $client->setAuth($this->username, $this->password);
+        $client->setHeader('Content-Type', 'application/atom+xml;type=entry');
+        $client->setBody($activity->asString(true, true, true));
+
+        $response = $client->send();
+    }
+}
+
+function getServiceDocument($remote)
+{
+    $discovery = new Discovery();
+
+    $xrd = $discovery->lookup($remote);
+
+    if (empty($xrd)) {
+        throw new Exception("Can't find XRD for $remote");
+    } 
+
+    $svcDocUrl = null;
+    $username  = null;
+
+    foreach ($xrd->links as $link) {
+        if ($link['rel'] == 'http://apinamespace.org/atom' &&
+            $link['type'] == 'application/atomsvc+xml') {
+            $svcDocUrl = $link['href'];
+            if (!empty($link['property'])) {
+                foreach ($link['property'] as $property) {
+                    if ($property['type'] == 'http://apinamespace.org/atom/username') {
+                        $username = $property['value'];
+                        break;
+                    }
+                }
+            }
+            break;
+        }
+    }
+
+    if (empty($svcDocUrl)) {
+        throw new Exception("No AtomPub API service for $remote.");
+    }
+
+    return array($svcDocUrl, $username);
+}
+
+class AccountMover
+{
+    private $_user    = null;
+    private $_profile = null;
+    private $_remote  = null;
+    private $_sink    = null;
+    
+    function __construct($user, $remote, $password)
+    {
+        $this->_user    = $user;
+        $this->_profile = $user->getProfile();
+
+        $oprofile = Ostatus_profile::ensureProfileURI($remote);
+
+        if (empty($oprofile)) {
+            throw new Exception("Can't locate account {$remote}");
+        }
+
+        $this->_remote = $oprofile->localProfile();
+
+        list($svcDocUrl, $username) = getServiceDocument($remote);
+
+        $this->_sink = new ActivitySink($svcDocUrl, $username, $password);
+    }
+
+    function move()
+    {
+        $stream = new UserActivityStream($this->_user);
+
+        $acts = array_reverse($stream->activities);
+
+        // Reverse activities to run in correct chron order
+
+        foreach ($acts as $act) {
+            $this->_moveActivity($act);
+        }
+    }
+
+    private function _moveActivity($act)
+    {
+        switch ($act->verb) {
+        case ActivityVerb::FAVORITE:
+            // push it, then delete local
+            $this->_sink->postActivity($act);
+            $notice = Notice::staticGet('uri', $act->objects[0]->id);
+            if (!empty($notice)) {
+                $fave = Fave::pkeyGet(array('user_id' => $this->_user->id,
+                                            'notice_id' => $notice->id));
+                $fave->delete();
+            }
+            break;
+        case ActivityVerb::POST:
+            // XXX: send a reshare, not a post
+            common_log(LOG_INFO, "Pushing notice {$act->objects[0]->id} to {$this->_remote->getURI()}");
+            $this->_sink->postActivity($act);
+            $notice = Notice::staticGet('uri', $act->objects[0]->id);
+            if (!empty($notice)) {
+                $notice->delete();
+            }
+            break;
+        case ActivityVerb::JOIN:
+            $this->_sink->postActivity($act);
+            $group = User_group::staticGet('uri', $act->objects[0]->id);
+            if (!empty($group)) {
+                Group_member::leave($group->id, $this->_user->id);
+            }
+            break;
+        case ActivityVerb::FOLLOW:
+            if ($act->actor->id == $this->_user->uri) {
+                $this->_sink->postActivity($act);
+                $other = Profile::fromURI($act->objects[0]->id);
+                if (!empty($other)) {
+                    Subscription::cancel($this->_profile, $other);
+                }
+            } else {
+                $otherUser = User::staticGet('uri', $act->actor->id);
+                if (!empty($otherUser)) {
+                    $otherProfile = $otherUser->getProfile();
+                    Subscription::start($otherProfile, $this->_remote);
+                    Subscription::cancel($otherProfile, $this->_user->getProfile());
+                } else {
+                    // It's a remote subscription. Do something here!
+                }
+            }
+            break;
+        }
+    }
+}
+
+try {
+
+    $user = getUser();
+
+    $remote = get_option_value('r', 'remote');
+
+    if (empty($remote)) {
+        show_help();
+        exit(1);
+    }
+
+    $password = get_option_value('w', 'password');
+
+    $mover = new AccountMover($user, $remote, $password);
+
+    $mover->move();
+
+} catch (Exception $e) {
+    print $e->getMessage()."\n";
+    exit(1);
+}

From a953b93194acb940683b81e2a5199cd8f101083d Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 5 Jan 2011 10:52:44 -0800
Subject: [PATCH 067/314] Revert "Revert "0.9.7alpha1""

This reverts commit fd205546512b75016b1e055aec24eab586ae818b.

Conflicts:

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

diff --git a/lib/common.php b/lib/common.php
index 6138200e49..22890b5cb7 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -22,13 +22,13 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 //exit with 200 response, if this is checking fancy from the installer
 if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') {  exit; }
 
-define('STATUSNET_BASE_VERSION', '0.9.8');
-define('STATUSNET_LIFECYCLE', 'dev'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
+define('STATUSNET_BASE_VERSION', '0.9.7');
+define('STATUSNET_LIFECYCLE', 'alpha1'); // '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', 'Letter Never Sent');
+define('STATUSNET_CODENAME', 'World Leader Pretend');
 
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);

From 1152b0c3e8e009963e6b34f1d3777f2854708eaf Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 2 Jan 2011 10:21:52 -0800
Subject: [PATCH 068/314] Move discovery library from OStatus plugin to core

---
 lib/discovery.php | 223 +++-------------------------------------------
 1 file changed, 14 insertions(+), 209 deletions(-)

diff --git a/lib/discovery.php b/lib/discovery.php
index d67ec94f00..905ece2ca5 100644
--- a/lib/discovery.php
+++ b/lib/discovery.php
@@ -3,7 +3,7 @@
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2010, StatusNet, Inc.
  *
- * Use Hammer discovery stack to find out interesting things about an URI
+ * A sample module to show best practices for StatusNet plugins
  *
  * PHP version 5
  *
@@ -20,7 +20,6 @@
  * 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  Discovery
  * @package   StatusNet
  * @author    James Walker <james@status.net>
  * @copyright 2010 StatusNet, Inc.
@@ -28,41 +27,22 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
 /**
  * This class implements LRDD-based service discovery based on the "Hammer Draft"
  * (including webfinger)
  *
- * @category  Discovery
- * @package   StatusNet
- * @author    James Walker <james@status.net>
- * @copyright 2010 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
- * @link      http://status.net/
- *
- * @see       http://groups.google.com/group/webfinger/browse_thread/thread/9f3d93a479e91bbf
+ * @see http://groups.google.com/group/webfinger/browse_thread/thread/9f3d93a479e91bbf
  */
-
 class Discovery
 {
-    const LRDD_REL    = 'lrdd';
+
+    const LRDD_REL = 'lrdd';
     const PROFILEPAGE = 'http://webfinger.net/rel/profile-page';
     const UPDATESFROM = 'http://schemas.google.com/g/2010#updates-from';
-    const HCARD       = 'http://microformats.org/profile/hcard';
+    const HCARD = 'http://microformats.org/profile/hcard';
 
     public $methods = array();
 
-    /**
-     * Constructor for a discovery object
-     *
-     * Registers different discovery methods.
-     *
-     * @return Discovery this
-     */
-
     public function __construct()
     {
         $this->registerMethod('Discovery_LRDD_Host_Meta');
@@ -70,14 +50,6 @@ class Discovery
         $this->registerMethod('Discovery_LRDD_Link_HTML');
     }
 
-    /**
-     * Register a discovery class
-     * 
-     * @param string $class Class name
-     *
-     * @return void
-     */
-
     public function registerMethod($class)
     {
         $this->methods[] = $class;
@@ -86,12 +58,7 @@ class Discovery
     /**
      * Given a "user id" make sure it's normalized to either a webfinger
      * acct: uri or a profile HTTP URL.
-     *
-     * @param string $user_id User ID to normalize
-     *
-     * @return string normalized acct: or http(s)?: URI
      */
-
     public static function normalize($user_id)
     {
         if (substr($user_id, 0, 5) == 'http:' ||
@@ -100,23 +67,13 @@ class Discovery
             return $user_id;
         }
 
-        if (strpos($user_id, '@') !== false) {
+        if (strpos($user_id, '@') !== FALSE) {
             return 'acct:' . $user_id;
         }
 
         return 'http://' . $user_id;
     }
 
-    /**
-     * Determine if a string is a Webfinger ID
-     *
-     * Webfinger IDs look like foo@example.com or acct:foo@example.com
-     *
-     * @param string $user_id ID to check
-     *
-     * @return boolean true if $user_id is a Webfinger, else false
-     */
-     
     public static function isWebfinger($user_id)
     {
         $uri = Discovery::normalize($user_id);
@@ -125,13 +82,8 @@ class Discovery
     }
 
     /**
-     * Given a user ID, return the first available XRD
-     *
-     * @param string $id User ID URI
-     *
-     * @return XRD XRD object for the user
+     * This implements the actual lookup procedure
      */
-
     public function lookup($id)
     {
         // Normalize the incoming $id to make sure we have a uri
@@ -155,20 +107,10 @@ class Discovery
         }
 
         // TRANS: Exception.
-        throw new Exception(sprintf(_('Unable to find services for %s.'), $id));
+        throw new Exception(sprintf(_m('Unable to find services for %s.'),$id));
     }
 
-    /**
-     * Given an array of links, returns the matching service
-     *
-     * @param array  $links   Links to check
-     * @param string $service Service to find
-     *
-     * @return array $link assoc array representing the link
-     */
-
-    public static function getService($links, $service)
-    {
+    public static function getService($links, $service) {
         if (!is_array($links)) {
             return false;
         }
@@ -180,17 +122,6 @@ class Discovery
         }
     }
 
-    /**
-     * Apply a template using an ID
-     *
-     * Replaces {uri} in template string with the ID given.
-     *
-     * @param string $template Template to match
-     * @param string $id       User ID to replace with
-     *
-     * @return string replaced values
-     */
-
     public static function applyTemplate($template, $id)
     {
         $template = str_replace('{uri}', urlencode($id), $template);
@@ -198,18 +129,10 @@ class Discovery
         return $template;
     }
 
-    /**
-     * Fetch an XRD file and parse
-     *
-     * @param string $url URL of the XRD
-     * 
-     * @return XRD object representing the XRD file
-     */
-
     public static function fetchXrd($url)
     {
         try {
-            $client   = new HTTPClient();
+            $client = new HTTPClient();
             $response = $client->get($url);
         } catch (HTTP_Request2_Exception $e) {
             return false;
@@ -223,60 +146,13 @@ class Discovery
     }
 }
 
-/**
- * Abstract interface for discovery
- *
- * Objects that implement this interface can retrieve an array of
- * XRD links for the URI.
- *
- * @category  Discovery
- * @package   StatusNet
- * @author    James Walker <james@status.net>
- * @copyright 2010 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
- * @link      http://status.net/
- */
-
 interface Discovery_LRDD
 {
-    /**
-     * Discover interesting info about the URI
-     *
-     * @param string $uri URI to inquire about
-     *
-     * @return array Links in the XRD file
-     */
-
     public function discover($uri);
 }
 
-/**
- * Implementation of discovery using host-meta file
- *
- * Discovers XRD file for a user by going to the organization's
- * host-meta file and trying to find a template for LRDD.
- *
- * @category  Discovery
- * @package   StatusNet
- * @author    James Walker <james@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 Discovery_LRDD_Host_Meta implements Discovery_LRDD
 {
-    /**
-     * Discovery core method
-     *
-     * For Webfinger and HTTP URIs, fetch the host-meta file
-     * and look for LRDD templates
-     *
-     * @param string $uri URI to inquire about
-     *
-     * @return array Links in the XRD file
-     */
-
     public function discover($uri)
     {
         if (Discovery::isWebfinger($uri)) {
@@ -300,38 +176,12 @@ class Discovery_LRDD_Host_Meta implements Discovery_LRDD
     }
 }
 
-/**
- * Implementation of discovery using HTTP Link header
- *
- * Discovers XRD file for a user by fetching the URL and reading any
- * Link: headers in the HTTP response.
- *
- * @category  Discovery
- * @package   StatusNet
- * @author    James Walker <james@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 Discovery_LRDD_Link_Header implements Discovery_LRDD
 {
-    /**
-     * Discovery core method
-     *
-     * For HTTP IDs fetch the URL and look for Link headers.
-     *
-     * @param string $uri URI to inquire about
-     *
-     * @return array Links in the XRD file
-     *
-     * @todo fail out of Webfinger URIs faster 
-     */
-
     public function discover($uri)
     {
         try {
-            $client   = new HTTPClient();
+            $client = new HTTPClient();
             $response = $client->get($uri);
         } catch (HTTP_Request2_Exception $e) {
             return false;
@@ -349,14 +199,6 @@ class Discovery_LRDD_Link_Header implements Discovery_LRDD
         return array(Discovery_LRDD_Link_Header::parseHeader($link_header));
     }
 
-    /**
-     * Given a string or array of headers, returns XRD-like assoc array
-     *
-     * @param string|array $header string or array of strings for headers
-     * 
-     * @return array Link header in XRD-like format
-     */
-
     protected static function parseHeader($header)
     {
         $lh = new LinkHeader($header);
@@ -367,39 +209,12 @@ class Discovery_LRDD_Link_Header implements Discovery_LRDD
     }
 }
 
-/**
- * Implementation of discovery using HTML <link> element
- *
- * Discovers XRD file for a user by fetching the URL and reading any
- * <link> elements in the HTML response.
- *
- * @category  Discovery
- * @package   StatusNet
- * @author    James Walker <james@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 Discovery_LRDD_Link_HTML implements Discovery_LRDD
 {
-    /**
-     * Discovery core method
-     *
-     * For HTTP IDs, fetch the URL and look for <link> elements
-     * in the HTML response.
-     *
-     * @param string $uri URI to inquire about
-     *
-     * @return array Links in XRD-ish assoc array
-     *
-     * @todo fail out of Webfinger URIs faster 
-     */
-
     public function discover($uri)
     {
         try {
-            $client   = new HTTPClient();
+            $client = new HTTPClient();
             $response = $client->get($uri);
         } catch (HTTP_Request2_Exception $e) {
             return false;
@@ -412,16 +227,6 @@ class Discovery_LRDD_Link_HTML implements Discovery_LRDD
         return Discovery_LRDD_Link_HTML::parse($response->getBody());
     }
 
-    /**
-     * Parse HTML and return <link> elements
-     *
-     * Given an HTML string, scans the string for <link> elements
-     *
-     * @param string $html HTML to scan
-     *
-     * @return array array of associative arrays in XRD-ish format
-     */
-
     public function parse($html)
     {
         $links = array();
@@ -432,8 +237,8 @@ class Discovery_LRDD_Link_HTML implements Discovery_LRDD
         preg_match_all('/<link\s[^>]*>/i', $head_html, $link_matches);
 
         foreach ($link_matches[0] as $link_html) {
-            $link_url  = null;
-            $link_rel  = null;
+            $link_url = null;
+            $link_rel = null;
             $link_type = null;
 
             preg_match('/\srel=(("|\')([^\\2]*?)\\2|[^"\'\s]+)/i', $link_html, $rel_matches);

From fafb6733db344e0f4a94e5757d31a393f0bf67fd Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 2 Jan 2011 11:01:28 -0800
Subject: [PATCH 069/314] PHPCS discovery.php

---
 lib/discovery.php | 219 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 205 insertions(+), 14 deletions(-)

diff --git a/lib/discovery.php b/lib/discovery.php
index 905ece2ca5..c66790c1d9 100644
--- a/lib/discovery.php
+++ b/lib/discovery.php
@@ -3,7 +3,7 @@
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2010, StatusNet, Inc.
  *
- * A sample module to show best practices for StatusNet plugins
+ * Use Hammer discovery stack to find out interesting things about an URI
  *
  * PHP version 5
  *
@@ -20,6 +20,7 @@
  * 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  Discovery
  * @package   StatusNet
  * @author    James Walker <james@status.net>
  * @copyright 2010 StatusNet, Inc.
@@ -31,18 +32,33 @@
  * This class implements LRDD-based service discovery based on the "Hammer Draft"
  * (including webfinger)
  *
- * @see http://groups.google.com/group/webfinger/browse_thread/thread/9f3d93a479e91bbf
+ * @category  Discovery
+ * @package   StatusNet
+ * @author    James Walker <james@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ *
+ * @see       http://groups.google.com/group/webfinger/browse_thread/thread/9f3d93a479e91bbf
  */
+
 class Discovery
 {
-
-    const LRDD_REL = 'lrdd';
+    const LRDD_REL    = 'lrdd';
     const PROFILEPAGE = 'http://webfinger.net/rel/profile-page';
     const UPDATESFROM = 'http://schemas.google.com/g/2010#updates-from';
-    const HCARD = 'http://microformats.org/profile/hcard';
+    const HCARD       = 'http://microformats.org/profile/hcard';
 
     public $methods = array();
 
+    /**
+     * Constructor for a discovery object
+     *
+     * Registers different discovery methods.
+     *
+     * @return Discovery this
+     */
+
     public function __construct()
     {
         $this->registerMethod('Discovery_LRDD_Host_Meta');
@@ -50,6 +66,14 @@ class Discovery
         $this->registerMethod('Discovery_LRDD_Link_HTML');
     }
 
+    /**
+     * Register a discovery class
+     * 
+     * @param string $class Class name
+     *
+     * @return void
+     */
+
     public function registerMethod($class)
     {
         $this->methods[] = $class;
@@ -58,7 +82,12 @@ class Discovery
     /**
      * Given a "user id" make sure it's normalized to either a webfinger
      * acct: uri or a profile HTTP URL.
+     *
+     * @param string $user_id User ID to normalize
+     *
+     * @return string normalized acct: or http(s)?: URI
      */
+
     public static function normalize($user_id)
     {
         if (substr($user_id, 0, 5) == 'http:' ||
@@ -67,13 +96,23 @@ class Discovery
             return $user_id;
         }
 
-        if (strpos($user_id, '@') !== FALSE) {
+        if (strpos($user_id, '@') !== false) {
             return 'acct:' . $user_id;
         }
 
         return 'http://' . $user_id;
     }
 
+    /**
+     * Determine if a string is a Webfinger ID
+     *
+     * Webfinger IDs look like foo@example.com or acct:foo@example.com
+     *
+     * @param string $user_id ID to check
+     *
+     * @return boolean true if $user_id is a Webfinger, else false
+     */
+     
     public static function isWebfinger($user_id)
     {
         $uri = Discovery::normalize($user_id);
@@ -82,8 +121,13 @@ class Discovery
     }
 
     /**
-     * This implements the actual lookup procedure
+     * Given a user ID, return the first available XRD
+     *
+     * @param string $id User ID URI
+     *
+     * @return XRD XRD object for the user
      */
+
     public function lookup($id)
     {
         // Normalize the incoming $id to make sure we have a uri
@@ -107,10 +151,20 @@ class Discovery
         }
 
         // TRANS: Exception.
-        throw new Exception(sprintf(_m('Unable to find services for %s.'),$id));
+        throw new Exception(sprintf(_('Unable to find services for %s.'), $id));
     }
 
-    public static function getService($links, $service) {
+    /**
+     * Given an array of links, returns the matching service
+     *
+     * @param array  $links   Links to check
+     * @param string $service Service to find
+     *
+     * @return array $link assoc array representing the link
+     */
+
+    public static function getService($links, $service)
+    {
         if (!is_array($links)) {
             return false;
         }
@@ -122,6 +176,17 @@ class Discovery
         }
     }
 
+    /**
+     * Apply a template using an ID
+     *
+     * Replaces {uri} in template string with the ID given.
+     *
+     * @param string $template Template to match
+     * @param string $id       User ID to replace with
+     *
+     * @return string replaced values
+     */
+
     public static function applyTemplate($template, $id)
     {
         $template = str_replace('{uri}', urlencode($id), $template);
@@ -129,10 +194,18 @@ class Discovery
         return $template;
     }
 
+    /**
+     * Fetch an XRD file and parse
+     *
+     * @param string $url URL of the XRD
+     * 
+     * @return XRD object representing the XRD file
+     */
+
     public static function fetchXrd($url)
     {
         try {
-            $client = new HTTPClient();
+            $client   = new HTTPClient();
             $response = $client->get($url);
         } catch (HTTP_Request2_Exception $e) {
             return false;
@@ -146,13 +219,60 @@ class Discovery
     }
 }
 
+/**
+ * Abstract interface for discovery
+ *
+ * Objects that implement this interface can retrieve an array of
+ * XRD links for the URI.
+ *
+ * @category  Discovery
+ * @package   StatusNet
+ * @author    James Walker <james@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
 interface Discovery_LRDD
 {
+    /**
+     * Discover interesting info about the URI
+     *
+     * @param string $uri URI to inquire about
+     *
+     * @return array Links in the XRD file
+     */
+
     public function discover($uri);
 }
 
+/**
+ * Implementation of discovery using host-meta file
+ *
+ * Discovers XRD file for a user by going to the organization's
+ * host-meta file and trying to find a template for LRDD.
+ *
+ * @category  Discovery
+ * @package   StatusNet
+ * @author    James Walker <james@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 Discovery_LRDD_Host_Meta implements Discovery_LRDD
 {
+    /**
+     * Discovery core method
+     *
+     * For Webfinger and HTTP URIs, fetch the host-meta file
+     * and look for LRDD templates
+     *
+     * @param string $uri URI to inquire about
+     *
+     * @return array Links in the XRD file
+     */
+
     public function discover($uri)
     {
         if (Discovery::isWebfinger($uri)) {
@@ -176,12 +296,38 @@ class Discovery_LRDD_Host_Meta implements Discovery_LRDD
     }
 }
 
+/**
+ * Implementation of discovery using HTTP Link header
+ *
+ * Discovers XRD file for a user by fetching the URL and reading any
+ * Link: headers in the HTTP response.
+ *
+ * @category  Discovery
+ * @package   StatusNet
+ * @author    James Walker <james@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 Discovery_LRDD_Link_Header implements Discovery_LRDD
 {
+    /**
+     * Discovery core method
+     *
+     * For HTTP IDs fetch the URL and look for Link headers.
+     *
+     * @param string $uri URI to inquire about
+     *
+     * @return array Links in the XRD file
+     *
+     * @todo fail out of Webfinger URIs faster 
+     */
+
     public function discover($uri)
     {
         try {
-            $client = new HTTPClient();
+            $client   = new HTTPClient();
             $response = $client->get($uri);
         } catch (HTTP_Request2_Exception $e) {
             return false;
@@ -199,6 +345,14 @@ class Discovery_LRDD_Link_Header implements Discovery_LRDD
         return array(Discovery_LRDD_Link_Header::parseHeader($link_header));
     }
 
+    /**
+     * Given a string or array of headers, returns XRD-like assoc array
+     *
+     * @param string|array $header string or array of strings for headers
+     * 
+     * @return array Link header in XRD-like format
+     */
+
     protected static function parseHeader($header)
     {
         $lh = new LinkHeader($header);
@@ -209,12 +363,39 @@ class Discovery_LRDD_Link_Header implements Discovery_LRDD
     }
 }
 
+/**
+ * Implementation of discovery using HTML <link> element
+ *
+ * Discovers XRD file for a user by fetching the URL and reading any
+ * <link> elements in the HTML response.
+ *
+ * @category  Discovery
+ * @package   StatusNet
+ * @author    James Walker <james@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 Discovery_LRDD_Link_HTML implements Discovery_LRDD
 {
+    /**
+     * Discovery core method
+     *
+     * For HTTP IDs, fetch the URL and look for <link> elements
+     * in the HTML response.
+     *
+     * @param string $uri URI to inquire about
+     *
+     * @return array Links in XRD-ish assoc array
+     *
+     * @todo fail out of Webfinger URIs faster 
+     */
+
     public function discover($uri)
     {
         try {
-            $client = new HTTPClient();
+            $client   = new HTTPClient();
             $response = $client->get($uri);
         } catch (HTTP_Request2_Exception $e) {
             return false;
@@ -227,6 +408,16 @@ class Discovery_LRDD_Link_HTML implements Discovery_LRDD
         return Discovery_LRDD_Link_HTML::parse($response->getBody());
     }
 
+    /**
+     * Parse HTML and return <link> elements
+     *
+     * Given an HTML string, scans the string for <link> elements
+     *
+     * @param string $html HTML to scan
+     *
+     * @return array array of associative arrays in XRD-ish format
+     */
+
     public function parse($html)
     {
         $links = array();
@@ -237,8 +428,8 @@ class Discovery_LRDD_Link_HTML implements Discovery_LRDD
         preg_match_all('/<link\s[^>]*>/i', $head_html, $link_matches);
 
         foreach ($link_matches[0] as $link_html) {
-            $link_url = null;
-            $link_rel = null;
+            $link_url  = null;
+            $link_rel  = null;
             $link_type = null;
 
             preg_match('/\srel=(("|\')([^\\2]*?)\\2|[^"\'\s]+)/i', $link_html, $rel_matches);

From 81079fe5226bc88b523d65a9e08d4eec6f6a2870 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 2 Jan 2011 11:10:46 -0800
Subject: [PATCH 070/314] execution protection on discovery.php

---
 lib/discovery.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/discovery.php b/lib/discovery.php
index c66790c1d9..d67ec94f00 100644
--- a/lib/discovery.php
+++ b/lib/discovery.php
@@ -28,6 +28,10 @@
  * @link      http://status.net/
  */
 
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
 /**
  * This class implements LRDD-based service discovery based on the "Hammer Draft"
  * (including webfinger)

From 905aded81a8a001fefc211981c435c5c21bb3a99 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 7 Jan 2011 19:48:50 -0500
Subject: [PATCH 071/314] move account-moving classes to their own libraries

---
 lib/accountmover.php | 171 +++++++++++++++++++++++++++++++
 lib/activitysink.php | 155 ++++++++++++++++++++++++++++
 scripts/moveuser.php | 235 -------------------------------------------
 3 files changed, 326 insertions(+), 235 deletions(-)
 create mode 100644 lib/accountmover.php
 create mode 100644 lib/activitysink.php

diff --git a/lib/accountmover.php b/lib/accountmover.php
new file mode 100644
index 0000000000..ba9da0f6fd
--- /dev/null
+++ b/lib/accountmover.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * A class for moving an account to a new server
+ * 
+ * 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  Account
+ * @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);
+}
+
+/**
+ * Moves an account from this server to another
+ *
+ * @category  Account
+ * @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 AccountMover
+{
+    private $_user    = null;
+    private $_profile = null;
+    private $_remote  = null;
+    private $_sink    = null;
+    
+    function __construct($user, $remote, $password)
+    {
+        $this->_user    = $user;
+        $this->_profile = $user->getProfile();
+
+        $oprofile = Ostatus_profile::ensureProfileURI($remote);
+
+        if (empty($oprofile)) {
+            throw new Exception("Can't locate account {$remote}");
+        }
+
+        $this->_remote = $oprofile->localProfile();
+
+        list($svcDocUrl, $username) = self::getServiceDocument($remote);
+
+        $this->_sink = new ActivitySink($svcDocUrl, $username, $password);
+    }
+
+    static function getServiceDocument($remote)
+    {
+        $discovery = new Discovery();
+
+        $xrd = $discovery->lookup($remote);
+
+        if (empty($xrd)) {
+            throw new Exception("Can't find XRD for $remote");
+        } 
+
+        $svcDocUrl = null;
+        $username  = null;
+
+        foreach ($xrd->links as $link) {
+            if ($link['rel'] == 'http://apinamespace.org/atom' &&
+                $link['type'] == 'application/atomsvc+xml') {
+                $svcDocUrl = $link['href'];
+                if (!empty($link['property'])) {
+                    foreach ($link['property'] as $property) {
+                        if ($property['type'] == 'http://apinamespace.org/atom/username') {
+                            $username = $property['value'];
+                            break;
+                        }
+                    }
+                }
+                break;
+            }
+        }
+
+        if (empty($svcDocUrl)) {
+            throw new Exception("No AtomPub API service for $remote.");
+        }
+
+        return array($svcDocUrl, $username);
+    }
+
+    function move()
+    {
+        $stream = new UserActivityStream($this->_user);
+
+        $acts = array_reverse($stream->activities);
+
+        // Reverse activities to run in correct chron order
+
+        foreach ($acts as $act) {
+            $this->_moveActivity($act);
+        }
+    }
+
+    private function _moveActivity($act)
+    {
+        switch ($act->verb) {
+        case ActivityVerb::FAVORITE:
+            // push it, then delete local
+            $this->_sink->postActivity($act);
+            $notice = Notice::staticGet('uri', $act->objects[0]->id);
+            if (!empty($notice)) {
+                $fave = Fave::pkeyGet(array('user_id' => $this->_user->id,
+                                            'notice_id' => $notice->id));
+                $fave->delete();
+            }
+            break;
+        case ActivityVerb::POST:
+            // XXX: send a reshare, not a post
+            common_log(LOG_INFO, "Pushing notice {$act->objects[0]->id} to {$this->_remote->getURI()}");
+            $this->_sink->postActivity($act);
+            $notice = Notice::staticGet('uri', $act->objects[0]->id);
+            if (!empty($notice)) {
+                $notice->delete();
+            }
+            break;
+        case ActivityVerb::JOIN:
+            $this->_sink->postActivity($act);
+            $group = User_group::staticGet('uri', $act->objects[0]->id);
+            if (!empty($group)) {
+                Group_member::leave($group->id, $this->_user->id);
+            }
+            break;
+        case ActivityVerb::FOLLOW:
+            if ($act->actor->id == $this->_user->uri) {
+                $this->_sink->postActivity($act);
+                $other = Profile::fromURI($act->objects[0]->id);
+                if (!empty($other)) {
+                    Subscription::cancel($this->_profile, $other);
+                }
+            } else {
+                $otherUser = User::staticGet('uri', $act->actor->id);
+                if (!empty($otherUser)) {
+                    $otherProfile = $otherUser->getProfile();
+                    Subscription::start($otherProfile, $this->_remote);
+                    Subscription::cancel($otherProfile, $this->_user->getProfile());
+                } else {
+                    // It's a remote subscription. Do something here!
+                }
+            }
+            break;
+        }
+    }
+}
diff --git a/lib/activitysink.php b/lib/activitysink.php
new file mode 100644
index 0000000000..287fd8f0ab
--- /dev/null
+++ b/lib/activitysink.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * A remote, atompub-receiving service
+ * 
+ * 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  AtomPub
+ * @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 remote service that supports AtomPub
+ *
+ * @category  AtomPub
+ * @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 ActivitySink
+{
+    protected $svcDocUrl   = null;
+    protected $username    = null;
+    protected $password    = null;
+    protected $collections = array();
+
+    function __construct($svcDocUrl, $username, $password)
+    {
+        $this->svcDocUrl = $svcDocUrl;
+        $this->username  = $username;
+        $this->password  = $password;
+
+        $this->_parseSvcDoc();
+    }
+
+    private function _parseSvcDoc()
+    {
+        $client   = new HTTPClient();
+        $response = $client->get($this->svcDocUrl);
+
+        if ($response->getStatus() != 200) {
+            throw new Exception("Can't get {$this->svcDocUrl}; response status " . $response->getStatus());
+        }
+
+        $xml = $response->getBody();
+
+        $dom = new DOMDocument();
+
+        // We don't want to bother with white spaces
+        $dom->preserveWhiteSpace = false;
+
+        // Don't spew XML warnings to output
+        $old = error_reporting();
+        error_reporting($old & ~E_WARNING);
+        $ok = $dom->loadXML($xml);
+        error_reporting($old);
+
+        $path = new DOMXPath($dom);
+
+        $path->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
+        $path->registerNamespace('app', 'http://www.w3.org/2007/app');
+        $path->registerNamespace('activity', 'http://activitystrea.ms/spec/1.0/');
+
+        $collections = $path->query('//app:collection');
+
+        for ($i = 0; $i < $collections->length; $i++) {
+            $collection = $collections->item($i);
+            $url = $collection->getAttribute('href');
+            $takesEntries = false;
+            $accepts = $path->query('app:accept', $collection);
+            for ($j = 0; $j < $accepts->length; $j++) {
+                $accept = $accepts->item($j);
+                $acceptValue = $accept->nodeValue;
+                if (preg_match('#application/atom\+xml(;\s*type=entry)?#', $acceptValue)) {
+                    $takesEntries = true;
+                    break;
+                }
+            }
+            if (!$takesEntries) {
+                continue;
+            }
+            $verbs = $path->query('activity:verb', $collection);
+            if ($verbs->length == 0) {
+                $this->_addCollection(ActivityVerb::POST, $url);
+            } else {
+                for ($k = 0; $k < $verbs->length; $k++) {
+                    $verb = $verbs->item($k);
+                    $this->_addCollection($verb->nodeValue, $url);
+                }
+            }
+        }
+    }
+
+    private function _addCollection($verb, $url)
+    {
+        if (array_key_exists($verb, $this->collections)) {
+            $this->collections[$verb][] = $url;
+        } else {
+            $this->collections[$verb] = array($url);
+        }
+        return;
+    }
+
+    function postActivity($activity)
+    {
+        if (!array_key_exists($activity->verb, $this->collections)) {
+            throw new Exception("No collection for verb {$activity->verb}");
+        } else {
+            if (count($this->collections[$activity->verb]) > 1) {
+                common_log(LOG_NOTICE, "More than one collection for verb {$activity->verb}");
+            }
+            $this->postToCollection($this->collections[$activity->verb][0], $activity);
+        }
+    }
+
+    function postToCollection($url, $activity)
+    {
+        $client = new HTTPClient($url);
+
+        $client->setMethod('POST');
+        $client->setAuth($this->username, $this->password);
+        $client->setHeader('Content-Type', 'application/atom+xml;type=entry');
+        $client->setBody($activity->asString(true, true, true));
+
+        $response = $client->send();
+    }
+}
diff --git a/scripts/moveuser.php b/scripts/moveuser.php
index feaca15103..b02b10b1e5 100644
--- a/scripts/moveuser.php
+++ b/scripts/moveuser.php
@@ -37,241 +37,6 @@ an HTTP or HTTPS URL (http://example.com/social/site/user/nickname).
 END_OF_MOVEUSER_HELP;
 
 require_once INSTALLDIR.'/scripts/commandline.inc';
-require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
-
-class ActivitySink
-{
-    protected $svcDocUrl   = null;
-    protected $username    = null;
-    protected $password    = null;
-    protected $collections = array();
-
-    function __construct($svcDocUrl, $username, $password)
-    {
-        $this->svcDocUrl = $svcDocUrl;
-        $this->username  = $username;
-        $this->password  = $password;
-
-        $this->_parseSvcDoc();
-    }
-
-    private function _parseSvcDoc()
-    {
-        $client   = new HTTPClient();
-        $response = $client->get($this->svcDocUrl);
-
-        if ($response->getStatus() != 200) {
-            throw new Exception("Can't get {$this->svcDocUrl}; response status " . $response->getStatus());
-        }
-
-        $xml = $response->getBody();
-
-        $dom = new DOMDocument();
-
-        // We don't want to bother with white spaces
-        $dom->preserveWhiteSpace = false;
-
-        // Don't spew XML warnings to output
-        $old = error_reporting();
-        error_reporting($old & ~E_WARNING);
-        $ok = $dom->loadXML($xml);
-        error_reporting($old);
-
-        $path = new DOMXPath($dom);
-
-        $path->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
-        $path->registerNamespace('app', 'http://www.w3.org/2007/app');
-        $path->registerNamespace('activity', 'http://activitystrea.ms/spec/1.0/');
-
-        $collections = $path->query('//app:collection');
-
-        for ($i = 0; $i < $collections->length; $i++) {
-            $collection = $collections->item($i);
-            $url = $collection->getAttribute('href');
-            $takesEntries = false;
-            $accepts = $path->query('app:accept', $collection);
-            for ($j = 0; $j < $accepts->length; $j++) {
-                $accept = $accepts->item($j);
-                $acceptValue = $accept->nodeValue;
-                if (preg_match('#application/atom\+xml(;\s*type=entry)?#', $acceptValue)) {
-                    $takesEntries = true;
-                    break;
-                }
-            }
-            if (!$takesEntries) {
-                continue;
-            }
-            $verbs = $path->query('activity:verb', $collection);
-            if ($verbs->length == 0) {
-                $this->_addCollection(ActivityVerb::POST, $url);
-            } else {
-                for ($k = 0; $k < $verbs->length; $k++) {
-                    $verb = $verbs->item($k);
-                    $this->_addCollection($verb->nodeValue, $url);
-                }
-            }
-        }
-    }
-
-    private function _addCollection($verb, $url)
-    {
-        if (array_key_exists($verb, $this->collections)) {
-            $this->collections[$verb][] = $url;
-        } else {
-            $this->collections[$verb] = array($url);
-        }
-        return;
-    }
-
-    function postActivity($activity)
-    {
-        if (!array_key_exists($activity->verb, $this->collections)) {
-            throw new Exception("No collection for verb {$activity->verb}");
-        } else {
-            if (count($this->collections[$activity->verb]) > 1) {
-                common_log(LOG_NOTICE, "More than one collection for verb {$activity->verb}");
-            }
-            $this->postToCollection($this->collections[$activity->verb][0], $activity);
-        }
-    }
-
-    function postToCollection($url, $activity)
-    {
-        $client = new HTTPClient($url);
-
-        $client->setMethod('POST');
-        $client->setAuth($this->username, $this->password);
-        $client->setHeader('Content-Type', 'application/atom+xml;type=entry');
-        $client->setBody($activity->asString(true, true, true));
-
-        $response = $client->send();
-    }
-}
-
-function getServiceDocument($remote)
-{
-    $discovery = new Discovery();
-
-    $xrd = $discovery->lookup($remote);
-
-    if (empty($xrd)) {
-        throw new Exception("Can't find XRD for $remote");
-    } 
-
-    $svcDocUrl = null;
-    $username  = null;
-
-    foreach ($xrd->links as $link) {
-        if ($link['rel'] == 'http://apinamespace.org/atom' &&
-            $link['type'] == 'application/atomsvc+xml') {
-            $svcDocUrl = $link['href'];
-            if (!empty($link['property'])) {
-                foreach ($link['property'] as $property) {
-                    if ($property['type'] == 'http://apinamespace.org/atom/username') {
-                        $username = $property['value'];
-                        break;
-                    }
-                }
-            }
-            break;
-        }
-    }
-
-    if (empty($svcDocUrl)) {
-        throw new Exception("No AtomPub API service for $remote.");
-    }
-
-    return array($svcDocUrl, $username);
-}
-
-class AccountMover
-{
-    private $_user    = null;
-    private $_profile = null;
-    private $_remote  = null;
-    private $_sink    = null;
-    
-    function __construct($user, $remote, $password)
-    {
-        $this->_user    = $user;
-        $this->_profile = $user->getProfile();
-
-        $oprofile = Ostatus_profile::ensureProfileURI($remote);
-
-        if (empty($oprofile)) {
-            throw new Exception("Can't locate account {$remote}");
-        }
-
-        $this->_remote = $oprofile->localProfile();
-
-        list($svcDocUrl, $username) = getServiceDocument($remote);
-
-        $this->_sink = new ActivitySink($svcDocUrl, $username, $password);
-    }
-
-    function move()
-    {
-        $stream = new UserActivityStream($this->_user);
-
-        $acts = array_reverse($stream->activities);
-
-        // Reverse activities to run in correct chron order
-
-        foreach ($acts as $act) {
-            $this->_moveActivity($act);
-        }
-    }
-
-    private function _moveActivity($act)
-    {
-        switch ($act->verb) {
-        case ActivityVerb::FAVORITE:
-            // push it, then delete local
-            $this->_sink->postActivity($act);
-            $notice = Notice::staticGet('uri', $act->objects[0]->id);
-            if (!empty($notice)) {
-                $fave = Fave::pkeyGet(array('user_id' => $this->_user->id,
-                                            'notice_id' => $notice->id));
-                $fave->delete();
-            }
-            break;
-        case ActivityVerb::POST:
-            // XXX: send a reshare, not a post
-            common_log(LOG_INFO, "Pushing notice {$act->objects[0]->id} to {$this->_remote->getURI()}");
-            $this->_sink->postActivity($act);
-            $notice = Notice::staticGet('uri', $act->objects[0]->id);
-            if (!empty($notice)) {
-                $notice->delete();
-            }
-            break;
-        case ActivityVerb::JOIN:
-            $this->_sink->postActivity($act);
-            $group = User_group::staticGet('uri', $act->objects[0]->id);
-            if (!empty($group)) {
-                Group_member::leave($group->id, $this->_user->id);
-            }
-            break;
-        case ActivityVerb::FOLLOW:
-            if ($act->actor->id == $this->_user->uri) {
-                $this->_sink->postActivity($act);
-                $other = Profile::fromURI($act->objects[0]->id);
-                if (!empty($other)) {
-                    Subscription::cancel($this->_profile, $other);
-                }
-            } else {
-                $otherUser = User::staticGet('uri', $act->actor->id);
-                if (!empty($otherUser)) {
-                    $otherProfile = $otherUser->getProfile();
-                    Subscription::start($otherProfile, $this->_remote);
-                    Subscription::cancel($otherProfile, $this->_user->getProfile());
-                } else {
-                    // It's a remote subscription. Do something here!
-                }
-            }
-            break;
-        }
-    }
-}
 
 try {
 

From b11426dbf4d5175da091b63af6cfbad6e1c4bedb Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 10 Jan 2011 14:56:15 -0500
Subject: [PATCH 072/314] normalize accounts and check for return in HTTP for
 moving

---
 lib/accountmover.php |  2 ++
 lib/activitysink.php | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/lib/accountmover.php b/lib/accountmover.php
index ba9da0f6fd..eefd0487d8 100644
--- a/lib/accountmover.php
+++ b/lib/accountmover.php
@@ -57,6 +57,8 @@ class AccountMover
         $this->_user    = $user;
         $this->_profile = $user->getProfile();
 
+        $remote = Discovery::normalize($remote);
+
         $oprofile = Ostatus_profile::ensureProfileURI($remote);
 
         if (empty($oprofile)) {
diff --git a/lib/activitysink.php b/lib/activitysink.php
index 287fd8f0ab..fbe1f1e7ff 100644
--- a/lib/activitysink.php
+++ b/lib/activitysink.php
@@ -151,5 +151,19 @@ class ActivitySink
         $client->setBody($activity->asString(true, true, true));
 
         $response = $client->send();
+
+        $status = $response->getStatus();
+        $reason = $response->getReasonPhrase();
+
+        if ($status >= 200 && $status < 300) {
+            return true;
+        } else if ($status >= 400 && $status < 500) {
+            throw new ClientException("{$url} {$status} {$reason}");
+        } else if ($status >= 500 && $status < 600) {
+            throw new ServerException("{$url} {$status} {$reason}");
+        } else {
+            // That's unexpected.
+            throw new Exception("{$url} {$status} {$reason}");
+        }
     }
 }

From feb3ae4c092b947834598c7b024e243a9163267b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 17 Jan 2011 15:06:15 -0500
Subject: [PATCH 073/314] add a log method to AccountMover

---
 lib/accountmover.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/lib/accountmover.php b/lib/accountmover.php
index eefd0487d8..b9b910d070 100644
--- a/lib/accountmover.php
+++ b/lib/accountmover.php
@@ -170,4 +170,20 @@ class AccountMover
             break;
         }
     }
+
+    /**
+     * Log some data
+     * 
+     * Add a header for our class so we know who did it.
+     *
+     * @param int    $level   Log level, like LOG_ERR or LOG_INFO
+     * @param string $message Message to log
+     *
+     * @return void
+     */
+
+    protected function log($level, $message)
+    {
+        common_log($level, "AccountMover: " . $message);
+    }
 }

From dce2824747344662e077717432dead3ebe898167 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 17 Jan 2011 15:25:58 -0500
Subject: [PATCH 074/314] considerably more logging and error checking in
 AccountMover

---
 lib/accountmover.php | 41 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/lib/accountmover.php b/lib/accountmover.php
index b9b910d070..31152fd118 100644
--- a/lib/accountmover.php
+++ b/lib/accountmover.php
@@ -110,21 +110,42 @@ class AccountMover
 
     function move()
     {
+        $this->log(LOG_INFO, 
+                   "Moving user {$this->_user->nickname} to {$this->_remote->nickname}");
+
         $stream = new UserActivityStream($this->_user);
 
         $acts = array_reverse($stream->activities);
 
+        $this->log(LOG_INFO,
+                   "Got {count($acts)} activities ".
+                   "for {$this->_user->nickname}");
+
         // Reverse activities to run in correct chron order
 
         foreach ($acts as $act) {
-            $this->_moveActivity($act);
+            try {
+                $this->_moveActivity($act);
+            } catch (Exception $e) {
+                $this->log(LOG_ERR,
+                           "Error moving activity {$act->id} {$act->verb}: " .
+                           $e->getMessage());
+                continue;
+            }
         }
+
+        $this->log(LOG_INFO,
+                   "Finished moving user {$this->_user->nickname} ".
+                   "to {$this->_remote->nickname}");
     }
 
     private function _moveActivity($act)
     {
         switch ($act->verb) {
         case ActivityVerb::FAVORITE:
+            $this->log(LOG_INFO,
+                       "Moving favorite of {$act->objects[0]->id} by ".
+                       "{$act->actor->id} to {$this->_remote->nickname}.");
             // push it, then delete local
             $this->_sink->postActivity($act);
             $notice = Notice::staticGet('uri', $act->objects[0]->id);
@@ -135,8 +156,10 @@ class AccountMover
             }
             break;
         case ActivityVerb::POST:
+            $this->log(LOG_INFO,
+                       "Moving notice {$act->objects[0]->id} by ".
+                       "{$act->actor->id} to {$this->_remote->nickname}.");
             // XXX: send a reshare, not a post
-            common_log(LOG_INFO, "Pushing notice {$act->objects[0]->id} to {$this->_remote->getURI()}");
             $this->_sink->postActivity($act);
             $notice = Notice::staticGet('uri', $act->objects[0]->id);
             if (!empty($notice)) {
@@ -144,6 +167,9 @@ class AccountMover
             }
             break;
         case ActivityVerb::JOIN:
+            $this->log(LOG_INFO,
+                       "Moving group join of {$act->objects[0]->id} by ".
+                       "{$act->actor->id} to {$this->_remote->nickname}.");
             $this->_sink->postActivity($act);
             $group = User_group::staticGet('uri', $act->objects[0]->id);
             if (!empty($group)) {
@@ -152,6 +178,9 @@ class AccountMover
             break;
         case ActivityVerb::FOLLOW:
             if ($act->actor->id == $this->_user->uri) {
+                $this->log(LOG_INFO,
+                           "Moving subscription to {$act->objects[0]->id} by ".
+                           "{$act->actor->id} to {$this->_remote->nickname}.");
                 $this->_sink->postActivity($act);
                 $other = Profile::fromURI($act->objects[0]->id);
                 if (!empty($other)) {
@@ -160,11 +189,17 @@ class AccountMover
             } else {
                 $otherUser = User::staticGet('uri', $act->actor->id);
                 if (!empty($otherUser)) {
+                    $this->log(LOG_INFO,
+                               "Changing sub to {$act->objects[0]->id}".
+                               "by {$act->actor->id} to {$this->_remote->nickname}.");
                     $otherProfile = $otherUser->getProfile();
                     Subscription::start($otherProfile, $this->_remote);
                     Subscription::cancel($otherProfile, $this->_user->getProfile());
                 } else {
-                    // It's a remote subscription. Do something here!
+                    $this->log(LOG_NOTICE,
+                               "Not changing sub to {$act->objects[0]->id}".
+                               "by remote {$act->actor->id} ".
+                               "to {$this->_remote->nickname}.");
                 }
             }
             break;

From a2aa87fbffe8b73d32463d1763e024da7ccdcd0b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 17 Jan 2011 15:45:03 -0500
Subject: [PATCH 075/314] OStatusPlugin does discovery in Profile::fromURI()

---
 plugins/OStatus/OStatusPlugin.php | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index 86bd15e0b7..59c18746f0 100644
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -992,17 +992,29 @@ class OStatusPlugin extends Plugin
         return false;
     }
 
-    function onStartGetProfileFromURI($uri, &$profile) {
+    function onStartGetProfileFromURI($uri, &$profile)
+    {
+        // Don't want to do Web-based discovery on our own server,
+        // so we check locally first.
 
-        // XXX: do discovery here instead (OStatus_profile::ensureProfileURI($uri))
+        $user = User::staticGet('uri', $uri);
+        
+        if (!empty($user)) {
+            $profile = $user->getProfile();
+            return false;
+        }
 
-        $oprofile = Ostatus_profile::staticGet('uri', $uri);
+        // Now, check remotely
 
-        if (!empty($oprofile) && !$oprofile->isGroup()) {
+        $oprofile = Ostatus_profile::ensureProfileURI($uri);
+
+        if (!empty($oprofile)) {
             $profile = $oprofile->localProfile();
             return false;
         }
 
+        // Still not a hit, so give up.
+
         return true;
     }
 

From 6d429ce3579fbbaef120140f4c2c5eae5a2bccf5 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 17 Jan 2011 15:57:04 -0500
Subject: [PATCH 076/314] return a 409 Conflict when subscription already
 exists

---
 actions/atompubsubscriptionfeed.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/actions/atompubsubscriptionfeed.php b/actions/atompubsubscriptionfeed.php
index 15ae79f6a6..b319f8dc03 100644
--- a/actions/atompubsubscriptionfeed.php
+++ b/actions/atompubsubscriptionfeed.php
@@ -263,6 +263,14 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction
                 return;
             }
 
+            if (Subscription::exists($this->_profile, $profile)) {
+                // 409 Conflict
+                $this->clientError(sprintf(_('Already subscribed to %s'),
+                                           $person->id), 
+                                   409);
+                return;
+            }
+
             if (Subscription::start($this->_profile, $profile)) {
                 $sub = Subscription::pkeyGet(array('subscriber' => $this->_profile->id,
                                                    'subscribed' => $profile->id));

From fb681990d9935715074b7d6755b52d7b091a06e7 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 17 Jan 2011 17:31:56 -0500
Subject: [PATCH 077/314] Account moving is a background activity

---
 lib/accountmover.php  | 143 +++++++++--------------------------
 lib/activitymover.php | 168 ++++++++++++++++++++++++++++++++++++++++++
 lib/queuemanager.php  |   2 +
 scripts/moveuser.php  |   4 +-
 4 files changed, 205 insertions(+), 112 deletions(-)
 create mode 100644 lib/activitymover.php

diff --git a/lib/accountmover.php b/lib/accountmover.php
index 31152fd118..85c95c1132 100644
--- a/lib/accountmover.php
+++ b/lib/accountmover.php
@@ -45,17 +45,16 @@ if (!defined('STATUSNET')) {
  * @link      http://status.net/
  */
 
-class AccountMover
+class AccountMover extends QueueHandler
 {
-    private $_user    = null;
-    private $_profile = null;
-    private $_remote  = null;
-    private $_sink    = null;
-    
-    function __construct($user, $remote, $password)
+    function transport()
     {
-        $this->_user    = $user;
-        $this->_profile = $user->getProfile();
+        return 'acctmove';
+    }
+
+    function handle($object)
+    {
+        list($user, $remote, $password) = $object;
 
         $remote = Discovery::normalize($remote);
 
@@ -65,11 +64,33 @@ class AccountMover
             throw new Exception("Can't locate account {$remote}");
         }
 
-        $this->_remote = $oprofile->localProfile();
-
         list($svcDocUrl, $username) = self::getServiceDocument($remote);
 
-        $this->_sink = new ActivitySink($svcDocUrl, $username, $password);
+        $sink = new ActivitySink($svcDocUrl, $username, $password);
+
+        $this->log(LOG_INFO, 
+                   "Moving user {$user->nickname} ".
+                   "to {$remote}.");
+
+        $stream = new UserActivityStream($user);
+
+        // Reverse activities to run in correct chron order
+
+        $acts = array_reverse($stream->activities);
+
+        $this->log(LOG_INFO,
+                   "Got ".count($acts)." activities ".
+                   "for {$user->nickname}.");
+
+        $qm = QueueManager::get();
+
+        foreach ($acts as $act) {
+            $qm->enqueue(array($act, $sink, $user->uri, $remote), 'actmove');
+        }
+
+        $this->log(LOG_INFO,
+                   "Finished moving user {$user->nickname} ".
+                   "to {$remote}.");
     }
 
     static function getServiceDocument($remote)
@@ -108,104 +129,6 @@ class AccountMover
         return array($svcDocUrl, $username);
     }
 
-    function move()
-    {
-        $this->log(LOG_INFO, 
-                   "Moving user {$this->_user->nickname} to {$this->_remote->nickname}");
-
-        $stream = new UserActivityStream($this->_user);
-
-        $acts = array_reverse($stream->activities);
-
-        $this->log(LOG_INFO,
-                   "Got {count($acts)} activities ".
-                   "for {$this->_user->nickname}");
-
-        // Reverse activities to run in correct chron order
-
-        foreach ($acts as $act) {
-            try {
-                $this->_moveActivity($act);
-            } catch (Exception $e) {
-                $this->log(LOG_ERR,
-                           "Error moving activity {$act->id} {$act->verb}: " .
-                           $e->getMessage());
-                continue;
-            }
-        }
-
-        $this->log(LOG_INFO,
-                   "Finished moving user {$this->_user->nickname} ".
-                   "to {$this->_remote->nickname}");
-    }
-
-    private function _moveActivity($act)
-    {
-        switch ($act->verb) {
-        case ActivityVerb::FAVORITE:
-            $this->log(LOG_INFO,
-                       "Moving favorite of {$act->objects[0]->id} by ".
-                       "{$act->actor->id} to {$this->_remote->nickname}.");
-            // push it, then delete local
-            $this->_sink->postActivity($act);
-            $notice = Notice::staticGet('uri', $act->objects[0]->id);
-            if (!empty($notice)) {
-                $fave = Fave::pkeyGet(array('user_id' => $this->_user->id,
-                                            'notice_id' => $notice->id));
-                $fave->delete();
-            }
-            break;
-        case ActivityVerb::POST:
-            $this->log(LOG_INFO,
-                       "Moving notice {$act->objects[0]->id} by ".
-                       "{$act->actor->id} to {$this->_remote->nickname}.");
-            // XXX: send a reshare, not a post
-            $this->_sink->postActivity($act);
-            $notice = Notice::staticGet('uri', $act->objects[0]->id);
-            if (!empty($notice)) {
-                $notice->delete();
-            }
-            break;
-        case ActivityVerb::JOIN:
-            $this->log(LOG_INFO,
-                       "Moving group join of {$act->objects[0]->id} by ".
-                       "{$act->actor->id} to {$this->_remote->nickname}.");
-            $this->_sink->postActivity($act);
-            $group = User_group::staticGet('uri', $act->objects[0]->id);
-            if (!empty($group)) {
-                Group_member::leave($group->id, $this->_user->id);
-            }
-            break;
-        case ActivityVerb::FOLLOW:
-            if ($act->actor->id == $this->_user->uri) {
-                $this->log(LOG_INFO,
-                           "Moving subscription to {$act->objects[0]->id} by ".
-                           "{$act->actor->id} to {$this->_remote->nickname}.");
-                $this->_sink->postActivity($act);
-                $other = Profile::fromURI($act->objects[0]->id);
-                if (!empty($other)) {
-                    Subscription::cancel($this->_profile, $other);
-                }
-            } else {
-                $otherUser = User::staticGet('uri', $act->actor->id);
-                if (!empty($otherUser)) {
-                    $this->log(LOG_INFO,
-                               "Changing sub to {$act->objects[0]->id}".
-                               "by {$act->actor->id} to {$this->_remote->nickname}.");
-                    $otherProfile = $otherUser->getProfile();
-                    Subscription::start($otherProfile, $this->_remote);
-                    Subscription::cancel($otherProfile, $this->_user->getProfile());
-                } else {
-                    $this->log(LOG_NOTICE,
-                               "Not changing sub to {$act->objects[0]->id}".
-                               "by remote {$act->actor->id} ".
-                               "to {$this->_remote->nickname}.");
-                }
-            }
-            break;
-        }
-    }
-
     /**
      * Log some data
      * 
diff --git a/lib/activitymover.php b/lib/activitymover.php
new file mode 100644
index 0000000000..7032331104
--- /dev/null
+++ b/lib/activitymover.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * Title of module
+ * 
+ * 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 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);
+}
+
+/**
+ * Class comment
+ *
+ * @category  General
+ * @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 ActivityMover extends QueueHandler
+{
+    function transport()
+    {
+        return 'actmove';
+    }
+    
+    function handle($data)
+    {
+        list ($act, $sink, $userURI, $remoteURI) = $data;
+
+        $user   = User::staticGet('uri', $userURI);
+        $remote = Profile::fromURI($remoteURI);
+
+        try {
+            $this->moveActivity($act, $sink, $user, $remote);
+        } catch (ClientException $cex) {
+            $this->log(LOG_WARNING,
+                       $cex->getMessage());
+            // "don't retry me"
+            return true;
+        } catch (ServerException $sex) {
+            $this->log(LOG_WARNING,
+                       $sex->getMessage());
+            // "retry me" (because we think the server might handle it next time)
+            return false;
+        } catch (Exception $ex) {
+            $this->log(LOG_WARNING,
+                       $ex->getMessage());
+            // "don't retry me"
+            return true;
+        }
+    }
+
+    function moveActivity($act, $sink, $user, $remote)
+    {
+        if (empty($user)) {
+            throw new Exception("No such user {$act->actor->id}");
+        }
+
+        switch ($act->verb) {
+        case ActivityVerb::FAVORITE:
+            $this->log(LOG_INFO,
+                       "Moving favorite of {$act->objects[0]->id} by ".
+                       "{$act->actor->id} to {$remote->nickname}.");
+            // push it, then delete local
+            $sink->postActivity($act);
+            $notice = Notice::staticGet('uri', $act->objects[0]->id);
+            if (!empty($notice)) {
+                $fave = Fave::pkeyGet(array('user_id' => $user->id,
+                                            'notice_id' => $notice->id));
+                $fave->delete();
+            }
+            break;
+        case ActivityVerb::POST:
+            $this->log(LOG_INFO,
+                       "Moving notice {$act->objects[0]->id} by ".
+                       "{$act->actor->id} to {$remote->nickname}.");
+            // XXX: send a reshare, not a post
+            $sink->postActivity($act);
+            $notice = Notice::staticGet('uri', $act->objects[0]->id);
+            if (!empty($notice)) {
+                $notice->delete();
+            }
+            break;
+        case ActivityVerb::JOIN:
+            $this->log(LOG_INFO,
+                       "Moving group join of {$act->objects[0]->id} by ".
+                       "{$act->actor->id} to {$remote->nickname}.");
+            $sink->postActivity($act);
+            $group = User_group::staticGet('uri', $act->objects[0]->id);
+            if (!empty($group)) {
+                Group_member::leave($group->id, $user->id);
+            }
+            break;
+        case ActivityVerb::FOLLOW:
+            if ($act->actor->id == $user->uri) {
+                $this->log(LOG_INFO,
+                           "Moving subscription to {$act->objects[0]->id} by ".
+                           "{$act->actor->id} to {$remote->nickname}.");
+                $sink->postActivity($act);
+                $other = Profile::fromURI($act->objects[0]->id);
+                if (!empty($other)) {
+                    Subscription::cancel($user->getProfile(), $other);
+                }
+            } else {
+                $otherUser = User::staticGet('uri', $act->actor->id);
+                if (!empty($otherUser)) {
+                    $this->log(LOG_INFO,
+                               "Changing sub to {$act->objects[0]->id}".
+                               "by {$act->actor->id} to {$remote->nickname}.");
+                    $otherProfile = $otherUser->getProfile();
+                    Subscription::start($otherProfile, $remote);
+                    Subscription::cancel($otherProfile, $user->getProfile());
+                } else {
+                    $this->log(LOG_NOTICE,
+                               "Not changing sub to {$act->objects[0]->id}".
+                               "by remote {$act->actor->id} ".
+                               "to {$remote->nickname}.");
+                }
+            }
+            break;
+        }
+    }
+
+    /**
+     * Log some data
+     * 
+     * Add a header for our class so we know who did it.
+     *
+     * @param int    $level   Log level, like LOG_ERR or LOG_INFO
+     * @param string $message Message to log
+     *
+     * @return void
+     */
+
+    protected function log($level, $message)
+    {
+        common_log($level, "ActivityMover: " . $message);
+    }
+}
diff --git a/lib/queuemanager.php b/lib/queuemanager.php
index 65a972e234..5b59444bc2 100644
--- a/lib/queuemanager.php
+++ b/lib/queuemanager.php
@@ -268,6 +268,8 @@ abstract class QueueManager extends IoManager
             $this->connect('deluser', 'DelUserQueueHandler');
             $this->connect('feedimp', 'FeedImporter');
             $this->connect('actimp', 'ActivityImporter');
+            $this->connect('acctmove', 'AccountMover');
+            $this->connect('actmove', 'ActivityMover');
 
             // Broadcasting profile updates to OMB remote subscribers
             $this->connect('profile', 'ProfileQueueHandler');
diff --git a/scripts/moveuser.php b/scripts/moveuser.php
index b02b10b1e5..cf8fd2e0be 100644
--- a/scripts/moveuser.php
+++ b/scripts/moveuser.php
@@ -51,9 +51,9 @@ try {
 
     $password = get_option_value('w', 'password');
 
-    $mover = new AccountMover($user, $remote, $password);
+    $qm = QueueManager::get();
 
-    $mover->move();
+    $qm->enqueue(array($user, $remote, $password), 'acctmove');
 
 } catch (Exception $e) {
     print $e->getMessage()."\n";

From a3c08faddd8bce8887bbcf263cec8bdc2a6c0f11 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 17 Jan 2011 17:32:44 -0500
Subject: [PATCH 078/314] Erroneous code ensuring Webfinger accounts

Ostatus_profile::ensureProfileURI() was accidentally falling through to
the default switch case, and was also calling common_log() incorrectly.
---
 plugins/OStatus/classes/Ostatus_profile.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 06e42187d4..303e177a57 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -1779,8 +1779,10 @@ class Ostatus_profile extends Memcached_DataObject
                 case 'mailto':
                     $rest = $match[2];
                     $oprofile = Ostatus_profile::ensureWebfinger($rest);
+                    break;
                 default:
-                    common_log("Unrecognized URI protocol for profile: $protocol ($uri)");
+                    common_log(LOG_WARNING,
+                               "Unrecognized URI protocol for profile: $protocol ($uri)");
                     break;
                 }
             }

From aa4a8e50511a61039fc158a6bc5fa0a853eb79c4 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 17 Jan 2011 18:04:10 -0500
Subject: [PATCH 079/314] wrap account actions in a section

---
 actions/profilesettings.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 19fbdbd293..303bb0ad9b 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -458,6 +458,9 @@ class ProfilesettingsAction extends AccountSettingsAction
 
         $this->elementStart('div', array('id' => 'aside_primary',
                                          'class' => 'aside'));
+
+        $this->elementStart('div', array('id' => 'account_actions',
+                                         'class' => 'section'));
         $this->elementStart('ul');
         if (Event::handle('StartProfileSettingsActions', array($this))) {
             if ($user->hasRight(Right::BACKUPACCOUNT)) {
@@ -485,5 +488,6 @@ class ProfilesettingsAction extends AccountSettingsAction
         }
         $this->elementEnd('ul');
         $this->elementEnd('div');
+        $this->elementEnd('div');
     }
 }

From ea3105140140bc4537f34042b7c360619f5022b2 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 18 Jan 2011 11:08:32 -0800
Subject: [PATCH 080/314] TwitterBridge fix: merge down remaining 64-bit
 Snowflake ID fixes for twitterstatusfetcher.php from 0.9.x

Original fixes in c169dcb5221cf3dd452c291bf97374bb459cc5b9; didn't get merged in 39cad55711897323fac5f651c003c4d815a51ae0 because the code had been broken out to another file, but manual merge went smooth.

These affect twitterstatusfetcher.php on all 32-bit installs and some 64-bit installs (depending on whether the version of the JSON library reads the large numbers as long or double internally). 64-bit bug is harder to see as it tends to manifest as off-by-one due to losing a bit of precision off the end.
---
 .../daemons/twitterstatusfetcher.php          | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
index 1b9cca8ecb..64b8acebde 100755
--- a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
+++ b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
@@ -200,7 +200,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon
 
             if (preg_match("/$source/", mb_strtolower($status->source))) {
                 common_debug($this->name() . ' - Skipping import of status ' .
-                             $status->id . ' with source ' . $source);
+                             twitter_id($status) . ' with source ' . $source);
                 continue;
             }
 
@@ -238,23 +238,24 @@ class TwitterStatusFetcher extends ParallelizingDaemon
             return null;
         }
 
-        $statusUri = $this->makeStatusURI($status->user->screen_name, $status->id);
+        $statusId = twitter_id($status);
+        $statusUri = $this->makeStatusURI($status->user->screen_name, $statusId);
 
         // check to see if we've already imported the status
-        $n2s = Notice_to_status::staticGet('status_id', $status->id);
+        $n2s = Notice_to_status::staticGet('status_id', $statusId);
 
         if (!empty($n2s)) {
             common_log(
                 LOG_INFO,
                 $this->name() .
-                " - Ignoring duplicate import: {$status->id}"
+                " - Ignoring duplicate import: {$statusId}"
             );
             return Notice::staticGet('id', $n2s->notice_id);
         }
 
         // If it's a retweet, save it as a repeat!
         if (!empty($status->retweeted_status)) {
-            common_log(LOG_INFO, "Status {$status->id} is a retweet of {$status->retweeted_status->id}.");
+            common_log(LOG_INFO, "Status {$statusId} is a retweet of " . twitter_id($status->retweeted_status) . ".");
             $original = $this->saveStatus($status->retweeted_status);
             if (empty($original)) {
                 return null;
@@ -278,7 +279,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon
                                                 'uri' => $statusUri,
                                                 'is_local' => Notice::GATEWAY));
                 common_log(LOG_INFO, "Saved {$repeat->id} as a repeat of {$original->id}");
-                Notice_to_status::saveNew($repeat->id, $status->id);
+                Notice_to_status::saveNew($repeat->id, $statusId);
                 return $repeat;
             }
         }
@@ -297,17 +298,18 @@ class TwitterStatusFetcher extends ParallelizingDaemon
 
         $notice->reply_to   = null;
 
-        if (!empty($status->in_reply_to_status_id)) {
-            common_log(LOG_INFO, "Status {$status->id} is a reply to status {$status->in_reply_to_status_id}");
-            $n2s = Notice_to_status::staticGet('status_id', $status->in_reply_to_status_id);
+        $replyTo = twitter_id($status, 'in_reply_to_status_id');
+        if (!empty($replyTo)) {
+            common_log(LOG_INFO, "Status {$statusId} is a reply to status {$replyTo}");
+            $n2s = Notice_to_status::staticGet('status_id', $replyTo);
             if (empty($n2s)) {
-                common_log(LOG_INFO, "Couldn't find local notice for status {$status->in_reply_to_status_id}");
+                common_log(LOG_INFO, "Couldn't find local notice for status {$replyTo}");
             } else {
                 $reply = Notice::staticGet('id', $n2s->notice_id);
                 if (empty($reply)) {
-                    common_log(LOG_INFO, "Couldn't find local notice for status {$status->in_reply_to_status_id}");
+                    common_log(LOG_INFO, "Couldn't find local notice for status {$replyTo}");
                 } else {
-                    common_log(LOG_INFO, "Found local notice {$reply->id} for status {$status->in_reply_to_status_id}");
+                    common_log(LOG_INFO, "Found local notice {$reply->id} for status {$replyTo}");
                     $notice->reply_to     = $reply->id;
                     $notice->conversation = $reply->conversation;
                 }
@@ -317,7 +319,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon
         if (empty($notice->conversation)) {
             $conv = Conversation::create();
             $notice->conversation = $conv->id;
-            common_log(LOG_INFO, "No known conversation for status {$status->id} so making a new one {$conv->id}.");
+            common_log(LOG_INFO, "No known conversation for status {$statusId} so making a new one {$conv->id}.");
         }
 
         $notice->is_local   = Notice::GATEWAY;
@@ -338,7 +340,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon
             Event::handle('EndNoticeSave', array($notice));
         }
 
-        Notice_to_status::saveNew($notice->id, $status->id);
+        Notice_to_status::saveNew($notice->id, $statusId);
 
         $this->saveStatusMentions($notice, $status);
 

From d0d1257d9928f9a282874bec0423885839d84a20 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 18 Jan 2011 12:34:04 -0800
Subject: [PATCH 081/314] SubMirror: switch the mirror setup tab from account
 settings to subscriptions/groups/invites area

---
 plugins/SubMirror/SubMirrorPlugin.php        | 7 ++++---
 plugins/SubMirror/actions/mirrorsettings.php | 6 ++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/plugins/SubMirror/SubMirrorPlugin.php b/plugins/SubMirror/SubMirrorPlugin.php
index 578ef6607c..0f2fc24787 100644
--- a/plugins/SubMirror/SubMirrorPlugin.php
+++ b/plugins/SubMirror/SubMirrorPlugin.php
@@ -93,15 +93,16 @@ class SubMirrorPlugin extends Plugin
     }
 
     /**
-     * Menu item for settings
+     * Menu item for personal subscriptions/groups area
      *
-     * @param Action &$action Action being executed
+     * @param Widget $widget Widget being executed
      *
      * @return boolean hook return
      */
 
-    function onEndAccountSettingsNav(&$action)
+    function onEndSubGroupNav($widget)
     {
+        $action = $widget->out;
         $action_name = $action->trimmed('action');
 
         $action->menuItem(common_local_url('mirrorsettings'),
diff --git a/plugins/SubMirror/actions/mirrorsettings.php b/plugins/SubMirror/actions/mirrorsettings.php
index a828b26feb..20e1807b3d 100644
--- a/plugins/SubMirror/actions/mirrorsettings.php
+++ b/plugins/SubMirror/actions/mirrorsettings.php
@@ -102,4 +102,10 @@ class MirrorSettingsAction extends AccountSettingsAction
     function handlePost()
     {
     }
+
+    function showLocalNav()
+    {
+        $nav = new SubGroupNav($this, common_current_user());
+        $nav->show();
+    }
 }

From 56e2bc10d97a0241d3ce9e8abadd3d42658701ec Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 18 Jan 2011 12:34:27 -0800
Subject: [PATCH 082/314] Cleanup stray PHP 4-style references in hook calls
 for navigation bars. We can't replace the live action from here, and don't
 need a reference to keep the object mutable. Dumping the references helps
 ensure we don't end up getting errors when things calling the hooks might
 forget to use the reference and the PHP error reporting settings expose this
 fact at us.

---
 lib/accountsettingsaction.php                        |  4 ++--
 lib/connectsettingsaction.php                        |  4 ++--
 lib/logingroupnav.php                                |  4 ++--
 lib/userprofile.php                                  | 12 ++++++------
 .../CasAuthentication/CasAuthenticationPlugin.php    |  2 +-
 plugins/Facebook/FacebookPlugin.php                  |  8 ++++----
 plugins/FacebookBridge/FacebookBridgePlugin.php      |  8 ++++----
 plugins/NewMenu/NewMenuPlugin.php                    | 10 +++++-----
 plugins/OpenID/OpenIDPlugin.php                      | 12 ++++++------
 plugins/TwitterBridge/TwitterBridgePlugin.php        |  8 ++++----
 plugins/UserFlag/UserFlagPlugin.php                  |  4 ++--
 11 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/lib/accountsettingsaction.php b/lib/accountsettingsaction.php
index 7991c9002c..b1ea998bfa 100644
--- a/lib/accountsettingsaction.php
+++ b/lib/accountsettingsaction.php
@@ -96,7 +96,7 @@ class AccountSettingsNav extends Widget
         $action_name = $this->action->trimmed('action');
         $this->action->elementStart('ul', array('class' => 'nav'));
 
-        if (Event::handle('StartAccountSettingsNav', array(&$this->action))) {
+        if (Event::handle('StartAccountSettingsNav', array($this->action))) {
             $user = common_current_user();
 
             if(Event::handle('StartAccountSettingsProfileMenuItem', array($this, &$menu))){
@@ -142,7 +142,7 @@ class AccountSettingsNav extends Widget
                 Event::handle('EndAccountSettingsOtherMenuItem', array($this, &$menu));
             }
 
-            Event::handle('EndAccountSettingsNav', array(&$this->action));
+            Event::handle('EndAccountSettingsNav', array($this->action));
         }
 
         $this->action->elementEnd('ul');
diff --git a/lib/connectsettingsaction.php b/lib/connectsettingsaction.php
index 325276c5fc..20f18ef0d9 100644
--- a/lib/connectsettingsaction.php
+++ b/lib/connectsettingsaction.php
@@ -96,7 +96,7 @@ class ConnectSettingsNav extends Widget
         $action_name = $this->action->trimmed('action');
         $this->action->elementStart('ul', array('class' => 'nav'));
 
-        if (Event::handle('StartConnectSettingsNav', array(&$this->action))) {
+        if (Event::handle('StartConnectSettingsNav', array($this->action))) {
 
             # action => array('prompt', 'title')
             $menu = array();
@@ -129,7 +129,7 @@ class ConnectSettingsNav extends Widget
                         $action_name === $menuaction);
             }
 
-            Event::handle('EndConnectSettingsNav', array(&$this->action));
+            Event::handle('EndConnectSettingsNav', array($this->action));
         }
 
         $this->action->elementEnd('ul');
diff --git a/lib/logingroupnav.php b/lib/logingroupnav.php
index b545fbf269..0fd0f45c7d 100644
--- a/lib/logingroupnav.php
+++ b/lib/logingroupnav.php
@@ -73,7 +73,7 @@ class LoginGroupNav extends Widget
 
         $this->action->elementStart('ul', array('class' => 'nav'));
 
-        if (Event::handle('StartLoginGroupNav', array(&$this->action))) {
+        if (Event::handle('StartLoginGroupNav', array($this->action))) {
 
             $this->action->menuItem(common_local_url('login'),
                                     _('Login'),
@@ -87,7 +87,7 @@ class LoginGroupNav extends Widget
                                         $action_name === 'register');
             }
 
-            Event::handle('EndLoginGroupNav', array(&$this->action));
+            Event::handle('EndLoginGroupNav', array($this->action));
         }
 
         $this->action->elementEnd('ul');
diff --git a/lib/userprofile.php b/lib/userprofile.php
index 2813f735ea..91c5fb413a 100644
--- a/lib/userprofile.php
+++ b/lib/userprofile.php
@@ -242,7 +242,7 @@ class UserProfile extends Widget
             $this->out->elementEnd('div');
             return;
         }
-        if (Event::handle('StartProfilePageActionsSection', array(&$this->out, $this->profile))) {
+        if (Event::handle('StartProfilePageActionsSection', array($this->out, $this->profile))) {
 
             $cur = common_current_user();
 
@@ -250,13 +250,13 @@ class UserProfile extends Widget
             $this->out->element('h2', null, _('User actions'));
             $this->out->elementStart('ul');
 
-            if (Event::handle('StartProfilePageActionsElements', array(&$this->out, $this->profile))) {
+            if (Event::handle('StartProfilePageActionsElements', array($this->out, $this->profile))) {
                 if (empty($cur)) { // not logged in
-                    if (Event::handle('StartProfileRemoteSubscribe', array(&$this->out, $this->profile))) {
+                    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));
+                        Event::handle('EndProfileRemoteSubscribe', array($this->out, $this->profile));
                     }
                 } else {
                     if ($cur->id == $this->profile->id) { // your own page
@@ -376,13 +376,13 @@ class UserProfile extends Widget
                     }
                 }
 
-                Event::handle('EndProfilePageActionsElements', array(&$this->out, $this->profile));
+                Event::handle('EndProfilePageActionsElements', array($this->out, $this->profile));
             }
 
             $this->out->elementEnd('ul');
             $this->out->elementEnd('div');
 
-            Event::handle('EndProfilePageActionsSection', array(&$this->out, $this->profile));
+            Event::handle('EndProfilePageActionsSection', array($this->out, $this->profile));
         }
     }
 
diff --git a/plugins/CasAuthentication/CasAuthenticationPlugin.php b/plugins/CasAuthentication/CasAuthenticationPlugin.php
index 71e54d41f9..3196bd94a7 100644
--- a/plugins/CasAuthentication/CasAuthenticationPlugin.php
+++ b/plugins/CasAuthentication/CasAuthenticationPlugin.php
@@ -74,7 +74,7 @@ class CasAuthenticationPlugin extends AuthenticationPlugin
         return true;
     }
 
-    function onEndLoginGroupNav(&$action)
+    function onEndLoginGroupNav($action)
     {
         $action_name = $action->trimmed('action');
 
diff --git a/plugins/Facebook/FacebookPlugin.php b/plugins/Facebook/FacebookPlugin.php
index 798009817c..e877d300b6 100644
--- a/plugins/Facebook/FacebookPlugin.php
+++ b/plugins/Facebook/FacebookPlugin.php
@@ -446,11 +446,11 @@ class FacebookPlugin extends Plugin
     /*
      * Add a login tab for Facebook Connect
      *
-     * @param Action &action the current action
+     * @param Action $action the current action
      *
      * @return void
      */
-    function onEndLoginGroupNav(&$action)
+    function onEndLoginGroupNav($action)
     {
         if (self::hasKeys()) {
             $action_name = $action->trimmed('action');
@@ -470,11 +470,11 @@ class FacebookPlugin extends Plugin
     /*
      * Add a tab for managing Facebook Connect settings
      *
-     * @param Action &action the current action
+     * @param Action $action the current action
      *
      * @return void
      */
-    function onEndConnectSettingsNav(&$action)
+    function onEndConnectSettingsNav($action)
     {
         if (self::hasKeys()) {
             $action_name = $action->trimmed('action');
diff --git a/plugins/FacebookBridge/FacebookBridgePlugin.php b/plugins/FacebookBridge/FacebookBridgePlugin.php
index 8b5d05e983..000b214ff4 100644
--- a/plugins/FacebookBridge/FacebookBridgePlugin.php
+++ b/plugins/FacebookBridge/FacebookBridgePlugin.php
@@ -186,11 +186,11 @@ class FacebookBridgePlugin extends Plugin
      * Add a login tab for Facebook, but only if there's a Facebook
      * application defined for the plugin to use.
      *
-     * @param Action &action the current action
+     * @param Action $action the current action
      *
      * @return void
      */
-    function onEndLoginGroupNav(&$action)
+    function onEndLoginGroupNav($action)
     {
         $action_name = $action->trimmed('action');
 
@@ -252,11 +252,11 @@ class FacebookBridgePlugin extends Plugin
      * Add a tab for user-level Facebook settings if the user
      * has a link to Facebook
      *
-     * @param Action &action the current action
+     * @param Action $action the current action
      *
      * @return void
      */
-    function onEndConnectSettingsNav(&$action)
+    function onEndConnectSettingsNav($action)
     {
         if ($this->hasApplication()) {
             $action_name = $action->trimmed('action');
diff --git a/plugins/NewMenu/NewMenuPlugin.php b/plugins/NewMenu/NewMenuPlugin.php
index cdcea5cd92..14950ab079 100644
--- a/plugins/NewMenu/NewMenuPlugin.php
+++ b/plugins/NewMenu/NewMenuPlugin.php
@@ -279,19 +279,19 @@ class NewMenuPlugin extends Plugin
         return true;
     }
 
-    function onStartAccountSettingsNav(&$action)
+    function onStartAccountSettingsNav($action)
     {
         $this->_settingsMenu($action);
         return false;
     }
 
-    function onStartConnectSettingsNav(&$action)
+    function onStartConnectSettingsNav($action)
     {
         $this->_settingsMenu($action);
         return false;
     }
 
-    private function _settingsMenu(&$action)
+    private function _settingsMenu($action)
     {
         $actionName = $action->trimmed('action');
 
@@ -325,7 +325,7 @@ class NewMenuPlugin extends Plugin
                           _('Other options'),
                           $actionName == 'othersettings');
 
-        Event::handle('EndAccountSettingsNav', array(&$action));
+        Event::handle('EndAccountSettingsNav', array($action));
         
         if (common_config('xmpp', 'enabled')) {
             $action->menuItem(common_local_url('imsettings'),
@@ -346,7 +346,7 @@ class NewMenuPlugin extends Plugin
                           _('Authorized connected applications'),
                           $actionName == 'oauthconnectionsettings');
 
-        Event::handle('EndConnectSettingsNav', array(&$action));
+        Event::handle('EndConnectSettingsNav', array($action));
     }
 
     function onEndShowStyles($action)
diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php
index d5a8c1bf02..2635cb7c9d 100644
--- a/plugins/OpenID/OpenIDPlugin.php
+++ b/plugins/OpenID/OpenIDPlugin.php
@@ -248,11 +248,11 @@ class OpenIDPlugin extends Plugin
      *
      * If we're in openidOnly mode, we disable the menu for all other login.
      *
-     * @param Action &$action Action being executed
+     * @param Action $action Action being executed
      *
      * @return boolean hook return
      */
-    function onStartLoginGroupNav(&$action)
+    function onStartLoginGroupNav($action)
     {
         if (common_config('site', 'openidonly')) {
             $this->showOpenIDLoginTab($action);
@@ -268,11 +268,11 @@ class OpenIDPlugin extends Plugin
     /**
      * Menu item for login
      *
-     * @param Action &$action Action being executed
+     * @param Action $action Action being executed
      *
      * @return boolean hook return
      */
-    function onEndLoginGroupNav(&$action)
+    function onEndLoginGroupNav($action)
     {
         $this->showOpenIDLoginTab($action);
 
@@ -318,11 +318,11 @@ class OpenIDPlugin extends Plugin
     /**
      * Menu item for OpenID settings
      *
-     * @param Action &$action Action being executed
+     * @param Action $action Action being executed
      *
      * @return boolean hook return
      */
-    function onEndAccountSettingsNav(&$action)
+    function onEndAccountSettingsNav($action)
     {
         $action_name = $action->trimmed('action');
 
diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php
index b2dce6f1c0..048daad98f 100644
--- a/plugins/TwitterBridge/TwitterBridgePlugin.php
+++ b/plugins/TwitterBridge/TwitterBridgePlugin.php
@@ -137,11 +137,11 @@ class TwitterBridgePlugin extends Plugin
     /*
      * Add a login tab for 'Sign in with Twitter'
      *
-     * @param Action &action the current action
+     * @param Action $action the current action
      *
      * @return void
      */
-    function onEndLoginGroupNav(&$action)
+    function onEndLoginGroupNav($action)
     {
         $action_name = $action->trimmed('action');
 
@@ -160,11 +160,11 @@ class TwitterBridgePlugin extends Plugin
     /**
      * Add the Twitter Settings page to the Connect Settings menu
      *
-     * @param Action &$action The calling page
+     * @param Action $action The calling page
      *
      * @return boolean hook return
      */
-    function onEndConnectSettingsNav(&$action)
+    function onEndConnectSettingsNav($action)
     {
         if (self::hasKeys()) {
             $action_name = $action->trimmed('action');
diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php
index fc7698841e..a375717ccd 100644
--- a/plugins/UserFlag/UserFlagPlugin.php
+++ b/plugins/UserFlag/UserFlagPlugin.php
@@ -121,12 +121,12 @@ class UserFlagPlugin extends Plugin
     /**
      * Add a 'flag' button to profile page
      *
-     * @param Action  &$action The action being called
+     * @param Action  $action The action being called
      * @param Profile $profile Profile being shown
      *
      * @return boolean hook result
      */
-    function onEndProfilePageActionsElements(&$action, $profile)
+    function onEndProfilePageActionsElements($action, $profile)
     {
         $this->showFlagButton($action, $profile,
                               array('action' => 'showstream',

From 9be770e60995679997e689ffbb4038e18d6c894e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 18 Jan 2011 12:52:38 -0800
Subject: [PATCH 083/314] Start cleaning up profile sidebar: link the header
 text on subscription/subscriber/groups sections to the tabs so users don't
 have to dance around looking for the link if they don't have enough to
 trigger a 'more' link. Consolidated some of that link generation; sooooo much
 more dupe code to kill in this section!

---
 lib/profileaction.php | 54 ++++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/lib/profileaction.php b/lib/profileaction.php
index 4bfc4d48d9..fd2b73f6f2 100644
--- a/lib/profileaction.php
+++ b/lib/profileaction.php
@@ -99,6 +99,21 @@ class ProfileAction extends OwnerDesignAction
         $this->showStatistics();
     }
 
+    /**
+     * Convenience function for common pattern of links to subscription/groups sections.
+     *
+     * @param string $actionClass
+     * @param string $title
+     * @param string $cssClass
+     */
+    private function statsSectionLink($actionClass, $title, $cssClass='')
+    {
+        $this->element('a', array('href' => common_local_url($actionClass,
+                                                             array('nickname' => $this->profile->nickname)),
+                                  'class' => $cssClass),
+                       $title);
+    }
+
     function showSubscriptions()
     {
         $profile = $this->profile->getSubscriptions(0, PROFILES_PER_MINILIST + 1);
@@ -106,7 +121,9 @@ class ProfileAction extends OwnerDesignAction
         $this->elementStart('div', array('id' => 'entity_subscriptions',
                                          'class' => 'section'));
         if (Event::handle('StartShowSubscriptionsMiniList', array($this))) {
-            $this->element('h2', null, _('Subscriptions'));
+            $this->elementStart('h2');
+            $this->statsSectionLink('subscriptions', _('Subscriptions'));
+            $this->elementEnd('h2');
 
             $cnt = 0;
 
@@ -120,10 +137,7 @@ class ProfileAction extends OwnerDesignAction
 
             if ($cnt > PROFILES_PER_MINILIST) {
                 $this->elementStart('p');
-                $this->element('a', array('href' => common_local_url('subscriptions',
-                                                                     array('nickname' => $this->profile->nickname)),
-                                          'class' => 'more'),
-                               _('All subscriptions'));
+                $this->statsSectionLink('subscriptions', _('All subscriptions'), 'more');
                 $this->elementEnd('p');
             }
 
@@ -141,7 +155,9 @@ class ProfileAction extends OwnerDesignAction
 
         if (Event::handle('StartShowSubscribersMiniList', array($this))) {
 
-            $this->element('h2', null, _('Subscribers'));
+            $this->elementStart('h2');
+            $this->statsSectionLink('subscribers', _('Subscribers'));
+            $this->elementEnd('h2');
 
             $cnt = 0;
 
@@ -155,10 +171,7 @@ class ProfileAction extends OwnerDesignAction
 
             if ($cnt > PROFILES_PER_MINILIST) {
                 $this->elementStart('p');
-                $this->element('a', array('href' => common_local_url('subscribers',
-                                                                     array('nickname' => $this->profile->nickname)),
-                                          'class' => 'more'),
-                               _('All subscribers'));
+                $this->statsSectionLink('subscribers', _('All subscribers'), 'more');
                 $this->elementEnd('p');
             }
 
@@ -200,27 +213,21 @@ class ProfileAction extends OwnerDesignAction
 
         $this->elementStart('dl', 'entity_subscriptions');
         $this->elementStart('dt');
-        $this->element('a', array('href' => common_local_url('subscriptions',
-                                                             array('nickname' => $this->profile->nickname))),
-                       _('Subscriptions'));
+        $this->statsSectionLink('subscriptions', _('Subscriptions'));
         $this->elementEnd('dt');
         $this->element('dd', null, $subs_count);
         $this->elementEnd('dl');
 
         $this->elementStart('dl', 'entity_subscribers');
         $this->elementStart('dt');
-        $this->element('a', array('href' => common_local_url('subscribers',
-                                                             array('nickname' => $this->profile->nickname))),
-                       _('Subscribers'));
+        $this->statsSectionLink('subscribers', _('Subscribers'));
         $this->elementEnd('dt');
         $this->element('dd', 'subscribers', $subbed_count);
         $this->elementEnd('dl');
 
         $this->elementStart('dl', 'entity_groups');
         $this->elementStart('dt');
-        $this->element('a', array('href' => common_local_url('usergroups',
-                                                             array('nickname' => $this->profile->nickname))),
-                       _('Groups'));
+        $this->statsSectionLink('usergroups', _('Groups'));
         $this->elementEnd('dt');
         $this->element('dd', 'groups', $group_count);
         $this->elementEnd('dl');
@@ -246,7 +253,9 @@ class ProfileAction extends OwnerDesignAction
         $this->elementStart('div', array('id' => 'entity_groups',
                                          'class' => 'section'));
         if (Event::handle('StartShowGroupsMiniList', array($this))) {
-            $this->element('h2', null, _('Groups'));
+            $this->elementStart('h2');
+            $this->statsSectionLink('usergroups', _('Groups'));
+            $this->elementEnd('h2');
 
             if ($groups) {
                 $gml = new GroupMiniList($groups, $this->profile, $this);
@@ -258,10 +267,7 @@ class ProfileAction extends OwnerDesignAction
 
             if ($cnt > GROUPS_PER_MINILIST) {
                 $this->elementStart('p');
-                $this->element('a', array('href' => common_local_url('usergroups',
-                                                                     array('nickname' => $this->profile->nickname)),
-                                          'class' => 'more'),
-                               _('All groups'));
+                $this->statsSectionLink('usergroups', _('All groups'), 'more');
                 $this->elementEnd('p');
             }
 

From ff6df8061b1b1cdd2685246ed238818ed46c959f Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 18 Jan 2011 13:12:08 -0800
Subject: [PATCH 084/314] Refactor profile sidebar stats generation: factor out
 giant chunk of repeated method calls

---
 lib/profileaction.php | 55 +++++++++++++++++--------------------------
 1 file changed, 21 insertions(+), 34 deletions(-)

diff --git a/lib/profileaction.php b/lib/profileaction.php
index fd2b73f6f2..ae70ad560b 100644
--- a/lib/profileaction.php
+++ b/lib/profileaction.php
@@ -200,52 +200,39 @@ class ProfileAction extends OwnerDesignAction
         $this->element('h2', null, _('Statistics'));
 
         // Other stats...?
-        $this->elementStart('dl', 'entity_user-id');
-        $this->element('dt', null, _('User ID'));
-        $this->element('dd', null, $this->profile->id);
-        $this->elementEnd('dl');
+        $this->showStatsRow('user-id', _('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->showStatsRow('member-since', _('Member since'), date('j M Y',
                                         strtotime($this->profile->created)));
-        $this->elementEnd('dl');
 
-        $this->elementStart('dl', 'entity_subscriptions');
-        $this->elementStart('dt');
-        $this->statsSectionLink('subscriptions', _('Subscriptions'));
-        $this->elementEnd('dt');
-        $this->element('dd', null, $subs_count);
-        $this->elementEnd('dl');
+        $this->showStatsRow('subscriptions', _('Subscriptions'), $subs_count, 'subscriptions');
 
-        $this->elementStart('dl', 'entity_subscribers');
-        $this->elementStart('dt');
-        $this->statsSectionLink('subscribers', _('Subscribers'));
-        $this->elementEnd('dt');
-        $this->element('dd', 'subscribers', $subbed_count);
-        $this->elementEnd('dl');
+        $this->showStatsRow('subscribers', _('Subscribers'), $subbed_count, 'subscribed');
 
-        $this->elementStart('dl', 'entity_groups');
-        $this->elementStart('dt');
-        $this->statsSectionLink('usergroups', _('Groups'));
-        $this->elementEnd('dt');
-        $this->element('dd', 'groups', $group_count);
-        $this->elementEnd('dl');
+        $this->showStatsRow('groups', _('Groups'), $group_count, 'usergroup');
 
-        $this->elementStart('dl', 'entity_notices');
-        $this->element('dt', null, _('Notices'));
-        $this->element('dd', null, $notice_count);
-        $this->elementEnd('dl');
+        $this->showStatsRow('notices', _('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->elementEnd('dl');
+        $this->showStatsRow('daily_notices', _('Daily average'), $daily_count);
 
         $this->elementEnd('div');
     }
 
+    function showStatsRow($id, $label, $content, $labelAction=false)
+    {
+        $this->elementStart('dl', 'entity_' . $id);
+        $this->elementStart('dt');
+        if ($labelAction) {
+            $this->statsSectionLink($labelAction, $label);
+        } else {
+            $this->text($label);
+        }
+        $this->elementEnd('dt');
+        $this->element('dd', null, $content);
+        $this->elementEnd('dl');
+    }
+
     function showGroups()
     {
         $groups = $this->profile->getGroups(0, GROUPS_PER_MINILIST + 1);

From 397f7cd0d86cc6819e99ca44727396ea4c98118b Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 18 Jan 2011 13:21:59 -0800
Subject: [PATCH 085/314] Refactor profile sidebar statistics output so plugins
 can hook it and add entries.

---
 lib/profileaction.php | 78 ++++++++++++++++++++++++++++++-------------
 1 file changed, 54 insertions(+), 24 deletions(-)

diff --git a/lib/profileaction.php b/lib/profileaction.php
index ae70ad560b..5e4e0f52a0 100644
--- a/lib/profileaction.php
+++ b/lib/profileaction.php
@@ -183,10 +183,7 @@ class ProfileAction extends OwnerDesignAction
 
     function showStatistics()
     {
-        $subs_count   = $this->profile->subscriptionCount();
-        $subbed_count = $this->profile->subscriberCount();
         $notice_count = $this->profile->noticeCount();
-        $group_count  = $this->profile->getGroups()->N;
         $age_days     = (time() - strtotime($this->profile->created)) / 86400;
         if ($age_days < 1) {
             // Rather than extrapolating out to a bajillion...
@@ -199,37 +196,70 @@ class ProfileAction extends OwnerDesignAction
 
         $this->element('h2', null, _('Statistics'));
 
-        // Other stats...?
-        $this->showStatsRow('user-id', _('User ID'), $this->profile->id);
+        $profile = $this->profile;
+        $actionParams = array('nickname' => $profile->nickname);
+        $stats = array(
+            array(
+                'id' => 'user-id',
+                'label' => _('User ID'),
+                'value' => $profile->id,
+            ),
+            array(
+                'id' => 'member-since',
+                'label' => _('Member since'),
+                'value' => date('j M Y', strtotime($profile->created))
+            ),
+            array(
+                'id' => 'subscriptions',
+                'label' => _('Subscriptions'),
+                'link' => common_local_url('subscriptions', $actionParams),
+                'value' => $profile->subscriptionCount(),
+            ),
+            array(
+                'id' => 'subscribers',
+                'label' => _('Subscribers'),
+                'link' => common_local_url('subscribers', $actionParams),
+                'value' => $profile->subscriberCount(),
+            ),
+            array(
+                'id' => 'groups',
+                'label' => _('Groups'),
+                'link' => common_local_url('usergroups', $actionParams),
+                'value' => $profile->getGroups()->N,
+            ),
+            array(
+                'id' => 'notices',
+                'label' => _('Notices'),
+                'value' => $notice_count,
+            ),
+            array(
+                'id' => 'daily_notices',
+                // TRANS: Average count of posts made per day since account registration
+                'label' => _('Daily average'),
+                'value' => $daily_count
+            )
+        );
 
-        $this->showStatsRow('member-since', _('Member since'), date('j M Y',
-                                        strtotime($this->profile->created)));
-
-        $this->showStatsRow('subscriptions', _('Subscriptions'), $subs_count, 'subscriptions');
-
-        $this->showStatsRow('subscribers', _('Subscribers'), $subbed_count, 'subscribed');
-
-        $this->showStatsRow('groups', _('Groups'), $group_count, 'usergroup');
-
-        $this->showStatsRow('notices', _('Notices'), $notice_count);
-
-        // TRANS: Average count of posts made per day since account registration
-        $this->showStatsRow('daily_notices', _('Daily average'), $daily_count);
+        // Give plugins a chance to add stats entries
+        Event::handle('ProfileStats', array($profile, &$stats));
 
+        foreach ($stats as $row) {
+            $this->showStatsRow($row);
+        }
         $this->elementEnd('div');
     }
 
-    function showStatsRow($id, $label, $content, $labelAction=false)
+    private function showStatsRow($row)
     {
-        $this->elementStart('dl', 'entity_' . $id);
+        $this->elementStart('dl', 'entity_' . $row['id']);
         $this->elementStart('dt');
-        if ($labelAction) {
-            $this->statsSectionLink($labelAction, $label);
+        if (!empty($row['link'])) {
+            $this->element('a', array('href' => $row['link']), $row['label']);
         } else {
-            $this->text($label);
+            $this->text($row['label']);
         }
         $this->elementEnd('dt');
-        $this->element('dd', null, $content);
+        $this->element('dd', null, $row['value']);
         $this->elementEnd('dl');
     }
 

From b5027559780355e3b58c6fbcaed0db220eaf82c1 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 18 Jan 2011 13:32:12 -0800
Subject: [PATCH 086/314] SubMirror: add mirrored feeds count & management link
 to stats section when showing your own profile sidebar.

---
 plugins/SubMirror/SubMirrorPlugin.php | 33 +++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/plugins/SubMirror/SubMirrorPlugin.php b/plugins/SubMirror/SubMirrorPlugin.php
index 0f2fc24787..38a4c40d48 100644
--- a/plugins/SubMirror/SubMirrorPlugin.php
+++ b/plugins/SubMirror/SubMirrorPlugin.php
@@ -164,4 +164,37 @@ class SubMirrorPlugin extends Plugin
         }
         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) {
+            $mirror = new SubMirror();
+            $mirror->subscriber = $profile->id;
+            $entry = array(
+                'id' => 'mirrors',
+                'label' => _m('Mirrored feeds'),
+                'link' => common_local_url('mirrorsettings'),
+                'value' => $mirror->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 deffcc1442ab452c3cadba1d2158d24209831656 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 18 Jan 2011 16:55:51 -0500
Subject: [PATCH 087/314] non-working version of private groups

---
 .../PrivateGroup/Group_privacy_settings.php   | 184 ++++++++++++++++++
 plugins/PrivateGroup/Group_private_inbox.php  | 184 ++++++++++++++++++
 plugins/PrivateGroup/PrivateGroupPlugin.php   | 177 +++++++++++++++++
 plugins/PrivateGroup/groupinbox.php           | 164 ++++++++++++++++
 4 files changed, 709 insertions(+)
 create mode 100644 plugins/PrivateGroup/Group_privacy_settings.php
 create mode 100644 plugins/PrivateGroup/Group_private_inbox.php
 create mode 100644 plugins/PrivateGroup/PrivateGroupPlugin.php
 create mode 100644 plugins/PrivateGroup/groupinbox.php

diff --git a/plugins/PrivateGroup/Group_privacy_settings.php b/plugins/PrivateGroup/Group_privacy_settings.php
new file mode 100644
index 0000000000..38d68c91ed
--- /dev/null
+++ b/plugins/PrivateGroup/Group_privacy_settings.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/PrivateGroup/Group_private_inbox.php b/plugins/PrivateGroup/Group_private_inbox.php
new file mode 100644
index 0000000000..38d68c91ed
--- /dev/null
+++ b/plugins/PrivateGroup/Group_private_inbox.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/PrivateGroup/PrivateGroupPlugin.php b/plugins/PrivateGroup/PrivateGroupPlugin.php
new file mode 100644
index 0000000000..9aded1d960
--- /dev/null
+++ b/plugins/PrivateGroup/PrivateGroupPlugin.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * Private groups for StatusNet 0.9.x
+ *
+ * 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  Privacy
+ * @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);
+}
+
+/**
+ * Private groups
+ *
+ * This plugin allows users to send private messages to a group.
+ *
+ * @category  Privacy
+ * @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 PrivateGroupPlugin extends Plugin
+{
+    /**
+     * Database schema setup
+     *
+     * @see Schema
+     * @see ColumnDef
+     *
+     * @return boolean hook value
+     */
+
+    function onCheckSchema()
+    {
+        $schema = Schema::get();
+
+        // For storing user-submitted flags on profiles
+
+        $schema->ensureTable('group_privacy_settings',
+                             array(new ColumnDef('group_id',
+                                                 'integer',
+                                                 null,
+                                                 false,
+                                                 'PRI'),
+                                   new ColumnDef('allow_privacy',
+                                                 'integer'),
+                                   new ColumnDef('allow_sender',
+                                                 'integer'),
+                                   new ColumnDef('created',
+                                                 'datetime'),
+                                   new ColumnDef('modified',
+                                                 'timestamp'));
+
+        $schema->ensureTable('group_private_inbox',
+                             array(new ColumnDef('group_id',
+                                                 'integer',
+                                                 null,
+                                                 false,
+                                                 'PRI'),
+                                   new ColumnDef('allow_privacy',
+                                                 'integer'),
+                                   new ColumnDef('allow_sender',
+                                                 'integer'),
+                                   new ColumnDef('created',
+                                                 'datetime'),
+                                   new ColumnDef('modified',
+                                                 'timestamp'));
+
+        return true;
+    }
+
+    /**
+     * Load related modules when needed
+     *
+     * @param string $cls Name of the class to be loaded
+     *
+     * @return boolean hook value
+     */
+
+    function onAutoload($cls)
+    {
+        $dir = dirname(__FILE__);
+
+        switch ($cls)
+        {
+        case 'GroupinboxAction':
+            include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
+            return false;
+        case 'Group_privacy_settings':
+        case 'Group_private_inbox':
+            include_once $dir . '/'.$cls.'.php';
+            return false;
+        default:
+            return true;
+        }
+    }
+
+    /**
+     * Map URLs to actions
+     *
+     * @param Net_URL_Mapper $m path-to-action mapper
+     *
+     * @return boolean hook value
+     */
+
+    function onRouterInitialized($m)
+    {
+        $m->connect('group/:nickname/inbox',
+                    array('action' => 'groupinbox'),
+                    array('nickname' => Nickname::DISPLAY_FMT));
+
+        return true;
+    }
+
+    /**
+     * Add group inbox to the 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 onEndGroupGroupNav($groupnav)
+    {
+        $action = $groupnav->action;
+        $group  = $groupnav->group;
+
+        $action->menuItem(common_local_url('groupinbox',
+                                           array('nickname' => $group->nickname)),
+                          _m('Inbox'),
+                          _m('Private messages for this group'),
+                          $action->trimmed('action') == 'groupinbox',
+                          'nav_group_inbox');
+        return true;
+    }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'PrivateGroup',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Evan Prodromou',
+                            'homepage' => 'http://status.net/wiki/Plugin:PrivateGroup',
+                            'rawdescription' =>
+                            _m('Allow posting DMs to a group.'));
+        return true;
+    }
+}
diff --git a/plugins/PrivateGroup/groupinbox.php b/plugins/PrivateGroup/groupinbox.php
new file mode 100644
index 0000000000..a793ac6de2
--- /dev/null
+++ b/plugins/PrivateGroup/groupinbox.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 1d24ece32e11fb482b67b54d630ac14decdaae39 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 18 Jan 2011 15:18:55 -0800
Subject: [PATCH 088/314] add rss.me to notice_source defaults

---
 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 82074077b4..b13cfb3e3b 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -77,4 +77,5 @@ VALUES
     ('twitvim','TwitVim','http://vim.sourceforge.net/scripts/script.php?script_id=2204', now()),
     ('Updating.Me','Updating.Me','http://updating.me/', now()),
     ('urfastr','urfastr','http://urfastr.net/', now()),
-    ('yatca','Yatca','http://www.yatca.com/', now());
+    ('yatca','Yatca','http://www.yatca.com/', now()),
+    ('rss.me', 'rss.me', 'http://rss.me/', now());

From 64844473f866609ed093ca7046fea59170e6c77e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 19 Jan 2011 14:26:31 -0800
Subject: [PATCH 089/314] fix wrong datatypes (saving string instead of array)
 in AtomPub notice processing

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

diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index 5809df3b5e..24aa08e279 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -427,11 +427,11 @@ class ApiTimelineUserAction extends ApiBareAuthAction
                 $profile = Profile::fromURI($uri);
 
                 if (!empty($profile)) {
-                    $options['replies'] = $uri;
+                    $options['replies'][] = $uri;
                 } else {
                     $group = User_group::staticGet('uri', $uri);
                     if (!empty($group)) {
-                        $options['groups'] = $uri;
+                        $options['groups'][] = $uri;
                     } else {
                         // @fixme: hook for discovery here
                         common_log(LOG_WARNING, sprintf(_('AtomPub post with unknown attention URI %s'), $uri));

From 4026e208c2be6e941270a7540b548ee57908b870 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 19 Jan 2011 15:13:46 -0800
Subject: [PATCH 090/314] Add a scary 'experimental feture' warning &
 are-you-sure prompt on moveuser.php

As with deleteuser.php, can pass -y to bypass the prompt if you're sure.
---
 actions/deleteaccount.php |  2 +-
 scripts/moveuser.php      | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/actions/deleteaccount.php b/actions/deleteaccount.php
index dd587d0445..614519d474 100644
--- a/actions/deleteaccount.php
+++ b/actions/deleteaccount.php
@@ -161,7 +161,7 @@ class DeleteaccountAction extends Action
         if ($this->trimmed('iamsure') != $iamsure ) {
             // 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.
-            $this->_error = sprintf(_('You must write  "%s" exactly in the box.', $iamsure));
+            $this->_error = sprintf(_('You must write "%s" exactly in the box.'), $iamsure);
             $this->showPage();
             return;
         }
diff --git a/scripts/moveuser.php b/scripts/moveuser.php
index cf8fd2e0be..17b3e0fb67 100644
--- a/scripts/moveuser.php
+++ b/scripts/moveuser.php
@@ -19,7 +19,7 @@
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 
-$shortoptions = 'i:n:r:w:';
+$shortoptions = 'i:n:r:w:y';
 $longoptions = array('id=', 'nickname=', 'remote=', 'password=');
 
 $helptext = <<<END_OF_MOVEUSER_HELP
@@ -30,6 +30,7 @@ Move a local user to a remote account.
   -n --nickname nickname of the user to move
   -r --remote   Full ID of remote users
   -w --password Password of remote user
+  -y --yes      do not wait for confirmation
 
 Remote user identity must be a Webfinger (nickname@example.com) or 
 an HTTP or HTTPS URL (http://example.com/social/site/user/nickname).
@@ -51,6 +52,17 @@ try {
 
     $password = get_option_value('w', 'password');
 
+    if (!have_option('y', 'yes')) {
+        print "WARNING: EXPERIMENTAL FEATURE! Moving accounts will delete data from the source site.\n";
+        print "\n";
+        print "About to PERMANENTLY move user '{$user->nickname}' to $remote. Are you sure? [y/N] ";
+        $response = fgets(STDIN);
+        if (strtolower(trim($response)) != 'y') {
+            print "Aborting.\n";
+            exit(0);
+        }
+    }
+
     $qm = QueueManager::get();
 
     $qm->enqueue(array($user, $remote, $password), 'acctmove');

From 4618641da23aab0822bec008ff7406ffc13e1cad Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 19 Jan 2011 18:31:07 -0500
Subject: [PATCH 091/314] data structures

---
 .../PrivateGroup/Group_privacy_settings.php   | 119 ++++++------------
 plugins/PrivateGroup/Group_private_inbox.php  |   2 +-
 plugins/PrivateGroup/PrivateGroupPlugin.php   |   1 +
 3 files changed, 43 insertions(+), 79 deletions(-)

diff --git a/plugins/PrivateGroup/Group_privacy_settings.php b/plugins/PrivateGroup/Group_privacy_settings.php
index 38d68c91ed..7861571222 100644
--- a/plugins/PrivateGroup/Group_privacy_settings.php
+++ b/plugins/PrivateGroup/Group_privacy_settings.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Data class for counting greetings
+ * Data class for group privacy settings
  *
  * 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,18 +31,10 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
-
 /**
- * Data class for counting greetings
+ * Data class for group privacy
  *
- * 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.
+ * Stores admin preferences about the group.
  *
  * @category Action
  * @package  StatusNet
@@ -53,11 +45,31 @@ require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
  * @see      DB_DataObject
  */
 
-class User_greeting_count extends Memcached_DataObject
+class Group_privacy_settings extends Memcached_DataObject
 {
-    public $__table = 'user_greeting_count'; // table name
-    public $user_id;                         // int(4)  primary_key not_null
-    public $greeting_count;                  // int(4)
+    public $__table = 'group_privacy_settings';
+    /** ID of the group. */
+    public $group_id;      
+    /** When to allow privacy: always, sometimes, or never. */
+    public $allow_privacy;
+    /** Who can send private messages: everyone, member, admin */
+    public $allow_sender; 
+    /** row creation timestamp */
+    public $created;
+    /** Last-modified timestamp */
+    public $modified;
+
+    /** NEVER is */
+
+    const SOMETIMES = -1;
+    const NEVER  = 0;
+    const ALWAYS = 1;
+
+    /** These are bit-mappy, as a hedge against the future. */
+
+    const EVERYONE = 1;
+    const MEMBER   = 2;
+    const ADMIN    = 4;
 
     /**
      * Get an instance by key
@@ -68,11 +80,11 @@ class User_greeting_count extends Memcached_DataObject
      * @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 Memcached_DataObject::staticGet('Group_privacy_settings', $k, $v);
     }
 
     /**
@@ -83,10 +95,15 @@ class User_greeting_count extends Memcached_DataObject
      *
      * @return array array of column definitions
      */
+
     function table()
     {
-        return array('user_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
-                     'greeting_count' => DB_DATAOBJECT_INT);
+        return array('group_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+                     'allow_privacy' => DB_DATAOBJECT_INT,
+                     'allow_sender' => 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);
+                     
     }
 
     /**
@@ -98,6 +115,7 @@ class User_greeting_count extends Memcached_DataObject
      *
      * @return array list of key field names
      */
+
     function keys()
     {
         return array_keys($this->keyTypes());
@@ -106,79 +124,24 @@ class User_greeting_count extends Memcached_DataObject
     /**
      * 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');
+        return array('group_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/PrivateGroup/Group_private_inbox.php b/plugins/PrivateGroup/Group_private_inbox.php
index 38d68c91ed..11142314bc 100644
--- a/plugins/PrivateGroup/Group_private_inbox.php
+++ b/plugins/PrivateGroup/Group_private_inbox.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Data class for counting greetings
+ * Data class for group inbox info
  *
  * PHP version 5
  *
diff --git a/plugins/PrivateGroup/PrivateGroupPlugin.php b/plugins/PrivateGroup/PrivateGroupPlugin.php
index 9aded1d960..f0f904cca1 100644
--- a/plugins/PrivateGroup/PrivateGroupPlugin.php
+++ b/plugins/PrivateGroup/PrivateGroupPlugin.php
@@ -46,6 +46,7 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
+
 class PrivateGroupPlugin extends Plugin
 {
     /**

From 6eca8188b6f341f51cb9c741ea6785b4b35c6e84 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 19 Jan 2011 15:52:18 -0800
Subject: [PATCH 092/314] Fix a couple spelling mistakes in comments and remove
 redundant statement terminator

---
 classes/User.php      | 2 +-
 lib/apiauth.php       | 2 +-
 lib/apioauthstore.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/User.php b/classes/User.php
index 47bf8a6177..654ac8fb50 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -975,7 +975,7 @@ class User extends Memcached_DataObject
     }
 
     /*
-     * Get a list of OAuth client application that have access to this
+     * Get a list of OAuth client applications that have access to this
      * user's account.
      */
     function getConnectedApps($offset = 0, $limit = null)
diff --git a/lib/apiauth.php b/lib/apiauth.php
index 1dacf1409b..0cc184c04c 100644
--- a/lib/apiauth.php
+++ b/lib/apiauth.php
@@ -337,7 +337,7 @@ class ApiAuthAction extends ApiAction
     }
 
     /**
-     * Log an API authentication failer. Collect the proxy and IP
+     * Log an API authentication failure. Collect the proxy and IP
      * and log them
      *
      * @param string $logMsg additional log message
diff --git a/lib/apioauthstore.php b/lib/apioauthstore.php
index 2a65fffc4b..6aabde047c 100644
--- a/lib/apioauthstore.php
+++ b/lib/apioauthstore.php
@@ -229,7 +229,7 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore
                 // insert a new Oauth_application_user record w/access token
                 $appUser = new Oauth_application_user();
 
-                $appUser->profile_id     = $tokenAssoc->profile_id;;
+                $appUser->profile_id     = $tokenAssoc->profile_id;
                 $appUser->application_id = $app->id;
                 $appUser->access_type    = $app->access_type;
                 $appUser->token          = $at->tok;

From a79427d86f725f25d78dfaad273b06ae4613c78f Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 19 Jan 2011 16:13:42 -0800
Subject: [PATCH 093/314] Fix syntax error in error msg

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

diff --git a/actions/apioauthaccesstoken.php b/actions/apioauthaccesstoken.php
index 064d05120f..a3ce9edbf6 100644
--- a/actions/apioauthaccesstoken.php
+++ b/actions/apioauthaccesstoken.php
@@ -98,7 +98,7 @@ class ApiOauthAccessTokenAction extends ApiOauthAction
 
             common_log(LOG_WARNING, $msg);
             // TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-            $this->clientError(_("Invalid request token or verifier.", 400, 'text'));
+            $this->clientError(_("Invalid request token or verifier."), 400, 'text');
         } else {
             common_log(
                 LOG_INFO,

From e475bdfe772607a21c689f51553f9c40e5c7338f Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 19 Jan 2011 22:55:00 -0800
Subject: [PATCH 094/314] OAuth: Fix rare problem in which request tokens were
 sometimes being returned as access tokens.

---
 actions/apioauthaccesstoken.php |   1 +
 lib/apioauthstore.php           | 194 +++++++++++++++++++++++---------
 2 files changed, 141 insertions(+), 54 deletions(-)

diff --git a/actions/apioauthaccesstoken.php b/actions/apioauthaccesstoken.php
index a3ce9edbf6..6c3819c3bd 100644
--- a/actions/apioauthaccesstoken.php
+++ b/actions/apioauthaccesstoken.php
@@ -84,6 +84,7 @@ class ApiOauthAccessTokenAction extends ApiOauthAction
             common_debug(var_export($req, true));
             $code = $e->getCode();
             $this->clientError($e->getMessage(), empty($code) ? 401 : $code, 'text');
+            return;
         }
 
         if (empty($atok)) {
diff --git a/lib/apioauthstore.php b/lib/apioauthstore.php
index 6aabde047c..f1f88b13a1 100644
--- a/lib/apioauthstore.php
+++ b/lib/apioauthstore.php
@@ -152,8 +152,11 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore
                 );
             }
 
-            // check to see if we have previously issued an access token for this application
-            // and profile
+            // Check to see if we have previously issued an access token for
+            // this application and profile; if so we can just return the
+            // existing access token. That seems to be the best practice. It
+            // makes it so users only have to authorize the app once per
+            // machine.
 
             $appUser = new Oauth_application_user();
 
@@ -172,19 +175,40 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore
                      )
                 );
 
-                $at = new Token();
+                $at = null;
 
-                // fetch the full access token
-                $at->consumer_key = $consumer->key;
-                $at->tok          = $appUser->token;
+                // Special case: we used to store request tokens in the
+                // Oauth_application_user record, and the access_type would
+                // always be 0 (no access) as a failsafe until an access
+                // token was issued and replaced the request token. There could
+                // be a few old Oauth_application_user records storing request
+                // tokens still around, and we don't want to accidentally
+                // return a useless request token instead of a new access
+                // token. So if we find one, we generate a new access token
+                // and update the existing Oauth_application_user record before
+                // returning the new access token. This should be rare.
 
-                $result = $at->find(true);
+                if ($appUser->access_type == 0) {
 
-                if (!$result) {
-                    throw new Exception(
-                        // TRANS: Exception thrown when no access token can be issued.
-                        _('Could not issue access token.')
-                    );
+                    $at = $this->generateNewAccessToken($consumer, $rt, $verifier);
+                    $this->updateAppUser($appUser, $app, $at);
+
+                } else {
+
+                    $at = new Token();
+
+                    // fetch the full access token
+                    $at->consumer_key = $consumer->key;
+                    $at->tok          = $appUser->token;
+
+                    $result = $at->find(true);
+
+                    if (!$result) {
+                        throw new Exception(
+                            // TRANS: Exception thrown when no access token can be issued.
+                            _('Could not issue access token.')
+                        );
+                    }
                 }
 
                 // Yay, we can re-issue the access token
@@ -200,48 +224,8 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore
                      )
                 );
 
-                // make a brand new access token
-                $at = new Token();
-
-                $at->consumer_key      = $consumer->key;
-                $at->tok               = common_good_rand(16);
-                $at->secret            = common_good_rand(16);
-                $at->type              = 1; // access
-                $at->verifier          = $verifier;
-                $at->verified_callback = $rt->verified_callback; // 1.0a
-                $at->created           = common_sql_now();
-
-                if (!$at->insert()) {
-                    $e = $at->_lastError;
-                    common_debug('access token "' . $at->tok . '" not inserted: "' . $e->message . '"', __FILE__);
-                    return null;
-                } else {
-                    common_debug('access token "' . $at->tok . '" inserted', __FILE__);
-                    // burn the old one
-                    $orig_rt   = clone($rt);
-                    $rt->state = 2; // used
-                    if (!$rt->update($orig_rt)) {
-                        return null;
-                    }
-                    common_debug('request token "' . $rt->tok . '" updated', __FILE__);
-                }
-
-                // insert a new Oauth_application_user record w/access token
-                $appUser = new Oauth_application_user();
-
-                $appUser->profile_id     = $tokenAssoc->profile_id;
-                $appUser->application_id = $app->id;
-                $appUser->access_type    = $app->access_type;
-                $appUser->token          = $at->tok;
-                $appUser->created        = common_sql_now();
-
-                $result = $appUser->insert();
-
-                if (!$result) {
-                    common_log_db_error($appUser, 'INSERT', __FILE__);
-                    // TRANS: Server error displayed when a database error occurs.
-                    $this->serverError(_('Database error inserting OAuth application user.'));
-                }
+                $at = $this->generateNewAccessToken($consumer, $rt, $verifier);
+                $this->newAppUser($tokenAssoc, $app, $at);
 
                 // Okay, good
                 return new OAuthToken($at->tok, $at->secret);
@@ -261,6 +245,108 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore
         }
     }
 
+    /*
+     * Generate a new access token and save it to the database
+     *
+     * @param Consumer $consumer the OAuth consumer
+     * @param Token    $rt       the authorized request token
+     * @param string   $verifier the OAuth 1.0a verifier
+     *
+     * @access private
+     *
+     * @return Token   $at       the new access token
+     */
+    private function generateNewAccessToken($consumer, $rt, $verifier)
+    {
+        $at = new Token();
+
+        $at->consumer_key      = $consumer->key;
+        $at->tok               = common_good_rand(16);
+        $at->secret            = common_good_rand(16);
+        $at->type              = 1; // access
+        $at->verifier          = $verifier;
+        $at->verified_callback = $rt->verified_callback; // 1.0a
+        $at->created           = common_sql_now();
+
+        if (!$at->insert()) {
+            $e = $at->_lastError;
+            common_debug('access token "' . $at->tok . '" not inserted: "' . $e->message . '"', __FILE__);
+            return null;
+        } else {
+            common_debug('access token "' . $at->tok . '" inserted', __FILE__);
+            // burn the old one
+            $orig_rt   = clone($rt);
+            $rt->state = 2; // used
+            if (!$rt->update($orig_rt)) {
+                return null;
+            }
+            common_debug('request token "' . $rt->tok . '" updated', __FILE__);
+        }
+
+        return $at;
+    }
+
+   /*
+    * Add a new app user (Oauth_application_user) record
+    *
+    * @param Oauth_token_association $tokenAssoc token-to-app association
+    * @param Oauth_application       $app        the OAuth client app
+    * @param Token                   $at         the access token
+    *
+    * @access private
+    *
+    * @return void
+    */
+    private function newAppUser($tokenAssoc, $app, $at)
+    {
+        $appUser = new Oauth_application_user();
+
+        $appUser->profile_id     = $tokenAssoc->profile_id;
+        $appUser->application_id = $app->id;
+        $appUser->access_type    = $app->access_type;
+        $appUser->token          = $at->tok;
+        $appUser->created        = common_sql_now();
+
+        $result = $appUser->insert();
+
+        if (!$result) {
+            common_log_db_error($appUser, 'INSERT', __FILE__);
+
+            // TRANS: Server error displayed when a database error occurs.
+            throw new Exception(
+                _('Database error inserting OAuth application user.')
+            );
+        }
+    }
+
+   /*
+    * Update an existing app user (Oauth_application_user) record
+    *
+    * @param Oauth_application_user $appUser existing app user rec
+    * @param Oauth_application      $app     the OAuth client app
+    * @param Token                  $at      the access token
+    *
+    * @access private
+    *
+    * @return void
+    */
+    private function updateAppUser($appUser, $app, $at)
+    {
+        $original = clone($appUser);
+        $appUser->access_type = $app->access_type;
+        $appUser->token       = $at->tok;
+
+        $result = $appUser->update($original);
+
+        if (!$result) {
+            common_log_db_error($appUser, 'UPDATE', __FILE__);
+            // TRANS: Server error displayed when a database error occurs.
+            throw new Exception(
+                _('Database error updating OAuth application user.')
+            );
+        }
+    }
+
     /**
      * Revoke specified access token
      *

From 114d9ebf284a30547a5414f8921518b6c4d499e3 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 19 Jan 2011 15:52:18 -0800
Subject: [PATCH 095/314] Fix a couple spelling mistakes in comments and remove
 redundant statement terminator

---
 classes/User.php      | 2 +-
 lib/apiauth.php       | 2 +-
 lib/apioauthstore.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/User.php b/classes/User.php
index 47bf8a6177..654ac8fb50 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -975,7 +975,7 @@ class User extends Memcached_DataObject
     }
 
     /*
-     * Get a list of OAuth client application that have access to this
+     * Get a list of OAuth client applications that have access to this
      * user's account.
      */
     function getConnectedApps($offset = 0, $limit = null)
diff --git a/lib/apiauth.php b/lib/apiauth.php
index 1dacf1409b..0cc184c04c 100644
--- a/lib/apiauth.php
+++ b/lib/apiauth.php
@@ -337,7 +337,7 @@ class ApiAuthAction extends ApiAction
     }
 
     /**
-     * Log an API authentication failer. Collect the proxy and IP
+     * Log an API authentication failure. Collect the proxy and IP
      * and log them
      *
      * @param string $logMsg additional log message
diff --git a/lib/apioauthstore.php b/lib/apioauthstore.php
index 2a65fffc4b..6aabde047c 100644
--- a/lib/apioauthstore.php
+++ b/lib/apioauthstore.php
@@ -229,7 +229,7 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore
                 // insert a new Oauth_application_user record w/access token
                 $appUser = new Oauth_application_user();
 
-                $appUser->profile_id     = $tokenAssoc->profile_id;;
+                $appUser->profile_id     = $tokenAssoc->profile_id;
                 $appUser->application_id = $app->id;
                 $appUser->access_type    = $app->access_type;
                 $appUser->token          = $at->tok;

From 28f10ac52801f546126f58e0550d37bca2c98a3c Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 19 Jan 2011 16:13:42 -0800
Subject: [PATCH 096/314] Fix syntax error in error msg

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

diff --git a/actions/apioauthaccesstoken.php b/actions/apioauthaccesstoken.php
index 064d05120f..a3ce9edbf6 100644
--- a/actions/apioauthaccesstoken.php
+++ b/actions/apioauthaccesstoken.php
@@ -98,7 +98,7 @@ class ApiOauthAccessTokenAction extends ApiOauthAction
 
             common_log(LOG_WARNING, $msg);
             // TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-            $this->clientError(_("Invalid request token or verifier.", 400, 'text'));
+            $this->clientError(_("Invalid request token or verifier."), 400, 'text');
         } else {
             common_log(
                 LOG_INFO,

From 882b6862a39a44a2cd2d2dc7dac9a794f2183d7d Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 19 Jan 2011 22:55:00 -0800
Subject: [PATCH 097/314] OAuth: Fix rare problem in which request tokens were
 sometimes being returned as access tokens.

---
 actions/apioauthaccesstoken.php |   1 +
 lib/apioauthstore.php           | 194 +++++++++++++++++++++++---------
 2 files changed, 141 insertions(+), 54 deletions(-)

diff --git a/actions/apioauthaccesstoken.php b/actions/apioauthaccesstoken.php
index a3ce9edbf6..6c3819c3bd 100644
--- a/actions/apioauthaccesstoken.php
+++ b/actions/apioauthaccesstoken.php
@@ -84,6 +84,7 @@ class ApiOauthAccessTokenAction extends ApiOauthAction
             common_debug(var_export($req, true));
             $code = $e->getCode();
             $this->clientError($e->getMessage(), empty($code) ? 401 : $code, 'text');
+            return;
         }
 
         if (empty($atok)) {
diff --git a/lib/apioauthstore.php b/lib/apioauthstore.php
index 6aabde047c..f1f88b13a1 100644
--- a/lib/apioauthstore.php
+++ b/lib/apioauthstore.php
@@ -152,8 +152,11 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore
                 );
             }
 
-            // check to see if we have previously issued an access token for this application
-            // and profile
+            // Check to see if we have previously issued an access token for
+            // this application and profile; if so we can just return the
+            // existing access token. That seems to be the best practice. It
+            // makes it so users only have to authorize the app once per
+            // machine.
 
             $appUser = new Oauth_application_user();
 
@@ -172,19 +175,40 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore
                      )
                 );
 
-                $at = new Token();
+                $at = null;
 
-                // fetch the full access token
-                $at->consumer_key = $consumer->key;
-                $at->tok          = $appUser->token;
+                // Special case: we used to store request tokens in the
+                // Oauth_application_user record, and the access_type would
+                // always be 0 (no access) as a failsafe until an access
+                // token was issued and replaced the request token. There could
+                // be a few old Oauth_application_user records storing request
+                // tokens still around, and we don't want to accidentally
+                // return a useless request token instead of a new access
+                // token. So if we find one, we generate a new access token
+                // and update the existing Oauth_application_user record before
+                // returning the new access token. This should be rare.
 
-                $result = $at->find(true);
+                if ($appUser->access_type == 0) {
 
-                if (!$result) {
-                    throw new Exception(
-                        // TRANS: Exception thrown when no access token can be issued.
-                        _('Could not issue access token.')
-                    );
+                    $at = $this->generateNewAccessToken($consumer, $rt, $verifier);
+                    $this->updateAppUser($appUser, $app, $at);
+
+                } else {
+
+                    $at = new Token();
+
+                    // fetch the full access token
+                    $at->consumer_key = $consumer->key;
+                    $at->tok          = $appUser->token;
+
+                    $result = $at->find(true);
+
+                    if (!$result) {
+                        throw new Exception(
+                            // TRANS: Exception thrown when no access token can be issued.
+                            _('Could not issue access token.')
+                        );
+                    }
                 }
 
                 // Yay, we can re-issue the access token
@@ -200,48 +224,8 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore
                      )
                 );
 
-                // make a brand new access token
-                $at = new Token();
-
-                $at->consumer_key      = $consumer->key;
-                $at->tok               = common_good_rand(16);
-                $at->secret            = common_good_rand(16);
-                $at->type              = 1; // access
-                $at->verifier          = $verifier;
-                $at->verified_callback = $rt->verified_callback; // 1.0a
-                $at->created           = common_sql_now();
-
-                if (!$at->insert()) {
-                    $e = $at->_lastError;
-                    common_debug('access token "' . $at->tok . '" not inserted: "' . $e->message . '"', __FILE__);
-                    return null;
-                } else {
-                    common_debug('access token "' . $at->tok . '" inserted', __FILE__);
-                    // burn the old one
-                    $orig_rt   = clone($rt);
-                    $rt->state = 2; // used
-                    if (!$rt->update($orig_rt)) {
-                        return null;
-                    }
-                    common_debug('request token "' . $rt->tok . '" updated', __FILE__);
-                }
-
-                // insert a new Oauth_application_user record w/access token
-                $appUser = new Oauth_application_user();
-
-                $appUser->profile_id     = $tokenAssoc->profile_id;
-                $appUser->application_id = $app->id;
-                $appUser->access_type    = $app->access_type;
-                $appUser->token          = $at->tok;
-                $appUser->created        = common_sql_now();
-
-                $result = $appUser->insert();
-
-                if (!$result) {
-                    common_log_db_error($appUser, 'INSERT', __FILE__);
-                    // TRANS: Server error displayed when a database error occurs.
-                    $this->serverError(_('Database error inserting OAuth application user.'));
-                }
+                $at = $this->generateNewAccessToken($consumer, $rt, $verifier);
+                $this->newAppUser($tokenAssoc, $app, $at);
 
                 // Okay, good
                 return new OAuthToken($at->tok, $at->secret);
@@ -261,6 +245,108 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore
         }
     }
 
+    /*
+     * Generate a new access token and save it to the database
+     *
+     * @param Consumer $consumer the OAuth consumer
+     * @param Token    $rt       the authorized request token
+     * @param string   $verifier the OAuth 1.0a verifier
+     *
+     * @access private
+     *
+     * @return Token   $at       the new access token
+     */
+    private function generateNewAccessToken($consumer, $rt, $verifier)
+    {
+        $at = new Token();
+
+        $at->consumer_key      = $consumer->key;
+        $at->tok               = common_good_rand(16);
+        $at->secret            = common_good_rand(16);
+        $at->type              = 1; // access
+        $at->verifier          = $verifier;
+        $at->verified_callback = $rt->verified_callback; // 1.0a
+        $at->created           = common_sql_now();
+
+        if (!$at->insert()) {
+            $e = $at->_lastError;
+            common_debug('access token "' . $at->tok . '" not inserted: "' . $e->message . '"', __FILE__);
+            return null;
+        } else {
+            common_debug('access token "' . $at->tok . '" inserted', __FILE__);
+            // burn the old one
+            $orig_rt   = clone($rt);
+            $rt->state = 2; // used
+            if (!$rt->update($orig_rt)) {
+                return null;
+            }
+            common_debug('request token "' . $rt->tok . '" updated', __FILE__);
+        }
+
+        return $at;
+    }
+
+   /*
+    * Add a new app user (Oauth_application_user) record
+    *
+    * @param Oauth_token_association $tokenAssoc token-to-app association
+    * @param Oauth_application       $app        the OAuth client app
+    * @param Token                   $at         the access token
+    *
+    * @access private
+    *
+    * @return void
+    */
+    private function newAppUser($tokenAssoc, $app, $at)
+    {
+        $appUser = new Oauth_application_user();
+
+        $appUser->profile_id     = $tokenAssoc->profile_id;
+        $appUser->application_id = $app->id;
+        $appUser->access_type    = $app->access_type;
+        $appUser->token          = $at->tok;
+        $appUser->created        = common_sql_now();
+
+        $result = $appUser->insert();
+
+        if (!$result) {
+            common_log_db_error($appUser, 'INSERT', __FILE__);
+
+            // TRANS: Server error displayed when a database error occurs.
+            throw new Exception(
+                _('Database error inserting OAuth application user.')
+            );
+        }
+    }
+
+   /*
+    * Update an existing app user (Oauth_application_user) record
+    *
+    * @param Oauth_application_user $appUser existing app user rec
+    * @param Oauth_application      $app     the OAuth client app
+    * @param Token                  $at      the access token
+    *
+    * @access private
+    *
+    * @return void
+    */
+    private function updateAppUser($appUser, $app, $at)
+    {
+        $original = clone($appUser);
+        $appUser->access_type = $app->access_type;
+        $appUser->token       = $at->tok;
+
+        $result = $appUser->update($original);
+
+        if (!$result) {
+            common_log_db_error($appUser, 'UPDATE', __FILE__);
+            // TRANS: Server error displayed when a database error occurs.
+            throw new Exception(
+                _('Database error updating OAuth application user.')
+            );
+        }
+    }
+
     /**
      * Revoke specified access token
      *

From 26652d9be666cb9e1b97ceb1436cfc940821b226 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Thu, 20 Jan 2011 18:39:46 +0100
Subject: [PATCH 098/314] Update translator documentation Update L10n Remove
 superfluous whitespace

---
 actions/apiatomservice.php  | 11 +++++++----
 actions/apiblockcreate.php  |  1 +
 actions/apistatusesshow.php | 10 ++++++++--
 actions/deletenotice.php    |  2 +-
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/actions/apiatomservice.php b/actions/apiatomservice.php
index b60b312fc4..5d786723e9 100644
--- a/actions/apiatomservice.php
+++ b/actions/apiatomservice.php
@@ -39,7 +39,6 @@ require_once INSTALLDIR.'/lib/apibareauth.php';
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
  * @link      http://status.net/
  */
-
 class ApiAtomServiceAction extends ApiBareAuthAction
 {
     /**
@@ -50,13 +49,13 @@ class ApiAtomServiceAction extends ApiBareAuthAction
      * @return boolean success flag
      *
      */
-
     function prepare($args)
     {
         parent::prepare($args);
         $this->user = $this->getTargetUser($this->arg('id'));
 
         if (empty($this->user)) {
+            // TRANS: Client error displayed when making an Atom API request for an unknown user.
             $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
@@ -71,7 +70,6 @@ class ApiAtomServiceAction extends ApiBareAuthAction
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
@@ -83,13 +81,15 @@ class ApiAtomServiceAction extends ApiBareAuthAction
                                              'xmlns:atom' => 'http://www.w3.org/2005/Atom',
                                              'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/'));
         $this->elementStart('workspace');
-        $this->element('atom:title', null, _('Main'));
+        // TRANS: Title for Atom feed.
+        $this->element('atom:title', null, _m('ATOM','Main'));
         $this->elementStart('collection',
                             array('href' => common_local_url('ApiTimelineUser',
                                                              array('id' => $this->user->id,
                                                                    'format' => 'atom'))));
         $this->element('atom:title',
                        null,
+                       // TRANS: Title for Atom feed. %s is a user nickname.
                        sprintf(_("%s timeline"),
                                $this->user->nickname));
         $this->element('accept', null, 'application/atom+xml;type=entry');
@@ -100,6 +100,7 @@ class ApiAtomServiceAction extends ApiBareAuthAction
                                                              array('subscriber' => $this->user->id))));
         $this->element('atom:title',
                        null,
+                       // TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
                        sprintf(_("%s subscriptions"),
                                $this->user->nickname));
         $this->element('accept', null, 'application/atom+xml;type=entry');
@@ -110,6 +111,7 @@ class ApiAtomServiceAction extends ApiBareAuthAction
                                                              array('profile' => $this->user->id))));
         $this->element('atom:title',
                        null,
+                       // TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
                        sprintf(_("%s favorites"),
                                $this->user->nickname));
         $this->element('accept', null, 'application/atom+xml;type=entry');
@@ -120,6 +122,7 @@ class ApiAtomServiceAction extends ApiBareAuthAction
                                                              array('profile' => $this->user->id))));
         $this->element('atom:title',
                        null,
+                       // TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
                        sprintf(_("%s memberships"),
                                $this->user->nickname));
         $this->element('accept', null, 'application/atom+xml;type=entry');
diff --git a/actions/apiblockcreate.php b/actions/apiblockcreate.php
index a9f31e791b..6942a53bb8 100644
--- a/actions/apiblockcreate.php
+++ b/actions/apiblockcreate.php
@@ -92,6 +92,7 @@ class ApiBlockCreateAction extends ApiAuthAction
         }
 
         if (empty($this->user) || empty($this->other)) {
+        	  // TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
             $this->clientError(_('No such user.'), 404, $this->format);
             return;
         }
diff --git a/actions/apistatusesshow.php b/actions/apistatusesshow.php
index 80b0374a63..9a7f36bb3a 100644
--- a/actions/apistatusesshow.php
+++ b/actions/apistatusesshow.php
@@ -114,6 +114,7 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
             $this->deleteNotice();
             break;
         default:
+            // TRANS: Client error displayed calling an unsupported HTTP error in API status show.
             $this->clientError(_('HTTP method not supported.'), 405);
             return;
         }
@@ -138,6 +139,8 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
                 $this->showSingleAtomStatus($this->notice);
                 break;
             default:
+                // TRANS: Exception thrown requesting an unsupported notice output format.
+                // TRANS: %s is the requested output format.
                 throw new Exception(sprintf(_("Unsupported format: %s"), $this->format));
             }
         } else {
@@ -171,7 +174,7 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
      *
      * @return boolean true
      */
-    
+
     function isReadOnly($args)
     {
         return ($_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'HEAD');
@@ -220,6 +223,7 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
     function deleteNotice()
     {
         if ($this->format != 'atom') {
+            // TRANS: Client error displayed when trying to delete a notice not using the Atom format.
             $this->clientError(_("Can only delete using the Atom format."));
             return;
         }
@@ -227,7 +231,8 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
         if (empty($this->auth_user) ||
             ($this->notice->profile_id != $this->auth_user->id &&
              !$this->auth_user->hasRight(Right::DELETEOTHERSNOTICE))) {
-            $this->clientError(_('Can\'t delete this notice.'), 403);
+            // TRANS: Client error displayed when a user has no rights to delete notices of other users.
+            $this->clientError(_('Cannot delete this notice.'), 403);
             return;
         }
 
@@ -240,6 +245,7 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
 
         header('HTTP/1.1 200 OK');
         header('Content-Type: text/plain');
+        // TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
         print(sprintf(_('Deleted notice %d'), $this->notice->id));
         print("\n");
     }
diff --git a/actions/deletenotice.php b/actions/deletenotice.php
index a7ac28e19c..ff57bbd61e 100644
--- a/actions/deletenotice.php
+++ b/actions/deletenotice.php
@@ -75,7 +75,7 @@ class DeletenoticeAction extends Action
         if ($this->notice->profile_id != $this->user_profile->id &&
                    !$this->user->hasRight(Right::DELETEOTHERSNOTICE)) {
             // TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-            common_user_error(_('Can\'t delete this notice.'));
+            common_user_error(_('Cannot delete this notice.'));
             exit;
         }
         // XXX: Ajax!

From 6658bd1893a08f03ae85bac9c9cf7700592d7213 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Thu, 20 Jan 2011 18:45:13 +0100
Subject: [PATCH 099/314] Update translator documentation Remove unneeded i18n
 for debug message Remove superfluous whitespace

---
 actions/apitimelineuser.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index 5809df3b5e..85e8f97b2a 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -241,7 +241,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
      *
      * @return boolean true
      */
-    
+
     function isReadOnly($args)
     {
         return ($_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'HEAD');
@@ -307,11 +307,13 @@ class ApiTimelineUserAction extends ApiBareAuthAction
 
         $xml = trim(file_get_contents('php://input'));
         if (empty($xml)) {
+            // TRANS: Client error displayed attempting to post an empty API notice.
             $this->clientError(_('Atom post must not be empty.'));
         }
 
         $dom = DOMDocument::loadXML($xml);
         if (!$dom) {
+            // TRANS: Client error displayed attempting to post an API that is not well-formed XML.
             $this->clientError(_('Atom post must be well-formed XML.'));
         }
 
@@ -375,6 +377,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
         } else {
             // @fixme fetch from $sourceUrl?
             // TRANS: Client error displayed when posting a notice without content through the API.
+            // TRANS: %d is the notice ID (number).
             $this->clientError(sprintf(_('No content for notice %d.'),
                                        $note->id));
             return;
@@ -434,7 +437,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
                         $options['groups'] = $uri;
                     } else {
                         // @fixme: hook for discovery here
-                        common_log(LOG_WARNING, sprintf(_('AtomPub post with unknown attention URI %s'), $uri));
+                        common_log(LOG_WARNING, sprintf('AtomPub post with unknown attention URI %s', $uri));
                     }
                 }
             }

From 6dc94a538993580b27813004915edc4cee957e60 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 20 Jan 2011 10:43:27 -0800
Subject: [PATCH 100/314] Move getConnectedApps() from Profile to User, where
 it belongs

Conflicts:

	classes/User.php
---
 actions/oauthconnectionssettings.php |  2 +-
 classes/Profile.php                  | 25 ------------
 classes/User.php                     | 59 ++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 26 deletions(-)

diff --git a/actions/oauthconnectionssettings.php b/actions/oauthconnectionssettings.php
index 9a7cda924a..cdb73203f0 100644
--- a/actions/oauthconnectionssettings.php
+++ b/actions/oauthconnectionssettings.php
@@ -97,7 +97,7 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction
         $offset = ($this->page - 1) * APPS_PER_PAGE;
         $limit  =  APPS_PER_PAGE + 1;
 
-        $connection = $profile->getConnectedApps($offset, $limit);
+        $connection = $user->getConnectedApps($offset, $limit);
 
         $cnt = 0;
 
diff --git a/classes/Profile.php b/classes/Profile.php
index 00e076a624..e29e6db7b7 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -409,31 +409,6 @@ class Profile extends Memcached_DataObject
         return $profile;
     }
 
-    function getConnectedApps($offset = 0, $limit = null)
-    {
-        $qry =
-          'SELECT u.* ' .
-          'FROM oauth_application_user u, oauth_application a ' .
-          'WHERE u.profile_id = %d ' .
-          'AND a.id = u.application_id ' .
-          'AND u.access_type > 0 ' .
-          'ORDER BY u.created DESC ';
-
-        if ($offset > 0) {
-            if (common_config('db','type') == 'pgsql') {
-                $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
-            } else {
-                $qry .= ' LIMIT ' . $offset . ', ' . $limit;
-            }
-        }
-
-        $apps = new Oauth_application_user();
-
-        $cnt = $apps->query(sprintf($qry, $this->id));
-
-        return $apps;
-    }
-
     function subscriptionCount()
     {
         $c = common_memcache();
diff --git a/classes/User.php b/classes/User.php
index c824ddb0c2..1b1b971ec7 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -116,6 +116,16 @@ class User extends Memcached_DataObject
         return $result;
     }
 
+    /**
+     * Check whether the given nickname is potentially usable, or if it's
+     * excluded by any blacklists on this system.
+     *
+     * WARNING: INPUT IS NOT VALIDATED OR NORMALIZED. NON-NORMALIZED INPUT
+     * OR INVALID INPUT MAY LEAD TO FALSE RESULTS.
+     *
+     * @param string $nickname
+     * @return boolean true if clear, false if blacklisted
+     */
     static function allowed_nickname($nickname)
     {
         // XXX: should already be validated for size, content, etc.
@@ -949,4 +959,53 @@ class User extends Memcached_DataObject
             throw $e;
         }
     }
+
+    /**
+     * Find and shorten links in the given text using this user's URL shortening
+     * settings.
+     *
+     * By default, links will be left untouched if the text is shorter than the
+     * configured maximum notice length. Pass true for the $always parameter
+     * to force all links to be shortened regardless.
+     *
+     * Side effects: may save file and file_redirection records for referenced URLs.
+     *
+     * @param string $text
+     * @param boolean $always
+     * @return string
+     */
+    public function shortenLinks($text, $always=false)
+    {
+        return common_shorten_links($text, $always, $this);
+    }
+
+    /*
+     * Get a list of OAuth client application that have access to this
+     * user's account.
+     */
+    function getConnectedApps($offset = 0, $limit = null)
+    {
+        $qry =
+          'SELECT u.* ' .
+          'FROM oauth_application_user u, oauth_application a ' .
+          'WHERE u.profile_id = %d ' .
+          'AND a.id = u.application_id ' .
+          'AND u.access_type > 0 ' .
+          'ORDER BY u.created DESC ';
+
+        if ($offset > 0) {
+            if (common_config('db','type') == 'pgsql') {
+                $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
+            } else {
+                $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+            }
+        }
+
+        $apps = new Oauth_application_user();
+
+        $cnt = $apps->query(sprintf($qry, $this->id));
+
+        return $apps;
+    }
+
 }

From 3a24b95edb87a20302f5d9911763867a0fcb8277 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 19 Jan 2011 15:52:18 -0800
Subject: [PATCH 101/314] Fix a couple spelling mistakes in comments and remove
 redundant statement terminator

---
 classes/User.php      | 2 +-
 lib/apiauth.php       | 2 +-
 lib/apioauthstore.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/User.php b/classes/User.php
index 1b1b971ec7..b339d61702 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -980,7 +980,7 @@ class User extends Memcached_DataObject
     }
 
     /*
-     * Get a list of OAuth client application that have access to this
+     * Get a list of OAuth client applications that have access to this
      * user's account.
      */
     function getConnectedApps($offset = 0, $limit = null)
diff --git a/lib/apiauth.php b/lib/apiauth.php
index 1dacf1409b..0cc184c04c 100644
--- a/lib/apiauth.php
+++ b/lib/apiauth.php
@@ -337,7 +337,7 @@ class ApiAuthAction extends ApiAction
     }
 
     /**
-     * Log an API authentication failer. Collect the proxy and IP
+     * Log an API authentication failure. Collect the proxy and IP
      * and log them
      *
      * @param string $logMsg additional log message
diff --git a/lib/apioauthstore.php b/lib/apioauthstore.php
index 2a65fffc4b..6aabde047c 100644
--- a/lib/apioauthstore.php
+++ b/lib/apioauthstore.php
@@ -229,7 +229,7 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore
                 // insert a new Oauth_application_user record w/access token
                 $appUser = new Oauth_application_user();
 
-                $appUser->profile_id     = $tokenAssoc->profile_id;;
+                $appUser->profile_id     = $tokenAssoc->profile_id;
                 $appUser->application_id = $app->id;
                 $appUser->access_type    = $app->access_type;
                 $appUser->token          = $at->tok;

From 28d40e5eed82626be7543a0998cf4956b95034cc Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 19 Jan 2011 16:13:42 -0800
Subject: [PATCH 102/314] Fix syntax error in error msg

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

diff --git a/actions/apioauthaccesstoken.php b/actions/apioauthaccesstoken.php
index 064d05120f..a3ce9edbf6 100644
--- a/actions/apioauthaccesstoken.php
+++ b/actions/apioauthaccesstoken.php
@@ -98,7 +98,7 @@ class ApiOauthAccessTokenAction extends ApiOauthAction
 
             common_log(LOG_WARNING, $msg);
             // TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-            $this->clientError(_("Invalid request token or verifier.", 400, 'text'));
+            $this->clientError(_("Invalid request token or verifier."), 400, 'text');
         } else {
             common_log(
                 LOG_INFO,

From 05361bb6868dac96566ea477530c9ac148c37ae6 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 19 Jan 2011 22:55:00 -0800
Subject: [PATCH 103/314] OAuth: Fix rare problem in which request tokens were
 sometimes being returned as access tokens.

---
 actions/apioauthaccesstoken.php |   1 +
 lib/apioauthstore.php           | 194 +++++++++++++++++++++++---------
 2 files changed, 141 insertions(+), 54 deletions(-)

diff --git a/actions/apioauthaccesstoken.php b/actions/apioauthaccesstoken.php
index a3ce9edbf6..6c3819c3bd 100644
--- a/actions/apioauthaccesstoken.php
+++ b/actions/apioauthaccesstoken.php
@@ -84,6 +84,7 @@ class ApiOauthAccessTokenAction extends ApiOauthAction
             common_debug(var_export($req, true));
             $code = $e->getCode();
             $this->clientError($e->getMessage(), empty($code) ? 401 : $code, 'text');
+            return;
         }
 
         if (empty($atok)) {
diff --git a/lib/apioauthstore.php b/lib/apioauthstore.php
index 6aabde047c..f1f88b13a1 100644
--- a/lib/apioauthstore.php
+++ b/lib/apioauthstore.php
@@ -152,8 +152,11 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore
                 );
             }
 
-            // check to see if we have previously issued an access token for this application
-            // and profile
+            // Check to see if we have previously issued an access token for
+            // this application and profile; if so we can just return the
+            // existing access token. That seems to be the best practice. It
+            // makes it so users only have to authorize the app once per
+            // machine.
 
             $appUser = new Oauth_application_user();
 
@@ -172,19 +175,40 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore
                      )
                 );
 
-                $at = new Token();
+                $at = null;
 
-                // fetch the full access token
-                $at->consumer_key = $consumer->key;
-                $at->tok          = $appUser->token;
+                // Special case: we used to store request tokens in the
+                // Oauth_application_user record, and the access_type would
+                // always be 0 (no access) as a failsafe until an access
+                // token was issued and replaced the request token. There could
+                // be a few old Oauth_application_user records storing request
+                // tokens still around, and we don't want to accidentally
+                // return a useless request token instead of a new access
+                // token. So if we find one, we generate a new access token
+                // and update the existing Oauth_application_user record before
+                // returning the new access token. This should be rare.
 
-                $result = $at->find(true);
+                if ($appUser->access_type == 0) {
 
-                if (!$result) {
-                    throw new Exception(
-                        // TRANS: Exception thrown when no access token can be issued.
-                        _('Could not issue access token.')
-                    );
+                    $at = $this->generateNewAccessToken($consumer, $rt, $verifier);
+                    $this->updateAppUser($appUser, $app, $at);
+
+                } else {
+
+                    $at = new Token();
+
+                    // fetch the full access token
+                    $at->consumer_key = $consumer->key;
+                    $at->tok          = $appUser->token;
+
+                    $result = $at->find(true);
+
+                    if (!$result) {
+                        throw new Exception(
+                            // TRANS: Exception thrown when no access token can be issued.
+                            _('Could not issue access token.')
+                        );
+                    }
                 }
 
                 // Yay, we can re-issue the access token
@@ -200,48 +224,8 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore
                      )
                 );
 
-                // make a brand new access token
-                $at = new Token();
-
-                $at->consumer_key      = $consumer->key;
-                $at->tok               = common_good_rand(16);
-                $at->secret            = common_good_rand(16);
-                $at->type              = 1; // access
-                $at->verifier          = $verifier;
-                $at->verified_callback = $rt->verified_callback; // 1.0a
-                $at->created           = common_sql_now();
-
-                if (!$at->insert()) {
-                    $e = $at->_lastError;
-                    common_debug('access token "' . $at->tok . '" not inserted: "' . $e->message . '"', __FILE__);
-                    return null;
-                } else {
-                    common_debug('access token "' . $at->tok . '" inserted', __FILE__);
-                    // burn the old one
-                    $orig_rt   = clone($rt);
-                    $rt->state = 2; // used
-                    if (!$rt->update($orig_rt)) {
-                        return null;
-                    }
-                    common_debug('request token "' . $rt->tok . '" updated', __FILE__);
-                }
-
-                // insert a new Oauth_application_user record w/access token
-                $appUser = new Oauth_application_user();
-
-                $appUser->profile_id     = $tokenAssoc->profile_id;
-                $appUser->application_id = $app->id;
-                $appUser->access_type    = $app->access_type;
-                $appUser->token          = $at->tok;
-                $appUser->created        = common_sql_now();
-
-                $result = $appUser->insert();
-
-                if (!$result) {
-                    common_log_db_error($appUser, 'INSERT', __FILE__);
-                    // TRANS: Server error displayed when a database error occurs.
-                    $this->serverError(_('Database error inserting OAuth application user.'));
-                }
+                $at = $this->generateNewAccessToken($consumer, $rt, $verifier);
+                $this->newAppUser($tokenAssoc, $app, $at);
 
                 // Okay, good
                 return new OAuthToken($at->tok, $at->secret);
@@ -261,6 +245,108 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore
         }
     }
 
+    /*
+     * Generate a new access token and save it to the database
+     *
+     * @param Consumer $consumer the OAuth consumer
+     * @param Token    $rt       the authorized request token
+     * @param string   $verifier the OAuth 1.0a verifier
+     *
+     * @access private
+     *
+     * @return Token   $at       the new access token
+     */
+    private function generateNewAccessToken($consumer, $rt, $verifier)
+    {
+        $at = new Token();
+
+        $at->consumer_key      = $consumer->key;
+        $at->tok               = common_good_rand(16);
+        $at->secret            = common_good_rand(16);
+        $at->type              = 1; // access
+        $at->verifier          = $verifier;
+        $at->verified_callback = $rt->verified_callback; // 1.0a
+        $at->created           = common_sql_now();
+
+        if (!$at->insert()) {
+            $e = $at->_lastError;
+            common_debug('access token "' . $at->tok . '" not inserted: "' . $e->message . '"', __FILE__);
+            return null;
+        } else {
+            common_debug('access token "' . $at->tok . '" inserted', __FILE__);
+            // burn the old one
+            $orig_rt   = clone($rt);
+            $rt->state = 2; // used
+            if (!$rt->update($orig_rt)) {
+                return null;
+            }
+            common_debug('request token "' . $rt->tok . '" updated', __FILE__);
+        }
+
+        return $at;
+    }
+
+   /*
+    * Add a new app user (Oauth_application_user) record
+    *
+    * @param Oauth_token_association $tokenAssoc token-to-app association
+    * @param Oauth_application       $app        the OAuth client app
+    * @param Token                   $at         the access token
+    *
+    * @access private
+    *
+    * @return void
+    */
+    private function newAppUser($tokenAssoc, $app, $at)
+    {
+        $appUser = new Oauth_application_user();
+
+        $appUser->profile_id     = $tokenAssoc->profile_id;
+        $appUser->application_id = $app->id;
+        $appUser->access_type    = $app->access_type;
+        $appUser->token          = $at->tok;
+        $appUser->created        = common_sql_now();
+
+        $result = $appUser->insert();
+
+        if (!$result) {
+            common_log_db_error($appUser, 'INSERT', __FILE__);
+
+            // TRANS: Server error displayed when a database error occurs.
+            throw new Exception(
+                _('Database error inserting OAuth application user.')
+            );
+        }
+    }
+
+   /*
+    * Update an existing app user (Oauth_application_user) record
+    *
+    * @param Oauth_application_user $appUser existing app user rec
+    * @param Oauth_application      $app     the OAuth client app
+    * @param Token                  $at      the access token
+    *
+    * @access private
+    *
+    * @return void
+    */
+    private function updateAppUser($appUser, $app, $at)
+    {
+        $original = clone($appUser);
+        $appUser->access_type = $app->access_type;
+        $appUser->token       = $at->tok;
+
+        $result = $appUser->update($original);
+
+        if (!$result) {
+            common_log_db_error($appUser, 'UPDATE', __FILE__);
+            // TRANS: Server error displayed when a database error occurs.
+            throw new Exception(
+                _('Database error updating OAuth application user.')
+            );
+        }
+    }
+
     /**
      * Revoke specified access token
      *

From 91ee2ea3b16e77d54bd9f20541a9958a4824a090 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Thu, 20 Jan 2011 20:00:45 +0100
Subject: [PATCH 104/314] Translator comments added L10n updates Remove
 superfluous whitespace Number parameters in message when two or more are used
 ClientException and ServerException should end with a period

---
 actions/atompubfavoritefeed.php     | 46 ++++++++++++++---------------
 actions/atompubmembershipfeed.php   | 44 ++++++++++++++-------------
 actions/atompubshowfavorite.php     | 22 ++++++--------
 actions/atompubshowmembership.php   | 20 ++++++-------
 actions/atompubshowsubscription.php |  8 ++---
 actions/atompubsubscriptionfeed.php | 45 ++++++++++++++--------------
 actions/confirmaddress.php          |  2 +-
 actions/emailsettings.php           | 12 ++++----
 actions/groupdesignsettings.php     |  2 +-
 actions/grouplogo.php               | 29 +++++++++++++-----
 actions/imsettings.php              | 21 ++++---------
 actions/licenseadminpanel.php       |  8 -----
 actions/othersettings.php           |  2 +-
 actions/profilesettings.php         | 15 ++++------
 actions/remotesubscribe.php         |  6 ++--
 actions/repeat.php                  |  4 +--
 actions/smssettings.php             | 27 ++++-------------
 actions/userdesignsettings.php      | 13 +-------
 18 files changed, 142 insertions(+), 184 deletions(-)

diff --git a/actions/atompubfavoritefeed.php b/actions/atompubfavoritefeed.php
index 478a01b7c6..d35bd9f53e 100644
--- a/actions/atompubfavoritefeed.php
+++ b/actions/atompubfavoritefeed.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2010, StatusNet, Inc.
  *
  * Feed of ActivityStreams 'favorite' actions
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -46,7 +46,6 @@ require_once INSTALLDIR . '/lib/apiauth.php';
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class AtompubfavoritefeedAction extends ApiAuthAction
 {
     private $_profile = null;
@@ -59,7 +58,6 @@ class AtompubfavoritefeedAction extends ApiAuthAction
      *
      * @return boolean true
      */
-
     function prepare($argarray)
     {
         parent::prepare($argarray);
@@ -67,7 +65,8 @@ class AtompubfavoritefeedAction extends ApiAuthAction
         $this->_profile = Profile::staticGet('id', $this->trimmed('profile'));
 
         if (empty($this->_profile)) {
-            throw new ClientException(_('No such profile'), 404);
+            // TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+            throw new ClientException(_('No such profile.'), 404);
         }
 
         $offset = ($this->page-1) * $this->count;
@@ -76,7 +75,7 @@ class AtompubfavoritefeedAction extends ApiAuthAction
         $this->_faves = Fave::byProfile($this->_profile->id,
                                         $offset,
                                         $limit);
-        
+
         return true;
     }
 
@@ -87,7 +86,6 @@ class AtompubfavoritefeedAction extends ApiAuthAction
      *
      * @return void
      */
-
     function handle($argarray=null)
     {
         parent::handle($argarray);
@@ -101,6 +99,7 @@ class AtompubfavoritefeedAction extends ApiAuthAction
             $this->addFavorite();
             break;
         default:
+            // TRANS: Client exception thrown when using an unsupported HTTP method.
             throw new ClientException(_('HTTP method not supported.'), 405);
             return;
         }
@@ -113,7 +112,6 @@ class AtompubfavoritefeedAction extends ApiAuthAction
      *
      * @return void
      */
-
     function showFeed()
     {
         header('Content-Type: application/atom+xml; charset=utf-8');
@@ -139,21 +137,25 @@ class AtompubfavoritefeedAction extends ApiAuthAction
         $feed->addAuthor($this->_profile->getBestName(),
                          $this->_profile->getURI());
 
+        // TRANS: Title for Atom favorites feed.
+        // TRANS: %s is a user nickname.
         $feed->setTitle(sprintf(_("%s favorites"),
                                 $this->_profile->getBestName()));
 
-        $feed->setSubtitle(sprintf(_("Notices %s has favorited to on %s"),
+        // TRANS: Subtitle for Atom favorites feed.
+        // TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
+        $feed->setSubtitle(sprintf(_("Notices %1$s has favorited on %2$s"),
                                    $this->_profile->getBestName(),
                                    common_config('site', 'name')));
 
         $feed->addLink(common_local_url('showfavorites',
-                                        array('nickname' => 
+                                        array('nickname' =>
                                               $this->_profile->nickname)));
 
         $feed->addLink($url,
                        array('rel' => 'self',
                              'type' => 'application/atom+xml'));
-                                        
+
         // If there's more...
 
         if ($this->page > 1) {
@@ -162,9 +164,9 @@ class AtompubfavoritefeedAction extends ApiAuthAction
                                  'type' => 'application/atom+xml'));
 
             $feed->addLink(common_local_url('AtomPubFavoriteFeed',
-                                            array('profile' => 
+                                            array('profile' =>
                                                   $this->_profile->id),
-                                            array('page' => 
+                                            array('page' =>
                                                   $this->page - 1)),
                            array('rel' => 'prev',
                                  'type' => 'application/atom+xml'));
@@ -205,17 +207,17 @@ class AtompubfavoritefeedAction extends ApiAuthAction
      *
      * @return void
      */
-
     function addFavorite()
     {
         // XXX: Refactor this; all the same for atompub
 
         if (empty($this->auth_user) ||
             $this->auth_user->id != $this->_profile->id) {
-            throw new ClientException(_("Can't add someone else's".
-                                        " subscription"), 403);
+            // TRANS: Client exception thrown when trying to set a favorite for another user.
+            throw new ClientException(_("Cannot add someone else's".
+                                        " subscription."), 403);
         }
-        
+
         $xml = file_get_contents('php://input');
 
         $dom = DOMDocument::loadXML($xml);
@@ -234,9 +236,8 @@ class AtompubfavoritefeedAction extends ApiAuthAction
         if (Event::handle('StartAtomPubNewActivity', array(&$activity))) {
 
             if ($activity->verb != ActivityVerb::FAVORITE) {
-                // TRANS: Client error displayed when not using the POST verb.
-                // TRANS: Do not translate POST.
-                throw new ClientException(_('Can only handle Favorite activities.'));
+                // TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
+                throw new ClientException(_('Can only handle favorite activities.'));
                 return;
             }
 
@@ -245,6 +246,7 @@ class AtompubfavoritefeedAction extends ApiAuthAction
             if (!in_array($note->type, array(ActivityObject::NOTE,
                                              ActivityObject::BLOGENTRY,
                                              ActivityObject::STATUS))) {
+                // TRANS: Client exception thrown when trying favorite an object that is not a notice.
                 throw new ClientException(_('Can only fave notices.'));
                 return;
             }
@@ -253,6 +255,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.'));
             }
 
@@ -260,6 +263,7 @@ class AtompubfavoritefeedAction extends ApiAuthAction
                                        'notice_id' => $notice->id));
 
             if (!empty($old)) {
+                // TRANS: Client exception thrown when trying favorite an already favorited notice.
                 throw new ClientException(_('Already a favorite.'));
             }
 
@@ -296,7 +300,6 @@ class AtompubfavoritefeedAction extends ApiAuthAction
      *
      * @return boolean is read only action?
      */
-
     function isReadOnly($args)
     {
         if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
@@ -328,7 +331,6 @@ class AtompubfavoritefeedAction extends ApiAuthAction
      *
      * @return string etag http header
      */
-
     function etag()
     {
         return null;
@@ -339,7 +341,6 @@ class AtompubfavoritefeedAction extends ApiAuthAction
      *
      * @return boolean true if delete, else false
      */
-
     function requiresAuth()
     {
         if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
@@ -359,7 +360,6 @@ class AtompubfavoritefeedAction extends ApiAuthAction
      *
      * @return void
      */
-
     function notify($fave, $notice, $user)
     {
         $other = User::staticGet('id', $notice->profile_id);
diff --git a/actions/atompubmembershipfeed.php b/actions/atompubmembershipfeed.php
index 3002576c15..8e3db3f3de 100644
--- a/actions/atompubmembershipfeed.php
+++ b/actions/atompubmembershipfeed.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2010, StatusNet, Inc.
  *
  * Feed of group memberships for a user, in ActivityStreams format
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -46,7 +46,6 @@ require_once INSTALLDIR . '/lib/apiauth.php';
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class AtompubmembershipfeedAction extends ApiAuthAction
 {
     private $_profile     = null;
@@ -59,7 +58,6 @@ class AtompubmembershipfeedAction extends ApiAuthAction
      *
      * @return boolean true
      */
-
     function prepare($argarray)
     {
         parent::prepare($argarray);
@@ -67,8 +65,9 @@ class AtompubmembershipfeedAction extends ApiAuthAction
         $profileId = $this->trimmed('profile');
 
         $this->_profile = Profile::staticGet('id', $profileId);
-        
+
         if (empty($this->_profile)) {
+            // TRANS: Client exception.
             throw new ClientException(_('No such profile.'), 404);
         }
 
@@ -78,7 +77,7 @@ class AtompubmembershipfeedAction extends ApiAuthAction
         $this->_memberships = Group_member::byMember($this->_profile->id,
                                                      $offset,
                                                      $limit);
-        
+
         return true;
     }
 
@@ -89,7 +88,6 @@ class AtompubmembershipfeedAction extends ApiAuthAction
      *
      * @return void
      */
-
     function handle($argarray=null)
     {
         parent::handle($argarray);
@@ -103,6 +101,7 @@ class AtompubmembershipfeedAction extends ApiAuthAction
             $this->addMembership();
             break;
         default:
+            // TRANS: Client exception thrown when using an unsupported HTTP method.
             throw new ClientException(_('HTTP method not supported.'), 405);
             return;
         }
@@ -115,7 +114,6 @@ class AtompubmembershipfeedAction extends ApiAuthAction
      *
      * @return void
      */
-
     function showFeed()
     {
         header('Content-Type: application/atom+xml; charset=utf-8');
@@ -141,21 +139,25 @@ class AtompubmembershipfeedAction extends ApiAuthAction
         $feed->addAuthor($this->_profile->getBestName(),
                          $this->_profile->getURI());
 
+        // TRANS: Title for group membership feed.
+        // TRANS: %s is a username.
         $feed->setTitle(sprintf(_("%s group memberships"),
                                 $this->_profile->getBestName()));
 
-        $feed->setSubtitle(sprintf(_("Groups %s is a member of on %s"),
+        // TRANS: Subtitle for group membership feed.
+        // TRANS: %1$s is a username, %2$s is the StatusNet sitename.
+        $feed->setSubtitle(sprintf(_("Groups %1$s is a member of on %2$s"),
                                    $this->_profile->getBestName(),
                                    common_config('site', 'name')));
 
         $feed->addLink(common_local_url('usergroups',
-                                        array('nickname' => 
+                                        array('nickname' =>
                                               $this->_profile->nickname)));
 
         $feed->addLink($url,
                        array('rel' => 'self',
                              'type' => 'application/atom+xml'));
-                                        
+
         // If there's more...
 
         if ($this->page > 1) {
@@ -164,9 +166,9 @@ class AtompubmembershipfeedAction extends ApiAuthAction
                                  'type' => 'application/atom+xml'));
 
             $feed->addLink(common_local_url('AtomPubMembershipFeed',
-                                            array('profile' => 
+                                            array('profile' =>
                                                   $this->_profile->id),
-                                            array('page' => 
+                                            array('page' =>
                                                   $this->page - 1)),
                            array('rel' => 'prev',
                                  'type' => 'application/atom+xml'));
@@ -207,17 +209,17 @@ class AtompubmembershipfeedAction extends ApiAuthAction
      *
      * @return void
      */
-
     function addMembership()
     {
         // XXX: Refactor this; all the same for atompub
 
         if (empty($this->auth_user) ||
             $this->auth_user->id != $this->_profile->id) {
-            throw new ClientException(_("Can't add someone else's".
+            // TRANS: Client exception thrown when trying subscribe someone else to a group.
+            throw new ClientException(_("Cannot add someone else's".
                                         " membership"), 403);
         }
-        
+
         $xml = file_get_contents('php://input');
 
         $dom = DOMDocument::loadXML($xml);
@@ -234,25 +236,26 @@ class AtompubmembershipfeedAction extends ApiAuthAction
         $membership = null;
 
         if (Event::handle('StartAtomPubNewActivity', array(&$activity))) {
-
             if ($activity->verb != ActivityVerb::JOIN) {
                 // TRANS: Client error displayed when not using the POST verb.
                 // TRANS: Do not translate POST.
-                throw new ClientException(_('Can only handle Join activities.'));
+                throw new ClientException(_('Can only handle join activities.'));
                 return;
             }
 
             $groupObj = $activity->objects[0];
 
             if ($groupObj->type != ActivityObject::GROUP) {
+                // TRANS: Client exception thrown when trying favorite an object that is not a notice.
                 throw new ClientException(_('Can only fave notices.'));
                 return;
             }
 
             $group = User_group::staticGet('uri', $groupObj->id);
-            
+
             if (empty($group)) {
                 // XXX: import from listed URL or something
+                // TRANS: Client exception thrown when trying to subscribe to a non-existing group.
                 throw new ClientException(_('Unknown group.'));
             }
 
@@ -260,6 +263,7 @@ class AtompubmembershipfeedAction extends ApiAuthAction
                                                'group_id' => $group->id));
 
             if (!empty($old)) {
+                // TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
                 throw new ClientException(_('Already a member.'));
             }
 
@@ -267,6 +271,7 @@ class AtompubmembershipfeedAction extends ApiAuthAction
 
             if (Group_block::isBlocked($group, $profile)) {
                 // XXX: import from listed URL or something
+                // TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
                 throw new ClientException(_('Blocked by admin.'));
             }
 
@@ -299,7 +304,6 @@ class AtompubmembershipfeedAction extends ApiAuthAction
      *
      * @return boolean is read only action?
      */
-
     function isReadOnly($args)
     {
         if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
@@ -331,7 +335,6 @@ class AtompubmembershipfeedAction extends ApiAuthAction
      *
      * @return string etag http header
      */
-
     function etag()
     {
         return null;
@@ -342,7 +345,6 @@ class AtompubmembershipfeedAction extends ApiAuthAction
      *
      * @return boolean true if delete, else false
      */
-
     function requiresAuth()
     {
         if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
diff --git a/actions/atompubshowfavorite.php b/actions/atompubshowfavorite.php
index 5fe680bb7b..328f35d8f9 100644
--- a/actions/atompubshowfavorite.php
+++ b/actions/atompubshowfavorite.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2010, StatusNet, Inc.
  *
  * Show a single favorite in Atom Activity Streams format
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -48,7 +48,6 @@ require_once INSTALLDIR . '/lib/apiauth.php';
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class AtompubshowfavoriteAction extends ApiAuthAction
 {
     private $_profile = null;
@@ -62,7 +61,6 @@ class AtompubshowfavoriteAction extends ApiAuthAction
      *
      * @return boolean true
      */
-
     function prepare($argarray)
     {
         parent::prepare($argarray);
@@ -73,12 +71,14 @@ class AtompubshowfavoriteAction extends ApiAuthAction
         $this->_profile = Profile::staticGet('id', $profileId);
 
         if (empty($this->_profile)) {
+            // TRANS: Client exception.
             throw new ClientException(_('No such profile.'), 404);
         }
 
         $this->_notice = Notice::staticGet('id', $noticeId);
 
         if (empty($this->_notice)) {
+            // TRANS: Client exception thrown when referencing a non-existing notice.
             throw new ClientException(_('No such notice.'), 404);
         }
 
@@ -86,6 +86,7 @@ class AtompubshowfavoriteAction extends ApiAuthAction
                                            'notice_id' => $noticeId));
 
         if (empty($this->_fave)) {
+            // TRANS: Client exception thrown when referencing a non-existing favorite.
             throw new ClientException(_('No such favorite.'), 404);
         }
 
@@ -99,7 +100,6 @@ class AtompubshowfavoriteAction extends ApiAuthAction
      *
      * @return void
      */
-
     function handle($argarray=null)
     {
         parent::handle($argarray);
@@ -113,6 +113,7 @@ class AtompubshowfavoriteAction extends ApiAuthAction
             $this->deleteFave();
             break;
         default:
+            // TRANS: Client exception thrown using an unsupported HTTP method.
             throw new ClientException(_('HTTP method not supported.'),
                                       405);
         }
@@ -121,10 +122,9 @@ class AtompubshowfavoriteAction extends ApiAuthAction
 
     /**
      * Show a single favorite, in ActivityStreams format
-     * 
+     *
      * @return void
      */
-
     function showFave()
     {
         $activity = $this->_fave->asActivity();
@@ -140,15 +140,15 @@ class AtompubshowfavoriteAction extends ApiAuthAction
 
     /**
      * Delete the favorite
-     * 
+     *
      * @return void
      */
-
     function deleteFave()
     {
         if (empty($this->auth_user) ||
             $this->auth_user->id != $this->_profile->id) {
-            throw new ClientException(_("Can't delete someone else's".
+            // TRANS: Client exception thrown when trying to remove a favorite notice of another user.
+            throw new ClientException(_("Cannot delete someone else's".
                                         " favorite"), 403);
         }
 
@@ -166,7 +166,6 @@ class AtompubshowfavoriteAction extends ApiAuthAction
      *
      * @return boolean is read only action?
      */
-
     function isReadOnly($args)
     {
         if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
@@ -184,7 +183,6 @@ class AtompubshowfavoriteAction extends ApiAuthAction
      *
      * @return string last modified http header
      */
-
     function lastModified()
     {
         return max(strtotime($this->_profile->modified),
@@ -199,7 +197,6 @@ class AtompubshowfavoriteAction extends ApiAuthAction
      *
      * @return string etag http header
      */
-
     function etag()
     {
         $mtime = strtotime($this->_fave->modified);
@@ -215,7 +212,6 @@ class AtompubshowfavoriteAction extends ApiAuthAction
      *
      * @return boolean true if delete, else false
      */
-
     function requiresAuth()
     {
         if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
diff --git a/actions/atompubshowmembership.php b/actions/atompubshowmembership.php
index 6d848a2290..4454c7fd7a 100644
--- a/actions/atompubshowmembership.php
+++ b/actions/atompubshowmembership.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2010, StatusNet, Inc.
  *
  * Show a single membership as an Activity Streams entry
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -46,7 +46,6 @@ require_once INSTALLDIR . '/lib/apiauth.php';
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class AtompubshowmembershipAction extends ApiAuthAction
 {
     private $_profile    = null;
@@ -60,7 +59,6 @@ class AtompubshowmembershipAction extends ApiAuthAction
      *
      * @return boolean true
      */
-
     function prepare($argarray)
     {
         parent::prepare($argarray);
@@ -68,8 +66,9 @@ class AtompubshowmembershipAction extends ApiAuthAction
         $profileId = $this->trimmed('profile');
 
         $this->_profile = Profile::staticGet('id', $profileId);
-        
+
         if (empty($this->_profile)) {
+            // TRANS: Client exception.
             throw new ClientException(_('No such profile.'), 404);
         }
 
@@ -78,6 +77,7 @@ class AtompubshowmembershipAction extends ApiAuthAction
         $this->_group = User_group::staticGet('id', $groupId);
 
         if (empty($this->_group)) {
+            // TRANS: Client exception thrown when referencing a non-existing group.
             throw new ClientException(_('No such group'), 404);
         }
 
@@ -87,6 +87,7 @@ class AtompubshowmembershipAction extends ApiAuthAction
         $this->_membership = Group_member::pkeyGet($kv);
 
         if (empty($this->_membership)) {
+            // TRANS: Client exception thrown when trying to show membership of a non-subscribed group
             throw new ClientException(_('Not a member'), 404);
         }
 
@@ -100,7 +101,6 @@ class AtompubshowmembershipAction extends ApiAuthAction
      *
      * @return void
      */
-
     function handle($argarray=null)
     {
         switch ($_SERVER['REQUEST_METHOD']) {
@@ -112,7 +112,8 @@ class AtompubshowmembershipAction extends ApiAuthAction
             $this->deleteMembership();
             break;
         default:
-            throw new ClientException(_('Method not supported'), 405);
+            // TRANS: Client exception thrown when using an unsupported HTTP method.
+            throw new ClientException(_('HTTP method not supported'), 405);
             break;
         }
         return;
@@ -123,7 +124,6 @@ class AtompubshowmembershipAction extends ApiAuthAction
      *
      * @return void
      */
-
     function showMembership()
     {
         $activity = $this->_membership->asActivity();
@@ -147,7 +147,8 @@ class AtompubshowmembershipAction extends ApiAuthAction
     {
         if (empty($this->auth_user) ||
             $this->auth_user->id != $this->_profile->id) {
-            throw new ClientException(_("Can't delete someone else's".
+            // TRANS: Client exception thrown when deleting someone else's membership.
+            throw new ClientException(_("Cannot delete someone else's".
                                         " membership"), 403);
         }
 
@@ -168,7 +169,6 @@ class AtompubshowmembershipAction extends ApiAuthAction
      *
      * @return boolean is read only action?
      */
-
     function isReadOnly($args)
     {
         if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
@@ -203,7 +203,6 @@ class AtompubshowmembershipAction extends ApiAuthAction
      *
      * @return string etag http header
      */
-
     function etag()
     {
         $ctime = strtotime($this->_membership->created);
@@ -222,7 +221,6 @@ class AtompubshowmembershipAction extends ApiAuthAction
      *
      * @return boolean true if delete, else false
      */
-
     function requiresAuth()
     {
         if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
diff --git a/actions/atompubshowsubscription.php b/actions/atompubshowsubscription.php
index 6274f8f922..aeff0cbf2a 100644
--- a/actions/atompubshowsubscription.php
+++ b/actions/atompubshowsubscription.php
@@ -69,7 +69,7 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
         if (empty($this->_subscriber)) {
             // 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.
-            throw new ClientException(sprintf(_('No such profile id: %d'),
+            throw new ClientException(sprintf(_('No such profile id: %d.'),
                                               $subscriberId), 404);
         }
 
@@ -80,7 +80,7 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
         if (empty($this->_subscribed)) {
             // 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.
-            throw new ClientException(sprintf(_('No such profile id: %d'),
+            throw new ClientException(sprintf(_('No such profile id: %d.'),
                                               $subscribedId), 404);
         }
 
@@ -91,7 +91,7 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
         if (empty($this->_subscription)) {
             // 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.
-            $msg = sprintf(_('Profile %1$d not subscribed to profile %2$d'),
+            $msg = sprintf(_('Profile %1$d not subscribed to profile %2$d.'),
                            $subscriberId, $subscribedId);
             throw new ClientException($msg, 404);
         }
@@ -155,7 +155,7 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
             $this->auth_user->id != $this->_subscriber->id) {
             // TRANS: Client exception thrown when trying to delete a subscription of another user.
             throw new ClientException(_("Cannot delete someone else's ".
-                                        "subscription"), 403);
+                                        "subscription."), 403);
         }
 
         Subscription::cancel($this->_subscriber,
diff --git a/actions/atompubsubscriptionfeed.php b/actions/atompubsubscriptionfeed.php
index 15ae79f6a6..0893c4b045 100644
--- a/actions/atompubsubscriptionfeed.php
+++ b/actions/atompubsubscriptionfeed.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2010, StatusNet, Inc.
  *
  * AtomPub subscription feed
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -40,7 +40,7 @@ require_once INSTALLDIR . '/lib/apiauth.php';
  * Subscription feed class for AtomPub
  *
  * Generates a list of the user's subscriptions
- * 
+ *
  * @category  AtomPub
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
@@ -48,7 +48,6 @@ require_once INSTALLDIR . '/lib/apiauth.php';
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class AtompubsubscriptionfeedAction extends ApiAuthAction
 {
     private $_profile       = null;
@@ -61,17 +60,18 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction
      *
      * @return boolean true
      */
-
     function prepare($argarray)
     {
         parent::prepare($argarray);
-        
+
         $subscriber = $this->trimmed('subscriber');
 
         $this->_profile = Profile::staticGet('id', $subscriber);
 
         if (empty($this->_profile)) {
-            throw new ClientException(sprintf(_('No such profile id: %d'),
+            // 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.
+            throw new ClientException(sprintf(_('No such profile id: %d.'),
                                               $subscriber), 404);
         }
 
@@ -93,7 +93,6 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction
      *
      * @return void
      */
-
     function handle($argarray=null)
     {
         parent::handle($argarray);
@@ -106,6 +105,7 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction
             $this->addSubscription();
             break;
         default:
+            // TRANS: Client exception thrown when using an unsupported HTTP method.
             $this->clientError(_('HTTP method not supported.'), 405);
             return;
         }
@@ -118,7 +118,6 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction
      *
      * @return void
      */
-
     function showFeed()
     {
         header('Content-Type: application/atom+xml; charset=utf-8');
@@ -144,21 +143,25 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction
         $feed->addAuthor($this->_profile->getBestName(),
                          $this->_profile->getURI());
 
+        // TRANS: Title for Atom subscription feed.
+        // TRANS: %s is a user nickname.
         $feed->setTitle(sprintf(_("%s subscriptions"),
                                 $this->_profile->getBestName()));
 
-        $feed->setSubtitle(sprintf(_("People %s has subscribed to on %s"),
+        // TRANS: Subtitle for Atom subscription feed.
+        // TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
+        $feed->setSubtitle(sprintf(_("People %1$s has subscribed to on %2$s"),
                                    $this->_profile->getBestName(),
                                    common_config('site', 'name')));
 
         $feed->addLink(common_local_url('subscriptions',
-                                        array('nickname' => 
+                                        array('nickname' =>
                                               $this->_profile->nickname)));
 
         $feed->addLink($url,
                        array('rel' => 'self',
                              'type' => 'application/atom+xml'));
-                                        
+
         // If there's more...
 
         if ($this->page > 1) {
@@ -167,9 +170,9 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction
                                  'type' => 'application/atom+xml'));
 
             $feed->addLink(common_local_url('AtomPubSubscriptionFeed',
-                                            array('subscriber' => 
+                                            array('subscriber' =>
                                                   $this->_profile->id),
-                                            array('page' => 
+                                            array('page' =>
                                                   $this->page - 1)),
                            array('rel' => 'prev',
                                  'type' => 'application/atom+xml'));
@@ -214,15 +217,15 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction
      *
      * @return void
      */
-
     function addSubscription()
     {
         if (empty($this->auth_user) ||
             $this->auth_user->id != $this->_profile->id) {
-            throw new ClientException(_("Can't add someone else's".
-                                        " subscription"), 403);
+            // TRANS: Client exception thrown when trying to subscribe another user.
+            throw new ClientException(_("Cannot add someone else's".
+                                        " subscription."), 403);
         }
-        
+
         $xml = file_get_contents('php://input');
 
         $dom = DOMDocument::loadXML($xml);
@@ -250,6 +253,7 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction
             $person = $activity->objects[0];
 
             if ($person->type != ActivityObject::PERSON) {
+                // TRANS: Client exception thrown when subscribing to an object that is not a person.
                 $this->clientError(_('Can only follow people.'));
                 return;
             }
@@ -259,7 +263,8 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction
             $profile = Profile::fromURI($person->id);
 
             if (empty($profile)) {
-                $this->clientError(sprintf(_('Unknown profile %s'), $person->id));
+                // TRANS: Client exception thrown when subscribing to a non-existing profile.
+                $this->clientError(sprintf(_('Unknown profile %s.'), $person->id));
                 return;
             }
 
@@ -290,7 +295,6 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction
      *
      * @return boolean is read only action?
      */
-
     function isReadOnly($args)
     {
         return $_SERVER['REQUEST_METHOD'] != 'POST';
@@ -301,7 +305,6 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction
      *
      * @return string last modified http header
      */
-
     function lastModified()
     {
         return null;
@@ -312,7 +315,6 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction
      *
      * @return string etag http header
      */
-
     function etag()
     {
         return null;
@@ -323,7 +325,6 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction
      *
      * @return boolean true if delete, else false
      */
-
     function requiresAuth()
     {
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index 5617c53392..238e70551c 100644
--- a/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@ -115,7 +115,7 @@ class ConfirmaddressAction extends Action
         if (!$result) {
             common_log_db_error($cur, 'UPDATE', __FILE__);
             // TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
-            $this->serverError(_('Couldn\'t update user.'));
+            $this->serverError(_('Could not update user.'));
             return;
         }
 
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 4a7dc1b871..cc513c2b40 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -356,7 +356,7 @@ class EmailsettingsAction extends AccountSettingsAction
 	    if ($result === false) {
 		common_log_db_error($user, 'UPDATE', __FILE__);
 		// TRANS: Server error thrown on database error updating e-mail preferences.
-		$this->serverError(_('Couldn\'t update user.'));
+		$this->serverError(_('Could not update user.'));
 		return;
 	    }
 	    
@@ -423,7 +423,7 @@ class EmailsettingsAction extends AccountSettingsAction
         if ($result === false) {
             common_log_db_error($confirm, 'INSERT', __FILE__);
             // TRANS: Server error thrown on database error adding e-mail confirmation code.
-            $this->serverError(_('Couldn\'t insert confirmation code.'));
+            $this->serverError(_('Could not insert confirmation code.'));
             return;
         }
 
@@ -465,7 +465,7 @@ class EmailsettingsAction extends AccountSettingsAction
         if (!$result) {
             common_log_db_error($confirm, 'DELETE', __FILE__);
             // TRANS: Server error thrown on database error canceling e-mail address confirmation.
-            $this->serverError(_('Couldn\'t delete email confirmation.'));
+            $this->serverError(_('Could not delete email confirmation.'));
             return;
         }
 
@@ -505,7 +505,7 @@ class EmailsettingsAction extends AccountSettingsAction
         if (!$result) {
             common_log_db_error($user, 'UPDATE', __FILE__);
             // TRANS: Server error thrown on database error removing a registered e-mail address.
-            $this->serverError(_('Couldn\'t update user.'));
+            $this->serverError(_('Could not update user.'));
             return;
         }
         $user->query('COMMIT');
@@ -537,7 +537,7 @@ class EmailsettingsAction extends AccountSettingsAction
         if (!$user->updateKeys($orig)) {
             common_log_db_error($user, 'UPDATE', __FILE__);
             // TRANS: Server error thrown on database error removing incoming e-mail address.
-            $this->serverError(_("Couldn't update user record."));
+            $this->serverError(_("Could not update user record."));
         }
 
         // TRANS: Message given after successfully removing an incoming e-mail address.
@@ -562,7 +562,7 @@ class EmailsettingsAction extends AccountSettingsAction
         if (!$user->updateKeys($orig)) {
             common_log_db_error($user, 'UPDATE', __FILE__);
             // TRANS: Server error thrown on database error adding incoming e-mail address.
-            $this->serverError(_("Couldn't update user record."));
+            $this->serverError(_("Could not update user record."));
         }
 
         // TRANS: Message given after successfully adding an incoming e-mail address.
diff --git a/actions/groupdesignsettings.php b/actions/groupdesignsettings.php
index 526226a285..6fd4da2c8e 100644
--- a/actions/groupdesignsettings.php
+++ b/actions/groupdesignsettings.php
@@ -263,7 +263,7 @@ class GroupDesignSettingsAction extends DesignSettingsAction
 
             if ($result === false) {
                 common_log_db_error($design, 'UPDATE', __FILE__);
-                $this->showForm(_('Couldn\'t update your design.'));
+                $this->showForm(_('Could not update your design.'));
                 return;
             }
 
diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index f414a23cc3..7b7c01b23b 100644
--- a/actions/grouplogo.php
+++ b/actions/grouplogo.php
@@ -49,7 +49,6 @@ 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 GrouplogoAction extends GroupDesignAction
 {
     var $mode = null;
@@ -67,6 +66,7 @@ class GrouplogoAction extends GroupDesignAction
         parent::prepare($args);
 
         if (!common_logged_in()) {
+            // TRANS: Client error displayed when trying to create a group while not logged in.
             $this->clientError(_('You must be logged in to create a group.'));
             return false;
         }
@@ -83,6 +83,7 @@ class GrouplogoAction extends GroupDesignAction
         }
 
         if (!$nickname) {
+            // TRANS: Client error displayed when trying to change group logo settings without having a nickname.
             $this->clientError(_('No nickname.'), 404);
             return false;
         }
@@ -99,6 +100,7 @@ class GrouplogoAction extends GroupDesignAction
         }
 
         if (!$this->group) {
+            // TRANS: Client error displayed when trying to update logo settings for a non-existing group.
             $this->clientError(_('No such group.'), 404);
             return false;
         }
@@ -106,6 +108,7 @@ class GrouplogoAction extends GroupDesignAction
         $cur = common_current_user();
 
         if (!$cur->isAdmin($this->group)) {
+            // TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
             $this->clientError(_('You must be an admin to edit the group.'), 403);
             return false;
         }
@@ -136,9 +139,9 @@ class GrouplogoAction extends GroupDesignAction
      *
      * @return string Title of the page
      */
-
     function title()
     {
+        // TRANS: Title for group logo settings page.
         return _('Group logo');
     }
 
@@ -147,9 +150,10 @@ class GrouplogoAction extends GroupDesignAction
      *
      * @return instructions for use
      */
-
     function getInstructions()
     {
+        // TRANS: Instructions for group logo page.
+        // TRANS: %s is the maximum file size for that site.
         return sprintf(_('You can upload a logo image for your group. The maximum file size is %s.'), ImageFile::maxFileSize());
     }
 
@@ -160,7 +164,6 @@ class GrouplogoAction extends GroupDesignAction
      *
      * @return void
      */
-
     function showContent()
     {
         if ($this->mode == 'crop') {
@@ -178,6 +181,7 @@ class GrouplogoAction extends GroupDesignAction
 
         if (!$profile) {
             common_log_db_error($user, 'SELECT', __FILE__);
+            // TRANS: Server error displayed coming across a request from a user without a profile.
             $this->serverError(_('User without matching profile.'));
             return;
         }
@@ -192,6 +196,7 @@ class GrouplogoAction extends GroupDesignAction
                                           common_local_url('grouplogo',
                                                            array('nickname' => $this->group->nickname))));
         $this->elementStart('fieldset');
+        // TRANS: Group logo form legend.
         $this->element('legend', null, _('Group logo'));
         $this->hidden('token', common_session_token());
 
@@ -199,6 +204,7 @@ class GrouplogoAction extends GroupDesignAction
         if ($original) {
             $this->elementStart('li', array('id' => 'avatar_original',
                                             'class' => 'avatar_view'));
+            // TRANS: Uploaded original file in group logo form.
             $this->element('h2', null, _("Original"));
             $this->elementStart('div', array('id'=>'avatar_original_view'));
             $this->element('img', array('src' => $this->group->original_logo,
@@ -210,6 +216,7 @@ class GrouplogoAction extends GroupDesignAction
         if ($this->group->homepage_logo) {
             $this->elementStart('li', array('id' => 'avatar_preview',
                                             'class' => 'avatar_view'));
+            // TRANS: Header for preview of to be displayed group logo.
             $this->element('h2', null, _("Preview"));
             $this->elementStart('div', array('id'=>'avatar_preview_view'));
             $this->element('img', array('src' => $this->group->homepage_logo,
@@ -233,6 +240,7 @@ class GrouplogoAction extends GroupDesignAction
 
         $this->elementStart('ul', 'form_actions');
         $this->elementStart('li');
+        // TRANS: Submit button for uploading a group logo.
         $this->submit('upload', _('Upload'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
@@ -251,6 +259,7 @@ class GrouplogoAction extends GroupDesignAction
                                           common_local_url('grouplogo',
                                                            array('nickname' => $this->group->nickname))));
         $this->elementStart('fieldset');
+        // TRANS: Legend for group logo settings fieldset.
         $this->element('legend', null, _('Avatar settings'));
         $this->hidden('token', common_session_token());
 
@@ -259,6 +268,7 @@ class GrouplogoAction extends GroupDesignAction
         $this->elementStart('li',
                             array('id' => 'avatar_original',
                                   'class' => 'avatar_view'));
+        // TRANS: Header for originally uploaded file before a crop on the group logo page.
         $this->element('h2', null, _("Original"));
         $this->elementStart('div', array('id'=>'avatar_original_view'));
         $this->element('img', array('src' => Avatar::url($this->filedata['filename']),
@@ -271,6 +281,7 @@ class GrouplogoAction extends GroupDesignAction
         $this->elementStart('li',
                             array('id' => 'avatar_preview',
                                   'class' => 'avatar_view'));
+        // TRANS: Header for the cropped group logo on the group logo page.
         $this->element('h2', null, _("Preview"));
         $this->elementStart('div', array('id'=>'avatar_preview_view'));
         $this->element('img', array('src' => Avatar::url($this->filedata['filename']),
@@ -286,6 +297,7 @@ class GrouplogoAction extends GroupDesignAction
                                           'id' => $crop_info));
         }
 
+        // TRANS: Button text for cropping an uploaded group logo.
         $this->submit('crop', _('Crop'));
 
         $this->elementEnd('li');
@@ -302,13 +314,13 @@ class GrouplogoAction extends GroupDesignAction
      *
      * @return void
      */
-
     function handlePost()
     {
         // CSRF protection
 
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
+            // TRANS: Form validation error message.
             $this->show_form(_('There was a problem with your session token. '.
                                'Try again, please.'));
             return;
@@ -319,6 +331,7 @@ class GrouplogoAction extends GroupDesignAction
         } else if ($this->arg('crop')) {
             $this->cropLogo();
         } else {
+            // TRANS: Form validation error message when an unsupported argument is used.
             $this->showForm(_('Unexpected form submission.'));
         }
     }
@@ -331,7 +344,6 @@ class GrouplogoAction extends GroupDesignAction
      *
      * @return void
      */
-
     function uploadLogo()
     {
         try {
@@ -362,6 +374,7 @@ class GrouplogoAction extends GroupDesignAction
 
         $this->mode = 'crop';
 
+        // TRANS: Form instructions on the group logo page.
         $this->showForm(_('Pick a square area of the image to be the logo.'),
                         true);
     }
@@ -371,12 +384,12 @@ class GrouplogoAction extends GroupDesignAction
      *
      * @return void
      */
-
     function cropLogo()
     {
         $filedata = $_SESSION['FILEDATA'];
 
         if (!$filedata) {
+            // TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
             $this->serverError(_('Lost our file data.'));
             return;
         }
@@ -396,8 +409,10 @@ class GrouplogoAction extends GroupDesignAction
             @unlink($filedata['filepath']);
             unset($_SESSION['FILEDATA']);
             $this->mode = 'upload';
+            // TRANS: Form success message after updating a group logo.
             $this->showForm(_('Logo updated.'), true);
         } else {
+            // TRANS: Form failure message after failing to update a group logo.
             $this->showForm(_('Failed updating logo.'));
         }
     }
diff --git a/actions/imsettings.php b/actions/imsettings.php
index 29cbeb82e3..dc72290345 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -45,7 +45,6 @@ require_once INSTALLDIR.'/lib/jabber.php';
  *
  * @see      SettingsAction
  */
-
 class ImsettingsAction extends ConnectSettingsAction
 {
     /**
@@ -53,7 +52,6 @@ class ImsettingsAction extends ConnectSettingsAction
      *
      * @return string Title of the page
      */
-
     function title()
     {
         // TRANS: Title for instance messaging settings.
@@ -65,7 +63,6 @@ class ImsettingsAction extends ConnectSettingsAction
      *
      * @return instructions for use
      */
-
     function getInstructions()
     {
         // TRANS: Instant messaging settings page instructions.
@@ -85,7 +82,6 @@ class ImsettingsAction extends ConnectSettingsAction
      *
      * @return void
      */
-
     function showContent()
     {
         if (!common_config('xmpp', 'enabled')) {
@@ -152,7 +148,7 @@ class ImsettingsAction extends ConnectSettingsAction
             }
         }
         $this->elementEnd('fieldset');
-        
+
         $this->elementStart('fieldset', array('id' => 'settings_im_preferences'));
         // TRANS: Form legend for IM preferences form.
         $this->element('legend', null, _('IM preferences'));
@@ -194,7 +190,6 @@ class ImsettingsAction extends ConnectSettingsAction
      *
      * @return Confirm_address address object for this user
      */
-
     function getConfirmation()
     {
         $user = common_current_user();
@@ -221,7 +216,6 @@ class ImsettingsAction extends ConnectSettingsAction
      *
      * @return void
      */
-
     function handlePost()
     {
         // CSRF protection
@@ -254,7 +248,6 @@ class ImsettingsAction extends ConnectSettingsAction
      *
      * @return void
      */
-
     function savePreferences()
     {
         $jabbernotify       = $this->boolean('jabbernotify');
@@ -280,7 +273,7 @@ class ImsettingsAction extends ConnectSettingsAction
         if ($result === false) {
             common_log_db_error($user, 'UPDATE', __FILE__);
             // TRANS: Server error thrown on database error updating IM preferences.
-            $this->serverError(_('Couldn\'t update user.'));
+            $this->serverError(_('Could not update user.'));
             return;
         }
 
@@ -298,7 +291,6 @@ class ImsettingsAction extends ConnectSettingsAction
      *
      * @return void
      */
-
     function addAddress()
     {
         $user = common_current_user();
@@ -348,7 +340,7 @@ class ImsettingsAction extends ConnectSettingsAction
         if ($result === false) {
             common_log_db_error($confirm, 'INSERT', __FILE__);
             // TRANS: Server error thrown on database error adding IM confirmation code.
-            $this->serverError(_('Couldn\'t insert confirmation code.'));
+            $this->serverError(_('Could not insert confirmation code.'));
             return;
         }
 
@@ -374,7 +366,6 @@ class ImsettingsAction extends ConnectSettingsAction
      *
      * @return void
      */
-
     function cancelConfirmation()
     {
         $jabber = $this->arg('jabber');
@@ -397,7 +388,7 @@ class ImsettingsAction extends ConnectSettingsAction
         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 IM confirmation.'));
+            $this->serverError(_('Could not delete IM confirmation.'));
             return;
         }
 
@@ -412,7 +403,6 @@ class ImsettingsAction extends ConnectSettingsAction
      *
      * @return void
      */
-
     function removeAddress()
     {
         $user = common_current_user();
@@ -439,7 +429,7 @@ class ImsettingsAction extends ConnectSettingsAction
         if (!$result) {
             common_log_db_error($user, 'UPDATE', __FILE__);
             // TRANS: Server error thrown on database error removing a registered IM address.
-            $this->serverError(_('Couldn\'t update user.'));
+            $this->serverError(_('Could not update user.'));
             return;
         }
         $user->query('COMMIT');
@@ -459,7 +449,6 @@ class ImsettingsAction extends ConnectSettingsAction
      *
      * @return boolean whether the Jabber ID exists
      */
-
     function jabberExists($jabber)
     {
         $user = common_current_user();
diff --git a/actions/licenseadminpanel.php b/actions/licenseadminpanel.php
index 95ac48cc8f..4adeb5c3c6 100644
--- a/actions/licenseadminpanel.php
+++ b/actions/licenseadminpanel.php
@@ -40,7 +40,6 @@ 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 LicenseadminpanelAction extends AdminPanelAction
 {
 
@@ -61,7 +60,6 @@ class LicenseadminpanelAction extends AdminPanelAction
      *
      * @return string instructions
      */
-
     function getInstructions()
     {
         return _('License for this StatusNet site');
@@ -72,7 +70,6 @@ class LicenseadminpanelAction extends AdminPanelAction
      *
      * @return void
      */
-
     function showForm()
     {
         $form = new LicenseAdminPanelForm($this);
@@ -85,7 +82,6 @@ class LicenseadminpanelAction extends AdminPanelAction
      *
      * @return void
      */
-
     function saveSettings()
     {
         static $settings = array(
@@ -128,7 +124,6 @@ class LicenseadminpanelAction extends AdminPanelAction
      *
      * @return nothing
      */
-
     function validate(&$values)
     {
         // Validate license type (shouldn't have to do it, but just in case)
@@ -197,7 +192,6 @@ class LicenseAdminPanelForm extends AdminForm
      *
      * @return int ID of the form
      */
-
     function id()
     {
         return 'licenseadminpanel';
@@ -208,7 +202,6 @@ class LicenseAdminPanelForm extends AdminForm
      *
      * @return string class of the form
      */
-
     function formClass()
     {
         return 'form_settings';
@@ -312,7 +305,6 @@ class LicenseAdminPanelForm extends AdminForm
      *
      * @return void
      */
-
     function formActions()
     {
         $this->out->submit(
diff --git a/actions/othersettings.php b/actions/othersettings.php
index 13460a4bfb..ef2c9f32b0 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -181,7 +181,7 @@ class OthersettingsAction extends AccountSettingsAction
         if ($result === false) {
             common_log_db_error($user, 'UPDATE', __FILE__);
             // TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-            $this->serverError(_('Couldn\'t update user.'));
+            $this->serverError(_('Could not update user.'));
             return;
         }
 
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 19fbdbd293..523c9df4cb 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -46,7 +46,6 @@ require_once INSTALLDIR.'/lib/accountsettingsaction.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 ProfilesettingsAction extends AccountSettingsAction
 {
     /**
@@ -54,7 +53,6 @@ class ProfilesettingsAction extends AccountSettingsAction
      *
      * @return string Title of the page
      */
-
     function title()
     {
         // TRANS: Page title for profile settings.
@@ -66,7 +64,6 @@ class ProfilesettingsAction extends AccountSettingsAction
      *
      * @return instructions for use
      */
-
     function getInstructions()
     {
         // TRANS: Usage instructions for profile settings.
@@ -87,7 +84,6 @@ class ProfilesettingsAction extends AccountSettingsAction
      *
      * @return void
      */
-
     function showContent()
     {
         $user = common_current_user();
@@ -212,7 +208,6 @@ class ProfilesettingsAction extends AccountSettingsAction
      *
      * @return void
      */
-
     function handlePost()
     {
         // CSRF protection
@@ -323,7 +318,7 @@ class ProfilesettingsAction extends AccountSettingsAction
                 if ($result === false) {
                     common_log_db_error($user, 'UPDATE', __FILE__);
                     // TRANS: Server error thrown when user profile settings could not be updated.
-                    $this->serverError(_('Couldn\'t update user.'));
+                    $this->serverError(_('Could not update user.'));
                     return;
                 } else {
                     // Re-initialize language environment if it changed
@@ -348,7 +343,7 @@ class ProfilesettingsAction extends AccountSettingsAction
                     common_log_db_error($user, 'UPDATE', __FILE__);
                     // TRANS: Server error thrown when user profile settings could not be updated to
                     // TRANS: automatically subscribe to any subscriber.
-                    $this->serverError(_('Couldn\'t update user for autosubscribe.'));
+                    $this->serverError(_('Could not update user for autosubscribe.'));
                     return;
                 }
             }
@@ -406,7 +401,7 @@ class ProfilesettingsAction extends AccountSettingsAction
                 if ($result === false) {
                     common_log_db_error($prefs, ($exists) ? 'UPDATE' : 'INSERT', __FILE__);
                     // TRANS: Server error thrown when user profile location preference settings could not be updated.
-                    $this->serverError(_('Couldn\'t save location prefs.'));
+                    $this->serverError(_('Could not save location prefs.'));
                     return;
                 }
             }
@@ -419,7 +414,7 @@ class ProfilesettingsAction extends AccountSettingsAction
             if ($result === false) {
                 common_log_db_error($profile, 'UPDATE', __FILE__);
                 // TRANS: Server error thrown when user profile settings could not be saved.
-                $this->serverError(_('Couldn\'t save profile.'));
+                $this->serverError(_('Could not save profile.'));
                 return;
             }
 
@@ -428,7 +423,7 @@ class ProfilesettingsAction extends AccountSettingsAction
 
             if (!$result) {
                 // TRANS: Server error thrown when user profile settings tags could not be saved.
-                $this->serverError(_('Couldn\'t save tags.'));
+                $this->serverError(_('Could not save tags.'));
                 return;
             }
 
diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index 9fc235e743..63ba618c41 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -44,7 +44,6 @@ require_once INSTALLDIR.'/extlib/libomb/profile.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
-
 class RemotesubscribeAction extends Action
 {
     var $nickname;
@@ -173,14 +172,14 @@ class RemotesubscribeAction extends Action
         if ($service->getServiceURI(OAUTH_ENDPOINT_REQUEST) ==
             common_local_url('requesttoken') ||
             User::staticGet('uri', $service->getRemoteUserURI())) {
-            $this->showForm(_('That’s a local profile! Login to subscribe.'));
+            $this->showForm(_('That is a local profile! Login to subscribe.'));
             return;
         }
 
         try {
             $service->requestToken();
         } catch (OMB_RemoteServiceException $e) {
-            $this->showForm(_('Couldn’t get a request token.'));
+            $this->showForm(_('Could not get a request token.'));
             return;
         }
 
@@ -204,4 +203,3 @@ class RemotesubscribeAction extends Action
         common_redirect($target_url, 303);
     }
 }
-?>
diff --git a/actions/repeat.php b/actions/repeat.php
index 893cae4ffd..60b238f3a7 100644
--- a/actions/repeat.php
+++ b/actions/repeat.php
@@ -41,7 +41,6 @@ if (!defined('STATUSNET')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
-
 class RepeatAction extends Action
 {
     var $user = null;
@@ -73,7 +72,7 @@ class RepeatAction extends Action
         }
 
         if ($this->user->id == $this->notice->profile_id) {
-            $this->clientError(_("You can't repeat your own notice."));
+            $this->clientError(_("You cannot repeat your own notice."));
             return false;
         }
 
@@ -101,7 +100,6 @@ class RepeatAction extends Action
      *
      * @return void
      */
-
     function handle($args)
     {
         $repeat = $this->notice->repeat($this->user->id, 'web');
diff --git a/actions/smssettings.php b/actions/smssettings.php
index 6af1872a0e..e672b6d8af 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -44,7 +44,6 @@ require_once INSTALLDIR.'/lib/connectsettingsaction.php';
  *
  * @see      SettingsAction
  */
-
 class SmssettingsAction extends ConnectSettingsAction
 {
     /**
@@ -52,7 +51,6 @@ class SmssettingsAction extends ConnectSettingsAction
      *
      * @return string Title of the page
      */
-
     function title()
     {
         // TRANS: Title for SMS settings.
@@ -64,7 +62,6 @@ class SmssettingsAction extends ConnectSettingsAction
      *
      * @return instructions for use
      */
-
     function getInstructions()
     {
         // XXX: For consistency of parameters in messages, this should be a
@@ -88,7 +85,6 @@ class SmssettingsAction extends ConnectSettingsAction
      *
      * @return void
      */
-
     function showContent()
     {
         if (!common_config('sms', 'enabled')) {
@@ -219,7 +215,6 @@ class SmssettingsAction extends ConnectSettingsAction
      *
      * @todo very similar to EmailsettingsAction::getConfirmation(); refactor?
      */
-
     function getConfirmation()
     {
         $user = common_current_user();
@@ -246,7 +241,6 @@ class SmssettingsAction extends ConnectSettingsAction
      *
      * @return void
      */
-
     function handlePost()
     {
         // CSRF protection
@@ -285,7 +279,6 @@ class SmssettingsAction extends ConnectSettingsAction
      *
      * @return void
      */
-
     function savePreferences()
     {
         $smsnotify = $this->boolean('smsnotify');
@@ -305,7 +298,7 @@ class SmssettingsAction extends ConnectSettingsAction
         if ($result === false) {
             common_log_db_error($user, 'UPDATE', __FILE__);
             // TRANS: Server error thrown on database error updating SMS preferences.
-            $this->serverError(_('Couldn\'t update user.'));
+            $this->serverError(_('Could not update user.'));
             return;
         }
 
@@ -323,7 +316,6 @@ class SmssettingsAction extends ConnectSettingsAction
      *
      * @return void
      */
-
     function addAddress()
     {
         $user = common_current_user();
@@ -370,7 +362,7 @@ class SmssettingsAction extends ConnectSettingsAction
         if ($result === false) {
             common_log_db_error($confirm, 'INSERT', __FILE__);
             // TRANS: Server error thrown on database error adding SMS confirmation code.
-            $this->serverError(_('Couldn\'t insert confirmation code.'));
+            $this->serverError(_('Could not insert confirmation code.'));
             return;
         }
 
@@ -395,7 +387,6 @@ class SmssettingsAction extends ConnectSettingsAction
      *
      * @return void
      */
-
     function cancelConfirmation()
     {
         $sms     = $this->trimmed('sms');
@@ -419,7 +410,7 @@ class SmssettingsAction extends ConnectSettingsAction
         if (!$result) {
             common_log_db_error($confirm, 'DELETE', __FILE__);
             // TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-            $this->serverError(_('Couldn\'t delete email confirmation.'));
+            $this->serverError(_('Could not delete email confirmation.'));
             return;
         }
 
@@ -432,7 +423,6 @@ class SmssettingsAction extends ConnectSettingsAction
      *
      * @return void
      */
-
     function removeAddress()
     {
         $user = common_current_user();
@@ -461,7 +451,7 @@ class SmssettingsAction extends ConnectSettingsAction
         if (!$result) {
             common_log_db_error($user, 'UPDATE', __FILE__);
             // TRANS: Server error thrown on database error removing a registered SMS phone number.
-            $this->serverError(_('Couldn\'t update user.'));
+            $this->serverError(_('Could not update user.'));
             return;
         }
         $user->query('COMMIT');
@@ -479,7 +469,6 @@ class SmssettingsAction extends ConnectSettingsAction
      *
      * @return boolean does the number exist
      */
-
     function smsExists($sms)
     {
         $user = common_current_user();
@@ -498,7 +487,6 @@ class SmssettingsAction extends ConnectSettingsAction
      *
      * @return void
      */
-
     function carrierSelect()
     {
         $carrier = new Sms_carrier();
@@ -538,7 +526,6 @@ class SmssettingsAction extends ConnectSettingsAction
      *
      * @return void
      */
-
     function confirmCode()
     {
         $code = $this->trimmed('code');
@@ -559,7 +546,6 @@ class SmssettingsAction extends ConnectSettingsAction
      *
      * @return void
      */
-
     function removeIncoming()
     {
         $user = common_current_user();
@@ -575,7 +561,7 @@ class SmssettingsAction extends ConnectSettingsAction
 
         if (!$user->updateKeys($orig)) {
             common_log_db_error($user, 'UPDATE', __FILE__);
-            $this->serverError(_("Couldn't update user record."));
+            $this->serverError(_("Could not update user record."));
         }
 
         $this->showForm(_('Incoming email address removed.'), true);
@@ -588,7 +574,6 @@ class SmssettingsAction extends ConnectSettingsAction
      *
      * @see Emailsettings::newIncoming
      */
-
     function newIncoming()
     {
         $user = common_current_user();
@@ -599,7 +584,7 @@ class SmssettingsAction extends ConnectSettingsAction
 
         if (!$user->updateKeys($orig)) {
             common_log_db_error($user, 'UPDATE', __FILE__);
-            $this->serverError(_("Couldn't update user record."));
+            $this->serverError(_("Could not update user record."));
         }
 
         $this->showForm(_('New incoming email address added.'), true);
diff --git a/actions/userdesignsettings.php b/actions/userdesignsettings.php
index 1cf8780006..b82dea8dd6 100644
--- a/actions/userdesignsettings.php
+++ b/actions/userdesignsettings.php
@@ -46,7 +46,6 @@ require_once INSTALLDIR . '/lib/designsettings.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 UserDesignSettingsAction extends DesignSettingsAction
 {
     /**
@@ -70,7 +69,6 @@ class UserDesignSettingsAction extends DesignSettingsAction
      *
      * @return string Title of the page
      */
-
     function title()
     {
         return _('Profile design');
@@ -81,7 +79,6 @@ class UserDesignSettingsAction extends DesignSettingsAction
      *
      * @return instructions for use
      */
-
     function getInstructions()
     {
         return _('Customize the way your profile looks ' .
@@ -93,7 +90,6 @@ class UserDesignSettingsAction extends DesignSettingsAction
      *
      * @return Design
      */
-
     function getWorkingDesign()
     {
         $user   = common_current_user();
@@ -108,7 +104,6 @@ class UserDesignSettingsAction extends DesignSettingsAction
      *
      * @return void
      */
-
     function showContent()
     {
         $design = $this->getWorkingDesign();
@@ -125,7 +120,6 @@ class UserDesignSettingsAction extends DesignSettingsAction
      *
      * @return void
      */
-
     function saveDesign()
     {
         foreach ($this->args as $key => $val) {
@@ -168,7 +162,6 @@ class UserDesignSettingsAction extends DesignSettingsAction
         $design = $user->getDesign();
 
         if (!empty($design)) {
-
             $original = clone($design);
 
             $design->backgroundcolor = $bgcolor->intValue();
@@ -183,13 +176,11 @@ class UserDesignSettingsAction extends DesignSettingsAction
 
             if ($result === false) {
                 common_log_db_error($design, 'UPDATE', __FILE__);
-                $this->showForm(_('Couldn\'t update your design.'));
+                $this->showForm(_('Could not update your design.'));
                 return;
             }
-
             // update design
         } else {
-
             $user->query('BEGIN');
 
             // save new design
@@ -236,7 +227,6 @@ class UserDesignSettingsAction extends DesignSettingsAction
      *
      * @return nothing
      */
-
     function sethd()
     {
 
@@ -281,5 +271,4 @@ class UserDesignSettingsAction extends DesignSettingsAction
 
         $this->showForm(_('Enjoy your hotdog!'), true);
     }
-
 }

From 03acf301ba8b7e172409c2f0dd8a603dc29e38e3 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Thu, 20 Jan 2011 21:12:51 +0100
Subject: [PATCH 105/314] Localisation updates from http://translatewiki.net.

---
 locale/ar/LC_MESSAGES/statusnet.po            | 728 ++++++++------
 locale/arz/LC_MESSAGES/statusnet.po           | 758 +++++++-------
 locale/bg/LC_MESSAGES/statusnet.po            | 727 ++++++++------
 locale/br/LC_MESSAGES/statusnet.po            | 729 ++++++++------
 locale/ca/LC_MESSAGES/statusnet.po            | 756 +++++++-------
 locale/cs/LC_MESSAGES/statusnet.po            | 729 ++++++++------
 locale/de/LC_MESSAGES/statusnet.po            | 731 ++++++++------
 locale/en_GB/LC_MESSAGES/statusnet.po         | 729 ++++++++------
 locale/eo/LC_MESSAGES/statusnet.po            | 730 ++++++++------
 locale/es/LC_MESSAGES/statusnet.po            | 745 +++++++-------
 locale/fa/LC_MESSAGES/statusnet.po            | 730 ++++++++------
 locale/fi/LC_MESSAGES/statusnet.po            | 755 +++++++-------
 locale/fr/LC_MESSAGES/statusnet.po            | 726 ++++++++------
 locale/gl/LC_MESSAGES/statusnet.po            | 729 ++++++++------
 locale/hsb/LC_MESSAGES/statusnet.po           | 850 +++++++++-------
 locale/hu/LC_MESSAGES/statusnet.po            | 741 ++++++++------
 locale/ia/LC_MESSAGES/statusnet.po            | 834 ++++++++-------
 locale/is/LC_MESSAGES/statusnet.po            | 754 +++++++-------
 locale/it/LC_MESSAGES/statusnet.po            | 727 ++++++++------
 locale/ja/LC_MESSAGES/statusnet.po            | 758 +++++++-------
 locale/ka/LC_MESSAGES/statusnet.po            | 729 ++++++++------
 locale/ko/LC_MESSAGES/statusnet.po            | 724 +++++++------
 locale/mk/LC_MESSAGES/statusnet.po            | 865 ++++++++--------
 locale/ml/LC_MESSAGES/statusnet.po            | 949 ++++++++++--------
 locale/nb/LC_MESSAGES/statusnet.po            | 739 ++++++++------
 locale/nl/LC_MESSAGES/statusnet.po            | 741 ++++++++------
 locale/nn/LC_MESSAGES/statusnet.po            | 754 +++++++-------
 locale/pl/LC_MESSAGES/statusnet.po            | 863 ++++++++--------
 locale/pt/LC_MESSAGES/statusnet.po            | 739 ++++++++------
 locale/pt_BR/LC_MESSAGES/statusnet.po         | 824 ++++++++-------
 locale/ru/LC_MESSAGES/statusnet.po            | 725 +++++++------
 locale/statusnet.pot                          | 696 +++++++------
 locale/sv/LC_MESSAGES/statusnet.po            | 727 ++++++++------
 locale/te/LC_MESSAGES/statusnet.po            | 758 +++++++-------
 locale/tr/LC_MESSAGES/statusnet.po            | 759 +++++++-------
 locale/uk/LC_MESSAGES/statusnet.po            | 868 ++++++++--------
 locale/zh_CN/LC_MESSAGES/statusnet.po         | 728 ++++++++------
 .../locale/ia/LC_MESSAGES/Bookmark.po         |  36 +
 .../locale/mk/LC_MESSAGES/Bookmark.po         |  36 +
 .../locale/uk/LC_MESSAGES/Bookmark.po         |  37 +
 .../locale/ce/LC_MESSAGES/MobileProfile.po    |  78 ++
 .../NewMenu/locale/ia/LC_MESSAGES/NewMenu.po  |  98 ++
 .../NewMenu/locale/mk/LC_MESSAGES/NewMenu.po  |  98 ++
 .../NewMenu/locale/uk/LC_MESSAGES/NewMenu.po  |  99 ++
 .../locale/ia/LC_MESSAGES/SQLProfile.po       |  26 +
 .../locale/mk/LC_MESSAGES/SQLProfile.po       |  28 +
 .../locale/nl/LC_MESSAGES/SQLProfile.po       |   9 +-
 .../locale/uk/LC_MESSAGES/SQLProfile.po       |  29 +
 48 files changed, 16008 insertions(+), 12720 deletions(-)
 create mode 100644 plugins/Bookmark/locale/ia/LC_MESSAGES/Bookmark.po
 create mode 100644 plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po
 create mode 100644 plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po
 create mode 100644 plugins/MobileProfile/locale/ce/LC_MESSAGES/MobileProfile.po
 create mode 100644 plugins/NewMenu/locale/ia/LC_MESSAGES/NewMenu.po
 create mode 100644 plugins/NewMenu/locale/mk/LC_MESSAGES/NewMenu.po
 create mode 100644 plugins/NewMenu/locale/uk/LC_MESSAGES/NewMenu.po
 create mode 100644 plugins/SQLProfile/locale/ia/LC_MESSAGES/SQLProfile.po
 create mode 100644 plugins/SQLProfile/locale/mk/LC_MESSAGES/SQLProfile.po
 create mode 100644 plugins/SQLProfile/locale/uk/LC_MESSAGES/SQLProfile.po

diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index 2c4a22665d..4d58e73db5 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -11,19 +11,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:34:32+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19: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 (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
 "2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
 "99) ? 4 : 5 ) ) ) );\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -90,9 +90,9 @@ msgstr "حفظ إعدادت الوصول"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -113,6 +113,8 @@ msgstr "لا صفحة كهذه."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -133,8 +135,8 @@ msgstr "لا صفحة كهذه."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -145,7 +147,7 @@ msgstr "لا صفحة كهذه."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -307,7 +309,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "تعذّر تحديث المستخدم."
 
@@ -329,7 +345,8 @@ msgid "User has no profile."
 msgstr "ليس للمستخدم ملف شخصي."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "لم يمكن حفظ الملف."
 
@@ -365,8 +382,8 @@ msgstr[5] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 #, fuzzy
 msgid "Unable to save your design settings."
 msgstr "تعذّر حذف إعدادات التصميم."
@@ -375,13 +392,17 @@ msgstr "تعذّر حذف إعدادات التصميم."
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
+#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "تعذّر تحديث تصميمك."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+msgctxt "ATOM"
 msgid "Main"
 msgstr ""
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -392,31 +413,38 @@ msgstr ""
 msgid "%s timeline"
 msgstr "مسار %s الزمني"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "اشتراكات %s"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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 "المفضلات"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "لا يمكنك منع نفسك!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "فشل منع المستخدم."
 
@@ -558,7 +586,7 @@ msgstr "تعذّر إيجاد المستخدم الهدف."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "الاسم المستعار مستخدم بالفعل. جرّب اسمًا آخرًا."
@@ -568,7 +596,7 @@ msgstr "الاسم المستعار مستخدم بالفعل. جرّب اسمً
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "ليس اسمًا مستعارًا صحيحًا."
@@ -580,7 +608,7 @@ msgstr "ليس اسمًا مستعارًا صحيحًا."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "الصفحة الرئيسية ليست عنونًا صالحًا."
@@ -590,7 +618,7 @@ msgstr "الصفحة الرئيسية ليست عنونًا صالحًا."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -622,7 +650,7 @@ msgstr[5] "المنظمة طويلة جدا (الأقصى %d حرفا)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -753,7 +781,7 @@ msgid "Upload failed."
 msgstr "ارفع ملفًا"
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:101
+#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "توكن دخول غير صحيح محدد."
@@ -776,18 +804,19 @@ msgid "Request token already authorized."
 msgstr "لا تملك تصريحًا."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -809,16 +838,17 @@ msgstr "خطأ في قاعدة البيانات أثناء حذف مستخدم 
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -864,7 +894,7 @@ msgstr "الحساب"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -885,7 +915,7 @@ msgstr "كلمة السر"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -960,6 +990,7 @@ 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
@@ -979,40 +1010,50 @@ msgstr "لا يمكنك تكرار ملحوظتك الخاصة."
 msgid "Already repeated that notice."
 msgstr "كرر بالفعل هذه الملاحظة."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "لم يتم العثور على وسيلة API."
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "حُذِفت الحالة."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "لا حالة وُجدت بهذه الهوية."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "تعذّر حذف هذا الإشعار."
 
-#: actions/apistatusesshow.php:243
+#. 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 "احذف الإشعار"
@@ -1154,51 +1195,49 @@ msgstr "يستطيع المستخدمون الوالجون وحدهم تكرار
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "ابحث عن محتويات في الإشعارات"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:406
+#: actions/apitimelineuser.php:409
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "لا ملف بهذه الهوية."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 #, fuzzy
@@ -1210,108 +1249,116 @@ msgstr "لم يتم العثور على وسيلة API."
 msgid "User not found."
 msgstr "لم يُعثرعلى المستخدم."
 
-#: actions/atompubfavoritefeed.php:70
-#, fuzzy
-msgid "No such profile"
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
+msgid "No such profile."
 msgstr "لا ملف كهذا."
 
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#. 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 "Can't add someone else's subscription"
+msgid "Cannot add someone else's subscription."
 msgstr "تعذّر إدراج اشتراك جديد."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-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 "ابحث عن محتويات في الإشعارات"
 
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#. 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 "ابحث عن محتويات في الإشعارات"
 
-#: actions/atompubfavoritefeed.php:256
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "غير معروفة"
 
-#: actions/atompubfavoritefeed.php:263
+#. TRANS: Client exception thrown when trying favorite an already favorited notice.
+#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "أضف إلى المفضلات"
 
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
-msgid "No such profile."
-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"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "المجموعات التي %s عضو فيها"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "تعذّر إدراج اشتراك جديد."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:241
-msgid "Can only handle Join activities."
-msgstr ""
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
+msgstr "ابحث عن محتويات في الإشعارات"
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "غير معروفة"
 
-#: actions/atompubmembershipfeed.php:263
+#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
+#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "جميع الأعضاء"
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr "تعذّر حذف المفضلة."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "لا مجموعة كهذه"
 
-#: actions/atompubshowmembership.php:90
+#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
+#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member"
 msgstr "جميع الأعضاء"
 
-#: actions/atompubshowmembership.php:115
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "Method not supported"
+msgid "HTTP method not supported"
 msgstr "لم يتم العثور على وسيلة API."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1319,40 +1366,37 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
-msgid "No such profile id: %d"
+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"
+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"
+msgid "Cannot delete someone else's subscription."
 msgstr "تعذّر حفظ الاشتراك."
 
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "الأشخاص المشتركون ب%s"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
 msgstr "نوع ملف غير معروف"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1363,10 +1407,11 @@ msgstr "لا مرفق كهذا."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "لا اسم مستعار."
@@ -1397,30 +1442,36 @@ msgid "You can upload your personal avatar. The maximum file size is %s."
 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "إعدادات الأفتار"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "الأصل"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "معاينة"
 
@@ -1458,7 +1509,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr ""
 
@@ -1477,7 +1529,7 @@ msgstr "فشل تحديث الأفتار."
 msgid "Avatar deleted."
 msgstr "حُذف الأفتار."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1576,6 +1628,7 @@ msgstr "فشل حفظ معلومات المنع."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1585,7 +1638,7 @@ msgstr "فشل حفظ معلومات المنع."
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1667,23 +1720,6 @@ msgstr ""
 msgid "That address has already been confirmed."
 msgstr "هذا البريد الإلكتروني ملك مستخدم آخر بالفعل."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-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
@@ -1745,7 +1781,7 @@ msgid "Account deleted."
 msgstr "حُذف الأفتار."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "أنشئ حسابًا"
@@ -2104,7 +2140,7 @@ msgid "Reset back to default"
 msgstr "ارجع إلى المبدئي"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2221,14 +2257,16 @@ msgid "Edit %s group"
 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:70 actions/newgroup.php:65
 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 when trying to change group logo settings while not being a group admin.
 #: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "يجب أن تكون إداريا لتعدل المجموعة."
 
@@ -2289,8 +2327,8 @@ msgstr "عنوان البريد الإلكتروني المُؤكد الحالي
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "أزل"
@@ -2313,15 +2351,15 @@ msgstr "عنوان البريد الإلكتروني، مثل \"UserName@example
 #. 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "البريد الإلكتروني الوارد"
 
@@ -2332,13 +2370,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "أنشئ عنوان بريد إلكتروني لترسل إليه؛ ألغِ القديم."
 
@@ -2351,7 +2389,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "جديد"
@@ -2426,9 +2464,10 @@ msgstr "هذا البريد الإلكتروني ملك مستخدم آخر با
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, fuzzy
+msgid "Could not insert confirmation code."
 msgstr "تعذّر إدراج رمز التأكيد."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
@@ -2441,8 +2480,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 #, fuzzy
 msgid "No pending confirmation to cancel."
 msgstr "أُلغي تأكيد المراسلة الفورية."
@@ -2454,8 +2493,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+msgid "Could not delete email confirmation."
 msgstr "تعذّر حذف تأكيد البريد الإلكتروني."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
@@ -2474,25 +2514,26 @@ msgstr "هذا ليس عنوان بريدك الإلكتروني."
 msgid "The email address was removed."
 msgstr "أزيل عنوان البريد الإلكتروني."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, fuzzy
+msgid "Could not update user record."
 msgstr "تعذّر تحديث سجل المستخدم."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 #, fuzzy
 msgid "Incoming email address removed."
 msgstr "لا عنوان بريد إلكتروني وارد."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 #, fuzzy
 msgid "New incoming email address added."
 msgstr "لا عنوان بريد إلكتروني وارد."
@@ -2586,7 +2627,7 @@ msgstr "لم أتوقع هذا الرد!"
 msgid "User being listened to does not exist."
 msgstr "المستخدم الذي تستمع إليه غير موجود."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "تستطيع استخدام الاشتراك المحلي!"
 
@@ -2715,45 +2756,47 @@ msgid ""
 "palette of your choice."
 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "تعذّر تحديث تصميمك."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "حُفظت تفضيلات التصميم."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "شعار المجموعة"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr "بإمكانك رفع صورة شعار مجموعتك. أقصى حجم للملف هو %s."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "ارفع"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 #, fuzzy
 msgid "Crop"
 msgstr "مجموعات"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "حُدّث الشعار."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "فشل رفع الشعار."
 
@@ -2889,14 +2932,14 @@ msgid "Error removing the block."
 msgstr "خطأ أثناء منع الحجب."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2904,23 +2947,23 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "المراسلة الفورية غير متوفرة."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "عنوان المراسلة الفورية"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "عنوان جابر أو محادثة غوغل المعتمد حاليًا."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2932,7 +2975,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2940,68 +2983,68 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "تفضيلات المحادثة الفورية"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 #, fuzzy
 msgid "Send me notices through Jabber/GTalk."
 msgstr "أرسل لي إشعارات بالاشتراكات الجديدة عبر البريد الإلكتروني."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:182
+#: actions/imsettings.php:178
 #, fuzzy
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "انشر هوية مصغّرة لعنوان بريدي الإلكتروني."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "حُفِظت التفضيلات."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "لا هوية جابر."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 #, fuzzy
 msgid "Cannot normalize that Jabber ID"
 msgstr "ليست هوية جابر صالحة"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "ليست هوية جابر صالحة"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 #, fuzzy
 msgid "That is already your Jabber ID."
 msgstr "هذه ليست هويتك في جابر."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 #, fuzzy
 msgid "Jabber ID already belongs to another user."
 msgstr "هذا البريد الإلكتروني ملك مستخدم آخر بالفعل."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -3009,28 +3052,29 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "هذا عنوان محادثة فورية خاطئ."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:400
-msgid "Couldn't delete IM confirmation."
+#: actions/imsettings.php:391
+#, fuzzy
+msgid "Could not delete IM confirmation."
 msgstr "تعذّر حذف تأكيد البريد المراسلة الفورية."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "هذه ليست هويتك في جابر."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "أزيل عنوان المراسلة الفورية هذا."
 
@@ -3236,107 +3280,107 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s ترك المجموعة %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr ""
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "رسالة ترحيب غير صالحة. أقصى طول هو 255 حرف."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "خاص"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
 
@@ -4113,30 +4157,30 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "إعدادات الملف الشخصي"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr "بإمكانك تحديث بيانات ملفك الشخصي ليعرف عنك الناس أكثر."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "معلومات الملف الشخصي"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 #, 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4144,13 +4188,13 @@ msgstr "الاسم الكامل"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "الصفحة الرئيسية"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "مسار صفحتك الرئيسية أو مدونتك أو ملفك الشخصي على موقع آخر"
@@ -4158,7 +4202,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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4170,19 +4214,19 @@ msgstr[4] "تكلم عن نفسك واهتمامتك في %d حرف"
 msgstr[5] "تكلم عن نفسك واهتمامتك في %d حرف"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "السيرة"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4190,51 +4234,51 @@ msgid "Location"
 msgstr "الموقع"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "مكان تواجدك، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:157
+#: actions/profilesettings.php:153
 msgid "Share my current location when posting notices"
 msgstr "شارك مكاني الحالي عند إرسال إشعارات"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "الوسوم"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "سِم نفسك (حروف وأرقام و \"-\" و \".\" و \"_\")، افصلها بفاصلة (',') أو مسافة."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "اللغة"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "اللغة المفضلة"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "المنطقة الزمنية"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 msgid "What timezone are you normally in?"
 msgstr "ما المنطقة الزمنية التي تتواجد فيها عادة؟"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "اشترك تلقائيًا بأي شخص يشترك بي (يفضل أن يستخدم لغير البشر)"
@@ -4242,7 +4286,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4254,53 +4298,49 @@ msgstr[4] "الاسم طويل جدا (الأقصى %d حرفا)."
 msgstr[5] "الاسم طويل جدا (الأقصى %d حرفا)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "لم تُختر المنطقة الزمنية."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:276
 #, 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
+#: actions/profilesettings.php:346
 #, fuzzy
-msgid "Couldn't update user for autosubscribe."
+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:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, fuzzy
+msgid "Could not save location prefs."
 msgstr "لم يمكن حفظ تفضيلات الموقع."
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "تعذّر حفظ الملف الشخصي."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "حُفظت الإعدادات."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "أنشئ حسابًا"
@@ -4668,7 +4708,7 @@ msgid ""
 "to confirm your email address.)"
 msgstr ""
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4676,72 +4716,75 @@ msgid ""
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "اشتراك بعيد"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "اشترك بمستخدم بعيد"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "اسم المستخدم المستعار"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr ""
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "مسار الملف الشخصي"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "اشترك"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr ""
 
-#: actions/remotesubscribe.php:168
+#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 
-#: actions/remotesubscribe.php:176
-msgid "That’s a local profile! Login to subscribe."
+#: actions/remotesubscribe.php:175
+#, fuzzy
+msgid "That is a local profile! Login to subscribe."
 msgstr "هذا ملف شخصي محلي! لُج لتشترك."
 
-#: actions/remotesubscribe.php:183
-msgid "Couldn’t get a request token."
-msgstr ""
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
+msgstr "تعذّر إدراج الرسالة."
 
-#: actions/repeat.php:57
+#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "يستطيع المستخدمون الوالجون وحدهم تكرار الإشعارات."
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "لا ملاحظة محددة."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "لا يمكنك تكرار ملاحظتك الشخصية."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "أنت كررت هذه الملاحظة بالفعل."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "مكرر"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "مكرر!"
 
@@ -5497,147 +5540,147 @@ msgid "Save site notice"
 msgstr "احفظ إشعار الموقع"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "إعدادات الرسائل القصيرة"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "الرسائل القصيرة غير متوفرة."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "عنوان الرسائل القصيرة"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 #, fuzzy
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "عنوان البريد الإلكتروني المُؤكد الحالي."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:133
+#: actions/smssettings.php:129
 #, fuzzy
 msgid "Awaiting confirmation on this phone number."
 msgstr "إن رقم التأكيد هذا خاطئ."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "رمز التأكيد"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 msgid "Enter the code you received on your phone."
 msgstr ""
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "أكّد"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "رقم هاتف SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "رقم الهاتف بدون شرطات أو مسافات مع رمز المنطقة"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "تفضيلات الرسائل القصيرة"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 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:315
+#: actions/smssettings.php:308
 msgid "SMS preferences saved."
 msgstr "حُفظت تفضيلات الرسائل القصيرة."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "لا رقم هاتف."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 #, fuzzy
 msgid "No carrier selected."
 msgstr "حُذف الإشعار."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 #, 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:356
+#: actions/smssettings.php:348
 #, 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:384
+#: actions/smssettings.php:376
 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:413
+#: actions/smssettings.php:404
 msgid "That is the wrong confirmation number."
 msgstr "إن رقم التأكيد هذا خاطئ."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 msgid "That is not your phone number."
 msgstr "هذا ليس رقم هاتفك."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
+#: actions/smssettings.php:460
 msgid "The SMS phone number was removed."
 msgstr "تمت إزالة رقم هاتف الرسائل القصيرة."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr ""
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 #, 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5645,7 +5688,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "لم تدخل رمزًا"
 
@@ -5901,10 +5944,6 @@ msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "تعذّر حفظ الوسوم."
-
 #: actions/tagother.php:236
 #, fuzzy
 msgid "Use this form to add tags to your subscribers or subscriptions."
@@ -6130,18 +6169,18 @@ msgid "Wrong image type for avatar URL ‘%s’."
 msgstr ""
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "تصميم الملف الشخصي"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr "خصّص أسلوب عرض ملفك بصورة خلفية ومخطط ألوان من اختيارك."
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr "استمتع بالنقانق!"
 
@@ -7104,23 +7143,27 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "تعذّر إدراج الرسالة."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
@@ -7801,6 +7844,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 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
+msgid "Couldn't update your design."
+msgstr "تعذّر تحديث تصميمك."
+
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
 #: lib/designsettings.php:433
 msgid "Design defaults restored."
@@ -9117,3 +9166,28 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "No such profile"
+#~ msgstr "لا ملف كهذا."
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "المجموعات التي %s عضو فيها"
+
+#, fuzzy
+#~ msgid "Method not supported"
+#~ msgstr "لم يتم العثور على وسيلة API."
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "الأشخاص المشتركون ب%s"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "تعذّر تحديث المستخدم."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "تعذّر حفظ الملف الشخصي."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "تعذّر حفظ الوسوم."
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index ae0912c5b0..e94116d72a 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-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:34:33+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05:00+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 (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: arz\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -93,9 +93,9 @@ msgstr "اذف إعدادت الموقع"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -117,6 +117,8 @@ msgstr "لا وسم كهذا."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -137,8 +139,8 @@ msgstr "لا وسم كهذا."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -149,7 +151,7 @@ msgstr "لا وسم كهذا."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -311,7 +313,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "تعذّر تحديث المستخدم."
 
@@ -333,7 +349,8 @@ msgid "User has no profile."
 msgstr "ليس للمستخدم ملف شخصى."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "لم يمكن حفظ الملف."
 
@@ -369,8 +386,8 @@ msgstr[5] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 #, fuzzy
 msgid "Unable to save your design settings."
 msgstr "تعذّر حذف إعدادات التصميم."
@@ -379,13 +396,17 @@ msgstr "تعذّر حذف إعدادات التصميم."
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
+#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "تعذّر تحديث تصميمك."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+msgctxt "ATOM"
 msgid "Main"
 msgstr ""
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -396,31 +417,38 @@ msgstr ""
 msgid "%s timeline"
 msgstr "مسار %s الزمني"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "اشتراكات %s"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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 "المفضلات"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "ما ينفعش تمنع نفسك!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "فشل منع المستخدم."
 
@@ -564,7 +592,7 @@ msgstr "تعذّر إيجاد المستخدم الهدف."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr ""
@@ -574,7 +602,7 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "ليس اسمًا مستعارًا صحيحًا."
@@ -586,7 +614,7 @@ msgstr "ليس اسمًا مستعارًا صحيحًا."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "الصفحه الرئيسيه ليست عنونًا صالحًا."
@@ -596,7 +624,7 @@ msgstr "الصفحه الرئيسيه ليست عنونًا صالحًا."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -628,7 +656,7 @@ msgstr[5] "المنظمه طويله جدا (اكتر حاجه %d رمز)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -760,7 +788,7 @@ msgid "Upload failed."
 msgstr "ارفع ملفًا"
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:101
+#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "امارة تسجيل الدخول اللى اتحطت مش موجوده."
@@ -783,18 +811,19 @@ msgid "Request token already authorized."
 msgstr "لا تملك تصريحًا."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -816,16 +845,17 @@ msgstr "خطأ قاعده البيانات أثناء إدخال المستخد
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -871,7 +901,7 @@ msgstr "الحساب"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -892,7 +922,7 @@ msgstr "كلمه السر"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 #, fuzzy
 msgctxt "BUTTON"
@@ -968,6 +998,7 @@ 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
@@ -987,41 +1018,51 @@ msgstr "مش نافعه تتكرر الملاحظتك بتاعتك."
 msgid "Already repeated that notice."
 msgstr "الملاحظه اتكررت فعلا."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "الـ API method مش موجوده."
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "حُذِفت الحاله."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
+#: actions/apistatusesshow.php:162
 #, fuzzy
 msgid "No status with that ID found."
 msgstr "لا ملف شخصى بهذه الهويه."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "تعذّر حذف هذا الإشعار."
 
-#: actions/apistatusesshow.php:243
+#. 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 "احذف الإشعار"
@@ -1163,51 +1204,49 @@ msgstr "يحق للمُرسل والمستلم فقط قراءه هذه الرس
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "ابحث عن محتويات فى الإشعارات"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:406
+#: actions/apitimelineuser.php:409
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "لا ملف بهذه الهويه."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 #, fuzzy
@@ -1220,109 +1259,117 @@ msgstr "الـ API method مش موجوده."
 msgid "User not found."
 msgstr "الـ API method مش موجوده."
 
-#: actions/atompubfavoritefeed.php:70
-#, fuzzy
-msgid "No such profile"
-msgstr "لا ملف كهذا."
-
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-#, fuzzy
-msgid "Can't add someone else's subscription"
-msgstr "تعذّر إدراج اشتراك جديد."
-
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
-#, fuzzy
-msgid "Can only fave notices."
-msgstr "ابحث عن محتويات فى الإشعارات"
-
-#: actions/atompubfavoritefeed.php:256
-#, fuzzy
-msgid "Unknown note."
-msgstr "مش معروف"
-
-#: actions/atompubfavoritefeed.php:263
-#, fuzzy
-msgid "Already a favorite."
-msgstr "أضف إلى المفضلات"
-
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
 #, fuzzy
 msgid "No such profile."
 msgstr "لا ملف كهذا."
 
+#. 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"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "المجموعات التى %s عضو فيها"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "تعذّر إدراج اشتراك جديد."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:241
-msgid "Can only handle Join activities."
-msgstr ""
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
+msgstr "ابحث عن محتويات فى الإشعارات"
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "مش معروف"
 
-#: actions/atompubmembershipfeed.php:263
+#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
+#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "جميع الأعضاء"
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr "تعذّر حذف المفضله."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "لا مجموعه كهذه"
 
-#: actions/atompubshowmembership.php:90
+#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
+#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member"
 msgstr "جميع الأعضاء"
 
-#: actions/atompubshowmembership.php:115
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "Method not supported"
+msgid "HTTP method not supported"
 msgstr "الـ API method مش موجوده."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1330,40 +1377,37 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
-msgid "No such profile id: %d"
+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"
+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"
+msgid "Cannot delete someone else's subscription."
 msgstr "تعذّر حفظ الاشتراك."
 
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "الأشخاص المشتركون ب%s"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
 msgstr "نوع ملف غير معروف"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1374,10 +1418,11 @@ msgstr "لا مرفق كهذا."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "لا اسم مستعار."
@@ -1408,30 +1453,36 @@ msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "تستطيع رفع صورتك الشخصيه. أقصى حجم للملف هو 2 م.ب."
 
 #. 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "إعدادات الأفتار"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "الأصلي"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "عاين"
 
@@ -1470,7 +1521,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr ""
 
@@ -1489,7 +1541,7 @@ msgstr "فشل تحديث الأفتار."
 msgid "Avatar deleted."
 msgstr "حُذف الأفتار."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1589,6 +1641,7 @@ msgstr "فشل حفظ معلومات المنع."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1598,7 +1651,7 @@ msgstr "فشل حفظ معلومات المنع."
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1681,23 +1734,6 @@ msgstr ""
 msgid "That address has already been confirmed."
 msgstr "هذا البريد الإلكترونى ملك مستخدم آخر بالفعل."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-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
@@ -1759,7 +1795,7 @@ msgid "Account deleted."
 msgstr "حُذف الأفتار."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "أنشئ مجموعه جديدة"
@@ -2122,7 +2158,7 @@ msgid "Reset back to default"
 msgstr "ارجع إلى المبدئي"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2241,14 +2277,16 @@ msgid "Edit %s group"
 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:70 actions/newgroup.php:65
 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 when trying to change group logo settings while not being a group admin.
 #: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "لازم تكون ادارى علشان تعدّل الجروپ."
 
@@ -2309,8 +2347,8 @@ msgstr "عنوان البريد الإلكترونى المُؤكد الحالى
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "استرجع"
@@ -2333,8 +2371,8 @@ msgstr "عنوان البريد الإلكترونى، مثل \"UserName@example
 #. 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
@@ -2342,7 +2380,7 @@ msgstr "أضف"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "البريد الإلكترونى الوارد"
 
@@ -2353,13 +2391,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "أنشئ عنوان بريد إلكترونى لترسل إليه؛ ألغِ القديم."
 
@@ -2372,7 +2410,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 #, fuzzy
 msgctxt "BUTTON"
 msgid "New"
@@ -2451,9 +2489,10 @@ msgstr "هذا البريد الإلكترونى ملك مستخدم آخر با
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, fuzzy
+msgid "Could not insert confirmation code."
 msgstr "تعذّر إدراج رمز التأكيد."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
@@ -2466,8 +2505,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 #, fuzzy
 msgid "No pending confirmation to cancel."
 msgstr "لا رمز تأكيد."
@@ -2480,8 +2519,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+msgid "Could not delete email confirmation."
 msgstr "تعذّر حذف تأكيد البريد الإلكترونى."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
@@ -2500,7 +2540,7 @@ msgstr "هذا ليس عنوان بريدك الإلكترونى."
 msgid "The email address was removed."
 msgstr "لا عنوان بريد إلكترونى."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:554
 #, fuzzy
 msgid "No incoming email address."
 msgstr "لا عنوان بريد إلكترونى."
@@ -2508,19 +2548,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.
 #: actions/emailsettings.php:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
+#: actions/smssettings.php:564 actions/smssettings.php:587
 #, fuzzy
-msgid "Couldn't update user record."
+msgid "Could not update user record."
 msgstr "تعذّر تحديث المستخدم."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 #, fuzzy
 msgid "Incoming email address removed."
 msgstr "لا عنوان بريد إلكترونى."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 #, fuzzy
 msgid "New incoming email address added."
 msgstr "لا عنوان بريد إلكترونى."
@@ -2614,7 +2654,7 @@ msgstr "لم أتوقع هذا الرد!"
 msgid "User being listened to does not exist."
 msgstr "المستخدم الذى تستمع إليه غير موجود."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 #, fuzzy
 msgid "You can use the local subscription!"
 msgstr "تعذّر حفظ الاشتراك."
@@ -2746,46 +2786,48 @@ msgid ""
 "palette of your choice."
 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "تعذّر تحديث تصميمك."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 #, fuzzy
 msgid "Design preferences saved."
 msgstr "حُفِظت التفضيلات."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "شعار المجموعة"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, fuzzy, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr "تستطيع رفع صورتك الشخصيه. أقصى حجم للملف هو 2 م.ب."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "ارفع"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 #, fuzzy
 msgid "Crop"
 msgstr "مجموعات"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "حُدّث الشعار."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "فشل رفع الشعار."
 
@@ -2916,14 +2958,14 @@ msgid "Error removing the block."
 msgstr "خطأ أثناء منع الحجب."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2931,24 +2973,24 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "المراسله الفوريه غير متوفره."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "عنوان الرساله الفوريه"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 #, fuzzy
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "عنوان البريد الإلكترونى المُؤكد الحالى."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2960,7 +3002,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2968,67 +3010,67 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "حُفِظت التفضيلات."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 #, fuzzy
 msgid "Send me notices through Jabber/GTalk."
 msgstr "أرسل لى إشعارات بالاشتراكات الجديده عبر البريد الإلكترونى."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "حُفِظت التفضيلات."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "لا هويه جابر."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 #, fuzzy
 msgid "Cannot normalize that Jabber ID"
 msgstr "ليست هويه جابر صالحة"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "ليست هويه جابر صالحة"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 #, fuzzy
 msgid "That is already your Jabber ID."
 msgstr "هذه ليست هويتك فى جابر."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 #, fuzzy
 msgid "Jabber ID already belongs to another user."
 msgstr "هذا البريد الإلكترونى ملك مستخدم آخر بالفعل."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -3036,29 +3078,29 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "هذا عنوان محادثه فوريه خاطئ."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:400
+#: actions/imsettings.php:391
 #, fuzzy
-msgid "Couldn't delete IM confirmation."
+msgid "Could not delete IM confirmation."
 msgstr "تعذّر حذف تأكيد البريد الإلكترونى."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "هذه ليست هويتك فى جابر."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 #, fuzzy
 msgid "The IM address was removed."
 msgstr "أزيل هذا العنوان."
@@ -3269,107 +3311,107 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s ساب جروپ %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr ""
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "رساله ترحيب غير صالحه. أقصى طول هو 255 حرف."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "خاص"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
 
@@ -4144,29 +4186,29 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "إعدادات الملف الشخصي"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "معلومات الملف الشخصي"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4174,20 +4216,20 @@ msgstr "الاسم الكامل"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "الصفحه الرئيسية"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: 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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4199,19 +4241,19 @@ msgstr[4] "صِف نفسك واهتماماتك"
 msgstr[5] "صِف نفسك واهتماماتك"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "السيرة"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4219,50 +4261,50 @@ msgid "Location"
 msgstr "الموقع"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:157
+#: actions/profilesettings.php:153
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "الوسوم"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "اللغة"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "اللغه المفضلة"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "المنطقه الزمنية"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 msgid "What timezone are you normally in?"
 msgstr "ما المنطقه الزمنيه التى تتواجد فيها عادة؟"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:193
+#: actions/profilesettings.php:189
 #, fuzzy
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
@@ -4271,7 +4313,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4283,53 +4325,49 @@ msgstr[4] "الاسم طويل جدا (اكتر حاجه %d رمز)."
 msgstr[5] "الاسم طويل جدا (اكتر حاجه %d رمز)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "لم تُختر المنطقه الزمنيه."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:276
 #, 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
+#: actions/profilesettings.php:346
 #, fuzzy
-msgid "Couldn't update user for autosubscribe."
+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:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, fuzzy
+msgid "Could not save location prefs."
 msgstr "لم يمكن حفظ تفضيلات الموقع."
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "تعذّر حفظ الملف الشخصى."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "حُفظت الإعدادات."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "أنشئ مجموعه جديدة"
@@ -4697,7 +4735,7 @@ msgid ""
 "to confirm your email address.)"
 msgstr ""
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4705,72 +4743,75 @@ msgid ""
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "اشتراك بعيد"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "اشترك بمستخدم بعيد"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "اسم المستخدم المستعار"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr ""
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "مسار الملف الشخصي"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "اشترك"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr ""
 
-#: actions/remotesubscribe.php:168
+#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 
-#: actions/remotesubscribe.php:176
-msgid "That’s a local profile! Login to subscribe."
-msgstr ""
+#: actions/remotesubscribe.php:175
+#, fuzzy
+msgid "That is a local profile! Login to subscribe."
+msgstr "لقد منعك المستخدم."
 
-#: actions/remotesubscribe.php:183
-msgid "Couldn’t get a request token."
-msgstr ""
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
+msgstr "تعذّر إدراج الرساله."
 
-#: actions/repeat.php:57
+#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr ""
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "ما فيش ملاحظه متحدده."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "ما ينفعش تكرر الملاحظه بتاعتك."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "انت عيدت الملاحظه دى فعلا."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "مكرر"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "مكرر!"
 
@@ -5531,152 +5572,152 @@ msgid "Save site notice"
 msgstr "إشعار الموقع"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "تظبيطات الـSMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "الرسائل القصيره غير متوفره."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 #, fuzzy
 msgid "SMS address"
 msgstr "عنوان الرساله الفوريه"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 #, fuzzy
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "عنوان البريد الإلكترونى المُؤكد الحالى."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:133
+#: actions/smssettings.php:129
 #, fuzzy
 msgid "Awaiting confirmation on this phone number."
 msgstr "هذا ليس رقم هاتفك."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "رمز التأكيد"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 msgid "Enter the code you received on your phone."
 msgstr ""
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
+#: actions/smssettings.php:144
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "أكّد"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "نمرة تليفون الـSMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "حُفِظت التفضيلات."
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 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:315
+#: actions/smssettings.php:308
 #, fuzzy
 msgid "SMS preferences saved."
 msgstr "حُفِظت التفضيلات."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "لا رقم هاتف."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 #, fuzzy
 msgid "No carrier selected."
 msgstr "حُذف الإشعار."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 #, 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:356
+#: actions/smssettings.php:348
 #, 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:384
+#: actions/smssettings.php:376
 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:413
+#: actions/smssettings.php:404
 #, fuzzy
 msgid "That is the wrong confirmation number."
 msgstr "هذا ليس رقم هاتفك."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 msgid "That is not your phone number."
 msgstr "هذا ليس رقم هاتفك."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
+#: actions/smssettings.php:460
 #, fuzzy
 msgid "The SMS phone number was removed."
 msgstr "نمرة تليفون الـSMS"
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr ""
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 #, 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5684,7 +5725,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
+#: actions/smssettings.php:535
 #, fuzzy
 msgid "No code entered"
 msgstr "لا محتوى!"
@@ -5937,10 +5978,6 @@ msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "تعذّر حفظ الوسوم."
-
 #: actions/tagother.php:236
 #, fuzzy
 msgid "Use this form to add tags to your subscribers or subscriptions."
@@ -6168,18 +6205,18 @@ msgid "Wrong image type for avatar URL ‘%s’."
 msgstr ""
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "تصميم الملف الشخصي"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr "استمتع بالنقانق!"
 
@@ -7162,24 +7199,28 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "تعذّر إدراج الرساله."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
@@ -7826,6 +7867,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 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
+msgid "Couldn't update your design."
+msgstr "تعذّر تحديث تصميمك."
+
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
 #: lib/designsettings.php:433
 msgid "Design defaults restored."
@@ -9124,3 +9171,28 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "No such profile"
+#~ msgstr "لا ملف كهذا."
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "المجموعات التى %s عضو فيها"
+
+#, fuzzy
+#~ msgid "Method not supported"
+#~ msgstr "الـ API method مش موجوده."
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "الأشخاص المشتركون ب%s"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "تعذّر تحديث المستخدم."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "تعذّر حفظ الملف الشخصى."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "تعذّر حفظ الوسوم."
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 024dae0acc..8665ea59a6 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:34:34+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05:01+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 (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: bg\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -87,9 +87,9 @@ msgstr "Запазване настройките за достъп"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -110,6 +110,8 @@ msgstr "Няма такака страница."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -130,8 +132,8 @@ msgstr "Няма такака страница."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -142,7 +144,7 @@ msgstr "Няма такака страница."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -302,7 +304,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Грешка при обновяване на потребителя."
 
@@ -324,7 +340,8 @@ msgid "User has no profile."
 msgstr "Потребителят няма профил."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "Грешка при запазване на профила."
 
@@ -356,8 +373,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 #, fuzzy
 msgid "Unable to save your design settings."
 msgstr "Грешка при записване настройките за Twitter"
@@ -366,14 +383,18 @@ msgstr "Грешка при записване настройките за Twitt
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
+#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 #, fuzzy
 msgid "Could not update your design."
 msgstr "Грешка при обновяване на потребителя."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+msgctxt "ATOM"
 msgid "Main"
 msgstr ""
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -384,31 +405,38 @@ msgstr ""
 msgid "%s timeline"
 msgstr "Поток на %s"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Абонаменти на %s"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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 "Любими"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Не можете да блокирате себе си!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Грешка при блокиране на потребителя."
 
@@ -550,7 +578,7 @@ msgstr "Целевият потребител не беше открит."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Опитайте друг псевдоним, този вече е зает."
@@ -560,7 +588,7 @@ msgstr "Опитайте друг псевдоним, този вече е за
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Неправилен псевдоним."
@@ -572,7 +600,7 @@ msgstr "Неправилен псевдоним."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Адресът на личната страница не е правилен URL."
@@ -582,7 +610,7 @@ msgstr "Адресът на личната страница не е правил
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -610,7 +638,7 @@ msgstr[1] "Описанието е твърде дълго (до %d символ
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -736,7 +764,7 @@ msgid "Upload failed."
 msgstr "Качване на файл"
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:101
+#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "Не е указана бележка."
@@ -759,18 +787,19 @@ msgid "Request token already authorized."
 msgstr "Не сте абонирани за никого."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -792,16 +821,17 @@ msgstr "Грешка в базата от данни — отговор при 
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Неочаквано изпращане на форма."
 
@@ -847,7 +877,7 @@ msgstr "Сметка"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -868,7 +898,7 @@ msgstr "Парола"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -941,6 +971,7 @@ 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
@@ -960,40 +991,50 @@ msgstr "Не можете да повтаряте собствени бележ
 msgid "Already repeated that notice."
 msgstr "Вече сте повторили тази бележка."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "Не е открит методът в API."
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Бележката е изтрита."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Не е открита бележка с такъв идентификатор."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "Грешка при изтриване на бележката."
 
-#: actions/apistatusesshow.php:243
+#. 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 "Изтриване на бележката"
@@ -1127,51 +1168,49 @@ msgstr "Само потребителят може да отваря собст
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Търсене в съдържанието на бележките"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:406
+#: actions/apitimelineuser.php:409
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Не е открита бележка с такъв идентификатор."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1182,108 +1221,116 @@ msgstr "Методът в API все още се разработва."
 msgid "User not found."
 msgstr "Не е открит методът в API."
 
-#: actions/atompubfavoritefeed.php:70
-#, fuzzy
-msgid "No such profile"
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
+msgid "No such profile."
 msgstr "Няма такъв профил."
 
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#. 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 "Can't add someone else's subscription"
+msgid "Cannot add someone else's subscription."
 msgstr "Грешка при добавяне на нов абонамент."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-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 "Търсене в съдържанието на бележките"
 
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#. 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 "Търсене в съдържанието на бележките"
 
-#: actions/atompubfavoritefeed.php:256
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "Непознато"
 
-#: actions/atompubfavoritefeed.php:263
+#. TRANS: Client exception thrown when trying favorite an already favorited notice.
+#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "Добавяне към любимите"
 
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
-msgid "No such profile."
-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"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "Групи, в които участва %s"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "Грешка при добавяне на нов абонамент."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:241
-msgid "Can only handle Join activities."
-msgstr ""
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
+msgstr "Търсене в съдържанието на бележките"
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Непознато"
 
-#: actions/atompubmembershipfeed.php:263
+#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
+#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "Всички членове"
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr "Грешка при изтриване на любима бележка."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "Няма такава група"
 
-#: actions/atompubshowmembership.php:90
+#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
+#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member"
 msgstr "Всички членове"
 
-#: actions/atompubshowmembership.php:115
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "Method not supported"
+msgid "HTTP method not supported"
 msgstr "Не е открит методът в API."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1291,40 +1338,37 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
-msgid "No such profile id: %d"
+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"
+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"
+msgid "Cannot delete someone else's subscription."
 msgstr "Грешка при добавяне на нов абонамент."
 
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "Абонирани за %s"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
 msgstr "Неподдържан вид файл"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1335,10 +1379,11 @@ msgstr "Няма прикачени файлове."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Няма псевдоним."
@@ -1370,30 +1415,36 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "Настройки за аватар"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "Оригинал"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "Преглед"
 
@@ -1431,7 +1482,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr ""
 
@@ -1450,7 +1502,7 @@ msgstr "Неуспешно обновяване на аватара."
 msgid "Avatar deleted."
 msgstr "Аватарът е изтрит."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1549,6 +1601,7 @@ msgstr "Грешка при записване данните за блокир
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1558,7 +1611,7 @@ msgstr "Грешка при записване данните за блокир
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1640,23 +1693,6 @@ msgstr "Неразпознат вид адрес %s"
 msgid "That address has already been confirmed."
 msgstr "Този адрес е вече потвърден."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-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
@@ -1718,7 +1754,7 @@ msgid "Account deleted."
 msgstr "Аватарът е изтрит."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "Създаване на нова сметка"
@@ -2085,7 +2121,7 @@ msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2207,14 +2243,16 @@ msgid "Edit %s group"
 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:70 actions/newgroup.php:65
 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 when trying to change group logo settings while not being a group admin.
 #: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "За да редактирате група, трябва да сте влезли."
 
@@ -2277,8 +2315,8 @@ msgstr "Текущ потвърден адрес на е-поща."
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Премахване"
@@ -2303,15 +2341,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Входяща поща"
 
@@ -2322,13 +2360,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Задаване на нова е-поща, от която да се публикува. Отменя предишната."
 
@@ -2341,7 +2379,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 #, fuzzy
 msgctxt "BUTTON"
 msgid "New"
@@ -2417,9 +2455,10 @@ msgstr "Тази е-поща вече се използва от друг пот
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, fuzzy
+msgid "Could not insert confirmation code."
 msgstr "Не може да се вмъкне код за потвърждение."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
@@ -2435,8 +2474,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Няма потвърждения, очакващи да бъдат отказани."
 
@@ -2448,8 +2487,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+msgid "Could not delete email confirmation."
 msgstr "Грешка при изтриване потвърждението по е-поща."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
@@ -2468,24 +2508,25 @@ msgstr "Това не е вашият адрес на е-поща."
 msgid "The email address was removed."
 msgstr "Входящият адрес на е-поща е премахнат."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, fuzzy
+msgid "Could not update user record."
 msgstr "Грешка при обновяване записа на потребител."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 msgid "Incoming email address removed."
 msgstr "Входящият адрес на е-поща е премахнат."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "Добавен е нов входящ адрес на е-поща."
 
@@ -2579,7 +2620,7 @@ msgstr "Неочакван отговор."
 msgid "User being listened to does not exist."
 msgstr "Потребителят, когото проследявате, не съществува. "
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Можете да ползвате локален абонамент!"
 
@@ -2711,47 +2752,48 @@ msgid ""
 "palette of your choice."
 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-#, fuzzy
-msgid "Couldn't update your design."
-msgstr "Грешка при обновяване на потребителя."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "Настройките на е-поща са запазени."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "Лого на групата"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
 "Можете да качите личен аватар тук. Максималната големина на файла е %s."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "Качване"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "Изрязване"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 #, fuzzy
 msgid "Pick a square area of the image to be the logo."
 msgstr "Изберете квадратна област от изображението за аватар"
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "Лотого е обновено."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "Неуспешно обновяване на логото."
 
@@ -2885,14 +2927,14 @@ msgid "Error removing the block."
 msgstr "Грешка при повтаряне на бележката."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2902,24 +2944,24 @@ msgstr ""
 "%). Въведете адреса си в настройките по-долу."
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 #, fuzzy
 msgid "IM is not available."
 msgstr "Страницата не е достъпна във вида медия, който приемате"
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "Адрес на е-поща"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Текущ потвърден Jabber/GTalk адрес."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2933,7 +2975,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2943,63 +2985,63 @@ msgstr ""
 "сте добавили %s в списъка си с приятели в IM или GTalk клиента си."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Настройки на е-поща"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Изпращане на бележките по Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Публикуване промяната на състоянието ми в Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr "Изпращане по Jabber/GTalk на отговори от хора, "
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Публикуване на MicroID за адреса в Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Настройките са запазени."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Няма Jabber ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "Грешка при нормализация на този Jabber ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "Неправилен Jabber ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "Това вече е вашият Jabber ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID already belongs to another user."
 msgstr "Този Jabber ID принадлежи на друг потребител."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -3009,29 +3051,29 @@ msgstr ""
 "от %s, трябва да го одобрите."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "Грешен IM адрес."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:400
+#: actions/imsettings.php:391
 #, fuzzy
-msgid "Couldn't delete IM confirmation."
+msgid "Could not delete IM confirmation."
 msgstr "Грешка при изтриване потвърждението по е-поща."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Това не е вашият Jabber ID."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "Входящият адрес на е-поща е премахнат."
 
@@ -3258,107 +3300,107 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s напусна групата %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Лиценз"
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Името на местоположението е твърде дълго (макс. 255 знака)."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "Частен"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr "Всички права запазени"
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
 
@@ -4144,30 +4186,30 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "Настройки на профила"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr "Можете да обновите личния си профил, за да знаят хората повече за вас."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "Данни на профила"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 #, 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4175,13 +4217,13 @@ msgstr "Пълно име"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Лична страница"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "Адрес на личната ви страница, блог или профил в друг сайт"
@@ -4189,7 +4231,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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4197,19 +4239,19 @@ msgstr[0] "Опишете себе си и интересите си в до %d
 msgstr[1] "Опишете себе си и интересите си в до %d букви"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "За мен"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4217,50 +4259,50 @@ msgid "Location"
 msgstr "Местоположение"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Къде се намирате (град, община, държава и т.н.)"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:157
+#: actions/profilesettings.php:153
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "Етикети"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "Език"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "Предпочитан език"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "Часови пояс"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 msgid "What timezone are you normally in?"
 msgstr "В кой часови пояс сте обикновено?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4270,7 +4312,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4278,54 +4320,49 @@ msgstr[0] "Биографията е твърде дълга (до %d симво
 msgstr[1] "Биографията е твърде дълга (до %d символа)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Не е избран часови пояс"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:276
 #, 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
+#: actions/profilesettings.php:346
 #, fuzzy
-msgid "Couldn't update user for autosubscribe."
+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:409
+#: actions/profilesettings.php:404
 #, fuzzy
-msgid "Couldn't save location prefs."
+msgid "Could not save location prefs."
 msgstr "Грешка при запазване етикетите."
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "Грешка при запазване на профила."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
-msgstr "Грешка при запазване етикетите."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Настройките са запазени."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Създаване на нова сметка"
@@ -4704,7 +4741,7 @@ msgstr ""
 "(Трябва да получите веднага електронно писмо с указания за потвърждаване "
 "адреса на е-пощата ви.)"
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4716,74 +4753,76 @@ msgstr ""
 "[подобна услуга за микроблогване](%%doc.openmublog%%), въведете адреса на "
 "профила си в нея по-долу."
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Отдалечен абонамент"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Абониране за отдалечен потребител"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Потребителски псевдоним"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "Псевдоним на потребител, когото искате да следите"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Адрес на профила"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "Адрес на профила ви в друга, съвместима услуга за микроблогване"
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "Абониране"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "Неправилен адрес на профил (грешен формат)"
 
-#: actions/remotesubscribe.php:168
+#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "Неправилен адрес на профил (няма документ YADIS или XRDS е неправилен)."
 
-#: actions/remotesubscribe.php:176
-msgid "That’s a local profile! Login to subscribe."
+#: actions/remotesubscribe.php:175
+#, fuzzy
+msgid "That is a local profile! Login to subscribe."
 msgstr "Това е локален профил! Влезте, за да се абонирате."
 
-#: actions/remotesubscribe.php:183
+#: actions/remotesubscribe.php:182
 #, fuzzy
-msgid "Couldn’t get a request token."
+msgid "Could not get a request token."
 msgstr "Не е получен token за одобрение."
 
-#: actions/repeat.php:57
+#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Само влезли потребители могат да повтарят бележки."
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Не е указана бележка."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "Не можете да повтаряте собствена бележка."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Вече сте повторили тази бележка."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Повторено"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Повторено!"
 
@@ -5520,72 +5559,72 @@ msgid "Save site notice"
 msgstr "Запазване настройките на сайта"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "Настройки за SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 #, fuzzy
 msgid "SMS is not available."
 msgstr "Страницата не е достъпна във вида медия, който приемате"
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "Адрес на е-поща"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Текущ потвърден телефонен номер за SMS-и."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:133
+#: actions/smssettings.php:129
 msgid "Awaiting confirmation on this phone number."
 msgstr "Очаква се потвърждение за този телефонен номер."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "Код за потвърждение"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 msgid "Enter the code you received on your phone."
 msgstr "Въведете кода, който получихте по телефона."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
+#: actions/smssettings.php:144
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Потвърждаване"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "Телефонен номер за SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Телефонен номер — с код, без пунктоация и без интервали."
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "Настройки на е-поща"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5594,33 +5633,33 @@ msgstr ""
 "такси от оператора."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
 #, fuzzy
 msgid "SMS preferences saved."
 msgstr "Настройките са запазени."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "Не е въведен телефонен номер."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr "Не е избран оператор."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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."
@@ -5630,40 +5669,40 @@ msgstr ""
 "му."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
+#: actions/smssettings.php:404
 msgid "That is the wrong confirmation number."
 msgstr "Този код за потвърждение е грешен."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 msgid "That is not your phone number."
 msgstr "Това не е вашият телефонен номер."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
+#: actions/smssettings.php:460
 #, fuzzy
 msgid "The SMS phone number was removed."
 msgstr "Телефонен номер за SMS"
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "Мобилен оператор"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5673,7 +5712,7 @@ msgstr ""
 "не фигурира тук, пишете ни на адрес %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "Не е въведен код."
 
@@ -5927,10 +5966,6 @@ msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "Грешка при запазване на етикетите."
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
@@ -6168,19 +6203,19 @@ msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Грешен вид изображение за '%s'"
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 #, fuzzy
 msgid "Profile design"
 msgstr "Настройки на профила"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr ""
 
@@ -7150,24 +7185,28 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Грешка при вмъкване на съобщението."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
@@ -7799,6 +7838,13 @@ msgctxt "BUTTON"
 msgid "Reset"
 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
+#, 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
 msgid "Design defaults restored."
@@ -9061,3 +9107,28 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "No such profile"
+#~ msgstr "Няма такъв профил."
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "Групи, в които участва %s"
+
+#, fuzzy
+#~ msgid "Method not supported"
+#~ msgstr "Не е открит методът в API."
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "Абонирани за %s"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "Грешка при обновяване на потребителя."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "Грешка при запазване на профила."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "Грешка при запазване етикетите."
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 186a2a5670..6cfa7f1338 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-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:34:35+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05:10+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 (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -90,9 +90,9 @@ msgstr "Enrollañ an arventennoù moned"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -113,6 +113,8 @@ msgstr "N'eus ket eus ar bajenn-se."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -133,8 +135,8 @@ msgstr "N'eus ket eus ar bajenn-se."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -145,7 +147,7 @@ msgstr "N'eus ket eus ar bajenn-se."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -309,7 +311,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Dibosupl eo hizivaat an implijer."
 
@@ -331,7 +347,8 @@ 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.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "Dibosupl eo enrollañ ar profil."
 
@@ -363,8 +380,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "Dibosupl eo enrollañ an arventennoù empentiñ."
 
@@ -372,13 +389,18 @@ 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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Dibosupl eo hizivaat ho design."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+#, fuzzy
+msgctxt "ATOM"
 msgid "Main"
 msgstr "Pennañ"
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -389,31 +411,38 @@ msgstr "Pennañ"
 msgid "%s timeline"
 msgstr "Oberezhioù %s"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Koumanantoù %s"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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 "Pennrolloù"
 
-#: actions/apiatomservice.php:123
+#. 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 "Izili ar strollad %s"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:104
+#: 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:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "N'eus ket bet tu da stankañ an implijer."
 
@@ -556,7 +585,7 @@ msgstr "Dibosupl eo kavout an implijer pal."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
@@ -566,7 +595,7 @@ msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "N'eo ket ul lesanv mat."
@@ -578,7 +607,7 @@ msgstr "N'eo ket ul lesanv mat."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "N'eo ket chomlec'h al lec'hienn personel un URL reizh."
@@ -588,7 +617,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -616,7 +645,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -740,7 +769,7 @@ 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:101
+#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "Fichenn direizh."
@@ -763,18 +792,19 @@ msgid "Request token already authorized."
 msgstr "N'oc'h ket aotreet."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -796,16 +826,17 @@ msgstr "Ur fazi 'zo bet en ur ensoc'hañ an avatar"
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Kinnig ar furmskrid dic'hortoz."
 
@@ -850,7 +881,7 @@ msgstr "Kont"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -871,7 +902,7 @@ msgstr "Ger-tremen"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -941,6 +972,7 @@ msgstr "Ne c'helloc'h ket dilemel statud un implijer all."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: 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
@@ -960,40 +992,50 @@ msgstr "Ne c'helloc'h ket adlavar ho alioù."
 msgid "Already repeated that notice."
 msgstr "Kemenn bet adkemeret dija."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "N'eo ket bet kavet an hentenn API !"
 
-#: actions/apistatusesshow.php:141
+#. 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-se."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:152
+#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Statud diverket."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "N'eo ket bet kavet a statud evit an ID-mañ"
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "Dibosupl eo dilemel ar c'hemenn-mañ."
 
-#: actions/apistatusesshow.php:243
+#. 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 "Dilemel un ali"
@@ -1127,51 +1169,49 @@ msgstr "N'eus nemet an implijerien kevreet hag a c'hell adkemer alioù."
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Klask alioù en danvez"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:406
+#: actions/apitimelineuser.php:409
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1183,108 +1223,116 @@ msgstr "Hentenn API war sevel."
 msgid "User not found."
 msgstr "N'eo ket bet kavet an hentenn API !"
 
-#: actions/atompubfavoritefeed.php:70
-#, fuzzy
-msgid "No such profile"
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
+msgid "No such profile."
 msgstr "N'eus ket eus ar profil-se."
 
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#. 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 "Can't add someone else's subscription"
+msgid "Cannot add someone else's subscription."
 msgstr "Dibosupl eo dilemel ar c'houmanant."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-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 "Klask alioù en danvez"
 
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#. 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"
 
-#: actions/atompubfavoritefeed.php:256
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "Dianav"
 
-#: actions/atompubfavoritefeed.php:263
+#. TRANS: Client exception thrown when trying favorite an already favorited notice.
+#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "Ouzhpennañ d'ar pennrolloù"
 
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
-msgid "No such profile."
-msgstr "N'eus ket eus ar profil-se."
-
+#. 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"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "Ezel eo %s eus ar strolladoù"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "Dibosupl eo dilemel ar c'houmanant."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:241
-msgid "Can only handle Join activities."
-msgstr ""
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
+msgstr "Klask alioù en danvez"
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Dianav"
 
-#: actions/atompubmembershipfeed.php:263
+#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
+#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "An holl izili"
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:89
+#. 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
 #, fuzzy
-msgid "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr "Diposupl eo dilemel ar pennroll-mañ."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "N'eus ket eus ar strollad-se"
 
-#: actions/atompubshowmembership.php:90
+#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
+#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member"
 msgstr "An holl izili"
 
-#: actions/atompubshowmembership.php:115
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "Method not supported"
+msgid "HTTP method not supported"
 msgstr "N'eo ket bet kavet an hentenn API !"
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1292,40 +1340,37 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
-msgid "No such profile id: %d"
+msgid "No such profile id: %d."
 msgstr "N'eus ket eus ar profil-se."
 
 #. 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"
+msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "N'oc'h ket koumanantet d'ar profil-se."
 
 #. 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"
+msgid "Cannot delete someone else's subscription."
 msgstr "Dibosupl eo dilemel ar c'houmanant."
 
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "Koumanantet da %s"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
 msgstr "Dizanv eo seurt ar restr"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1336,10 +1381,11 @@ msgstr "N'eo ket bet kavet ar restr stag."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Lesanv ebet."
@@ -1370,30 +1416,36 @@ msgid "You can upload your personal avatar. The maximum file size is %s."
 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "Arventennoù an avatar"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "Orin"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "Rakwelet"
 
@@ -1428,7 +1480,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "Kollet eo bet roadennoù."
 
@@ -1447,7 +1500,7 @@ msgstr "Ur gudenn 'zo bet e-pad hizivadenn an avatar."
 msgid "Avatar deleted."
 msgstr "Dilammet eo bet an Avatar."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1546,6 +1599,7 @@ msgstr "Dibosupl eo enrollañ an titouroù stankañ."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1555,7 +1609,7 @@ msgstr "Dibosupl eo enrollañ an titouroù stankañ."
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1636,23 +1690,6 @@ msgstr "Doare chomlec'h dianav %s."
 msgid "That address has already been confirmed."
 msgstr "Kadarnaet eo bet dija ar chomlec'h-mañ."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-msgstr "Dibosupl eo hizivaat an implijer."
-
 #. 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
@@ -1714,7 +1751,7 @@ msgid "Account deleted."
 msgstr "Dilammet eo bet an Avatar."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "Krouiñ ur gont"
@@ -2069,7 +2106,7 @@ msgid "Reset back to default"
 msgstr "Adlakaat an arventennoù dre ziouer"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2183,14 +2220,16 @@ msgid "Edit %s group"
 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:70 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: Client error displayed trying to edit a group while not 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:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "Rankout a reer bezañ merour evit kemmañ ar strollad."
 
@@ -2251,8 +2290,8 @@ msgstr "Chomlec'h postel gwiriekaet er mare-mañ."
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Dilemel"
@@ -2275,15 +2314,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Postel o tont"
 
@@ -2294,14 +2333,14 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 #, 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 #, fuzzy
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Chomlec'h postel nevez evit embann e %s"
@@ -2315,7 +2354,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nevez"
@@ -2391,9 +2430,10 @@ 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, 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.
@@ -2406,8 +2446,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Kadarnadenn ebet da vezañ nullet."
 
@@ -2418,8 +2458,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+msgid "Could not delete email confirmation."
 msgstr "Dibosupl eo dilemel ar postel kadarnadur."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
@@ -2438,24 +2479,25 @@ msgstr "N'eo ket ho postel."
 msgid "The email address was removed."
 msgstr "Dilamet eo bet ar chomlec'h postel."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, fuzzy
+msgid "Could not update user record."
 msgstr "Dibosupl eo hizivaat doser an implijer."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 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:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "Ouzhpennet ez eus bet ur chomlec'h postel nevez o tont tre"
 
@@ -2552,7 +2594,7 @@ msgstr "Ne oa ket gortozet ar respont-mañ !"
 msgid "User being listened to does not exist."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 #, fuzzy
 msgid "You can use the local subscription!"
 msgstr "Dibosupl eo dilemel ar c'houmanant."
@@ -2681,45 +2723,47 @@ msgid ""
 "palette of your choice."
 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "Dibosupl eo hizivaat ho design."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "Enrollet eo bet an arventennoù design."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "Logo ar strollad"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "Enporzhiañ"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "Adframmañ"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 #, 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"
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "Logo hizivaet."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "N'eo ket bet kaset da benn an hizivadenn."
 
@@ -2856,14 +2900,14 @@ msgid "Error removing the block."
 msgstr "Ur fazi a zo bet e-pad nulladenn ar stankadenn."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2871,23 +2915,23 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "Dizimplijadus eo ar bostelerezh prim"
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "Chomlec'h postelerezh prim"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Chomlec'h Jabber/GTalk kadarnaet er mare-mañ."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2899,7 +2943,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2907,65 +2951,65 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Penndibaboù ar bostelerezh prim"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Kas din an alioù dre Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 #, fuzzy
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Embann ur MicroID evit ma chomlec'h Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 #, fuzzy
 msgid "Send me replies through Jabber/GTalk 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:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Embann ur MicroID evit ma chomlec'h Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Penndibaboù enrollet"
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "ID Jabber ebet."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "Dibosupl eo implijout an ID Jabber-mañ"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "N'eo ket un ID Jabber reizh."
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "Ho ID Jabber eo dija"
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID 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.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2973,29 +3017,29 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 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:400
+#: actions/imsettings.php:391
 #, fuzzy
-msgid "Couldn't delete IM confirmation."
+msgid "Could not delete IM confirmation."
 msgstr "Diposubl eo dilemel ar postel kadarnadur."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "N'eo ket ho ID Jabber."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "Dilamet eo bet ar chomlec'h IM."
 
@@ -3195,107 +3239,107 @@ 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:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Aotre-implijout"
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr "Aotre-implijout al lec'hienn StatusNet-mañ"
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr "Diuzadenn aotre-implijout direizh"
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Re hir eo al lec'hiadur (255 arouezenn d'ar muiañ)."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr "Direizh eo URL an aotre-implijout"
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr "Direizh eo URL skeudenn an aotre-implijout"
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr "Goullo pe reizh e rank bezañ URL an aotre-implijout"
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr "Goullo pe reizh e rank bezañ URL skeudenn an aotre-implijout"
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr "Diuzadenn un aotre-implijout"
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "Prevez"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr "Pep gwir miret strizh."
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr "Seurt"
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr "Dibab un aotre-implijout"
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr "Munudoù an aotre-implijout"
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr "Perc'henn"
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 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:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr "Titl an aotre-implijout"
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr "Titl an aotre-implijout"
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr "URL an aotre-implijout"
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 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:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr "URL skeudenn an aotre-implijout"
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr "URL ur skeudenn da ziskouez gant an aotre-implijout."
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Enrollañ arventennoù an aotre-implijout"
 
@@ -4084,12 +4128,12 @@ msgstr ""
 "lec'hienn \"%2$s\"."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "Arventennoù ar profil"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4097,19 +4141,19 @@ msgstr ""
 "diwar ho penn."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "Titouroù ar profil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 #, 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4117,13 +4161,13 @@ msgstr "Anv klok"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Pajenn degemer"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: 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"
@@ -4131,7 +4175,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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4139,19 +4183,19 @@ 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:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "Buhezskrid"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4159,24 +4203,24 @@ msgid "Location"
 msgstr "Lec'hiadur"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 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:157
+#: actions/profilesettings.php:153
 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:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "Balizennoù"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4184,27 +4228,27 @@ msgstr ""
 "virgulennoù pe esaouennoù"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "Yezh"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "Yezh d'ober ganti da gentañ"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "Takad eur"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 msgid "What timezone are you normally in?"
 msgstr "Pehini eo gwerzhid-eur boaz ?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4214,7 +4258,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4222,52 +4266,49 @@ 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:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 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:281
+#: actions/profilesettings.php:276
 #, 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, 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:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, fuzzy
+msgid "Could not save location prefs."
 msgstr "Dibosupl eo enrollañ an dibaboù lec'hiadur."
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "Dibosupl eo enrollañ ar profil."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
-msgstr "Dibosupl eo enrollañ ar balizennoù."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Enrollet eo bet an arventennoù."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Krouiñ ur gont"
@@ -4644,7 +4685,7 @@ msgstr ""
 "(Resevout a reoc'h a-benn nebeut ur postel gant an titouroù evit kadarnaat "
 "ho chomlec'h.)"
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4652,72 +4693,75 @@ msgid ""
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Koumanant eus a-bell"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Koumanantiñ d'un implijer pell"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Lesanv an implijer"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "Lesanv an implijer ho peus c'hoant heuliañ"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "URL ar profil"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "En em enskrivañ"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "URL direizh evit ar profil (furmad fall)"
 
-#: actions/remotesubscribe.php:168
+#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 
-#: actions/remotesubscribe.php:176
-msgid "That’s a local profile! Login to subscribe."
+#: 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:183
-msgid "Couldn’t get a request token."
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
 msgstr "Dibosupl eo kaout ur jedaouer reked."
 
-#: actions/repeat.php:57
+#: 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:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "N'eus bet diferet ali ebet."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: 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:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Adkemeret ho peus ar c'hemenn-mañ c'hoazh."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Adlavaret"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Adlavaret !"
 
@@ -5464,13 +5508,13 @@ msgid "Save site notice"
 msgstr "Enrollañ ali ul lec'hienn"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "Arventennoù SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
@@ -5478,131 +5522,131 @@ msgstr ""
 "%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "Dizimplijadus eo an SMS."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "Chomlec'h SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 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:133
+#: actions/smssettings.php:129
 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:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "Kod kadarnaat"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 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:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Kadarnaat"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "Niverenn bellgomz evit an SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 #, 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:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "Penndibaboù an SMSoù"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 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:315
+#: actions/smssettings.php:308
 msgid "SMS preferences saved."
 msgstr "Penndibaboù an SMSoù enrollet."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "Niverenn bellgomz ebet."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 #, fuzzy
 msgid "No carrier selected."
 msgstr "Ali dilammet."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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:413
+#: actions/smssettings.php:404
 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:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 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:470
+#: actions/smssettings.php:460
 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:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "Pourvezer pellgomzerezh hezoug"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5610,7 +5654,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "N'eo bet lakaet kod ebet"
 
@@ -5871,10 +5915,6 @@ msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "Dibosupl eo enrollañ ar merkoù."
-
 #: actions/tagother.php:236
 #, fuzzy
 msgid "Use this form to add tags to your subscribers or subscriptions."
@@ -6105,18 +6145,18 @@ 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:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "Design ar profil"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr "Bez plijadur gant da hotdog !"
 
@@ -7055,23 +7095,27 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Diposubl eo ensoc'hañ ur gemenadenn"
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
@@ -7696,6 +7740,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Adderaouiñ"
 
+#. 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
+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
 #, fuzzy
@@ -8960,3 +9010,28 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "No such profile"
+#~ msgstr "N'eus ket eus ar profil-se."
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "Ezel eo %s eus ar strolladoù"
+
+#, fuzzy
+#~ msgid "Method not supported"
+#~ msgstr "N'eo ket bet kavet an hentenn API !"
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "Koumanantet da %s"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "Dibosupl eo hizivaat an implijer."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "Dibosupl eo enrollañ ar profil."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "Dibosupl eo enrollañ ar balizennoù."
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index 7d05968301..ffb9a43295 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-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:34:37+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05: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-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -95,9 +95,9 @@ msgstr "Desa els paràmetres d'accés"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -118,6 +118,8 @@ msgstr "No existeix la pàgina."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -138,8 +140,8 @@ msgstr "No existeix la pàgina."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -150,7 +152,7 @@ msgstr "No existeix la pàgina."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -320,7 +322,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "No s'ha pogut actualitzar l'usuari."
 
@@ -342,7 +358,8 @@ msgid "User has no profile."
 msgstr "L'usuari no té perfil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "No s'ha pogut desar el perfil."
 
@@ -378,8 +395,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "No s'han pogut desar els paràmetres de disseny."
 
@@ -387,13 +404,18 @@ 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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "No s'ha pogut actualitzar el vostre disseny."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+#, fuzzy
+msgctxt "ATOM"
 msgid "Main"
 msgstr "Principal"
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -404,31 +426,38 @@ msgstr "Principal"
 msgid "%s timeline"
 msgstr "%s línia temporal"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Subscripcions de %s"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: 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:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Ha fallat el blocatge de l'usuari."
 
@@ -566,7 +595,7 @@ msgstr "No s'ha pogut trobar l'usuari de destinació."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Aquest sobrenom ja existeix. Prova un altre. "
@@ -576,7 +605,7 @@ msgstr "Aquest sobrenom ja existeix. Prova un altre. "
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Sobrenom no vàlid."
@@ -588,7 +617,7 @@ msgstr "Sobrenom no vàlid."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "La pàgina personal no és un URL vàlid."
@@ -598,7 +627,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: 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)."
@@ -625,7 +654,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "La localització és massa llarga (màx. 255 caràcters)."
@@ -748,7 +777,7 @@ 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:101
+#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "El testimoni de sol·licitud o verificador no és vàlid."
 
@@ -768,18 +797,19 @@ msgid "Request token already authorized."
 msgstr "El testimoni de sol·licitud ja està autoritzat."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -802,16 +832,17 @@ msgstr "Error de la base de dades en inserir l'oauth_token_association."
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Enviament de formulari inesperat."
 
@@ -862,7 +893,7 @@ msgstr "Compte"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -883,7 +914,7 @@ msgstr "Contrasenya"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -956,6 +987,7 @@ msgstr "No podeu eliminar l'estat d'un altre usuari."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: 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
@@ -975,39 +1007,49 @@ msgstr "No podeu repetir els vostres propis avisos."
 msgid "Already repeated that notice."
 msgstr "Avís duplicat."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "El mètode HTTP no està implementat."
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: 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:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "No s'ha trobat cap estatus amb la ID trobada."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "No es pot eliminar l'avís."
 
-#: actions/apistatusesshow.php:243
+#. 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"
@@ -1140,51 +1182,49 @@ msgstr "Només l'usuari pot afegir a la pròpia línia temporal."
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Només accepta AtomPub per als canals Atom."
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr "L'enviament Atom no ha de ser buit."
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 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:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, 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.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, 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:406
+#: actions/apitimelineuser.php:409
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "L'avís amb URI «%s» amb ja existeix."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr "Enviament AtomPub amb un URI %s d'atenció desconegut"
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1195,96 +1235,108 @@ msgstr "Mètode API en construcció."
 msgid "User not found."
 msgstr "No s'ha trobat el mètode API!"
 
-#: actions/atompubfavoritefeed.php:70
-msgid "No such profile"
-msgstr "No existeix el perfil"
-
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr "Els avisos que %s ha preferit a %s"
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-msgid "Can't add someone else's subscription"
-msgstr "No es pot afegir la subscripció d'algú altre"
-
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-msgstr "Només es poden gestionar les activitats de preferència."
-
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
-msgid "Can only fave notices."
-msgstr "Només es poden preferir els avisos."
-
-#: actions/atompubfavoritefeed.php:256
-msgid "Unknown note."
-msgstr "Nota desconeguda."
-
-#: actions/atompubfavoritefeed.php:263
-msgid "Already a favorite."
-msgstr "Ja és una preferit."
-
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "No existeix el perfil."
 
+#. 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 "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
+#, fuzzy
+msgid "Can only handle favorite activities."
+msgstr "Només es poden gestionar les activitats de preferència."
+
+#. 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"
 
-#: actions/atompubmembershipfeed.php:147
-#, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "Els grups en què %s és membre a %s"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
+#. 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 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:241
-msgid "Can only handle Join activities."
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
 msgstr "Només es poden gestionar les activitats d'unió."
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 msgid "Unknown group."
 msgstr "Grup desconegut."
 
-#: actions/atompubmembershipfeed.php:263
+#. 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."
 
-#: actions/atompubmembershipfeed.php:270
+#. 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."
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+#, fuzzy
+msgid "Cannot delete someone else's favorite"
 msgstr "No es pot eliminar el preferit d'algú altre"
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "No s'ha trobat el grup."
 
-#: actions/atompubshowmembership.php:90
+#. 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"
 
-#: actions/atompubshowmembership.php:115
-msgid "Method not supported"
-msgstr "El mètode no està implementat"
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
+#, fuzzy
+msgid "HTTP method not supported"
+msgstr "El mètode HTTP no està implementat."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, fuzzy
+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.
@@ -1292,41 +1344,38 @@ msgstr "No es pot eliminar la pertinència d'algú altre"
 #: actions/atompubshowsubscription.php:72
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
-#, php-format
-msgid "No such profile id: %d"
+#, fuzzy, 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
 #, fuzzy, php-format
-msgid "Profile %1$d not subscribed to profile %2$d"
+msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "El perfil %d no està subscrit al perfil %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"
+msgid "Cannot delete someone else's subscription."
 msgstr "No es pot eliminar la subscripció d'algú altre"
 
-#: actions/atompubsubscriptionfeed.php:150
-#, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "La gent a qui %s s'ha subscrit a %s"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr "Només es poden gestionar les activitats de seguiment."
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr "Només es pot seguir gent."
 
-#: actions/atompubsubscriptionfeed.php:262
-#, php-format
-msgid "Unknown profile %s"
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
+#, fuzzy, php-format
+msgid "Unknown profile %s."
 msgstr "Perfil desconegut %s"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1337,10 +1386,11 @@ msgstr "No existeix l'adjunció."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Cap sobrenom."
@@ -1372,30 +1422,36 @@ msgstr ""
 "Podeu pujar el vostre avatar personal. La mida màxima del fitxer és %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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "Configuració de l'avatar"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "Original"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "Vista prèvia"
 
@@ -1432,7 +1488,8 @@ msgstr ""
 "avatar."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "S'ha perdut el nostre fitxer de dades."
 
@@ -1451,7 +1508,7 @@ msgstr "Error en actualitzar avatar."
 msgid "Avatar deleted."
 msgstr "S'ha eliminat l'avatar."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1553,6 +1610,7 @@ msgstr "No s'ha pogut desar la informació del bloc."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1562,7 +1620,7 @@ msgstr "No s'ha pogut desar la informació del bloc."
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1642,23 +1700,6 @@ msgstr "Tipus d'adreça desconeguda %s."
 msgid "That address has already been confirmed."
 msgstr "Aquesta adreça ja ha estat confirmada."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-msgstr "No s'ha pogut actualitzar l'usuari."
-
 #. 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
@@ -1719,7 +1760,7 @@ msgid "Account deleted."
 msgstr "S'ha eliminat l'avatar."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "Crea un compte"
@@ -2080,7 +2121,7 @@ msgid "Reset back to default"
 msgstr "Torna a restaurar al valor per defecte"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2192,14 +2233,16 @@ msgid "Edit %s group"
 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:70 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: Client error displayed trying to edit a group while not 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:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "Heu de ser administrador per editar el grup."
 
@@ -2260,8 +2303,8 @@ msgstr "Adreça electrònica confirmada actualment."
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Elimina"
@@ -2286,15 +2329,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Correu electrònic entrant"
 
@@ -2305,13 +2348,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 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."
 
@@ -2326,7 +2369,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nou"
@@ -2402,9 +2445,10 @@ 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, fuzzy
+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.
@@ -2420,8 +2464,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Cap confirmació pendent per cancel·lar."
 
@@ -2432,8 +2476,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+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.
@@ -2452,24 +2497,25 @@ msgstr "Aquest no és el teu correu electrònic"
 msgid "The email address was removed."
 msgstr "S'ha eliminat l'adreça de correu electrònic."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, fuzzy
+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:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 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:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "Nou correu electrònic entrant afegit."
 
@@ -2568,7 +2614,7 @@ msgstr "Resposta inesperada!"
 msgid "User being listened to does not exist."
 msgstr "L'usuari que s'escolta no existeix."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Podeu utilitzar la subscripció local!"
 
@@ -2697,22 +2743,19 @@ msgstr ""
 "Personalitzeu l'aspecte del vostre grup amb una imatge de fons i una paleta "
 "de colors de la vostra elecció."
 
-#. 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "No s'ha pogut actualitzar el vostre disseny."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "S'han desat les preferències de disseny."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "Logo del grup"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2720,23 +2763,28 @@ msgstr ""
 "Podeu pujar una imatge com a logotip del vostre grup. La mida màxima del "
 "fitxer és %s."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "Puja"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "Retalla"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 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."
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "Logo actualitzat."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "Error en actualitzar logo."
 
@@ -2877,14 +2925,14 @@ msgid "Error removing the block."
 msgstr "S'ha produït un error en eliminar el bloc."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2894,23 +2942,23 @@ msgstr ""
 "de Jabber/GTalk. Configureu la vostra adreça i opcions a continuació."
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "La MI no és disponible."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "Adreça de missatgeria instantània"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Adreça actual Jabber/Gtalk confirmada."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2925,7 +2973,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2936,65 +2984,65 @@ msgstr ""
 "missatgeria instantània o al GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Preferències de MI"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Envia'm avisos per Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Envia'm un avís quan el meu estat Jabber/GTalk canvii."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk 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 IM preferences form.
-#: actions/imsettings.php:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publica una MicroID per al meu compte de Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "S'han desat les preferències."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Cap Jabber ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "Impossible normalitzar aquest Jabber ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "Jabber ID no vàlid"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "Aquest ja és el teu Jabber ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID 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.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -3004,28 +3052,29 @@ 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:391
+#: actions/imsettings.php:382
 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:400
-msgid "Couldn't delete IM confirmation."
+#: actions/imsettings.php:391
+#, fuzzy
+msgid "Could not delete IM confirmation."
 msgstr "No s'ha pogut eliminar la confirmació de MI."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Aquest no és el teu Jabber ID."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "S'ha eliminat l'adreça de MI."
 
@@ -3251,20 +3300,20 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s ha abandonat el grup %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Llicència"
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr "Llicència d'aquest lloc basat en StatusNet"
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr "La selecció de la llicència no és vàlida."
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
@@ -3272,88 +3321,88 @@ msgstr ""
 "Heu d'especificar el propietari del contingut quan utilitzeu la llicència "
 "«Tots els drets reservats»."
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 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:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr "L'URL de la llicència no és vàlid."
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr "L'URL de la imatge de la llicència no és vàlid."
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 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:187
+#: actions/licenseadminpanel.php:182
 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:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr "Selecció de llicència"
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "Privat"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr "Tots els drets reservats"
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr "Tipus"
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr "Seleccioneu la llicència"
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr "Detalls de la llicència"
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr "Propietari"
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 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:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr "Títol de la llicència"
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr "El títol de la llicència."
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr "URL de la llicència"
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr "URL per a més informació de la llicència."
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr "URL de la imatge de la llicència"
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr "URL de la imatge que es mostrarà juntament amb la llicència."
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Desa els paràmetres de la llicència"
 
@@ -4131,12 +4180,12 @@ msgstr ""
 "lloc."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "Configuració del perfil"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4144,19 +4193,19 @@ msgstr ""
 "pugui conèixer millor."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "Informació del perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4164,20 +4213,20 @@ msgstr "Nom complet"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Pàgina personal"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: 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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4185,19 +4234,19 @@ 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:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "Biografia"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4205,24 +4254,24 @@ msgid "Location"
 msgstr "Ubicació"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 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:157
+#: actions/profilesettings.php:153
 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:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "Etiquetes"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4230,27 +4279,27 @@ msgstr ""
 "espais"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "Llengua"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "Llengua preferida"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "Fus horari"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 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:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4260,7 +4309,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4268,51 +4317,48 @@ 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:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 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:281
+#: actions/profilesettings.php:276
 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, fuzzy
+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:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, fuzzy
+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 could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "No s'ha pogut desar el perfil."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
-msgstr "No s'han pogut desar les etiquetes."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "S'ha desat la configuració."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Crea un compte"
@@ -4709,7 +4755,7 @@ 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:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4721,74 +4767,77 @@ msgstr ""
 "[servei de microblogging compatible](%%doc.openmublog%%), escriviu l'URL del "
 "vostre perfil a continuació."
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Subscripció remota"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Subscriu a un usuari remot"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Sobrenom de l'usuari"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "Sobrenom de l'usuari que vols seguir"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "URL del perfil"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL del teu perfil en un altre servei de microblogging compatible"
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "Subscriu-m'hi"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "L'URL del perfil és invàlid (format incorrecte)"
 
-#: actions/remotesubscribe.php:168
+#: 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:176
-msgid "That’s a local profile! Login to subscribe."
+#: actions/remotesubscribe.php:175
+#, fuzzy
+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:183
-msgid "Couldn’t get a request token."
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
 msgstr "No s'ha pogut obtenir un testimoni de sol·licitud."
 
-#: actions/repeat.php:57
+#: 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:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "No s'ha especificat cap avís."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "No podeu repetir el vostre propi avís."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Ja havíeu repetit l'avís."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Repetit"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Repetit!"
 
@@ -5559,13 +5608,13 @@ msgid "Save site notice"
 msgstr "Desa l'avís per a tot el lloc"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 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:74
+#: actions/smssettings.php:71
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
@@ -5573,58 +5622,58 @@ msgstr ""
 "site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "L'SMS no és disponible."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "Adreça SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 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:133
+#: actions/smssettings.php:129
 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:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "Codi de confirmació"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 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:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Confirma"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 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:156
+#: actions/smssettings.php:152
 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:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "Preferències de l'SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5633,32 +5682,32 @@ msgstr ""
 "exorbitant càrrega del meu transport."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
 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:338
+#: actions/smssettings.php:330
 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:344
+#: actions/smssettings.php:336
 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:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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."
@@ -5668,39 +5717,39 @@ msgstr ""
 "servir."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
+#: actions/smssettings.php:404
 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:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 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:470
+#: actions/smssettings.php:460
 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:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "Transport mòbil"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5711,7 +5760,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:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "No s'ha introduït cap codi"
 
@@ -5974,10 +6023,6 @@ msgstr ""
 "Només podeu etiquetar gent a la qual estigueu subscrit o que us hagin "
 "subscrit."
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "No s'han pogut guardar les etiquetes."
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
@@ -6211,12 +6256,12 @@ 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:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "Disseny del perfil"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6224,7 +6269,7 @@ msgstr ""
 "Personalitzeu l'aspecte del vostre perfil amb una imatge de fons o una "
 "paleta de colors de la vostra elecció."
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr "Gaudiu de l'entrepà!"
 
@@ -7197,22 +7242,26 @@ msgstr ""
 "sol·licitat."
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 msgid "Could not issue access token."
 msgstr "No s'ha pogut emetre un testimoni d'accés."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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
+#, fuzzy
+msgid "Database error updating OAuth application user."
+msgstr "Error de la base de dades en inserir l'usuari de l'aplicació OAuth."
+
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "No s'ha pogut suprimir el testimoni revocat."
 
@@ -7862,6 +7911,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Reinicialitza"
 
+#. 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
+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
 msgid "Design defaults restored."
@@ -9213,3 +9268,30 @@ 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 "AtomPub post with unknown attention URI %s"
+#~ msgstr "Enviament AtomPub amb un URI %s d'atenció desconegut"
+
+#~ msgid "No such profile"
+#~ msgstr "No existeix el perfil"
+
+#~ msgid "Notices %s has favorited to on %s"
+#~ msgstr "Els avisos que %s ha preferit a %s"
+
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "Els grups en què %s és membre a %s"
+
+#~ msgid "Method not supported"
+#~ msgstr "El mètode no està implementat"
+
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "La gent a qui %s s'ha subscrit a %s"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "No s'ha pogut actualitzar l'usuari."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "No s'ha pogut desar el perfil."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "No s'han pogut desar les etiquetes."
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index a299248211..9cce57cbbb 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-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:34:38+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05:17+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 (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: cs\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n >= 2 && n <= 4) ? 1 : "
 "2 );\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -89,9 +89,9 @@ msgstr "uložit nastavení přístupu"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -112,6 +112,8 @@ msgstr "Tady žádná taková stránka není."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -132,8 +134,8 @@ msgstr "Tady žádná taková stránka není."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -144,7 +146,7 @@ msgstr "Tady žádná taková stránka není."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -313,7 +315,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Nepodařilo se aktualizovat nastavení uživatele"
 
@@ -335,7 +351,8 @@ msgid "User has no profile."
 msgstr "Uživatel nemá profil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "Nepodařilo se uložit profil."
 
@@ -374,8 +391,8 @@ msgstr[2] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "Nelze uložit vaše nastavení designu."
 
@@ -383,13 +400,17 @@ 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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Nelze uložit design."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+msgctxt "ATOM"
 msgid "Main"
 msgstr ""
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -400,31 +421,38 @@ msgstr ""
 msgid "%s timeline"
 msgstr "časová osa %s"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Odběry uživatele %s"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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é"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: 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:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Zablokovat uživatele se nezdařilo."
 
@@ -563,7 +591,7 @@ msgstr "Nepodařilo se najít cílového uživatele."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Přezdívku již někdo používá. Zkuste jinou."
@@ -573,7 +601,7 @@ msgstr "Přezdívku již někdo používá. Zkuste jinou."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Není platnou přezdívkou."
@@ -585,7 +613,7 @@ msgstr "Není platnou přezdívkou."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Domovská stránka není platná URL."
@@ -595,7 +623,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -624,7 +652,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -749,7 +777,7 @@ 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:101
+#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "Neplatný přihlašovací token."
@@ -772,18 +800,19 @@ msgid "Request token already authorized."
 msgstr "Nejste autorizován."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -805,16 +834,17 @@ msgstr "Chyba databáze při vkládání uživatele aplikace OAuth."
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Nečekaný požadavek."
 
@@ -866,7 +896,7 @@ msgstr "Účet"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -887,7 +917,7 @@ msgstr "Heslo"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -961,6 +991,7 @@ msgstr "Nesmíte odstraňovat status jiného uživatele."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: 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
@@ -980,40 +1011,50 @@ msgstr "Nelze opakovat své vlastní oznámení."
 msgid "Already repeated that notice."
 msgstr "Již jste zopakoval toto oznámení."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr " API metoda nebyla nalezena."
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: 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:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Nenalezen status s tímto ID."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "Toto oznámení nelze odstranit."
 
-#: actions/apistatusesshow.php:243
+#. 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í"
@@ -1149,51 +1190,49 @@ msgstr "Pouze uživatel může přečíst své vlastní schránky."
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, 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:406
+#: actions/apitimelineuser.php:409
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Oznámení s tímto id neexistuje."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1205,108 +1244,116 @@ msgstr "API metoda ve výstavbě."
 msgid "User not found."
 msgstr " API metoda nebyla nalezena."
 
-#: actions/atompubfavoritefeed.php:70
-#, fuzzy
-msgid "No such profile"
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
+msgid "No such profile."
 msgstr "Žádný takový profil."
 
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#. 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 "Can't add someone else's subscription"
+msgid "Cannot add someone else's subscription."
 msgstr "Nelze vložit odebírání"
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-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 "Najít v obsahu oznámení"
 
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#. 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í"
 
-#: actions/atompubfavoritefeed.php:256
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "Neznámé"
 
-#: actions/atompubfavoritefeed.php:263
+#. 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"
 
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Žádný takový profil."
-
+#. 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"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "Skupiny kterých je %s členem"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "Nelze vložit odebírání"
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:241
-msgid "Can only handle Join activities."
-msgstr ""
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
+msgstr "Najít v obsahu oznámení"
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Neznámé"
 
-#: actions/atompubmembershipfeed.php:263
+#. 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é"
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr "Nelze smazat oblíbenou položku."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "Žádná taková skupina"
 
-#: actions/atompubshowmembership.php:90
+#. 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é"
 
-#: actions/atompubshowmembership.php:115
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "Method not supported"
+msgid "HTTP method not supported"
 msgstr " API metoda nebyla nalezena."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1314,40 +1361,37 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
-msgid "No such profile id: %d"
+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"
+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"
+msgid "Cannot delete someone else's subscription."
 msgstr "Nelze smazat odebírání sebe sama"
 
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "Lidé přihlášení k %s"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
 msgstr "Neznámý typ souboru"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1358,10 +1402,11 @@ msgstr "Žádná taková příloha."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Žádná přezdívka."
@@ -1392,30 +1437,36 @@ 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."
 
 #. 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "Nastavené Profilu"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "Originál"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "Náhled"
 
@@ -1453,7 +1504,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "Ztratili jsme údaje souboru."
 
@@ -1472,7 +1524,7 @@ msgstr "Nahrávání obrázku selhalo."
 msgid "Avatar deleted."
 msgstr "Avatar smazán."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1574,6 +1626,7 @@ msgstr "Nepodařilo se uložit blokování."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1583,7 +1636,7 @@ msgstr "Nepodařilo se uložit blokování."
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1664,23 +1717,6 @@ msgstr "Neznámý typ adresy %s."
 msgid "That address has already been confirmed."
 msgstr "Adresa již byla potvrzena"
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-msgstr "Nelze aktualizovat uživatele"
-
 #. 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
@@ -1742,7 +1778,7 @@ msgid "Account deleted."
 msgstr "Avatar smazán."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "Zaregistrujte se"
@@ -2109,7 +2145,7 @@ msgid "Reset back to default"
 msgstr "Reset zpět do výchozího"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2223,14 +2259,16 @@ msgid "Edit %s group"
 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:70 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: Client error displayed trying to edit a group while not 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:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "K úpravě skupiny musíte být admin."
 
@@ -2291,8 +2329,8 @@ msgstr "Aktuální potvrzená e-mailová adresa."
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Odstranit"
@@ -2317,15 +2355,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Příchozí e-mail"
 
@@ -2336,13 +2374,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 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."
 
@@ -2355,7 +2393,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nová"
@@ -2429,9 +2467,10 @@ 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, 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.
@@ -2447,8 +2486,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Žádné potvrzení ke zrušení."
 
@@ -2459,8 +2498,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+msgid "Could not delete email confirmation."
 msgstr "Nelze smazat potvrzení emailu"
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
@@ -2479,24 +2519,25 @@ msgstr "To není vaše e-mailová adresa."
 msgid "The email address was removed."
 msgstr "E-mailová adresa byla odstraněna."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, 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:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 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:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "Přidána nová příchozí e-mailová adresa."
 
@@ -2595,7 +2636,7 @@ msgstr "Nečekaná odpověď!"
 msgid "User being listened to does not exist."
 msgstr "Úživatel, kterému nasloucháte neexistuje."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Můžete použít místní odebírání."
 
@@ -2724,22 +2765,19 @@ msgstr ""
 "Přizpůsobit vzhled skupiny obrázkem na pozadí a barevnou paletou vašeho "
 "výběru."
 
-#. 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "Nelze uložit vzhled."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "Nastavení vzhledu uloženo."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "Logo skupiny"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2747,23 +2785,28 @@ msgstr ""
 "Můžete nahrát obrázek loga pro vaši skupinu. Maximální velikost souboru je %"
 "s."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "Upload"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "Oříznout"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr "Vyberte čtvercovou oblast obrázku, která bude vaše logo."
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "Logo aktualizováno."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "Nepodařilo se aktualizovat logo."
 
@@ -2904,14 +2947,14 @@ msgid "Error removing the block."
 msgstr "Chyba při odstraňování bloku."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2921,23 +2964,23 @@ msgstr ""
 "%) .Zadejte svou adresu a nastavení níže."
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM není k dispozici."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "IM adresa"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Aktuální potvrzená Jabber / GTalk adresa."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2951,7 +2994,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2962,64 +3005,64 @@ msgstr ""
 "nebo na GTalku."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Nastavení IM"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Zasílat oznámení pomocí Jabber/GTalk"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk 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:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk 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:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publikovat MicroID pro mou Jabber / GTalk adresu."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Nastavení uloženo"
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Chybí Jabber ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "Nelze normalizovat tento JabberID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "Není platným Jabber ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "Toto je již vaše Jabber ID"
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID 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.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -3029,28 +3072,29 @@ msgstr ""
 "posílal zprávy."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 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:400
-msgid "Couldn't delete IM confirmation."
+#: actions/imsettings.php:391
+#, fuzzy
+msgid "Could not delete IM confirmation."
 msgstr "Nelze smazat potvrzení IM"
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Toto není váš Jabber ID"
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "IM adresa byla odstraněna."
 
@@ -3278,108 +3322,108 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s opustil(a) skupinu %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr ""
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Neplatné uvítací text. Max délka je 255 znaků."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 #, fuzzy
 msgid "Private"
 msgstr "Soukromí"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
 
@@ -4167,12 +4211,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:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "Nastavené Profilu"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4180,19 +4224,19 @@ msgstr ""
 "více dozvědět."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "Nastavené Profilu"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 #, 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4200,13 +4244,13 @@ msgstr "Celé jméno"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Moje stránky"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: 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."
@@ -4214,7 +4258,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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4223,19 +4267,19 @@ 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:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "O mě"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4243,50 +4287,50 @@ msgid "Location"
 msgstr "Umístění"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 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:157
+#: actions/profilesettings.php:153
 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:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "Tagy"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "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:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "Jazyk"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "Preferovaný jazyk"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "Časové pásmo"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 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:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4296,7 +4340,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4305,52 +4349,49 @@ 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:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 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:281
+#: actions/profilesettings.php:276
 #, 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, 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:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, fuzzy
+msgid "Could not save location prefs."
 msgstr "Nelze uložit nastavení umístění."
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "Nelze uložit profil"
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
-msgstr "Nelze uložit tagy."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Nastavení uloženo"
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Zaregistrujte se"
@@ -4738,7 +4779,7 @@ msgstr ""
 "(Měli byste za okamžik obdržet e-mailem zprávu s instrukcemi, jak potvrdit "
 "svou e-mailovou adresu.)"
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4749,74 +4790,77 @@ 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:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Vzdálený odběr"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Přihlásit se ke vzdálenému uživateli"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Přezdívka uživatele"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "Přezdívka uživatele, kterého chcete sledovat"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Adresa Profilu"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "Adresa profilu na jiných kompatibilních mikroblozích."
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "Odebírat"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "Neplatná adresa profilu (špatný formát)"
 
-#: actions/remotesubscribe.php:168
+#: 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:176
-msgid "That’s a local profile! Login to subscribe."
+#: 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:183
-msgid "Couldn’t get a request token."
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
 msgstr "Nelze získat řetězec požadavku."
 
-#: actions/repeat.php:57
+#: 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:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Oznámení neuvedeno."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "Nemůžete opakovat své vlastní oznámení."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Již jste zopakoval toto oznámení."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Opakované"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Opakované!"
 
@@ -5584,70 +5628,70 @@ msgid "Save site notice"
 msgstr "Uložit oznámení stránky"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "nastavení SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "SMS není k dispozici."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "SMS adresa"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 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:133
+#: actions/smssettings.php:129
 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:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "Potvrzovací kód"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 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:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Potvrdit"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "SMS telefonní číslo"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 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:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "Nastavení SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5656,32 +5700,32 @@ msgstr ""
 "provider může naůčtovat nesmyslně vysoké částky."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
 msgid "SMS preferences saved."
 msgstr "Nastavení SMS uloženo."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "Žádné telefonní číslo."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr "Nevybrán poskytovatel."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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."
@@ -5690,39 +5734,39 @@ msgstr ""
 "použít."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
+#: actions/smssettings.php:404
 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:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 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:470
+#: actions/smssettings.php:460
 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:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "Mobilní operátor"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5732,7 +5776,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:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "Nezadán kód"
 
@@ -5996,10 +6040,6 @@ 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:200
-msgid "Could not save tags."
-msgstr "Nelze uložit nálepky"
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
@@ -6232,12 +6272,12 @@ 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:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "Vzhled profilu"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6245,7 +6285,7 @@ msgstr ""
 "Přizpůsobit vzhled vašeho profilu obrázkem na pozadí a barevnou paletou "
 "vašeho výběru."
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr "Užijte si svůj párek v rohlíku!"
 
@@ -7211,23 +7251,27 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Nemohu vložit zprávu."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
@@ -7886,6 +7930,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Reset"
 
+#. 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
+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
 msgid "Design defaults restored."
@@ -9247,3 +9297,28 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "No such profile"
+#~ msgstr "Žádný takový profil."
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "Skupiny kterých je %s členem"
+
+#, fuzzy
+#~ msgid "Method not supported"
+#~ msgstr " API metoda nebyla nalezena."
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "Lidé přihlášení k %s"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "Nelze aktualizovat uživatele"
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "Nelze uložit profil"
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "Nelze uložit tagy."
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 763be8a28e..6e26517b57 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -19,17 +19,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:34:40+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05: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 (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -97,9 +97,9 @@ msgstr "Zugangs-Einstellungen speichern"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -120,6 +120,8 @@ msgstr "Seite nicht vorhanden"
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -140,8 +142,8 @@ msgstr "Seite nicht vorhanden"
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -152,7 +154,7 @@ msgstr "Seite nicht vorhanden"
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -322,7 +324,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Konnte Benutzerdaten nicht aktualisieren."
 
@@ -344,7 +360,8 @@ msgid "User has no profile."
 msgstr "Benutzer hat kein Profil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "Konnte Profil nicht speichern."
 
@@ -380,8 +397,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "Konnte Twitter-Einstellungen nicht speichern."
 
@@ -389,13 +406,17 @@ 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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Konnte Benutzerdesign nicht aktualisieren."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+msgctxt "ATOM"
 msgid "Main"
 msgstr ""
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -406,31 +427,38 @@ msgstr ""
 msgid "%s timeline"
 msgstr "%s-Zeitleiste"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s Abonnements"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: 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:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Blockieren des Benutzers fehlgeschlagen."
 
@@ -573,7 +601,7 @@ msgstr "Konnte keine Statusmeldungen finden."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
@@ -583,7 +611,7 @@ msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ungültiger Benutzername."
@@ -595,7 +623,7 @@ msgstr "Ungültiger Benutzername."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr ""
@@ -606,7 +634,7 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Der bürgerliche Name ist zu lang (maximal 255 Zeichen)."
@@ -633,7 +661,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
@@ -756,7 +784,7 @@ 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:101
+#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Anmelde-Token ungültig oder abgelaufen."
 
@@ -776,18 +804,19 @@ msgid "Request token already authorized."
 msgstr "Anfrage-Token bereits autorisiert."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -808,16 +837,17 @@ msgstr "Datenbankfehler beim Einfügen von oauth_token_association."
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Unerwartete Formulareingabe."
 
@@ -868,7 +898,7 @@ msgstr "Profil"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -889,7 +919,7 @@ msgstr "Passwort"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -963,6 +993,7 @@ msgstr "Du kannst den Status eines anderen Benutzers nicht löschen."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: 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
@@ -982,39 +1013,49 @@ msgstr "Du kannst deine eigenen Nachrichten nicht wiederholen."
 msgid "Already repeated that notice."
 msgstr "Nachricht bereits wiederholt"
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTTP-Methode wird nicht unterstützt."
 
-#: actions/apistatusesshow.php:141
+#. 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 "Nicht unterstütztes Bildformat: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:152
+#: 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:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Keine Nachricht mit dieser ID gefunden."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "Die Nachricht konnte nicht gelöscht werden."
 
-#: actions/apistatusesshow.php:243
+#. 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"
@@ -1154,51 +1195,49 @@ msgstr "Nur der Benutzer selbst kann seinen Posteingang lesen."
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, 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:406
+#: actions/apitimelineuser.php:409
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Nachricht mit URI „%s“ existiert bereits."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1209,142 +1248,149 @@ msgstr "API-Methode im Aufbau."
 msgid "User not found."
 msgstr "API-Methode nicht gefunden."
 
-#: actions/atompubfavoritefeed.php:70
-msgid "No such profile"
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
+msgid "No such profile."
 msgstr "Profil nicht gefunden."
 
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#. 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 "Can't add someone else's subscription"
+msgid "Cannot add someone else's subscription."
 msgstr "Konnte neues Abonnement nicht eintragen."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-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 "Durchsuche den Inhalt der Nachrichten"
 
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#. 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"
 
-#: actions/atompubfavoritefeed.php:256
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+#: actions/atompubfavoritefeed.php:259
 msgid "Unknown note."
 msgstr "Unbekannter Hinweis."
 
-#: actions/atompubfavoritefeed.php:263
+#. TRANS: Client exception thrown when trying favorite an already favorited notice.
+#: actions/atompubfavoritefeed.php:267
 msgid "Already a favorite."
 msgstr "Bereits ein Favorit."
 
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Profil nicht gefunden."
-
+#. 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"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "Gruppen, in denen „%s“ Mitglied ist"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "Konnte neues Abonnement nicht eintragen."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:241
-msgid "Can only handle Join activities."
-msgstr ""
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
+msgstr "Durchsuche den Inhalt der Nachrichten"
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 msgid "Unknown group."
 msgstr "Unbekannte Gruppe."
 
-#: actions/atompubmembershipfeed.php:263
+#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
+#: actions/atompubmembershipfeed.php:267
 msgid "Already a member."
 msgstr "Bereits Mitglied."
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:89
+#. TRANS: Client exception thrown when referencing a non-existing favorite.
+#: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
 msgstr "Datei nicht gefunden."
 
+#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
 #: actions/atompubshowfavorite.php:151
 #, fuzzy
-msgid "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr "Konnte Favoriten nicht löschen."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "Keine derartige Gruppe"
 
-#: actions/atompubshowmembership.php:90
+#. 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"
 
-#: actions/atompubshowmembership.php:115
-msgid "Method not supported"
-msgstr "Methode wird nicht unterstützt"
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
+#, fuzzy
+msgid "HTTP method not supported"
+msgstr "HTTP-Methode wird nicht unterstützt."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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"
+#, fuzzy, 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"
+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"
+msgid "Cannot delete someone else's subscription."
 msgstr "Konnte Selbst-Abonnement nicht löschen."
 
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "Leute, die „%s“ abonniert haben"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
-#, php-format
-msgid "Unknown profile %s"
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
+#, fuzzy, php-format
+msgid "Unknown profile %s."
 msgstr "Profil %s ist unbekannt"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1355,10 +1401,11 @@ msgstr "Kein solcher Anhang."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Kein Benutzername."
@@ -1390,30 +1437,36 @@ msgstr ""
 "Du kannst dein persönliches Avatar hochladen. Die maximale Dateigröße ist %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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "Avatar-Einstellungen"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "Original"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "Vorschau"
 
@@ -1449,7 +1502,8 @@ msgstr ""
 "Wähle eine quadratische Fläche aus dem Bild, um dein Avatar zu speichern"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "Daten verloren."
 
@@ -1468,7 +1522,7 @@ msgstr "Aktualisierung des Avatars fehlgeschlagen."
 msgid "Avatar deleted."
 msgstr "Avatar gelöscht."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1570,6 +1624,7 @@ msgstr "Konnte Blockierungsdaten nicht speichern."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1579,7 +1634,7 @@ msgstr "Konnte Blockierungsdaten nicht speichern."
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1659,23 +1714,6 @@ msgstr "Nicht erkannter Adresstyp %s"
 msgid "That address has already been confirmed."
 msgstr "Diese Adresse wurde bereits bestätigt."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-msgstr "Konnte Benutzerdaten nicht aktualisieren."
-
 #. 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
@@ -1736,7 +1774,7 @@ msgid "Account deleted."
 msgstr "Avatar gelöscht."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "Neues Benutzerkonto erstellen"
@@ -2097,7 +2135,7 @@ msgid "Reset back to default"
 msgstr "Standard wiederherstellen"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2210,14 +2248,16 @@ msgid "Edit %s group"
 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:70 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: Client error displayed trying to edit a group while not 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:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "Du musst ein Admin sein, um die Gruppe zu bearbeiten"
 
@@ -2278,8 +2318,8 @@ msgstr "Aktuelle bestätigte E-Mail-Adresse."
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Entfernen"
@@ -2304,15 +2344,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Eingehende E-Mail"
 
@@ -2323,13 +2363,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 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 "
@@ -2344,7 +2384,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Neu"
@@ -2420,9 +2460,10 @@ 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, 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.
@@ -2438,8 +2479,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Keine ausstehende Bestätigung, die abgebrochen werden kann."
 
@@ -2450,8 +2491,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, 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.
@@ -2470,24 +2512,25 @@ msgstr "Dies ist nicht deine E-Mail-Adresse."
 msgid "The email address was removed."
 msgstr "Die E-Mail-Adresse wurde entfernt."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, 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:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 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:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "Neue Eingangs-E-Mail-Adresse hinzugefügt."
 
@@ -2586,7 +2629,7 @@ msgstr "Unerwartete Antwort!"
 msgid "User being listened to does not exist."
 msgstr "Aufgeführter Benutzer existiert nicht."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Du kannst ein lokales Abonnement erstellen!"
 
@@ -2717,22 +2760,19 @@ msgstr ""
 "Stelle ein wie die Gruppenseite aussehen soll. Hintergrundbild und "
 "Farbpalette frei wählbar."
 
-#. 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "Konnte dein Design nicht aktualisieren."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "Design-Einstellungen gespeichert."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "Gruppen-Logo"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2740,23 +2780,28 @@ msgstr ""
 "Du kannst ein Logo für deine Gruppe hochladen. Die maximale Dateigröße ist %"
 "s."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "Hochladen"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "Zuschneiden"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 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."
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "Logo aktualisiert."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "Aktualisierung des Logos fehlgeschlagen."
 
@@ -2898,14 +2943,14 @@ msgid "Error removing the block."
 msgstr "Fehler beim Freigeben des Benutzers."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2915,23 +2960,23 @@ msgstr ""
 "senden. Stelle deine Adresse und Einstellungen unten ein."
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM ist nicht verfügbar."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "IM-Adresse"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Aktuelle bestätigte Jabber/GTalk-Adresse"
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2946,7 +2991,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2957,65 +3002,65 @@ msgstr ""
 "Programm oder GTalk aufgenommen hast."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "IM-Einstellungen"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Schicke mir Nachrichten mittels Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Schicke eine Nachricht, wenn sich mein Jabber/GTalk-Status verändert."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk 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 IM preferences form.
-#: actions/imsettings.php:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "MicroID für meine Jabber/GTalk-Adresse veröffentlichen."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Einstellungen gesichert."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Keine Jabber-ID"
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "Konnte diese Jabber-ID nicht normalisieren"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "Ungültige Jabber-ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "Diese Jabber-ID hast du schon angegeben."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID 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.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -3025,28 +3070,29 @@ 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:391
+#: actions/imsettings.php:382
 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:400
-msgid "Couldn't delete IM confirmation."
+#: actions/imsettings.php:391
+#, fuzzy
+msgid "Could not delete IM confirmation."
 msgstr "Konnte die IM-Bestätigung nicht löschen."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Dies ist nicht deine Jabber-ID."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "Die IM-Adresse wurde entfernt."
 
@@ -3276,20 +3322,20 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s hat die Gruppe %2$s verlassen"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Lizenz"
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr "Lizenz dieser StatusNet-Website"
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr "Ungültige Lizenzauswahl."
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
@@ -3297,87 +3343,87 @@ msgstr ""
 "Du musst den Besitzer des Inhalts angeben, wenn du „Alle Rechte vorbehalten“ "
 "wählst."
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Ungültiger Lizenztitel. Die maximale Länge liegt bei 255 Zeichen."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr "Ungültige Lizenz-URL."
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr "Ungültige Lizenz-Bild-URL."
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr "Lizenz-URL muss leer oder eine gültige URL sein."
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr "Lizenz-Bild muss leer oder eine gültige URL sein."
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr "Lizenzauswahl"
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "Privat"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr "Alle Rechte vorbehalten"
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr "Typ"
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr "Lizenz auswählen"
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr "Lizenz-Details"
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr "Besitzer"
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 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:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr "Lizenz-Titel"
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr "Der Titel der Lizenz."
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr "Lizenz-URL"
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr "URL mit weiteren Informationen über die Lizenz."
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr "Lizenz-Bild-URl"
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr "URL eines mit der Lizenz anzuzeigenden Bildes."
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Lizenz-Einstellungen speichern"
 
@@ -4154,12 +4200,12 @@ msgstr ""
 "2$s“."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "Profil-Einstellungen"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4167,18 +4213,18 @@ msgstr ""
 "über dich erfahren können."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "Profilinformation"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4186,13 +4232,13 @@ msgstr "Bürgerlicher Name"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Homepage"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: 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 "
@@ -4201,7 +4247,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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4209,19 +4255,19 @@ 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:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "Biografie"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4229,24 +4275,24 @@ msgid "Location"
 msgstr "Aufenthaltsort"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 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:157
+#: actions/profilesettings.php:153
 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:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "Tags"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4254,27 +4300,27 @@ msgstr ""
 "Leerzeichen getrennt"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "Sprache"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "Bevorzugte Sprache"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "Zeitzone"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 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:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4284,7 +4330,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4292,51 +4338,48 @@ 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:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Keine Zeitzone ausgewählt."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:276
 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, 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:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, fuzzy
+msgid "Could not save location prefs."
 msgstr "Konnte Positions-Einstellungen nicht speichern."
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "Konnte Profil nicht speichern."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Einstellungen gespeichert."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Neues Benutzerkonto erstellen"
@@ -4736,7 +4779,7 @@ msgstr ""
 "(Du solltest in Kürze eine E-Mail mit der Anleitung zur Überprüfung deiner "
 "Mailadresse erhalten.)"
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4748,73 +4791,76 @@ msgstr ""
 "auf einer [kompatiblen Mikrobloggingsite](%%doc.openmublog%%) hast, dann gib "
 "deine Profil-URL unten an."
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Entferntes Abonnement"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Abonniere diesen Benutzer"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Benutzername"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "Name des Benutzers, dem du folgen möchtest"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Profil-URL"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "Profil-URL bei einem anderen kompatiblen Mikrobloggingdienst"
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "Ungültige Profil-URL (falsches Format)"
 
-#: actions/remotesubscribe.php:168
+#: 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:176
-msgid "That’s a local profile! Login to subscribe."
+#: 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:183
-msgid "Couldn’t get a request token."
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
 msgstr "Konnte keinen Anfrage-Token bekommen."
 
-#: actions/repeat.php:57
+#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Nur angemeldete Benutzer können Nachrichten wiederholen."
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Keine Nachricht angegeben."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "Du kannst deine eigene Nachricht nicht wiederholen."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Nachricht bereits wiederholt"
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Wiederholt"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Wiederholt!"
 
@@ -5587,70 +5633,70 @@ msgid "Save site notice"
 msgstr "Systemnachricht speichern"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "SMS-Einstellungen"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "SMS ist nicht verfügbar."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "SMS-Adresse"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 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:133
+#: actions/smssettings.php:129
 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:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "Bestätigungscode"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 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:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Bestätigen"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "SMS-Telefonnummer"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 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:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "SMS-Einstellungen"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5659,32 +5705,32 @@ msgstr ""
 "meinem Netzbetreiber entstehen können."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
 msgid "SMS preferences saved."
 msgstr "SMS-Einstellungen gesichert."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "Keine Telefonnummer."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr "Kein Netzanbieter ausgewählt."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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."
@@ -5694,39 +5740,39 @@ msgstr ""
 "die Anweisungen, um ihn zu benutzen."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
+#: actions/smssettings.php:404
 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:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 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:470
+#: actions/smssettings.php:460
 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:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "Netzanbieter"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5737,7 +5783,7 @@ msgstr ""
 "s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "Kein Code eingegeben"
 
@@ -5999,10 +6045,6 @@ msgstr ""
 "Du kannst nur Benutzer taggen, die du abonniert hast oder die dich abonniert "
 "haben."
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "Konnte Tags nicht speichern."
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
@@ -6235,12 +6277,12 @@ msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Falscher Bildtyp für „%s“"
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "Profil-Design-Einstellungen"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6248,7 +6290,7 @@ msgstr ""
 "Stelle ein wie deine Profilseite aussehen soll. Hintergrundbild und "
 "Farbpalette sind frei wählbar."
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr "Hab Spaß!"
 
@@ -7221,23 +7263,27 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Konnte Nachricht nicht einfügen."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "Konnte ungültig gemachtes Token nicht löschen."
 
@@ -7886,6 +7932,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Zurücksetzen"
 
+#. 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
+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
 msgid "Design defaults restored."
@@ -9241,3 +9293,26 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Hole Backup von der Datei „%s“."
+
+#~ msgid "No such profile"
+#~ msgstr "Profil nicht gefunden."
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "Gruppen, in denen „%s“ Mitglied ist"
+
+#~ msgid "Method not supported"
+#~ msgstr "Methode wird nicht unterstützt"
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "Leute, die „%s“ abonniert haben"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "Konnte Benutzerdaten nicht aktualisieren."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "Konnte Profil nicht speichern."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "Konnte Tags nicht speichern."
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index e4634df86c..9de1abafd7 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-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:34:41+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05: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 (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: en-gb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -90,9 +90,9 @@ msgstr "Save access settings"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -113,6 +113,8 @@ msgstr "No such page."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -133,8 +135,8 @@ msgstr "No such page."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -145,7 +147,7 @@ msgstr "No such page."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -314,7 +316,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Could not update user."
 
@@ -336,7 +352,8 @@ msgid "User has no profile."
 msgstr "User has no profile."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "Could not save profile."
 
@@ -372,8 +389,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "Unable to save your design settings."
 
@@ -381,13 +398,17 @@ 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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Could not update your design."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+msgctxt "ATOM"
 msgid "Main"
 msgstr ""
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -398,31 +419,38 @@ msgstr ""
 msgid "%s timeline"
 msgstr "%s timeline"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s subscriptions"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: 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:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Block user failed."
 
@@ -560,7 +588,7 @@ msgstr "Could not find target user."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Nickname already in use. Try another one."
@@ -570,7 +598,7 @@ msgstr "Nickname already in use. Try another one."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Not a valid nickname."
@@ -582,7 +610,7 @@ msgstr "Not a valid nickname."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Homepage is not a valid URL."
@@ -592,7 +620,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -620,7 +648,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -744,7 +772,7 @@ 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:101
+#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Invalid request token or verifier."
 
@@ -765,18 +793,19 @@ msgid "Request token already authorized."
 msgstr "You are not authorised."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -798,16 +827,17 @@ msgstr "Database error inserting OAuth application user."
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Unexpected form submission."
 
@@ -859,7 +889,7 @@ msgstr "Account"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -880,7 +910,7 @@ msgstr "Password"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -952,6 +982,7 @@ msgstr "You may not delete another user's status."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: 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
@@ -971,40 +1002,50 @@ msgstr "Cannot repeat your own notice."
 msgid "Already repeated that notice."
 msgstr "Already repeated that notice."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "API method not found."
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Status deleted."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "No status with that ID found."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "Can't delete this notice."
 
-#: actions/apistatusesshow.php:243
+#. 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"
@@ -1138,51 +1179,49 @@ msgstr "Only the user can read their own mailboxes."
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, 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:406
+#: actions/apitimelineuser.php:409
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Notice with that id does not exist."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1193,108 +1232,116 @@ msgstr "API method under construction."
 msgid "User not found."
 msgstr "API method not found."
 
-#: actions/atompubfavoritefeed.php:70
-#, fuzzy
-msgid "No such profile"
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
+msgid "No such profile."
 msgstr "No such profile."
 
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#. 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 "Can't add someone else's subscription"
+msgid "Cannot add someone else's subscription."
 msgstr "Couldn't insert new subscription."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-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 "Find content of notices"
 
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#. 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"
 
-#: actions/atompubfavoritefeed.php:256
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "Unknown"
 
-#: actions/atompubfavoritefeed.php:263
+#. TRANS: Client exception thrown when trying favorite an already favorited notice.
+#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "Add to favourites"
 
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
-msgid "No such profile."
-msgstr "No such profile."
-
+#. 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"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "Groups %s is a member of"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "Couldn't insert new subscription."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:241
-msgid "Can only handle Join activities."
-msgstr ""
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
+msgstr "Find content of notices"
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Unknown"
 
-#: actions/atompubmembershipfeed.php:263
+#. 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"
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr "Could not delete favourite."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "No such group."
 
-#: actions/atompubshowmembership.php:90
+#. 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"
 
-#: actions/atompubshowmembership.php:115
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "Method not supported"
+msgid "HTTP method not supported"
 msgstr "API method not found."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1302,40 +1349,37 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
-msgid "No such profile id: %d"
+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"
+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"
+msgid "Cannot delete someone else's subscription."
 msgstr "Could not delete self-subscription."
 
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "People subscribed to %s"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
 msgstr "Unknown file type"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1346,10 +1390,11 @@ msgstr "No such attachment."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "No nickname."
@@ -1380,30 +1425,36 @@ 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."
 
 #. 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "Avatar settings"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "Original"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "Preview"
 
@@ -1441,7 +1492,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "Lost our file data."
 
@@ -1460,7 +1512,7 @@ msgstr "Failed updating avatar."
 msgid "Avatar deleted."
 msgstr "Avatar deleted."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1562,6 +1614,7 @@ msgstr "Failed to save block information."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1571,7 +1624,7 @@ msgstr "Failed to save block information."
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1652,23 +1705,6 @@ msgstr "Unrecognized address type %s."
 msgid "That address has already been confirmed."
 msgstr "That address has already been confirmed."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-msgstr "Couldn't update user."
-
 #. 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
@@ -1730,7 +1766,7 @@ msgid "Account deleted."
 msgstr "Avatar deleted."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "Create an account"
@@ -2092,7 +2128,7 @@ msgid "Reset back to default"
 msgstr "Reset back to default"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2206,14 +2242,16 @@ msgid "Edit %s group"
 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:70 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: Client error displayed trying to edit a group while not 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:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "You must be an admin to edit the group."
 
@@ -2274,8 +2312,8 @@ msgstr "Current confirmed e-mail 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Remove"
@@ -2300,15 +2338,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Incoming e-mail"
 
@@ -2319,13 +2357,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 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."
 
@@ -2338,7 +2376,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "New"
@@ -2412,9 +2450,10 @@ 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, 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.
@@ -2429,8 +2468,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "No pending confirmation to cancel."
 
@@ -2441,8 +2480,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+msgid "Could not delete email confirmation."
 msgstr "Couldn't delete email confirmation."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
@@ -2461,24 +2501,25 @@ msgstr "That is not your e-mail address."
 msgid "The email address was removed."
 msgstr "The email address was removed."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, 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:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 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:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "New incoming e-mail address added."
 
@@ -2576,7 +2617,7 @@ msgstr "Not expecting this response!"
 msgid "User being listened to does not exist."
 msgstr "User being listened to does not exist."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "You can use the local subscription!"
 
@@ -2706,45 +2747,47 @@ msgstr ""
 "Customise the way your group looks with a background image and a colour "
 "palette of your choice."
 
-#. 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "Couldn't update your design."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "Design preferences saved."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "Group logo"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
 "You can upload a logo image for your group. The maximum file size is %s."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "Upload"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "Crop"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr "Pick a square area of the image to be the logo."
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "Logo updated."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "Failed updating logo."
 
@@ -2885,14 +2928,14 @@ msgid "Error removing the block."
 msgstr "Error removing the block."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2902,23 +2945,23 @@ msgstr ""
 "doc.im%%). Configure your address and settings below."
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM is not available."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "IM address"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Current confirmed Jabber/GTalk address."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2932,7 +2975,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2942,64 +2985,64 @@ msgstr ""
 "add %s to your buddy list in your IM client or on GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "IM preferences"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Send me notices through Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Post a notice when my Jabber/GTalk status changes."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk 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:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publish a MicroID for my Jabber/GTalk address."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Preferences saved."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "No Jabber ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "Cannot normalize that Jabber ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "Not a valid Jabber ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "That is already your Jabber ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID 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.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -3009,28 +3052,29 @@ msgstr ""
 "s for sending messages to you."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 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:400
-msgid "Couldn't delete IM confirmation."
+#: actions/imsettings.php:391
+#, fuzzy
+msgid "Could not delete IM confirmation."
 msgstr "Couldn't delete IM confirmation."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "That is not your Jabber ID."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "The IM address was removed."
 
@@ -3257,107 +3301,107 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s left group %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr ""
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Location is too long (max 255 chars)."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "Private"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
 
@@ -4133,31 +4177,31 @@ 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:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "Profile settings"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 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:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "Profile information"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 #, 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4165,13 +4209,13 @@ msgstr "Full name"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Homepage"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: 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"
@@ -4179,7 +4223,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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4187,19 +4231,19 @@ 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:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "Bio"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4207,51 +4251,51 @@ msgid "Location"
 msgstr "Location"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 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:157
+#: actions/profilesettings.php:153
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "Tags"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "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:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "Language"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "Preferred language"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "Timezone"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 msgid "What timezone are you normally in?"
 msgstr "In which timezone are you?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4260,7 +4304,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4268,52 +4312,49 @@ 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:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Timezone not selected."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:276
 #, 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, 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:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, fuzzy
+msgid "Could not save location prefs."
 msgstr "Couldn't save location prefs."
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "Couldn't save profile."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
-msgstr "Couldn't save tags."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Settings saved."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Create an account"
@@ -4701,7 +4742,7 @@ msgstr ""
 "(You should receive a message by e-mail momentarily, with instructions on "
 "how to confirm your e-mail address.)"
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4712,72 +4753,75 @@ 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:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Remote subscribe"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Subscribe to a remote user"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "User nickname"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "Nickname of the user you want to follow"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Profile URL"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL of your profile on another compatible microblogging service"
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "Subscribe"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "Invalid profile URL (bad format)"
 
-#: actions/remotesubscribe.php:168
+#: 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:176
-msgid "That’s a local profile! Login to subscribe."
+#: 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:183
-msgid "Couldn’t get a request token."
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
 msgstr "Couldn’t get a request token."
 
-#: actions/repeat.php:57
+#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Only logged-in users can repeat notices."
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "No notice specified."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "You can't repeat your own notice."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "You already repeated that notice."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Repeated"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Repeated!"
 
@@ -5533,70 +5577,70 @@ msgid "Save site notice"
 msgstr "Save site notice"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "SMS settings"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "SMS is not available."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "SMS address"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Current confirmed SMS-enabled phone number."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:133
+#: actions/smssettings.php:129
 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:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "Confirmation code"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 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:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Confirm"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "SMS phone number"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 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:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "SMS preferences"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5605,32 +5649,32 @@ msgstr ""
 "from my carrier."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
 msgid "SMS preferences saved."
 msgstr "SMS preferences saved."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "No phone number."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr "No carrier selected."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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."
@@ -5639,39 +5683,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:413
+#: actions/smssettings.php:404
 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:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 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:470
+#: actions/smssettings.php:460
 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:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "Mobile carrier"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5681,7 +5725,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:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "No code entered"
 
@@ -5938,10 +5982,6 @@ msgid ""
 msgstr ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "Could not save tags."
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "Use this form to add tags to your subscribers or subscriptions."
@@ -6172,12 +6212,12 @@ 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:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "Profile design"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6185,7 +6225,7 @@ msgstr ""
 "Customise the way your profile looks with a background image and a colour "
 "palette of your choice."
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr ""
 
@@ -7135,23 +7175,27 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Could not insert message."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
@@ -7792,6 +7836,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Reset"
 
+#. 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
+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
 msgid "Design defaults restored."
@@ -9047,3 +9097,28 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "No such profile"
+#~ msgstr "No such profile."
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "Groups %s is a member of"
+
+#, fuzzy
+#~ msgid "Method not supported"
+#~ msgstr "API method not found."
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "People subscribed to %s"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "Couldn't update user."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "Couldn't save profile."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "Couldn't save tags."
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index 1b69f13b35..ae848abf18 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-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:34:42+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05:22+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 (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: eo\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -94,9 +94,9 @@ msgstr "Konservu atingan agordon"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -117,6 +117,8 @@ msgstr "Ne estas tiu paĝo."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -137,8 +139,8 @@ msgstr "Ne estas tiu paĝo."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -149,7 +151,7 @@ msgstr "Ne estas tiu paĝo."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -318,7 +320,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Malsukcesis ĝisdatigi uzanton"
 
@@ -340,7 +356,8 @@ msgid "User has no profile."
 msgstr "La uzanto ne havas profilon."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "Malsukcesis konservi la profilon."
 
@@ -376,8 +393,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "Malsukcesis konservi vian desegnan agordon"
 
@@ -385,13 +402,18 @@ 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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Malsukcesis ĝisdatigi vian desegnon."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+#, fuzzy
+msgctxt "ATOM"
 msgid "Main"
 msgstr "Ĉefa"
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -402,31 +424,38 @@ msgstr "Ĉefa"
 msgid "%s timeline"
 msgstr "Tempstrio de %s"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s abonatoj"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: 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:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Ne sukcesis bloki uzanton."
 
@@ -562,7 +591,7 @@ msgstr "Malsukcesis trovi celan uzanton."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "La uzantnomo jam uziĝis. Provu ion alian."
@@ -572,7 +601,7 @@ msgstr "La uzantnomo jam uziĝis. Provu ion alian."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ne valida kromnomo."
@@ -584,7 +613,7 @@ msgstr "Ne valida kromnomo."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Ĉefpaĝo ne estas valida URL."
@@ -594,7 +623,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Kompleta nomo tro longas (maksimume 255 signoj)"
@@ -621,7 +650,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Lokonomo tro longas (maksimume 255 signoj)"
@@ -744,7 +773,7 @@ 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:101
+#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Malvalida peto-ĵetono aŭ verigilo."
 
@@ -764,18 +793,19 @@ msgid "Request token already authorized."
 msgstr ""
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -797,16 +827,17 @@ msgstr "Datumbaza eraro enigi la uzanton de *OAuth-aplikaĵo."
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Neatendita formo-sendo."
 
@@ -857,7 +888,7 @@ msgstr "Konto"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -878,7 +909,7 @@ msgstr "Pasvorto"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -952,6 +983,7 @@ msgstr "Vi ne povas forigi la staton de alia uzanto."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: 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
@@ -971,40 +1003,50 @@ msgstr "Vi ne povas ripeti vian propran avizon."
 msgid "Already repeated that notice."
 msgstr "La avizo jam ripetiĝis."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "Metodo de API ne troviĝas."
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Stato forigita."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Neniu stato kun tiu ID troviĝas."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "Ne povas forigi ĉi tiun avizon."
 
-#: actions/apistatusesshow.php:243
+#. 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"
@@ -1140,51 +1182,49 @@ msgstr "Nur uzanto povas legi sian propran paŝton."
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, 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:406
+#: actions/apitimelineuser.php:409
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Avizo kun tiu identigaĵo ne ekzistas."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1196,109 +1236,117 @@ msgstr "API-metodo farata."
 msgid "User not found."
 msgstr "Metodo de API ne troviĝas."
 
-#: actions/atompubfavoritefeed.php:70
-#, fuzzy
-msgid "No such profile"
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
+msgid "No such profile."
 msgstr "Ne ekzistas tia profilo."
 
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#. 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 "Can't add someone else's subscription"
+msgid "Cannot add someone else's subscription."
 msgstr "Eraris enmeti novan abonon."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-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 "Serĉi enhavon ĉe la retejo"
 
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#. 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 "Serĉi enhavon ĉe la retejo"
 
-#: actions/atompubfavoritefeed.php:256
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "Nekonata"
 
-#: actions/atompubfavoritefeed.php:263
+#. TRANS: Client exception thrown when trying favorite an already favorited notice.
+#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "Aldoni al ŝatolisto"
 
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Ne ekzistas tia profilo."
-
+#. 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"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "Grupoj de %s"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "Eraris enmeti novan abonon."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:241
-msgid "Can only handle Join activities."
-msgstr ""
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
+msgstr "Serĉi enhavon ĉe la retejo"
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Nekonata"
 
-#: actions/atompubmembershipfeed.php:263
+#. 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"
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:89
+#. TRANS: Client exception thrown when referencing a non-existing favorite.
+#: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
 msgstr "Ne ekzistas tia dosiero."
 
+#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
 #: actions/atompubshowfavorite.php:151
 #, fuzzy
-msgid "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr "Malsukcesis forigi ŝataton."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 #, fuzzy
 msgid "No such group"
 msgstr "Ne estas tiu grupo."
 
-#: actions/atompubshowmembership.php:90
+#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
+#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member"
 msgstr "Ĉiuj grupanoj"
 
-#: actions/atompubshowmembership.php:115
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "Method not supported"
+msgid "HTTP method not supported"
 msgstr "Metodo de API ne troviĝas."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1306,40 +1354,37 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
-msgid "No such profile id: %d"
+msgid "No such profile id: %d."
 msgstr "Ne ekzistas tia 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"
+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"
+msgid "Cannot delete someone else's subscription."
 msgstr "Ne eblas forigi abonon al vi mem."
 
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "Abonantoj de %s"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
 msgstr "Nekonata dosiertipo"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1350,10 +1395,11 @@ msgstr "Ne estas tiu aldonaĵo."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Neniu kromnomo."
@@ -1384,30 +1430,36 @@ 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."
 
 #. 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "Vizaĝbilda agordo"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "Originala"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "Antaŭrigardo"
 
@@ -1445,7 +1497,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "Perdiĝis nia dosiera datumo."
 
@@ -1464,7 +1517,7 @@ msgstr "Eraris ĝisdatigi vizaĝbildon."
 msgid "Avatar deleted."
 msgstr "Vizaĝbildo forigita."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1565,6 +1618,7 @@ msgstr "Eraris konservi blokado-informon."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1574,7 +1628,7 @@ msgstr "Eraris konservi blokado-informon."
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1655,23 +1709,6 @@ msgstr "Nerekonata adrestipo %s."
 msgid "That address has already been confirmed."
 msgstr "La adreso jam estis konfirmita."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-msgstr "Ne povus ĝisdatigi uzanton."
-
 #. 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
@@ -1733,7 +1770,7 @@ msgid "Account deleted."
 msgstr "Vizaĝbildo forigita."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "Krei konton"
@@ -2098,7 +2135,7 @@ msgid "Reset back to default"
 msgstr "Redefaŭltiĝi"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2212,14 +2249,16 @@ msgid "Edit %s group"
 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:70 actions/newgroup.php:65
 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 when trying to change group logo settings while not being a group admin.
 #: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "Vi devas esti administranto por redakti la grupon."
 
@@ -2280,8 +2319,8 @@ msgstr "Nuna konfirmita retpoŝtadreso."
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Forigi"
@@ -2306,15 +2345,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Alveninta poŝto"
 
@@ -2325,13 +2364,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 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."
 
@@ -2344,7 +2383,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nova"
@@ -2418,9 +2457,10 @@ 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, fuzzy
+msgid "Could not insert confirmation code."
 msgstr "Malsukcesis enmeti konfirmkodon."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
@@ -2435,8 +2475,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Ne estas peto-konfirmo por nuligi."
 
@@ -2447,8 +2487,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+msgid "Could not delete email confirmation."
 msgstr "Ne povas forigi retpoŝtan konfirmon."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
@@ -2467,24 +2508,25 @@ msgstr "Tiu ne estas via retpoŝtadreso."
 msgid "The email address was removed."
 msgstr "La retpoŝtadreso estas forigita."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, 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:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 msgid "Incoming email address removed."
 msgstr "Alvena retpoŝtadreso forigita."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "Nova alvena retpoŝtadreso aldonita."
 
@@ -2581,7 +2623,7 @@ msgstr "Neatendita respondo!"
 msgid "User being listened to does not exist."
 msgstr "Vizitata uzanto ne ekzistas."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Vi povas aboni loke!"
 
@@ -2708,45 +2750,47 @@ msgid ""
 "palette of your choice."
 msgstr "Agordi kiel aspektu via grupo, per elekto de fonbildo kaj koloraro."
 
-#. 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "Malsukcesis ĝisdatigi vian desegnon."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "Desegna agordo konservita."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "Grupa emblemo"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
 "Vi povas alŝuti emblemo-bildon por via grupo. Dosiero-grandlimo estas $s."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "Alŝuti"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "Tranĉi"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr "Elektu kvadratan parton de la bildo kiel la emblemo."
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "Emblemo ĝisdatigita."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "Malsukcesis ĝisdatigi emblemon."
 
@@ -2887,14 +2931,14 @@ msgid "Error removing the block."
 msgstr "Eraro ĉe provo malbloki."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2904,23 +2948,23 @@ msgstr ""
 "%). Jen agordu vian adreson kaj ceteron."
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "Tujmesaĝilo ne estas disponebla."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "Tujmesaĝila adreso"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Nuna konfirmita Jabber/GTalk-adreso."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2934,7 +2978,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2944,64 +2988,64 @@ msgstr ""
 "s al via amikolisto je via tujmesaĝilo-kliento aŭ je GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Tujmesaĝilaj preferoj"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Sendu al mi avizojn per Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk 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:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk 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:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publikigu MikroID por mia Jabber/GTalk-adreso."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Prefero konservita."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Mankas Jabber-ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "Malsukcesis normigi la Jabber-ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "Tio ne estas valida Jabber-ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "Tio estas jam via Jabber-ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID 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.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -3011,28 +3055,29 @@ msgstr ""
 "al %s sendi mesaĝojn al vi."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 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:400
-msgid "Couldn't delete IM confirmation."
+#: actions/imsettings.php:391
+#, fuzzy
+msgid "Could not delete IM confirmation."
 msgstr "Malsukcesis forigi tujmesaĝila agordo."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Tio ne estas via Jabber-ID."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "La tujmesaĝila adreso estas forigita."
 
@@ -3256,107 +3301,107 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s eksaniĝis de grupo %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Permesilo"
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr "Nevalida permesila elekto"
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Nevalida permesila titolo. La longlimo estas 255 literoj."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "Privata"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr "Ĉiuj rajtoj rezervitaj."
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr "Speco"
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
 
@@ -4123,12 +4168,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:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "Profila agordo"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4136,19 +4181,19 @@ msgstr ""
 "vi."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "Profila informo"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 #, 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4156,13 +4201,13 @@ msgstr "Plena nomo"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Hejmpaĝo"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: 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"
@@ -4170,7 +4215,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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4178,19 +4223,19 @@ 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:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "Biografio"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4198,24 +4243,24 @@ msgid "Location"
 msgstr "Loko"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 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:157
+#: actions/profilesettings.php:153
 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:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "Markiloj"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4223,27 +4268,27 @@ msgstr ""
 "per komoj aŭ spacoj"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "Lingvo"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "Preferata lingvo"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "Horzono"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 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:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "Aŭtomate aboni iun ajn, kiu abonas min (prefereble por ne-homoj)"
@@ -4251,7 +4296,7 @@ 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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4259,52 +4304,49 @@ 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:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Horzono ne elektita"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:276
 #, 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, 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:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, fuzzy
+msgid "Could not save location prefs."
 msgstr "Malsukcesis konservi lokan preferon."
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "Malsukcesis konservi la profilon."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
-msgstr "Malsukcesis konservi markilojn."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Agordo konservitas."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Krei konton"
@@ -4691,7 +4733,7 @@ msgid ""
 msgstr ""
 "(Vi ricevos tuj mesaĝon retpoŝtan, kun gvidon konfirmi vian retpoŝtadreson.)"
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4702,73 +4744,76 @@ msgstr ""
 "%). Se vi jam havas konton ĉe iu [kongrua mikroblogilo-retejo](%%doc."
 "openmublog%%),  entajpu vian profilan URL jene."
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Defore aboni"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Aboni foran uzanton"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Uzanta alinomo"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "Alnomo de la uzanto, kiun vi volas aboni."
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Profila URL"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL de via profilo ĉe alia kongrua mikroblogilo-servo"
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "Aboni"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "Nevalida profila URL (fuŝa formato)"
 
-#: actions/remotesubscribe.php:168
+#: 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:176
-msgid "That’s a local profile! Login to subscribe."
+#: 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:183
-msgid "Couldn’t get a request token."
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
 msgstr "Malsukcesis akiri pet-ĵetonon."
 
-#: actions/repeat.php:57
+#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Nur ensalutinto rajtas ripeti avizon."
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Neniu profilo specifiĝas."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "Vi ne povas ripeti vian propran avizon."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "La avizo jam ripetiĝis."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Ripetita"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Ripetita!"
 
@@ -5533,70 +5578,70 @@ msgid "Save site notice"
 msgstr "Konservi retejan agordon"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "SMM-a agordo"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "SMM ne estas disponebla."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "SMM-a adreso"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Nuna konfirmita SMM-pova telefonnumero"
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:133
+#: actions/smssettings.php:129
 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:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "Konfirma kodo."
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 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:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Konfirmi"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "SMM-a telefonnumero"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 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:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "SMM-aj preferoj"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5605,32 +5650,32 @@ msgstr ""
 "peranto."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
 msgid "SMS preferences saved."
 msgstr "SMM-prefero konserviĝas."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "Mankas la telefononumero."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr "Neniu peranto elektiĝas."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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."
@@ -5639,39 +5684,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:413
+#: actions/smssettings.php:404
 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:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 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:470
+#: actions/smssettings.php:460
 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:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "Poŝtelefona peranto"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5681,7 +5726,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:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "Neniu kodo entajpita"
 
@@ -5939,10 +5984,6 @@ 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:200
-msgid "Could not save tags."
-msgstr "Malsukcesis konservi etikedojn."
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "Uzu ĉi tiun formularon por etikedi viajn abonantojn aŭ abonatojn."
@@ -6171,18 +6212,18 @@ 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:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "Profila desegno"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 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:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr "Ĝuu vian kolbasobulkon!"
 
@@ -7140,23 +7181,27 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Malsukcesis enmeti mesaĝon."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "Malsukcesis forigi revokitan ĵetonon."
 
@@ -7812,6 +7857,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Restarigi"
 
+#. 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
+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
 msgid "Design defaults restored."
@@ -9163,3 +9214,28 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "No such profile"
+#~ msgstr "Ne ekzistas tia profilo."
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "Grupoj de %s"
+
+#, fuzzy
+#~ msgid "Method not supported"
+#~ msgstr "Metodo de API ne troviĝas."
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "Abonantoj de %s"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "Ne povus ĝisdatigi uzanton."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "Malsukcesis konservi la profilon."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "Malsukcesis konservi markilojn."
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index e0fe7a83df..02b882b20d 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -5,6 +5,7 @@
 # Author: Crazymadlover
 # Author: Locos epraix
 # Author: McDutchie
+# Author: Ovruni
 # Author: Patcito
 # Author: PerroVerd
 # Author: Peter17
@@ -16,17 +17,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:34:43+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05: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-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -93,9 +94,9 @@ msgstr "Guardar la configuración de acceso"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -116,6 +117,8 @@ msgstr "No existe tal página."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -136,8 +139,8 @@ msgstr "No existe tal página."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -148,7 +151,7 @@ msgstr "No existe tal página."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -318,7 +321,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "No se pudo actualizar el usuario."
 
@@ -340,7 +357,8 @@ msgid "User has no profile."
 msgstr "El usuario no tiene un perfil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "No se pudo guardar el perfil."
 
@@ -376,8 +394,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "No se pudo grabar tu configuración de diseño."
 
@@ -385,13 +403,17 @@ 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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "No se pudo actualizar tu diseño."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+msgctxt "ATOM"
 msgid "Main"
 msgstr ""
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -402,31 +424,38 @@ msgstr ""
 msgid "%s timeline"
 msgstr "línea temporal de %s"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Suscripciones %s"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: 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:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Falló bloquear usuario."
 
@@ -564,7 +593,7 @@ msgstr "No se pudo encontrar ningún usuario de destino."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "El usuario ya existe. Prueba con otro."
@@ -574,7 +603,7 @@ msgstr "El usuario ya existe. Prueba con otro."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Usuario inválido"
@@ -586,7 +615,7 @@ msgstr "Usuario inválido"
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "La página de inicio no es un URL válido."
@@ -596,7 +625,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -624,7 +653,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -748,7 +777,7 @@ 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:101
+#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "Token de acceso inválido especificado."
@@ -771,18 +800,19 @@ msgid "Request token already authorized."
 msgstr "No estás autorizado."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -805,16 +835,17 @@ msgstr "Error de base de datos al insertar usuario de la aplicación OAuth."
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Envío de formulario inesperado."
 
@@ -857,7 +888,6 @@ msgstr ""
 
 #. TRANS: Fieldset legend.
 #: actions/apioauthauthorize.php:455
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Cuenta"
@@ -866,7 +896,7 @@ msgstr "Cuenta"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -887,7 +917,7 @@ msgstr "Contraseña"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -961,6 +991,7 @@ msgstr "No puedes borrar el estado de otro usuario."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: 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
@@ -980,40 +1011,50 @@ msgstr "No puedes repetir tus propios mensajes"
 msgid "Already repeated that notice."
 msgstr "Este mensaje ya se ha repetido."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "Método de API no encontrado."
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Status borrado."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "No hay estado para ese ID"
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "No se puede eliminar este mensaje."
 
-#: actions/apistatusesshow.php:243
+#. 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"
@@ -1149,51 +1190,49 @@ msgstr "Sólo el usuario puede leer sus bandejas de correo."
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Buscar en el contenido de mensajes"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:406
+#: actions/apitimelineuser.php:409
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "No existe ningún mensaje con ese ID."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1204,108 +1243,116 @@ msgstr "Método API en construcción."
 msgid "User not found."
 msgstr "Método de API no encontrado."
 
-#: actions/atompubfavoritefeed.php:70
-#, fuzzy
-msgid "No such profile"
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
+msgid "No such profile."
 msgstr "No existe tal perfil."
 
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#. 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 "Can't add someone else's subscription"
+msgid "Cannot add someone else's subscription."
 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/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-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 "Buscar en el contenido de mensajes"
 
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#. 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 en el contenido de mensajes"
 
-#: actions/atompubfavoritefeed.php:256
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "Desconocido"
 
-#: actions/atompubfavoritefeed.php:263
+#. TRANS: Client exception thrown when trying favorite an already favorited notice.
+#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "Agregar a favoritos"
 
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
-msgid "No such profile."
-msgstr "No existe tal perfil."
-
+#. TRANS: Title for group membership feed.
+#. TRANS: %s is a username.
 #: actions/atompubmembershipfeed.php:144
 #, fuzzy, php-format
 msgid "%s group memberships"
 msgstr "Miembros del grupo %s"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "%s es miembro de los grupos"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "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:241
-msgid "Can only handle Join activities."
-msgstr ""
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
+msgstr "Buscar en el contenido de mensajes"
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Desconocido"
 
-#: actions/atompubmembershipfeed.php:263
+#. 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"
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr "No se pudo borrar favorito."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "No existe ese grupo"
 
-#: actions/atompubshowmembership.php:90
+#. 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"
 
-#: actions/atompubshowmembership.php:115
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "Method not supported"
+msgid "HTTP method not supported"
 msgstr "Método de API no encontrado."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1313,40 +1360,37 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
-msgid "No such profile id: %d"
+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"
+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"
+msgid "Cannot delete someone else's subscription."
 msgstr "No se pudo eliminar la auto-suscripción."
 
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "Personas suscritas a %s"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
 msgstr "Tipo de archivo desconocido"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1357,10 +1401,11 @@ msgstr "No existe tal archivo adjunto."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Ningún nombre de usuario."
@@ -1391,37 +1436,42 @@ 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."
 
 #. 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "Configuración de imagen"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "Original"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 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
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Borrar"
@@ -1429,7 +1479,6 @@ 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
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Subir"
@@ -1452,7 +1501,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "Se perdió nuestros datos de archivo."
 
@@ -1471,7 +1521,7 @@ msgstr "Error al actualizar la imagen."
 msgid "Avatar deleted."
 msgstr "Imagen borrada."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1573,6 +1623,7 @@ msgstr "No se guardó información de bloqueo."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1582,7 +1633,7 @@ msgstr "No se guardó información de bloqueo."
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1664,23 +1715,6 @@ msgstr "Tipo de dirección %s desconocida."
 msgid "That address has already been confirmed."
 msgstr "Esa dirección ya fue confirmada."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-msgstr "No se pudo actualizar el usuario."
-
 #. 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
@@ -1742,7 +1776,7 @@ msgid "Account deleted."
 msgstr "Imagen borrada."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "Crear una cuenta"
@@ -1868,9 +1902,8 @@ msgstr "%1$s ha dejado el 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 "Borrar usuario"
+msgstr "Borrar grupo"
 
 #. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
@@ -1885,15 +1918,13 @@ msgstr ""
 
 #. 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 mensaje"
+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 usuario"
+msgstr "Borrar este grupo"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
@@ -2111,7 +2142,7 @@ msgid "Reset back to default"
 msgstr "Volver a los valores predeterminados"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2225,14 +2256,16 @@ msgid "Edit %s group"
 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:70 actions/newgroup.php:65
 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 when trying to change group logo settings while not being a group admin.
 #: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "Para editar el grupo debes ser administrador."
 
@@ -2293,8 +2326,8 @@ msgstr "Actual dirección de correo electrónico confirmada"
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Eliminar"
@@ -2319,15 +2352,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Correo entrante"
 
@@ -2338,13 +2371,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 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."
 
@@ -2357,7 +2390,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nuevo"
@@ -2434,9 +2467,10 @@ 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, 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.
@@ -2452,8 +2486,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Ninguna confirmación pendiente para cancelar."
 
@@ -2464,8 +2498,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, 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.
@@ -2484,24 +2519,25 @@ msgstr "Esa no es tu dirección de correo electrónico"
 msgid "The email address was removed."
 msgstr "La dirección de correo electrónico ha sido eliminada."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, 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:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 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:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "Nueva dirección de correo entrante agregada."
 
@@ -2600,7 +2636,7 @@ msgstr "¡Respuesta inesperada!"
 msgid "User being listened to does not exist."
 msgstr "El usuario al que quieres listar no existe."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "¡Puedes usar la suscripción local!"
 
@@ -2732,22 +2768,19 @@ msgstr ""
 "Personaliza el aspecto de tu grupo con una imagen de fondo y la paleta de "
 "colores que prefieras."
 
-#. 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "No fue posible actualizar tu diseño."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "Preferencias de diseño guardadas."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "Logo de grupo"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2755,23 +2788,28 @@ msgstr ""
 "Puedes subir una imagen de logo para tu grupo. El tamaño máximo del archivo "
 "debe ser %s."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "Subir"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "Cortar"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 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."
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "Logo actualizado."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "Error al actualizar el logo."
 
@@ -2912,14 +2950,14 @@ msgid "Error removing the block."
 msgstr "Se ha producido un error al eliminar el bloque."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2929,23 +2967,23 @@ msgstr ""
 "Jabber/GTalk. Configura tu dirección y opciones abajo."
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "La mensajería instantánea no está disponible."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "Dirección de mensajería instantánea"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Dirección actual Jabber/Gtalk confirmada."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2960,7 +2998,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2971,64 +3009,64 @@ msgstr ""
 "mensajería instantánea o en GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Preferencias de mensajería instantánea"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Enviarme mensajes por Jabber/GTalk"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Publicar un mensaje cuando el estado de mi Jabber/GTalk cambie."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk 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:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publicar un MicroID para mi cuenta Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Preferencias guardadas."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Ningún Jabber ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "No se puede normalizar este Jabber ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "Jabber ID no válido"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "Ese ya es tu Jabber ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID 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.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -3039,28 +3077,29 @@ msgstr ""
 "mensajes."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 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:400
-msgid "Couldn't delete IM confirmation."
+#: actions/imsettings.php:391
+#, fuzzy
+msgid "Could not delete IM 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:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Ese no es tu Jabber ID."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "La dirección de mensajería instantánea ha sido eliminada."
 
@@ -3288,107 +3327,107 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s ha dejado el grupo %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
-msgstr ""
+msgstr "Licencia"
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Texto de bienvenida inválido. La longitud máx. es de 255 caracteres."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "Privado"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
 
@@ -4181,12 +4220,12 @@ msgstr ""
 "$s’."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "Configuración del perfil"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4194,12 +4233,12 @@ msgstr ""
 "sepa más sobre ti."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "Información del perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4207,7 +4246,7 @@ msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4215,13 +4254,13 @@ msgstr "Nombre completo"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Página de inicio"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: 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"
@@ -4229,7 +4268,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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4237,19 +4276,19 @@ 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:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "Biografía"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4257,24 +4296,24 @@ msgid "Location"
 msgstr "Ubicación"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 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:157
+#: actions/profilesettings.php:153
 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:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "Etiquetas"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4282,27 +4321,27 @@ msgstr ""
 "espacios"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "Idioma"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "Lenguaje de preferencia"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "Zona horaria"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 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:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4312,7 +4351,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4320,52 +4359,49 @@ 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:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Zona horaria no seleccionada"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:276
 #, 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, 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:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, 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 could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "No se pudo guardar el perfil."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
-msgstr "No se pudo guardar las etiquetas."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Se guardó configuración."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Crear una cuenta"
@@ -4770,7 +4806,7 @@ 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:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4782,74 +4818,77 @@ msgstr ""
 "[servicio de microblogueo compatible](%%doc.openmublog%%), escribe el URL de "
 "tu perfil debajo."
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Subscripción remota"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Suscribirse a un usuario remoto"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Usuario"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "Usuario a quien quieres seguir"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "URL del perfil"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "El URL de tu perfil en otro servicio de microblogueo compatible"
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "Suscribirse"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "El URL del perfil es inválido (formato incorrecto)"
 
-#: actions/remotesubscribe.php:168
+#: 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:176
-msgid "That’s a local profile! Login to subscribe."
+#: 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:183
-msgid "Couldn’t get a request token."
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
 msgstr "No se pudo obtener un token de solicitud"
 
-#: actions/repeat.php:57
+#: 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:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "No se ha especificado un mensaje."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "No puedes repetir tus propios mensajes."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Ya has repetido este mensaje."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Repetido"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "¡Repetido!"
 
@@ -5287,7 +5326,6 @@ msgstr "Creado"
 
 #. TRANS: Label for member count in statistics on group page.
 #: actions/showgroup.php:461
-#, fuzzy
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Miembros"
@@ -5624,71 +5662,71 @@ msgid "Save site notice"
 msgstr "Guardar el mensaje del sitio"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 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:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "SMS no está disponible."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "Dirección de SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 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:133
+#: actions/smssettings.php:129
 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:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "Código de confirmación"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 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:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 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:156
+#: actions/smssettings.php:152
 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:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "Preferencias de SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5697,32 +5735,32 @@ msgstr ""
 "por mi operador móvil"
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
 msgid "SMS preferences saved."
 msgstr "Preferencias de SMS guardadas."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 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:344
+#: actions/smssettings.php:336
 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:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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."
@@ -5732,39 +5770,39 @@ msgstr ""
 "cómo usarlo."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
+#: actions/smssettings.php:404
 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:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 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:470
+#: actions/smssettings.php:460
 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:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "Operador de telefonía móvil"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5775,7 +5813,7 @@ msgstr ""
 "informarnos al %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "No ingresó código"
 
@@ -6039,10 +6077,6 @@ msgstr ""
 "Sólo puedes marcar a las personas a quienes estás suscrito o que están "
 "suscritas a ti."
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "No se han podido guardar las etiquetas."
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
@@ -6277,12 +6311,12 @@ 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:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "Diseño del perfil"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6290,7 +6324,7 @@ msgstr ""
 "Personaliza la vista de tu perfil con una imagen de fondo y la paelta de "
 "colores que quieras."
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr "¡Disfruta de tu perrito caliente!"
 
@@ -7263,23 +7297,27 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "No se pudo insertar mensaje."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "No se pudo eliminar el token revocado."
 
@@ -7938,6 +7976,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Restablecer"
 
+#. 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
+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
 msgid "Design defaults restored."
@@ -9299,3 +9343,28 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "No such profile"
+#~ msgstr "No existe tal perfil."
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "%s es miembro de los grupos"
+
+#, fuzzy
+#~ msgid "Method not supported"
+#~ msgstr "Método de API no encontrado."
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "Personas suscritas a %s"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "No se pudo actualizar el usuario."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "No se pudo guardar el perfil."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "No se pudo guardar las etiquetas."
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index 01c7edf568..4a1e51eac9 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-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:34:45+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05:24+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 (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -94,9 +94,9 @@ msgstr "ذخیرهٔ تنظیمات دسترسی"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -117,6 +117,8 @@ msgstr "چنین صفحه‌ای وجود ندارد."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -137,8 +139,8 @@ msgstr "چنین صفحه‌ای وجود ندارد."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -149,7 +151,7 @@ msgstr "چنین صفحه‌ای وجود ندارد."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -316,7 +318,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "نمی‌توان کاربر را به‌هنگام‌سازی کرد."
 
@@ -338,7 +354,8 @@ msgid "User has no profile."
 msgstr "کاربر هیچ نمایه‌ای ندارد."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "نمی‌توان نمایه را ذخیره کرد."
 
@@ -370,8 +387,8 @@ msgstr[0] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "نمی‌توان تنظیمات طرح‌تان را ذخیره کرد."
 
@@ -379,13 +396,18 @@ msgstr "نمی‌توان تنظیمات طرح‌تان را ذخیره کرد.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
+#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "نمی‌توان طرح‌تان به‌هنگام‌سازی کرد."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+#, fuzzy
+msgctxt "ATOM"
 msgid "Main"
 msgstr "اصلی"
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -396,31 +418,38 @@ msgstr "اصلی"
 msgid "%s timeline"
 msgstr "خط‌زمانی %s"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s اشتراک"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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 "برگزیده‌ها"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "شما نمی‌توانید خودتان رو مسدود کنید!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "مسدود کردن کاربر شکست خورد."
 
@@ -557,7 +586,7 @@ msgstr "نمی‌توان کاربر هدف را پیدا کرد."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "این لقب در حال حاضر ثبت شده است. لطفا یکی دیگر انتخاب کنید."
@@ -567,7 +596,7 @@ msgstr "این لقب در حال حاضر ثبت شده است. لطفا یکی
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "لقب نا معتبر."
@@ -579,7 +608,7 @@ msgstr "لقب نا معتبر."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "صفحهٔ خانگی یک نشانی معتبر نیست."
@@ -589,7 +618,7 @@ msgstr "صفحهٔ خانگی یک نشانی معتبر نیست."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -616,7 +645,7 @@ msgstr[0] "توصیف خیلی طولانی است (حداکثر %d نویسه)"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -739,7 +768,7 @@ msgid "Upload failed."
 msgstr "بارگذاری شکست خورد."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:101
+#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "رمز ورود مشخص شده نامعتبر است."
@@ -762,18 +791,19 @@ msgid "Request token already authorized."
 msgstr "شما شناسایی نشده اید."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -795,16 +825,17 @@ msgstr "هنگام افزودن کاربر برنامهٔ OAuth در پایگا
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "ارسال غیر قابل انتظار فرم."
 
@@ -858,7 +889,7 @@ msgstr "حساب کاربری"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -879,7 +910,7 @@ msgstr "گذرواژه"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -953,6 +984,7 @@ 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
@@ -972,40 +1004,50 @@ msgstr "نمی توانید پیام خود را تکرار کنید."
 msgid "Already repeated that notice."
 msgstr "قبلا آن پیام تکرار شده است."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "رابط مورد نظر پیدا نشد."
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "وضعیت حذف شد."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "هیچ وضعیتی با آن شناسه یافت نشد."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "نمی‌توان این پیام را پاک کرد."
 
-#: actions/apistatusesshow.php:243
+#. 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 "پیام را پاک کن"
@@ -1137,51 +1179,49 @@ msgstr "تنها کاربران می تواند صندوق نامهٔ خودشا
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "پیدا کردن محتوای پیام‌ها"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:406
+#: actions/apitimelineuser.php:409
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "پیامی با آن شناسه وجود ندارد."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1193,108 +1233,116 @@ msgstr "روش API در دست ساخت."
 msgid "User not found."
 msgstr "رابط مورد نظر پیدا نشد."
 
-#: actions/atompubfavoritefeed.php:70
-#, fuzzy
-msgid "No such profile"
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
+msgid "No such profile."
 msgstr "چنین نمایه‌ای وجود ندارد."
 
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#. 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 "Can't add someone else's subscription"
+msgid "Cannot add someone else's subscription."
 msgstr "نمی‌توان اشتراک تازه‌ای افزود."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-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 "پیدا کردن محتوای پیام‌ها"
 
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#. 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 "پیدا کردن محتوای پیام‌ها"
 
-#: actions/atompubfavoritefeed.php:256
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "ناشناخته"
 
-#: actions/atompubfavoritefeed.php:263
+#. TRANS: Client exception thrown when trying favorite an already favorited notice.
+#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "افزودن به برگزیده‌ها"
 
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
-msgid "No such profile."
-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"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "هست عضو %s گروه"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "نمی‌توان اشتراک تازه‌ای افزود."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:241
-msgid "Can only handle Join activities."
-msgstr ""
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
+msgstr "پیدا کردن محتوای پیام‌ها"
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "ناشناخته"
 
-#: actions/atompubmembershipfeed.php:263
+#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
+#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "همهٔ اعضا"
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr "نمی‌توان پیام برگزیده را حذف کرد."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "چنین گروهی وجود ندارد."
 
-#: actions/atompubshowmembership.php:90
+#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
+#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member"
 msgstr "همهٔ اعضا"
 
-#: actions/atompubshowmembership.php:115
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "Method not supported"
+msgid "HTTP method not supported"
 msgstr "رابط مورد نظر پیدا نشد."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1302,40 +1350,37 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
-msgid "No such profile id: %d"
+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"
+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"
+msgid "Cannot delete someone else's subscription."
 msgstr "نمی‌توان اشتراک را ذخیره کرد."
 
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "افراد مشترک %s"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
 msgstr "نوع فایل پشتیبانی نشده"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1346,10 +1391,11 @@ msgstr "چنین پیوستی وجود ندارد."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "لقبی وجود ندارد."
@@ -1381,30 +1427,36 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "تنظیمات چهره"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "اصلی"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "پیش‌نمایش"
 
@@ -1443,7 +1495,8 @@ msgstr ""
 "یک مربع از عکس خود را انتخاب کنید تا به عنوان تصویر چهرهٔ شما انتخاب شود."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "فایل اطلاعات خود را گم کرده ایم."
 
@@ -1462,7 +1515,7 @@ msgstr "به روز رسانی چهره موفقیت آمیر نبود."
 msgid "Avatar deleted."
 msgstr "چهره پاک شد."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1565,6 +1618,7 @@ msgstr "ذخیرهٔ ردیف اطلاعات شکست خورد."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1574,7 +1628,7 @@ msgstr "ذخیرهٔ ردیف اطلاعات شکست خورد."
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1655,23 +1709,6 @@ msgstr "نوع نشانی نامشخص است %s."
 msgid "That address has already been confirmed."
 msgstr "آن نشانی در حال حاضر تصدیق شده است."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-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
@@ -1733,7 +1770,7 @@ msgid "Account deleted."
 msgstr "چهره پاک شد."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "ساختن یک جساب‌کاربری"
@@ -2104,7 +2141,7 @@ msgid "Reset back to default"
 msgstr "برگشت به حالت پیش گزیده"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2220,14 +2257,16 @@ msgid "Edit %s group"
 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:70 actions/newgroup.php:65
 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 when trying to change group logo settings while not being a group admin.
 #: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "برای ویرایش گروه باید یک مدیر باشید."
 
@@ -2288,8 +2327,8 @@ msgstr "نشانی پست الکترونیکی تایید شدهٔ کنونی"
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "حذف"
@@ -2314,15 +2353,15 @@ msgstr "نشانی پست الکترونیکی، مانند «UserName@example.o
 #. 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "پست الکترونیک ورودی"
 
@@ -2333,14 +2372,14 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "نشانی جدید برای فرستادن پیام ایجاد کن؛ نشانی قبلی لغو می‌شود."
 
@@ -2353,7 +2392,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "تازه"
@@ -2429,9 +2468,10 @@ msgstr "این نشانی در حال حاضر متعلق به فرد دیگری
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, fuzzy
+msgid "Could not insert confirmation code."
 msgstr "نمی‌توان کد تایید را اضافه کرد."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
@@ -2446,8 +2486,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "هیچ تاییدی برای فسخ کردن وجود ندارد."
 
@@ -2458,8 +2498,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+msgid "Could not delete email confirmation."
 msgstr "نمی‌توان تصدیق پست الکترونیک را پاک کرد."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
@@ -2478,24 +2519,25 @@ msgstr "آن نشانی شما نیست."
 msgid "The email address was removed."
 msgstr "نشانی پست الکترونیکی پاک شده است."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, fuzzy
+msgid "Could not update user record."
 msgstr "نمی‌توان اطلاعات کاربر را به روز کرد."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 msgid "Incoming email address removed."
 msgstr "نشانی ورودی پاک شد."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "نشانی ورودی جدید اضافه شد."
 
@@ -2594,7 +2636,7 @@ msgstr "انتظار چنین واکنشی وجود نداشت!"
 msgid "User being listened to does not exist."
 msgstr "کاربری که دنبالش هستید وجود ندارد."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "شما می‌توانید از دنبال کردن محلی استفاده کنید!"
 
@@ -2722,44 +2764,46 @@ msgid ""
 "palette of your choice."
 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "نمی‌توان ظاهر را به روز کرد."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "ترجیحات طرح ذخیره شد."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "نشان گروه"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr "شما می‌توانید یک نشان برای گروه خود با بیشینه حجم %s بفرستید."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "پایین‌گذاری"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "برش"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr "یک ناحیه‌ی مربع از تصویر را انتخاب کنید تا به عنوان نشان انتخاب شود."
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "نشان به‌هنگام‌سازی شد."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "به‌هنگام‌سازی نشان شکست خورد."
 
@@ -2900,14 +2944,14 @@ msgid "Error removing the block."
 msgstr "اشکال در پاکسازی"
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2917,23 +2961,23 @@ msgstr ""
 "یا Gtalk ارسال/دریافت کنید. نشانی خود را در این قسمت تنظیم کنید"
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "پیام‌رسان فوری در دسترس نیست."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "نشانی پیام‌رسان فوری"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "نشانی Jabber/GTalk تایید شده کنونی"
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2947,7 +2991,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2957,63 +3001,63 @@ msgstr ""
 "به فهرست دوستان خود در کارگیر پیام‌رسان فوری‌تان یا در GTalk مطمئن شوید."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "ترجیحات پیام‌رسان فوری"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "پیام‌ها را از راه Jabber/GTalk برای من بفرست."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "هر وقت که وضعیت Jabber/Gtalk من تغییر کرد، یک پیام بفرست."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr "پاسخ کسانی که من آن‌ها را دنبال نمی‌کنم را با Jabber/Gtalk برایم بفرست."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "یک شناسهٔ کوچک برای Jabber/Gtalk من منتشر کن."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "تنظیمات ذخیره شد."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "هیچ شناسهٔ Jabber ای وجود ندارد."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "نمی‌توان شناسهٔ Jabber را تایید کرد"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "شناسهٔ Jabber درست نیست"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "این شناسه Jabber کنونی شماست."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID already belongs to another user."
 msgstr "شناسهٔ Jabber به یک کاربر دیگر مربوط است."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -3023,28 +3067,29 @@ msgstr ""
 "برای فرستادن پیام به شما، تایید کنید."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "نشانی پیام رسان اشتباه است."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:400
-msgid "Couldn't delete IM confirmation."
+#: actions/imsettings.php:391
+#, fuzzy
+msgid "Could not delete IM confirmation."
 msgstr "نمی‌توان تایید پیام‌رسان فوری را پاک کرد."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "این شناسهٔ Jabber شما نیست."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "نشانی پیام‌رسان فوری پاک شده است."
 
@@ -3267,107 +3312,107 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s گروه %2$s را ترک کرد"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr ""
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "متن خوشامدگویی نامعتبر است. بیشینهٔ طول متن ۲۵۵ نویسه است."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "خصوصی"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
 
@@ -4153,12 +4198,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:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "تنظیمات نمایه"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4166,19 +4211,19 @@ msgstr ""
 "در مورد شما بدانند."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "اطلاعات نمایه"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 #, 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4186,13 +4231,13 @@ msgstr "نام‌کامل"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "صفحهٔ خانگی"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "نشانی اینترنتی صفحهٔ خانگی، وبلاگ یا نمایه‌تان در یک وب‌گاه دیگر"
@@ -4200,26 +4245,26 @@ 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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, 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:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "شرح‌حال"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4227,51 +4272,51 @@ msgid "Location"
 msgstr "موقعیت"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "مکانی که شما در آن هستید، مانند «شهر، ایالت (یا استان)، کشور»"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:157
+#: actions/profilesettings.php:153
 msgid "Share my current location when posting notices"
 msgstr "مکان کنونی من هنگام فرستادن پیام‌ها به اشتراک گذاشته شود"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "برچسب‌ها"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 "برچسب‌ها برای خودتان (حروف، اعداد، -، .، و _) جدا شده با کاما- یا فاصله-"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "زبان"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "زبان برگزیده"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "منطقهٔ‌زمانی"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 msgid "What timezone are you normally in?"
 msgstr "شما معمولا در کدام منطقهٔ زمانی هستید؟"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4280,59 +4325,56 @@ 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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, 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:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "منطقهٔ زمانی انتخاب نشده است."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:276
 #, 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, 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:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, fuzzy
+msgid "Could not save location prefs."
 msgstr "نمی‌توان تنظیمات مکانی را تنظیم کرد."
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "نمی‌توان نمایه را ذخیره کرد."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
-msgstr "نمی‌توان نشان را ذخیره کرد."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "تنظیمات ذخیره شد."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "ساختن یک جساب‌کاربری"
@@ -4723,7 +4765,7 @@ msgstr ""
 "(شما هر لحظه باید یک پیام با پست الکترونیکی با راهنمای چگونگی تایید نشانی "
 "پست الکترونیک‌تان دریافت کنید.)"
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4734,74 +4776,77 @@ msgstr ""
 "ثبت کنید[(%%action.register%%). اگر شما یک حساب در یک ]وب‌گاه میکروبلاگینگ "
 "سازگار[(%%doc.openmublog%%) دارید، نشانی نمایهٔ خود را در زیر وارد کنید."
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "اشتراک از راه دور"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "اشتراک یک کاربر از راه دور"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "نام کاربری کاربر"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "نام کاربری، کاربری که می خواهید او را دنبال کنید"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "نشانی نمایه"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "نشانی اینترنتی نمایهٔ شما در سرویس میکروبلاگینگ سازگار دیگری"
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "اشتراک"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "نشانی اینترنتی نمایه نامعتبر است (فرمت نامناسب است)"
 
-#: actions/remotesubscribe.php:168
+#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "این یک نشانی نمایهٔ صحیح نیست (هیچ سند YADIS وجود ندارد و یا XRDS مشخص شده "
 "نامعتبر است)."
 
-#: actions/remotesubscribe.php:176
-msgid "That’s a local profile! Login to subscribe."
+#: actions/remotesubscribe.php:175
+#, fuzzy
+msgid "That is a local profile! Login to subscribe."
 msgstr "این یک نمایهٔ محلی است! برای اشتراک وارد شوید."
 
-#: actions/remotesubscribe.php:183
-msgid "Couldn’t get a request token."
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
 msgstr "نمی‌توان یک نشانهٔ درخواست را به‌دست آورد."
 
-#: actions/repeat.php:57
+#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "تنها کاربران وارد شده می توانند پیام‌ها را تکرار کنند."
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "هیچ پیامی مشخص نشده است."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "شما نمی‌توانید پیام خودتان را تکرار کنید."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "شما قبلا آن پیام را تکرار کرده‌اید."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "تکرار شده"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "تکرار شد!"
 
@@ -5571,71 +5616,71 @@ msgid "Save site notice"
 msgstr "ذخیرهٔ پیام وب‌گاه"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "تنظیمات پیامک"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "پیامک در دسترس نیست."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "نشانی پیامک"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "شمارهٔ تلفن با قابلیت فرستادن پیامک که در حال حاضر تایید شده است."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:133
+#: actions/smssettings.php:129
 msgid "Awaiting confirmation on this phone number."
 msgstr "منتظر تاییدیه برای این شماره تلفن."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "کد تاییدیه"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 msgid "Enter the code you received on your phone."
 msgstr "کدی را که در گوشی‌تان دریافت کردید، وارد کنید"
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "تایید"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "شمارهٔ تماس پیامک"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "شماره تلفن، بدون نشانه گذاری یا فاصله، با کد منطقه"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "ترجیحات پیامک"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5644,32 +5689,32 @@ msgstr ""
 "زیادی از طرف اپراتورم بشوم."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
 msgid "SMS preferences saved."
 msgstr "تنظیمات پیامک ذخیره شد."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "بدون شماره تلفن."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr "هیچ اپراتوری انتخاب نشده است."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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."
@@ -5678,39 +5723,39 @@ msgstr ""
 "کد و راهنمای استفاده از آن بررسی کنید."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
+#: actions/smssettings.php:404
 msgid "That is the wrong confirmation number."
 msgstr "این کد تاییدیه نادرست است."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 msgid "That is not your phone number."
 msgstr "این شمارهٔ تلفن شما نیست."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
+#: actions/smssettings.php:460
 msgid "The SMS phone number was removed."
 msgstr "شماره تماس پیامک پاک شد."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "اپراتور موبایل"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5721,7 +5766,7 @@ msgstr ""
 "بفرستید تا ما باخبر شویم."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "کدی وارد نشد"
 
@@ -5986,10 +6031,6 @@ msgstr ""
 "شما تنها می‌توانید افرادی را برچسب‌دار کنید که مشترک آن‌ها هستید یا آن‌ها مشترک "
 "شما هستند."
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "نمی‌توان برچسب‌ها را ذخیره کرد."
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "از این روش برای افزودن برچسب به مشترک‌ها یا اشتراک‌هایتان استفاده کنید."
@@ -6215,12 +6256,12 @@ msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "نوع تصویر برای نشانی اینترنتی چهره نادرست است «%s»."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "طراحی نمایه"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6228,7 +6269,7 @@ msgstr ""
 "شیوهٔ نمایش نمایهٔ خود را با یک تصویر پیش‌زمینه و یک رنگ از جعبهٔ رنگ‌ها به "
 "انتخاب خودتان سفارشی‌سازی کنید."
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr "از هات داگ خود لذت ببرید!"
 
@@ -7189,23 +7230,27 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "پیغام نمی تواند درج گردد"
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
@@ -7858,6 +7903,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 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
+msgid "Couldn't update your design."
+msgstr "نمی‌توان ظاهر را به روز کرد."
+
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
 #: lib/designsettings.php:433
 msgid "Design defaults restored."
@@ -9198,3 +9249,28 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "No such profile"
+#~ msgstr "چنین نمایه‌ای وجود ندارد."
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "هست عضو %s گروه"
+
+#, fuzzy
+#~ msgid "Method not supported"
+#~ msgstr "رابط مورد نظر پیدا نشد."
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "افراد مشترک %s"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "نمی‌توان کاربر را به روز کرد."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "نمی‌توان نمایه را ذخیره کرد."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "نمی‌توان نشان را ذخیره کرد."
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 6d6904e95a..2da695ebd5 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -14,17 +14,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:34:46+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05:26+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 (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -97,9 +97,9 @@ msgstr "Profiilikuva-asetukset"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -120,6 +120,8 @@ msgstr "Sivua ei ole."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -140,8 +142,8 @@ msgstr "Sivua ei ole."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -152,7 +154,7 @@ msgstr "Sivua ei ole."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -318,7 +320,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Käyttäjän päivitys epäonnistui."
 
@@ -340,7 +356,8 @@ 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.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "Profiilin tallennus epäonnistui."
 
@@ -372,8 +389,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "Ulkoasun tallennus epäonnistui."
 
@@ -381,14 +398,18 @@ 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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 #, fuzzy
 msgid "Could not update your design."
 msgstr "Ei voitu päivittää käyttäjää."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+msgctxt "ATOM"
 msgid "Main"
 msgstr ""
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -399,31 +420,38 @@ msgstr ""
 msgid "%s timeline"
 msgstr "%s aikajana"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Käyttäjän %s tilaukset"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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 "Suosikit"
 
-#: actions/apiatomservice.php:123
+#. 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 "Ryhmän %s jäsenet"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:104
+#: 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:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Käyttäjän esto epäonnistui."
 
@@ -565,7 +593,7 @@ msgstr "Ei voitu päivittää käyttäjää."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
@@ -575,7 +603,7 @@ msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Tuo ei ole kelvollinen tunnus."
@@ -587,7 +615,7 @@ msgstr "Tuo ei ole kelvollinen tunnus."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Kotisivun verkko-osoite ei ole toimiva."
@@ -597,7 +625,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -625,7 +653,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -749,7 +777,7 @@ 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:101
+#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "Päivityksen sisältö ei kelpaa"
@@ -772,18 +800,19 @@ msgid "Request token already authorized."
 msgstr "Sinulla ei ole valtuutusta tähän."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -808,16 +837,17 @@ msgstr "Tietokantavirhe tallennettaessa risutagiä: %s"
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Odottamaton lomakkeen lähetys."
 
@@ -863,7 +893,7 @@ msgstr "Käyttäjätili"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -884,7 +914,7 @@ msgstr "Salasana"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -957,6 +987,7 @@ msgstr "Et voi poistaa toisen käyttäjän päivitystä."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: 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
@@ -977,40 +1008,50 @@ msgstr "Ilmoituksia ei voi pistää päälle."
 msgid "Already repeated that notice."
 msgstr "Tätä päivitystä ei voi poistaa."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "API-metodia ei löytynyt."
 
-#: actions/apistatusesshow.php:141
+#. 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 "Formaattia ei ole tuettu."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:152
+#: 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:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "Tätä päivitystä ei voi poistaa."
 
-#: actions/apistatusesshow.php:243
+#. 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 "Poista päivitys"
@@ -1145,51 +1186,49 @@ msgstr "Vain käyttäjä voi lukea omaa postilaatikkoaan."
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Hae päivityksien sisällöstä"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:406
+#: actions/apitimelineuser.php:409
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Ei profiilia tuolla id:llä."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1200,109 +1239,117 @@ msgstr "API-metodi on työn alla!"
 msgid "User not found."
 msgstr "API-metodia ei löytynyt."
 
-#: actions/atompubfavoritefeed.php:70
-#, fuzzy
-msgid "No such profile"
-msgstr "Tiedostoa ei ole."
-
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-#, fuzzy
-msgid "Can't add someone else's subscription"
-msgstr "Ei voitu lisätä uutta tilausta."
-
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
-#, fuzzy
-msgid "Can only fave notices."
-msgstr "Hae päivityksien sisällöstä"
-
-#: actions/atompubfavoritefeed.php:256
-#, fuzzy
-msgid "Unknown note."
-msgstr "Tuntematon toiminto"
-
-#: actions/atompubfavoritefeed.php:263
-#, fuzzy
-msgid "Already a favorite."
-msgstr "Lisää suosikkeihin"
-
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
 #, fuzzy
 msgid "No such profile."
 msgstr "Tiedostoa ei ole."
 
+#. 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
+#, fuzzy
+msgid "Can only handle favorite activities."
+msgstr "Hae päivityksien sisällöstä"
+
+#. 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 "Hae päivityksien sisällöstä"
+
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+#: actions/atompubfavoritefeed.php:259
+#, fuzzy
+msgid "Unknown note."
+msgstr "Tuntematon toiminto"
+
+#. TRANS: Client exception thrown when trying favorite an already favorited notice.
+#: actions/atompubfavoritefeed.php:267
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Lisää suosikkeihin"
+
+#. 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"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "Ryhmät, joiden jäsen %s on"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "Ei voitu lisätä uutta tilausta."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:241
-msgid "Can only handle Join activities."
-msgstr ""
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
+msgstr "Hae päivityksien sisällöstä"
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Tuntematon toiminto"
 
-#: actions/atompubmembershipfeed.php:263
+#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
+#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "Kaikki jäsenet"
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:89
+#. TRANS: Client exception thrown when referencing a non-existing favorite.
+#: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
 msgstr "Tiedostoa ei ole."
 
+#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
 #: actions/atompubshowfavorite.php:151
 #, fuzzy
-msgid "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr "Ei voitu poistaa suosikkia."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "Tuota ryhmää ei ole."
 
-#: actions/atompubshowmembership.php:90
+#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
+#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member"
 msgstr "Kaikki jäsenet"
 
-#: actions/atompubshowmembership.php:115
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "Method not supported"
+msgid "HTTP method not supported"
 msgstr "API-metodia ei löytynyt."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1310,40 +1357,37 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
-msgid "No such profile id: %d"
+msgid "No such profile id: %d."
 msgstr "Tiedostoa ei ole."
 
 #. 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"
+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"
+msgid "Cannot delete someone else's subscription."
 msgstr "Tilausta ei onnistuttu tallentamaan."
 
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "Ihmiset jotka ovat käyttäjän %s tilaajia"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
 msgstr "Tunnistamaton tiedoston tyyppi"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1354,10 +1398,11 @@ msgstr "Liitettä ei ole."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Tunnusta ei ole."
@@ -1388,30 +1433,36 @@ msgid "You can upload your personal avatar. The maximum file size is %s."
 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "Profiilikuva-asetukset"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "Alkuperäinen"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "Esikatselu"
 
@@ -1449,7 +1500,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "Tiedoston data hävisi."
 
@@ -1468,7 +1520,7 @@ msgstr "Profiilikuvan päivittäminen epäonnistui."
 msgid "Avatar deleted."
 msgstr "Kuva poistettu."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1567,6 +1619,7 @@ msgstr "Käyttäjän estotiedon tallennus epäonnistui."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1576,7 +1629,7 @@ msgstr "Käyttäjän estotiedon tallennus epäonnistui."
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1657,23 +1710,6 @@ msgstr "Tuntematon osoitetyyppi %s "
 msgid "That address has already been confirmed."
 msgstr "Tämä osoite on jo vahvistettu."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-msgstr "Ei voitu päivittää käyttäjää."
-
 #. 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
@@ -1735,7 +1771,7 @@ msgid "Account deleted."
 msgstr "Kuva poistettu."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "Luo uusi ryhmä"
@@ -2109,7 +2145,7 @@ msgid "Reset back to default"
 msgstr "Käytä oletusasetuksia"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2233,14 +2269,16 @@ msgid "Edit %s group"
 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:70 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: Client error displayed trying to edit a group while not 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:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr ""
 "Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja."
@@ -2303,8 +2341,8 @@ msgstr "Tämän hetken vahvistettu sähköpostiosoite."
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Poista"
@@ -2330,15 +2368,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Saapuva sähköposti"
 
@@ -2349,13 +2387,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 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 "
@@ -2370,7 +2408,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 #, fuzzy
 msgctxt "BUTTON"
 msgid "New"
@@ -2446,9 +2484,10 @@ 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, 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.
@@ -2464,8 +2503,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Avoimia vahvistuksia ei ole peruutettavana."
 
@@ -2477,8 +2516,9 @@ msgstr "Tämä on väärä pikaviestiosoite."
 
 #. 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+msgid "Could not delete email confirmation."
 msgstr "Ei voitu poistaa sähköpostivahvistusta."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
@@ -2497,24 +2537,25 @@ msgstr "Tämä ei ole sähköpostiosoitteesi."
 msgid "The email address was removed."
 msgstr "Saapuvan sähköpostin osoite poistettu."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, fuzzy
+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:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 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:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "Uusi saapuvan sähköpostin osoite lisätty."
 
@@ -2608,7 +2649,7 @@ msgstr "Odottamaton vastaus saatu!"
 msgid "User being listened to does not exist."
 msgstr "Käyttäjää jota seurataan ei ole olemassa."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Voit käyttää paikallista tilausta!"
 
@@ -2740,44 +2781,46 @@ msgid ""
 "palette of your choice."
 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "Ei voitu päivittää sinun sivusi ulkoasua."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "Ulkoasuasetukset tallennettu."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "Ryhmän logo"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, fuzzy, 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."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "Lataa"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "Rajaa"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr "Valitse neliön muotoinen alue kuvasta logokuvaksi"
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "Logo päivitetty."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "Logon päivittäminen epäonnistui."
 
@@ -2910,14 +2953,14 @@ msgid "Error removing the block."
 msgstr "Tapahtui virhe, kun estoa poistettiin."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2927,23 +2970,23 @@ msgstr ""
 "im%%) käyttäen. Alla voit määrittää osoitteesi ja asetuksesi. "
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "Pikaviestin ei ole käytettävissä."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "Sähköpostiosoitteet"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Tämän hetken vahvistettu Jabber/GTalk -osoite."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2958,7 +3001,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2969,65 +3012,65 @@ msgstr ""
 "GTalkissa."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Asetukset tallennettu."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Lähetä minulle päivityksiä Jabberilla/GTalkilla."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Lähetä päivitys kun Jabber/GTalk -tilatietoni vaihtuu."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Lähetä Jabberilla/GTalkilla sellaistenkin ihmisten vastaukset, joita en ole "
 "tilannut. "
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Julkaise MicroID Jabber/GTalk-osoitteelleni."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Asetukset tallennettu."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Ei Jabber ID -osoitetta"
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "Ei voida normalisoida Jabber ID -tunnusta"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "Tuo ei ole kelvollinen Jabber ID."
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "Tämä on jo Jabber ID -tunnuksesi."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID 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.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -3037,29 +3080,29 @@ msgstr ""
 "antaa osoitteelle %s oikeus lähettää viestejä sinulle."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 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:400
+#: actions/imsettings.php:391
 #, fuzzy
-msgid "Couldn't delete IM confirmation."
+msgid "Could not delete IM confirmation."
 msgstr "Ei voitu poistaa sähköpostivahvistusta."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Tämä ei ole Jabber ID-tunnuksesi."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "Saapuvan sähköpostin osoite poistettu."
 
@@ -3290,108 +3333,108 @@ 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:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr ""
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 #, fuzzy
 msgid "Private"
 msgstr "Yksityisyys"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
 
@@ -4197,12 +4240,12 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "Profiiliasetukset"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4210,12 +4253,12 @@ msgstr ""
 "enemmän."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "Profiilitieto"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4224,7 +4267,7 @@ msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4232,13 +4275,13 @@ msgstr "Koko nimi"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Kotisivu"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: 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."
@@ -4246,7 +4289,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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4254,19 +4297,19 @@ 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:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "Tietoja"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4274,25 +4317,25 @@ msgid "Location"
 msgstr "Kotipaikka"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 #, 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:157
+#: actions/profilesettings.php:153
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "Tagit"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4300,27 +4343,27 @@ msgstr ""
 "ääkköset, numeroita, -, ., ja _), pilkulla tai välilyönnillä erotettuna"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "Kieli"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "Ensisijainen kieli"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "Aikavyöhyke"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 msgid "What timezone are you normally in?"
 msgstr "Millä aikavyöhykkeellä olet tavallisesti?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4330,7 +4373,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4338,53 +4381,49 @@ 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:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 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:281
+#: actions/profilesettings.php:276
 #, 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, 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:409
+#: actions/profilesettings.php:404
 #, fuzzy
-msgid "Couldn't save location prefs."
+msgid "Could not save location prefs."
 msgstr "Tageja ei voitu tallentaa."
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "Ei voitu tallentaa profiilia."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
-msgstr "Tageja ei voitu tallentaa."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Asetukset tallennettu."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Luo uusi ryhmä"
@@ -4774,7 +4813,7 @@ msgstr ""
 "(Saat pian sähköpostiisi viestin, jonka ohjeita seuraamalla voit vahvistaa "
 "sähköpostiosoitteesi.)"
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4786,81 +4825,82 @@ msgstr ""
 "jo käyttäjätunnus  jossain [yhteensopivassa mikroblogauspalvelussa](%%doc."
 "openmublog%%),  syötä profiilisi URL-osoite alla olevaan kenttään."
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Etätilaus"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Tilaa tämä etäkäyttäjä"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Käyttäjätunnus"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "Käyttäjän, jota haluat seurata, käyttäjätunnus"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Profiilin URL"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "Profiilisi URL-osoite toisessa yhteensopivassa mikroblogauspalvelussa"
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "Tilaa"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "Profiilin URL-osoite '%s' ei kelpaa (virheellinen muoto)."
 
-#: actions/remotesubscribe.php:168
+#: 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:176
-msgid "That’s a local profile! Login to subscribe."
+#: 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:183
+#: actions/remotesubscribe.php:182
 #, fuzzy
-msgid "Couldn’t get a request token."
+msgid "Could not get a request token."
 msgstr "Ei saatu request tokenia."
 
-#: actions/repeat.php:57
+#: 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:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 #, fuzzy
 msgid "No notice specified."
 msgstr "Profiilia ei ole määritelty."
 
-#: actions/repeat.php:76
+#: actions/repeat.php:75
 #, fuzzy
-msgid "You can't repeat your own notice."
+msgid "You cannot repeat your own notice."
 msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Sinä kuulut jo tähän ryhmään."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 #, fuzzy
 msgid "Repeated"
 msgstr "Luotu"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 #, fuzzy
 msgid "Repeated!"
 msgstr "Luotu"
@@ -5623,72 +5663,72 @@ msgid "Save site notice"
 msgstr "Palvelun ilmoitus"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "Profiilikuva-asetukset"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "SMS ei ole käytettävissä."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "Sähköpostiosoitteet"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 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:133
+#: actions/smssettings.php:129
 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:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "Vahvistuskoodi"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 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:148
+#: actions/smssettings.php:144
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Vahvista"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "Puhelinnumeroa ei ole."
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 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:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "Asetukset tallennettu."
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5697,33 +5737,33 @@ msgstr ""
 "tästä matkapuhelinoperaattoriltani."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
 #, fuzzy
 msgid "SMS preferences saved."
 msgstr "Asetukset tallennettu."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "Puhelinnumeroa ei ole."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr "Operaattoria ei ole valittu."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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."
@@ -5732,40 +5772,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:413
+#: actions/smssettings.php:404
 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:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 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:470
+#: actions/smssettings.php:460
 #, fuzzy
 msgid "The SMS phone number was removed."
 msgstr "SMS puhelinnumero"
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "Matkapuhelinoperaattori"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5776,7 +5816,7 @@ msgstr ""
 "sähköpostia meille osoitteeseen %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "Koodia ei ole syötetty."
 
@@ -6032,10 +6072,6 @@ msgstr ""
 "Voit tagata ainoastaan ihmisiä, joita tilaat tai jotka tilaavat sinun "
 "päivityksiäsi."
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "Tagien tallennus epäonnistui."
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
@@ -6280,19 +6316,19 @@ 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:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 #, fuzzy
 msgid "Profile design"
 msgstr "Profiiliasetukset"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr ""
 
@@ -7274,24 +7310,28 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Viestin tallennus ei onnistunut."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
@@ -7919,6 +7959,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Vaihda"
 
+#. 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
+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
 #, fuzzy
@@ -9207,3 +9253,28 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "No such profile"
+#~ msgstr "Tiedostoa ei ole."
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "Ryhmät, joiden jäsen %s on"
+
+#, fuzzy
+#~ msgid "Method not supported"
+#~ msgstr "API-metodia ei löytynyt."
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "Ihmiset jotka ovat käyttäjän %s tilaajia"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "Ei voitu päivittää käyttäjää."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "Ei voitu tallentaa profiilia."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "Tageja ei voitu tallentaa."
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 4a62098d98..34823b0cb7 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-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:34:47+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05: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-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -98,9 +98,9 @@ msgstr "Sauvegarder les paramètres d’accès"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -121,6 +121,8 @@ msgstr "Page non trouvée."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -141,8 +143,8 @@ msgstr "Page non trouvée."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -153,7 +155,7 @@ msgstr "Page non trouvée."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -324,7 +326,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Impossible de mettre à jour l’utilisateur."
 
@@ -346,7 +362,8 @@ msgid "User has no profile."
 msgstr "Aucun profil ne correspond à cet utilisateur."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "Impossible d’enregistrer le profil."
 
@@ -382,8 +399,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "Impossible de sauvegarder les parmètres de la conception."
 
@@ -391,13 +408,18 @@ 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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Impossible de mettre à jour votre conception."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+#, fuzzy
+msgctxt "ATOM"
 msgid "Main"
 msgstr "Principal"
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -408,31 +430,38 @@ msgstr "Principal"
 msgid "%s timeline"
 msgstr "Activité de %s"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Abonnements de %s"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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 "Favoris"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: 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:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Le blocage de l’utilisateur a échoué."
 
@@ -572,7 +601,7 @@ msgstr "Impossible de trouver l’utilisateur cible."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudo déjà utilisé. Essayez-en un autre."
@@ -582,7 +611,7 @@ msgstr "Pseudo déjà utilisé. Essayez-en un autre."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Pseudo invalide."
@@ -594,7 +623,7 @@ msgstr "Pseudo invalide."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "L’adresse du site personnel n’est pas un URL valide. "
@@ -604,7 +633,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: 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)."
@@ -631,7 +660,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "L’emplacement est trop long (limité à 255 caractères maximum)."
@@ -754,7 +783,7 @@ 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:101
+#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Jeton de requête ou de vérification invalide."
 
@@ -774,18 +803,19 @@ msgid "Request token already authorized."
 msgstr "Le jeton de requête a déjà été autorisé."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -810,16 +840,17 @@ msgstr ""
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Soumission de formulaire inattendue."
 
@@ -872,7 +903,7 @@ msgstr "Compte"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -893,7 +924,7 @@ msgstr "Mot de passe"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -967,6 +998,7 @@ msgstr "Vous ne pouvez pas supprimer le statut d’un autre utilisateur."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: 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
@@ -986,39 +1018,49 @@ msgstr "Vous ne pouvez pas reprendre votre propre avis."
 msgid "Already repeated that notice."
 msgstr "Vous avez déjà repris cet avis."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "Méthode HTTP non trouvée !"
 
-#: actions/apistatusesshow.php:141
+#. 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 non supporté : %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:152
+#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Statut supprimé."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Aucun statut trouvé avec cet identifiant."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "Impossible de supprimer cet avis."
 
-#: actions/apistatusesshow.php:243
+#. 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"
@@ -1156,54 +1198,52 @@ msgstr "Seul l’utilisateur peut ajouter des éléments son flux."
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "N’accepter que des AtomPub pour les flux atom."
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 #, fuzzy
 msgid "Atom post must not be empty."
 msgstr "Une publication Atom doit être une entrée « Atom »."
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 #, 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:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 #, 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:347
 #, 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.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, 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:406
+#: actions/apitimelineuser.php:409
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "L’avis d’URI « %s » existe déjà."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr "Publication AtomPost avec l’URI d’attention inconnu %s"
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1214,110 +1254,116 @@ msgstr "Méthode API en construction."
 msgid "User not found."
 msgstr "Page non trouvée."
 
-#: actions/atompubfavoritefeed.php:70
-#, fuzzy
-msgid "No such profile"
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
+msgid "No such profile."
 msgstr "Profil non-trouvé."
 
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#. 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 "Can't add someone else's subscription"
+msgid "Cannot add someone else's subscription."
 msgstr "Impossible d’insérer un nouvel abonnement."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
+#. 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."
+msgid "Can only handle favorite activities."
 msgstr "Ne peut gérer que les activités de publication."
 
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#. 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."
 
-#: actions/atompubfavoritefeed.php:256
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "Inconnu"
 
-#: actions/atompubfavoritefeed.php:263
+#. TRANS: Client exception thrown when trying favorite an already favorited notice.
+#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "Ajouter aux favoris"
 
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Profil non-trouvé."
-
+#. 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"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "Groupes de %s"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "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:241
+#: actions/atompubmembershipfeed.php:242
 #, fuzzy
-msgid "Can only handle Join activities."
+msgid "Can only handle join activities."
 msgstr "Ne peut gérer que les activités de publication."
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Inconnu"
 
-#: actions/atompubmembershipfeed.php:263
+#. 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"
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr "Impossible de supprimer le favori."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "Aucun groupe trouvé."
 
-#: actions/atompubshowmembership.php:90
+#. 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"
 
-#: actions/atompubshowmembership.php:115
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "Method not supported"
+msgid "HTTP method not supported"
 msgstr "Méthode HTTP non trouvée !"
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1325,41 +1371,38 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
-msgid "No such profile id: %d"
+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"
+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"
+msgid "Cannot delete someone else's subscription."
 msgstr "Impossible de supprimer l’abonnement à soi-même."
 
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "Abonnés de %s"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 #, fuzzy
 msgid "Can only handle Follow activities."
 msgstr "Ne peut gérer que les activités de publication."
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
 msgstr "Type de fichier inconnu"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1370,10 +1413,11 @@ msgstr "Pièce jointe non trouvée."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Aucun pseudo."
@@ -1406,30 +1450,36 @@ msgstr ""
 "taille maximale du fichier est de %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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "Paramètres de l’avatar"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "Image originale"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "Aperçu"
 
@@ -1464,7 +1514,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "Données perdues."
 
@@ -1483,7 +1534,7 @@ msgstr "La mise à jour de l’avatar a échoué."
 msgid "Avatar deleted."
 msgstr "Avatar supprimé."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1585,6 +1636,7 @@ msgstr "Impossible d’enregistrer les informations de blocage."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1594,7 +1646,7 @@ msgstr "Impossible d’enregistrer les informations de blocage."
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1674,23 +1726,6 @@ msgstr "Type d’adresse non reconnu : %s."
 msgid "That address has already been confirmed."
 msgstr "Cette adresse a déjà été confirmée."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-msgstr "Impossible de mettre à jour l’utilisateur."
-
 #. 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
@@ -1751,7 +1786,7 @@ msgid "Account deleted."
 msgstr "Avatar supprimé."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "Créer un compte"
@@ -2115,7 +2150,7 @@ msgid "Reset back to default"
 msgstr "Revenir aux valeurs par défaut"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2227,14 +2262,16 @@ msgid "Edit %s group"
 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:70 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: Client error displayed trying to edit a group while not 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:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "Vous devez être administrateur pour modifier le groupe."
 
@@ -2295,8 +2332,8 @@ msgstr "Adresse courriel actuellement confirmée."
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Enlever"
@@ -2321,15 +2358,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Courriel entrant"
 
@@ -2340,13 +2377,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Nouvelle adresse courriel pour poster ; annule l’ancienne."
 
@@ -2359,7 +2396,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nouveau"
@@ -2435,9 +2472,10 @@ 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, 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.
@@ -2452,8 +2490,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Aucune confirmation à annuler."
 
@@ -2464,8 +2502,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, 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.
@@ -2484,24 +2523,25 @@ msgstr "Ceci n’est pas votre adresse courriel."
 msgid "The email address was removed."
 msgstr "L’adresse électronique a été supprimée."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, 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:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 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:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "Nouvelle adresse de courriel entrant ajoutée."
 
@@ -2600,7 +2640,7 @@ msgstr "Réponse inattendue !"
 msgid "User being listened to does not exist."
 msgstr "L’utilisateur suivi n’existe pas."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Vous pouvez utiliser l’abonnement local."
 
@@ -2731,22 +2771,19 @@ msgstr ""
 "Personnalisez l’apparence de votre groupe avec une image d’arrière plan et "
 "une palette de couleurs de votre choix"
 
-#. 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "Impossible de mettre à jour votre conception."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "Préférences de conception enregistrées."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "Logo du groupe"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2754,23 +2791,28 @@ msgstr ""
 "Vous pouvez choisir un logo pour votre groupe. La taille maximale du fichier "
 "est de %s."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "Transfert"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "Recadrer"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 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."
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "Logo mis à jour."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "La mise à jour du logo a échoué."
 
@@ -2913,14 +2955,14 @@ msgid "Error removing the block."
 msgstr "Erreur lors de l’annulation du blocage."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2931,23 +2973,23 @@ msgstr ""
 "dessous."
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "La messagerie instantanée n’est pas disponible."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "Adresse de messagerie instantanée"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Adresse Jabber/GTalk actuellement confirmée."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2962,7 +3004,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2973,66 +3015,66 @@ msgstr ""
 "GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Préférences de messagerie instantanée"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Envoyez-moi les avis par Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk 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:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk 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 IM preferences form.
-#: actions/imsettings.php:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publier un MicroID pour mon adresse Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Préférences enregistrées"
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Aucun identifiant Jabber"
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "Impossible d’utiliser cet identifiant Jabber"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "Identifiant Jabber invalide."
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "Vous utilisez déjà cet idenfiant Jabber."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID 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.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -3042,28 +3084,29 @@ 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:391
+#: actions/imsettings.php:382
 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:400
-msgid "Couldn't delete IM confirmation."
+#: actions/imsettings.php:391
+#, fuzzy
+msgid "Could not delete IM confirmation."
 msgstr "Impossible de supprimer la confirmation de messagerie instantanée."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Ceci n’est pas votre identifiant Jabber."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "L’adresse de messagerie instantanée a été supprimée."
 
@@ -3295,20 +3338,20 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s a quitté le groupe %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Licence"
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr "Licence de ce site StatusNet"
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr "Sélection de licence invalide."
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
@@ -3316,87 +3359,87 @@ msgstr ""
 "Vous devez spécifier le propriétaire du contenu lorsque vous utilisez la "
 "licence « Tous droits réservés »."
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Titre de licence invalide. La taille maximale est de 255 caractères."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr "URL de licence invalide."
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr "URL d’image de licence invalide."
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr "L’URL de la licence doit être vide ou valide."
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 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:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr "Sélection d’une licence"
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "Privé"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr "Tous droits réservés"
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr "Type"
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr "Sélectionner une licence"
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr "Détails de la licence"
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 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:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr "Titre de la licence"
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr "Le titre de la licence."
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr "URL de la licence"
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr "URL où obtenir plus d'informations sur la licence."
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr "URL de l’image de la licence"
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr "URL d’une image à afficher avec la licence."
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Enregistrer les paramètres de licence"
 
@@ -4178,12 +4221,12 @@ msgstr ""
 "$s »."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "Paramètres du profil"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4191,18 +4234,18 @@ msgstr ""
 "sache plus à votre sujet."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "Information de profil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4210,13 +4253,13 @@ msgstr "Nom complet"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Site personnel"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: 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."
@@ -4224,7 +4267,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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4232,19 +4275,19 @@ 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:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "Bio"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4252,24 +4295,24 @@ msgid "Location"
 msgstr "Emplacement"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 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:157
+#: actions/profilesettings.php:153
 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:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "Balises"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4277,27 +4320,27 @@ msgstr ""
 "virgules ou des espaces"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "Langue"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "Langue préférée"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "Fuseau horaire"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 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:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4307,7 +4350,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4315,51 +4358,48 @@ 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:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 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:281
+#: actions/profilesettings.php:276
 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, 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:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, 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 could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "Impossible d’enregistrer le profil."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Préférences enregistrées."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Créer un compte"
@@ -4762,7 +4802,7 @@ msgstr ""
 "(Vous recevrez bientôt un courriel contenant les instructions pour confirmer "
 "votre adresse.)"
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4774,73 +4814,76 @@ msgstr ""
 "sur un [site de micro-blogging compatible](%%doc.openmublog%%), entrez l’URL "
 "de votre profil ci-dessous."
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Abonnement à distance"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "S’abonner à un utilisateur distant"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Pseudo de l’utilisateur"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "Pseudo de l’utilisateur que vous voulez suivre"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "URL du profil"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL de votre profil sur un autre service de micro-blogging compatible"
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "S’abonner"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "URL du profil invalide (mauvais format)"
 
-#: actions/remotesubscribe.php:168
+#: 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:176
-msgid "That’s a local profile! Login to subscribe."
+#: 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:183
-msgid "Couldn’t get a request token."
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
 msgstr "Impossible d’obtenir un jeton de requête."
 
-#: actions/repeat.php:57
+#: 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:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Aucun avis n’a été spécifié."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "Vous ne pouvez pas reprendre votre propre avis."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Vous avez déjà repris cet avis."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Repris"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Repris !"
 
@@ -5619,13 +5662,13 @@ msgid "Save site notice"
 msgstr "Enregistrer l'avis du site"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "Paramètres SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
@@ -5633,59 +5676,59 @@ msgstr ""
 "name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "Les SMS ne sont pas disponibles."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "Adresse SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 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:133
+#: actions/smssettings.php:129
 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:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "Code de confirmation"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 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:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Confirmer"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 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:156
+#: actions/smssettings.php:152
 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:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "Préférences pour les SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5694,32 +5737,32 @@ msgstr ""
 "facture de téléphonie mobile."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
 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:338
+#: actions/smssettings.php:330
 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:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr "Aucun fournisseur sélectionné."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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."
@@ -5729,39 +5772,39 @@ msgstr ""
 "pour son utilisation."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
+#: actions/smssettings.php:404
 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:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 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:470
+#: actions/smssettings.php:460
 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:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "Fournisseur de téléphonie mobile"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5772,7 +5815,7 @@ msgstr ""
 "écrivez-nous à %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "Aucun code entré"
 
@@ -6037,10 +6080,6 @@ msgstr ""
 "Vous pouvez seulement marquer les personnes auxquelles vous êtes abonné(e) "
 "ou qui sont abonnées à vous."
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "Impossible d’enregistrer les marques."
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
@@ -6275,12 +6314,12 @@ 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:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "Conception de profil"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6288,7 +6327,7 @@ 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:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr "Bon appétit !"
 
@@ -7262,23 +7301,28 @@ msgstr ""
 "requête."
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 msgid "Could not issue access token."
 msgstr "Impossible d’émettre le jeton d’accès."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "Impossible de supprimer un jeton révoqué."
 
@@ -7936,6 +7980,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Réinitialiser"
 
+#. 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
+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
 msgid "Design defaults restored."
@@ -9302,3 +9352,31 @@ msgstr "XML invalide, racine XRD manquante."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Obtention de la sauvegarde depuis le fichier « %s »."
+
+#~ msgid "AtomPub post with unknown attention URI %s"
+#~ msgstr "Publication AtomPost avec l’URI d’attention inconnu %s"
+
+#, fuzzy
+#~ msgid "No such profile"
+#~ msgstr "Profil non-trouvé."
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "Groupes de %s"
+
+#, fuzzy
+#~ msgid "Method not supported"
+#~ msgstr "Méthode HTTP non trouvée !"
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "Abonnés de %s"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "Impossible de mettre à jour l’utilisateur."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "Impossible d’enregistrer le profil."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "Impossible d’enregistrer les marques."
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index 4481b116de..f77179b069 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:34:49+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05:28+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 (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -88,9 +88,9 @@ msgstr "Gardar a configuración de acceso"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -111,6 +111,8 @@ msgstr "Esa páxina non existe."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -131,8 +133,8 @@ msgstr "Esa páxina non existe."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -143,7 +145,7 @@ msgstr "Esa páxina non existe."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -313,7 +315,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Non se puido actualizar o usuario."
 
@@ -335,7 +351,8 @@ msgid "User has no profile."
 msgstr "O usuario non ten perfil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "Non se puido gardar o perfil."
 
@@ -371,8 +388,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "Non se puido gardar a súa configuración de deseño."
 
@@ -380,13 +397,17 @@ 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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Non se puido actualizar o seu deseño."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+msgctxt "ATOM"
 msgid "Main"
 msgstr ""
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -397,31 +418,38 @@ msgstr ""
 msgid "%s timeline"
 msgstr "Liña do tempo de %s"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s subscricións"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: 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:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Non se puido bloquear o usuario."
 
@@ -562,7 +590,7 @@ msgstr "Non se puido atopar o usuario de destino."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Ese alcume xa está en uso. Probe con outro."
@@ -572,7 +600,7 @@ msgstr "Ese alcume xa está en uso. Probe con outro."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "O formato do alcume non é correcto."
@@ -584,7 +612,7 @@ msgstr "O formato do alcume non é correcto."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "O URL da páxina persoal non é correcto."
@@ -594,7 +622,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -622,7 +650,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -746,7 +774,7 @@ 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:101
+#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "O pase especificado é incorrecto."
@@ -768,18 +796,19 @@ msgid "Request token already authorized."
 msgstr "Non está autorizado."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -803,16 +832,17 @@ msgstr ""
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Envío de formulario inesperado."
 
@@ -863,7 +893,7 @@ msgstr "Conta"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -884,7 +914,7 @@ msgstr "Contrasinal"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -955,6 +985,7 @@ msgstr "Non pode borrar o estado doutro usuario."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: 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
@@ -974,40 +1005,50 @@ msgstr "Non pode repetir a súa propia nota."
 msgid "Already repeated that notice."
 msgstr "Xa repetiu esa nota."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "Non se atopou o método da API."
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: 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:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Non se atopou ningún estado con esa ID."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "Non se pode borrar esta nota."
 
-#: actions/apistatusesshow.php:243
+#. 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"
@@ -1145,51 +1186,49 @@ msgstr "Só o usuario pode ler as súas caixas de entrada."
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, 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:406
+#: actions/apitimelineuser.php:409
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Non hai ningunha nota con esa id."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1201,109 +1240,117 @@ msgstr "Método API en desenvolvemento."
 msgid "User not found."
 msgstr "Non se atopou o método da API."
 
-#: actions/atompubfavoritefeed.php:70
-#, fuzzy
-msgid "No such profile"
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
+msgid "No such profile."
 msgstr "Non existe ese perfil."
 
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#. 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 "Can't add someone else's subscription"
+msgid "Cannot add someone else's subscription."
 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/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-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 "Buscar nos contidos das notas"
 
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#. 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"
 
-#: actions/atompubfavoritefeed.php:256
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "Descoñecida"
 
-#: actions/atompubfavoritefeed.php:263
+#. TRANS: Client exception thrown when trying favorite an already favorited notice.
+#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "Engadir aos favoritos"
 
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Non existe ese perfil."
-
+#. 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"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "Grupos aos que pertence %s"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "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:241
-msgid "Can only handle Join activities."
-msgstr ""
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
+msgstr "Buscar nos contidos das notas"
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Descoñecida"
 
-#: actions/atompubmembershipfeed.php:263
+#. 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"
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr "Non se puido eliminar o favorito."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 #, fuzzy
 msgid "No such group"
 msgstr "Non existe tal grupo."
 
-#: actions/atompubshowmembership.php:90
+#. 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"
 
-#: actions/atompubshowmembership.php:115
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "Method not supported"
+msgid "HTTP method not supported"
 msgstr "Non se atopou o método da API."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1311,40 +1358,37 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
-msgid "No such profile id: %d"
+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"
+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"
+msgid "Cannot delete someone else's subscription."
 msgstr "Non se puido borrar a subscrición a si mesmo."
 
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "Persoas subscritas a %s"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
 msgstr "Non se coñece o tipo de ficheiro"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1355,10 +1399,11 @@ msgstr "Non existe tal dato adxunto."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Sen alcume."
@@ -1391,30 +1436,36 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "Configuración do avatar"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "Orixinal"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "Vista previa"
 
@@ -1449,7 +1500,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "Perdéronse os datos do ficheiro."
 
@@ -1468,7 +1520,7 @@ msgstr "Non se puido actualizar o avatar."
 msgid "Avatar deleted."
 msgstr "Borrouse o avatar."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1570,6 +1622,7 @@ msgstr "Non se puido gardar a información do bloqueo."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1579,7 +1632,7 @@ msgstr "Non se puido gardar a información do bloqueo."
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1659,23 +1712,6 @@ msgstr "Non se recoñeceu o tipo de enderezo %s."
 msgid "That address has already been confirmed."
 msgstr "Ese enderezo xa se confirmou."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-msgstr "Non se puido actualizar o usuario."
-
 #. 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
@@ -1737,7 +1773,7 @@ msgid "Account deleted."
 msgstr "Borrouse o avatar."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "Crear unha conta"
@@ -2106,7 +2142,7 @@ msgid "Reset back to default"
 msgstr "Volver ao deseño por defecto"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2220,14 +2256,16 @@ msgid "Edit %s group"
 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:70 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: Client error displayed trying to edit a group while not 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:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "Ten que ser administrador para editar o grupo."
 
@@ -2288,8 +2326,8 @@ msgstr "Enderezo de correo electrónico confirmado actualmente."
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Borrar"
@@ -2314,15 +2352,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Correo entrante"
 
@@ -2333,14 +2371,14 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 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 "
@@ -2355,7 +2393,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Novo"
@@ -2433,9 +2471,10 @@ 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, 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.
@@ -2451,8 +2490,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Non hai ningunha confirmación pendente que cancelar."
 
@@ -2463,8 +2502,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, 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.
@@ -2483,24 +2523,25 @@ msgstr "Ese non é o seu enderezo de correo electrónico."
 msgid "The email address was removed."
 msgstr "Borrouse o enderezo de correo electrónico."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, 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:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 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:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "Engadiuse un novo enderezo de correo electrónico entrante."
 
@@ -2597,7 +2638,7 @@ msgstr "Non se esperaba esta resposta!"
 msgid "User being listened to does not exist."
 msgstr "Non existe o usuario ao que está seguindo."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Pode usar a subscrición local!"
 
@@ -2727,22 +2768,19 @@ msgstr ""
 "Personaliza o aspecto do grupo cunha imaxe de fondo e unha paleta de cores "
 "da súa escolla."
 
-#. 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "Non se puido actualizar o seu deseño."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "Gardáronse as preferencias de deseño."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "Logo do grupo"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2750,23 +2788,28 @@ msgstr ""
 "Pode cargar un logo para o seu grupo. O tamaño máximo para o ficheiro é de %"
 "s."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "Cargar"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "Recortar"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr "Escolla unha zona cadrada da imaxe para usala como logo."
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "Actualizouse o logo."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "Non se puido actualizar o logo."
 
@@ -2906,14 +2949,14 @@ msgid "Error removing the block."
 msgstr "Houbo un erro ao facer efectiva a readmisión."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2923,23 +2966,23 @@ msgstr ""
 "Jabber/GTalk. Configure a continuación o seu enderezo e preferencias."
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "A mensaxería instantánea non está dispoñible."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "Enderezo de mensaxería instantánea"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Enderezo de Jabber/GTalk confirmado actualmente."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2954,7 +2997,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2965,65 +3008,65 @@ msgstr ""
 "instantánea ou en GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Preferencias de mensaxería instantánea"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Enviádeme as notas mediante Jabber ou GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk 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:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk 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 IM preferences form.
-#: actions/imsettings.php:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publicar unha MicroID para o meu enderezo de Jabber ou GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Gardáronse as preferencias."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Non existe ningunha ID de Jabber."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "Non se pode normalizar esa ID de Jabber"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "A ID de Jabber non é correcta"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "Esa xa é a súa ID de Jabber."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID 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.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -3033,28 +3076,29 @@ 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:391
+#: actions/imsettings.php:382
 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:400
-msgid "Couldn't delete IM confirmation."
+#: actions/imsettings.php:391
+#, fuzzy
+msgid "Could not delete IM 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:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Esa ID de Jabber non é súa."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "Borrouse o enderezo de mensaxería instantánea."
 
@@ -3282,20 +3326,20 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s deixou o grupo %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Licenza"
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr "Licenza deste sitio StatusNet"
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr "A selección de licenza non é válida."
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
@@ -3303,88 +3347,88 @@ msgstr ""
 "Cómpre especificar o propietario dos contidos ao empregar a licenza \"Todos "
 "os dereitos reservados\"."
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Título de licenza incorrecto. A extensión máxima é de 255 caracteres."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr "Enderezo URL de licenza incorrecto."
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr "Enderezo URL de imaxe de licenza incorrecto."
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 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:187
+#: actions/licenseadminpanel.php:182
 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:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr "Selección da licenza"
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "Privado"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr "Todos os dereitos reservados"
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr "Tipo"
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr "Seleccionar unha licenza"
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr "Detalles da licenza"
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr "Propietario"
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 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:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr "Título da licenza"
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr "O título da licenza."
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr "URL da licenza"
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr "URL para obter máis información sobre a licenza."
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr "URL da imaxe da licenza"
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr "URL dunha imaxe a mostrar coa licenza."
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Gardar a configuración de licenza"
 
@@ -4174,12 +4218,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:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "Configuración do perfil"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4187,12 +4231,12 @@ msgstr ""
 "coñeza mellor."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "Información do perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4201,7 +4245,7 @@ msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4209,13 +4253,13 @@ msgstr "Nome completo"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Páxina persoal"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: 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"
@@ -4223,7 +4267,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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4231,19 +4275,19 @@ 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:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "Biografía"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4251,24 +4295,24 @@ msgid "Location"
 msgstr "Lugar"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 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:157
+#: actions/profilesettings.php:153
 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:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "Etiquetas"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4276,27 +4320,27 @@ msgstr ""
 "guións baixos), separados por comas ou espazos"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "Lingua"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "Lingua escollida"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "Fuso horario"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 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:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4306,7 +4350,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4314,52 +4358,49 @@ 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:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 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:281
+#: actions/profilesettings.php:276
 #, 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, 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:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, fuzzy
+msgid "Could not save location prefs."
 msgstr "Non se puideron gardar as preferencias de lugar."
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "Non se puido gardar o perfil."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Gardouse a configuración."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Crear unha conta"
@@ -4763,7 +4804,7 @@ 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:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4775,75 +4816,78 @@ msgstr ""
 "mensaxes de blogue curtas compatible](%%doc.openmublog%%), introduza a "
 "continuación o URL do seu perfil."
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Subscribirse remotamente"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Subscribirse a un usuario remoto"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Alcume do usuario"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "Alcume do usuario ao que quere seguir"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "URL do perfil"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 "URL do seu perfil noutro servizo de mensaxes de blogue curtas compatible"
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "Subscribirse"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "O enderezo URL do perfil é incorrecto (formato erróneo)"
 
-#: actions/remotesubscribe.php:168
+#: 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:176
-msgid "That’s a local profile! Login to subscribe."
+#: 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:183
-msgid "Couldn’t get a request token."
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
 msgstr "Non se puido obter o pase solicitado."
 
-#: actions/repeat.php:57
+#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Só os usuarios identificados poden repetir notas."
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Non se especificou nota ningunha."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "Non pode repetir a súa propia nota."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Xa repetiu esa nota."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Repetida"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Repetida!"
 
@@ -5620,72 +5664,72 @@ msgid "Save site notice"
 msgstr "Gardar a nota do sitio"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 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:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "Os SMS non están dispoñibles."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "Enderezo dos SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 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:133
+#: actions/smssettings.php:129
 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:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "Código de confirmación"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 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:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 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:156
+#: actions/smssettings.php:152
 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:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "Preferencias dos SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5694,32 +5738,32 @@ msgstr ""
 "exorbitantes na factura da miña compañía."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
 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:338
+#: actions/smssettings.php:330
 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:344
+#: actions/smssettings.php:336
 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:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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."
@@ -5728,39 +5772,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:413
+#: actions/smssettings.php:404
 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:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 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:470
+#: actions/smssettings.php:460
 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:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "Compañía"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5771,7 +5815,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:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "Non se introduciu ningún código"
 
@@ -6034,10 +6078,6 @@ msgstr ""
 "Só pode etiquetar a xente á que estea subscrito ou que estean subscritos a "
 "vostede."
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "Non se puideron gardar as etiquetas."
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
@@ -6272,12 +6312,12 @@ 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:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "Deseño do perfil"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6285,7 +6325,7 @@ msgstr ""
 "Personalice a aparencia do seu perfil cunha imaxe de fondo e unha paleta de "
 "cores escollida por vostede."
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr "Bo proveito!"
 
@@ -7255,25 +7295,31 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Non se puido inserir a mensaxe."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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 ""
+"Houbo un erro na base de datos ao intentar inserir o usuario da aplicación "
+"OAuth."
+
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "Erro ao borrar o pase revogado."
 
@@ -7934,6 +7980,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Restablecer"
 
+#. 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
+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
 msgid "Design defaults restored."
@@ -9299,3 +9351,28 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "No such profile"
+#~ msgstr "Non existe ese perfil."
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "Grupos aos que pertence %s"
+
+#, fuzzy
+#~ msgid "Method not supported"
+#~ msgstr "Non se atopou o método da API."
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "Persoas subscritas a %s"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "Non se puido actualizar o usuario."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "Non se puido gardar o perfil."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "Non se puideron gardar as etiquetas."
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index 7dfca01f6f..4ab4b4fd02 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-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:34:50+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05:30+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 (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hsb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || "
 "n%100==4) ? 2 : 3)\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -89,9 +89,9 @@ msgstr "Přistupne nastajenja składować"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -112,6 +112,8 @@ msgstr "Strona njeeksistuje."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -132,8 +134,8 @@ msgstr "Strona njeeksistuje."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -144,7 +146,7 @@ msgstr "Strona njeeksistuje."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -302,9 +304,25 @@ msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
+"Dyrbiš parameter z mjenom \"device\" z jednej ze slědowacych hódnotow podać: "
+"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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Wužiwar njeje so dał aktualizować."
 
@@ -326,7 +344,8 @@ msgid "User has no profile."
 msgstr "Wužiwar nima profil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "Profil njeje so składować dał."
 
@@ -360,8 +379,8 @@ msgstr[3] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "Njeje móžno, designowe nastajenja składować."
 
@@ -369,13 +388,18 @@ 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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Design njeda so aktualizować."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+#, fuzzy
+msgctxt "ATOM"
 msgid "Main"
 msgstr "Hłowny"
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -386,31 +410,38 @@ msgstr "Hłowny"
 msgid "%s timeline"
 msgstr ""
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s abonementow"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: 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:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Blokowanje wužiwarja je so njeporadźiło."
 
@@ -550,7 +581,7 @@ msgstr "Cilowy wužiwar njeda so namakać."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Přimjeno so hižo wužiwa. Spytaj druhe."
@@ -560,7 +591,7 @@ msgstr "Přimjeno so hižo wužiwa. Spytaj druhe."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Žane płaćiwe přimjeno."
@@ -572,7 +603,7 @@ msgstr "Žane płaćiwe přimjeno."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Startowa strona njeje płaćiwy URL."
@@ -582,7 +613,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: 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)."
@@ -611,7 +642,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Městno je předołho (maks. 255 znamješkow)."
@@ -736,7 +767,7 @@ 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:101
+#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Njepłaćiwe přizjewjenske znamješka."
 
@@ -756,18 +787,19 @@ msgid "Request token already authorized."
 msgstr "Naprašowanski token hižo awtorizowany."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -788,16 +820,17 @@ msgstr "Zmylk datoweje banki při zasunjenju oauth_token_association."
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Njewočakowane wotpósłanje formulara."
 
@@ -842,7 +875,7 @@ msgstr "Konto"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -863,7 +896,7 @@ msgstr "Hesło"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -933,6 +966,7 @@ msgstr "Njemóžeš status druheho wužiwarja zničić."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: 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
@@ -952,39 +986,49 @@ msgstr "Njemóžno twoju zdźělenku wospjetować."
 msgid "Already repeated that notice."
 msgstr "Tuta zdźělenka bu hižo wospjetowana."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTTP-metoda so njepodpěruje."
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: 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:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Žadyn status z tym ID namakany."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "Tuta zdźělenka njeda so zničić."
 
-#: actions/apistatusesshow.php:243
+#. 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"
@@ -1119,51 +1163,49 @@ msgstr "Jenož wužiwar móže swojsku časowu lajstu přidać."
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Jenož AtomPub za Atom-kanale akceptować."
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr "Póst z Atoma njesmě prózdny być."
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 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:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, 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:406
+#: actions/apitimelineuser.php:409
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Zdźělenka z URI \"%s\" hižo eksistuje."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1174,138 +1216,147 @@ msgstr "API-metoda njeskónčena."
 msgid "User not found."
 msgstr "Wužiwar njenamakany."
 
-#: actions/atompubfavoritefeed.php:70
-msgid "No such profile"
-msgstr "Profil njeeksistuje"
-
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-msgid "Can't add someone else's subscription"
-msgstr "Nowy abonement njeda so přidać"
-
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
-msgid "Can only fave notices."
-msgstr "Jenož zdźělenki dadźa so jako fawority składować."
-
-#: actions/atompubfavoritefeed.php:256
-msgid "Unknown note."
-msgstr "Njeznata notica."
-
-#: actions/atompubfavoritefeed.php:263
-msgid "Already a favorite."
-msgstr "Je hižo faworit."
-
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "Profil njeeksistuje."
 
+#. 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 "Nowy abonement njeda so přidać"
+
+#. 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 "Jenož zdźělenki dadźa so jako fawority składować."
+
+#. 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"
 
-#: actions/atompubmembershipfeed.php:147
-#, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "Skupiny, w kotrychž %s je čłon na %s"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "Nowy abonement njeda so přidać"
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:241
-msgid "Can only handle Join activities."
-msgstr ""
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
+msgstr "Jenož zdźělenki dadźa so jako fawority składować."
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 msgid "Unknown group."
 msgstr "Njeznata skupina"
 
-#: actions/atompubmembershipfeed.php:263
+#. 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."
 
-#: actions/atompubmembershipfeed.php:270
+#. 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."
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+#, fuzzy
+msgid "Cannot delete someone else's favorite"
 msgstr "Faworit druheho njeda so zhašeć"
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "Skupina njeeksistuje"
 
-#: actions/atompubshowmembership.php:90
+#. 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"
 
-#: actions/atompubshowmembership.php:115
-msgid "Method not supported"
-msgstr "Metoda so njepodpěruje."
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
+#, fuzzy
+msgid "HTTP method not supported"
+msgstr "HTTP-metoda so njepodpěruje."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, fuzzy
+msgid "Cannot delete someone else's membership"
+msgstr "Abonement 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"
+#, fuzzy, 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
 #, fuzzy, php-format
-msgid "Profile %1$d not subscribed to profile %2$d"
-msgstr "Njejsy tón profil abonował."
+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
 #, fuzzy
-msgid "Cannot delete someone else's subscription"
+msgid "Cannot delete someone else's subscription."
 msgstr "Abonement druheho njeda so zhašeć"
 
-#: actions/atompubsubscriptionfeed.php:150
-#, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "Ludźo, kotřiž su %s na %s abonowali"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
-#, php-format
-msgid "Unknown profile %s"
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
+#, fuzzy, php-format
+msgid "Unknown profile %s."
 msgstr "Njeznaty profil %s"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1316,10 +1367,11 @@ msgstr "Přiwěšk njeeksistuje."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Žane přimjeno."
@@ -1351,30 +1403,36 @@ msgstr ""
 "Móžeš swój wosobinski awatar nahrać. Maksimalna datajowa wulkosć je %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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "Nastajenja awatara"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "Original"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "Přehlad"
 
@@ -1409,7 +1467,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "Naše datajowe daty su so zhubili."
 
@@ -1428,7 +1487,7 @@ msgstr "Aktualizowanje awatara je so njeporadźiło."
 msgid "Avatar deleted."
 msgstr "Awatar zničeny."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr "Konto zawěsćić"
 
@@ -1438,7 +1497,7 @@ msgstr "Jenož přizjewjeni wužiwarjo móža swoje konto zawěsćić."
 
 #: actions/backupaccount.php:84
 msgid "You may not backup your account."
-msgstr ""
+msgstr "Njesměš swoje konto zawěsćić."
 
 #: actions/backupaccount.php:232
 msgid ""
@@ -1525,6 +1584,7 @@ msgstr "Njebě móžno blokěrowanske informacije składować."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1534,7 +1594,7 @@ msgstr "Njebě móžno blokěrowanske informacije składować."
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1614,23 +1674,6 @@ msgstr "Njespóznaty adresowy typ %s."
 msgid "That address has already been confirmed."
 msgstr "Tuta adresa bu hižo wobkrućena."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-msgstr "Wužiwar njeda aktualizować."
-
 #. 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
@@ -1680,7 +1723,7 @@ msgstr ""
 #: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write  \"%s\" exactly in the box."
-msgstr ""
+msgstr "Dyrbiš \"%s\"eksaktnje do pola zapisać."
 
 #. TRANS: Confirmation that a user account has been deleted.
 #: actions/deleteaccount.php:206
@@ -1688,7 +1731,7 @@ msgid "Account deleted."
 msgstr "Konto zhašene."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 msgid "Delete account"
 msgstr "Konto zhašeć"
 
@@ -1717,15 +1760,14 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
-msgstr "Njemóžeš swoje konto zhašeć."
+msgstr "Zapodaj \"%s\", zo by wobkrućił, zo chceš swoje konto zhašeć."
 
 #. TRANS: Button title for user account deletion.
 #: actions/deleteaccount.php:323
-#, fuzzy
 msgid "Permanently delete your account"
-msgstr "Njemóžeš swoje konto zhašeć."
+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
@@ -2038,7 +2080,7 @@ msgid "Reset back to default"
 msgstr "Na standard wróćo stajić"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2150,14 +2192,16 @@ msgid "Edit %s group"
 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:70 actions/newgroup.php:65
 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 when trying to change group logo settings while not being a group admin.
 #: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "Dyrbiš administrator być, zo by skupinu wobdźěłał."
 
@@ -2218,8 +2262,8 @@ msgstr "Aktualna wobkrućena e-mejlowa adresa."
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Wotstronić"
@@ -2242,15 +2286,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Dochadźaca e-mejl"
 
@@ -2261,13 +2305,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
@@ -2280,7 +2324,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nowy"
@@ -2354,9 +2398,10 @@ 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, fuzzy
+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.
@@ -2369,8 +2414,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Njeje žane njesćinjene wobkrućenje, kotrež da so přetorhnyć,"
 
@@ -2381,8 +2426,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+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.
@@ -2401,24 +2447,25 @@ msgstr "To njeje twoja e-mejlowa adresa."
 msgid "The email address was removed."
 msgstr "E-mejlowa adresa bu wotstronjena."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, fuzzy
+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:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 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:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "Nowa adresa za dochadźace e-mejle přidata."
 
@@ -2511,7 +2558,7 @@ msgstr "Njewočakowana wotmołwa!"
 msgid "User being listened to does not exist."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Móžeš lokalny abonement wužiwać!"
 
@@ -2636,22 +2683,19 @@ msgid ""
 "palette of your choice."
 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "Twój design njeda so aktualizować."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "Designowe nastajenja składowane."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "Skupinske logo"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2659,23 +2703,28 @@ msgstr ""
 "Móžeš logowy wobraz za swoju skupinu nahrać. Maksimalna datajowa wulkosć je %"
 "s."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "Nahrać"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "Přirězać"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "Logo zaktualizowane."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "Aktualizowanje loga je so njeporadźiło."
 
@@ -2807,14 +2856,14 @@ msgid "Error removing the block."
 msgstr "Zmylk při wotstronjenju blokowanja."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2822,23 +2871,23 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM k dispoziciji njesteji."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "IM-adresa"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Aktualna wobkrućena adresa Jabber/GTalk."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2850,7 +2899,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2858,63 +2907,63 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "IM-nastajenja"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Pósćel mi zdźělenki přez Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Powěsć pósłac, hdyž so status Jabber/GTalk změni."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "MicroID za moju adresu Jabber/GTalk publikować."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Nastajenja składowane."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Žadyn ID Jabber."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "Tutón Jabber-ID njehodźi so normalizować"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "Njepłaćiwy ID Jabber"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "To je hižo twój ID Jabber."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID 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.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2922,28 +2971,29 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 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:400
-msgid "Couldn't delete IM confirmation."
+#: actions/imsettings.php:391
+#, fuzzy
+msgid "Could not delete IM confirmation."
 msgstr "IM-wobkrućenje njeda so zhašeć."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "To njeje twój ID Jabber."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "IM-adresa bu wotstronjena."
 
@@ -3147,106 +3197,106 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s je skupinu %2$s wopušćił"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Licenca"
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr "Licenca za tute sydło StatusNet"
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr "Njepłaćiwy wuběr licency."
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 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:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr "Njepłaćiwy URL licency."
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr "Njepłaćiwy URL wobraza licency."
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 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:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr "Licencowy wobraz dyrbi prózdny abo płaćiwy URL być."
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr "Wuběr licency"
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "Priwatny"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr "Wšě prawa wuměnjene."
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr "Cresative Commons"
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr "Typ"
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr "Licencu wubrać"
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr "Podrobnosće licency"
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr "Wobsedźer"
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 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:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr "Titul licency"
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr "Titul licency."
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr "URL licency"
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr "URL za dalše informacije wo licency."
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr "URL wobraza licency"
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr "URL za wobraz, kotryž ma so z licencu zwobraznić."
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Licencne nastajenja składować"
 
@@ -4000,12 +4050,12 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "Profilowe nastajenja"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4013,12 +4063,12 @@ msgstr ""
 "wjace wo tebi zhonili."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "Profilowe informacije"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 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 "
@@ -4026,7 +4076,7 @@ msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4034,20 +4084,20 @@ msgstr "Dospołne mjeno"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Startowa strona"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: 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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4057,19 +4107,19 @@ 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:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "Biografija"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4077,50 +4127,50 @@ msgid "Location"
 msgstr "Městno"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 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:157
+#: actions/profilesettings.php:153
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "Rěč"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "Preferowana rěč"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "Časowe pasmo"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 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:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4128,7 +4178,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4138,51 +4188,48 @@ 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:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Časowe pasmo njeje wubrane."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:276
 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 actions/tagother.php:178
 #, 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:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, fuzzy
+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:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, fuzzy
+msgid "Could not save location prefs."
 msgstr "Nastajenja městna njedachu so składować."
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "Profil njeda so składować."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Nastajenja składowane."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Konto wobnowić"
 
@@ -4225,7 +4272,7 @@ msgstr ""
 
 #: actions/public.php:191
 msgid "Be the first to post!"
-msgstr ""
+msgstr "Budź prěni, kiž něšto pisa!"
 
 #: actions/public.php:195
 #, php-format
@@ -4274,7 +4321,7 @@ msgstr ""
 #. 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 ""
+msgstr "Budź prěni, kiž tajki pisa!"
 
 #. TRANS: Message shown to a anonymous user for the public tag cloud
 #. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
@@ -4538,7 +4585,7 @@ msgid ""
 "to confirm your email address.)"
 msgstr ""
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4546,72 +4593,75 @@ msgid ""
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Zdaleny abonement"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Zdaleneho wužiwarja abonować"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Wužiwarske přimjeno"
 
-#: actions/remotesubscribe.php:130
+#: 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:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "URL profila"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "Abonować"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "Njepłaćiwy profilowy URL (wopačny format)"
 
-#: actions/remotesubscribe.php:168
+#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 
-#: actions/remotesubscribe.php:176
-msgid "That’s a local profile! Login to subscribe."
+#: actions/remotesubscribe.php:175
+#, fuzzy
+msgid "That is a local profile! Login to subscribe."
 msgstr "To je lokalny profil! Přizjew so, zo by abonował."
 
-#: actions/remotesubscribe.php:183
-msgid "Couldn’t get a request token."
-msgstr ""
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
+msgstr "Přistupny token njeda so wudać."
 
-#: actions/repeat.php:57
+#: 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:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Žana zdźělenka podata."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "Njemóžeš swójsku zdźělenku wospjetować."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Sy tutu zdźělenku hižo wospjetował."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Wospjetowany"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Wospjetowany!"
 
@@ -4722,7 +4772,6 @@ msgstr "Systemowy zmylk při nahrawanju dataje."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
 #: actions/restoreaccount.php:207
-#, fuzzy
 msgid "Not an Atom feed."
 msgstr "To Atomowy kanal njeje."
 
@@ -5332,141 +5381,141 @@ msgid "Save site notice"
 msgstr "Sydłowu zdźělenku składować"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "SMS-nastajenja"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "SMS k dispoziciji njesteji."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "SMS-adresa"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 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:133
+#: actions/smssettings.php:129
 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:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "Wobkrućenski kod"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 msgid "Enter the code you received on your phone."
-msgstr ""
+msgstr "Zapodaj kod, kotryž sy přez telefon dóstał."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Wobkrućić"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "SMS telefonowe čisło"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
+msgstr "Telefonowe čisło, bjez interpunkcije abo mjezerow, z předwolenjom"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "SMS-nastajenja"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 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:315
+#: actions/smssettings.php:308
 msgid "SMS preferences saved."
 msgstr "SMS-nastajenja składowane."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "Žane telefonowe čisło."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr "Žadyn poskićowar wubrany."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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:413
+#: actions/smssettings.php:404
 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:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 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:470
+#: actions/smssettings.php:460
 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:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr ""
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5474,7 +5523,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "Žadyn kod zapodaty"
 
@@ -5494,7 +5543,7 @@ msgstr "Njepłaćiwa hódnota za wuwjedźenje njejapkeho fota."
 
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
-msgstr ""
+msgstr "Frekwenca njejapkich fotkow dyrbi ličba być."
 
 #: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
@@ -5530,7 +5579,7 @@ msgstr "URL rozprawy"
 
 #: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
-msgstr ""
+msgstr "Njejapke fotki budu so do tutoho URL słać."
 
 #: actions/snapshotadminpanel.php:248
 msgid "Save snapshot settings"
@@ -5725,10 +5774,6 @@ msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "Taflički njedadźa so składować."
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
@@ -5949,18 +5994,18 @@ 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:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "Profilowy design"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr "Wjele wjesela!"
 
@@ -6152,7 +6197,7 @@ msgstr "Zastupić"
 #: classes/Group_member.php:151
 #, php-format
 msgid "%1$s has joined group %2$s."
-msgstr ""
+msgstr "%1$s je do skupiny %2$s zastupił."
 
 #. TRANS: Server exception thrown when updating a local group fails.
 #: classes/Local_group.php:42
@@ -6700,9 +6745,9 @@ 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 "Njeznata rěč \"%s\"."
+msgstr "Njeznaty werb: \"%s\"."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
 #: lib/activityimporter.php:107
@@ -6711,9 +6756,8 @@ 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 "Podaj mjeno wužiwarja, kotrehož chceš abonować"
+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
@@ -6728,13 +6772,12 @@ 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 ""
+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
-#, fuzzy
 msgid "User is already a member of this group."
-msgstr "Sy hižo čłon teje skupiny."
+msgstr "Wužiwar je hižo čłon tuteje skupiny."
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
 #: lib/activityimporter.php:207
@@ -6744,9 +6787,9 @@ 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 "Žadyn wobsah za zdźělenku %d."
+msgstr "!Žadyn wobsah za powěsć %s."
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -6895,22 +6938,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 msgid "Could not issue access token."
 msgstr "Přistupny token njeda so wudać."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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
+#, fuzzy
+msgid "Database error updating OAuth application user."
+msgstr "Zmylk datoweje banki při zasunjenju wužiwarja OAuth-aplikacije."
+
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
@@ -7030,11 +7077,10 @@ msgstr "Wotwołać"
 
 #: lib/atom10feed.php:113
 msgid "Author element must contain a name element."
-msgstr ""
+msgstr "Element \"author\" dyrbi element \"name\" wobsahować."
 
 #. 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 "Njewužij tutu metodu!"
 
@@ -7160,14 +7206,14 @@ msgstr "Zdźělenka je jako faworit markěrowana."
 #: lib/command.php:357
 #, php-format
 msgid "%1$s joined group %2$s."
-msgstr ""
+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
 #, php-format
 msgid "%1$s left group %2$s."
-msgstr ""
+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.
@@ -7299,7 +7345,7 @@ msgstr "%s abonowany."
 #. TRANS: Error text shown when no username was provided when issuing the command.
 #: lib/command.php:692 lib/command.php:803
 msgid "Specify the name of the user to unsubscribe from."
-msgstr ""
+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.
@@ -7345,6 +7391,7 @@ msgstr "Přizjewjenski přikaz je znjemóžnjeny."
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
+"Tutón wotkaz je jenož jedyn raz wužiwajomny a za 2 mjeńšinje płaćiwy: %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.
@@ -7537,6 +7584,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Wróćo stajić"
 
+#. 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
+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
 msgid "Design defaults restored."
@@ -7938,7 +7991,7 @@ msgstr "SMS-wobkrućenje"
 #: lib/mail.php:472
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
-msgstr ""
+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.
@@ -8126,7 +8179,7 @@ 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 ""
+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.
@@ -8703,10 +8756,10 @@ msgstr "před něhdźe jednej mjeńšinu"
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "před něhdźe jednej mjeńšinu"
+msgstr[1] "před něhdźe %d mjeńšinomaj"
+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
@@ -8718,10 +8771,10 @@ msgstr "před něhdźe jednej hodźinu"
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "před něhdźe jednej hodźinu"
+msgstr[1] "před něhdźe %d hodźinomaj"
+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
@@ -8733,10 +8786,10 @@ msgstr "před něhdźe jednym dnjom"
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "před něhdźe jednym dnjom"
+msgstr[1] "před něhdźe %d dnjomaj"
+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
@@ -8748,10 +8801,10 @@ msgstr "před něhdźe jednym měsacom"
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "před něhdźe jednym měsacom"
+msgstr[1] "před něhdźe %d měsacomaj"
+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
@@ -8807,4 +8860,25 @@ msgstr "Njepłaćiwy XML, korjeń XRD faluje."
 #: scripts/restoreuser.php:62
 #, php-format
 msgid "Getting backup from file '%s'."
-msgstr ""
+msgstr "Wobstaruje so zawěsćenje z dataje \"%s\"-"
+
+#~ msgid "No such profile"
+#~ msgstr "Profil njeeksistuje"
+
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "Skupiny, w kotrychž %s je čłon na %s"
+
+#~ msgid "Method not supported"
+#~ msgstr "Metoda so njepodpěruje."
+
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "Ludźo, kotřiž su %s na %s abonowali"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "Wužiwar njeda aktualizować."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "Profil njeda so składować."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "Taflički njedadźa so składować."
diff --git a/locale/hu/LC_MESSAGES/statusnet.po b/locale/hu/LC_MESSAGES/statusnet.po
index c51fb8e3c8..2debe428e9 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-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:34:51+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05:31+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-01-14 13:22:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hu\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -91,9 +91,9 @@ msgstr "Hozzáférések beállításainak mentése"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -114,6 +114,8 @@ msgstr "Nincs ilyen lap."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -134,8 +136,8 @@ msgstr "Nincs ilyen lap."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -146,7 +148,7 @@ msgstr "Nincs ilyen lap."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -310,7 +312,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Nem sikerült frissíteni a felhasználót."
 
@@ -332,7 +348,8 @@ msgid "User has no profile."
 msgstr "A felhasználónak nincs profilja."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "Nem sikerült menteni a profilt."
 
@@ -368,8 +385,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "Nem sikerült elmenteni a megjelenítési beállításaid."
 
@@ -377,13 +394,17 @@ 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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Nem sikerült frissíteni a megjelenítést."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+msgctxt "ATOM"
 msgid "Main"
 msgstr ""
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -394,31 +415,38 @@ msgstr ""
 msgid "%s timeline"
 msgstr "%s története"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr ""
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: 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:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Nem sikerült a felhasználó blokkolása."
 
@@ -556,7 +584,7 @@ msgstr "A cél felhasználó nem található."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: 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."
@@ -566,7 +594,7 @@ msgstr "A becenév már foglalt. Próbálj meg egy másikat."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Nem érvényes becenév."
@@ -578,7 +606,7 @@ msgstr "Nem érvényes becenév."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "A honlap érvénytelen URL-cím."
@@ -588,7 +616,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -616,7 +644,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -740,7 +768,7 @@ msgid "Upload failed."
 msgstr ""
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:101
+#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr ""
 
@@ -762,18 +790,19 @@ msgid "Request token already authorized."
 msgstr "Nincs jogosultságod."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -794,16 +823,17 @@ msgstr ""
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Váratlan űrlapbeküldés."
 
@@ -849,7 +879,7 @@ msgstr "Kontó"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -870,7 +900,7 @@ msgstr "Jelszó"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -943,6 +973,7 @@ msgstr "Nem törölheted más felhasználók állapotait."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: 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
@@ -962,40 +993,50 @@ msgstr "Nem ismételheted meg a saját híredet."
 msgid "Already repeated that notice."
 msgstr "Már megismételted azt a hírt."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "Az API-metódus nem található."
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: 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:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Nem található ilyen azonosítójú állapot."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
-msgstr ""
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
+msgstr "Ne töröljük ezt a hírt"
 
-#: actions/apistatusesshow.php:243
+#. 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"
@@ -1130,51 +1171,49 @@ msgstr "Csak a felhasználó láthatja a saját postaládáját."
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, 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:406
+#: actions/apitimelineuser.php:409
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1186,107 +1225,116 @@ msgstr "Az API-metódus fejlesztés alatt áll."
 msgid "User not found."
 msgstr "Az API-metódus nem található."
 
-#: actions/atompubfavoritefeed.php:70
-#, fuzzy
-msgid "No such profile"
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
+msgid "No such profile."
 msgstr "Nincs ilyen profil."
 
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
+#. 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."
 
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-msgid "Can't 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 "Keressünk a hírek tartalmában"
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#. 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"
 
-#: actions/atompubfavoritefeed.php:256
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "Ismeretlen művelet"
 
-#: actions/atompubfavoritefeed.php:263
+#. 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"
 
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Nincs ilyen profil."
-
+#. 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"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "A legtöbb tagból álló csoportok"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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:241
-msgid "Can only handle Join activities."
-msgstr ""
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
+msgstr "Keressünk a hírek tartalmában"
 
-#: actions/atompubmembershipfeed.php:256
+#. 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"
 
-#: actions/atompubmembershipfeed.php:263
+#. 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"
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr "Nem sikerült törölni a kedvencet."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "Nincs ilyen csoport"
 
-#: actions/atompubshowmembership.php:90
+#. 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"
 
-#: actions/atompubshowmembership.php:115
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "Method not supported"
+msgid "HTTP method not supported"
 msgstr "Az API-metódus nem található."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1294,40 +1342,37 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
-msgid "No such profile id: %d"
+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"
+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"
+msgid "Cannot delete someone else's subscription."
 msgstr "Nem sikerült törölni a kedvencet."
 
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "Senki sem követ figyelemmel."
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
 msgstr "Ismeretlen fájltípus"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1338,10 +1383,11 @@ msgstr "Nincs ilyen csatolmány."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Nincs becenév."
@@ -1372,30 +1418,36 @@ 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."
 
 #. 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "Avatarbeállítások"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "Eredeti"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "Előnézet"
 
@@ -1433,7 +1485,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "Elvesztettük az adatainkat."
 
@@ -1452,7 +1505,7 @@ msgstr "Nem sikerült felölteni az avatart."
 msgid "Avatar deleted."
 msgstr "Avatar törölve."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1551,6 +1604,7 @@ msgstr "Nem sikerült elmenteni a blokkolási információkat."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1560,7 +1614,7 @@ msgstr "Nem sikerült elmenteni a blokkolási információkat."
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1641,23 +1695,6 @@ msgstr ""
 msgid "That address has already been confirmed."
 msgstr "Ez a cím már meg van erősítve."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-msgstr "Nem sikerült frissíteni a felhasználót."
-
 #. 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
@@ -1719,7 +1756,7 @@ msgid "Account deleted."
 msgstr "Avatar törölve."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "Felhasználó törlése"
@@ -2081,7 +2118,7 @@ msgid "Reset back to default"
 msgstr "Visszaállítás az alapértelmezettre"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2195,14 +2232,16 @@ msgid "Edit %s group"
 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:70 actions/newgroup.php:65
 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 when trying to change group logo settings while not being a group admin.
 #: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr ""
 
@@ -2263,8 +2302,8 @@ msgstr "A jelenleg megerősített e-mail cím."
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Eltávolítás"
@@ -2290,15 +2329,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Bejövő email"
 
@@ -2309,13 +2348,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
@@ -2328,7 +2367,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Új"
@@ -2404,9 +2443,10 @@ 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, 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.
@@ -2422,8 +2462,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Nincs várakozó megerősítés, amit vissza lehetne vonni."
 
@@ -2434,8 +2474,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, 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.
@@ -2454,24 +2495,25 @@ msgstr "Ez nem a te e-mail címed."
 msgid "The email address was removed."
 msgstr ""
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, 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:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 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:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "Új bejövő e-mail cím hozzáadva."
 
@@ -2566,7 +2608,7 @@ msgstr "Nem várt válasz!"
 msgid "User being listened to does not exist."
 msgstr "A felhasználó akire figyelsz nem létezik."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Figyelemmel követheted helyben!"
 
@@ -2695,44 +2737,46 @@ msgid ""
 "palette of your choice."
 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "Nem sikerült frissíteni a designt."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "Design beállítások elmentve."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "Csoport logója"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "Feltöltés"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "Levágás"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "Logó frissítve."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "Nem sikerült a logó feltöltése."
 
@@ -2867,14 +2911,14 @@ msgid "Error removing the block."
 msgstr "Hiba a blokkolás feloldása közben."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2882,23 +2926,23 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM nem elérhető."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "IM-cím"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr ""
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2910,7 +2954,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2918,63 +2962,63 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Azonnali üzenetküldő beállításai"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Beállítások elmentve."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Nincs Jabber-azonosító."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "Nem lehet normalizálni a Jabber azonosítót"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "Érvénytelen Jabber-azonosító"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "Jelenleg is ez a Jabber-azonosítód."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID 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.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2982,28 +3026,29 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 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:400
-msgid "Couldn't delete IM confirmation."
-msgstr ""
+#: actions/imsettings.php:391
+#, fuzzy
+msgid "Could not delete IM 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:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Ez nem a te Jabber-azonosítód."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr ""
 
@@ -3203,107 +3248,107 @@ msgid "%1$s left group %2$s"
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr ""
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Érvénytelen SSL szerver. A maximális hossz 255 karakter."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "Privát"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
 
@@ -4077,12 +4122,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:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "Profilbeállítások"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4090,19 +4135,19 @@ msgstr ""
 "többet tudhassanak rólad."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "Személyes profil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 #, 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4110,13 +4155,13 @@ msgstr "Teljes név"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Honlap"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
@@ -4126,7 +4171,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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4134,19 +4179,19 @@ 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:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "Életrajz"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4154,24 +4199,24 @@ msgid "Location"
 msgstr "Helyszín"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 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:157
+#: actions/profilesettings.php:153
 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:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "Címkék"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4179,27 +4224,27 @@ msgstr ""
 "elválasztva"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "Nyelv"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "Előnyben részesített nyelv"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "Időzóna"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 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:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4209,7 +4254,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4217,52 +4262,49 @@ 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:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 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:281
+#: actions/profilesettings.php:276
 #, 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, 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:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, 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 could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "Nem sikerült elmenteni a profilt."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
-msgstr "Nem sikerült a címkéket elmenteni."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "A beállításokat elmentettük."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr ""
 
@@ -4627,7 +4669,7 @@ msgstr ""
 "(Hamarosan kapnod kell egy e-mailt az e-mail címed megerősítésére vonatkozó "
 "utasításokkal.)"
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4635,72 +4677,75 @@ msgid ""
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Távoli feliratkozás"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr ""
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Felhasználó beceneve"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr ""
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Profil URL"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "Kövessük"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr ""
 
-#: actions/remotesubscribe.php:168
+#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 
-#: actions/remotesubscribe.php:176
-msgid "That’s a local profile! Login to subscribe."
-msgstr ""
+#: actions/remotesubscribe.php:175
+#, fuzzy
+msgid "That is a local profile! Login to subscribe."
+msgstr "Az a felhasználó blokkolta hogy figyelemmel kövesd."
 
-#: actions/remotesubscribe.php:183
-msgid "Couldn’t get a request token."
-msgstr ""
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
+msgstr "Nem sikerült az üzenetet feldolgozni."
 
-#: actions/repeat.php:57
+#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr ""
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Nincs hír megjelölve."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
-msgstr ""
+#: 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:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr ""
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr ""
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr ""
 
@@ -5441,141 +5486,141 @@ msgid "Save site notice"
 msgstr ""
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 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:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "Az SMS nem elérhető."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr ""
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:133
+#: actions/smssettings.php:129
 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:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr ""
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 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:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Megerősítés"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "SMS telefonszám"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr ""
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 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:315
+#: actions/smssettings.php:308
 msgid "SMS preferences saved."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "Nincs telefonszám."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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:413
+#: actions/smssettings.php:404
 msgid "That is the wrong confirmation number."
 msgstr ""
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 msgid "That is not your phone number."
 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
+#: actions/smssettings.php:460
 msgid "The SMS phone number was removed."
 msgstr ""
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "Mobilszolgáltató"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5583,7 +5628,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "Nincs kód megadva"
 
@@ -5832,10 +5877,6 @@ msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr ""
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
@@ -6057,18 +6098,18 @@ msgid "Wrong image type for avatar URL ‘%s’."
 msgstr ""
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr ""
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr ""
 
@@ -7000,23 +7041,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Nem sikerült az üzenetet feldolgozni."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
@@ -7626,6 +7670,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Alaphelyzet"
 
+#. 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
+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
 msgid "Design defaults restored."
@@ -8936,3 +8986,28 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "No such profile"
+#~ msgstr "Nincs ilyen profil."
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "A legtöbb tagból álló csoportok"
+
+#, fuzzy
+#~ msgid "Method not supported"
+#~ msgstr "Az API-metódus nem található."
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "Senki sem követ figyelemmel."
+
+#~ msgid "Couldn't update user."
+#~ msgstr "Nem sikerült frissíteni a felhasználót."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "Nem sikerült elmenteni a profilt."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "Nem sikerült a címkéket elmenteni."
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index e2af6f23a3..635f29d291 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-01-15 00:20+0000\n"
-"PO-Revision-Date: 2011-01-15 00:22:41+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05: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-Generator: MediaWiki 1.18alpha (r80364); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 00:06:50+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -86,9 +86,9 @@ msgstr "Salveguardar configurationes de accesso"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -109,6 +109,8 @@ msgstr "Pagina non existe."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -129,8 +131,8 @@ msgstr "Pagina non existe."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -141,7 +143,7 @@ msgstr "Pagina non existe."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -311,7 +313,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Non poteva actualisar le usator."
 
@@ -333,7 +349,8 @@ msgid "User has no profile."
 msgstr "Le usator non ha un profilo."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "Non poteva salveguardar le profilo."
 
@@ -369,8 +386,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "Impossibile salveguardar le configurationes del apparentia."
 
@@ -378,13 +395,18 @@ 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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Non poteva actualisar le apparentia."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+#, fuzzy
+msgctxt "ATOM"
 msgid "Main"
 msgstr "Principal"
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -395,31 +417,38 @@ msgstr "Principal"
 msgid "%s timeline"
 msgstr "Chronologia de %s"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Subscriptiones de %s"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: 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:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Le blocada del usator ha fallite."
 
@@ -557,7 +586,7 @@ msgstr "Non poteva trovar le usator de destination."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonymo ja in uso. Proba un altere."
@@ -567,7 +596,7 @@ msgstr "Pseudonymo ja in uso. Proba un altere."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Non un pseudonymo valide."
@@ -579,7 +608,7 @@ msgstr "Non un pseudonymo valide."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Le pagina personal non es un URL valide."
@@ -589,7 +618,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Le nomine complete es troppo longe (maximo 255 characteres)."
@@ -616,7 +645,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Loco es troppo longe (maximo 255 characteres)."
@@ -739,7 +768,7 @@ 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:101
+#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Indicio de requesta o verificator invalide."
 
@@ -759,18 +788,19 @@ msgid "Request token already authorized."
 msgstr "Indicio de requesta jam autorisate."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -792,16 +822,17 @@ msgstr ""
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Submission de formulario inexpectate."
 
@@ -852,7 +883,7 @@ msgstr "Conto"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -873,7 +904,7 @@ msgstr "Contrasigno"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -947,6 +978,7 @@ msgstr "Tu non pote deler le stato de un altere usator."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: 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
@@ -966,39 +998,49 @@ msgstr "Non pote repeter tu proprie nota."
 msgid "Already repeated that notice."
 msgstr "Iste nota ha ja essite repetite."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "Methodo HTTP non supportate."
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Stato delite."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Nulle stato trovate con iste ID."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "Non pote deler iste nota."
 
-#: actions/apistatusesshow.php:243
+#. 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"
@@ -1134,51 +1176,49 @@ msgstr "Solmente le usator pote adder cosas a su proprie chronologia."
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Solmente acceptar AtomPub pro syndicationes Atom."
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr "Le message Atom non pote esser vacue."
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 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:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, 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.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, 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:406
+#: actions/apitimelineuser.php:409
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Un nota con le URI \"%s\" jam existe."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr "Message AtomPub con URI de attention incognite %s"
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1189,96 +1229,108 @@ msgstr "Methodo API in construction."
 msgid "User not found."
 msgstr "Usator non trovate."
 
-#: actions/atompubfavoritefeed.php:70
-msgid "No such profile"
-msgstr "Profilo non existe"
-
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr "Notas que %s ha addite al favorites in %s"
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-msgid "Can't add someone else's subscription"
-msgstr "Non es possibile adder le subscription de un altere persona."
-
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-msgstr "Solmente le activitates Favorite es possibile."
-
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
-msgid "Can only fave notices."
-msgstr "Solmente notas pote esser addite al favorites."
-
-#: actions/atompubfavoritefeed.php:256
-msgid "Unknown note."
-msgstr "Nota incognite."
-
-#: actions/atompubfavoritefeed.php:263
-msgid "Already a favorite."
-msgstr "Es ja favorite."
-
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "Profilo non existe."
 
+#. 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 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
+#, fuzzy
+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"
 
-#: actions/atompubmembershipfeed.php:147
-#, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "Gruppos del quales %s es membro in %s"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
+#. 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 pote 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:241
-msgid "Can only handle Join activities."
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
 msgstr "Solmente le activitates \"Join\" es possibile."
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 msgid "Unknown group."
 msgstr "Gruppo incognite."
 
-#: actions/atompubmembershipfeed.php:263
+#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
+#: actions/atompubmembershipfeed.php:267
 msgid "Already a member."
 msgstr "Ja membro."
 
-#: actions/atompubmembershipfeed.php:270
+#. 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."
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+#, fuzzy
+msgid "Cannot delete someone else's favorite"
 msgstr "Non pote deler le favorite de un altere persona."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "Gruppo non existe"
 
-#: actions/atompubshowmembership.php:90
+#. 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"
 
-#: actions/atompubshowmembership.php:115
-msgid "Method not supported"
-msgstr "Methodo non supportate"
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
+#, fuzzy
+msgid "HTTP method not supported"
+msgstr "Methodo HTTP non supportate."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, fuzzy
+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.
@@ -1286,41 +1338,38 @@ msgstr "Non pote deler le membrato de un altere persona"
 #: actions/atompubshowsubscription.php:72
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
-#, php-format
-msgid "No such profile id: %d"
+#, fuzzy, 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
 #, fuzzy, php-format
-msgid "Profile %1$d not subscribed to profile %2$d"
-msgstr "Le profilo %d non es subscribite al profilo %d"
+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
 #, fuzzy
-msgid "Cannot delete someone else's subscription"
+msgid "Cannot delete someone else's subscription."
 msgstr "Non pote deler le subscription de un altere persona"
 
-#: actions/atompubsubscriptionfeed.php:150
-#, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "Personas al quales %s ha subscribite in %s"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr "Solmente le activitates \"Follow\" es possibile."
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr "Pote solmente sequer personas."
 
-#: actions/atompubsubscriptionfeed.php:262
-#, php-format
-msgid "Unknown profile %s"
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
+#, fuzzy, php-format
+msgid "Unknown profile %s."
 msgstr "Profilo incognite: %s"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1331,10 +1380,11 @@ msgstr "Annexo non existe."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Nulle pseudonymo."
@@ -1366,30 +1416,36 @@ msgstr ""
 "Tu pote incargar tu avatar personal. Le dimension maximal del file 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "Configuration del avatar"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "Original"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "Previsualisation"
 
@@ -1424,7 +1480,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "Datos del file perdite."
 
@@ -1443,7 +1500,7 @@ msgstr "Actualisation del avatar fallite."
 msgid "Avatar deleted."
 msgstr "Avatar delite."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr "Facer un copia de reserva del conto"
 
@@ -1549,6 +1606,7 @@ msgstr "Falleva de salveguardar le information del blocada."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1558,7 +1616,7 @@ msgstr "Falleva de salveguardar le information del blocada."
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1638,23 +1696,6 @@ msgstr "Le typo de adresse %s non es recognoscite."
 msgid "That address has already been confirmed."
 msgstr "Iste adresse ha ja essite confirmate."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-msgstr "Non poteva actualisar usator."
-
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
 #: actions/confirmaddress.php:132
@@ -1704,7 +1745,7 @@ msgstr "Io es secur."
 #: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write  \"%s\" exactly in the box."
-msgstr ""
+msgstr "Tu debe scriber \"%s\" exactemente in le quadro."
 
 #. TRANS: Confirmation that a user account has been deleted.
 #: actions/deleteaccount.php:206
@@ -1712,7 +1753,7 @@ msgid "Account deleted."
 msgstr "Conto delite."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 msgid "Delete account"
 msgstr "Deler conto"
 
@@ -1722,6 +1763,8 @@ msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
 msgstr ""
+"Isto resulta in le <strong>deletion permanente</strong> del datos de tu "
+"conto ab iste servitor."
 
 #. 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.
@@ -1731,6 +1774,8 @@ msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
 "deletion."
 msgstr ""
+"Es fortemente consiliate facer un <a href=\"%s\">copia de reserva de tu "
+"datos</a> ante le deletion."
 
 #. TRANS: Field label for delete account confirmation entry.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
@@ -1741,15 +1786,14 @@ 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
+#, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
-msgstr "Tu non pote deler usatores."
+msgstr "Entra \"%s\" pro confirmar que tu vole deler tu conto."
 
 #. TRANS: Button title for user account deletion.
 #: actions/deleteaccount.php:323
-#, fuzzy
 msgid "Permanently delete your account"
-msgstr "Tu non pote deler usatores."
+msgstr "Deler permanentemente tu conto"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 #: actions/deleteapplication.php:62
@@ -2075,7 +2119,7 @@ msgid "Reset back to default"
 msgstr "Revenir al predefinitiones"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2187,14 +2231,16 @@ msgid "Edit %s group"
 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:70 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: Client error displayed trying to edit a group while not 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:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "Tu debe esser administrator pro modificar le gruppo."
 
@@ -2255,8 +2301,8 @@ msgstr "Adresse de e-mail actualmente confirmate."
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Remover"
@@ -2281,15 +2327,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "E-mail entrante"
 
@@ -2300,13 +2346,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 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."
@@ -2322,7 +2368,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nove"
@@ -2396,9 +2442,10 @@ 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, fuzzy
+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.
@@ -2414,8 +2461,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Nulle confirmation pendente a cancellar."
 
@@ -2426,8 +2473,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+msgid "Could not delete email confirmation."
 msgstr "Non poteva deler confirmation de e-mail."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
@@ -2446,24 +2494,25 @@ msgstr "Isto non es tu adresse de e-mail."
 msgid "The email address was removed."
 msgstr "Le adresse de e-mail ha essite removite."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, fuzzy
+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:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 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:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "Nove adresse de e-mail entrante addite."
 
@@ -2561,7 +2610,7 @@ msgstr "Non expectava iste responsa!"
 msgid "User being listened to does not exist."
 msgstr "Le usator sequite non existe."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Tu pote usar le subscription local!"
 
@@ -2691,22 +2740,19 @@ msgstr ""
 "Personalisa le apparentia de tu gruppo con un imagine de fundo e un paletta "
 "de colores de tu preferentia."
 
-#. 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "Non poteva actualisar tu apparentia."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "Preferentias de apparentia salveguardate."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "Logotypo del gruppo"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2714,23 +2760,28 @@ msgstr ""
 "Tu pote incargar un imagine pro le logotypo de tu gruppo. Le dimension "
 "maximal del file es %s."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "Incargar"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "Taliar"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr "Selige un area quadrate del imagine que devenira le logotypo."
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "Logotypo actualisate."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "Falleva de actualisar le logotypo."
 
@@ -2871,14 +2922,14 @@ msgid "Error removing the block."
 msgstr "Error de remover le blocada."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2888,23 +2939,23 @@ msgstr ""
 "Jabber/GTalk. Configura tu adresse e parametros hic infra."
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "Messageria instantanee non disponibile."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "Adresse de messageria instantanee"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Adresse Jabber/GTalk actualmente confirmate."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2918,7 +2969,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2929,65 +2980,65 @@ msgstr ""
 "in GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Preferentias de messageria instantanee"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Inviar me notas per Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Publicar un nota quando mi stato de Jabber/GTalk cambia."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Inviar me responsas per Jabber/GTalk de personas al quales io non es "
 "subscribite."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publicar un MicroID pro mi adresse Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Preferentias confirmate."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Nulle ID de Jabber."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "Non pote normalisar iste ID de Jabber"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "ID de Jabber non valide"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "Isto es ja tu ID de Jabber."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID already belongs to another user."
 msgstr "Le ID de Jabber pertine ja a un altere usator."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2997,28 +3048,29 @@ msgstr ""
 "instantanee specificate. Tu debe approbar que %s invia messages a te."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 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:400
-msgid "Couldn't delete IM confirmation."
+#: actions/imsettings.php:391
+#, fuzzy
+msgid "Could not delete IM confirmation."
 msgstr "Non poteva deler confirmation de messageria instantanee."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Isto non es tu ID de Jabber."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "Le adresse de messageria instantanee ha essite removite."
 
@@ -3244,20 +3296,20 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s quitava le gruppo %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Licentia"
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr "Licentia pro iste sito StatusNet"
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr "Selection de licentia invalide."
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
@@ -3265,87 +3317,87 @@ msgstr ""
 "Tu debe specificar le proprietario del contento si tu usa le licentia \"Tote "
 "derectos reservate\"."
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Titulo de licentia invalide. Longitude maximal es 255 characteres."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr "URL de licentia invalide."
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr "URL de imagine de licentia invalide."
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 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:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr "Le imagine de licentia debe esser vacue o un URL valide."
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr "Selection de licentia"
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "Private"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr "Tote le derectos reservate"
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr "Typo"
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr "Selige licentia"
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr "Detalios de licentia"
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr "Proprietario"
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 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:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr "Titulo de licentia"
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr "Le titulo del licentia."
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr "URL del licentia"
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr "URL pro ulterior informationes super le licentia."
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr "URL del imagine del licentia"
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr "Le URL de un imagine a monstrar con le licentia."
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Salveguardar configurationes de licentia"
 
@@ -3455,9 +3507,8 @@ 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
-#, fuzzy
 msgid "You are not allowed to create groups on this site."
-msgstr "Tu non ha le permission de deler iste gruppo."
+msgstr "Tu non ha le permission de crear gruppos in iste sito."
 
 #. TRANS: Form instructions for group create form.
 #: actions/newgroup.php:117
@@ -4120,12 +4171,12 @@ msgstr ""
 "$s’."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "Configurationes del profilo"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4133,18 +4184,18 @@ msgstr ""
 "gente pote facer plus de te."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "Information de profilo"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4152,20 +4203,20 @@ msgstr "Nomine complete"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Pagina personal"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: 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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4173,19 +4224,19 @@ 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:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "Bio"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4193,24 +4244,24 @@ msgid "Location"
 msgstr "Loco"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 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:157
+#: actions/profilesettings.php:153
 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:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "Etiquettas"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4218,27 +4269,27 @@ msgstr ""
 "spatios"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "Lingua"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "Lingua preferite"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "Fuso horari"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 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:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4247,7 +4298,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4255,54 +4306,50 @@ 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:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Fuso horari non seligite."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:276
 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 actions/tagother.php:178
 #, 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:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, fuzzy
+msgid "Could not update user for autosubscribe."
 msgstr "Non poteva actualisar usator pro autosubscription."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, fuzzy
+msgid "Could not save location prefs."
 msgstr "Non poteva salveguardar le preferentias de loco."
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "Non poteva salveguardar profilo."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Preferentias confirmate."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
-#, fuzzy
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 msgid "Restore account"
-msgstr "Crear un conto"
+msgstr "Restaurar conto"
 
 #: actions/public.php:83
 #, php-format
@@ -4692,7 +4739,7 @@ msgstr ""
 "(Tu recipera tosto un message de e-mail con instructiones pro confirmar tu "
 "adresse de e-mail.)"
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4704,74 +4751,77 @@ msgstr ""
 "[sito de microblogging compatibile](%%doc.openmublog%%), entra hic infra le "
 "URL de tu profilo."
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Subscription remote"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Subscriber te a un usator remote"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Pseudonymo del usator"
 
-#: actions/remotesubscribe.php:130
+#: 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:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "URL del profilo"
 
-#: actions/remotesubscribe.php:134
+#: 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"
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "Subscriber"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "URL de profilo invalide (mal formato)"
 
-#: actions/remotesubscribe.php:168
+#: 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:176
-msgid "That’s a local profile! Login to subscribe."
+#: actions/remotesubscribe.php:175
+#, fuzzy
+msgid "That is a local profile! Login to subscribe."
 msgstr "Isto es un profilo local! Aperi un session pro subscriber."
 
-#: actions/remotesubscribe.php:183
-msgid "Couldn’t get a request token."
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
 msgstr "Non poteva obtener un indicio de requesta."
 
-#: actions/repeat.php:57
+#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Solmente usatores authenticate pote repeter notas."
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Nulle nota specificate."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "Tu non pote repeter tu proprie nota."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Tu ha ja repetite iste nota."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Repetite"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Repetite!"
 
@@ -4835,22 +4885,19 @@ 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
-#, fuzzy
 msgid "Only logged-in users can restore their account."
-msgstr "Solmente usatores authenticate pote repeter notas."
+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
-#, fuzzy
 msgid "You may not restore your account."
-msgstr "Tu non ha ancora registrate alcun application."
+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
-#, fuzzy
 msgid "No uploaded file."
-msgstr "Incargar 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
@@ -4893,9 +4940,8 @@ 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
-#, fuzzy
 msgid "Not an Atom feed."
-msgstr "Non es membro"
+msgstr "Non es un syndication Atom."
 
 #. TRANS: Success message when a feed has been restored.
 #: actions/restoreaccount.php:241
@@ -4903,11 +4949,13 @@ msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
+"Le syndication ha essite restaurate. Tu vetule messages debe ora apparer in "
+"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 ""
+msgstr "Le syndication essera restaurate. Per favor attende qualque minutas."
 
 #. TRANS: Form instructions for feed restore.
 #: actions/restoreaccount.php:342
@@ -4915,12 +4963,13 @@ msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
+"Tu pote incargar un copia de reserva de un fluxo in formato <a href=\"http://"
+"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
-#, fuzzy
 msgid "Upload the file"
-msgstr "Incargar file"
+msgstr "Incargar le file"
 
 #: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
@@ -5541,70 +5590,70 @@ msgid "Save site notice"
 msgstr "Salveguardar aviso del sito"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "Parametros de SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "SMS non es disponibile."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "Adresse SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 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:133
+#: actions/smssettings.php:129
 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:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "Codice de confirmation"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 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:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "Numero de telephono pro SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 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:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "Preferentias de SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5613,32 +5662,32 @@ msgstr ""
 "de mi operator."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
 msgid "SMS preferences saved."
 msgstr "Preferentias de SMS confirmate."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "Nulle numero de telephono."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr "Nulle operator seligite."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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."
@@ -5647,39 +5696,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:413
+#: actions/smssettings.php:404
 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:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 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:470
+#: actions/smssettings.php:460
 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:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "Operator de telephonia mobile"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5690,7 +5739,7 @@ msgstr ""
 "nos a %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "Nulle codice entrate"
 
@@ -5953,10 +6002,6 @@ msgstr ""
 "Tu pote solmente etiquettar personas a qui tu es subscribite o qui es "
 "subscribite a te."
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "Non poteva salveguardar etiquettas."
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
@@ -6187,12 +6232,12 @@ 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:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "Apparentia del profilo"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6200,7 +6245,7 @@ msgstr ""
 "Personalisa le apparentia de tu profilo con un imagine de fundo e un paletta "
 "de colores de tu preferentia."
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr "Bon appetito!"
 
@@ -6965,54 +7010,53 @@ 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 "Lingua \"%s\" incognite."
+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 ""
+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
-#, fuzzy
 msgid "Cannot force remote user to subscribe."
-msgstr "Specifica le nomine del usator al qual subscriber te."
+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
-#, fuzzy
 msgid "Unknown profile."
-msgstr "Profilo incognite: %s"
+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 ""
+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 ""
+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
-#, fuzzy
 msgid "User is already a member of this group."
-msgstr "Tu es ja membro de iste gruppo."
+msgstr "Le usator es ja membro de iste gruppo."
 
 #. 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 "
+"confidentia."
 
 #. 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 "Nulle contento pro nota %d."
+msgstr "Nulle contento pro nota %s."
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7165,24 +7209,30 @@ msgstr ""
 "requesta."
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 msgid "Could not issue access token."
 msgstr "Non poteva emitter le indicio de accesso."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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
+#, fuzzy
+msgid "Database error updating OAuth application user."
+msgstr ""
+"Error del base de datos durante le insertion del usator del application "
+"OAuth."
+
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "Falleva de deler le indicio revocate."
 
@@ -7301,15 +7351,13 @@ msgid "Revoke"
 msgstr "Revocar"
 
 #: lib/atom10feed.php:113
-#, fuzzy
 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
-#, fuzzy
 msgid "Do not use this method!"
-msgstr "Non deler iste gruppo"
+msgstr "Non usa iste methodo!"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7829,6 +7877,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Reinitialisar"
 
+#. 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
+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
 msgid "Design defaults restored."
@@ -7859,17 +7913,16 @@ msgid "FOAF"
 msgstr "Amico de un amico"
 
 #: lib/feedimporter.php:75
-#, fuzzy
 msgid "Not an atom feed."
-msgstr "Non es membro"
+msgstr "Non es un syndication Atom."
 
 #: lib/feedimporter.php:82
 msgid "No author in the feed."
-msgstr ""
+msgstr "Il non ha un autor in le syndication."
 
 #: lib/feedimporter.php:89
 msgid "Can't import without a user."
-msgstr ""
+msgstr "Non pote importar sin usator."
 
 #. TRANS: Header for feed links (h2).
 #: lib/feedlist.php:66
@@ -9180,3 +9233,30 @@ msgstr "XML invalide, radice XRD mancante."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Obtene copia de reserva ex file '%s'."
+
+#~ msgid "AtomPub post with unknown attention URI %s"
+#~ msgstr "Message AtomPub con URI de attention incognite %s"
+
+#~ msgid "No such profile"
+#~ msgstr "Profilo non existe"
+
+#~ msgid "Notices %s has favorited to on %s"
+#~ msgstr "Notas que %s ha addite al favorites in %s"
+
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "Gruppos del quales %s es membro in %s"
+
+#~ msgid "Method not supported"
+#~ msgstr "Methodo non supportate"
+
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "Personas al quales %s ha subscribite in %s"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "Non poteva actualisar usator."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "Non poteva salveguardar profilo."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "Non poteva salveguardar etiquettas."
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index 24ee84e74c..f9cbcf30a2 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:34:55+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05:34+0000\n"
 "Language-Team: Icelandic <http://translatewiki.net/wiki/Portal:is>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: is\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -92,9 +92,9 @@ msgstr "Stillingar fyrir mynd"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -117,6 +117,8 @@ msgstr "Ekkert þannig merki."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -137,8 +139,8 @@ msgstr "Ekkert þannig merki."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -149,7 +151,7 @@ msgstr "Ekkert þannig merki."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -311,7 +313,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 #, fuzzy
 msgid "Could not update user."
 msgstr "Gat ekki uppfært notanda."
@@ -334,7 +350,8 @@ msgid "User has no profile."
 msgstr "Notandi hefur enga persónulega síðu."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 #, fuzzy
 msgid "Could not save profile."
 msgstr "Gat ekki vistað persónulega síðu."
@@ -367,8 +384,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr ""
 
@@ -376,14 +393,18 @@ msgstr ""
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
+#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 #, fuzzy
 msgid "Could not update your design."
 msgstr "Gat ekki uppfært hóp."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+msgctxt "ATOM"
 msgid "Main"
 msgstr ""
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -394,32 +415,39 @@ msgstr ""
 msgid "%s timeline"
 msgstr "Rás %s"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s áskriftir"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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 "Uppáhald"
 
-#: actions/apiatomservice.php:123
+#. 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 "Hópmeðlimir %s"
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:104
+#: actions/apiblockcreate.php:105
 #, fuzzy
 msgid "You cannot block yourself!"
 msgstr "Gat ekki uppfært notanda."
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Mistókst að loka á notanda."
 
@@ -567,7 +595,7 @@ msgstr "Gat ekki uppfært notanda."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
@@ -577,7 +605,7 @@ msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ekki tækt stuttnefni."
@@ -589,7 +617,7 @@ msgstr "Ekki tækt stuttnefni."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Heimasíða er ekki gild vefslóð."
@@ -599,7 +627,7 @@ msgstr "Heimasíða er ekki gild vefslóð."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -627,7 +655,7 @@ msgstr[1] "Staðsetning er of löng (í mesta lagi %d stafir)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -754,7 +782,7 @@ msgid "Upload failed."
 msgstr "Misheppnuð skipun"
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:101
+#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "Ótækt bablinnihald"
@@ -777,18 +805,19 @@ msgid "Request token already authorized."
 msgstr "Þú ert ekki áskrifandi."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -811,16 +840,17 @@ msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s"
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Bjóst ekki við innsendingu eyðublaðs."
 
@@ -866,7 +896,7 @@ msgstr "Aðgangur"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -887,7 +917,7 @@ msgstr "Lykilorð"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 #, fuzzy
 msgctxt "BUTTON"
@@ -961,6 +991,7 @@ msgstr "Þú getur ekki eytt stöðu annars notanda."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: 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
@@ -981,40 +1012,50 @@ msgstr "Get ekki kveikt á tilkynningum."
 msgid "Already repeated that notice."
 msgstr "Get ekki eytt þessu babli."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "Aðferð í forritsskilum fannst ekki!"
 
-#: actions/apistatusesshow.php:141
+#. 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 "Skráarsnið myndar ekki stutt."
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:152
+#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr ""
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Engin staða með þessu kenni fannst."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "Get ekki eytt þessu babli."
 
-#: actions/apistatusesshow.php:243
+#. 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 "Eyða babli"
@@ -1149,51 +1190,49 @@ msgstr "Aðeins notandinn getur lesið hans eigin pósthólf."
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Finna innihald babls"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:406
+#: actions/apitimelineuser.php:409
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Enginn persónuleg síða með þessu einkenni."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1204,109 +1243,117 @@ msgstr "Aðferð í forritsskilum er í þróun."
 msgid "User not found."
 msgstr "Aðferð í forritsskilum fannst ekki!"
 
-#: actions/atompubfavoritefeed.php:70
-#, fuzzy
-msgid "No such profile"
-msgstr "Ekkert svoleiðis babl."
-
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-#, fuzzy
-msgid "Can't add someone else's subscription"
-msgstr "Gat ekki sett inn nýja áskrift."
-
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
-#, fuzzy
-msgid "Can only fave notices."
-msgstr "Finna innihald babls"
-
-#: actions/atompubfavoritefeed.php:256
-#, fuzzy
-msgid "Unknown note."
-msgstr "Óþekkt aðgerð"
-
-#: actions/atompubfavoritefeed.php:263
-#, fuzzy
-msgid "Already a favorite."
-msgstr "Bæta við sem uppáhaldsbabli"
-
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
 #, fuzzy
 msgid "No such profile."
 msgstr "Ekkert svoleiðis babl."
 
+#. 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 "Gat ekki sett inn nýja áskrift."
+
+#. 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 "Finna innihald babls"
+
+#. 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 "Finna innihald babls"
+
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+#: actions/atompubfavoritefeed.php:259
+#, fuzzy
+msgid "Unknown note."
+msgstr "Óþekkt aðgerð"
+
+#. TRANS: Client exception thrown when trying favorite an already favorited notice.
+#: actions/atompubfavoritefeed.php:267
+#, fuzzy
+msgid "Already a favorite."
+msgstr "Bæta við sem uppáhaldsbabli"
+
+#. TRANS: Title for group membership feed.
+#. TRANS: %s is a username.
 #: actions/atompubmembershipfeed.php:144
 #, fuzzy, php-format
 msgid "%s group memberships"
 msgstr "Hópmeðlimir %s"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "Hópar sem %s er meðlimur í"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "Gat ekki sett inn nýja áskrift."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:241
-msgid "Can only handle Join activities."
-msgstr ""
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
+msgstr "Finna innihald babls"
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Óþekkt aðgerð"
 
-#: actions/atompubmembershipfeed.php:263
+#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
+#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "Allir meðlimir"
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:89
+#. TRANS: Client exception thrown when referencing a non-existing favorite.
+#: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
 msgstr "Ekkert svoleiðis babl."
 
+#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
 #: actions/atompubshowfavorite.php:151
 #, fuzzy
-msgid "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr "Gat ekki eytt uppáhaldi."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "Enginn þannig hópur."
 
-#: actions/atompubshowmembership.php:90
+#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
+#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member"
 msgstr "Allir meðlimir"
 
-#: actions/atompubshowmembership.php:115
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "Method not supported"
+msgid "HTTP method not supported"
 msgstr "Aðferð í forritsskilum fannst ekki!"
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, fuzzy
+msgid "Cannot delete someone else's membership"
+msgstr "Gat ekki vistað áskrift."
 
 #. 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.
@@ -1314,40 +1361,37 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
-msgid "No such profile id: %d"
+msgid "No such profile id: %d."
 msgstr "Ekkert svoleiðis babl."
 
 #. 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"
+msgid "Profile %1$d not subscribed to profile %2$d."
 msgstr "Þú ert ekki áskrifandi."
 
 #. 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"
+msgid "Cannot delete someone else's subscription."
 msgstr "Gat ekki vistað áskrift."
 
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "Fólk sem eru áskrifendur að %s"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
 msgstr "Óþekkt skráargerð"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1359,10 +1403,11 @@ msgstr "Ekkert þannig merki."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Ekkert stuttnefni."
@@ -1393,30 +1438,36 @@ msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
 
 #. 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Notandi hefur enga persónulega síðu."
 
 #. 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "Stillingar fyrir mynd"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "Upphafleg mynd"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "Forsýn"
 
@@ -1456,7 +1507,8 @@ msgstr ""
 "Veldu ferningslaga svæði á upphaflegu myndinni sem einkennismyndina þína"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "Týndum skráargögnunum okkar"
 
@@ -1476,7 +1528,7 @@ msgstr "Mistókst að uppfæra mynd"
 msgid "Avatar deleted."
 msgstr "Mynd hefur verið uppfærð."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1576,6 +1628,7 @@ msgstr "Mistókst að vista upplýsingar um notendalokun"
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1585,7 +1638,7 @@ msgstr "Mistókst að vista upplýsingar um notendalokun"
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1668,23 +1721,6 @@ msgstr "Óþekkt gerð tölvupóstfangs %s"
 msgid "That address has already been confirmed."
 msgstr "Þetta tölvupóstfang hefur nú þegar verið staðfest."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-msgstr "Gat ekki uppfært notanda."
-
 #. 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
@@ -1748,7 +1784,7 @@ msgid "Account deleted."
 msgstr "Mynd hefur verið uppfærð."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "Búa til nýjan hóp"
@@ -2124,7 +2160,7 @@ msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2246,14 +2282,16 @@ msgid "Edit %s group"
 msgstr "Breyta hópnum %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:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Þú verður að hafa skráð þig inn til að búa til hóp."
 
 #. TRANS: Client error displayed trying to edit a group while not 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:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "Þú verður að hafa skráð þig inn til að búa til hóp."
 
@@ -2316,8 +2354,8 @@ msgstr "Núverandi staðfesta tölvupóstfangið."
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Endurheimta"
@@ -2342,8 +2380,8 @@ msgstr "Tölvupóstfang eins og \"notandi@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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
@@ -2351,7 +2389,7 @@ msgstr "Bæta við"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Móttökutölvupóstur"
 
@@ -2362,13 +2400,13 @@ msgstr "Ég vil babla í gegnum tölvupóst."
 
 #. 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 msgid "Send email to this address to post new notices."
 msgstr "Sendu tölvupóst á þetta póstfang til þess að senda inn nýtt babl."
 
 #. 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Búa til nýtt tölvupóstfang til að senda til. Skrifar yfir það gamla."
 
@@ -2381,7 +2419,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 #, fuzzy
 msgctxt "BUTTON"
 msgid "New"
@@ -2458,9 +2496,10 @@ msgstr "Þetta tölvupóstfang tilheyrir öðrum notanda."
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, fuzzy
+msgid "Could not insert confirmation code."
 msgstr "Gat ekki sett inn staðfestingarlykil."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
@@ -2476,8 +2515,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Engin staðfesting í bið sem þarf að hætta við."
 
@@ -2489,8 +2528,9 @@ msgstr "Þetta er rangt snarskilaboðafang."
 
 #. 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+msgid "Could not delete email confirmation."
 msgstr "Gat ekki eytt tölvupóstsstaðfestingu."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
@@ -2509,24 +2549,25 @@ msgstr "Þetta er ekki tölvupóstfangið þitt."
 msgid "The email address was removed."
 msgstr "Móttökutölvupóstfang fjarlægt."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:554
 msgid "No incoming email address."
 msgstr "Ekkert móttökutölvupóstfang."
 
 #. 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, fuzzy
+msgid "Could not update user record."
 msgstr "Gat ekki uppfært skráarfærslu notanda."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 msgid "Incoming email address removed."
 msgstr "Móttökutölvupóstfang fjarlægt."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "Nýju móttökutölvupóstfangi bætt við."
 
@@ -2623,7 +2664,7 @@ msgstr "Bjóst ekki við þessu svari!"
 msgid "User being listened to does not exist."
 msgstr "Notandi sem verið er að hlusta á er ekki til."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Þú getur notað staðbundna áskrift!"
 
@@ -2763,48 +2804,49 @@ msgid ""
 "palette of your choice."
 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-#, fuzzy
-msgid "Couldn't update your design."
-msgstr "Gat ekki uppfært hóp."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 #, fuzzy
 msgid "Design preferences saved."
 msgstr "Stillingar vistaðar."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "Einkennismynd hópsins"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, fuzzy, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "Hlaða upp"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "Skera af"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 #, fuzzy
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 "Veldu ferningslaga svæði á upphaflegu myndinni sem einkennismyndina þína"
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "Einkennismynd uppfærð."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "Tókst ekki að uppfæra einkennismynd"
 
@@ -2938,14 +2980,14 @@ msgid "Error removing the block."
 msgstr "Vill kom upp við að aflétta notendalokun."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "Stillingar fyrir mynd"
 
 #. 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2956,24 +2998,24 @@ msgstr ""
 "neðan og stilltu notkunina."
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 #, fuzzy
 msgid "IM is not available."
 msgstr "Þessi síða er ekki aðgengileg í "
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "Tölvupóstföng"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Núverandi staðfesta Jabber/GTalk snarskilaboðafangið."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2988,7 +3030,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2999,64 +3041,64 @@ msgstr ""
 "á GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Stillingar vistaðar."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Sendur mér babl í gegnum Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Senda inn babl þegar Jabber/GTalk staðan breytist."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Sendu mér svör í gegnum Jabber/GTalk frá fólki sem ég er ekki áskrifandi að."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Birta MicroID fyrir Jabber/GTalk netfangið mitt."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Stillingar vistaðar."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Ekkert Jabber-kenni"
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "Get ekki staðlað þetta Jabber kenni"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "Ekki tækt Jabber-kenni"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "Þetta er nú þegar Jabber-kennið þitt."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber-kennið tilheyrir öðrum notanda."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -3066,29 +3108,29 @@ msgstr ""
 "við. Þú verður að leyfa %s að senda snarskilaboð til þín."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "Þetta er rangt snarskilaboðafang."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:400
+#: actions/imsettings.php:391
 #, fuzzy
-msgid "Couldn't delete IM confirmation."
+msgid "Could not delete IM confirmation."
 msgstr "Gat ekki eytt tölvupóstsstaðfestingu."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "Enginn staðfestingarlykill."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#: actions/imsettings.php:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Þetta er ekki Jabber-kennið þitt."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "Móttökutölvupóstfang fjarlægt."
 
@@ -3318,108 +3360,108 @@ msgid "%1$s left group %2$s"
 msgstr "Staða %1$s á %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr ""
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Staðsetning er of löng (í mesta lagi 255 stafir)."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 #, fuzzy
 msgid "Private"
 msgstr "Friðhelgi"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
 
@@ -4224,12 +4266,12 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "Stillingar persónulegrar síðu"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4237,19 +4279,19 @@ msgstr ""
 "um þig."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "Upplýsingar á persónulegri síðu"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4257,13 +4299,13 @@ msgstr "Fullt nafn"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Heimasíða"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
@@ -4273,7 +4315,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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4281,20 +4323,20 @@ msgstr[0] "Lýstu þér og áhugamálum þínum í 140 táknum"
 msgstr[1] "Lýstu þér og áhugamálum þínum í 140 táknum"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Lýstu þér og þínum "
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "Lýsing"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4302,24 +4344,24 @@ msgid "Location"
 msgstr "Staðsetning"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Staðsetning þín, eins og \"borg, sýsla, land\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:157
+#: actions/profilesettings.php:153
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "Merki"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4327,27 +4369,27 @@ msgstr ""
 "bili"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "Tungumál"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "Tungumál (ákjósanlegt)"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "Tímabelti"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 msgid "What timezone are you normally in?"
 msgstr "Í hvaða tímabelti eru í rauninni?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4357,7 +4399,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4365,53 +4407,49 @@ msgstr[0] "Staðsetning er of löng (í mesta lagi %d stafir)."
 msgstr[1] "Staðsetning er of löng (í mesta lagi %d stafir)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Tímabelti ekki valið."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:276
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Tungumál er of langt (í mesta lagi 50 stafir)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 actions/tagother.php:178
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Ógilt merki: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, fuzzy
+msgid "Could not update user for autosubscribe."
 msgstr "Gat ekki uppfært notanda í sjálfvirka áskrift."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:409
+#: actions/profilesettings.php:404
 #, fuzzy
-msgid "Couldn't save location prefs."
+msgid "Could not save location prefs."
 msgstr "Gat ekki vistað merki."
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "Gat ekki vistað persónulega síðu."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+msgid "Could not save tags."
 msgstr "Gat ekki vistað merki."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Stillingar vistaðar."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Búa til nýjan hóp"
@@ -4795,7 +4833,7 @@ msgstr ""
 "(Þú ættir að fá tölvupóst eftir smá stund. Í tölvupóstinum eru leiðbeiningar "
 "um það hvernig þú staðfestir tölvupóstfangið þitt.)"
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4807,83 +4845,83 @@ msgstr ""
 "[samvirkandi örbloggsþjónustu](%%doc.openmublog%%), sláðu þá inn veffang "
 "persónulegu síðunnar þinnar hér fyrir neðan."
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Fara í fjaráskrift"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 #, fuzzy
 msgid "Subscribe to a remote user"
 msgstr "Gerast áskrifandi að þessum notanda"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Stuttnefni notanda"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "Stuttnefni notandans sem þú vilt fylgja"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Veffang persónulegrar síðu"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "Veffang persónulegrar síðu á samvirkandi örbloggsþjónustu"
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "Gerast áskrifandi"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "Ótækt veffang persónulegrar síðu (vitlaust snið)"
 
-#: actions/remotesubscribe.php:168
+#: actions/remotesubscribe.php:167
 #, fuzzy
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr "Ekki tækt veffang á persónulega síðu (ekkert YADIS skjal)."
 
-#: actions/remotesubscribe.php:176
+#: actions/remotesubscribe.php:175
 #, fuzzy
-msgid "That’s a local profile! Login to subscribe."
+msgid "That is a local profile! Login to subscribe."
 msgstr ""
 "Þetta er staðbundinn persónuaðgangur! Skráðu þig inn til að gerast "
 "áskrifandi."
 
-#: actions/remotesubscribe.php:183
+#: actions/remotesubscribe.php:182
 #, fuzzy
-msgid "Couldn’t get a request token."
+msgid "Could not get a request token."
 msgstr "Gat ekki komist yfir beiðnistóka."
 
-#: actions/repeat.php:57
+#: actions/repeat.php:56
 #, fuzzy
 msgid "Only logged-in users can repeat notices."
 msgstr "Aðeins notandinn getur lesið hans eigin pósthólf."
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 #, fuzzy
 msgid "No notice specified."
 msgstr "Engin persónuleg síða tilgreind"
 
-#: actions/repeat.php:76
+#: actions/repeat.php:75
 #, fuzzy
-msgid "You can't repeat your own notice."
+msgid "You cannot repeat your own notice."
 msgstr "Þú getur ekki nýskráð þig nema þú samþykkir leyfið."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 #, fuzzy
 msgid "You already repeated that notice."
 msgstr "Þú hefur nú þegar lokað á þennan notanda."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 #, fuzzy
 msgid "Repeated"
 msgstr "Í sviðsljósinu"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr ""
 
@@ -5631,72 +5669,72 @@ msgid "Save site notice"
 msgstr "Babl vefsíðunnar"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "Stillingar fyrir mynd"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Þú getur fengið SMS í gegnum tölvupóst frá %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:97
+#: actions/smssettings.php:93
 #, fuzzy
 msgid "SMS is not available."
 msgstr "Þessi síða er ekki aðgengileg í "
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "Tölvupóstföng"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Núverandi staðfesta SMS símanúmerið."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:133
+#: actions/smssettings.php:129
 msgid "Awaiting confirmation on this phone number."
 msgstr "Býð eftir staðfestingu varðandi þetta símanúmer."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "Staðfestingarlykill"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 msgid "Enter the code you received on your phone."
 msgstr "Sláðu inn lykilinn sem þú fékkst í símann þinn."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
+#: actions/smssettings.php:144
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Staðfesta"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "Ekkert símanúmer."
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Símanúmer, með svæðisnúmeri ef við á, án greinarmerkja eða bila"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "Stillingar vistaðar."
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5705,33 +5743,33 @@ msgstr ""
 "farsímafyrirtækið rukki fyrir móttöku á SMSunum."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
 #, fuzzy
 msgid "SMS preferences saved."
 msgstr "Stillingar vistaðar."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "Ekkert símanúmer."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr "Ekkert farsímafélag valið."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 msgid "That is already your phone number."
 msgstr "Þetta er nú þegar símanúmerið þitt."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:356
+#: actions/smssettings.php:348
 msgid "That phone number already belongs to another user."
 msgstr "Þetta símanúmer tilheyri nú þegar öðrum notanda."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:384
+#: actions/smssettings.php:376
 #, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
@@ -5742,40 +5780,40 @@ msgstr ""
 "staðfestingarlykillinn að vera og leiðbeingar um hvernig eigi að nota hann. "
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
+#: actions/smssettings.php:404
 msgid "That is the wrong confirmation number."
 msgstr "Þetta er rangur staðfestingarlykill."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:427
+#: actions/smssettings.php:418
 msgid "SMS confirmation cancelled."
 msgstr "SMS staðfesting"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
-#: actions/smssettings.php:448
+#: actions/smssettings.php:438
 msgid "That is not your phone number."
 msgstr "Þetta er ekki símanúmerið þitt."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
+#: actions/smssettings.php:460
 #, fuzzy
 msgid "The SMS phone number was removed."
 msgstr "SMS símanúmer"
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "Farsímafyrirtæki"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 msgid "Select a carrier"
 msgstr "Veldu farsímafyrirtæki"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5786,7 +5824,7 @@ msgstr ""
 "láttu okkur vita."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "Enginn lykill sleginn inn"
 
@@ -6042,10 +6080,6 @@ msgstr ""
 "Þú getur aðeins merkt fólk sem þú ert áskrifandi að eða þau sem eru "
 "áskrifendur að þér."
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "Gat ekki vistað merki."
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
@@ -6290,19 +6324,19 @@ msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Röng gerð myndar fyrir '%s'"
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 #, fuzzy
 msgid "Profile design"
 msgstr "Stillingar persónulegrar síðu"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr ""
 
@@ -7287,24 +7321,28 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Gat ekki skeytt skilaboðum inn í."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: lib/apioauthstore.php:317
 #, fuzzy
 msgid "Database error inserting OAuth application user."
 msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s"
 
+#: lib/apioauthstore.php:345
+#, fuzzy
+msgid "Database error updating OAuth application user."
+msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s"
+
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
@@ -7930,6 +7968,13 @@ msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Endurstilla"
 
+#. 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
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "Gat ekki uppfært hóp."
+
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
 #: lib/designsettings.php:433
 msgid "Design defaults restored."
@@ -9205,3 +9250,28 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "No such profile"
+#~ msgstr "Ekkert svoleiðis babl."
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "Hópar sem %s er meðlimur í"
+
+#, fuzzy
+#~ msgid "Method not supported"
+#~ msgstr "Aðferð í forritsskilum fannst ekki!"
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "Fólk sem eru áskrifendur að %s"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "Gat ekki uppfært notanda."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "Gat ekki vistað persónulega síðu."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "Gat ekki vistað merki."
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 90f53271fd..223452403d 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-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:34:55+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05:35+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 (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: it\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -90,9 +90,9 @@ msgstr "Salva impostazioni di accesso"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -113,6 +113,8 @@ msgstr "Pagina inesistente."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -133,8 +135,8 @@ msgstr "Pagina inesistente."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -145,7 +147,7 @@ msgstr "Pagina inesistente."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -313,7 +315,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Impossibile aggiornare l'utente."
 
@@ -335,7 +351,8 @@ msgid "User has no profile."
 msgstr "L'utente non ha un profilo."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "Impossibile salvare il profilo."
 
@@ -371,8 +388,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "Impossibile salvare la impostazioni dell'aspetto."
 
@@ -380,13 +397,17 @@ 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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Impossibile aggiornare l'aspetto."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+msgctxt "ATOM"
 msgid "Main"
 msgstr ""
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -397,31 +418,38 @@ msgstr ""
 msgid "%s timeline"
 msgstr "Attività di %s"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Abbonamenti di %s"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: 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:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Blocco dell'utente non riuscito."
 
@@ -561,7 +589,7 @@ msgstr "Impossibile trovare l'utente destinazione."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Soprannome già in uso. Prova con un altro."
@@ -571,7 +599,7 @@ msgstr "Soprannome già in uso. Prova con un altro."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Non è un soprannome valido."
@@ -583,7 +611,7 @@ msgstr "Non è un soprannome valido."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "L'indirizzo della pagina web non è valido."
@@ -593,7 +621,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -621,7 +649,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -745,7 +773,7 @@ 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:101
+#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "Token di accesso specificato non valido."
@@ -768,18 +796,19 @@ msgid "Request token already authorized."
 msgstr "Autorizzazione non presente."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -802,16 +831,17 @@ msgstr "Errore nel database nell'inserire l'applicazione utente OAuth."
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Invio del modulo inaspettato."
 
@@ -863,7 +893,7 @@ msgstr "Account"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -884,7 +914,7 @@ msgstr "Password"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -958,6 +988,7 @@ msgstr "Non puoi eliminare il messaggio di un altro utente."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: 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
@@ -977,40 +1008,50 @@ msgstr "Non puoi ripetere un tuo messaggio."
 msgid "Already repeated that notice."
 msgstr "Hai già ripetuto quel messaggio."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "Metodo delle API non trovato."
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Messaggio eliminato."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Nessuno stato trovato con quel ID."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "Impossibile eliminare questo messaggio."
 
-#: actions/apistatusesshow.php:243
+#. 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"
@@ -1146,51 +1187,49 @@ msgstr "Solo l'utente può leggere la propria casella di posta."
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, 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:406
+#: actions/apitimelineuser.php:409
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Un messaggio con quel ID non esiste."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1201,108 +1240,116 @@ msgstr "Metodo delle API in lavorazione."
 msgid "User not found."
 msgstr "Metodo delle API non trovato."
 
-#: actions/atompubfavoritefeed.php:70
-#, fuzzy
-msgid "No such profile"
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
+msgid "No such profile."
 msgstr "Nessun profilo."
 
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#. 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 "Can't add someone else's subscription"
+msgid "Cannot add someone else's subscription."
 msgstr "Impossibile inserire un nuovo abbonamento."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-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 "Trova contenuto dei messaggi"
 
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#. 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"
 
-#: actions/atompubfavoritefeed.php:256
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "Sconosciuto"
 
-#: actions/atompubfavoritefeed.php:263
+#. TRANS: Client exception thrown when trying favorite an already favorited notice.
+#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "Aggiungi ai preferiti"
 
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Nessun profilo."
-
+#. 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"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "Gruppi di cui %s fa parte"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "Impossibile inserire un nuovo abbonamento."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:241
-msgid "Can only handle Join activities."
-msgstr ""
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
+msgstr "Trova contenuto dei messaggi"
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Sconosciuto"
 
-#: actions/atompubmembershipfeed.php:263
+#. 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"
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr "Impossibile eliminare un preferito."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "Nessun gruppo"
 
-#: actions/atompubshowmembership.php:90
+#. 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"
 
-#: actions/atompubshowmembership.php:115
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "Method not supported"
+msgid "HTTP method not supported"
 msgstr "Metodo delle API non trovato."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1310,40 +1357,37 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
-msgid "No such profile id: %d"
+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"
+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"
+msgid "Cannot delete someone else's subscription."
 msgstr "Impossibile salvare l'abbonamento."
 
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "Persone abbonate a %s"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
 msgstr "Tipo di file sconosciuto"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1354,10 +1398,11 @@ msgstr "Nessun allegato."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Nessun soprannome."
@@ -1389,30 +1434,36 @@ msgstr ""
 "Puoi caricare la tua immagine personale. La dimensione massima del file è %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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "Impostazioni immagine"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "Originale"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "Anteprima"
 
@@ -1450,7 +1501,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "Perso il nostro file di dati."
 
@@ -1469,7 +1521,7 @@ msgstr "Aggiornamento dell'immagine non riuscito."
 msgid "Avatar deleted."
 msgstr "Immagine eliminata."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1571,6 +1623,7 @@ msgstr "Salvataggio delle informazioni per il blocco non riuscito."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1580,7 +1633,7 @@ msgstr "Salvataggio delle informazioni per il blocco non riuscito."
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1661,23 +1714,6 @@ msgstr "Tipo di indirizzo %s non riconosciuto."
 msgid "That address has already been confirmed."
 msgstr "Quell'indirizzo è già stato confermato."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-msgstr "Impossibile aggiornare l'utente."
-
 #. 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
@@ -1739,7 +1775,7 @@ msgid "Account deleted."
 msgstr "Immagine eliminata."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "Crea un account"
@@ -2107,7 +2143,7 @@ msgid "Reset back to default"
 msgstr "Reimposta i valori predefiniti"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2221,14 +2257,16 @@ msgid "Edit %s group"
 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:70 actions/newgroup.php:65
 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 when trying to change group logo settings while not being a group admin.
 #: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "Devi essere amministratore per modificare il gruppo."
 
@@ -2289,8 +2327,8 @@ msgstr "Indirizzo email attualmente confermato."
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Rimuovi"
@@ -2316,15 +2354,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Email di ricezione"
 
@@ -2335,13 +2373,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 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 "
@@ -2356,7 +2394,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nuovo"
@@ -2431,9 +2469,10 @@ 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, 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.
@@ -2449,8 +2488,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Nessuna conferma da annullare."
 
@@ -2461,8 +2500,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+msgid "Could not delete email confirmation."
 msgstr "Impossibile eliminare l'email di conferma."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
@@ -2481,24 +2521,25 @@ msgstr "Quello non è il tuo indirizzo email."
 msgid "The email address was removed."
 msgstr "L'indirizzo email è stato rimosso."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, 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:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 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:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "Nuovo indirizzo email di ricezione aggiunto."
 
@@ -2597,7 +2638,7 @@ msgstr "Risposta non attesa!"
 msgid "User being listened to does not exist."
 msgstr "L'utente che intendi seguire non esiste."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Puoi usare l'abbonamento locale!"
 
@@ -2727,22 +2768,19 @@ msgstr ""
 "Personalizza l'aspetto del tuo gruppo con un'immagine di sfondo e dei colori "
 "personalizzati."
 
-#. 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "Impossibile aggiornare l'aspetto."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "Preferenze dell'aspetto salvate."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "Logo del gruppo"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2750,23 +2788,28 @@ msgstr ""
 "Puoi caricare un'immagine per il logo del tuo gruppo. La dimensione massima "
 "del file è di %s."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "Carica"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "Ritaglia"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr "Scegli un'area quadrata dell'immagine per il logo."
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "Logo aggiornato."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "Aggiornamento del logo non riuscito."
 
@@ -2907,14 +2950,14 @@ msgid "Error removing the block."
 msgstr "Errore nel rimuovere il blocco."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2925,23 +2968,23 @@ msgstr ""
 "impostazioni qui di seguito."
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "Messaggistica istantanea non disponibile."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "Indirizzo di messaggistica istantanea"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Indirizzo Jabber/GTalk attualmente confermato."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2956,7 +2999,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2967,63 +3010,63 @@ msgstr ""
 "di messaggistica o su GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Preferenze messaggistica"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Inviami i messaggi via Jabber/GTalk"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Pubblica un messaggio quando il mio stato Jabber/GTalk cambia"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk 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:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Pubblica un MicroID per il mio indirizzo Jabber/GTalk"
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Preferenze salvate."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Nessun ID di Jabber."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "Impossibile normalizzare quell'ID Jabber"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "Non è un ID Jabber valido"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "Quello è già il tuo ID di Jabber."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID 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.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -3033,28 +3076,29 @@ 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:391
+#: actions/imsettings.php:382
 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:400
-msgid "Couldn't delete IM confirmation."
+#: actions/imsettings.php:391
+#, fuzzy
+msgid "Could not delete IM confirmation."
 msgstr "Impossibile eliminare la conferma della messaggistica."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Quello non è il tuo ID di Jabber."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "L'indirizzo di messaggistica è stato rimosso."
 
@@ -3284,20 +3328,20 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s ha lasciato il gruppo %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Licenza"
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr "La licenza per questo sito StatusNet"
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr "Selezione della licenza non valida."
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
@@ -3305,88 +3349,88 @@ msgstr ""
 "È necessario specificare il proprietario dei contenuti quando viene usata la "
 "licenza \"Tutti i diritti riservati\"."
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Titolo della licenza non valido. Lunghezza massima 255 caratteri."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr "Indirizzo della licenza non valido."
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr "Indirizzo immagine della licenza non valido."
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 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:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr "L'immagine della licenza deve essere vuota o un URL valido."
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr "Selezione licenza"
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "Privato"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr "Tutti i diritti riservati"
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr "Tipo"
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr "Seleziona licenza"
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr "Dettagli licenza"
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr "Proprietario"
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 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:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr "Titolo licenza"
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr "Il titolo della licenza."
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr "Indirizzo licenza"
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr "Indirizzo per informazioni aggiuntive riguardo la licenza."
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr "Indirizzo immagine licenza"
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr "Indirizzo di un'immagine da visualizzare con la licenza."
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Salva impostazioni licenza"
 
@@ -4176,12 +4220,12 @@ msgstr ""
 "\"%2$s\"."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "Impostazioni del profilo"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4189,12 +4233,12 @@ msgstr ""
 "altri potranno conoscere qualcosa in più su di te."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "Informazioni sul profilo"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4202,7 +4246,7 @@ msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4210,13 +4254,13 @@ msgstr "Nome"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Pagina web"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: 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"
@@ -4224,7 +4268,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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4232,19 +4276,19 @@ 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:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "Biografia"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4252,51 +4296,51 @@ msgid "Location"
 msgstr "Ubicazione"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 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:157
+#: actions/profilesettings.php:153
 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:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "Etichette"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "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:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "Lingua"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "Lingua preferita"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "Fuso orario"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 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:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4306,7 +4350,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4314,52 +4358,49 @@ 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:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Fuso orario non selezionato"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:276
 #, 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, 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:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, fuzzy
+msgid "Could not save location prefs."
 msgstr "Impossibile salvare le preferenze della posizione."
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "Impossibile salvare il profilo."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Impostazioni salvate."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Crea un account"
@@ -4753,7 +4794,7 @@ msgstr ""
 "(Dovresti ricevere, entro breve, un messaggio email con istruzioni su come "
 "confermare il tuo indirizzo email.)"
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4765,74 +4806,77 @@ msgstr ""
 "microblog compatibile](%%doc.openmublog%%), inserisci l'indirizzo del tuo "
 "profilo qui di seguito."
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Abbonamento remoto"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Abbonati a un utente remoto"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Soprannome dell'utente"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "Soprannome dell'utente che vuoi seguire"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "URL del profilo"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL del tuo profilo su un altro servizio di microblog compatibile"
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "Abbonati"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "URL del profilo non valido (formato errato)"
 
-#: actions/remotesubscribe.php:168
+#: 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:176
-msgid "That’s a local profile! Login to subscribe."
+#: 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:183
-msgid "Couldn’t get a request token."
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
 msgstr "Impossibile ottenere un token di richiesta."
 
-#: actions/repeat.php:57
+#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Solo gli utenti collegati possono ripetere i messaggi."
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Nessun messaggio specificato."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "Non puoi ripetere i tuoi stessi messaggi."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Hai già ripetuto quel messaggio."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Ripetuti"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Ripetuti!"
 
@@ -5600,70 +5644,70 @@ msgid "Save site notice"
 msgstr "Salva messaggio"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "Impostazioni SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "Il servizio SMS non è disponibile."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "Indirizzo SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 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:133
+#: actions/smssettings.php:129
 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:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "Codice di conferma"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 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:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Conferma"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "Numero di telefono per SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 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:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "Preferenze dell'SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5672,32 +5716,32 @@ msgstr ""
 "bollette da parte del mio operatore"
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
 msgid "SMS preferences saved."
 msgstr "Preferenze dell'SMS salvate."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "Nessun numero di telefono."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr "Nessun operatore selezionato."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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."
@@ -5707,39 +5751,39 @@ msgstr ""
 "usarlo."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
+#: actions/smssettings.php:404
 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:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 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:470
+#: actions/smssettings.php:460
 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:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "Operatore telefonico"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5749,7 +5793,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:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "Nessun codice inserito"
 
@@ -6013,10 +6057,6 @@ msgstr ""
 "Puoi etichettare sole le persone di cui hai un abbonamento o che sono "
 "abbonate a te."
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "Impossibile salvare le etichette."
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
@@ -6251,12 +6291,12 @@ 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:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "Aspetto del profilo"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6264,7 +6304,7 @@ msgstr ""
 "Personalizza l'aspetto del tuo profilo con un'immagine di sfondo e dei "
 "colori personalizzati."
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr "Gustati il tuo hotdog!"
 
@@ -7236,23 +7276,27 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Impossibile inserire il messaggio."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "Eliminazione del token revocato non riuscita."
 
@@ -7913,6 +7957,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Reimposta"
 
+#. 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
+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
 msgid "Design defaults restored."
@@ -9271,3 +9321,28 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "No such profile"
+#~ msgstr "Nessun profilo."
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "Gruppi di cui %s fa parte"
+
+#, fuzzy
+#~ msgid "Method not supported"
+#~ msgstr "Metodo delle API non trovato."
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "Persone abbonate a %s"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "Impossibile aggiornare l'utente."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "Impossibile salvare il profilo."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "Impossibile salvare le etichette."
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 37e3467bea..ef1f2708cc 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-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:34:57+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05:36+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 (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -92,9 +92,9 @@ msgstr "アクセス設定の保存"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -115,6 +115,8 @@ msgstr "そのようなページはありません。"
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -135,8 +137,8 @@ msgstr "そのようなページはありません。"
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -147,7 +149,7 @@ msgstr "そのようなページはありません。"
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -316,7 +318,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "ユーザを更新できませんでした。"
 
@@ -338,7 +354,8 @@ msgid "User has no profile."
 msgstr "ユーザはプロフィールをもっていません。"
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "プロフィールを保存できませんでした。"
 
@@ -371,8 +388,8 @@ msgstr[0] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "あなたのデザイン設定を保存できません。"
 
@@ -380,13 +397,17 @@ msgstr "あなたのデザイン設定を保存できません。"
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
+#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "デザインを更新できませんでした。"
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+msgctxt "ATOM"
 msgid "Main"
 msgstr ""
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -397,31 +418,38 @@ msgstr ""
 msgid "%s timeline"
 msgstr "%s のタイムライン"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s フォローしている"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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 "お気に入り"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "自分自身をブロックすることはできません！"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "ユーザのブロックに失敗しました。"
 
@@ -560,7 +588,7 @@ msgstr "ターゲットユーザーを見つけられません。"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "そのニックネームは既に使用されています。他のものを試してみて下さい。"
@@ -570,7 +598,7 @@ msgstr "そのニックネームは既に使用されています。他のもの
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "有効なニックネームではありません。"
@@ -582,7 +610,7 @@ msgstr "有効なニックネームではありません。"
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "ホームページのURLが不適切です。"
@@ -592,7 +620,7 @@ msgstr "ホームページのURLが不適切です。"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -619,7 +647,7 @@ msgstr[0] "記述が長すぎます。（最長%d字）"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -743,7 +771,7 @@ msgid "Upload failed."
 msgstr "ファイルアップロード"
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:101
+#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "不正なログイントークンが指定されています。"
@@ -766,18 +794,19 @@ msgid "Request token already authorized."
 msgstr "認証されていません。"
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -799,16 +828,17 @@ msgstr "OAuth アプリケーションユーザの追加時ＤＢエラー。"
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "予期せぬフォーム送信です。"
 
@@ -854,7 +884,7 @@ msgstr "アカウント"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -875,7 +905,7 @@ msgstr "パスワード"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 #, fuzzy
 msgctxt "BUTTON"
@@ -950,6 +980,7 @@ 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
@@ -969,40 +1000,50 @@ msgstr "あなたのつぶやきを繰り返せません。"
 msgid "Already repeated that notice."
 msgstr "すでにつぶやきを繰り返しています。"
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "API メソッドが見つかりません。"
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "ステータスを削除しました。"
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "そのＩＤでのステータスはありません。"
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "このつぶやきを削除できません。"
 
-#: actions/apistatusesshow.php:243
+#. 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 "つぶやき削除"
@@ -1134,51 +1175,49 @@ msgstr "ユーザだけがかれら自身のメールボックスを読むこと
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "つぶやきの内容を探す"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:406
+#: actions/apitimelineuser.php:409
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "その ID によるつぶやきは存在していません"
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1190,109 +1229,117 @@ msgstr "API メソッドが工事中です。"
 msgid "User not found."
 msgstr "API メソッドが見つかりません。"
 
-#: actions/atompubfavoritefeed.php:70
-#, fuzzy
-msgid "No such profile"
-msgstr "そのようなファイルはありません。"
-
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-#, fuzzy
-msgid "Can't add someone else's subscription"
-msgstr "サブスクリプションを追加できません"
-
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
-#, fuzzy
-msgid "Can only fave notices."
-msgstr "つぶやきの内容を探す"
-
-#: actions/atompubfavoritefeed.php:256
-#, fuzzy
-msgid "Unknown note."
-msgstr "不明"
-
-#: actions/atompubfavoritefeed.php:263
-#, fuzzy
-msgid "Already a favorite."
-msgstr "お気に入りに加える"
-
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
 #, fuzzy
 msgid "No such profile."
 msgstr "そのようなファイルはありません。"
 
+#. 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 グループメンバー"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "グループ %s はメンバー"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "サブスクリプションを追加できません"
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:241
-msgid "Can only handle Join activities."
-msgstr ""
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
+msgstr "つぶやきの内容を探す"
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "不明"
 
-#: actions/atompubmembershipfeed.php:263
+#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
+#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "全てのメンバー"
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr "お気に入りを取り消すことができません。"
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "そのようなグループはありません。"
 
-#: actions/atompubshowmembership.php:90
+#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
+#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member"
 msgstr "全てのメンバー"
 
-#: actions/atompubshowmembership.php:115
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "Method not supported"
+msgid "HTTP method not supported"
 msgstr "API メソッドが見つかりません。"
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1300,40 +1347,37 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
-msgid "No such profile id: %d"
+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"
+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"
+msgid "Cannot delete someone else's subscription."
 msgstr "フォローを保存できません。"
 
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "人々は %s をフォローしました。"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
 msgstr "不明なファイルタイプ"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1344,10 +1388,11 @@ msgstr "そのような添付はありません。"
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "ニックネームがありません。"
@@ -1378,30 +1423,36 @@ msgid "You can upload your personal avatar. The maximum file size is %s."
 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "アバター設定"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "オリジナル"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "プレビュー"
 
@@ -1440,7 +1491,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "ファイルデータを紛失しました。"
 
@@ -1459,7 +1511,7 @@ msgstr "アバターの更新に失敗しました。"
 msgid "Avatar deleted."
 msgstr "アバターが削除されました。"
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1562,6 +1614,7 @@ msgstr "ブロック情報の保存に失敗しました。"
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1571,7 +1624,7 @@ msgstr "ブロック情報の保存に失敗しました。"
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1652,23 +1705,6 @@ msgstr "不明なアドレスタイプ %s"
 msgid "That address has already been confirmed."
 msgstr "そのアドレスは既に承認されています。"
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-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
@@ -1730,7 +1766,7 @@ msgid "Account deleted."
 msgstr "アバターが削除されました。"
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "新しいグループを作成"
@@ -2101,7 +2137,7 @@ msgid "Reset back to default"
 msgstr "デフォルトへリセットする"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2215,14 +2251,16 @@ msgid "Edit %s group"
 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:70 actions/newgroup.php:65
 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 when trying to change group logo settings while not being a group admin.
 #: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "グループを編集するには管理者である必要があります。"
 
@@ -2283,8 +2321,8 @@ msgstr "現在確認されているメールアドレス。"
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "回復"
@@ -2309,8 +2347,8 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
@@ -2318,7 +2356,7 @@ msgstr "追加"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "入ってくるメール"
 
@@ -2329,13 +2367,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "投稿のための新しいEメールアドレスを作ります; 古い方を取り消します。"
 
@@ -2348,7 +2386,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 #, fuzzy
 msgctxt "BUTTON"
 msgid "New"
@@ -2427,9 +2465,10 @@ msgstr "このメールアドレスは既に他の人が使っています。"
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, fuzzy
+msgid "Could not insert confirmation code."
 msgstr "承認コードを追加できません"
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
@@ -2445,8 +2484,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "承認待ちのものはありません。"
 
@@ -2458,8 +2497,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+msgid "Could not delete email confirmation."
 msgstr "メール承認を削除できません"
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
@@ -2478,24 +2518,25 @@ msgstr "これはあなたのメールアドレスではありません。"
 msgid "The email address was removed."
 msgstr "入ってくるメールアドレスは削除されました。"
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, fuzzy
+msgid "Could not update user record."
 msgstr "ユーザレコードを更新できません。"
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 msgid "Incoming email address removed."
 msgstr "入ってくるメールアドレスは削除されました。"
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "新しい入ってくるメールアドレスが追加されました。"
 
@@ -2594,7 +2635,7 @@ msgstr "想定外のレスポンスです！"
 msgid "User being listened to does not exist."
 msgstr "存在しないように聴かれているユーザ。"
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "ローカルサブスクリプションを使用可能です！"
 
@@ -2728,22 +2769,19 @@ 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "あなたのデザインを更新できません。"
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "デザイン設定が保存されました。"
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "グループロゴ"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2751,23 +2789,28 @@ msgstr ""
 "あなたのグループ用にロゴイメージをアップロードできます。最大ファイルサイズは "
 "%s。"
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "アップロード"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "切り取り"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr "ロゴとなるイメージの正方形を選択。"
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "ロゴが更新されました。"
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "ロゴの更新に失敗しました。"
 
@@ -2908,14 +2951,14 @@ msgid "Error removing the block."
 msgstr "ブロックの削除エラー"
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2925,23 +2968,23 @@ msgstr ""
 "す。下のアドレスを設定して下さい。"
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "ＩＭ が利用不可。"
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "IMアドレス"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "確認された最新の　Jabber/GTakk アドレス"
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2955,7 +2998,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2965,65 +3008,65 @@ msgstr ""
 "IMクライアントやGTalkに追加して下さい。"
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "設定が保存されました。"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Jabber/GTalk で私に通知を送って下さい。"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Jabber/GTalkのステータスが変更された時に通知を送る。"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Jabber/GTalkを通して回答を、私がフォローされていない人々から私に送ってくださ"
 "い。"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "私のJabber/GTalkアドレスのためにMicroIDを発行してください。"
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "設定が保存されました。"
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Jabbar ID はありません。"
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "その Jabbar ID を正規化できません"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "有効な Jabber ID ではありません。"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "その Jabber ID は既にあなたのものです。"
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID ｊは既に別のユーザが使用しています。"
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -3033,29 +3076,29 @@ msgstr ""
 "ようにするには%sを承認してください。"
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "その IM アドレスは不正です。"
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:400
+#: actions/imsettings.php:391
 #, fuzzy
-msgid "Couldn't delete IM confirmation."
+msgid "Could not delete IM confirmation."
 msgstr "メール承認を削除できません"
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "その Jabber ID はあなたのものではありません。"
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "入ってくるメールアドレスは削除されました。"
 
@@ -3281,107 +3324,107 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s はグループ %2$s に残りました。"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "ライセンス"
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr "このStatusNetサイトのライセンス"
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "不正なウェルカムテキスト。最大長は255字です。"
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "プライベート"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
 
@@ -4171,12 +4214,12 @@ msgstr ""
 "つぶやきライセンス ‘%1$s’ はサイトライセンス ‘%2$s’ と互換性がありません。"
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "プロファイル設定"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4184,19 +4227,19 @@ msgstr ""
 "す。"
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "プロファイル情報"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 #, 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4204,13 +4247,13 @@ msgstr "フルネーム"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "ホームページ"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"
@@ -4218,26 +4261,26 @@ 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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, 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:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "自己紹介"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4245,24 +4288,24 @@ msgid "Location"
 msgstr "場所"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "自分のいる場所。例：「都市, 都道府県 (または地域), 国」"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:157
+#: actions/profilesettings.php:153
 msgid "Share my current location when posting notices"
 msgstr "つぶやきを投稿するときには私の現在の場所を共有してください"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "タグ"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4270,27 +4313,27 @@ msgstr ""
 "りで"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "言語"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "ご希望の言語"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "タイムゾーン"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 msgid "What timezone are you normally in?"
 msgstr "普段のタイムゾーンはどれですか？"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "自分をフォローしている者を自動的にフォローする (BOTに最適)"
@@ -4298,59 +4341,56 @@ 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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, 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:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "タイムゾーンが選ばれていません。"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:276
 #, 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, 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:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, fuzzy
+msgid "Could not save location prefs."
 msgstr "場所情報を保存できません。"
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "プロファイルを保存できません"
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
-msgstr "タグを保存できません。"
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "設定が保存されました。"
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "新しいグループを作成"
@@ -4741,7 +4781,7 @@ msgstr ""
 "(メールアドレスを承認する方法を読んで、すぐにメールによるメッセージを受け取る"
 "ようにしてください)"
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4753,75 +4793,78 @@ msgstr ""
 "openmublog%%) にアカウントをお持ちの場合は、下にプロファイルURLを入力して下さ"
 "い."
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "リモートフォロー"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "リモートユーザーをフォロー"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "ユーザのニックネーム"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "フォローしたいユーザのニックネーム"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "プロファイルURL"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "プロファイルサービスまたはマイクロブロギングサービスのURL"
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "フォロー"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "不正なプロファイルURL。（形式不備）"
 
-#: actions/remotesubscribe.php:168
+#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "有効なプロファイルURLではありません。（YADIS ドキュメントがないかまたは 不正"
 "な XRDS 定義）"
 
-#: actions/remotesubscribe.php:176
-msgid "That’s a local profile! Login to subscribe."
+#: actions/remotesubscribe.php:175
+#, fuzzy
+msgid "That is a local profile! Login to subscribe."
 msgstr ""
 "それはローカルのプロファイルです! フォローするには、ログインしてください。"
 
-#: actions/remotesubscribe.php:183
-msgid "Couldn’t get a request token."
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
 msgstr "リクエストトークンを取得できません"
 
-#: actions/repeat.php:57
+#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "ログインユーザだけがつぶやきを繰り返せます。"
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "つぶやきがありません。"
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "自分のつぶやきは繰り返せません。"
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "すでにそのつぶやきを繰り返しています。"
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "繰り返された"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "繰り返されました!"
 
@@ -5602,73 +5645,73 @@ msgid "Save site notice"
 msgstr "サイトつぶやき"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "SMS 設定"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "SMS は利用できません。"
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 #, fuzzy
 msgid "SMS address"
 msgstr "IMアドレス"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "現在の確認された SMS 可能な電話番号。"
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:133
+#: actions/smssettings.php:129
 msgid "Awaiting confirmation on this phone number."
 msgstr "この電話番号は確認待ちです。"
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "確認コード"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 msgid "Enter the code you received on your phone."
 msgstr "あなたがあなたの電話で受け取ったコードを入れてください。"
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
+#: actions/smssettings.php:144
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "パスワード確認"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "SMS 電話番号"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "電話番号、句読点またはスペースがない、市街番号付き"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "設定が保存されました。"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5677,33 +5720,33 @@ msgstr ""
 "るかもしれないのを理解しています。"
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
 #, fuzzy
 msgid "SMS preferences saved."
 msgstr "設定が保存されました。"
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "電話番号がありません。"
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr "キャリアが選択されていません。"
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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."
@@ -5712,40 +5755,40 @@ msgstr ""
 "コードと指示のために電話をチェックしてください。"
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
+#: actions/smssettings.php:404
 msgid "That is the wrong confirmation number."
 msgstr "それは間違った確認番号です。"
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 msgid "That is not your phone number."
 msgstr "それはあなたの電話番号ではありません。"
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
+#: actions/smssettings.php:460
 #, fuzzy
 msgid "The SMS phone number was removed."
 msgstr "SMS 電話番号"
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "携帯電話会社"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5756,7 +5799,7 @@ msgstr ""
 "ください。"
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "コードが入力されていません"
 
@@ -6021,10 +6064,6 @@ msgstr ""
 "あなたはフォローされる人々にタグ付けをすることができるだけか、あなたをフォ"
 "ローされているか。"
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "タグをを保存できません。"
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "このフォームを使用して、フォロー者かフォローにタグを加えてください。"
@@ -6257,12 +6296,12 @@ msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "アバター URL '%s' は不正な画像形式。"
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "プロファイルデザイン"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6270,7 +6309,7 @@ msgstr ""
 "あなたのプロフィールがバックグラウンド画像とあなたの選択の色のパレットで見る"
 "方法をカスタマイズしてください。"
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 #, fuzzy
 msgid "Enjoy your hotdog!"
 msgstr "あなたのhotdogを楽しんでください!"
@@ -7234,23 +7273,27 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "メッセージを追加できません。"
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
@@ -7869,6 +7912,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 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
+msgid "Couldn't update your design."
+msgstr "あなたのデザインを更新できません。"
+
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
 #: lib/designsettings.php:433
 msgid "Design defaults restored."
@@ -9185,3 +9234,28 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "No such profile"
+#~ msgstr "そのようなファイルはありません。"
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "グループ %s はメンバー"
+
+#, fuzzy
+#~ msgid "Method not supported"
+#~ msgstr "API メソッドが見つかりません。"
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "人々は %s をフォローしました。"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "ユーザを更新できません"
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "プロファイルを保存できません"
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "タグを保存できません。"
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
index ed7d20767d..d5dcbd0f7a 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-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:34:58+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05:37+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 (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ka\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -86,9 +86,9 @@ msgstr "შეინახე შესვლის პარამეტრე
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -109,6 +109,8 @@ msgstr "ასეთი გვერდი არ არსებობს."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -129,8 +131,8 @@ msgstr "ასეთი გვერდი არ არსებობს."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -141,7 +143,7 @@ msgstr "ასეთი გვერდი არ არსებობს."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -309,7 +311,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "მომხმარებლის განახლება ვერ მოხერხდა."
 
@@ -331,7 +347,8 @@ msgid "User has no profile."
 msgstr "მომხმარებელს პროფილი არ გააჩნია."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "პროფილის შენახვა ვერ მოხერხდა."
 
@@ -364,8 +381,8 @@ msgstr[0] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "სამწუხაროდ თქვენი დიზაინის პარამეტრების შენახვა ვერ მოხერხდა."
 
@@ -373,13 +390,17 @@ msgstr "სამწუხაროდ თქვენი დიზაინი
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
+#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "დიზაინის განახლება ვერ მოხერხდა."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+msgctxt "ATOM"
 msgid "Main"
 msgstr ""
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -390,31 +411,38 @@ msgstr ""
 msgid "%s timeline"
 msgstr "%s-ის ნაკადი"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s გამოწერები"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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 "რჩეულები"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "საკუთარი თავის დაბლოკვა შეუძლებელია."
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "მომხმარებლის დაბლოკვა ვერ მოხერხდა."
 
@@ -551,7 +579,7 @@ msgstr "სასურველი მომხმარებელი ვე
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "მეტსახელი უკვე გამოყენებულია. სცადე სხვა."
@@ -561,7 +589,7 @@ msgstr "მეტსახელი უკვე გამოყენებუ
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "მეტსახელი არასწორია."
@@ -573,7 +601,7 @@ msgstr "მეტსახელი არასწორია."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "სასტარტო გვერდი არასწორი URL-ია."
@@ -583,7 +611,7 @@ msgstr "სასტარტო გვერდი არასწორი URL
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -610,7 +638,7 @@ msgstr[0] "აღწერა ძალიან გრძელია (არ
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -733,7 +761,7 @@ msgid "Upload failed."
 msgstr "ატვირთვა ვერ მოხერხდა."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:101
+#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr ""
 
@@ -755,18 +783,19 @@ msgid "Request token already authorized."
 msgstr "თქვენ არ ხართ ავტორიზირებული."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -788,16 +817,17 @@ msgstr "ბაზამ დაუშვა შეცდომა OAuth აპლ
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -843,7 +873,7 @@ msgstr "ანგარიში"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -864,7 +894,7 @@ msgstr "პაროლი"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -938,6 +968,7 @@ 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
@@ -957,40 +988,50 @@ msgstr "საკუთარი შეტყობინების გამ
 msgid "Already repeated that notice."
 msgstr "ეს შეტყობინება უკვე გამეორებულია."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "API მეთოდი ვერ მოიძებნა."
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "სტატუსი წაშლილია."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "ასეთი ID-ს სტატუსი ვერ მოიძებნა."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "ამ შეტყობინების წაშლა შეუძლებელია."
 
-#: actions/apistatusesshow.php:243
+#. 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 "შეტყობინების წაშლა"
@@ -1122,51 +1163,49 @@ msgstr "მხოლოდ მომხმარებელს შეუძლ
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "მოძებნე შეტყობინებებში"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:406
+#: actions/apitimelineuser.php:409
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "შეტყობინებები ამ ID-თ არ არსებობს."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1178,107 +1217,115 @@ msgstr "API მეთოდი დამუშავების პროცე
 msgid "User not found."
 msgstr "API მეთოდი ვერ მოიძებნა."
 
-#: actions/atompubfavoritefeed.php:70
-#, fuzzy
-msgid "No such profile"
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
+msgid "No such profile."
 msgstr "ასეთი პროფილი არ არსებობს."
 
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#. 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 "Can't add someone else's subscription"
+msgid "Cannot add someone else's subscription."
 msgstr "ახალი გამოწერის ჩასმა ვერ მოხერხდა."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-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 "მოძებნე შეტყობინებებში"
 
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#. 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 "მოძებნე შეტყობინებებში"
 
-#: actions/atompubfavoritefeed.php:256
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "უცნობი"
 
-#: actions/atompubfavoritefeed.php:263
+#. TRANS: Client exception thrown when trying favorite an already favorited notice.
+#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "რჩეულებში დამატება"
 
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
-msgid "No such profile."
-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 ჯგუფის წევრი"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "%1$s-ს ის ჯგუფები რომლებშიც გაერთიანებულია %2$s."
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "ახალი გამოწერის ჩასმა ვერ მოხერხდა."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:241
-msgid "Can only handle Join activities."
-msgstr ""
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
+msgstr "მოძებნე შეტყობინებებში"
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "უცნობი"
 
-#: actions/atompubmembershipfeed.php:263
+#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
+#: actions/atompubmembershipfeed.php:267
 msgid "Already a member."
 msgstr ""
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr "ფავორიტის წაშლა ვერ მოხერხდა."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 #, fuzzy
 msgid "No such group"
 msgstr "ასეთი ჯგუფი ვერ მოიძებნა."
 
-#: actions/atompubshowmembership.php:90
+#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
+#: actions/atompubshowmembership.php:91
 msgid "Not a member"
 msgstr ""
 
-#: actions/atompubshowmembership.php:115
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "Method not supported"
+msgid "HTTP method not supported"
 msgstr "API მეთოდი ვერ მოიძებნა."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1286,40 +1333,37 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
-msgid "No such profile id: %d"
+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"
+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"
+msgid "Cannot delete someone else's subscription."
 msgstr "საკუთარი გამოწერის წაშლა ვერ ხერხდება."
 
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "%s-ს გამოწერა დასრულდა წარმატებით."
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
 msgstr "ფაილის ტიპი უცნობია"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1330,10 +1374,11 @@ msgstr "ასეთი მიმაგრებული დოკუმენ
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "მეტსახელი უცნობია."
@@ -1365,30 +1410,36 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "ავატარის პარამეტრები."
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "ორიგინალი"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "წინასწარი გადახედვა"
 
@@ -1426,7 +1477,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr ""
 
@@ -1445,7 +1497,7 @@ msgstr "ავატარის განახლება ვერ მოხ
 msgid "Avatar deleted."
 msgstr "ავატარი წაიშალა."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1544,6 +1596,7 @@ msgstr "დაბლოკვის შესახებ ინფორმა
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1553,7 +1606,7 @@ msgstr "დაბლოკვის შესახებ ინფორმა
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1634,23 +1687,6 @@ msgstr "მისამართის ამოუცნობი ტიპი
 msgid "That address has already been confirmed."
 msgstr "ეს მისამართი უკვე დადასტურებულია."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-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
@@ -1712,7 +1748,7 @@ msgid "Account deleted."
 msgstr "ავატარი წაიშალა."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "გახსენი ანგარიში"
@@ -2079,7 +2115,7 @@ msgid "Reset back to default"
 msgstr "პირვანდელის პარამეტრების დაბრუნება"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2193,14 +2229,16 @@ msgid "Edit %s group"
 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:70 actions/newgroup.php:65
 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 when trying to change group logo settings while not being a group admin.
 #: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "ჯგუფის რედაქტირებისათვის საჭიროა ადმინის უფლებები."
 
@@ -2261,8 +2299,8 @@ msgstr "მიმდინარე დადასტურებული ე
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "წაშლა"
@@ -2287,15 +2325,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "შემომავალი ელ. ფოსტა"
 
@@ -2306,13 +2344,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
@@ -2325,7 +2363,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "ახალი"
@@ -2401,9 +2439,10 @@ msgstr "ეს ელ. ფოსტის მისამართი დაკ
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, fuzzy
+msgid "Could not insert confirmation code."
 msgstr "დასტურის კოდის ჩასმა ვერ მოხერხდა."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
@@ -2419,8 +2458,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "გასაუქმებელიარაფერია. არ არის მომლოდინე დასტური."
 
@@ -2431,8 +2470,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+msgid "Could not delete email confirmation."
 msgstr "ელ. ფოსტის დადასტურების წაშლა ვერ მოხერხდა."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
@@ -2451,24 +2491,25 @@ msgstr "ეს არ არის თქვენი ელ. ფოსტის
 msgid "The email address was removed."
 msgstr "ელ. ფოსტის მისამართი მოშორებულია."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, fuzzy
+msgid "Could not update user record."
 msgstr "მომხმარებლის ჩანაწერის განახლება ვერ მოხერხდა."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 msgid "Incoming email address removed."
 msgstr "შემომავალი ელ. ფოსტის მისამართი მოშორებულია."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "დამატებულია ახალი შემომავალი ელ. ფოსტა."
 
@@ -2566,7 +2607,7 @@ msgstr "ეს უკუქმედება არ არის მოსა
 msgid "User being listened to does not exist."
 msgstr "მისადევნებელი მომხმარებელი არ არსებობს."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "შეგიძლიათ გამოიყენოთ ადგილობრივი გამოწერა!"
 
@@ -2696,45 +2737,47 @@ 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "დიზაინის განახლება ვერ მოხერხდა."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "დიზაინის პარამეტრები შენახულია."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "ჯგუფის ლოგო"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
 "თქვენ შეგიძლიათ ატვირთოთ ლოგოს თქვენი ჯგუფისათვის. ფაილის დასაშვები ზომაა %s."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "ატვირთვა"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "მოჭრა"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr "აირჩიეთ სურათის კვადრატული მონაკვეთი ლოგოსათვის."
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "ლოგო განახლდა."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "ლოგოს განახლება ვერ მოხერხდა."
 
@@ -2876,14 +2919,14 @@ msgid "Error removing the block."
 msgstr "შეცდომა ბლოკის მოხსნისას."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2893,23 +2936,23 @@ msgstr ""
 "doc.im%%). მომართეთ თქვენი მისამართი და პარამეტრები ქვევით."
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM არ არის ხელმისაწვდომი."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "IM მისამართი"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "მიმდინარე დადასტურებული Jabber/GTalk მისამართი."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2923,7 +2966,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2933,64 +2976,64 @@ msgstr ""
 "დარწმუნდით, რომ დაიმატეთ %s მეგობრების სიაში თქვენს IM კლიენტში ან GTalk-ში."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "IM პარამეტრები"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "გამომიგზავნე შეტყობინებები  Jabber/GTalk-ის მეშვეობით."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "დაპოსტე შეტყობინება, როდესაც ჩემი Jabber/GTalk სტატუსი შეიცვლება."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "გამომიგზავნე პასუხები Jabber/GTalk-ით ხალხისგან, რომლთა მიმდევარი არ ვარ."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "გამოაქვეყნე  MicroID ჩემი Jabber/GTalk მისამართისთვის."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "პარამეტრები შენახულია."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Jabber ID უცნობია."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "Jabber ID-ს ნორმალიზაცია ვერ ხერხდება"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "არასწორი Jabber ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "ეს უკვე არის თქვენი Jabber ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID უკვე ეკუთვნის სხვა მომხმარებელს."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -3000,28 +3043,29 @@ msgstr ""
 "s-ს გამოგიგზავნოთ შეტყობინებები."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "ეს არასწორი IM მისამართია."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:400
-msgid "Couldn't delete IM confirmation."
+#: actions/imsettings.php:391
+#, fuzzy
+msgid "Could not delete IM confirmation."
 msgstr "IM დასტურის წაშლა ვერ მოხერხდა."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "ეს არ არის თქვენი Jabber ID"
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "IM მისამართი მოშორებულია."
 
@@ -3248,107 +3292,107 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s-მა დატოვა ჯგუფი %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr ""
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "არასწორი მისასალმებელი ტექსტი. სიმბოლოების მაქს. რაოდენობაა 255."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr ""
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
 
@@ -4129,12 +4173,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:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "პროფილის პარამეტრები"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4142,19 +4186,19 @@ msgstr ""
 "თქვენს შესახებ."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "ინფორმაცია პროფილზე"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 #, 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4162,13 +4206,13 @@ msgstr "სრული სახელი"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "ვებ. გვერსი"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "თქვენი ვებ. გვერდის URL, ბლოგი, ან პროფილი სხვა საიტზე"
@@ -4176,26 +4220,26 @@ 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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, 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:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "ბიოგრაფია"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4203,24 +4247,24 @@ msgid "Location"
 msgstr "მდებარეობა"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "რომელ ქალაქში, რეგიონში, ქვეყანაში ხართ?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:157
+#: actions/profilesettings.php:153
 msgid "Share my current location when posting notices"
 msgstr "გააზიარე ჩემი მდებარეობა შეტყობინებების დაპოსტვისას"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "სანიშნეები"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4228,27 +4272,27 @@ msgstr ""
 "სივრცით"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "ენა"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "სასურველი ენა"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "დროის სარტყელი"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 msgid "What timezone are you normally in?"
 msgstr "რომელ დროის სარტყელში ხართ ხომლე ჩვეულებრივ?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4257,59 +4301,56 @@ 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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, 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:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "დროის სარტყელი არ არის არჩეული."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:276
 #, 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, 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:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, fuzzy
+msgid "Could not save location prefs."
 msgstr "მდებარეობის პარამეტრების შენახვა ვერ მოხერხდა."
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "პროფილის შენახვა ვერ მოხერხდა."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "პარამეტრები შენახულია."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "გახსენი ანგარიში"
@@ -4700,7 +4741,7 @@ msgstr ""
 "(თქვენ უნდა მიიღოს ელ. წერილი მომენტალურად. ინსტრუქციებით, თუ როგორ "
 "დაადასტუროთ თქვენი ელ. ფოსტის მისამართი.)"
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4712,74 +4753,77 @@ msgstr ""
 "ანგარიში [თავსებად მიკრობლოგინგის საიტზე](%%doc.openmublog%%), მაშინ "
 "შეიყვანეთ თქვენი პროფილის URL ქვევით."
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "დაშორებული გამოწერა"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "გამოიწერე დაშორებული მომხმარებელი"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "მომხმარებლის მეტსახელი"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "მომხმარებლის მეტსახელი რომელსაც გინდათ რომ მიჰყვეთ"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "პროფილის URL"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "თქვენი პროფილის URL სხვა თავსებად მიკრობლოგინგის სერვისზე"
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "გამოწერა"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "პროფილის არასწორი URL (ცუდი ფორმატი)"
 
-#: actions/remotesubscribe.php:168
+#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "ეს არ არის პროფილის სწორი URL (YADIS დოკუმენტი არ არის, ან არასწორი XRDS–ა "
 "განსაზღვრული)."
 
-#: actions/remotesubscribe.php:176
-msgid "That’s a local profile! Login to subscribe."
+#: actions/remotesubscribe.php:175
+#, fuzzy
+msgid "That is a local profile! Login to subscribe."
 msgstr "ეს ადგილობრივი პროფილია! შედით რომ გამოიწეროთ."
 
-#: actions/remotesubscribe.php:183
-msgid "Couldn’t get a request token."
-msgstr ""
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
+msgstr "შეტყობინების ჩასმა ვერ მოხერხდა."
 
-#: actions/repeat.php:57
+#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "მხოლოდ ავტორიზირებულ მომხმარებლებს შეუძლიათ შეტყობინებების გამეორება."
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "შეტყობინება მითითებული არ არის."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "საკუთარი შეტყობინების გამეორება არ შეიძლება."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "თქვენ უკვე გაიმეორეთ ეს შეტყობინება."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "გამეორებული"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "გამეორებული!"
 
@@ -5524,13 +5568,13 @@ msgid "Save site notice"
 msgstr "შეინახე საერთოსასაიტო შეტყობინება"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "SMS პარამეტრები"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
@@ -5538,58 +5582,58 @@ msgstr ""
 "საშუალებით."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "SMS არ არის ხელმისაწვდომი."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "SMS მისამართი"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "მიმდინარე დადასტურებული SMS გააქტიურებული ტელ. ნომერი."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:133
+#: actions/smssettings.php:129
 msgid "Awaiting confirmation on this phone number."
 msgstr "ამ ტელ. ნომრის დასტური მოლოდინშია."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "დასტურის კოდი"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 msgid "Enter the code you received on your phone."
 msgstr "შეიყვანეთ კოდი, რომელიც მიიღეთ თქვენს ტელეფონზე."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "დასტური"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "SMS ტელეფონის ნომერი"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "ტელ. ნომერი, პუნქტუაციის ან სივრცეების გარეშე, ქვეყნის კოდით."
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "SMS კონფიგურაცია"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5598,32 +5642,32 @@ msgstr ""
 "საგრძნობი გადასახადები დამაკისროს."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
 msgid "SMS preferences saved."
 msgstr "SMS კონფიგურაცია შენახულია."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "ტელეფონის ნომერი არ არის."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr "ოპერატორი შერჩეული არ არის."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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."
@@ -5633,39 +5677,39 @@ msgstr ""
 "ინსტრუქცია გამოყენებისთვის."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
+#: actions/smssettings.php:404
 msgid "That is the wrong confirmation number."
 msgstr "ეს დასტურის კოდი არასწორია."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 msgid "That is not your phone number."
 msgstr "ეს არ არის თქვენი ნომერი."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
+#: actions/smssettings.php:460
 msgid "The SMS phone number was removed."
 msgstr "SMS ტელეფონის ნომერი წაშლილია."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "მობილური ოპერატორი"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5676,7 +5720,7 @@ msgstr ""
 "გაგვაგებინეთ ამის შესახებ, მოგვწერეთ მისამართზე - %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "კოდი არ არის შეყვანილი"
 
@@ -5941,10 +5985,6 @@ msgstr ""
 "ადამიანების მონიშვნა შესაძლებელია მხოლოდ მაშინ, როდესაც ან თქვენ გაქვთ "
 "გამოწერილი მისი განახლებები, ან იმას."
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "სანიშნეების შენახვა ვერ მოხერხდა."
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
@@ -6179,12 +6219,12 @@ msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "ავატარის სურათის ფორმატი არასწორია URL ‘%s’."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "პროფილის დიზაინი"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6192,7 +6232,7 @@ msgstr ""
 "აირჩიეთ, როგორ გნებავთ გამოიყურებოდეს თქვენი პროფილი ფონური სურათისა და "
 "ფერთა პალიტრის შეცვლით."
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr "ისიამოვნეთ ჰოთ დოგით!"
 
@@ -7154,23 +7194,27 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "შეტყობინების ჩასმა ვერ მოხერხდა."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
@@ -7785,6 +7829,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 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
+msgid "Couldn't update your design."
+msgstr "დიზაინის განახლება ვერ მოხერხდა."
+
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
 #: lib/designsettings.php:433
 msgid "Design defaults restored."
@@ -9105,3 +9155,28 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "No such profile"
+#~ msgstr "ასეთი პროფილი არ არსებობს."
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "%1$s-ს ის ჯგუფები რომლებშიც გაერთიანებულია %2$s."
+
+#, fuzzy
+#~ msgid "Method not supported"
+#~ msgstr "API მეთოდი ვერ მოიძებნა."
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "%s-ს გამოწერა დასრულდა წარმატებით."
+
+#~ msgid "Couldn't update user."
+#~ msgstr "მომხმარებლის განახლება ვერ მოხერხდა."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "პროფილის შენახვა ვერ მოხერხდა."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "სანიშნეების შენახვა ვერ მოხერხდა."
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 62347deb7d..5b2e992bb7 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-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:34:59+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05:39+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 (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ko\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -88,9 +88,9 @@ msgstr "접근 설정을 저장"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -111,6 +111,8 @@ msgstr "해당하는 페이지 없음"
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -131,8 +133,8 @@ msgstr "해당하는 페이지 없음"
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -143,7 +145,7 @@ msgstr "해당하는 페이지 없음"
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -305,7 +307,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "이용자를 업데이트 할 수 없습니다."
 
@@ -327,7 +343,8 @@ msgid "User has no profile."
 msgstr "이용자가 프로필을 가지고 있지 않습니다."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "프로필을 저장 할 수 없습니다."
 
@@ -360,8 +377,8 @@ msgstr[0] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "디자인 설정을 저장할 수 없습니다."
 
@@ -369,13 +386,17 @@ msgstr "디자인 설정을 저장할 수 없습니다."
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
+#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "디자인을 업데이트 할 수 없습니다."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+msgctxt "ATOM"
 msgid "Main"
 msgstr ""
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -386,31 +407,38 @@ msgstr ""
 msgid "%s timeline"
 msgstr "%s 타임라인"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s 구독"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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 "좋아하는 글들"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "자기 자신은 차단할 수 없습니다."
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "이용자 차단에 실패했습니다."
 
@@ -548,7 +576,7 @@ msgstr "타겟 이용자를 찾을 수 없습니다."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십시오."
@@ -558,7 +586,7 @@ msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "유효한 별명이 아닙니다"
@@ -570,7 +598,7 @@ msgstr "유효한 별명이 아닙니다"
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "홈페이지 주소형식이 올바르지 않습니다."
@@ -580,7 +608,7 @@ msgstr "홈페이지 주소형식이 올바르지 않습니다."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -607,7 +635,7 @@ msgstr[0] "설명이 너무 깁니다. (최대 %d 글자)"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -730,7 +758,7 @@ msgid "Upload failed."
 msgstr "실행 실패"
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:101
+#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "허용되지 않는 요청입니다."
@@ -753,18 +781,19 @@ msgid "Request token already authorized."
 msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -786,16 +815,17 @@ msgstr "OAuth 응용 프로그램 사용자 추가 중 데이터베이스 오류
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "잘못된 폼 제출"
 
@@ -847,7 +877,7 @@ msgstr "계정"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -868,7 +898,7 @@ msgstr "비밀 번호"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -942,6 +972,7 @@ 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
@@ -961,40 +992,50 @@ msgstr "자기 자신의 소식은 재전송할 수 없습니다."
 msgid "Already repeated that notice."
 msgstr "이미 재전송된 소식입니다."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "API 메서드 발견 안 됨."
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "삭제된 소식입니다."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "발견된 ID의 상태가 없습니다."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "이 통지를 지울 수 없습니다."
 
-#: actions/apistatusesshow.php:243
+#. 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 "통지 삭제"
@@ -1126,51 +1167,49 @@ msgstr "오직 해당 사용자만 자신의 메일박스를 열람할 수 있
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "통지들의 내용 찾기"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:406
+#: actions/apitimelineuser.php:409
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "해당 id의 프로필이 없습니다."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1181,108 +1220,116 @@ msgstr "API 메서드를 구성중 입니다."
 msgid "User not found."
 msgstr "API 메서드 발견 안 됨."
 
-#: actions/atompubfavoritefeed.php:70
-#, fuzzy
-msgid "No such profile"
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
+msgid "No such profile."
 msgstr "해당하는 파일이 없습니다."
 
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#. 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 "Can't add someone else's subscription"
+msgid "Cannot add someone else's subscription."
 msgstr "예약 구독을 추가 할 수 없습니다."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-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 "통지들의 내용 찾기"
 
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#. 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 "통지들의 내용 찾기"
 
-#: actions/atompubfavoritefeed.php:256
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "알려지지 않은 행동"
 
-#: actions/atompubfavoritefeed.php:263
+#. TRANS: Client exception thrown when trying favorite an already favorited notice.
+#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "좋아하는 게시글로 추가하기"
 
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
-msgid "No such profile."
-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 그룹 회원"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "%s 사용자가 멤버인 그룹"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "예약 구독을 추가 할 수 없습니다."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:241
-msgid "Can only handle Join activities."
-msgstr ""
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
+msgstr "통지들의 내용 찾기"
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "알려지지 않은 행동"
 
-#: actions/atompubmembershipfeed.php:263
+#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
+#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "모든 회원"
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr "관심소식을 삭제할 수 없습니다."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "그러한 그룹이 없습니다."
 
-#: actions/atompubshowmembership.php:90
+#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
+#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member"
 msgstr "모든 회원"
 
-#: actions/atompubshowmembership.php:115
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "Method not supported"
+msgid "HTTP method not supported"
 msgstr "API 메서드 발견 안 됨."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1290,40 +1337,37 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
-msgid "No such profile id: %d"
+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"
+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"
+msgid "Cannot delete someone else's subscription."
 msgstr "구독을 저장할 수 없습니다."
 
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "%s에 의해 구독되는 사람들"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
 msgstr "알 수 없는 종류의 파일입니다"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1334,10 +1378,11 @@ msgstr "해당하는 첨부파일이 없습니다."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "별명이 없습니다."
@@ -1368,30 +1413,36 @@ msgid "You can upload your personal avatar. The maximum file size is %s."
 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "아바타 설정"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "원래 설정"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "미리보기"
 
@@ -1429,7 +1480,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "파일 데이터를 잃어버렸습니다."
 
@@ -1448,7 +1500,7 @@ msgstr "아바타 업데이트 실패"
 msgid "Avatar deleted."
 msgstr "아바타가 삭제되었습니다."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1549,6 +1601,7 @@ msgstr "정보차단을 저장하는데 실패했습니다."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1558,7 +1611,7 @@ msgstr "정보차단을 저장하는데 실패했습니다."
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1640,23 +1693,6 @@ msgstr "인식되지않은 주소유형 %s"
 msgid "That address has already been confirmed."
 msgstr "그 주소는 이미 승인되었습니다."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-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
@@ -1718,7 +1754,7 @@ msgid "Account deleted."
 msgstr "아바타가 삭제되었습니다."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "새 계정 만들기"
@@ -2080,7 +2116,7 @@ msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2196,14 +2232,16 @@ msgid "Edit %s group"
 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:70 actions/newgroup.php:65
 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 when trying to change group logo settings while not being a group admin.
 #: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "관리자만 그룹을 편집할 수 있습니다."
 
@@ -2264,8 +2302,8 @@ msgstr "확인된 최신의 메일 계정"
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "제거"
@@ -2290,15 +2328,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "받은 메일"
 
@@ -2309,13 +2347,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "포스팅을 위한 새 메일 계정의 생성; 전 메일 계정은 취소."
 
@@ -2328,7 +2366,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "새 게임"
@@ -2402,9 +2440,10 @@ msgstr "그 메일 주소는 이미 다른 사용자의 소유입니다."
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, fuzzy
+msgid "Could not insert confirmation code."
 msgstr "확인 코드를 추가 할 수 없습니다."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
@@ -2419,8 +2458,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "취소 할 대기중인 인증이 없습니다."
 
@@ -2432,8 +2471,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+msgid "Could not delete email confirmation."
 msgstr "메일 승인을 삭제 할 수 없습니다."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
@@ -2452,24 +2492,25 @@ msgstr "그 메일 주소는 귀하의 것이 아닙니다."
 msgid "The email address was removed."
 msgstr "메일 주소를 지웠습니다."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, fuzzy
+msgid "Could not update user record."
 msgstr "사용자 기록을 업데이트 할 수 없습니다."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 msgid "Incoming email address removed."
 msgstr "받는 메일 주소를 지웠습니다."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "새로운 받는 메일 주소를 추가했습니다."
 
@@ -2563,7 +2604,7 @@ msgstr "예상치 못한 반응 입니다."
 msgid "User being listened to does not exist."
 msgstr "살펴 보고 있는 사용자가 없습니다."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "당신은 로컬 구독을 사용할 수 있습니다."
 
@@ -2697,45 +2738,47 @@ msgid ""
 "palette of your choice."
 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "디자인을 수정할 수 없습니다."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "메일 설정이 저장되었습니다."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "그룹 로고"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
 "사이트의 배경 이미지를 업로드할 수 있습니다. 최대 파일 크기는 %1$s 입니다."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "올리기"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "자르기"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr "이미지에서 로고로 사용할 사각 영역을 지정하세요."
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "로고를 업데이트했습니다."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "로고 업데이트에 실패했습니다."
 
@@ -2867,14 +2910,14 @@ msgid "Error removing the block."
 msgstr "차단 제거 에러!"
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2884,23 +2927,23 @@ msgstr ""
 "래 당신의 주소와 환경설정을 조정하세요."
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "인스턴트 메신저를 사용할 수 없습니다."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "SMS 주소"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "확인된 최신의 Jabber/GTalk 계정"
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2914,7 +2957,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2924,64 +2967,64 @@ msgstr ""
 "GTalk 친구목록에 반드시 %s 주소를 추가하여 주십시오."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "메일 설정"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Jabber/GTalk 로 통지를 보내주세요."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Jabber/GTalk의 상태가 변경되었을 때 통지를 보냅니다."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "내가 구독하지 않는 사람으로 부터의 답장을  Jabber/GTalk을 통해 보내주세요."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Jabber/GTalk 계정을 위한 MicroID의 생성"
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "설정이 저장되었습니다."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Jabber ID가 아닙니다."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "그 Jabbar ID를 정규화 할 수 없습니다."
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "유효한 Jabber ID가 아닙니다."
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "그 Jabber ID는 이미 귀하의 것입니다."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID가 이미 다른 사용자에 의하여 사용되고 있습니다."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2991,28 +3034,29 @@ msgstr ""
 "달할 수 있습니다."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "옳지 않은 메신저 계정 입니다."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:400
-msgid "Couldn't delete IM confirmation."
+#: actions/imsettings.php:391
+#, fuzzy
+msgid "Could not delete IM confirmation."
 msgstr "메신저 승인을 삭제 할 수 없습니다."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "그 Jabber ID는 귀하의 것이 아닙니다."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "메일 주소를 지웠습니다."
 
@@ -3228,108 +3272,108 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s의 상태 (%2$s에서)"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "라이선스"
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "위치가 너무 깁니다. (최대 255글자)"
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 #, fuzzy
 msgid "Private"
 msgstr "개인정보 취급방침"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr "All Rights Reserved"
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr "크리에이티브 커먼즈 (Creative Commons)"
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr "종류"
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr "라이선스 선택"
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr "라이선스 세부 정보"
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr "라이선스 이름"
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr "라이선스 URL"
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr "라이선스 이미지 URL"
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
 
@@ -4109,12 +4153,12 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "프로필 설정"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4122,19 +4166,19 @@ msgstr ""
 "트 할 수 있습니다. "
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "프로필 정보"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 #, 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4142,13 +4186,13 @@ msgstr "실명"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "홈페이지"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "귀하의 홈페이지, 블로그 혹은 다른 사이트의 프로필 페이지 URL"
@@ -4156,26 +4200,26 @@ 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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, 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:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "자기소개"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4183,50 +4227,50 @@ msgid "Location"
 msgstr "위치"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "당신은 어디에 삽니까? \"시, 도 (or 군,구), 나라\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:157
+#: actions/profilesettings.php:153
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "태그"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr "당신을 위한 태그, (문자,숫자,-, ., _로 구성) 콤마 혹은 공백으로 구분."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "언어"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "언어 설정"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "시간대"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 msgid "What timezone are you normally in?"
 msgstr "주로 생활하는 곳이 어느 시간대입니까?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "나에게 구독하는 사람에게 자동 구독 신청"
@@ -4234,60 +4278,56 @@ 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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, 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:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "타임존이 설정 되지 않았습니다."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:276
 #, 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, 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:409
+#: actions/profilesettings.php:404
 #, fuzzy
-msgid "Couldn't save location prefs."
+msgid "Could not save location prefs."
 msgstr "태그를 저장할 수 없습니다."
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "프로필을 저장 할 수 없습니다."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "설정 저장"
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "새 계정 만들기"
@@ -4668,7 +4708,7 @@ msgstr ""
 "(지금 귀하는 귀하의 이메일 주소를 확인하는 방법에 대한 지침을 메일로 받으셨습"
 "니다.)"
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4679,77 +4719,78 @@ msgstr ""
 "register%%)하십시오. 이미 계정이 [호환되는 마이크로블로깅 사이트]((%%doc."
 "openmublog%%)에 계정이 있으면, 아래에 프로파일 URL을 입력하십시오."
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "리모트 구독 예약"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "원격 사용자에 구독"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "이용자 닉네임"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "따라가고 싶은 사용자의 별명"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "프로필 URL"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "다른 마이크로블로깅 서비스의 귀하의 프로필 URL"
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "구독"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "옳지 않은 프로필 URL (나쁜 포멧)"
 
-#: actions/remotesubscribe.php:168
+#: actions/remotesubscribe.php:167
 #, fuzzy
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr "유효한 프로필 URL이 아닙니다. (YADIS 문서가 없습니다)"
 
-#: actions/remotesubscribe.php:176
+#: actions/remotesubscribe.php:175
 #, fuzzy
-msgid "That’s a local profile! Login to subscribe."
+msgid "That is a local profile! Login to subscribe."
 msgstr "그것은 로컬프로필입니다. 구독을 위해서는 로그인하십시오."
 
-#: actions/remotesubscribe.php:183
+#: actions/remotesubscribe.php:182
 #, fuzzy
-msgid "Couldn’t get a request token."
+msgid "Could not get a request token."
 msgstr "리퀘스트 토큰을 취득 할 수 없습니다."
 
-#: actions/repeat.php:57
+#: actions/repeat.php:56
 #, fuzzy
 msgid "Only logged-in users can repeat notices."
 msgstr "오직 해당 사용자만 자신의 메일박스를 열람할 수 있습니다."
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 #, fuzzy
 msgid "No notice specified."
 msgstr "프로필을 지정하지 않았습니다."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "자신의 글은 재전송할 수 없습니다."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "이미 재전송된 소식입니다."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "재전송됨"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "재전송됨!"
 
@@ -5493,71 +5534,71 @@ msgid "Save site notice"
 msgstr "사이트 공지"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "메일 설정"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "인스턴트 메신저를 사용할 수 없습니다."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "SMS 주소"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "확인된 최신의 SMS가 가능한 휴대폰 번호"
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:133
+#: actions/smssettings.php:129
 msgid "Awaiting confirmation on this phone number."
 msgstr "이 전화 번호는 인증 대기중입니다."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "인증 코드"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 msgid "Enter the code you received on your phone."
 msgstr "휴대폰으로 받으신 인증번호를 입력하십시오."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "확인"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "휴대폰 번호가 없습니다."
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "지역번호와 함께 띄어쓰기 없이 번호를 적어 주세요."
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "메일 설정"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5566,32 +5607,32 @@ msgstr ""
 "습니다."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
 msgid "SMS preferences saved."
 msgstr "SMS 설정을 저장했습니다."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "휴대폰 번호가 없습니다."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr "통신회사가 선택 되지 않았습니다."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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."
@@ -5600,39 +5641,39 @@ msgstr ""
 "와 사용법을 확인하여 주시기 바랍니다."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
+#: actions/smssettings.php:404
 msgid "That is the wrong confirmation number."
 msgstr "옳지 않은 인증 번호 입니다."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 msgid "That is not your phone number."
 msgstr "그 휴대폰 번호는 귀하의 것이 아닙니다."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
+#: actions/smssettings.php:460
 msgid "The SMS phone number was removed."
 msgstr "메일 주소를 지웠습니다."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "휴대전화 사업자"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5640,7 +5681,7 @@ msgid ""
 msgstr "귀하의 휴대폰의 통신회사는 무엇입니까?"
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "코드가 입력 되지 않았습니다."
 
@@ -5897,10 +5938,6 @@ msgid ""
 msgstr ""
 "당신이 구독하거나 당신을 구독하는 사람들에 대해서만 태그를 붙일 수 있습니다."
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "태그를 저장할 수 없습니다."
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "당신의 구독자나 구독하는 사람에 태깅을 위해 이 양식을 사용하세요."
@@ -6135,18 +6172,18 @@ msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "%S 잘못된 그림 파일 타입입니다. "
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "프로필 디자인"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr ""
 
@@ -7111,23 +7148,27 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "메시지를 삽입할 수 없습니다."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
@@ -7741,6 +7782,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 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
+msgid "Couldn't update your design."
+msgstr "디자인을 수정할 수 없습니다."
+
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
 #: lib/designsettings.php:433
 #, fuzzy
@@ -8985,3 +9032,28 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "No such profile"
+#~ msgstr "해당하는 파일이 없습니다."
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "%s 사용자가 멤버인 그룹"
+
+#, fuzzy
+#~ msgid "Method not supported"
+#~ msgstr "API 메서드 발견 안 됨."
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "%s에 의해 구독되는 사람들"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "사용자를 업데이트 할 수 없습니다."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "프로필을 저장 할 수 없습니다."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "태그를 저장할 수 없습니다."
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 477837ac3f..6a7aa4d753 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-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:00+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05: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-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -89,9 +89,9 @@ msgstr "Зачувај нагодувања на пристап"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -112,6 +112,8 @@ msgstr "Нема таква страница."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -132,8 +134,8 @@ msgstr "Нема таква страница."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -144,7 +146,7 @@ msgstr "Нема таква страница."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -313,7 +315,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Не можев да го подновам корисникот."
 
@@ -335,7 +351,8 @@ msgid "User has no profile."
 msgstr "Корисникот нема профил."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "Не може да се зачува профил."
 
@@ -371,8 +388,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "Не можам да ги зачувам Вашите нагодувања за изглед."
 
@@ -380,13 +397,18 @@ msgstr "Не можам да ги зачувам Вашите нагодувањ
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
+#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Не може да се поднови Вашиот изглед."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+#, fuzzy
+msgctxt "ATOM"
 msgid "Main"
 msgstr "Главна"
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -397,31 +419,38 @@ msgstr "Главна"
 msgid "%s timeline"
 msgstr "Историја на %s"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Претплати на %s"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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 бендисани"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Не можете да се блокирате самите себеси!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Блокирањето на корисникот не успеа."
 
@@ -561,7 +590,7 @@ msgstr "Не можев да го пронајдам целниот корисн
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Тој прекар е во употреба. Одберете друг."
@@ -571,7 +600,7 @@ msgstr "Тој прекар е во употреба. Одберете друг.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Неправилен прекар."
@@ -583,7 +612,7 @@ msgstr "Неправилен прекар."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Главната страница не е важечка URL-адреса."
@@ -593,7 +622,7 @@ msgstr "Главната страница не е важечка URL-адрес
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Полното име е предолго (највеќе 255 знаци)."
@@ -620,7 +649,7 @@ msgstr[1] "Описот е предолг (дозволено е највеќе
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Местоположбата е предолга (највеќе 255 знаци)."
@@ -743,7 +772,7 @@ msgid "Upload failed."
 msgstr "Подигањето не успеа."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:101
+#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Неважечки жетон за барање или потврдник."
 
@@ -763,18 +792,19 @@ msgid "Request token already authorized."
 msgstr "Жетонот за барање е веќе овластен."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -795,16 +825,17 @@ msgstr "Грешка во базата при вметнувањето на auth
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Неочекувано поднесување на образец."
 
@@ -855,7 +886,7 @@ msgstr "Сметка"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -876,7 +907,7 @@ msgstr "Лозинка"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -950,6 +981,7 @@ 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
@@ -969,39 +1001,49 @@ msgstr "Не можете да ја повторувате сопственат
 msgid "Already repeated that notice."
 msgstr "Забелешката е веќе повторена."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTML-методот не е поддржан."
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Статусот е избришан."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Нема пронајдено статус со тој ID."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "Не може да се избрише оваа забелешка."
 
-#: actions/apistatusesshow.php:243
+#. 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"
@@ -1136,51 +1178,49 @@ msgstr "Само корисникот може да ја надополнува
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Прифаќај само AtomPub за Atom-канали."
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr "Забелешката преку Atom не смее да биде празна."
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr "Забелешката преку Atom мора да биде добро-поставен XML."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Не може да работи со предмети на активност од типот „%s“."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, php-format
 msgid "No content for notice %d."
 msgstr "Нема содржина за забелешката %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:406
+#: actions/apitimelineuser.php:409
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Веќе постои забелешка со URI „%s“."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr "AtomPub-објава со непознат URI за внимание %s"
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1191,96 +1231,108 @@ msgstr "API-методот е во изработка."
 msgid "User not found."
 msgstr "Корисникот не е пронајден."
 
-#: actions/atompubfavoritefeed.php:70
-msgid "No such profile"
-msgstr "Нема таков профил"
-
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr "Забелешки на %s што ги бендисува %s"
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-msgid "Can't add someone else's subscription"
-msgstr "Не можам да додадам туѓа претплата"
-
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-msgstr "Може да работи само со активности за бендисување."
-
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
-msgid "Can only fave notices."
-msgstr "Може само да бендисува забелешки."
-
-#: actions/atompubfavoritefeed.php:256
-msgid "Unknown note."
-msgstr "Непозната белешка."
-
-#: actions/atompubfavoritefeed.php:263
-msgid "Already a favorite."
-msgstr "Веќе е бендисано."
-
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "Нема таков профил."
 
+#. 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
+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"
 
-#: actions/atompubmembershipfeed.php:147
-#, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "Групи на %s кадешто членува %s"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
+#. 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:241
-msgid "Can only handle Join activities."
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
 msgstr "Може да работи само со активности за зачленување."
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 msgid "Unknown group."
 msgstr "Непозната група."
 
-#: actions/atompubmembershipfeed.php:263
+#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
+#: actions/atompubmembershipfeed.php:267
 msgid "Already a member."
 msgstr "Веќе членувате."
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr "Блокиран од администратор."
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+#, fuzzy
+msgid "Cannot delete someone else's favorite"
 msgstr "Не можам да избришам туѓа бендисана ставка."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "Нема такваа група"
 
-#: actions/atompubshowmembership.php:90
+#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
+#: actions/atompubshowmembership.php:91
 msgid "Not a member"
 msgstr "Не членувате"
 
-#: actions/atompubshowmembership.php:115
-msgid "Method not supported"
-msgstr "Методот не е поддржан"
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
+#, fuzzy
+msgid "HTTP method not supported"
+msgstr "HTML-методот не е поддржан."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1288,41 +1340,38 @@ msgstr "Не можам да избришам туѓо членство"
 #: actions/atompubshowsubscription.php:72
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
-#, php-format
-msgid "No such profile id: %d"
+#, fuzzy, 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
 #, fuzzy, php-format
-msgid "Profile %1$d not subscribed to profile %2$d"
-msgstr "Профилот %d не е претплатен на профилот %d"
+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
 #, fuzzy
-msgid "Cannot delete someone else's subscription"
+msgid "Cannot delete someone else's subscription."
 msgstr "Не можам да избришам туѓа претплата"
 
-#: actions/atompubsubscriptionfeed.php:150
-#, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "Луѓе на %s на коишто се претплатил %s"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr "Може да работи само со аквитности за следење."
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr "Може само да следи луѓе."
 
-#: actions/atompubsubscriptionfeed.php:262
-#, php-format
-msgid "Unknown profile %s"
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
+#, fuzzy, php-format
+msgid "Unknown profile %s."
 msgstr "Непознат профил %s"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1333,10 +1382,11 @@ msgstr "Нема таков прилог."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Нема прекар."
@@ -1369,30 +1419,36 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "Нагодувања на аватарот"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "Оригинал"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "Преглед"
 
@@ -1427,7 +1483,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "Податоците за податотеката се изгубени."
 
@@ -1446,18 +1503,17 @@ msgstr "Подновата на аватарот не успеа."
 msgid "Avatar deleted."
 msgstr "Аватарот е избришан."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
-msgstr ""
+msgstr "Резервна сметка"
 
 #: actions/backupaccount.php:80
-#, fuzzy
 msgid "Only logged-in users can backup their account."
-msgstr "Само најавени корисници можат да повторуваат забелешки."
+msgstr "Само одјавени корисници можат да прават резервна верзија на сметката."
 
 #: actions/backupaccount.php:84
 msgid "You may not backup your account."
-msgstr ""
+msgstr "Не можете да направите резрвна верзија на Вашата сметка."
 
 #: actions/backupaccount.php:232
 msgid ""
@@ -1467,16 +1523,20 @@ 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>. Ова е "
+"експериментална функција која прави нецелосна резерва. Во резервата нема да "
+"се зачуваат лични податоци како е-пошта и адреса за НП. Покрај ова, во "
+"резервата не се зачувуваат и подигнатите податотеки и непосредните пораки."
 
 #: actions/backupaccount.php:255
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
-msgstr "Позадина"
+msgstr "Резерва"
 
 #: actions/backupaccount.php:258
 msgid "Backup your account"
-msgstr ""
+msgstr "Направете резервна верзија на сметката"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 #: actions/block.php:68
@@ -1549,6 +1609,7 @@ msgstr "Не можев да ги снимам инофрмациите за б
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1558,7 +1619,7 @@ msgstr "Не можев да ги снимам инофрмациите за б
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1638,23 +1699,6 @@ msgstr "Непознат тип на адреса %s."
 msgid "That address has already been confirmed."
 msgstr "Оваа адреса веќе е потврдена."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-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
@@ -1686,39 +1730,35 @@ 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 "Само најавени корисници можат да повторуваат забелешки."
+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 "Не можете да бришете корисници."
+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 ""
+msgstr "Во кутијата морате точно да го впишете „%s“ како што е."
 
 #. 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.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
-#, fuzzy
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 msgid "Delete account"
-msgstr "Создај сметка"
+msgstr "Избриши сметка"
 
 #. TRANS: Form text for user deletion form.
 #: actions/deleteaccount.php:279
@@ -1726,6 +1766,7 @@ msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
 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.
@@ -1735,6 +1776,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.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
@@ -1745,15 +1788,14 @@ 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
@@ -2077,7 +2119,7 @@ msgid "Reset back to default"
 msgstr "Врати по основно"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2189,14 +2231,16 @@ msgid "Edit %s group"
 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:70 actions/newgroup.php:65
 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 when trying to change group logo settings while not being a group admin.
 #: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "Мора да сте администратор за да можете да ја уредите групата."
 
@@ -2257,8 +2301,8 @@ msgstr "Тековна потврдена е-поштенска адреса."
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Отстрани"
@@ -2283,15 +2327,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Приемна пошта"
 
@@ -2302,13 +2346,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Создај нова е-поштенска адреса за примање објави; ја заменува старата адреса."
@@ -2324,7 +2368,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Нова"
@@ -2400,9 +2444,10 @@ msgstr "Таа е-поштенска адреса е веќе зафатена 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, fuzzy
+msgid "Could not insert confirmation code."
 msgstr "Потврдниот код не може да се внесе."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
@@ -2418,8 +2463,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Нема потврди кои може да се откажат."
 
@@ -2430,8 +2475,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+msgid "Could not delete email confirmation."
 msgstr "Не можев да ја избришам потврдата по е-пошта."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
@@ -2450,24 +2496,25 @@ msgstr "Ова не е Вашата е-поштенска адреса."
 msgid "The email address was removed."
 msgstr "Е-поштенската адреса е отстранета."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, fuzzy
+msgid "Could not update user record."
 msgstr "Не можев да ја подновам корисничката евиденција."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 msgid "Incoming email address removed."
 msgstr "Приемната е-поштенска адреса е отстранета."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "Додадена е нова влезна е-поштенска адреса."
 
@@ -2566,7 +2613,7 @@ msgstr "Овој одговор не беше очекуван!"
 msgid "User being listened to does not exist."
 msgstr "Следениот корисник не постои."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Може да ја користите локалната претплата."
 
@@ -2698,22 +2745,19 @@ 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "Не можев да го подновам Вашиот изглед."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "Нагодувањата се зачувани."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "Лого на групата"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2721,23 +2765,28 @@ msgstr ""
 "Можете да подигнете слика за логото на Вашата група. Максималната дозволена "
 "големина на податотеката е %s."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "Подигни"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "Отсечи"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr "Одберете квадратен простор на сликата за лого."
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "Логото е подновено."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "Подновата на логото не успеа."
 
@@ -2879,14 +2928,14 @@ msgid "Error removing the block."
 msgstr "Грешка при отстранување на блокот."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2896,23 +2945,23 @@ msgstr ""
 "im%%). Подолу "
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM е недостапно."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "IM адреса"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Моментално потврдена Jabber/GTalk адреса."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2927,7 +2976,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2937,64 +2986,64 @@ msgstr ""
 "%s во Вашиот контактен список во Вашиот IM клиент или GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "IM нагодувања"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Испраќај ми забелешки преку Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Објавувај забелешка кога мојот статус на Jabber/GTalk ќе се промени."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Испраќај ми одговори преку Jabber/GTalk од луѓе на кои не сум претплатен."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Објави MicroID за мојата адреса на Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Нагодувањата се зачувани."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Нема JabberID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "Ова JabberID не може да се нормализира."
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "Неправилен JabberID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "Ова веќе е Вашиот Jabber ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID already belongs to another user."
 msgstr "Ова Jabber ID му припаѓа на друг корисник."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -3004,28 +3053,29 @@ msgstr ""
 "одобрите на %s да Ви испраќа пораки."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "Ова е погрешната IM адреса."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:400
-msgid "Couldn't delete IM confirmation."
+#: actions/imsettings.php:391
+#, fuzzy
+msgid "Could not delete IM confirmation."
 msgstr "Не можев да ја избришам потврдата на IM."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Ова не е Вашиот Jabber ID."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "IM-адресата е отстранета."
 
@@ -3251,20 +3301,20 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s ја напушти групата %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Лиценца"
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr "Лиценца на ова StatusNet-мрежно место"
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr "Неважечки избор на лиценца."
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
@@ -3272,91 +3322,91 @@ msgstr ""
 "Мора да го наведете сопственикот на содржината кога користите лиценца со "
 "Сите права задржани."
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Неважечки наслов на лиценцата. Дозволени се највеќе 255 знаци."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr "Неважечка URL-адреса на лиценцата."
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr "Неважечка URL-адреса за сликата на лиценцата."
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 "URL-адресата на лиценцата мора да стои празна или да биде важечка адреса."
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr ""
 "Сликата на лиценцата мора да стои празна или да биде важечка URL-адреса."
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr "Избор на лиценца"
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "Приватен"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr "Сите права задржани"
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr "Тип"
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr "Одберете лиценца"
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr "Податоци за лиценцата"
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr "Сопственик"
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 "Име и презиме на сопственикот на содржината на мрежното место (ако е "
 "применливо)."
 
-#: actions/licenseadminpanel.php:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr "Наслов на лиценцата"
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr "Насловот на лиценцата."
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr "URL-адреса на лиценцата"
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr "URL-адреса за повеќе информации во врска со лиценцата."
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr "URL-адреса за сликата на лиценцата"
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr "URL-адреса за слика што ќе се прикажува со лиценцата."
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Зачувај нагодувања на лиценцата"
 
@@ -3464,9 +3514,8 @@ 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 "Не Ви е дозволено да ја избришете оваа група."
+msgstr "Не Ви е дозволено да создавате групи на ова мреж. место."
 
 #. TRANS: Form instructions for group create form.
 #: actions/newgroup.php:117
@@ -4131,12 +4180,12 @@ msgstr ""
 "место „%2$s“."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "Нагодувања на профилот"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4144,18 +4193,18 @@ msgstr ""
 "повеќе за Вас."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "Информации за профил"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4163,13 +4212,13 @@ msgstr "Цело име"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Домашна страница"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: actions/profilesettings.php:121
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
 "URL-адреса на Вашата домашна страница, блог или профил на друго мрежно место."
@@ -4177,7 +4226,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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4185,19 +4234,19 @@ msgstr[0] "Опишете се себеси и своите интереси с
 msgstr[1] "Опишете се себеси и своите интереси со %d знаци."
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "Биографија"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4205,25 +4254,25 @@ msgid "Location"
 msgstr "Местоположба"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Каде се наоѓате, на пр. „Град, Област, Земја“."
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:157
+#: actions/profilesettings.php:153
 msgid "Share my current location when posting notices"
 msgstr ""
 "Прикажувај ја мојата тековна местоположба при објавување на забелешките"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "Ознаки"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4231,27 +4280,27 @@ msgstr ""
 "празно место"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "Јазик"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "Претпочитан јазик"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "Часовна зона"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 msgid "What timezone are you normally in?"
 msgstr "Во која часовна зона обично се наоѓате?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4261,7 +4310,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4269,54 +4318,50 @@ msgstr[0] "Биографијата е предолга (највеќе до %d
 msgstr[1] "Биографијата е предолга (највеќе до %d знаци)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Не е избрана часовна зона."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:276
 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, 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:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, fuzzy
+msgid "Could not save location prefs."
 msgstr "Не можев да ги зачувам нагодувањата за местоположба"
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "Не можам да го зачувам профилот."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Нагодувањата се зачувани"
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
-#, fuzzy
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 msgid "Restore account"
-msgstr "Создај сметка"
+msgstr "Врати сметка"
 
 #: actions/public.php:83
 #, php-format
@@ -4711,7 +4756,7 @@ msgstr ""
 "(Би требало веднаш да добиете порака по е-пошта, во која стојат напатствија "
 "за потврдување на е-поштенската адреса.)"
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4723,74 +4768,77 @@ msgstr ""
 "[усогласиво мреж. место за микроблогирање](%%doc.openmublog%%), внесете го "
 "URL-то на Вашиот профил подолу."
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Оддалечена претплата"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Претплати се на далечински корисник"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Прекар на корисникот"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "Прекар на корисникот што сакате да го следите."
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "URL на профилот"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL на Вашиот профил на друга соодветна служба за микроблогирање."
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "Претплати се"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "Неправилно URL на профил (лош формат)"
 
-#: actions/remotesubscribe.php:168
+#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "Неважечка URL-адреса на профил (нема YADIS документ или определен е "
 "неважечки XRDS)."
 
-#: actions/remotesubscribe.php:176
-msgid "That’s a local profile! Login to subscribe."
+#: actions/remotesubscribe.php:175
+#, fuzzy
+msgid "That is a local profile! Login to subscribe."
 msgstr "Тоа е локален профил! најавете се за да се претплатите."
 
-#: actions/remotesubscribe.php:183
-msgid "Couldn’t get a request token."
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
 msgstr "Не можев да добијам жетон за барање."
 
-#: actions/repeat.php:57
+#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Само најавени корисници можат да повторуваат забелешки."
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Нема назначено забелешка."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "Не можете да повторувате сопствена забелешка."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Веќе ја имате повторено таа забелешка."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Повторено"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Повторено!"
 
@@ -4854,22 +4902,19 @@ 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 "Само најавени корисници можат да повторуваат забелешки."
+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 "Сè уште немате регистрирано ниеден програм,"
+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 "Подигање"
+msgstr "Нема подигната податотека."
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
 #: actions/restoreaccount.php:129 lib/mediafile.php:194
@@ -4914,9 +4959,8 @@ msgstr "Системска грешка при подигањето на под
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
 #: actions/restoreaccount.php:207
-#, fuzzy
 msgid "Not an Atom feed."
-msgstr "Не членувате"
+msgstr "Ова не е Atom-канал."
 
 #. TRANS: Success message when a feed has been restored.
 #: actions/restoreaccount.php:241
@@ -4924,11 +4968,14 @@ 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
@@ -4936,12 +4983,13 @@ msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
+"Можете да опдигнете зачувано резервно емитување во форматот <a href=\"http://"
+"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
-#, fuzzy
 msgid "Upload the file"
-msgstr "Подигање"
+msgstr "Подигни ја податотеката"
 
 #: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
@@ -5566,71 +5614,71 @@ msgid "Save site notice"
 msgstr "Зачувај ја објавава"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "Нагодувања за СМС"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "СМС-пораките се недостапни."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "СМС адреса"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Тековен потврден телефонски број со можност за СМС."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:133
+#: actions/smssettings.php:129
 msgid "Awaiting confirmation on this phone number."
 msgstr "Очекувам потврда за овој телефонски број."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "Потврден код"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 msgid "Enter the code you received on your phone."
 msgstr "Внесете го кодот што го добивте по телефон."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Потврди"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "Телефонски број за СМС"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 "Телефонски број, без интерпункциски знаци и празни места, со повикувачки код"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "СМС нагодувања"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5639,32 +5687,32 @@ msgstr ""
 "трошоци."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
 msgid "SMS preferences saved."
 msgstr "СМС нагодувањата се зачувани."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "Нема телефонски број."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr "Немате избрано оператор."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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."
@@ -5673,39 +5721,39 @@ msgstr ""
 "го телефонот за да го видите кодот, заедно со напатствија за негова употреба."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
+#: actions/smssettings.php:404
 msgid "That is the wrong confirmation number."
 msgstr "Ова е погрешен потврден број."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 msgid "That is not your phone number."
 msgstr "Тоа не е Вашиот телефонски број."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
+#: actions/smssettings.php:460
 msgid "The SMS phone number was removed."
 msgstr "Телефонскиот број за СМС е отстранет."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "Мобилен оператор"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5715,7 +5763,7 @@ msgstr ""
 "пошта, но не фигурира овде, известете нè на %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "Нема внесено код"
 
@@ -5979,10 +6027,6 @@ msgstr ""
 "Можете да означувате само луѓе на коишто сте претплатени или луѓе "
 "претплатени на Вас."
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "Не можев да ги зачувам ознаките."
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "Со овој образец додавајте ознаки во Вашите претплатници или претплати."
@@ -6213,12 +6257,12 @@ msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Погрешен тип на слика за URL на аватарот „%s“."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "Изглед на профилот"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6226,7 +6270,7 @@ msgstr ""
 "Прилагодете го изгледот на Вашиот профил, со позадинска слика и палета од "
 "бои по Ваш избор."
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr "Добар апетит!"
 
@@ -6999,54 +7043,51 @@ 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 "Непознат јазик „%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 ""
+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 "Назначете го името на корисникот на којшто сакате да се претплатите."
+msgstr "Не можам да му наметнам на далечинскиот корисник да се претплати."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
 #: lib/activityimporter.php:132
-#, fuzzy
 msgid "Unknown profile."
-msgstr "Непознат профил %s"
+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 ""
+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 ""
+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 "Веќе членувате во таа група."
+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 ""
+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 "Нема содржина за забелешката %d."
+msgstr "Нема содржина за забелешката %s."
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7197,24 +7238,30 @@ msgid ""
 msgstr "Не можев да пронајдам профил и програм поврзан со жетонот за барање."
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 msgid "Could not issue access token."
 msgstr "Не можев да го издадам жетонот за пристап."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "Не успеав да го избришам отповиканиот жетон."
 
@@ -7332,15 +7379,13 @@ msgid "Revoke"
 msgstr "Одземи"
 
 #: lib/atom10feed.php:113
-#, fuzzy
 msgid "Author element must contain a name element."
-msgstr "авторскиот елемент мора да содржи елемент на име."
+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 "Не ја бриши групава"
+msgstr "Не користете го овој метод!"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7863,6 +7908,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 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
+msgid "Couldn't update your design."
+msgstr "Не можев да го подновам Вашиот изглед."
+
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
 #: lib/designsettings.php:433
 msgid "Design defaults restored."
@@ -7893,17 +7944,16 @@ msgid "FOAF"
 msgstr "FOAF"
 
 #: lib/feedimporter.php:75
-#, fuzzy
 msgid "Not an atom feed."
-msgstr "Не членувате"
+msgstr "Ова не е Atom-канал."
 
 #: lib/feedimporter.php:82
 msgid "No author in the feed."
-msgstr ""
+msgstr "Нема автор во емитувањето."
 
 #: lib/feedimporter.php:89
 msgid "Can't import without a user."
-msgstr ""
+msgstr "Не можам да увезам без корисник."
 
 #. TRANS: Header for feed links (h2).
 #: lib/feedlist.php:66
@@ -9215,3 +9265,30 @@ msgstr "Неважечки XML. Нема XRD-корен."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Земам резерва на податотеката „%s“."
+
+#~ msgid "AtomPub post with unknown attention URI %s"
+#~ msgstr "AtomPub-објава со непознат URI за внимание %s"
+
+#~ msgid "No such profile"
+#~ msgstr "Нема таков профил"
+
+#~ msgid "Notices %s has favorited to on %s"
+#~ msgstr "Забелешки на %s што ги бендисува %s"
+
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "Групи на %s кадешто членува %s"
+
+#~ msgid "Method not supported"
+#~ msgstr "Методот не е поддржан"
+
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "Луѓе на %s на коишто се претплатил %s"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "Не можев да го подновам корисникот."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "Не можам да го зачувам профилот."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "Не можев да ги зачувам ознаките."
diff --git a/locale/ml/LC_MESSAGES/statusnet.po b/locale/ml/LC_MESSAGES/statusnet.po
index 7f694bd6b3..ed13e9423b 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-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:05+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05:41+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-01-14 13:22:39+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ml\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -86,9 +86,9 @@ msgstr "അഭിഗമ്യതാ സജ്ജീകരണങ്ങൾ സേ
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -109,6 +109,8 @@ msgstr "അത്തരത്തിൽ ഒരു താളില്ല."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -129,8 +131,8 @@ msgstr "അത്തരത്തിൽ ഒരു താളില്ല."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -141,7 +143,7 @@ msgstr "അത്തരത്തിൽ ഒരു താളില്ല."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -301,9 +303,23 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
-msgstr ""
+msgstr "ഉപയോക്തൃ വിവരങ്ങൾ പുതുക്കാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Client error displayed if a user profile could not be found.
 #. TRANS: Client error displayed when a user has no profile.
@@ -323,7 +339,8 @@ msgid "User has no profile."
 msgstr ""
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr ""
 
@@ -355,8 +372,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "താങ്കളുടെ രൂപകല്പനാ സജ്ജീകരണങ്ങൾ കാത്തുസൂക്ഷിക്കാനായില്ല."
 
@@ -364,13 +381,18 @@ msgstr "താങ്കളുടെ രൂപകല്പനാ സജ്ജീ
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
+#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "താങ്കളുടെ രൂപകല്പന പുതുക്കാനായില്ല."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+#, fuzzy
+msgctxt "ATOM"
 msgid "Main"
 msgstr "മുഖ്യം"
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -381,31 +403,38 @@ msgstr "മുഖ്യം"
 msgid "%s timeline"
 msgstr "%s എന്ന ഉപയോക്താവിന്റെ സമയരേഖ"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr ""
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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 ""
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "താങ്കൾക്ക് താങ്കളെത്തന്നെ തടയാൻ പറ്റില്ല!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "ഉപയോക്താവിനെ തടയൽ പരാജയപ്പെട്ടു."
 
@@ -451,8 +480,8 @@ 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] ""
+msgstr[0] "അത് വളരെ വലുതാണ്. സന്ദേശത്തിന്റെ പരമാവധി വലിപ്പം %d അക്ഷരമാണ്."
+msgstr[1] "അത് വളരെ വലുതാണ്. സന്ദേശത്തിന്റെ പരമാവധി വലിപ്പം %d അക്ഷരങ്ങളാണ്."
 
 #. TRANS: Client error displayed if a recipient user could not be found (403).
 #: actions/apidirectmessagenew.php:139
@@ -476,7 +505,7 @@ msgstr ""
 #: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:108
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
-msgstr ""
+msgstr "ആ ഐ.ഡി.യോട് യോജിക്കുന്ന സ്ഥിതിവിവരം കണ്ടെത്താനായില്ല."
 
 #. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
 #: actions/apifavoritecreate.php:120
@@ -529,7 +558,7 @@ 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 ""
+msgstr "സ്രോതസ്സ് ഉപയോക്താവിനെ നിർണ്ണയിക്കാനായില്ല."
 
 #. TRANS: Client error displayed when a target user could not be determined showing friendship.
 #: actions/apifriendshipsshow.php:140
@@ -541,7 +570,7 @@ msgstr "ലക്ഷ്യമിട്ട ഉപയോക്താവിനെ 
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "വിളിപ്പേര് മുമ്പേ ഉപയോഗത്തിലുണ്ട്. മറ്റൊരെണ്ണം ശ്രമിക്കുക."
@@ -551,7 +580,7 @@ msgstr "വിളിപ്പേര് മുമ്പേ ഉപയോഗത്
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "സാധുവായ വിളിപ്പേര് അല്ല."
@@ -563,7 +592,7 @@ msgstr "സാധുവായ വിളിപ്പേര് അല്ല."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "ഹോംപേജിന്റെ യൂ.ആർ.എൽ. സാധുവല്ല."
@@ -573,10 +602,10 @@ msgstr "ഹോംപേജിന്റെ യൂ.ആർ.എൽ. സാധുവ
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
-msgstr ""
+msgstr "പൂർണ്ണ നാമത്തിന്റെ നീളം വളരെ കൂടുതലാണ് (പരമാവധി 255 അക്ഷരങ്ങൾ)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
@@ -600,7 +629,7 @@ msgstr[1] ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr ""
@@ -723,9 +752,9 @@ msgid "Upload failed."
 msgstr "അപ്‌ലോഡ് പരാജയപ്പെട്ടു."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:101
+#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
-msgstr ""
+msgstr "അസാധുവായ അഭ്യർത്ഥനാ ചീട്ട് അല്ലെങ്കിൽ പരിശോധനോപാധി."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
 #: actions/apioauthauthorize.php:107
@@ -743,18 +772,19 @@ msgid "Request token already authorized."
 msgstr "അഭ്യർത്ഥനാ ചീട്ട് മുമ്പേ തന്നെ അംഗീകരിക്കപ്പെട്ടതാണ്."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -775,16 +805,17 @@ msgstr ""
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "അപ്രതീക്ഷിത ഫോം സമർപ്പിക്കൽ."
 
@@ -829,7 +860,7 @@ msgstr "അംഗത്വം"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -850,7 +881,7 @@ msgstr "രഹസ്യവാക്ക്"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -920,6 +951,7 @@ 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
@@ -939,47 +971,57 @@ msgstr "താങ്കൾക്ക് താങ്കളുടെ തന്ന
 msgid "Already repeated that notice."
 msgstr "ആ അറിയിപ്പ് മുമ്പേ തന്നെ ആവർത്തിച്ചിരിക്കുന്നു."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "എച്ച്.റ്റി.റ്റി.പി. രീതി പിന്തുണയ്ക്കുന്നില്ല."
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "സ്ഥിതിവിവരക്കുറിപ്പ് മായ്ച്ചിരിക്കുന്നു."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
-msgstr ""
+msgstr "ആ ഐ.ഡി.യിൽ ഒരു സ്ഥിതിവിവരം കണ്ടെത്താനായില്ല."
 
-#: actions/apistatusesshow.php:223
+#. 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 ""
+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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "ഈ അറിയിപ്പ് മായ്ക്കാൻ കഴിഞ്ഞില്ല."
 
-#: actions/apistatusesshow.php:243
+#. 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 ""
+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 ""
+msgstr "ക്ലയന്റ് 'status' ചരത്തിന് ഒരു വില നൽകിയിരിക്കണം."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
@@ -988,13 +1030,13 @@ msgstr ""
 #, 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] ""
-msgstr[1] ""
+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 ""
+msgstr "മാതൃ അറിയിപ്പ് കണ്ടെത്താനായില്ല."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
@@ -1003,7 +1045,9 @@ msgstr ""
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
 msgstr[0] ""
+"കൂടെ ചേർത്തിരിക്കുന്ന യൂ.ആർ.എൽ. അടക്കം അറിയിപ്പിന്റെ പരമാവധി വലിപ്പം %d അക്ഷരമാണ്."
 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.
@@ -1102,50 +1146,48 @@ msgstr "ഉപയോക്താവിനു മാത്രമേ അദ്ദ
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
-#, php-format
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
+#, fuzzy, php-format
 msgid "No content for notice %d."
-msgstr ""
+msgstr "ഉള്ളടക്കമൊന്നും %s എന്ന അറിയിപ്പിനു നൽകിയിട്ടില്ല."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:406
+#: actions/apitimelineuser.php:409
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
-msgstr ""
-
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
+msgstr "\"%s\" എന്ന യൂ.ആർ.ഐ.യിൽ അറിയിപ്പ് മുമ്പേ നിലവിലുണ്ട്."
 
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
@@ -1157,96 +1199,108 @@ msgstr ""
 msgid "User not found."
 msgstr "ഉപയോക്താവിനെ കണ്ടത്താനായില്ല."
 
-#: actions/atompubfavoritefeed.php:70
-msgid "No such profile"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-msgid "Can't add someone else's subscription"
-msgstr ""
-
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
-msgid "Can only fave notices."
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:256
-msgid "Unknown note."
-msgstr "അജ്ഞാതമായ കുറിപ്പ്."
-
-#: actions/atompubfavoritefeed.php:263
-msgid "Already a favorite."
-msgstr ""
-
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr ""
 
+#. 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
+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 സംഘ അംഗത്വങ്ങൾ"
 
-#: actions/atompubmembershipfeed.php:147
-#, php-format
-msgid "Groups %s is a member of on %s"
-msgstr ""
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "മറ്റൊരാളുടെ അംഗത്വം മായ്ക്കാനാവില്ല."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:241
-msgid "Can only handle Join activities."
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
 msgstr "പങ്ക് ചേരൽ പ്രക്രിയകൾ മാത്രം കൈകാര്യം ചെയ്യാനേ കഴിയൂ."
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 msgid "Unknown group."
 msgstr "അജ്ഞാത സംഘം."
 
-#: actions/atompubmembershipfeed.php:263
+#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
+#: actions/atompubmembershipfeed.php:267
 msgid "Already a member."
 msgstr "ഇപ്പോൾ തന്നെ അംഗമാണ്."
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr "കാര്യനിർവ്വാഹകനാൽ തടയപ്പെട്ടിരിക്കുന്നു."
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
-msgstr ""
+#, fuzzy
+msgid "Cannot delete someone else's favorite"
+msgstr "മറ്റൊരാളുടെ അംഗത്വം മായ്ക്കാനാവില്ല."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "അത്തരത്തിൽ ഒരു സംഘം ഇല്ല"
 
-#: actions/atompubshowmembership.php:90
+#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
+#: actions/atompubshowmembership.php:91
 msgid "Not a member"
 msgstr "അംഗം അല്ല"
 
-#: actions/atompubshowmembership.php:115
-msgid "Method not supported"
-msgstr "പിന്തുണയില്ലാത്ത മാർഗ്ഗമാണ്"
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
+#, fuzzy
+msgid "HTTP method not supported"
+msgstr "എച്ച്.റ്റി.റ്റി.പി. രീതി പിന്തുണയ്ക്കുന്നില്ല."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1254,42 +1308,39 @@ msgstr "മറ്റൊരാളുടെ അംഗത്വം മായ്ക
 #: actions/atompubshowsubscription.php:72
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
-#, php-format
-msgid "No such profile id: %d"
-msgstr ""
+#, 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"
+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"
+msgid "Cannot delete someone else's subscription."
 msgstr "മറ്റൊരാളുടെ അംഗത്വം മായ്ക്കാനാവില്ല."
 
-#: actions/atompubsubscriptionfeed.php:150
-#, php-format
-msgid "People %s has subscribed to on %s"
-msgstr ""
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr "പിന്തുടരൽ പ്രക്രിയകൾ മാത്രം കൈകാര്യം ചെയ്യാനേ കഴിയൂ."
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr "ഉപയോക്താക്കളെ പിന്തുടരാൻ മാത്രമേ കഴിയൂ."
 
-#: actions/atompubsubscriptionfeed.php:262
-#, php-format
-msgid "Unknown profile %s"
-msgstr ""
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
+#, fuzzy, php-format
+msgid "Unknown profile %s."
+msgstr "അജ്ഞാതമായ കുറിപ്പ്."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
@@ -1299,10 +1350,11 @@ msgstr ""
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "അങ്ങിനെ വിളിപ്പേര് ഇല്ല."
@@ -1333,30 +1385,36 @@ msgid "You can upload your personal avatar. The maximum file size is %s."
 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "അവതാരത്തിന്റെ സജ്ജീകരണം"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "യഥാർത്ഥം"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "എങ്ങനെയുണ്ടെന്നു കാണുക"
 
@@ -1391,7 +1449,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr ""
 
@@ -1410,7 +1469,7 @@ msgstr "അവതാരം അപ്‌ലോഡ് ചെയ്യുന്ന
 msgid "Avatar deleted."
 msgstr ""
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1502,13 +1561,14 @@ msgstr "ഈ ഉപയോക്താവിനെ തടയുക"
 #. TRANS: Server error displayed when blocking a user fails.
 #: actions/block.php:189
 msgid "Failed to save block information."
-msgstr ""
+msgstr "തടയലിന്റെ വിവരങ്ങൾ സേവ് ചെയ്യുന്നതിൽ പരാജയപ്പെട്ടു."
 
 #. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
 #. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1518,7 +1578,7 @@ msgstr ""
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1598,28 +1658,11 @@ msgstr "തിരിച്ചറിയാവാത്ത തരം വിലാ
 msgid "That address has already been confirmed."
 msgstr "ആ വിലാസം മുമ്പേ തന്നെ സ്ഥിരീകരിക്കപ്പെട്ടതാണ്."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-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
 msgid "Could not delete address confirmation."
-msgstr ""
+msgstr "ഇമെയിൽ സ്ഥിരീകരണം നീക്കം ചെയ്യാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Title for the contact address confirmation action.
 #: actions/confirmaddress.php:150
@@ -1646,39 +1689,35 @@ 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 "ഉപയോക്താവിനു മാത്രമേ അദ്ദേഹത്തിന്റെ സ്വന്തം സമയരേഖ ചേർക്കാൻ കഴിയൂ."
+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 "താങ്കൾക്ക് ഉപയോക്താക്കളെ നീക്കം ചെയ്യാൻ കഴിയില്ല."
+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 ""
+msgstr "പെട്ടിയിൽ  \"%s\" എന്നു തന്നെ താങ്കൾ എഴുതി നൽകണം."
 
 #. 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.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
-#, fuzzy
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 msgid "Delete account"
-msgstr "ഒരംഗത്വമെടുക്കുക"
+msgstr "അംഗത്വം മായ്ക്കുക"
 
 #. TRANS: Form text for user deletion form.
 #: actions/deleteaccount.php:279
@@ -1686,6 +1725,7 @@ msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
 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.
@@ -1705,15 +1745,14 @@ 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
@@ -2031,7 +2070,7 @@ msgid "Reset back to default"
 msgstr "മുമ്പ് സ്വതേയുണ്ടായിരുന്നതിലേയ്ക്ക് പുനഃസ്ഥാപിക്കുക"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2054,7 +2093,7 @@ msgstr ""
 #: actions/doc.php:158
 #, php-format
 msgid "No such document \"%s\""
-msgstr ""
+msgstr "\"%s\" എന്നൊരു രേഖ ഇല്ല"
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
@@ -2115,7 +2154,7 @@ msgstr "സംഘടനയേതെന്ന് ആവശ്യമാണ്."
 #. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
 #: actions/editapplication.php:223 actions/newapplication.php:199
 msgid "Organization is too long (maximum 255 characters)."
-msgstr ""
+msgstr "സംഘടനയുടെ പേരിന്റെ നീളം വളരെക്കൂടുതലാണ് (പരമാവധി 255 അക്ഷരങ്ങൾ)."
 
 #: actions/editapplication.php:226 actions/newapplication.php:202
 msgid "Organization homepage is required."
@@ -2143,14 +2182,16 @@ msgid "Edit %s group"
 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:70 actions/newgroup.php:65
 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 when trying to change group logo settings while not being a group admin.
 #: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "സംഘത്തിൽ മാറ്റം വരുത്താൻ താങ്കൾ ഒരു കാര്യനിർവ്വാഹകനായിരിക്കണം."
 
@@ -2211,8 +2252,8 @@ msgstr "ഇപ്പോൾ സ്ഥിരീകരിക്കപ്പെട
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "നീക്കം ചെയ്യുക"
@@ -2237,15 +2278,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "ഇങ്ങോട്ടുള്ള ഇമെയിൽ"
 
@@ -2256,13 +2297,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "പ്രസിദ്ധീകരിക്കാനായി പുതിയൊരു ഇമെയിൽ വിലാസം സൃഷ്ടിക്കുക; പഴയതു റദ്ദാക്കപ്പെടും."
 
@@ -2277,7 +2318,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "പുതിയത്"
@@ -2351,9 +2392,10 @@ msgstr "ആ ഇമെയിൽ വിലാസം മറ്റൊരു ഉപ
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, fuzzy
+msgid "Could not insert confirmation code."
 msgstr "സ്ഥിരീകരണ കോഡ് ഉൾപ്പെടുത്താൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
@@ -2369,8 +2411,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "റദ്ദാക്കാനായി സ്ഥിരീകരണങ്ങളൊന്നും അവശേഷിക്കുന്നില്ല."
 
@@ -2381,8 +2423,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+msgid "Could not delete email confirmation."
 msgstr "ഇമെയിൽ സ്ഥിരീകരണം നീക്കം ചെയ്യാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
@@ -2401,24 +2444,25 @@ msgstr "അത് താങ്കളുടെ ഇമെയിൽ വിലാസ
 msgid "The email address was removed."
 msgstr "ഇമെയിൽ വിലാസം നീക്കം ചെയ്തിരിക്കുന്നു."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
-msgstr ""
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, fuzzy
+msgid "Could not update user record."
+msgstr "ഉപയോക്തൃ വിവരങ്ങൾ പുതുക്കാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 msgid "Incoming email address removed."
 msgstr "സ്വീകരിക്കാനുള്ള ഇമെയിൽ വിലാസം നീക്കം ചെയ്തിരിക്കുന്നു."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "സ്വീകരിക്കാനുള്ള പുതിയ ഇമെയിൽ വിലാസം കൂട്ടിച്ചേർത്തിരിക്കുന്നു."
 
@@ -2511,13 +2555,13 @@ msgstr "ഈ പ്രതികരണമല്ല പ്രതീക്ഷിച
 msgid "User being listened to does not exist."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr ""
 
 #: actions/finishremotesubscribe.php:99
 msgid "That user has blocked you from subscribing."
-msgstr ""
+msgstr "വരിക്കാരനാകുന്നതിൽ നിന്നും ആ ഉപയോക്താവ് താങ്കളെ തടഞ്ഞിരിക്കുന്നു."
 
 #: actions/finishremotesubscribe.php:110
 msgid "You are not authorized."
@@ -2620,7 +2664,7 @@ msgstr "സംഘത്തിൽ നിന്നും ഉപയോക്താ
 
 #: actions/groupbyid.php:74 actions/userbyid.php:70
 msgid "No ID."
-msgstr ""
+msgstr "ഐ.ഡി. ഇല്ല."
 
 #: actions/groupdesignsettings.php:68
 msgid "You must be logged in to edit a group."
@@ -2636,44 +2680,48 @@ msgid ""
 "palette of your choice."
 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "താങ്കളുടെ രൂപകല്പന പുതുക്കാനായില്ല."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "രൂപകല്പനാ ക്രമീകരണങ്ങൾ സേവ് ചെയ്തിരിക്കുന്നു."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "സംഘത്തിന്റെ ലോഗോ"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
+"താങ്കൾക്ക് താങ്കളുടെ സംഘത്തിനുള്ള ലോഗോ അപ്‌ലോഡ് ചെയ്യാവുന്നതാണ്. പ്രമാണത്തിന്റെ പരമാവധി വലിപ്പം "
+"%s ആയിരിക്കണം."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "അപ്‌ലോഡ്"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "വെട്ടിച്ചെറുതാക്കുക"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr "ലോഗോ ആക്കാൻ ചിത്രത്തിന്റെ ഒരു സമചതുരത്തിലുള്ള ഭാഗം തിരഞ്ഞെടുക്കുക."
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "ലോഗോ പുതുക്കി."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "ലോഗോ പുതുക്കൽ പരാജയപ്പെട്ടു."
 
@@ -2689,7 +2737,7 @@ msgstr "%s സംഘ അംഗങ്ങൾ"
 #: actions/groupmembers.php:107
 #, php-format
 msgid "%1$s group members, page %2$d"
-msgstr ""
+msgstr "%1$s സംഘത്തിലെ അംഗങ്ങൾ, താൾ %2$d"
 
 #: actions/groupmembers.php:122
 msgid "A list of the users in this group."
@@ -2807,14 +2855,14 @@ msgid "Error removing the block."
 msgstr "തടയൽ നീക്കുന്നതിൽ പിഴവുണ്ടായി."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2825,23 +2873,23 @@ msgstr ""
 "താഴെ ക്രമീകരിക്കുക."
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "ഐ.എം. ലഭ്യമല്ല."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "ഐ.എം. വിലാസം"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "ഇപ്പോഴത്തെ സ്ഥിരീകരിക്കപ്പെട്ട ജാബ്ബർ/ജിറ്റോക് വിലാസം"
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2855,7 +2903,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2863,92 +2911,95 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "ഐ.എം. ക്രമീകരണങ്ങൾ"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "ജാബ്ബർ/ജിറ്റോക് വഴി എനിക്ക് അറിയിപ്പുകൾ അയയ്ക്കുക."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "എന്റെ ജാബ്ബർ/ജിറ്റോക് സ്ഥിതിവിവരം മാറുമ്പോൾ അറിയിപ്പുകൾ പ്രസിദ്ധീകരിക്കുക."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "ക്രമീകരണങ്ങൾ സേവ് ചെയ്തു."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "ജാബ്ബർ ഐ.ഡി. അല്ല."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr ""
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "ജാബർ ഐ.ഡി. അസാധുവാണ്"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "അത് ഇപ്പോൾ തന്നെ താങ്കളുടെ ജാബ്ബർ ഐ.ഡി. ആണ്."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID already belongs to another user."
 msgstr "ജാബ്ബർ ഐ.ഡി. മുമ്പേ തന്നെ മറ്റൊരു ഉപയോക്താവിന്റേതാണ്."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: 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 ""
+"താങ്കൾ ചേർത്തിട്ടുള്ള ഐ.എം. വിലാസത്തിലേയ്ക്ക് ഒരു സ്ഥിരീകരണ കോഡ് അയച്ചിട്ടുണ്ട്. താങ്കൾക്ക് "
+"സന്ദേശങ്ങൾ അയയ്ക്കാൻ താങ്കൾ %s അയയ്ക്കേണ്ടതാണ്."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "ഇത് തെറ്റായ ഐ.എം. വിലാസമാണ്."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:400
-msgid "Couldn't delete IM confirmation."
-msgstr ""
+#: actions/imsettings.php:391
+#, fuzzy
+msgid "Could not delete IM confirmation."
+msgstr "ഇമെയിൽ സ്ഥിരീകരണം നീക്കം ചെയ്യാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "അത് താങ്കളുടെ ജാബ്ബർ ഐ.ഡി. അല്ല."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "ഐ.എം. വിലാസം നീക്കം ചെയ്തിരിക്കുന്നു."
 
@@ -3029,8 +3080,8 @@ msgstr[1] ""
 #: actions/invite.php:167
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "താഴെക്കൊടുത്തിരിക്കുന്ന വ്യക്തിയെ ക്ഷണിച്ചിരിക്കുന്നു:"
+msgstr[1] "താഴെക്കൊടുത്തിരിക്കുന്ന വ്യക്തികളെ ക്ഷണിച്ചിരിക്കുന്നു:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
@@ -3143,107 +3194,107 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s %2$s എന്ന സംഘത്തിൽ നിന്നും ഒഴിവായി"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "അനുമതി"
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr "ഈ സ്റ്റാറ്റസ്‌നെറ്റ് സൈറ്റിന്റെ ഉപയോഗാനുമതി"
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr "അനുമതി തിരഞ്ഞെടുക്കൽ അസാധുവാണ്."
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 "എല്ലാ അവകാശങ്ങളും സംരക്ഷിതമായ ഉള്ളടക്കമാണ് ഉപയോഗിക്കുന്നതെങ്കിൽ ഉടമയെ വ്യക്തമാക്കേണ്ടതാണ്."
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "അസാധുവായ അനുമതി തലക്കെട്ട്. പരമാവധി നീളം 255 അക്ഷരങ്ങൾ."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr "അനുമതിയുടെ യു.ആർ.എൽ. അസാധുവാണ്."
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr "അനുമതി ചിത്രത്തിന്റെ യു.ആർ.എൽ. അസാധുവാണ്."
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
-msgstr ""
+msgstr "അനുമതിപത്ര യൂ.ആർ.എൽ. ശൂന്യമായിരിക്കണം അല്ലെങ്കിൽ സാധുവായ യൂ.ആർ.എൽ. ആയിരിക്കണം."
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
-msgstr ""
+msgstr "അനുമതിപത്ര ചിത്രം ശൂന്യമായിരിക്കണം അല്ലെങ്കിൽ സാധുവായ യൂ.ആർ.എൽ. ആയിരിക്കണം."
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr "അനുമതി തിരഞ്ഞെടുക്കൽ"
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "സ്വകാര്യം"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr "എല്ലാ അവകാശങ്ങളും സംരക്ഷിതം"
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr "ക്രിയേറ്റീവ് കോമൺസ്"
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr "തരം"
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr "അനുമതി തിരഞ്ഞെടുക്കുക"
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr "അനുമതിയുടെ വിശദാംശങ്ങൾ"
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr "ഉടമ"
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr "സൈറ്റിന്റെ ഉള്ളടക്കത്തിന്റെ ഉടമയുടെ (സാദ്ധ്യമെങ്കിൽ) പേര്."
 
-#: actions/licenseadminpanel.php:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr "അനുമതിയുടെ തലക്കെട്ട്"
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr "അനുമതിയുടെ ശീർഷകം."
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr "അനുമതിയുടെ യൂ.ആർ.എൽ."
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr "അനുമതിയെക്കുറിച്ച് കൂടുതൽ വിവരങ്ങൾ നൽകുന്ന യൂ.ആർ.എൽ."
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr "അനുമതി ചിത്ര യൂ.ആർ.എൽ."
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr "അനുമതിയോടൊപ്പം പ്രദർശിപ്പിക്കേണ്ട ചിത്രത്തിന്റെ യൂ.ആർ.എൽ.."
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "അനുമതി സജ്ജീകരണങ്ങൾ സേവ് ചെയ്യുക"
 
@@ -3349,9 +3400,8 @@ 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 "ഈ സൈറ്റിലെ ഉപയോക്താക്കളെ താങ്കൾക്ക് നിശബ്ദരാക്കാനാകില്ല."
+msgstr "ഈ സൈറ്റിൽ സംഘങ്ങൾ ഉണ്ടാക്കാൻ താങ്കൾക്ക് അനുമതിയില്ല."
 
 #. TRANS: Form instructions for group create form.
 #: actions/newgroup.php:117
@@ -3541,7 +3591,7 @@ msgstr ""
 #: actions/oembed.php:168
 #, php-format
 msgid "Content type %s not supported."
-msgstr ""
+msgstr "%s എന്ന തരം ഉള്ളടക്കം പിന്തുണയ്ക്കുന്നില്ല."
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:172
@@ -3587,7 +3637,7 @@ msgstr ""
 #. TRANS: Tooltip for for dropdown with URL shortener services.
 #: actions/othersettings.php:122
 msgid "Automatic shortening service to use."
-msgstr ""
+msgstr "ഉപയോഗിക്കാവുന്ന സ്വയംപ്രവർത്തിത ചെറുതാക്കൽ സേവനം."
 
 #. TRANS: Label for checkbox.
 #: actions/othersettings.php:128
@@ -3602,7 +3652,7 @@ msgstr ""
 #. TRANS: Form validation error for form "Other settings" in user profile.
 #: actions/othersettings.php:162
 msgid "URL shortening service is too long (maximum 50 characters)."
-msgstr ""
+msgstr "യൂ.ആർ.എൽ. ചെറുതാക്കൽ സേവനം വളരെ വലുതാണ് (പരമാവധി 50 അക്ഷരങ്ങൾ)."
 
 #: actions/otp.php:69
 msgid "No user ID specified."
@@ -3973,7 +4023,7 @@ msgstr ""
 
 #: actions/peoplesearch.php:58
 msgid "People search"
-msgstr ""
+msgstr "ആൾക്കാരെ തിരയുക"
 
 #: actions/peopletag.php:68
 #, php-format
@@ -3995,29 +4045,29 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr ""
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4025,20 +4075,20 @@ msgstr "പൂർണ്ണനാമം"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "ഹോംപേജ്"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: 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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4046,19 +4096,19 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4066,50 +4116,50 @@ msgid "Location"
 msgstr "സ്ഥലം"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "താങ്കളെവിടെയാണ്, അതായത് \"നഗരം, സംസ്ഥാനം (അഥവ പ്രദേശം), രാജ്യം\" എന്ന്"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:157
+#: actions/profilesettings.php:153
 msgid "Share my current location when posting notices"
 msgstr "അറിയിപ്പുകൾ പ്രസിദ്ധീകരിക്കുന്നതിനോടൊപ്പം എന്റെ ഇപ്പോഴത്തെ സ്ഥലവും പങ്കുവെയ്ക്കുക"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "റ്റാഗുകൾ"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "ഭാഷ"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "പ്രിയങ്കര ഭാഷ"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "സമയ മേഖല"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 msgid "What timezone are you normally in?"
 msgstr "താങ്കൾ സാധാരണയുണ്ടാകാറുള്ള സമയമേഖല ഏതാണ്?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4117,7 +4167,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4125,54 +4175,50 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "സമയമേഖല തിരഞ്ഞെടുത്തിട്ടില്ല."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:276
 msgid "Language is too long (maximum 50 characters)."
-msgstr ""
+msgstr "ഭാഷയുടെ നീളം വളരെ കൂടുതലാണ് (പരമാവധി 50 അക്ഷരങ്ങൾ)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
+#: actions/profilesettings.php:346
+#, 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:409
-msgid "Couldn't save location prefs."
-msgstr ""
-
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr ""
+#: actions/profilesettings.php:404
+#, fuzzy
+msgid "Could not save location prefs."
+msgstr "എന്റെ സ്ഥാനം പങ്ക് വെയ്ക്കരുത്"
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "സജ്ജീകരണങ്ങൾ സേവ് ചെയ്തിരിക്കുന്നു."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
-#, fuzzy
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 msgid "Restore account"
-msgstr "ഒരംഗത്വമെടുക്കുക"
+msgstr "അംഗത്വം പുനഃക്രമീകരിക്കുക"
 
 #: actions/public.php:83
 #, php-format
@@ -4248,7 +4294,7 @@ msgstr ""
 #: actions/publictagcloud.php:65
 #, php-format
 msgid "These are most popular recent tags on %s"
-msgstr ""
+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 "]("
@@ -4382,10 +4428,12 @@ msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
+"താങ്കളുടെ രഹസ്യവാക്ക് പുനഃസ്ഥാപിക്കാനുള്ള നിർദ്ദേശങ്ങൾ താങ്കളുടെ അംഗതത്തോടൊപ്പം നൽകിയിട്ടുള്ള "
+"ഇമെയിൽ വിലാസത്തിലേയ്ക്ക് അയച്ചിട്ടുണ്ട്."
 
 #: actions/recoverpassword.php:357
 msgid "Unexpected password reset."
-msgstr ""
+msgstr "അപ്രതീക്ഷിത രഹസ്യവാക്ക് പുനഃക്രമീകരണം."
 
 #: actions/recoverpassword.php:365
 msgid "Password must be 6 characters or more."
@@ -4525,7 +4573,7 @@ msgid ""
 "to confirm your email address.)"
 msgstr ""
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4533,72 +4581,75 @@ msgid ""
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr ""
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr ""
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "ഉപയോക്തൃ വിളിപ്പേര്"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "താങ്കൾക്ക് പിന്തുടരേണ്ട ഉപയോക്താവിന്റെ വിളിപ്പേര്"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr ""
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "വരിക്കാരാകുക"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr ""
 
-#: actions/remotesubscribe.php:168
+#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 
-#: actions/remotesubscribe.php:176
-msgid "That’s a local profile! Login to subscribe."
-msgstr ""
+#: actions/remotesubscribe.php:175
+#, fuzzy
+msgid "That is a local profile! Login to subscribe."
+msgstr "വരിക്കാരനാകുന്നതിൽ നിന്നും ആ ഉപയോക്താവ് താങ്കളെ തടഞ്ഞിരിക്കുന്നു."
 
-#: actions/remotesubscribe.php:183
-msgid "Couldn’t get a request token."
-msgstr ""
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
+msgstr "അസാധുവായ അഭ്യർത്ഥനാ ചീട്ട്."
 
-#: actions/repeat.php:57
+#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr ""
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
-msgstr ""
+msgstr "അറിയിപ്പുകളൊന്നും വ്യക്തമാക്കിയിട്ടില്ല."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "താങ്കൾക്ക് താങ്കളുടെ തന്നെ അറിയിപ്പ് ആവർത്തിക്കാനാവില്ല."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "താങ്കൾ ആ അറിയിപ്പ് മുമ്പേ തന്നെ ആവർത്തിച്ചിരിക്കുന്നു."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "ആവർത്തിച്ചു"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "ആവർത്തിച്ചു!"
 
@@ -4656,22 +4707,19 @@ 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 "ഉപയോക്താവിനു മാത്രമേ അദ്ദേഹത്തിന്റെ സ്വന്തം സമയരേഖ ചേർക്കാൻ കഴിയൂ."
+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 "താങ്കൾക്ക് താങ്കളുടെ തന്നെ അറിയിപ്പ് ആവർത്തിക്കാനാവില്ല."
+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 "പ്രമാണം അപ്‌ലോഡ് ചെയ്യുക"
+msgstr "പ്രമാണമൊന്നും അപ്‌ലോഡ് ചെയ്തിട്ടില്ല."
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
 #: actions/restoreaccount.php:129 lib/mediafile.php:194
@@ -4712,9 +4760,8 @@ msgstr ""
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
 #: actions/restoreaccount.php:207
-#, fuzzy
 msgid "Not an Atom feed."
-msgstr "അംഗം അല്ല"
+msgstr "ഒരു ആറ്റം ഫീഡ് അല്ല."
 
 #. TRANS: Success message when a feed has been restored.
 #: actions/restoreaccount.php:241
@@ -4737,7 +4784,6 @@ 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 "പ്രമാണം അപ്‌ലോഡ് ചെയ്യുക"
 
@@ -4932,14 +4978,14 @@ msgstr "താങ്കളാഗ്രഹിക്കുന്നത് പങ
 #: actions/showgroup.php:75
 #, php-format
 msgid "%s group"
-msgstr ""
+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 ""
+msgstr "%1$s സംഘം, താൾ %2$d"
 
 #. TRANS: Group profile header (h2). Text hidden by default.
 #: actions/showgroup.php:220
@@ -5078,7 +5124,7 @@ msgstr ""
 
 #: actions/shownotice.php:90
 msgid "Notice deleted."
-msgstr ""
+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
@@ -5180,7 +5226,7 @@ msgstr ""
 #: actions/showstream.php:328
 #, php-format
 msgid "Repeat of %s"
-msgstr ""
+msgstr "%s എന്ന ഉപയോക്താവിന്റെ ആവർത്തനം"
 
 #: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
@@ -5290,7 +5336,7 @@ msgstr ""
 #. TRANS: Page title for site-wide notice tab in admin panel.
 #: actions/sitenoticeadminpanel.php:55
 msgid "Site Notice"
-msgstr ""
+msgstr "സൈറ്റ് അറിയിപ്പ്"
 
 #. TRANS: Instructions for site-wide notice tab in admin panel.
 #: actions/sitenoticeadminpanel.php:66
@@ -5310,7 +5356,7 @@ msgstr ""
 #. TRANS: Label for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
-msgstr ""
+msgstr "സൈറ്റ് അറിയിപ്പ് എഴുത്ത്"
 
 #. TRANS: Tooltip for site-wide notice text field in admin panel.
 #: actions/sitenoticeadminpanel.php:179
@@ -5323,141 +5369,141 @@ msgid "Save site notice"
 msgstr ""
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr ""
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "എസ്.എം.എസ്. ലഭ്യമല്ല."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "എസ്.എം.എസ്. വിലാസം"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:133
+#: actions/smssettings.php:129
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "സ്ഥിരീകരണ കോഡ്"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 msgid "Enter the code you received on your phone."
 msgstr ""
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "സ്ഥിരീകരിക്കുക"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr ""
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr ""
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 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:315
+#: actions/smssettings.php:308
 msgid "SMS preferences saved."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "ഫോൺ നമ്പർ നൽകിയിട്ടില്ല."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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:413
+#: actions/smssettings.php:404
 msgid "That is the wrong confirmation number."
 msgstr ""
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 msgid "That is not your phone number."
 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
+#: actions/smssettings.php:460
 msgid "The SMS phone number was removed."
 msgstr ""
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr ""
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5465,7 +5511,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr ""
 
@@ -5714,10 +5760,6 @@ msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr ""
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
@@ -5937,18 +5979,18 @@ msgid "Wrong image type for avatar URL ‘%s’."
 msgstr ""
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr ""
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr ""
 
@@ -6682,9 +6724,9 @@ 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 "അപരിചിതമായ ഭാഷ \"%s\"."
+msgstr "അപരിചിതമായ ക്രിയ: \"%s\"."
 
 #. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
 #: lib/activityimporter.php:107
@@ -6705,7 +6747,7 @@ 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 ""
+msgstr "ഈ പ്രവൃത്തി ഞങ്ങളുടെ ഒരുപയോക്താവ് ചെയ്തതാണെന്ന് തോന്നുന്നില്ല."
 
 #. TRANS: Client exception thrown when trying to join a remote group that is not a group.
 #: lib/activityimporter.php:154
@@ -6714,9 +6756,8 @@ 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 "താങ്കൾ ആ സംഘത്തിൽ മുമ്പേ തന്നെ അംഗമാണ്."
+msgstr "ഉപയോക്താവ് ഈ സംഘത്തിൽ മുമ്പേ തന്നെ അംഗമാണ്."
 
 #. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
 #: lib/activityimporter.php:207
@@ -6726,9 +6767,9 @@ 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 "താങ്കൾക്ക് താങ്കളുടെ തന്നെ അറിയിപ്പ് ആവർത്തിക്കാനാവില്ല."
+msgstr "ഉള്ളടക്കമൊന്നും %s എന്ന അറിയിപ്പിൽ നൽകിയിട്ടില്ല."
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -6769,7 +6810,7 @@ msgstr ""
 #. TRANS: the admin panel Design.
 #: lib/adminpanelaction.php:274
 msgid "Unable to delete design setting."
-msgstr ""
+msgstr "രൂപകല്പനാ സജ്ജീകരണങ്ങൾ മായ്ക്കാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:337
@@ -6877,22 +6918,25 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 msgid "Could not issue access token."
 msgstr ""
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
@@ -7014,9 +7058,8 @@ 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 "ഈ സംഘത്തെ മായ്ക്കരുത്"
+msgstr "ഈ മാർഗ്ഗം ഉപയോഗിക്കരുത്!"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7346,7 +7389,7 @@ msgstr[1] ""
 #. TRANS: any group subscriptions.
 #: lib/command.php:884
 msgid "You are not a member of any groups."
-msgstr ""
+msgstr "താങ്കൾ ഒരു സംഘത്തിലേയും അംഗമല്ല."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
@@ -7354,8 +7397,8 @@ msgstr ""
 #: lib/command.php:889
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "താങ്കൾ ഈ സംഘത്തിലെ അംഗമാണ്:"
+msgstr[1] "താങ്കൾ ഈ സംഘങ്ങളിലെ അംഗമാണ്:"
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
 #: lib/command.php:904
@@ -7489,6 +7532,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 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
+msgid "Couldn't update your design."
+msgstr "താങ്കളുടെ രൂപകല്പന പുതുക്കാനായില്ല."
+
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
 #: lib/designsettings.php:433
 msgid "Design defaults restored."
@@ -7519,9 +7568,8 @@ msgid "FOAF"
 msgstr ""
 
 #: lib/feedimporter.php:75
-#, fuzzy
 msgid "Not an atom feed."
-msgstr "അംഗം അല്ല"
+msgstr "ഒരു ആറ്റം ഫീഡ് അല്ല."
 
 #: lib/feedimporter.php:82
 msgid "No author in the feed."
@@ -7840,7 +7888,7 @@ msgstr ""
 #: lib/mail.php:315
 #, php-format
 msgid "New email address for posting to %s"
-msgstr ""
+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
@@ -7908,7 +7956,7 @@ msgstr ""
 #: lib/mail.php:547
 #, php-format
 msgid "New private message from %s"
-msgstr ""
+msgstr "%s അയച്ച സ്വകാര്യ സന്ദേശങ്ങൾ"
 
 #. TRANS: Body for direct-message notification email.
 #. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
@@ -7974,6 +8022,9 @@ msgid ""
 "\n"
 "\t%s"
 msgstr ""
+"പൂർണ്ണമായ സംവാദം ഇവിടെ വായിക്കാം:\n"
+"\n"
+"\t%s"
 
 #. 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.
@@ -8272,7 +8323,7 @@ msgstr "ഇൻബോക്സ്"
 
 #: lib/personalgroupnav.php:129
 msgid "Your incoming messages"
-msgstr ""
+msgstr "താങ്കൾക്ക് വരുന്ന സന്ദേശങ്ങൾ"
 
 #: lib/personalgroupnav.php:133
 msgid "Outbox"
@@ -8302,19 +8353,19 @@ msgstr ""
 
 #: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
 msgid "Subscribers"
-msgstr ""
+msgstr "വരിക്കാർ"
 
 #: lib/profileaction.php:161
 msgid "All subscribers"
-msgstr ""
+msgstr "എല്ലാ വരിക്കാരും"
 
 #: lib/profileaction.php:191
 msgid "User ID"
-msgstr ""
+msgstr "ഉപയോക്തൃ ഐ.ഡി"
 
 #: lib/profileaction.php:196
 msgid "Member since"
-msgstr ""
+msgstr "അംഗമായത്"
 
 #. TRANS: Average count of posts made per day since account registration
 #: lib/profileaction.php:235
@@ -8323,7 +8374,7 @@ msgstr "ദൈനിക ശരാശരി"
 
 #: lib/profileaction.php:264
 msgid "All groups"
-msgstr ""
+msgstr "എല്ലാ സംഘങ്ങളും"
 
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
@@ -8335,7 +8386,7 @@ msgstr "സാർവ്വജനികം"
 
 #: lib/publicgroupnav.php:82
 msgid "User groups"
-msgstr ""
+msgstr "ഉപയോക്തൃ സംഘങ്ങൾ"
 
 #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
@@ -8411,15 +8462,15 @@ msgstr "ജനങ്ങൾ"
 
 #: lib/searchgroupnav.php:81
 msgid "Find people on this site"
-msgstr ""
+msgstr "ഈ സൈറ്റിലെ ആൾക്കാരെ കണ്ടെത്തുക"
 
 #: lib/searchgroupnav.php:83
 msgid "Find content of notices"
-msgstr ""
+msgstr "അറിയിപ്പുകളുടെ ഉള്ളടക്കം കണ്ടെത്തുക"
 
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
-msgstr ""
+msgstr "ഈ സൈറ്റിലെ സംഘങ്ങൾ കണ്ടെത്തുക"
 
 #: lib/section.php:89
 msgid "Untitled section"
@@ -8478,7 +8529,7 @@ msgstr "ഒന്നുമില്ല"
 #. TRANS: Server exception displayed if a theme name was invalid.
 #: lib/theme.php:74
 msgid "Invalid theme name."
-msgstr ""
+msgstr "ദൃശ്യരൂപത്തിന്റെ പേര് അസാധുവാണ്."
 
 #: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
@@ -8486,13 +8537,13 @@ msgstr ""
 
 #: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
-msgstr ""
+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 ""
+msgstr "ദൃശ്യരൂപം സേവ് ചെയ്യുന്നതിൽ പരാജയപ്പെട്ടു."
 
 #: lib/themeuploader.php:147
 msgid "Invalid theme: bad directory structure."
@@ -8592,7 +8643,7 @@ msgstr "തിരുത്തുക"
 
 #: lib/userprofile.php:289
 msgid "Send a direct message to this user"
-msgstr ""
+msgstr "ഈ ഉപയോക്താവിന് നേരിട്ട് സന്ദേശമയയ്ക്കുക"
 
 #: lib/userprofile.php:290
 msgid "Message"
@@ -8720,3 +8771,9 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Method not supported"
+#~ msgstr "പിന്തുണയില്ലാത്ത മാർഗ്ഗമാണ്"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "ഉപയോക്തൃ വിവരങ്ങൾ പുതുക്കാൻ കഴിഞ്ഞില്ല."
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index c9511b5886..d3a99f627d 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/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-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:14+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05: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 (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -88,9 +88,9 @@ msgstr "Lagre tilgangsinnstillinger"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -111,6 +111,8 @@ msgstr "Ingen slik side."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -131,8 +133,8 @@ msgstr "Ingen slik side."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -143,7 +145,7 @@ msgstr "Ingen slik side."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -309,7 +311,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Kunne ikke oppdatere bruker."
 
@@ -331,7 +347,8 @@ msgid "User has no profile."
 msgstr "Brukeren har ingen profil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "Kunne ikke lagre profil."
 
@@ -367,8 +384,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "Kunne ikke lagre dine innstillinger for utseende."
 
@@ -376,13 +393,18 @@ 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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Kunne ikke oppdatere din profils utseende."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+#, fuzzy
+msgctxt "ATOM"
 msgid "Main"
 msgstr "Hoved"
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -393,31 +415,38 @@ msgstr "Hoved"
 msgid "%s timeline"
 msgstr "%s tidslinje"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s abonnementer"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: 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:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Blokkering av bruker mislyktes."
 
@@ -554,7 +583,7 @@ msgstr "Kunne ikke finne målbruker."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Det nicket er allerede i bruk. Prøv et annet."
@@ -564,7 +593,7 @@ msgstr "Det nicket er allerede i bruk. Prøv et annet."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ugyldig nick."
@@ -576,7 +605,7 @@ msgstr "Ugyldig nick."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Hjemmesiden er ikke en gyldig URL."
@@ -586,7 +615,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Fullt navn er for langt (maks 255 tegn)."
@@ -613,7 +642,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Plasseringen er for lang (maks 255 tegn)."
@@ -736,7 +765,7 @@ 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:101
+#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "Ugyldig symbol."
@@ -759,18 +788,19 @@ msgid "Request token already authorized."
 msgstr "Du er ikke autorisert."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -791,16 +821,17 @@ msgstr "Databasefeil ved innsetting av oauth_token_association."
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Uventet skjemainnsending."
 
@@ -851,7 +882,7 @@ msgstr "Konto"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -872,7 +903,7 @@ msgstr "Passord"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -946,6 +977,7 @@ msgstr "Du kan ikke slette statusen til en annen bruker."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: 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
@@ -965,39 +997,49 @@ msgstr "Kan ikke gjenta din egen notis."
 msgid "Already repeated that notice."
 msgstr "Allerede gjentatt den notisen."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTTP-metoden støttes ikke."
 
-#: actions/apistatusesshow.php:141
+#. 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 "Formatet støttes ikke: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:152
+#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Status slettet."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Ingen status med den ID-en funnet."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "Kan ikke slette notisen."
 
-#: actions/apistatusesshow.php:243
+#. 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"
@@ -1128,51 +1170,49 @@ msgstr "Bare brukeren kan legge til sin egen tidslinje."
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Aksepterer kun AtomPub for Atom-matinger."
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr "Atom-innlegget kan ikke være tomt."
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 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:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, 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.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, 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:406
+#: actions/apitimelineuser.php:409
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Notis med URI «%s» finnes allerede."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr "AtomPub-innlegg med ukjent oppmerksomhets-URI %s"
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1183,105 +1223,115 @@ msgstr "API-metode under utvikling."
 msgid "User not found."
 msgstr "Bruker ikke funnet."
 
-#: actions/atompubfavoritefeed.php:70
-msgid "No such profile"
-msgstr "Ingen slik profil"
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
+msgid "No such profile."
+msgstr "Ingen slik profil."
 
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr "Notiser som %s har lagt til som favoritt på %s"
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-msgid "Can't add someone else's subscription"
+#. 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 error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-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 "Kan bare håndtere POST-handlinger."
 
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#. 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"
 
-#: actions/atompubfavoritefeed.php:256
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+#: actions/atompubfavoritefeed.php:259
 msgid "Unknown note."
 msgstr "Ukjent notat."
 
-#: actions/atompubfavoritefeed.php:263
+#. 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"
 
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Ingen slik profil."
-
+#. 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"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "%1$s grupper %2$s er et medlem av."
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "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:241
-msgid "Can only handle Join activities."
-msgstr ""
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
+msgstr "Kan bare håndtere POST-handlinger."
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Ukjent"
 
-#: actions/atompubmembershipfeed.php:263
+#. 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"
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr "Kunne ikke slette favoritt."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "Ingen slik gruppe."
 
-#: actions/atompubshowmembership.php:90
+#. 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"
 
-#: actions/atompubshowmembership.php:115
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "Method not supported"
-msgstr "API-metode ikke funnet!"
+msgid "HTTP method not supported"
+msgstr "HTTP-metoden støttes ikke."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1289,40 +1339,37 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
-msgid "No such profile id: %d"
+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"
+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"
+msgid "Cannot delete someone else's subscription."
 msgstr "Kunne ikke slette favoritt."
 
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "Fjernabonner"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
 msgstr "Ukjent filtype"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1333,10 +1380,11 @@ msgstr "Ingen slike vedlegg."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Ingen kallenavn."
@@ -1367,30 +1415,36 @@ 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."
 
 #. 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "Avatarinnstillinger"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "Opprinnelig"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "Forhåndsvis"
 
@@ -1425,7 +1479,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "Mistet våre fildata."
 
@@ -1444,7 +1499,7 @@ msgstr "Oppdatering av avatar mislyktes."
 msgid "Avatar deleted."
 msgstr "Avatar slettet."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1546,6 +1601,7 @@ msgstr "Kunne ikke lagre blokkeringsinformasjon."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1555,7 +1611,7 @@ msgstr "Kunne ikke lagre blokkeringsinformasjon."
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1635,23 +1691,6 @@ msgstr "Ukjent adressetype %s."
 msgid "That address has already been confirmed."
 msgstr "Den adressen har allerede blitt bekreftet."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-msgstr "Klarte ikke å oppdatere bruker."
-
 #. 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
@@ -1712,7 +1751,7 @@ msgid "Account deleted."
 msgstr "Avatar slettet."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "Opprett en konto"
@@ -2074,7 +2113,7 @@ msgid "Reset back to default"
 msgstr "Tilbakestill til standardverdier"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2186,14 +2225,16 @@ msgid "Edit %s group"
 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:70 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: Client error displayed trying to edit a group while not 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:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "Du må være en administrator for å redigere gruppen."
 
@@ -2254,8 +2295,8 @@ msgstr "Nåværende bekreftede e-postadresse"
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Fjern"
@@ -2280,15 +2321,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "innkommende e-post"
 
@@ -2299,13 +2340,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 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."
 
@@ -2318,7 +2359,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Ny"
@@ -2392,9 +2433,10 @@ 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, 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.
@@ -2409,8 +2451,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Ingen ventende bekreftelse å avbryte."
 
@@ -2421,8 +2463,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+msgid "Could not delete email confirmation."
 msgstr "Kunne ikke slette e-postbekreftelse."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
@@ -2441,24 +2484,25 @@ msgstr "Det er ikke din e-postadresse."
 msgid "The email address was removed."
 msgstr "E-postadressen ble fjernet."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, 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:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 msgid "Incoming email address removed."
 msgstr "Inkommende e-postadresse fjernet."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "Ny innkommende e-postadresse lagt til."
 
@@ -2557,7 +2601,7 @@ msgstr "Forventet ikke denne responsen!"
 msgid "User being listened to does not exist."
 msgstr "Brukeren som lyttes til finnes ikke."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Du kan bruke det lokale abonnementet!"
 
@@ -2687,44 +2731,46 @@ msgstr ""
 "Tilpass hvordan gruppen din ser ut med et bakgrunnsbilde og en fargepalett "
 "av ditt valg."
 
-#. 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "Kunne ikke oppdatere utseende."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "Utseende lagret."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "Gruppelogo"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, 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."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "Last opp"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "Beskjær"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr "Velg et kvadratisk område av bildet som skal bli logoen."
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "Logo oppdatert."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "Kunne ikke oppdatere logo."
 
@@ -2865,14 +2911,14 @@ msgid "Error removing the block."
 msgstr "Feil under oppheving av blokkering."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2882,23 +2928,23 @@ msgstr ""
 "im%%). Konfigurer adresse og innstillinger under."
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "Direktemeldinger ikke tilgjengelig."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "Direktemeldingsadresse"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Nåværende bekreftede Jabber/GTak-adresse."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2912,7 +2958,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2922,63 +2968,63 @@ msgstr ""
 "vennelisten din i direktemeldingsklienten din eller på GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Direktemeldingsinnstillinger"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Send meg notiser gjennom Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Post en notis når min Jabber/Gtalk-status endres."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk 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:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publiser en MicroID for min Jabber/Gtalk-adresse."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Innstillinger lagret."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Ingen Jabber ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "Klarer ikke normalisere Jabber-IDen"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "Det er allerede din Jabber ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID 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.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2988,28 +3034,29 @@ msgstr ""
 "godkjenne %s for å sende meldinger til deg."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 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:400
-msgid "Couldn't delete IM confirmation."
+#: actions/imsettings.php:391
+#, fuzzy
+msgid "Could not delete IM confirmation."
 msgstr "Kunne ikke slette direktemeldingsbekreftelse."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Det er ikke din Jabber ID."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "Direktemeldingsadressen ble fjernet."
 
@@ -3230,106 +3277,106 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s forlot gruppe %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Lisens"
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr "Lisens for denne StatusNet-siden"
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr "Ugyldig lisensvalg."
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 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:156
+#: actions/licenseadminpanel.php:151
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Ugyldig lisenstittel. Maksimal lengde er 255 tegn."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr "Ugyldig lisensadresse."
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr "Ugyldig lisensbildeadresse."
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr "Lisensadressen må være tom eller en gyldig nettadresse."
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr "Lisensbildet må være tomt eller en gyldig nettadresse."
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr "Lisensvalg"
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "Privat"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr "Alle rettigheter reservert"
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr "Type"
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr "Velg lisens"
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr "Lisensdetaljer"
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr "Eier"
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr "Navn på eieren av nettstedets innhold (hvis aktuelt)."
 
-#: actions/licenseadminpanel.php:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr "Lisenstittel"
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr "Tittelen på lisensen."
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr "Lisensadresse"
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr "Adresse til mer informasjon om lisensen."
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr "Lisensbildeadresse"
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr "Adresse til et bilde som vises med lisensen."
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Lagre lisensinnstillinger"
 
@@ -4099,12 +4146,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:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "Profilinnstillinger"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4112,18 +4159,18 @@ msgstr ""
 "mer om deg."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "Profilinformasjon"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4131,20 +4178,20 @@ msgstr "Fullt navn"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Hjemmesiden"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: 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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4152,19 +4199,19 @@ 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:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "Om meg"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4172,24 +4219,24 @@ msgid "Location"
 msgstr "Plassering"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 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:157
+#: actions/profilesettings.php:153
 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:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "Tagger"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4197,27 +4244,27 @@ msgstr ""
 "eller mellomrom"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "Språk"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "Foretrukket språk"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "Tidssone"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 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:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4226,7 +4273,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4234,51 +4281,48 @@ 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:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Tidssone ikke valgt."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:276
 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, 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:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, fuzzy
+msgid "Could not save location prefs."
 msgstr "Kunne ikke lagre plasseringsinnstillinger."
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "Klarte ikke å lagre profil."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Innstillinger lagret."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Opprett en konto"
@@ -4668,7 +4712,7 @@ msgstr ""
 "(Du vil straks motta en epost med instruksjoner om hvordan du kan bekrefte "
 "din epostadresse)"
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4680,75 +4724,78 @@ msgstr ""
 "[kompatibelt mikrobloggingsnettsted](%%doc.openmublog%%), skriv inn "
 "profilnettadressen din nedenfor."
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Fjernabonner"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Abonner på en fjernbruker"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Brukerens kallenavn"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "Kallenavn på brukeren du vil følge"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Profilnettadresse"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 "Nettadresse til profilen din på en annen kompatibel mikrobloggingstjeneste"
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "Abonner"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "Ugyldig profilnettadresse (dårlig format)"
 
-#: actions/remotesubscribe.php:168
+#: 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:176
-msgid "That’s a local profile! Login to subscribe."
+#: 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:183
-msgid "Couldn’t get a request token."
-msgstr ""
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
+msgstr "Kunne ikke sette inn melding."
 
-#: actions/repeat.php:57
+#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Bare innloggede brukere kan repetere notiser."
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Ingen notis spesifisert."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "Du kan ikke gjenta din egen notis."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Du har allerede gjentatt den notisen."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Gjentatt"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Gjentatt!"
 
@@ -5512,70 +5559,70 @@ msgid "Save site notice"
 msgstr "Lagre nettstedsnotis"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "SMS-innstillinger"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "SMS er ikke tilgjengelig."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "SMS-adresse"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 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:133
+#: actions/smssettings.php:129
 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:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "Bekreftelseskode"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 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:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Bekreft"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "Telefonnummer for SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 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:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "SMS-innstillinger"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5584,32 +5631,32 @@ msgstr ""
 "min teleoperatør."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
 msgid "SMS preferences saved."
 msgstr "SMS-innstillinger lagret."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "Ingen telefonnummer."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr "Ingen operatør valgt."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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."
@@ -5618,39 +5665,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:413
+#: actions/smssettings.php:404
 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:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 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:470
+#: actions/smssettings.php:460
 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:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "Mobiloperatør"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5661,7 +5708,7 @@ msgstr ""
 "fortell oss."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "Ingen kode skrevet inn"
 
@@ -5922,10 +5969,6 @@ msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "Kunne ikke lagre merkelapper."
-
 #: actions/tagother.php:236
 #, fuzzy
 msgid "Use this form to add tags to your subscribers or subscriptions."
@@ -6155,12 +6198,12 @@ 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:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "Vis profilutseender"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 #, fuzzy
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
@@ -6169,7 +6212,7 @@ msgstr ""
 "Tilpass hvordan gruppen din ser ut med et bakgrunnsbilde og en fargepalett "
 "av ditt valg."
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr "Bon appétit."
 
@@ -7123,23 +7166,27 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Kunne ikke sette inn melding."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
@@ -7763,6 +7810,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Nullstill"
 
+#. 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
+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
 #, fuzzy
@@ -9124,3 +9177,33 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "AtomPub post with unknown attention URI %s"
+#~ msgstr "AtomPub-innlegg med ukjent oppmerksomhets-URI %s"
+
+#~ msgid "No such profile"
+#~ msgstr "Ingen slik profil"
+
+#~ msgid "Notices %s has favorited to on %s"
+#~ msgstr "Notiser som %s har lagt til som favoritt på %s"
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "%1$s grupper %2$s er et medlem av."
+
+#, fuzzy
+#~ msgid "Method not supported"
+#~ msgstr "API-metode ikke funnet!"
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "Fjernabonner"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "Klarte ikke å oppdatere bruker."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "Klarte ikke å lagre profil."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "Kunne ikke lagre merkelapper."
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 8d606109ec..9ae3a24e62 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-01-15 00:20+0000\n"
-"PO-Revision-Date: 2011-01-15 00:22:50+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05: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-Generator: MediaWiki 1.18alpha (r80364); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 00:06:50+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -89,9 +89,9 @@ msgstr "Toegangsinstellingen opslaan"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -112,6 +112,8 @@ msgstr "Deze pagina bestaat niet."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -132,8 +134,8 @@ msgstr "Deze pagina bestaat niet."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -144,7 +146,7 @@ msgstr "Deze pagina bestaat niet."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -315,7 +317,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Het was niet mogelijk de gebruiker bij te werken."
 
@@ -337,7 +353,8 @@ msgid "User has no profile."
 msgstr "Deze gebruiker heeft geen profiel."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "Het was niet mogelijk het profiel op te slaan."
 
@@ -373,8 +390,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "Het was niet mogelijk om uw ontwerpinstellingen op te slaan."
 
@@ -382,13 +399,18 @@ 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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Het was niet mogelijk uw ontwerp bij te werken."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+#, fuzzy
+msgctxt "ATOM"
 msgid "Main"
 msgstr "Hoofdmenu"
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -399,31 +421,38 @@ msgstr "Hoofdmenu"
 msgid "%s timeline"
 msgstr "%s tijdlijn"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Abonnementen van %s"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: 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:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Het blokkeren van de gebruiker is mislukt."
 
@@ -564,7 +593,7 @@ msgstr "Het was niet mogelijk de doelgebruiker te vinden."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr ""
@@ -575,7 +604,7 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ongeldige gebruikersnaam!"
@@ -587,7 +616,7 @@ msgstr "Ongeldige gebruikersnaam!"
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "De thuispagina is geen geldige URL."
@@ -597,7 +626,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "De volledige naam is te lang (maximaal 255 tekens)."
@@ -624,7 +653,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "De locatie is te lang (maximaal 255 tekens)."
@@ -747,7 +776,7 @@ 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:101
+#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Het opgegeven token of controlegetal is ongeldig."
 
@@ -767,18 +796,19 @@ msgid "Request token already authorized."
 msgstr "Het verzoektoken is al geautoriseerd."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -803,16 +833,17 @@ msgstr ""
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Het formulier is onverwacht ingezonden."
 
@@ -863,7 +894,7 @@ msgstr "Gebruikersgegevens"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -884,7 +915,7 @@ msgstr "Wachtwoord"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -958,6 +989,7 @@ msgstr "U kunt de status van een andere gebruiker niet verwijderen."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: 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
@@ -977,39 +1009,49 @@ msgstr "U kunt uw eigen mededeling niet herhalen."
 msgid "Already repeated that notice."
 msgstr "U hebt die mededeling al herhaald."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTTP-methode wordt niet ondersteund."
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: 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:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Er is geen status gevonden met dit ID."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "Deze mededeling kan niet verwijderd worden."
 
-#: actions/apistatusesshow.php:243
+#. 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"
@@ -1145,51 +1187,49 @@ msgstr "Gebruikers kunnen alleen zelf aan hun eigen tijdlijn toevoegen."
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Alleen AtomPub voor Atomfeeds accepteren."
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr "Het Atombericht mag niet leeg zijn."
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 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:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, 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.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, 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:406
+#: actions/apitimelineuser.php:409
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "De mededeling met URI \"%s\" bestaat al."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr "Het AtomPubbericht met onbekende aandachts-URI is %s"
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1200,100 +1240,112 @@ msgstr "De API-functie is in bewerking."
 msgid "User not found."
 msgstr "De pagina is niet aangetroffen."
 
-#: actions/atompubfavoritefeed.php:70
-msgid "No such profile"
-msgstr "Het profiel bestaat niet"
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
+msgid "No such profile."
+msgstr "Het profiel bestaat niet."
 
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr "Mededelingen die %s als favoriet heeft aangemerkt op %s"
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-msgid "Can't add someone else's subscription"
+#. 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 "Het is niet mogelijk het abonnement voor iemand anders toe te voegen"
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
+#. 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 ""
 "Het is alleen mogelijk om activiteiten met betrekking tot favorieten af te "
 "handelen."
 
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#. 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."
 
-#: actions/atompubfavoritefeed.php:256
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+#: actions/atompubfavoritefeed.php:259
 msgid "Unknown note."
 msgstr "Onbekend mededeling."
 
-#: actions/atompubfavoritefeed.php:263
+#. 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."
 
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Het profiel bestaat niet."
-
+#. 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"
 
-#: actions/atompubmembershipfeed.php:147
-#, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "Groepen waar %s lid van is op %s"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
+#. 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 "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:241
-msgid "Can only handle Join activities."
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
 msgstr ""
 "Het is alleen mogelijk om activiteiten met betrekking tot lidmaatschap af te "
 "handelen."
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 msgid "Unknown group."
 msgstr "Onbekende groep."
 
-#: actions/atompubmembershipfeed.php:263
+#. 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."
 
-#: actions/atompubmembershipfeed.php:270
+#. 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."
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+#, fuzzy
+msgid "Cannot delete someone else's favorite"
 msgstr "Het is niet mogelijk om een favoriet van een ander te verwijderen"
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "Deze groep bestaat niet"
 
-#: actions/atompubshowmembership.php:90
+#. 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"
 
-#: actions/atompubshowmembership.php:115
-msgid "Method not supported"
-msgstr "Methode wordt niet ondersteund"
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
+#, fuzzy
+msgid "HTTP method not supported"
+msgstr "HTTP-methode wordt niet ondersteund."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, fuzzy
+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.
@@ -1301,43 +1353,41 @@ msgstr "Het is niet mogelijk om een lidmaatschap van een ander te verwijderen"
 #: actions/atompubshowsubscription.php:72
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
-#, php-format
-msgid "No such profile id: %d"
+#, fuzzy, 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"
+#, fuzzy, 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"
+#, fuzzy
+msgid "Cannot delete someone else's subscription."
 msgstr ""
 "Het is niet mogelijk het abonnement van een andere gebruiker op te zeggen."
 
-#: actions/atompubsubscriptionfeed.php:150
-#, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "Mensen waarop %s geabonneerd is op %s"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 "Het is alleen mogelijk om activiteiten met betrekking tot volgen af te "
 "handelen."
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr "Het is alleen mogelijk om mensen te volgen."
 
-#: actions/atompubsubscriptionfeed.php:262
-#, php-format
-msgid "Unknown profile %s"
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
+#, fuzzy, php-format
+msgid "Unknown profile %s."
 msgstr "Onbekend profiel %s"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1348,10 +1398,11 @@ msgstr "Deze bijlage bestaat niet."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Geen gebruikersnaam."
@@ -1383,30 +1434,36 @@ msgstr ""
 "U kunt een persoonlijke avatar uploaden. De maximale bestandsgrootte 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "Avatarinstellingen"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "Origineel"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "Voorvertoning"
 
@@ -1442,7 +1499,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "Ons bestand is verloren gegaan."
 
@@ -1461,9 +1519,9 @@ msgstr "Het bijwerken van de avatar is mislukt."
 msgid "Avatar deleted."
 msgstr "De avatar is verwijderd."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
-msgstr "Reservekopie van account maken"
+msgstr "Reservekopie van gebruiker maken"
 
 #: actions/backupaccount.php:80
 msgid "Only logged-in users can backup their account."
@@ -1566,6 +1624,7 @@ msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1575,7 +1634,7 @@ msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan."
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1655,23 +1714,6 @@ msgstr "Onbekend adrestype %s."
 msgid "That address has already been confirmed."
 msgstr "Dit adres is al bevestigd."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-msgstr "De gebruiker kon gebruiker niet bijwerkt worden."
-
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
 #: actions/confirmaddress.php:132
@@ -1729,7 +1771,7 @@ msgid "Account deleted."
 msgstr "De gebruiker is verwijderd."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 msgid "Delete account"
 msgstr "Gebruiker verwijderen"
 
@@ -2097,7 +2139,7 @@ msgid "Reset back to default"
 msgstr "Standaardinstellingen toepassen"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2209,14 +2251,16 @@ msgid "Edit %s group"
 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:70 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: Client error displayed trying to edit a group while not 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:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "U moet beheerder zijn om de groep te kunnen bewerken."
 
@@ -2277,8 +2321,8 @@ msgstr "Huidige bevestigde e-mailadres"
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Verwijderen"
@@ -2303,15 +2347,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Inkomende e-mail"
 
@@ -2322,13 +2366,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 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 "
@@ -2345,7 +2389,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nieuw"
@@ -2419,9 +2463,10 @@ 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, fuzzy
+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.
@@ -2437,8 +2482,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Er is geen openstaand bevestigingsverzoek om te annuleren."
 
@@ -2449,8 +2494,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+msgid "Could not delete email confirmation."
 msgstr "De e-mailbevestiging kon niet verwijderd worden."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
@@ -2469,24 +2515,25 @@ msgstr "Dit is niet uw e-mailadres."
 msgid "The email address was removed."
 msgstr "Het e-mailadres is verwijderd."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, fuzzy
+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:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 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:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "Het nieuwe binnenkomende e-mailadres is toegevoegd."
 
@@ -2586,7 +2633,7 @@ msgstr "Onverwacht antwoord!"
 msgid "User being listened to does not exist."
 msgstr "De gebruiker waarnaar wordt geluisterd bestaat niet."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "U kunt het lokale abonnement gebruiken!"
 
@@ -2722,22 +2769,19 @@ msgstr ""
 "De vormgeving van uw groep aanpassen met een achtergrondafbeelding en een "
 "kleurenpalet van uw keuze."
 
-#. 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "Het was niet mogelijk uw ontwerp bij te werken."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "De ontwerpvoorkeuren zijn opgeslagen."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "Groepslogo"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2745,23 +2789,28 @@ msgstr ""
 "Hier kunt u een logo voor uw groep uploaden. De maximale bestandsgrootte is %"
 "s."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "Uploaden"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "Uitsnijden"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr "Selecteer een vierkant uit de afbeelding die het logo wordt."
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "Logo geactualiseerd."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "Het bijwerken van het logo is mislukt."
 
@@ -2904,14 +2953,14 @@ msgid "Error removing the block."
 msgstr "Er is een fout opgetreden bij het verwijderen van de blokkade."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2921,23 +2970,23 @@ msgstr ""
 "berichten\"](%%doc.im%%). Maak hieronder uw instellingen."
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM is niet beschikbaar."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "IM-adres"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Huidige bevestigde Jabber/GTalk adres."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2952,7 +3001,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2962,65 +3011,65 @@ msgstr ""
 "%s eerst aan uw contactenlijst in uw IM-programma of in GTalk toevoegt."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "IM-voorkeuren"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Mij berichten sturen via Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Een mededeling versturen als mijn Jabber/GTalk-status wijzigt."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Mij antwoorden sturen via Jabber/GTalk van gebruikers op wie ik niet "
 "geabonneerd ben."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Een MicroID voor mijn Jabber/GTalk-adres publiceren."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Uw voorkeuren zijn opgeslagen."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Geen Jabber-ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "Het was niet mogelijk om het Jabber-ID te normaliseren"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "Geen geldige Jabber-ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: 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 IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID already belongs to another user."
 msgstr "Het Jabber-ID wordt al gebruikt door een andere gebruiker."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -3030,28 +3079,29 @@ msgstr ""
 "ermee akkoord gaan dat %s berichten aan u verzendt."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 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:400
-msgid "Couldn't delete IM confirmation."
+#: actions/imsettings.php:391
+#, fuzzy
+msgid "Could not delete IM confirmation."
 msgstr "De IM-bevestiging kon niet verwijderd worden."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Dit is niet uw Jabber-ID."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "Het IM-adres is verwijderd."
 
@@ -3277,20 +3327,20 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s heeft de groep %2$s verlaten"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Licentie"
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr "Licentie voor deze StatusNetsite"
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr "Ongeldige licentieselectie."
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
@@ -3298,87 +3348,87 @@ msgstr ""
 "U moet de eigenaar van de inhoud opgeven als u de licentie \"Alle rechten "
 "voorbehouden\" gebruikt."
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "De licentienaam is ongeldig. De maximale lengte is 255 tekens."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr "Ongeldige licentie-URL."
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr "Ongeldige URL voor licentieafbeelding."
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr "De licentie-URL moet leeg zijn of een geldige URL."
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr "De licentieafbeelding moet leeg zijn of een geldige URL."
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr "Licentieselectie"
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "Privé"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr "Alle rechten voorbehouden"
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr "Type"
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr "Selecteer licentie"
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr "Licentiedetails"
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr "Eigenaar"
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 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:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr "Licentienaam"
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr "De naam van de licentie."
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr "Licentie-URL"
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr "URL voor meer informatie over de licentie."
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr "URL voor licentieafbeelding"
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr "Een URL voor een afbeelding om weer te geven met de licentie."
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Licentieinstellingen opslaan"
 
@@ -4156,12 +4206,12 @@ msgstr ""
 "van deze site."
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "Profielinstellingen"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4169,18 +4219,18 @@ msgstr ""
 "andere gebruikers."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "Profielinformatie"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4188,20 +4238,20 @@ msgstr "Volledige naam"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
-msgstr "Thuispagina"
+msgstr "Startpagina"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: 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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4209,19 +4259,19 @@ 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:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "Beschrijving"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4229,24 +4279,24 @@ msgid "Location"
 msgstr "Locatie"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 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:157
+#: actions/profilesettings.php:153
 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:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "Labels"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4254,27 +4304,27 @@ msgstr ""
 "spaties"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "Taal"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "Voorkeurstaal"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "Tijdzone"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 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:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4284,7 +4334,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4292,53 +4342,50 @@ 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:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 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:281
+#: actions/profilesettings.php:276
 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 actions/tagother.php:178
 #, 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:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, fuzzy
+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:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, fuzzy
+msgid "Could not save location prefs."
 msgstr "Het was niet mogelijk de locatievoorkeuren op te slaan."
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "Het profiel kon niet opgeslagen worden."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "De instellingen zijn opgeslagen."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Gebruiker terugladen van back-up"
 
@@ -4735,7 +4782,7 @@ msgstr ""
 "U ontvangt snel een e-mailbericht  met daarin instructies over hoe u uw e-"
 "mail kunt bevestigen."
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4747,74 +4794,77 @@ msgstr ""
 "[compatibele microblogsite](%%doc.openmublog%%) hebt, voer dan hieronder uw "
 "profiel-URL in."
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Abonneren op afstand"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Op een gebruiker uit een andere systeem abonneren"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Gebruikersnaam"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "De gebruikersnaam van de gebruiker die u wilt volgen"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Profiel-URL"
 
-#: actions/remotesubscribe.php:134
+#: 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"
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "Abonneren"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "Ongeldige profiel-URL (foutieve opmaak)"
 
-#: actions/remotesubscribe.php:168
+#: 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:176
-msgid "That’s a local profile! Login to subscribe."
+#: actions/remotesubscribe.php:175
+#, fuzzy
+msgid "That is a local profile! Login to subscribe."
 msgstr "Dat is een lokaal profiel. Meld u aan om te abonneren."
 
-#: actions/remotesubscribe.php:183
-msgid "Couldn’t get a request token."
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
 msgstr "Het was niet mogelijk een verzoektoken te krijgen."
 
-#: actions/repeat.php:57
+#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Alleen aangemelde gebruikers kunnen hun mededelingen herhalen."
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Er is geen mededeling opgegeven."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "U kunt uw eigen mededeling niet herhalen."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "U hent die mededeling al herhaald."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Herhaald"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Herhaald!"
 
@@ -5595,70 +5645,70 @@ msgid "Save site notice"
 msgstr "Websitebrede mededeling opslaan"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "SMS-instellingen"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "SMS is niet beschikbaar."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "SMS-adres"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Huidige bevestigde telefoonnummer met SMS-functie."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:133
+#: actions/smssettings.php:129
 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:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "Bevestigingscode"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 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:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Bevestigen"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "SMS-nummer"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 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:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "SMS-voorkeuren"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5667,32 +5717,32 @@ msgstr ""
 "van mijn provider kan opleveren."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
 msgid "SMS preferences saved."
 msgstr "Uw SMS-voorkeuren zijn opgeslagen."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "Geen telefoonnummer."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr "Er is geen provider geselecteerd."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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."
@@ -5701,39 +5751,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:413
+#: actions/smssettings.php:404
 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:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 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:470
+#: actions/smssettings.php:460
 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:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "Mobiele aanbieder"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5744,7 +5794,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:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "Er is geen code ingevoerd"
 
@@ -6010,10 +6060,6 @@ msgstr ""
 "U kunt alleen gebruikers labelen waarop u geabonneerd bent of die op u "
 "geabonneerd zijn."
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "Het was niet mogelijk de labels op te slaan."
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
@@ -6247,12 +6293,12 @@ 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:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "Profielontwerp"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6260,7 +6306,7 @@ msgstr ""
 "U kunt de vormgeving van uw profiel aanpassen door een achtergrondafbeelding "
 "toe te voegen of het kleurenpalet aan te passen."
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr "Geniet van uw hotdog!"
 
@@ -7243,24 +7289,30 @@ msgstr ""
 "niet aangetroffen."
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 msgid "Could not issue access token."
 msgstr "Het was niet mogelijk het toegangstoken uit te geven."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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
+#, fuzzy
+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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "Het was niet mogelijk een ingetrokken token te verwijderen."
 
@@ -7916,6 +7968,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Opnieuw instellen"
 
+#. 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
+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
 msgid "Design defaults restored."
@@ -9276,3 +9334,30 @@ 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 "AtomPub post with unknown attention URI %s"
+#~ msgstr "Het AtomPubbericht met onbekende aandachts-URI is %s"
+
+#~ msgid "No such profile"
+#~ msgstr "Het profiel bestaat niet"
+
+#~ msgid "Notices %s has favorited to on %s"
+#~ msgstr "Mededelingen die %s als favoriet heeft aangemerkt op %s"
+
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "Groepen waar %s lid van is op %s"
+
+#~ msgid "Method not supported"
+#~ msgstr "Methode wordt niet ondersteund"
+
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "Mensen waarop %s geabonneerd is op %s"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "De gebruiker kon gebruiker niet bijwerkt worden."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "Het profiel kon niet opgeslagen worden."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "Het was niet mogelijk de labels op te slaan."
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 7a10a06487..939097338b 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-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:12+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05:44+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 (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nn\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -94,9 +94,9 @@ msgstr "Avatar-innstillingar"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -119,6 +119,8 @@ msgstr "Dette emneord finst ikkje."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -139,8 +141,8 @@ msgstr "Dette emneord finst ikkje."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -151,7 +153,7 @@ msgstr "Dette emneord finst ikkje."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -312,7 +314,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Kan ikkje oppdatera brukar."
 
@@ -334,7 +350,8 @@ msgid "User has no profile."
 msgstr "Brukaren har inga profil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "Kan ikkje lagra profil."
 
@@ -366,8 +383,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 #, fuzzy
 msgid "Unable to save your design settings."
 msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
@@ -376,14 +393,18 @@ 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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 #, fuzzy
 msgid "Could not update your design."
 msgstr "Kan ikkje oppdatera brukar."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+msgctxt "ATOM"
 msgid "Main"
 msgstr ""
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -394,32 +415,39 @@ msgstr ""
 msgid "%s timeline"
 msgstr "%s tidsline"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s tingarar"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: 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:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Blokkering av brukar feila."
 
@@ -562,7 +590,7 @@ msgstr "Kan ikkje oppdatera brukar."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
@@ -572,7 +600,7 @@ msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ikkje eit gyldig brukarnamn."
@@ -584,7 +612,7 @@ msgstr "Ikkje eit gyldig brukarnamn."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Heimesida er ikkje ei gyldig internettadresse."
@@ -594,7 +622,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -622,7 +650,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -749,7 +777,7 @@ 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:101
+#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "Ugyldig notisinnhald"
@@ -772,18 +800,19 @@ msgid "Request token already authorized."
 msgstr "Du tingar ikkje oppdateringar til den profilen."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -806,16 +835,17 @@ msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s"
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Uventa skjemasending."
 
@@ -861,7 +891,7 @@ msgstr "Konto"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -882,7 +912,7 @@ msgstr "Passord"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 #, fuzzy
 msgctxt "BUTTON"
@@ -956,6 +986,7 @@ msgstr "Du kan ikkje sletta statusen til ein annan brukar."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: 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
@@ -976,41 +1007,51 @@ msgstr "Kan ikkje slå på notifikasjon."
 msgid "Already repeated that notice."
 msgstr "Kan ikkje sletta notisen."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "Fann ikkje API-metode."
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: 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:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Fann ingen status med den ID-en."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "Kan ikkje sletta notisen."
 
-#: actions/apistatusesshow.php:243
+#. 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"
@@ -1145,51 +1186,49 @@ msgstr "Kun brukaren kan lese sine eigne meldingar."
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, 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:406
+#: actions/apitimelineuser.php:409
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Fann ingen profil med den IDen."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1200,108 +1239,117 @@ msgstr "API-metoden er ikkje ferdig enno."
 msgid "User not found."
 msgstr "Fann ikkje API-metode."
 
-#: actions/atompubfavoritefeed.php:70
-msgid "No such profile"
-msgstr "Denne notisen finst ikkje"
-
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-#, fuzzy
-msgid "Can't add someone else's subscription"
-msgstr "Kan ikkje leggja til ny tinging."
-
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
-#, fuzzy
-msgid "Can only fave notices."
-msgstr "Søk i innhaldet av notisar"
-
-#: actions/atompubfavoritefeed.php:256
-#, fuzzy
-msgid "Unknown note."
-msgstr "Uventa handling."
-
-#: actions/atompubfavoritefeed.php:263
-#, fuzzy
-msgid "Already a favorite."
-msgstr "Legg til i favorittar"
-
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
 #, fuzzy
 msgid "No such profile."
 msgstr "Denne notisen finst ikkje."
 
+#. 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"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "Grupper %s er medlem av"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "Kan ikkje leggja til ny tinging."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:241
-msgid "Can only handle Join activities."
-msgstr ""
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
+msgstr "Søk i innhaldet av notisar"
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Uventa handling."
 
-#: actions/atompubmembershipfeed.php:263
+#. 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"
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr "Kunne ikkje slette favoritt."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "Denne gruppa finst ikkje."
 
-#: actions/atompubshowmembership.php:90
+#. 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"
 
-#: actions/atompubshowmembership.php:115
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "Method not supported"
+msgid "HTTP method not supported"
 msgstr "Fann ikkje API-metode."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1309,40 +1357,37 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
-msgid "No such profile id: %d"
+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"
+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"
+msgid "Cannot delete someone else's subscription."
 msgstr "Kunne ikkje lagra abonnement."
 
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "Mennesker som tingar %s"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
 msgstr "Ukjend fil type"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1353,10 +1398,11 @@ msgstr "Dette emneord finst ikkje."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Ingen kallenamn."
@@ -1387,30 +1433,36 @@ msgid "You can upload your personal avatar. The maximum file size is %s."
 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "Avatar-innstillingar"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "Original"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "Forhandsvis"
 
@@ -1449,7 +1501,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "Fant ikkje igjen fil data."
 
@@ -1469,7 +1522,7 @@ msgstr "Feil ved oppdatering av brukarbilete."
 msgid "Avatar deleted."
 msgstr "Lasta opp brukarbilete."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1569,6 +1622,7 @@ msgstr "Lagring av informasjon feila."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1578,7 +1632,7 @@ msgstr "Lagring av informasjon feila."
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1661,23 +1715,6 @@ msgstr "Ukjend adressetype %s"
 msgid "That address has already been confirmed."
 msgstr "Den addressa har alt blitt bekrefta."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-msgstr "Kan ikkje oppdatera brukar."
-
 #. 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
@@ -1740,7 +1777,7 @@ msgid "Account deleted."
 msgstr "Lasta opp brukarbilete."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "Opprett ei ny gruppe"
@@ -2115,7 +2152,7 @@ msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2236,14 +2273,16 @@ msgid "Edit %s group"
 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:70 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: Client error displayed trying to edit a group while not 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:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "Du må være logga inn for å lage ei gruppe."
 
@@ -2306,8 +2345,8 @@ msgstr "Godkjent epostadresse."
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Gjenopprett"
@@ -2332,8 +2371,8 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
@@ -2341,7 +2380,7 @@ msgstr "Legg til"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Innkomande epost"
 
@@ -2352,13 +2391,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Vel ny epostadresse til å oppdatera med; fjerner den gamle."
 
@@ -2371,7 +2410,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 #, fuzzy
 msgctxt "BUTTON"
 msgid "New"
@@ -2448,9 +2487,10 @@ 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, 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.
@@ -2465,8 +2505,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Ingen ventande stadfesting å avbryta."
 
@@ -2478,8 +2518,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+msgid "Could not delete email confirmation."
 msgstr "Kan ikkje sletta e-postgodkjenning."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
@@ -2498,24 +2539,25 @@ msgstr "Det er ikkje din epost addresse."
 msgid "The email address was removed."
 msgstr "Fjerna innkomande epostadresse."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, 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:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 msgid "Incoming email address removed."
 msgstr "Fjerna innkomande epostadresse."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "La til ny innkomande epostadresse."
 
@@ -2611,7 +2653,7 @@ msgstr "Venta ikkje dette svaret!"
 msgid "User being listened to does not exist."
 msgstr "Brukaren du lyttar til eksisterer ikkje."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Du kan nytta det lokale abonnementet!"
 
@@ -2750,46 +2792,47 @@ msgid ""
 "palette of your choice."
 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-#, fuzzy
-msgid "Couldn't update your design."
-msgstr "Kan ikkje oppdatera brukar."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "Lagra brukarval."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "Logo åt gruppa"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, 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."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "Last opp"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "Skaler"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 #, fuzzy
 msgid "Pick a square area of the image to be the logo."
 msgstr "Velg eit utvalg av bildet som vil blir din avatar."
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "Logo oppdatert."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "Feil ved oppdatering av logo."
 
@@ -2923,14 +2966,14 @@ msgid "Error removing the block."
 msgstr "Feil ved fjerning av blokka."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2940,24 +2983,24 @@ msgstr ""
 "doc.im%%).  Set opp adressa og innstillingar under."
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 #, fuzzy
 msgid "IM is not available."
 msgstr "Denne sida er ikkje tilgjengleg i eit"
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "Epostadresser"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Stadfesta Jabber/Gtalk-adresse."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2971,7 +3014,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2981,63 +3024,63 @@ msgstr ""
 "leggja %s til venelista di i ljonmeldingsklienten din."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Lagra brukarval."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Send meg ein notis via Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk 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:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk 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:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publiser ein MicroID for Jabber/GTalk addressene mine"
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Lagra brukarval."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Nei Jabber-ID"
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "Klarar ikkje normalisera Jabber-IDen"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "Ikkje ein gyldig Jabber-ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "Det er alt din Jabber ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID 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.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -3047,29 +3090,29 @@ msgstr ""
 "for å senda meldinger til deg."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 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:400
+#: actions/imsettings.php:391
 #, fuzzy
-msgid "Couldn't delete IM confirmation."
+msgid "Could not delete IM confirmation."
 msgstr "Kan ikkje sletta e-postgodkjenning."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Det er ikkje din Jabber ID."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "Fjerna innkomande epostadresse."
 
@@ -3293,108 +3336,108 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s sin status på %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr ""
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Plassering er for lang (maksimalt 255 teikn)."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 #, fuzzy
 msgid "Private"
 msgstr "Personvern"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
 
@@ -4193,12 +4236,12 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "Profilinnstillingar"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4206,12 +4249,12 @@ msgstr ""
 "deg."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "Profil informasjon"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4219,7 +4262,7 @@ msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4227,13 +4270,13 @@ msgstr "Fullt namn"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Heimeside"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: 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."
@@ -4241,7 +4284,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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4249,20 +4292,20 @@ 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:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 #, 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "Om meg"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4270,24 +4313,24 @@ msgid "Location"
 msgstr "Plassering"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 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:157
+#: actions/profilesettings.php:153
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "Merkelappar"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4295,27 +4338,27 @@ msgstr ""
 "mellomroms separert."
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "Språk"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "Foretrukke språk"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "Tidssone"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 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:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4324,7 +4367,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4332,53 +4375,49 @@ 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:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Tidssone er ikkje valt."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:276
 #, 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, 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:409
+#: actions/profilesettings.php:404
 #, fuzzy
-msgid "Couldn't save location prefs."
+msgid "Could not save location prefs."
 msgstr "Kan ikkje lagra merkelapp."
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "Kan ikkje lagra profil."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
-msgstr "Kan ikkje lagra merkelapp."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Lagra innstillingar."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Opprett ei ny gruppe"
@@ -4764,7 +4803,7 @@ msgstr ""
 "(Du mottek ein epost med instruksjonar på korleis du stadfester epostadressa "
 "di)"
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4776,80 +4815,80 @@ msgstr ""
 "[kompatibel mikrobloggingside](%%doc.openmublog%%), kann du oppgje URLen til "
 "profilen under."
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Eksternt abbonement"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 #, fuzzy
 msgid "Subscribe to a remote user"
 msgstr "Lagre tinging for brukar: %s"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Brukaren sitt kallenamn"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "Kallenamnet til brukaren du vil fylgja"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Profil-adresse"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL til profilsida di på ei anna kompatibel mikrobloggingteneste."
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "Ting"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "Ugyldig profil-nettadresse (feil format)"
 
-#: actions/remotesubscribe.php:168
+#: 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:176
+#: actions/remotesubscribe.php:175
 #, fuzzy
-msgid "That’s a local profile! Login to subscribe."
+msgid "That is a local profile! Login to subscribe."
 msgstr "Det er ikkje ein lokal profil! Log inn for å tinge."
 
-#: actions/remotesubscribe.php:183
+#: actions/remotesubscribe.php:182
 #, fuzzy
-msgid "Couldn’t get a request token."
+msgid "Could not get a request token."
 msgstr "Fekk ikkje spørjingsbillett (request token)."
 
-#: actions/repeat.php:57
+#: actions/repeat.php:56
 #, fuzzy
 msgid "Only logged-in users can repeat notices."
 msgstr "Kun brukaren kan lese sine eigne meldingar."
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 #, fuzzy
 msgid "No notice specified."
 msgstr "Ingen vald profil."
 
-#: actions/repeat.php:76
+#: actions/repeat.php:75
 #, fuzzy
-msgid "You can't repeat your own notice."
+msgid "You cannot repeat your own notice."
 msgstr "Du kan ikkje registrera deg om du ikkje godtek vilkåra i lisensen."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 #, fuzzy
 msgid "You already repeated that notice."
 msgstr "Du har allereie blokkert denne brukaren."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Framheva"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 #, fuzzy
 msgid "Repeated!"
 msgstr "Lag"
@@ -5601,72 +5640,72 @@ msgid "Save site notice"
 msgstr "Statusmelding"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "Avatar-innstillingar"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 #, fuzzy
 msgid "SMS is not available."
 msgstr "Denne sida er ikkje tilgjengleg i eit"
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "Epostadresser"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Godkjent mobiltelefonnummer."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:133
+#: actions/smssettings.php:129
 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:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "Stadfestingskode"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 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:148
+#: actions/smssettings.php:144
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Godta"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "Ingen telefonnummer."
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 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:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "Lagra brukarval."
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5675,33 +5714,33 @@ msgstr ""
 "min tilbydar."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
 #, fuzzy
 msgid "SMS preferences saved."
 msgstr "Lagra brukarval."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "Ingen telefonnummer."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr "Ingen mobiloperatør vald."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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."
@@ -5710,40 +5749,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:413
+#: actions/smssettings.php:404
 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:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 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:470
+#: actions/smssettings.php:460
 #, 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:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "Telefontilbydar"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5753,7 +5792,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:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "Ingen innskriven kode"
 
@@ -6009,10 +6048,6 @@ msgstr ""
 "Du kan berre leggje til emneord på folk som du tingar notisar frå, eller som "
 "tingar notisar frå deg."
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "Kunne ikkje lagra emneord."
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
@@ -6255,19 +6290,19 @@ msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Feil biletetype for '%s'"
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 #, fuzzy
 msgid "Profile design"
 msgstr "Profilinnstillingar"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr ""
 
@@ -7250,24 +7285,28 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Kunne ikkje lagre melding."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
@@ -7886,6 +7925,13 @@ msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Avbryt"
 
+#. 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
+#, 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
 msgid "Design defaults restored."
@@ -9165,3 +9211,27 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "No such profile"
+#~ msgstr "Denne notisen finst ikkje"
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "Grupper %s er medlem av"
+
+#, fuzzy
+#~ msgid "Method not supported"
+#~ msgstr "Fann ikkje API-metode."
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "Mennesker som tingar %s"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "Kan ikkje oppdatera brukar."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "Kan ikkje lagra profil."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "Kan ikkje lagra merkelapp."
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index 3d586a4f84..9b7a806e4c 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-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:15+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05:53+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 (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-core\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -91,9 +91,9 @@ msgstr "Zapisz ustawienia dostępu"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -114,6 +114,8 @@ msgstr "Nie ma takiej strony."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -134,8 +136,8 @@ msgstr "Nie ma takiej strony."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -146,7 +148,7 @@ msgstr "Nie ma takiej strony."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -315,7 +317,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Nie można zaktualizować użytkownika."
 
@@ -337,7 +353,8 @@ msgid "User has no profile."
 msgstr "Użytkownik nie posiada profilu."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "Nie można zapisać profilu."
 
@@ -376,8 +393,8 @@ msgstr[2] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "Nie można zapisać ustawień wyglądu."
 
@@ -385,13 +402,18 @@ 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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Nie można zaktualizować wyglądu."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+#, fuzzy
+msgctxt "ATOM"
 msgid "Main"
 msgstr "Główna"
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -402,31 +424,38 @@ msgstr "Główna"
 msgid "%s timeline"
 msgstr "Oś czasu użytkownika %s"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Subskrypcje użytkownika %s"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: 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:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Zablokowanie użytkownika nie powiodło się."
 
@@ -566,7 +595,7 @@ msgstr "Nie można odnaleźć użytkownika docelowego."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonim jest już używany. Spróbuj innego."
@@ -576,7 +605,7 @@ msgstr "Pseudonim jest już używany. Spróbuj innego."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "To nie jest prawidłowy pseudonim."
@@ -588,7 +617,7 @@ msgstr "To nie jest prawidłowy pseudonim."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Strona domowa nie jest prawidłowym adresem URL."
@@ -598,7 +627,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: 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)."
@@ -626,7 +655,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
@@ -750,7 +779,7 @@ 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:101
+#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Nieprawidłowy token lub element sprawdzający żądania."
 
@@ -770,18 +799,19 @@ msgid "Request token already authorized."
 msgstr "Token żądania został już upoważniony."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -802,16 +832,17 @@ msgstr "Błąd bazy danych podczas wprowadzania oauth_token_association."
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Nieoczekiwane wysłanie formularza."
 
@@ -862,7 +893,7 @@ msgstr "Konto"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -883,7 +914,7 @@ msgstr "Hasło"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -957,6 +988,7 @@ msgstr "Nie można usuwać stanów innych użytkowników."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: 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
@@ -976,39 +1008,49 @@ msgstr "Nie można powtórzyć własnego wpisu."
 msgid "Already repeated that notice."
 msgstr "Już powtórzono ten wpis."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "Metoda HTTP nie jest obsługiwana."
 
-#: actions/apistatusesshow.php:141
+#. 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 "Nieobsługiwany format: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:152
+#: 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:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Nie odnaleziono stanów z tym identyfikatorem."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "Nie można usunąć tego wpisu."
 
-#: actions/apistatusesshow.php:243
+#. 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"
@@ -1144,51 +1186,49 @@ msgstr "Tylko użytkownik może dodawać do swojej osi czasu."
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Akceptowanie tylko AtomPub dla kanałów Atom."
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr "Wpis Atom nie może być pusty."
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 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:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, 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.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, 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:406
+#: actions/apitimelineuser.php:409
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Wpis z adresem URI \"%s\" już istnieje."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr "Wpis AtomPub z nieznanym adresem URI %s uwagi"
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1199,96 +1239,108 @@ msgstr "Metoda API jest w trakcie tworzenia."
 msgid "User not found."
 msgstr "Nie odnaleziono strony."
 
-#: actions/atompubfavoritefeed.php:70
-msgid "No such profile"
-msgstr "Nie ma takiego profilu"
-
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr "Wpisy %s został oznaczone jako ulubione na %s"
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-msgid "Can't add someone else's subscription"
-msgstr "Nie można dodać subskrypcji innej osoby"
-
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-msgstr "Można obsługiwać tylko działania ulubionych."
-
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
-msgid "Can only fave notices."
-msgstr "Można tylko dodawać wpisy do ulubionych."
-
-#: actions/atompubfavoritefeed.php:256
-msgid "Unknown note."
-msgstr "Nieznany wpis."
-
-#: actions/atompubfavoritefeed.php:263
-msgid "Already a favorite."
-msgstr "Jest już ulubiony."
-
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "Nie ma takiego profilu."
 
+#. 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 "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
+#, fuzzy
+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"
 
-#: actions/atompubmembershipfeed.php:147
-#, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "Grupy %s są członkiem w witrynie %s"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
+#. 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 "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:241
-msgid "Can only handle Join activities."
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
 msgstr "Można obsługiwać tylko działania dołączania."
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 msgid "Unknown group."
 msgstr "Nieznana grupa."
 
-#: actions/atompubmembershipfeed.php:263
+#. 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."
 
-#: actions/atompubmembershipfeed.php:270
+#. 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."
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+#, fuzzy
+msgid "Cannot delete someone else's favorite"
 msgstr "Nie można usunąć ulubionego wpisu innej osoby"
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "Nie ma takiej grupy."
 
-#: actions/atompubshowmembership.php:90
+#. 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"
 
-#: actions/atompubshowmembership.php:115
-msgid "Method not supported"
-msgstr "Metoda nie jest obsługiwana"
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
+#, fuzzy
+msgid "HTTP method not supported"
+msgstr "Metoda HTTP nie jest obsługiwana."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, fuzzy
+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.
@@ -1296,41 +1348,38 @@ msgstr "Nie można usunąć członkostwa innej osoby"
 #: actions/atompubshowsubscription.php:72
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
-#, php-format
-msgid "No such profile id: %d"
+#, fuzzy, 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
 #, fuzzy, php-format
-msgid "Profile %1$d not subscribed to profile %2$d"
-msgstr "Profil %d nie jest subskrybowany do profilu %d"
+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
 #, fuzzy
-msgid "Cannot delete someone else's subscription"
+msgid "Cannot delete someone else's subscription."
 msgstr "Nie można usunąć subskrypcji innej osoby"
 
-#: actions/atompubsubscriptionfeed.php:150
-#, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "Osoby %s są subskrybowane w witrynie %s"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr "Można obsługiwać tylko działania obserwowania."
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr "Można obserwować tylko osoby."
 
-#: actions/atompubsubscriptionfeed.php:262
-#, php-format
-msgid "Unknown profile %s"
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
+#, fuzzy, php-format
+msgid "Unknown profile %s."
 msgstr "Nieznany profil %s"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1341,10 +1390,11 @@ msgstr "Nie ma takiego załącznika."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Brak pseudonimu."
@@ -1375,30 +1425,36 @@ 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."
 
 #. 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "Ustawienia awatara"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "Oryginał"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "Podgląd"
 
@@ -1433,7 +1489,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "Utracono dane pliku."
 
@@ -1452,18 +1509,18 @@ msgstr "Zaktualizowanie awatara nie powiodło się."
 msgid "Avatar deleted."
 msgstr "Usunięto awatar."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
-msgstr ""
+msgstr "Wykonaj kopię zapasową konta"
 
 #: actions/backupaccount.php:80
-#, fuzzy
 msgid "Only logged-in users can backup their account."
-msgstr "Tylko zalogowani użytkownicy mogą powtarzać wpisy."
+msgstr ""
+"Tylko zalogowani użytkownicy mogą wykonywać kopie zapasowe swoich kont."
 
 #: actions/backupaccount.php:84
 msgid "You may not backup your account."
-msgstr ""
+msgstr "Użytkownik nie może wykonać kopii zapasowej konta."
 
 #: actions/backupaccount.php:232
 msgid ""
@@ -1473,16 +1530,21 @@ msgid ""
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
+"Można wykonać kopię zapasową danych konta w formacie <a href=\"http://"
+"activitystrea.ms/\">Strumieni działalności</a>. Jest to funkcja "
+"eksperymentalna i nie zapewnia kompletnej kopii zapasowej; prywatne "
+"informacje o koncie, takie jak adresy e-mail i komunikatora nie są "
+"zachowywane w kopii zapasowej. Ponadto nie są zachowywane wysłane pliki i "
+"bezpośrednie wiadomości."
 
 #: actions/backupaccount.php:255
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
-msgstr "Tło"
+msgstr "Kopia zapasowa"
 
 #: actions/backupaccount.php:258
 msgid "Backup your account"
-msgstr ""
+msgstr "Wykonuje kopię zapasową konta"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 #: actions/block.php:68
@@ -1554,6 +1616,7 @@ msgstr "Zapisanie informacji o blokadzie nie powiodło się."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1563,7 +1626,7 @@ msgstr "Zapisanie informacji o blokadzie nie powiodło się."
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1643,23 +1706,6 @@ msgstr "Nierozpoznany typ adresu %s."
 msgid "That address has already been confirmed."
 msgstr "Ten adres został już potwierdzony."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-msgstr "Nie można zaktualizować użytkownika."
-
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
 #: actions/confirmaddress.php:132
@@ -1691,39 +1737,35 @@ msgstr "Wpisy"
 
 #. 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 "Tylko zalogowani użytkownicy mogą powtarzać wpisy."
+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
-#, fuzzy
 msgid "You cannot delete your account."
-msgstr "Nie można usuwać użytkowników."
+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 ""
+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 ""
+msgstr "Należy wpisać dokładnie \"%s\" w polu obok."
 
 #. TRANS: Confirmation that a user account has been deleted.
 #: actions/deleteaccount.php:206
-#, fuzzy
 msgid "Account deleted."
-msgstr "Usunięto awatar."
+msgstr "Usunięto konto."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
-#, fuzzy
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 msgid "Delete account"
-msgstr "Utwórz konto"
+msgstr "Usuń konto"
 
 #. TRANS: Form text for user deletion form.
 #: actions/deleteaccount.php:279
@@ -1731,6 +1773,7 @@ msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
 msgstr ""
+"Spowoduje to <strong>trwałe usunięcie</strong> danych konta z tego serwera."
 
 #. 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.
@@ -1740,6 +1783,8 @@ msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
 "deletion."
 msgstr ""
+"Zdecydowanie zaleca się <a href=\"%s\">wykonanie kopii zapasowej danych</a> "
+"przed usunięciem."
 
 #. TRANS: Field label for delete account confirmation entry.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
@@ -1750,15 +1795,14 @@ msgstr "Potwierdź"
 #. 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 "Nie można usuwać użytkowników."
+msgstr "Proszę wpisać \"%s\", aby potwierdzić chęć usunięcia konta."
 
 #. TRANS: Button title for user account deletion.
 #: actions/deleteaccount.php:323
-#, fuzzy
 msgid "Permanently delete your account"
-msgstr "Nie można usuwać użytkowników."
+msgstr "Trwale usuwa konto"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 #: actions/deleteapplication.php:62
@@ -2079,7 +2123,7 @@ msgid "Reset back to default"
 msgstr "Przywróć domyślne ustawienia"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2191,14 +2235,16 @@ msgid "Edit %s group"
 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:70 actions/newgroup.php:65
 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 when trying to change group logo settings while not being a group admin.
 #: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "Musisz być administratorem, aby zmodyfikować grupę."
 
@@ -2259,8 +2305,8 @@ msgstr "Obecnie potwierdzone adresy e-mail."
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Usuń"
@@ -2286,15 +2332,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Wiadomości przychodzące"
 
@@ -2305,13 +2351,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 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."
 
@@ -2326,7 +2372,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nowy"
@@ -2400,9 +2446,10 @@ 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, fuzzy
+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.
@@ -2418,8 +2465,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Brak oczekujących potwierdzeń do anulowania."
 
@@ -2430,8 +2477,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+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.
@@ -2450,24 +2498,25 @@ msgstr "To nie jest twój adres e-mail."
 msgid "The email address was removed."
 msgstr "Adres e-mail został usunięty."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, fuzzy
+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:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 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:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "Dodano nowy przychodzący adres e-mail."
 
@@ -2566,7 +2615,7 @@ msgstr "Nieoczekiwana odpowiedź."
 msgid "User being listened to does not exist."
 msgstr "Nasłuchiwany użytkownik nie istnieje."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Można używać lokalnej subskrypcji."
 
@@ -2694,44 +2743,46 @@ msgid ""
 "palette of your choice."
 msgstr "Dostosuj wygląd grupy za pomocą wybranego obrazu tła i palety kolorów."
 
-#. 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "Nie można zaktualizować wyglądu."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "Zapisano preferencje wyglądu."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "Logo grupy"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, 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."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "Wyślij"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "Przytnij"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr "Wybierz kwadratowy obszar obrazu, który będzie logo."
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "Zaktualizowano logo."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "Zaktualizowanie logo nie powiodło się."
 
@@ -2872,14 +2923,14 @@ msgid "Error removing the block."
 msgstr "Błąd podczas usuwania blokady."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2889,23 +2940,23 @@ msgstr ""
 "Skonfiguruj adres i ustawienia poniżej."
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "Komunikator nie jest dostępny."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "Adres komunikatora"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Obecnie potwierdzone adresy Jabber/GTalk."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2920,7 +2971,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2930,64 +2981,64 @@ msgstr ""
 "upewnij się, że dodałeś %s do listy znajomych w komunikatorze lub na GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Preferencje komunikatora"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Wyślij mi wpisy przez Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk 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:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk 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:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Opublikuj MicroID adresu Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Zapisano preferencje."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Brak identyfikatora Jabbera."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "Nie można znormalizować tego identyfikatora Jabbera"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "To nie jest prawidłowy identyfikator Jabbera"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "Ten identyfikator Jabbera jest już twój."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID 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.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2997,28 +3048,29 @@ msgstr ""
 "zaakceptować otrzymywanie wiadomości od %s."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 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:400
-msgid "Couldn't delete IM confirmation."
+#: actions/imsettings.php:391
+#, fuzzy
+msgid "Could not delete IM confirmation."
 msgstr "Nie można usunąć potwierdzenia komunikatora."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "To nie jest twój identyfikator Jabbera."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "Adres komunikatora został usunięty."
 
@@ -3249,20 +3301,20 @@ 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:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Licencja"
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr "Licencja dla tej witryny StatusNet"
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr "Nieprawidłowy wybór licencji."
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
@@ -3270,87 +3322,87 @@ msgstr ""
 "Należy podać właściciela treści podczas używania licencji \"Wszystkie prawa "
 "zastrzeżone\"."
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Nieprawidłowy tytuł licencji. Maksymalna długość to 255 znaków."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr "Nieprawidłowy adres URL licencji."
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr "Nieprawidłowy adres URL obrazu licencji."
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 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:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr "Obraz licencji musi być pusty lub być prawidłowym adresem URL."
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr "Wybór licencji"
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "Prywatna"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr "Wszystkie prawa zastrzeżone"
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr "Typ"
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr "Wybierz licencję"
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr "Szczegóły licencji"
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr "Właściciel"
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 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:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr "Tytuł licencji"
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr "Tytuł licencji."
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr "Adres URL licencji"
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr "Adres URL dodatkowych informacji o licencji."
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr "Adres URL obrazu licencji"
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr "Adres URL obrazu do wyświetlenia z licencją."
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Zapisz ustawienia licencji"
 
@@ -3460,9 +3512,8 @@ 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
-#, fuzzy
 msgid "You are not allowed to create groups on this site."
-msgstr "Brak uprawnienia do usunięcia tej grupy."
+msgstr "Brak uprawnienia do tworzenia grup w tej witrynie."
 
 #. TRANS: Form instructions for group create form.
 #: actions/newgroup.php:117
@@ -4124,12 +4175,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:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "Ustawienia profilu"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4137,18 +4188,18 @@ msgstr ""
 "lepiej cię poznać."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "Informacje o profilu"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4156,20 +4207,20 @@ msgstr "Imię i nazwisko"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Strona domowa"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: 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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4178,19 +4229,19 @@ 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:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "O mnie"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4198,24 +4249,24 @@ msgid "Location"
 msgstr "Położenie"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 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:157
+#: actions/profilesettings.php:153
 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:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "Znaczniki"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4223,27 +4274,27 @@ msgstr ""
 "spacjami"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "Język"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "Preferowany język"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "Strefa czasowa"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 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:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4252,7 +4303,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4261,54 +4312,50 @@ 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:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Nie wybrano strefy czasowej."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:276
 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, fuzzy
+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:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, fuzzy
+msgid "Could not save location prefs."
 msgstr "Nie można zapisać preferencji położenia."
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "Nie można zapisać profilu."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Zapisano ustawienia."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
-#, fuzzy
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 msgid "Restore account"
-msgstr "Utwórz konto"
+msgstr "Przywróć konto"
 
 #: actions/public.php:83
 #, php-format
@@ -4697,7 +4744,7 @@ msgstr ""
 "(Powinieneś właśnie otrzymać wiadomość e-mail, zawierającą instrukcje "
 "potwierdzenia adresu e-mail)"
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4709,74 +4756,77 @@ msgstr ""
 "witrynie mikroblogowania](%%doc.openmublog%%), podaj poniżej adres URL "
 "profilu."
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Subskrybuj zdalnie"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Subskrybuj zdalnego użytkownika"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Pseudonim użytkownika"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "Pseudonim użytkownika którego chcesz obserwować"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Adres URL profilu"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "Adres URL profilu na innej, zgodnej usłudze mikroblogowania"
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "Subskrybuj"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "Nieprawidłowy adres URL profilu (błędny format)"
 
-#: actions/remotesubscribe.php:168
+#: 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:176
-msgid "That’s a local profile! Login to subscribe."
+#: actions/remotesubscribe.php:175
+#, fuzzy
+msgid "That is a local profile! Login to subscribe."
 msgstr "To jest profil lokalny. Zaloguj się, aby subskrybować."
 
-#: actions/remotesubscribe.php:183
-msgid "Couldn’t get a request token."
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
 msgstr "Nie można uzyskać tokenu żądana."
 
-#: actions/repeat.php:57
+#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Tylko zalogowani użytkownicy mogą powtarzać wpisy."
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Nie podano wpisu."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "Nie można powtórzyć własnego wpisu."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Już powtórzono ten wpis."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Powtórzono"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Powtórzono."
 
@@ -4840,22 +4890,19 @@ 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
-#, fuzzy
 msgid "Only logged-in users can restore their account."
-msgstr "Tylko zalogowani użytkownicy mogą powtarzać wpisy."
+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
-#, fuzzy
 msgid "You may not restore your account."
-msgstr "Nie zarejestrowano jeszcze żadnych aplikacji."
+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
-#, fuzzy
 msgid "No uploaded file."
-msgstr "Wyślij plik"
+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
@@ -4897,9 +4944,8 @@ msgstr "Błąd systemu podczas wysyłania pliku."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
 #: actions/restoreaccount.php:207
-#, fuzzy
 msgid "Not an Atom feed."
-msgstr "Nie jest członkiem"
+msgstr "Nie jest kanałem Atom."
 
 #. TRANS: Success message when a feed has been restored.
 #: actions/restoreaccount.php:241
@@ -4907,11 +4953,13 @@ msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
+"Kanał został przywrócony. Starsze wpisy powinny teraz pojawić się w wynikach "
+"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 ""
+msgstr "Kanał zostanie przywrócony. Proszę poczekać kilka minut na wyniki."
 
 #. TRANS: Form instructions for feed restore.
 #: actions/restoreaccount.php:342
@@ -4919,10 +4967,11 @@ msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
+"Można wysłać kopię zapasową strumienia w formacie <a href=\"http://"
+"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
-#, fuzzy
 msgid "Upload the file"
 msgstr "Wyślij plik"
 
@@ -5546,70 +5595,70 @@ msgid "Save site notice"
 msgstr "Zapisz wpis witryny"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "Ustawienia SMS"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "Wiadomości SMS nie są dostępne."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "Adres SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 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:133
+#: actions/smssettings.php:129
 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:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "Kod potwierdzający"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 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:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Potwierdź"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "Numer telefonu SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 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:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "Preferencje SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5618,32 +5667,32 @@ msgstr ""
 "swojego operatora."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
 msgid "SMS preferences saved."
 msgstr "Zapisano preferencje SMS."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "Brak numeru telefonu."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr "Nie wybrano operatora."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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."
@@ -5652,39 +5701,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:413
+#: actions/smssettings.php:404
 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:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 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:470
+#: actions/smssettings.php:460
 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:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "Operator komórkowy"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5695,7 +5744,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:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "Nie podano kodu"
 
@@ -5960,10 +6009,6 @@ msgstr ""
 "Można nadawać znaczniki tylko osobom, których subskrybujesz lub którzy "
 "subskrybują ciebie."
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "Nie można zapisać znaczników."
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
@@ -6193,19 +6238,19 @@ 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:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "Wygląd profilu"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 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:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr "Smacznego hot-doga."
 
@@ -6988,54 +7033,52 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown verb: \"%s\"."
-msgstr "Nieznany język \"%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 ""
+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
-#, fuzzy
 msgid "Cannot force remote user to subscribe."
-msgstr "Podaj nazwę użytkownika do subskrybowania."
+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
-#, fuzzy
 msgid "Unknown profile."
-msgstr "Nieznany profil %s"
+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 ""
+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 ""
+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
-#, fuzzy
 msgid "User is already a member of this group."
-msgstr "Jesteś już członkiem tej grupy."
+msgstr "Użytkownik jest już członkiem tej grupy."
 
 #. 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
-#, fuzzy, php-format
+#, php-format
 msgid "No content for notice %s."
-msgstr "Brak zawartości dla wpisu %d."
+msgstr "Brak zawartości dla wpisu %s."
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7186,22 +7229,26 @@ msgid ""
 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:186
+#: lib/apioauthstore.php:209
 msgid "Could not issue access token."
 msgstr "Nie można wywołać tokenu żądania."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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
+#, fuzzy
+msgid "Database error updating OAuth application user."
+msgstr "Błąd bazy danych podczas wprowadzania użytkownika aplikacji OAuth."
+
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "Usunięcie unieważnionego tokenu nie powiodło się."
 
@@ -7320,15 +7367,13 @@ msgid "Revoke"
 msgstr "Unieważnij"
 
 #: lib/atom10feed.php:113
-#, fuzzy
 msgid "Author element must contain a name element."
-msgstr "element autora musi zawierać element nazwy."
+msgstr "Element \"author\" musi zawierać element \"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 "Nie usuwaj tej grupy"
+msgstr "Nie należy używać tej metody."
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7852,6 +7897,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Przywróć"
 
+#. 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
+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
 msgid "Design defaults restored."
@@ -7882,17 +7933,16 @@ msgid "FOAF"
 msgstr "FOAF"
 
 #: lib/feedimporter.php:75
-#, fuzzy
 msgid "Not an atom feed."
-msgstr "Nie jest członkiem"
+msgstr "Nie jest kanałem Atom."
 
 #: lib/feedimporter.php:82
 msgid "No author in the feed."
-msgstr ""
+msgstr "Brak autora w kanale."
 
 #: lib/feedimporter.php:89
 msgid "Can't import without a user."
-msgstr ""
+msgstr "Nie można zaimportować bez użytkownika."
 
 #. TRANS: Header for feed links (h2).
 #: lib/feedlist.php:66
@@ -9223,3 +9273,30 @@ 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 "AtomPub post with unknown attention URI %s"
+#~ msgstr "Wpis AtomPub z nieznanym adresem URI %s uwagi"
+
+#~ msgid "No such profile"
+#~ msgstr "Nie ma takiego profilu"
+
+#~ msgid "Notices %s has favorited to on %s"
+#~ msgstr "Wpisy %s został oznaczone jako ulubione na %s"
+
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "Grupy %s są członkiem w witrynie %s"
+
+#~ msgid "Method not supported"
+#~ msgstr "Metoda nie jest obsługiwana"
+
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "Osoby %s są subskrybowane w witrynie %s"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "Nie można zaktualizować użytkownika."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "Nie można zapisać profilu."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "Nie można zapisać znaczników."
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index aeb55870b5..6458ba3b88 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - Core to Portuguese (Português)
 # Expored from translatewiki.net
 #
+# Author: Aracnus
 # Author: Brion
 # Author: Gallaecio
 # Author: Giro720
@@ -14,17 +15,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:18+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05:54+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 (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -91,9 +92,9 @@ msgstr "Gravar configurações de acesso"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -114,6 +115,8 @@ msgstr "Página não foi encontrada."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -134,8 +137,8 @@ msgstr "Página não foi encontrada."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -146,7 +149,7 @@ msgstr "Página não foi encontrada."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -314,7 +317,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Não foi possível actualizar o utilizador."
 
@@ -336,7 +353,8 @@ msgid "User has no profile."
 msgstr "Utilizador não tem perfil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "Não foi possível gravar o perfil."
 
@@ -349,7 +367,7 @@ msgstr "Não foi possível gravar o perfil."
 #: actions/designadminpanel.php:125 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
 "current configuration."
@@ -357,7 +375,7 @@ msgid_plural ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
 "current configuration."
 msgstr[0] ""
-"O servidor não conseguiu processar tantos dados POST (%s bytes) devido à sua "
+"O servidor não conseguiu processar tantos dados POST (%s byte) devido à sua "
 "configuração actual."
 msgstr[1] ""
 "O servidor não conseguiu processar tantos dados POST (%s bytes) devido à sua "
@@ -372,8 +390,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "Não foi possível gravar as configurações do estilo."
 
@@ -381,13 +399,18 @@ 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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Não foi possível actualizar o seu estilo."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+#, fuzzy
+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.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
@@ -398,31 +421,38 @@ msgstr ""
 msgid "%s timeline"
 msgstr "Notas de %s"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Subscrições de %s"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
-#, fuzzy, php-format
+#. 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"
+msgstr "Favoritas de %s"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: 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:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Bloqueio do utilizador falhou."
 
@@ -562,7 +592,7 @@ msgstr "Não foi possível encontrar o utilizador de destino."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Utilizador já é usado. Tente outro."
@@ -572,7 +602,7 @@ msgstr "Utilizador já é usado. Tente outro."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Utilizador não é válido."
@@ -584,7 +614,7 @@ msgstr "Utilizador não é válido."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Página de ínicio não é uma URL válida."
@@ -594,7 +624,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -622,7 +652,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -746,7 +776,7 @@ 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:101
+#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "Chave de entrada especificada é inválida."
@@ -769,18 +799,19 @@ msgid "Request token already authorized."
 msgstr "Não tem autorização."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -802,16 +833,17 @@ msgstr "Erro na base de dados ao inserir o utilizador da aplicação OAuth."
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Envio inesperado de formulário."
 
@@ -863,7 +895,7 @@ msgstr "Conta"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -884,7 +916,7 @@ msgstr "Senha"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -958,6 +990,7 @@ msgstr "Não pode apagar o estado de outro utilizador."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: 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
@@ -977,40 +1010,50 @@ msgstr "Não pode repetir a sua própria nota."
 msgid "Already repeated that notice."
 msgstr "Já repetiu essa nota."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "Método da API não encontrado."
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Estado apagado."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Não foi encontrado um estado com esse ID."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "Nota não pode ser apagada."
 
-#: actions/apistatusesshow.php:243
+#. 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"
@@ -1144,51 +1187,49 @@ msgstr "Só o próprio utilizador pode ler a sua caixa de correio."
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, 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:406
+#: actions/apitimelineuser.php:409
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Não existe nenhuma nota com essa identificação."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1200,108 +1241,116 @@ msgstr "Método da API em desenvolvimento."
 msgid "User not found."
 msgstr "Método da API não encontrado."
 
-#: actions/atompubfavoritefeed.php:70
-#, fuzzy
-msgid "No such profile"
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
+msgid "No such profile."
 msgstr "Perfil não foi encontrado."
 
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#. 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 "Can't add someone else's subscription"
+msgid "Cannot add someone else's subscription."
 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/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-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 "Procurar no conteúdo das notas"
 
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#. 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"
 
-#: actions/atompubfavoritefeed.php:256
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "Desconhecida"
 
-#: actions/atompubfavoritefeed.php:263
+#. TRANS: Client exception thrown when trying favorite an already favorited notice.
+#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "Adicionar às favoritas"
 
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Perfil não foi encontrado."
-
+#. 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"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "Grupos de que %s é membro"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "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:241
-msgid "Can only handle Join activities."
-msgstr ""
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
+msgstr "Procurar no conteúdo das notas"
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Desconhecida"
 
-#: actions/atompubmembershipfeed.php:263
+#. 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"
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr "Não foi possível eliminar o favorito."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "Grupo não existe"
 
-#: actions/atompubshowmembership.php:90
+#. 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"
 
-#: actions/atompubshowmembership.php:115
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "Method not supported"
+msgid "HTTP method not supported"
 msgstr "Método da API não encontrado."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1309,40 +1358,37 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
-msgid "No such profile id: %d"
+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"
+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"
+msgid "Cannot delete someone else's subscription."
 msgstr "Não foi possível apagar a auto-subscrição."
 
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "Pessoas que subscrevem %s"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
 msgstr "Tipo do ficheiro é desconhecido"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1353,10 +1399,11 @@ msgstr "Anexo não foi encontrado."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Nome de utilizador não definido."
@@ -1387,30 +1434,36 @@ 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."
 
 #. 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "Configurações do avatar"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "Original"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "Antevisão"
 
@@ -1448,7 +1501,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "Perdi os dados do nosso ficheiro."
 
@@ -1467,7 +1521,7 @@ msgstr "Falha ao actualizar avatar."
 msgid "Avatar deleted."
 msgstr "Avatar apagado."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1569,6 +1623,7 @@ msgstr "Não foi possível gravar informação do bloqueio."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1578,7 +1633,7 @@ msgstr "Não foi possível gravar informação do bloqueio."
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1659,23 +1714,6 @@ msgstr "Tipo do endereço %s não reconhecido."
 msgid "That address has already been confirmed."
 msgstr "Esse endereço já tinha sido confirmado."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-msgstr "Não foi possível actualizar o utilizador."
-
 #. 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
@@ -1737,7 +1775,7 @@ msgid "Account deleted."
 msgstr "Avatar apagado."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "Criar uma conta"
@@ -2108,7 +2146,7 @@ msgid "Reset back to default"
 msgstr "Repor predefinição"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2222,14 +2260,16 @@ msgid "Edit %s group"
 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:70 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: Client error displayed trying to edit a group while not 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:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "Tem de ser administrador para editar o grupo."
 
@@ -2290,8 +2330,8 @@ msgstr "Endereço de correio já confirmado."
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Remover"
@@ -2317,15 +2357,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Correio recebido"
 
@@ -2336,13 +2376,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 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."
 
@@ -2355,7 +2395,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Novo"
@@ -2433,9 +2473,10 @@ 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, 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.
@@ -2451,8 +2492,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Nenhuma confirmação pendente para cancelar."
 
@@ -2463,8 +2504,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, 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.
@@ -2483,24 +2525,25 @@ msgstr "Esse não é o seu endereço electrónico."
 msgid "The email address was removed."
 msgstr "O endereço de correio electrónico foi removido."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, 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:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 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:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "Adicionado endereço electrónico de entrada novo."
 
@@ -2598,7 +2641,7 @@ msgstr "Não esperava esta resposta!"
 msgid "User being listened to does not exist."
 msgstr "O utilizador que está a escutar não existe."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Pode usar a subscrição local!"
 
@@ -2728,22 +2771,19 @@ msgstr ""
 "Personalize o aspecto do seu grupo com uma imagem de fundo e uma paleta de "
 "cores à sua escolha."
 
-#. 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "Não foi possível actualizar o estilo."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "Preferências de estilo foram gravadas."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "Logotipo do grupo"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2751,23 +2791,28 @@ msgstr ""
 "Pode carregar uma imagem para logotipo do seu grupo. O tamanho máximo do "
 "ficheiro é %s."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "Carregar"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "Cortar"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr "Escolha uma área quadrada da imagem para ser o logotipo."
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "Logotipo actualizado."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "Não foi possível actualizar o logotipo."
 
@@ -2908,14 +2953,14 @@ msgid "Error removing the block."
 msgstr "Erro ao remover o bloqueio."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2925,23 +2970,23 @@ msgstr ""
 "Jabber/GTalk. Configure o seu endereço e outras definições abaixo."
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "MI não está disponível."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "Endereço IM"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Endereço do Jabber/GTalk já confirmado."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2956,7 +3001,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2967,63 +3012,63 @@ msgstr ""
 "MI ou no GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Preferências de MI"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Enviar-me notas via Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk 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:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk 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:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publicar um MicroID para o meu endereço Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Preferências gravadas."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Não introduziu o Jabber ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "Não é possível normalizar esse Jabber ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "Jabber ID não é válido"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "Esse já é o seu Jabber ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID 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.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -3033,28 +3078,29 @@ msgstr ""
 "aprovar que %s envie mensagens para si."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 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:400
-msgid "Couldn't delete IM confirmation."
+#: actions/imsettings.php:391
+#, fuzzy
+msgid "Could not delete IM 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:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Esse não é o seu Jabber ID."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "O endereço do mensageiro instantâneo foi removido."
 
@@ -3284,107 +3330,107 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s deixou o grupo %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr ""
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Texto de boas-vindas inválido. Tamanho máx. é 255 caracteres."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "Privado"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
 
@@ -4172,12 +4218,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:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "Configurações do perfil"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4185,19 +4231,19 @@ msgstr ""
 "saibam mais sobre si."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "Informação do perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 #, 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4205,13 +4251,13 @@ msgstr "Nome completo"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Página pessoal"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: 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"
@@ -4219,7 +4265,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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4227,19 +4273,19 @@ 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:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "Biografia"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4247,24 +4293,24 @@ msgid "Location"
 msgstr "Localidade"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 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:157
+#: actions/profilesettings.php:153
 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:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "Categorias"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4272,27 +4318,27 @@ msgstr ""
 "espaços"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "Língua"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "Língua preferida"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "Fuso horário"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 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:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "Subscrever automaticamente quem me subscreva (óptimo para não-humanos)"
@@ -4300,7 +4346,7 @@ 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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4308,52 +4354,49 @@ 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:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 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:281
+#: actions/profilesettings.php:276
 #, 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, 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:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, 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 could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "Não foi possível gravar o perfil."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Configurações gravadas."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Criar uma conta"
@@ -4754,7 +4797,7 @@ 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:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4766,74 +4809,77 @@ msgstr ""
 "microblogues compatível](%%doc.openmublog%%), introduza abaixo a URL do seu "
 "perfil lá."
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Subscrição remota"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Subscrever um utilizador remoto"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Nome do utilizador"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "Nome do utilizador que pretende seguir"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "URL do perfil"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL do seu perfil noutro serviço de microblogues compatível"
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "Subscrever"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "URL de perfil inválido (formato incorrecto)"
 
-#: actions/remotesubscribe.php:168
+#: 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:176
-msgid "That’s a local profile! Login to subscribe."
+#: 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:183
-msgid "Couldn’t get a request token."
+#: 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:57
+#: 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:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Nota não foi especificada."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: 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:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Já repetiu essa nota."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Repetida"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Repetida!"
 
@@ -5606,70 +5652,70 @@ msgid "Save site notice"
 msgstr "Gravar aviso do site"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 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:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "SMS não está disponível."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "Endereço SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 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:133
+#: actions/smssettings.php:129
 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:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "Código de confirmação"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 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:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 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:156
+#: actions/smssettings.php:152
 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:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "Preferências de SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5678,32 +5724,32 @@ msgstr ""
 "me montantes exorbitantes."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
 msgid "SMS preferences saved."
 msgstr "Preferências de SMS gravadas."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 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:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr "Operador não foi seleccionado."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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."
@@ -5713,39 +5759,39 @@ msgstr ""
 "utilização."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
+#: actions/smssettings.php:404
 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:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 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:470
+#: actions/smssettings.php:460
 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:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "Operador móvel"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5756,7 +5802,7 @@ msgstr ""
 "para %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "Nenhum código introduzido"
 
@@ -6018,10 +6064,6 @@ 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:200
-msgid "Could not save tags."
-msgstr "Não foi possível gravar as categorias."
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
@@ -6256,12 +6298,12 @@ 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:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "Estilo do perfil"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6269,7 +6311,7 @@ msgstr ""
 "Personalize o estilo do seu perfil com uma imagem de fundo e uma paleta de "
 "cores à sua escolha."
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr "Disfrute do seu cachorro-quente!"
 
@@ -7241,23 +7283,27 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Não foi possível inserir a mensagem."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "Falha ao eliminar código revogado."
 
@@ -7910,6 +7956,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Reiniciar"
 
+#. 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
+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
 msgid "Design defaults restored."
@@ -9265,3 +9317,28 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "No such profile"
+#~ msgstr "Perfil não foi encontrado."
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "Grupos de que %s é membro"
+
+#, fuzzy
+#~ msgid "Method not supported"
+#~ msgstr "Método da API não encontrado."
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "Pessoas que subscrevem %s"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "Não foi possível actualizar o utilizador."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "Não foi possível gravar o perfil."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "Não foi possível gravar as categorias."
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index b19d55525d..a11dc37a54 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-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:19+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05:55+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 (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -93,9 +93,9 @@ msgstr "Salvar as configurações de acesso"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -116,6 +116,8 @@ msgstr "Esta página não existe."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -136,8 +138,8 @@ msgstr "Esta página não existe."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -148,7 +150,7 @@ msgstr "Esta página não existe."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -318,7 +320,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Não foi possível atualizar o usuário."
 
@@ -340,7 +356,8 @@ 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.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "Não foi possível salvar o perfil."
 
@@ -376,8 +393,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "Não foi possível salvar suas configurações de aparência."
 
@@ -385,13 +402,18 @@ 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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Não foi possível atualizar a sua aparência."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+#, fuzzy
+msgctxt "ATOM"
 msgid "Main"
 msgstr "Principal"
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -402,31 +424,38 @@ msgstr "Principal"
 msgid "%s timeline"
 msgstr "Mensagens de %s"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Assinaturas de %s"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
-#, fuzzy, php-format
+#. 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 "Favoritos"
+msgstr "Favoritas de %s"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: 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:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Não foi possível bloquear o usuário."
 
@@ -568,7 +597,7 @@ msgstr "Não foi possível encontrar usuário de destino."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Esta identificação já está em uso. Tente outro."
@@ -578,7 +607,7 @@ msgstr "Esta identificação já está em uso. Tente outro."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Não é uma identificação válida."
@@ -590,7 +619,7 @@ msgstr "Não é uma identificação válida."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "A URL informada não é válida."
@@ -600,7 +629,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "O nome completo é muito extenso (máx. 255 caracteres)"
@@ -627,7 +656,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "A localização é muito extensa (máx. 255 caracteres)."
@@ -750,7 +779,7 @@ 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:101
+#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "O token ou o verificador solicitado é inválido."
 
@@ -770,18 +799,19 @@ msgid "Request token already authorized."
 msgstr "O token solicitado já foi autorizado."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -803,16 +833,17 @@ msgstr "Erro no banco de dados durante a inserção de oauth_token_association."
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Submissão inesperada de formulário."
 
@@ -864,7 +895,7 @@ msgstr "Conta"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -885,7 +916,7 @@ msgstr "Senha"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -959,6 +990,7 @@ msgstr "Você não pode excluir uma mensagem de outro usuário."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: 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
@@ -978,39 +1010,49 @@ msgstr "Você não pode repetir a sua própria mensagem."
 msgid "Already repeated that notice."
 msgstr "Você já repetiu essa mensagem."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "O método HTTP não é suportado."
 
-#: actions/apistatusesshow.php:141
+#. 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 não suportado: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:152
+#: 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:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Não foi encontrada nenhuma mensagem com esse ID."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "Não é possível excluir esta mensagem."
 
-#: actions/apistatusesshow.php:243
+#. 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"
@@ -1138,58 +1180,52 @@ 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
-#, fuzzy
 msgid "Only accept AtomPub for Atom feeds."
-msgstr "Só são aceitos AtomPub para fontes atom."
+msgstr "Só são aceitos AtomPub para fontes Atom."
 
-#: actions/apitimelineuser.php:310
-#, fuzzy
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
-msgstr "A publicação Atom deve ser uma entrada Atom."
+msgstr "A publicação Atom não pode estar em branco."
 
-#: actions/apitimelineuser.php:315
-#, fuzzy
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
-msgstr "A publicação Atom deve ser uma entrada Atom."
+msgstr "A publicação Atom deve ser um XML formatado corretamente."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
-#, fuzzy
+#: actions/apitimelineuser.php:336
 msgid "Can only handle POST activities."
-msgstr "Só é possível manipular atividades de publicação."
+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
-#, fuzzy, php-format
+#: actions/apitimelineuser.php:347
+#, php-format
 msgid "Cannot handle activity object type \"%s\"."
-msgstr "Não é possível manipular o tipo de objeto de atividade \"%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.
-#: actions/apitimelineuser.php:378
-#, fuzzy, php-format
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
+#, php-format
 msgid "No content for notice %d."
-msgstr "Encontre conteúdo de mensagens"
+msgstr "Nenhum conteúdo para a mensagem %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:406
+#: actions/apitimelineuser.php:409
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Já existe uma mensagem com a URI \"%s\"."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr "Publicação AtomPub com uma URI de atenção desconhecida %s"
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1200,110 +1236,109 @@ msgstr "O método da API está em construção."
 msgid "User not found."
 msgstr "O método da API não foi encontrado!"
 
-#: actions/atompubfavoritefeed.php:70
-#, fuzzy
-msgid "No such profile"
-msgstr "Este perfil não existe."
-
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-#, fuzzy
-msgid "Can't add someone else's subscription"
-msgstr "Não foi possível inserir a nova assinatura."
-
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-#, fuzzy
-msgid "Can only handle Favorite activities."
-msgstr "Só é possível manipular atividades de publicação."
-
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
-#, fuzzy
-msgid "Can only fave notices."
-msgstr "Só é possível manipular atividades de publicação."
-
-#: actions/atompubfavoritefeed.php:256
-#, fuzzy
-msgid "Unknown note."
-msgstr "Desconhecido"
-
-#: actions/atompubfavoritefeed.php:263
-#, fuzzy
-msgid "Already a favorite."
-msgstr "Adicionar às favoritas"
-
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "Este perfil não existe."
 
+#. 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 é 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
-#, fuzzy, php-format
+#, php-format
 msgid "%s group memberships"
 msgstr "Membros do grupo %s"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "Grupos dos quais %s é membro"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "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:241
+#: actions/atompubmembershipfeed.php:242
 #, fuzzy
-msgid "Can only handle Join activities."
-msgstr "Só é possível manipular atividades de publicação."
+msgid "Can only handle join activities."
+msgstr "Só é possível manipular as atividades de associação."
 
-#: actions/atompubmembershipfeed.php:256
-#, fuzzy
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 msgid "Unknown group."
-msgstr "Desconhecido"
+msgstr "Grupo desconhecido."
 
-#: actions/atompubmembershipfeed.php:263
-#, fuzzy
+#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
+#: actions/atompubmembershipfeed.php:267
 msgid "Already a member."
-msgstr "Todos os membros"
+msgstr "Já é um membro."
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
-msgstr ""
+msgstr "Bloqueado pelo administrador."
 
-#: actions/atompubshowfavorite.php:89
-#, fuzzy
+#. TRANS: Client exception thrown when referencing a non-existing favorite.
+#: actions/atompubshowfavorite.php:90
 msgid "No such favorite."
-msgstr "Esse arquivo não existe."
+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 "Can't delete someone else's favorite"
-msgstr "Não foi possível excluir a favorita."
+msgid "Cannot delete someone else's favorite"
+msgstr "Não é possível excluir a Favorita de outra pessoa"
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "Esse grupo não existe."
 
-#: actions/atompubshowmembership.php:90
-#, fuzzy
+#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
+#: actions/atompubshowmembership.php:91
 msgid "Not a member"
-msgstr "Todos os membros"
+msgstr "Não é um membro"
 
-#: actions/atompubshowmembership.php:115
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "Method not supported"
+msgid "HTTP method not supported"
 msgstr "O método HTTP não é suportado."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1311,42 +1346,38 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
-msgid "No such profile id: %d"
-msgstr "Este perfil não existe."
+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 "Você não está assinando esse perfil."
+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 foi possível salvar a assinatura."
-
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "Assinantes de %s"
+msgid "Cannot delete someone else's subscription."
+msgstr "Não é possível excluir a assinatura de outra pessoa"
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
-#, fuzzy
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
-msgstr "Só é possível manipular atividades de publicação."
+msgstr "Só é possível manipular atividades de Assinatura."
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
-msgstr ""
+msgstr "Só é possível assinar pessoas."
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
-msgid "Unknown profile %s"
-msgstr "Tipo de arquivo desconhecido"
+msgid "Unknown profile %s."
+msgstr "Perfil desconhecido: %s"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
@@ -1356,10 +1387,11 @@ msgstr "Este anexo não existe."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Nenhuma identificação."
@@ -1391,30 +1423,36 @@ msgstr ""
 "Você pode enviar seu avatar pessoal. O tamanho máximo do arquivo é de %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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "Configurações do avatar"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "Original"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "Pré-visualizar"
 
@@ -1449,7 +1487,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "Os dados do nosso arquivo foram perdidos."
 
@@ -1468,18 +1507,17 @@ msgstr "Não foi possível atualizar o avatar."
 msgid "Avatar deleted."
 msgstr "O avatar foi excluído."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
-msgstr ""
+msgstr "Fazer backup da conta"
 
 #: actions/backupaccount.php:80
-#, fuzzy
 msgid "Only logged-in users can backup their account."
-msgstr "Apenas usuários autenticados podem repetir mensagens."
+msgstr "Apenas usuários autenticados podem fazer backups de suas contas."
 
 #: actions/backupaccount.php:84
 msgid "You may not backup your account."
-msgstr ""
+msgstr "Você não pode fazer backup da sua conta."
 
 #: actions/backupaccount.php:232
 msgid ""
@@ -1489,6 +1527,11 @@ msgid ""
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
+"Você pode fazer backup dos dados da sua conta no formato de <a href=\"http://"
+"activitystrea.ms/\">Fluxos de Atividades</a>. Este é um recurso experimental "
+"e fornece um backup incompleto; informações privadas da sua conta, como "
+"endereços de e-mail e de mensagens instantâneas não são copiados. Além "
+"disso, arquivos enviados e mensagens diretas também não entram no backup."
 
 #: actions/backupaccount.php:255
 #, fuzzy
@@ -1571,6 +1614,7 @@ msgstr "Não foi possível salvar a informação de bloqueio."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1580,7 +1624,7 @@ msgstr "Não foi possível salvar a informação de bloqueio."
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1660,23 +1704,6 @@ msgstr "Tipo de endereço %s não reconhecido."
 msgid "That address has already been confirmed."
 msgstr "Esse endereço já foi confirmado."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-msgstr "Não foi possível atualizar o usuário."
-
 #. 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
@@ -1737,7 +1764,7 @@ msgid "Account deleted."
 msgstr "O avatar foi excluído."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "Criar uma conta"
@@ -2101,7 +2128,7 @@ msgid "Reset back to default"
 msgstr "Restaura de volta ao padrão"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2213,14 +2240,16 @@ msgid "Edit %s group"
 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:70 actions/newgroup.php:65
 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 when trying to change group logo settings while not being a group admin.
 #: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "Você deve ser um administrador para editar o grupo."
 
@@ -2281,8 +2310,8 @@ msgstr "Endereço de e-mail já confirmado."
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Remover"
@@ -2307,15 +2336,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "E-mail de recebimento"
 
@@ -2326,13 +2355,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 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."
 
@@ -2345,7 +2374,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Novo"
@@ -2423,9 +2452,10 @@ 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, 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.
@@ -2441,8 +2471,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Nenhuma confirmação pendente para cancelar."
 
@@ -2453,8 +2483,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, 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.
@@ -2473,24 +2504,25 @@ msgstr "Esse não é seu endereço de email."
 msgid "The email address was removed."
 msgstr "O endereço de e-mail foi removido."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, 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:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 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:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr ""
 "Foi adicionado um novo endereço de e-mail para recebimento de mensagens."
@@ -2590,7 +2622,7 @@ msgstr "Não esperava por esta resposta!"
 msgid "User being listened to does not exist."
 msgstr "O usuário que está está sendo acompanhado não existe."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Você pode usar a assinatura local!"
 
@@ -2721,22 +2753,19 @@ msgstr ""
 "Personalize a aparência do grupo com uma imagem de fundo e uma paleta de "
 "cores à sua escolha."
 
-#. 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "Não foi possível atualizar a aparência."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "As configurações da aparência foram salvas."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "Logo do grupo"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2744,23 +2773,28 @@ msgstr ""
 "Você pode enviar uma imagem de logo para o seu grupo. O tamanho máximo do "
 "arquivo é %s."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "Enviar"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "Cortar"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr "Selecione uma área quadrada da imagem para definir a logo"
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "A logo foi atualizada."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "Não foi possível atualizar a logo."
 
@@ -2901,14 +2935,14 @@ msgid "Error removing the block."
 msgstr "Erro na remoção do bloqueio."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2918,23 +2952,23 @@ msgstr ""
 "%doc.im%%) Jabber/GTalk. Configure seu endereço e opções abaixo."
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "MI não está disponível"
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "Endereço do MI"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Endereço de Jabber/GTalk já confirmado."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2949,7 +2983,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2960,65 +2994,65 @@ msgstr ""
 "ou no GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Preferências do mensageiro instantâneo"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Envie-me mensagens via Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Publicar uma mensagem quando eu mudar de status no Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Envie-me respostas de pessoas que eu não estou assinando através do Jabber/"
 "GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publique um MicroID para meu endereço de Jabber/Gtalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "As preferências foram salvas."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Nenhuma ID de Jabber."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "Não foi possível normalizar essa ID do Jabber"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "Não é uma ID de Jabber válida"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "Essa já é sua ID do Jabber."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID 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.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -3028,28 +3062,29 @@ 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:391
+#: actions/imsettings.php:382
 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:400
-msgid "Couldn't delete IM confirmation."
+#: actions/imsettings.php:391
+#, fuzzy
+msgid "Could not delete IM 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:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Essa não é sua ID do Jabber."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "O endereço de mensageiro instantâneo foi removido."
 
@@ -3274,20 +3309,20 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s deixou o grupo %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Licença"
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr "Licença para este site StatusNet"
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr "Seleção inválida de licença."
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
@@ -3295,92 +3330,92 @@ msgstr ""
 "Você deve especificar o proprietário do conteúdo quando usar a licença Todos "
 "os Direitos Reservados."
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 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:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr "A URL da licença é inválida."
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr "A URL da imagem da licença é inválida."
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 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:187
+#: actions/licenseadminpanel.php:182
 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:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr "Seleção da licença"
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "Particular"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr "Todos os Direitos Reservados"
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr "Tipo"
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr "Selecione a licença"
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr "Detalhes da licença"
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr "Proprietário"
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 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:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr "Título da licença"
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr "O título da licença."
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr "URL da licença"
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr "URL para obter mais informações sobre a licença."
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr "URL da imagem da licença"
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr "URL de uma imagem a ser exibida com a licença."
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Salvar as configurações da licença"
 
@@ -4158,12 +4193,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:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "Configurações do perfil"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4171,18 +4206,18 @@ msgstr ""
 "saibam mais sobre você."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "Informações do perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4190,20 +4225,20 @@ msgstr "Nome completo"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Site"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: 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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4211,19 +4246,19 @@ 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:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "Descrição"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4231,24 +4266,24 @@ msgid "Location"
 msgstr "Localização"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 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:157
+#: actions/profilesettings.php:153
 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:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "Etiquetas"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4256,27 +4291,27 @@ msgstr ""
 "espaços"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "Idioma"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "Idioma preferencial"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "Fuso horário"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 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:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4285,7 +4320,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4293,51 +4328,48 @@ 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:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 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:281
+#: actions/profilesettings.php:276
 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, 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:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, 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 could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "Não foi possível salvar o perfil."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "As configurações foram salvas."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Criar uma conta"
@@ -4736,7 +4768,7 @@ msgstr ""
 "(Você receberá uma mensagem por e-mail a qualquer momento, com instruções "
 "sobre como confirmar seu endereço.)"
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4748,73 +4780,76 @@ msgstr ""
 "microblog compatível](%%doc.openmublog%%), informe a URL do seu perfil "
 "abaixo."
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Assinatura remota"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Assinar um usuário remoto"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Identificação do usuário"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "Identificação do usuário que você quer seguir"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "URL do perfil"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL do seu perfil em outro serviço de microblog compatível"
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "Assinar"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "A URL do perfil é inválida (formato inválido)"
 
-#: actions/remotesubscribe.php:168
+#: 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:176
-msgid "That’s a local profile! Login to subscribe."
+#: 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:183
-msgid "Couldn’t get a request token."
+#: 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:57
+#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Apenas usuários autenticados podem repetir mensagens."
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Não foi especificada nenhuma mensagem."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: 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:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Você já repetiu essa mensagem."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Repetida"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Repetida!"
 
@@ -5587,70 +5622,70 @@ msgid "Save site notice"
 msgstr "Salvar os avisos do site"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 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:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "SMS não está disponível."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "Endereço de SMS"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 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:133
+#: actions/smssettings.php:129
 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:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "Código de confirmação"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 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:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "Telefone para SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 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:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "Preferências do SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5659,32 +5694,32 @@ msgstr ""
 "exorbitantes da minha operadora."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
 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:338
+#: actions/smssettings.php:330
 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:344
+#: actions/smssettings.php:336
 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:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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."
@@ -5693,39 +5728,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:413
+#: actions/smssettings.php:404
 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:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 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:470
+#: actions/smssettings.php:460
 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:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "Operadora de celular"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5735,7 +5770,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:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "Não foi digitado nenhum código"
 
@@ -5996,10 +6031,6 @@ 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:200
-msgid "Could not save tags."
-msgstr "Não foi possível salvar as etiquetas."
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
@@ -6233,12 +6264,12 @@ 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:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "Aparência do perfil"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6246,7 +6277,7 @@ 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:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr "Aproveite o seu cachorro-quente!"
 
@@ -7214,24 +7245,29 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Não foi possível inserir a mensagem."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "Falha ao eliminar código revogado."
 
@@ -7892,6 +7928,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Restaurar"
 
+#. 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
+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
 msgid "Design defaults restored."
@@ -9252,3 +9294,29 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "AtomPub post with unknown attention URI %s"
+#~ msgstr "Publicação AtomPub com uma URI de atenção desconhecida %s"
+
+#~ msgid "No such profile"
+#~ msgstr "Este perfil não existe"
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "Grupos dos quais %s é membro"
+
+#~ msgid "Method not supported"
+#~ msgstr "O método não é suportado"
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "Assinantes de %s"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "Não foi possível atualizar o usuário."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "Não foi possível salvar o perfil."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "Não foi possível salvar as etiquetas."
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index fb8300a0fe..3580dd1b6b 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -16,18 +16,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:20+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05: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-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -95,9 +95,9 @@ msgstr "Сохранить настройки доступа"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -118,6 +118,8 @@ msgstr "Нет такой страницы."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -138,8 +140,8 @@ msgstr "Нет такой страницы."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -150,7 +152,7 @@ msgstr "Нет такой страницы."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -318,7 +320,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Не удаётся обновить пользователя."
 
@@ -340,7 +356,8 @@ msgid "User has no profile."
 msgstr "У пользователя нет профиля."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "Не удаётся сохранить профиль."
 
@@ -379,8 +396,8 @@ msgstr[2] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "Не удаётся сохранить ваши настройки оформления!"
 
@@ -388,13 +405,18 @@ msgstr "Не удаётся сохранить ваши настройки оф
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
+#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Не удаётся обновить ваше оформление."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+#, fuzzy
+msgctxt "ATOM"
 msgid "Main"
 msgstr "Главная"
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -405,31 +427,38 @@ msgstr "Главная"
 msgid "%s timeline"
 msgstr "Лента %s"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Подписки %s"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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 "Любимое"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Вы не можете заблокировать самого себя!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Неудача при блокировке пользователя."
 
@@ -570,7 +599,7 @@ msgstr "Не удаётся найти целевого пользователя
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Такое имя уже используется. Попробуйте какое-нибудь другое."
@@ -580,7 +609,7 @@ msgstr "Такое имя уже используется. Попробуйте
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Неверное имя."
@@ -592,7 +621,7 @@ msgstr "Неверное имя."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "URL Главной страницы неверен."
@@ -602,7 +631,7 @@ msgstr "URL Главной страницы неверен."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Полное имя слишком длинное (максимум 255 символов)."
@@ -630,7 +659,7 @@ msgstr[2] "Слишком длинное описание (максимум %d 
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Слишком длинное месторасположение (максимум 255 символов)."
@@ -754,7 +783,7 @@ msgid "Upload failed."
 msgstr "Загрузка не удалась."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:101
+#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Недопустимый ключ запроса или верификатор."
 
@@ -774,18 +803,19 @@ msgid "Request token already authorized."
 msgstr "Ключ запроса уже авторизован."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -806,16 +836,17 @@ msgstr "Ошибка базы данных при вставке oauth_token_ass
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Нетиповое подтверждение формы."
 
@@ -867,7 +898,7 @@ msgstr "Аккаунт"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -888,7 +919,7 @@ msgstr "Пароль"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -962,6 +993,7 @@ 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
@@ -981,39 +1013,49 @@ msgstr "Невозможно повторить собственную запи
 msgid "Already repeated that notice."
 msgstr "Запись уже повторена."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTTP-метод не поддерживается."
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Статус удалён."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Не найдено статуса с таким ID."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "Не удаётся удалить эту запись."
 
-#: actions/apistatusesshow.php:243
+#. 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 удалена"
@@ -1147,54 +1189,52 @@ msgstr "Только пользователь может добавлять в 
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Принимать только AtomPub для atom-каналов."
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 #, fuzzy
 msgid "Atom post must not be empty."
 msgstr "POST-запрос Atom должен быть объектом Atom."
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 #, fuzzy
 msgid "Atom post must be well-formed XML."
 msgstr "POST-запрос Atom должен быть объектом Atom."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 #, fuzzy
 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:347
 #, fuzzy, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Невозможно обработать действия объекта типа «%s»"
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Найти запись по содержимому"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:406
+#: actions/apitimelineuser.php:409
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Запись с URI «%s» уже существует."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr "Запись AtomPub с неизвестным целевым URI %s"
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1205,110 +1245,116 @@ msgstr "Метод API реконструируется."
 msgid "User not found."
 msgstr "Метод API не найден."
 
-#: actions/atompubfavoritefeed.php:70
-#, fuzzy
-msgid "No such profile"
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
+msgid "No such profile."
 msgstr "Нет такого профиля."
 
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#. 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 "Can't add someone else's subscription"
+msgid "Cannot add someone else's subscription."
 msgstr "Не удаётся вставить новую подписку."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
+#. 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."
+msgid "Can only handle favorite activities."
 msgstr "Возможна обработка только POST-запросов."
 
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#. 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 "Возможна обработка только POST-запросов."
 
-#: actions/atompubfavoritefeed.php:256
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "Неизвестно"
 
-#: actions/atompubfavoritefeed.php:263
+#. TRANS: Client exception thrown when trying favorite an already favorited notice.
+#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "Добавить в любимые"
 
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
-msgid "No such profile."
-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"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "Группы, в которых состоит %s"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "Не удаётся вставить новую подписку."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:241
+#: actions/atompubmembershipfeed.php:242
 #, fuzzy
-msgid "Can only handle Join activities."
+msgid "Can only handle join activities."
 msgstr "Возможна обработка только POST-запросов."
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Неизвестно"
 
-#: actions/atompubmembershipfeed.php:263
+#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
+#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "Все участники"
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr "Заблокировано администратором."
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr "Не удаётся удалить любимую запись."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "Нет такой группы."
 
-#: actions/atompubshowmembership.php:90
+#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
+#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member"
 msgstr "Все участники"
 
-#: actions/atompubshowmembership.php:115
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "Method not supported"
+msgid "HTTP method not supported"
 msgstr "HTTP-метод не поддерживается."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1316,41 +1362,38 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
-msgid "No such profile id: %d"
+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"
+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"
+msgid "Cannot delete someone else's subscription."
 msgstr "Невозможно удалить подписку на самого себя."
 
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "Люди подписанные на %s"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 #, fuzzy
 msgid "Can only handle Follow activities."
 msgstr "Возможна обработка только POST-запросов."
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
 msgstr "Неподдерживаемый тип файла"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1361,10 +1404,11 @@ msgstr "Нет такого вложения."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Нет имени."
@@ -1396,30 +1440,36 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "Настройки аватары"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "Оригинал"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "Просмотр"
 
@@ -1454,7 +1504,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "Потеряна информация о файле."
 
@@ -1473,7 +1524,7 @@ msgstr "Неудача при обновлении аватары."
 msgid "Avatar deleted."
 msgstr "Аватар удалён."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1575,6 +1626,7 @@ msgstr "Не удаётся сохранить информацию о блок
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1584,7 +1636,7 @@ msgstr "Не удаётся сохранить информацию о блок
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1664,23 +1716,6 @@ msgstr "Нераспознанный тип адреса %s."
 msgid "That address has already been confirmed."
 msgstr "Этот адрес уже подтверждён."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-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
@@ -1741,7 +1776,7 @@ msgid "Account deleted."
 msgstr "Аватар удалён."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "Создать новый аккаунт"
@@ -2103,7 +2138,7 @@ msgid "Reset back to default"
 msgstr "Восстановить значения по умолчанию"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2215,14 +2250,16 @@ msgid "Edit %s group"
 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:70 actions/newgroup.php:65
 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 when trying to change group logo settings while not being a group admin.
 #: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "Вы должны быть администратором, чтобы изменять информацию о группе."
 
@@ -2283,8 +2320,8 @@ msgstr "Подтверждённый в настоящее время элект
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Удалить"
@@ -2309,15 +2346,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Входящий электронный адрес"
 
@@ -2328,14 +2365,14 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Создаёт новый адрес электронной почты для отсылки сообщений; отменяет старый "
@@ -2350,7 +2387,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Новый"
@@ -2431,9 +2468,10 @@ msgstr "Этот электронный адрес уже задействова
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, fuzzy
+msgid "Could not insert confirmation code."
 msgstr "Не удаётся вставить код подтверждения."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
@@ -2449,8 +2487,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Нет подтверждения отказа."
 
@@ -2461,8 +2499,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+msgid "Could not delete email confirmation."
 msgstr "Не удаётся удалить подверждение по электронному адресу."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
@@ -2481,24 +2520,25 @@ msgstr "Это не Ваш электронный адрес."
 msgid "The email address was removed."
 msgstr "Адрес эл. почты удалён."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, fuzzy
+msgid "Could not update user record."
 msgstr "Не удаётся обновить пользовательскую запись."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 msgid "Incoming email address removed."
 msgstr "Входящий электронный адрес удалён."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "Новый входящий электронный адрес добавлен."
 
@@ -2597,7 +2637,7 @@ msgstr "Неожиданный ответ!"
 msgid "User being listened to does not exist."
 msgstr "Указанный пользователь не существует."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Вы можете использовать локальную подписку!"
 
@@ -2727,22 +2767,19 @@ 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "Не удаётся обновить ваше оформление."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "Настройки оформления сохранены."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "Логотип группы"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2750,23 +2787,28 @@ msgstr ""
 "Здесь вы можете загрузить логотип для группы. Максимальный размер файла "
 "составляет %s."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "Загрузить"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "Обрезать"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr "Подберите нужный квадратный участок для вашего логотипа."
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "Логотип обновлён."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "Неудача при обновлении логотипа."
 
@@ -2907,14 +2949,14 @@ msgid "Error removing the block."
 msgstr "Ошибка при удалении данного блока."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2924,23 +2966,23 @@ msgstr ""
 "(%%doc.im%%). Настройте ваш аккаунт и предпочтения ниже."
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM не доступен."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "IM-адрес"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Подтверждённый в настоящее время Jabber/Gtalk - адрес."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2955,7 +2997,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2966,64 +3008,64 @@ msgstr ""
 "мессенджере или в GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Настройки IM"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Посылать мне записи через Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Публиковать запись, когда мой Jabber/GTalk - статус изменяется."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Посылать мне реплики через Jabber/GTalk от людей, на которых я не подписан."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Опубликовать MicroID для моего Jabber/GTalk - адреса."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Предпочтения сохранены."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Не Jabber ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "Не удаётся стандартизировать этот Jabber ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "Неверный код Jabber ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "Это уже Ваш Jabber ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID already belongs to another user."
 msgstr "Этот Jabber ID уже используется другим пользователем."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -3033,28 +3075,29 @@ msgstr ""
 "%s для отправки вам сообщений."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "Это неверный IM-адрес."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:400
-msgid "Couldn't delete IM confirmation."
+#: actions/imsettings.php:391
+#, fuzzy
+msgid "Could not delete IM confirmation."
 msgstr "Не удаётся удалить подверждение IM."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Это не Ваш Jabber ID."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "Адрес IM удалён."
 
@@ -3287,20 +3330,20 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s покинул группу %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Лицензия"
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr "Лицензия этого сайта StatusNet"
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr "Неверный выбор лицензии."
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
@@ -3308,87 +3351,87 @@ msgstr ""
 "Вы должны указать владельца содержания при использовании лицензии «Все права "
 "защищены»."
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Неверное название лицензии. Максимальная длина 255 символов."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr "Неверный URL лицензии."
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr "Неверный URL изображения лицензии."
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr "URL лицензии должен быть пустым или действительным URL."
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr "Изображение лицензии должно быть пустым или действительным URL."
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr "Выбор лицензии"
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "Личное"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr "Все права защищены"
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr "Тип"
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr "Выбор лицензии"
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr "Подробности лицензии"
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr "Владелец"
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr "Имя владельца содержимого сайта (если применимо)."
 
-#: actions/licenseadminpanel.php:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr "Название лицензии"
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr "Название лицензии."
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr "URL-адрес лицензии"
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr "URL-адрес для получения дополнительной информации о лицензии."
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr "URL изображения лицензии"
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr "URL изображения, отображаемого вместе с лицензией."
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Сохранить настройки лицензии"
 
@@ -4158,12 +4201,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:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "Настройки профиля"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4171,19 +4214,19 @@ msgstr ""
 "больше."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "Информация профиля"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4191,20 +4234,20 @@ msgstr "Полное имя"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Главная"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: 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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4213,19 +4256,19 @@ msgstr[1] "Опишите себя и свои увлечения при пом
 msgstr[2] "Опишите себя и свои увлечения при помощи %d символов"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "Биография"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4233,24 +4276,24 @@ msgid "Location"
 msgstr "Месторасположение"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Где вы находитесь, например «Город, область, страна»"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:157
+#: actions/profilesettings.php:153
 msgid "Share my current location when posting notices"
 msgstr "Делиться своим текущим местоположением при отправке записей"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "Теги"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4258,27 +4301,27 @@ msgstr ""
 "пробелом"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "Язык"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "Предпочитаемый язык"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "Часовой пояс"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 msgid "What timezone are you normally in?"
 msgstr "В каком часовом поясе Вы обычно находитесь?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "Автоматически подписываться на всех, кто подписался на меня"
@@ -4286,7 +4329,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4295,51 +4338,48 @@ msgstr[1] "Слишком длинная биография (максимум %d
 msgstr[2] "Слишком длинная биография (максимум %d символов)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Часовой пояс не выбран."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:276
 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, 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:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, fuzzy
+msgid "Could not save location prefs."
 msgstr "Не удаётся сохранить настройки местоположения."
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "Не удаётся сохранить профиль."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Настройки сохранены."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Создать новый аккаунт"
@@ -4735,7 +4775,7 @@ msgstr ""
 "(Вы должный получить письмо с описанием того, как подтвердить свой "
 "электронный адрес.)"
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4745,72 +4785,75 @@ msgstr ""
 "Чтобы подписаться, необходимо [авторизоваться](%%action.login%%) или "
 "[зарегистрировать](%%action.register%%) новый аккаунт."
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Подписаться на пользователя"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Подписаться на удалённого пользователя"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Имя пользователя."
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "Имя пользователя, которому Вы хотите следовать"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "URL профиля"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "Адрес URL твоего профиля на другом подходящем сервисе микроблогинга"
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "Подписаться"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "Неверный URL профиля (плохой формат)"
 
-#: actions/remotesubscribe.php:168
+#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr "Неправильный URL-профиль (нет YADIS-документа, либо неверный XRDS)."
 
-#: actions/remotesubscribe.php:176
-msgid "That’s a local profile! Login to subscribe."
+#: actions/remotesubscribe.php:175
+#, fuzzy
+msgid "That is a local profile! Login to subscribe."
 msgstr "Это локальный профиль! Авторизуйтесь для подписки."
 
-#: actions/remotesubscribe.php:183
-msgid "Couldn’t get a request token."
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
 msgstr "Не удаётся получить получить ключ запроса."
 
-#: actions/repeat.php:57
+#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Повторять записи могут только вошедшие пользователи."
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Не указана запись."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "Вы не можете повторить собственную запись."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Вы уже повторили эту запись."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Повторено"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Повторено!"
 
@@ -5581,72 +5624,72 @@ msgid "Save site notice"
 msgstr "Сохранить уведомление сайта"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "Установки СМС"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "Отправка СМС недоступна."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "SMS-адрес"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 "Подтверждённый в настоящее время SMS-доступный номер мобильного телефона."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:133
+#: actions/smssettings.php:129
 msgid "Awaiting confirmation on this phone number."
 msgstr "В ожидании подтверждения данного номера телефона."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "Код подтверждения"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 msgid "Enter the code you received on your phone."
 msgstr "Введите код, который вы получили по телефону."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Подтвердить"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "Номер телефона для СМС"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Номер телефона, без пробелов, с кодом зоны"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "Настройки SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5655,32 +5698,32 @@ msgstr ""
 "по пересылке."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
 msgid "SMS preferences saved."
 msgstr "Настройки SMS сохранены."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "Нет номера телефона."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr "Провайдер не выбран."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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."
@@ -5689,39 +5732,39 @@ msgstr ""
 "телефон для нахождения этого кода и инструкций по его использованию."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
+#: actions/smssettings.php:404
 msgid "That is the wrong confirmation number."
 msgstr "Это неверный номер подтверждения."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 msgid "That is not your phone number."
 msgstr "Это не Ваш номер телефона."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
+#: actions/smssettings.php:460
 msgid "The SMS phone number was removed."
 msgstr "Номер SMS телефона удалён."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "Выбор провайдера"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5732,7 +5775,7 @@ msgstr ""
 "то сообщите нам об этом по электронной почте %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "Код не введён"
 
@@ -5997,10 +6040,6 @@ msgstr ""
 "Вы можете помечать тегами только пользователей, на которых подписаны или "
 "которые подписаны на Вас."
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "Не удаётся сохранить теги."
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
@@ -6230,12 +6269,12 @@ msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Неверный тип изображения для URL аватары «%s»."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "Оформление профиля"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6243,7 +6282,7 @@ msgstr ""
 "Настройте внешний вид своего профиля, установив фоновое изображение и "
 "цветовую гамму на свой выбор."
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr "Приятного аппетита!"
 
@@ -7214,22 +7253,26 @@ msgid ""
 msgstr "Не удаётся найти профиль и приложение, связанное с ключом запроса."
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 msgid "Could not issue access token."
 msgstr "Ошибка выдачи ключа доступа."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "Не удаётся удалить аннулированный ключ."
 
@@ -7886,6 +7929,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 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
+msgid "Couldn't update your design."
+msgstr "Не удаётся обновить ваше оформление."
+
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
 #: lib/designsettings.php:433
 msgid "Design defaults restored."
@@ -9259,3 +9308,31 @@ msgstr "Неверный XML, отсутствует корень XRD."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Получение резервной копии из файла «%s»."
+
+#~ msgid "AtomPub post with unknown attention URI %s"
+#~ msgstr "Запись AtomPub с неизвестным целевым URI %s"
+
+#, fuzzy
+#~ msgid "No such profile"
+#~ msgstr "Нет такого профиля."
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "Группы, в которых состоит %s"
+
+#, fuzzy
+#~ msgid "Method not supported"
+#~ msgstr "HTTP-метод не поддерживается."
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "Люди подписанные на %s"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "Не удаётся обновить пользователя."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "Не удаётся сохранить профиль."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "Не удаётся сохранить теги."
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 8722900213..78785a5200 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-01-14 23:32+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+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"
@@ -82,9 +82,9 @@ msgstr ""
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -105,6 +105,8 @@ msgstr ""
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -125,8 +127,8 @@ msgstr ""
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -137,7 +139,7 @@ msgstr ""
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -297,7 +299,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr ""
 
@@ -319,7 +335,8 @@ msgid "User has no profile."
 msgstr ""
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr ""
 
@@ -351,8 +368,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr ""
 
@@ -360,13 +377,17 @@ msgstr ""
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
+#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr ""
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+msgctxt "ATOM"
 msgid "Main"
 msgstr ""
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -377,31 +398,38 @@ msgstr ""
 msgid "%s timeline"
 msgstr ""
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr ""
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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 ""
 
-#: actions/apiatomservice.php:123
+#. 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 ""
 
 #. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:104
+#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr ""
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr ""
 
@@ -537,7 +565,7 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr ""
@@ -547,7 +575,7 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr ""
@@ -559,7 +587,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr ""
@@ -569,7 +597,7 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr ""
@@ -596,7 +624,7 @@ msgstr[1] ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr ""
@@ -719,7 +747,7 @@ msgid "Upload failed."
 msgstr ""
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:101
+#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr ""
 
@@ -739,18 +767,19 @@ msgid "Request token already authorized."
 msgstr ""
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -771,16 +800,17 @@ msgstr ""
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -825,7 +855,7 @@ msgstr ""
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -846,7 +876,7 @@ msgstr ""
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -916,6 +946,7 @@ 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
@@ -935,39 +966,48 @@ msgstr ""
 msgid "Already repeated that notice."
 msgstr ""
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr ""
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr ""
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr ""
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+msgid "Cannot delete this notice."
 msgstr ""
 
-#: actions/apistatusesshow.php:243
+#. 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 ""
@@ -1098,51 +1138,49 @@ msgstr ""
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, php-format
 msgid "No content for notice %d."
 msgstr ""
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:406
+#: actions/apitimelineuser.php:409
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1153,96 +1191,101 @@ msgstr ""
 msgid "User not found."
 msgstr ""
 
-#: actions/atompubfavoritefeed.php:70
-msgid "No such profile"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-msgid "Can't add someone else's subscription"
-msgstr ""
-
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
-msgid "Can only fave notices."
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:256
-msgid "Unknown note."
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:263
-msgid "Already a favorite."
-msgstr ""
-
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr ""
 
+#. 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 ""
 
-#: actions/atompubmembershipfeed.php:147
-#, php-format
-msgid "Groups %s is a member of on %s"
-msgstr ""
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
+#. 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:241
-msgid "Can only handle Join activities."
+#: actions/atompubmembershipfeed.php:242
+msgid "Can only handle join activities."
 msgstr ""
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 msgid "Unknown group."
 msgstr ""
 
-#: actions/atompubmembershipfeed.php:263
+#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
+#: actions/atompubmembershipfeed.php:267
 msgid "Already a member."
 msgstr ""
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr ""
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr ""
 
-#: actions/atompubshowmembership.php:90
+#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
+#: actions/atompubshowmembership.php:91
 msgid "Not a member"
 msgstr ""
 
-#: actions/atompubshowmembership.php:115
-msgid "Method not supported"
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
+msgid "HTTP method not supported"
 msgstr ""
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+msgid "Cannot delete someone else's membership"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1251,39 +1294,36 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, php-format
-msgid "No such profile id: %d"
+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"
+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 ""
-
-#: actions/atompubsubscriptionfeed.php:150
-#, php-format
-msgid "People %s has subscribed to on %s"
+msgid "Cannot delete someone else's subscription."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
 msgstr ""
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1294,10 +1334,11 @@ msgstr ""
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr ""
@@ -1328,30 +1369,36 @@ msgid "You can upload your personal avatar. The maximum file size is %s."
 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr ""
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr ""
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr ""
 
@@ -1386,7 +1433,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr ""
 
@@ -1405,7 +1453,7 @@ msgstr ""
 msgid "Avatar deleted."
 msgstr ""
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1502,6 +1550,7 @@ msgstr ""
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1511,7 +1560,7 @@ msgstr ""
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1591,23 +1640,6 @@ msgstr ""
 msgid "That address has already been confirmed."
 msgstr ""
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-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
@@ -1665,7 +1697,7 @@ msgid "Account deleted."
 msgstr ""
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 msgid "Delete account"
 msgstr ""
 
@@ -2013,7 +2045,7 @@ msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2125,14 +2157,16 @@ msgid "Edit %s group"
 msgstr ""
 
 #. 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:70 actions/newgroup.php:65
 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 when trying to change group logo settings while not being a group admin.
 #: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr ""
 
@@ -2193,8 +2227,8 @@ msgstr ""
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr ""
@@ -2217,15 +2251,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr ""
 
@@ -2236,13 +2270,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
@@ -2255,7 +2289,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr ""
@@ -2329,9 +2363,9 @@ msgstr ""
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+msgid "Could not insert confirmation code."
 msgstr ""
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
@@ -2344,8 +2378,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr ""
 
@@ -2356,8 +2390,8 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+msgid "Could not delete email confirmation."
 msgstr ""
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
@@ -2376,24 +2410,24 @@ msgstr ""
 msgid "The email address was removed."
 msgstr ""
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+msgid "Could not update user record."
 msgstr ""
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 msgid "Incoming email address removed."
 msgstr ""
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr ""
 
@@ -2486,7 +2520,7 @@ msgstr ""
 msgid "User being listened to does not exist."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr ""
 
@@ -2611,44 +2645,46 @@ msgid ""
 "palette of your choice."
 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr ""
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr ""
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr ""
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr ""
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr ""
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr ""
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr ""
 
@@ -2778,14 +2814,14 @@ msgid "Error removing the block."
 msgstr ""
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2793,23 +2829,23 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr ""
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr ""
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr ""
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2821,7 +2857,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2829,63 +2865,63 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr ""
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr ""
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr ""
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr ""
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr ""
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID already belongs to another user."
 msgstr ""
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2893,28 +2929,28 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr ""
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:400
-msgid "Couldn't delete IM confirmation."
+#: actions/imsettings.php:391
+msgid "Could not delete IM confirmation."
 msgstr ""
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr ""
 
@@ -3106,106 +3142,106 @@ msgid "%1$s left group %2$s"
 msgstr ""
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr ""
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr ""
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr ""
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr ""
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr ""
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
 
@@ -3954,29 +3990,29 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr ""
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -3984,20 +4020,20 @@ msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: 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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4005,19 +4041,19 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4025,50 +4061,50 @@ msgid "Location"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:157
+#: actions/profilesettings.php:153
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr ""
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr ""
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 msgid "What timezone are you normally in?"
 msgstr ""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4076,7 +4112,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4084,51 +4120,46 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr ""
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:276
 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 actions/tagother.php:178
 #, 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:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+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:409
-msgid "Couldn't save location prefs."
-msgstr ""
-
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
+#: actions/profilesettings.php:404
+msgid "Could not save location prefs."
 msgstr ""
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr ""
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr ""
 
@@ -4480,7 +4511,7 @@ msgid ""
 "to confirm your email address.)"
 msgstr ""
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4488,72 +4519,72 @@ msgid ""
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr ""
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr ""
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr ""
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr ""
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr ""
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr ""
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr ""
 
-#: actions/remotesubscribe.php:168
+#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 
-#: actions/remotesubscribe.php:176
-msgid "That’s a local profile! Login to subscribe."
+#: actions/remotesubscribe.php:175
+msgid "That is a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/remotesubscribe.php:183
-msgid "Couldn’t get a request token."
+#: actions/remotesubscribe.php:182
+msgid "Could not get a request token."
 msgstr ""
 
-#: actions/repeat.php:57
+#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr ""
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr ""
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+msgid "You cannot repeat your own notice."
 msgstr ""
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr ""
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr ""
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr ""
 
@@ -5273,141 +5304,141 @@ msgid "Save site notice"
 msgstr ""
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr ""
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr ""
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr ""
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:133
+#: actions/smssettings.php:129
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr ""
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 msgid "Enter the code you received on your phone."
 msgstr ""
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr ""
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr ""
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr ""
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 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:315
+#: actions/smssettings.php:308
 msgid "SMS preferences saved."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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:413
+#: actions/smssettings.php:404
 msgid "That is the wrong confirmation number."
 msgstr ""
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 msgid "That is not your phone number."
 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
+#: actions/smssettings.php:460
 msgid "The SMS phone number was removed."
 msgstr ""
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr ""
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5415,7 +5446,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr ""
 
@@ -5664,10 +5695,6 @@ msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr ""
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
@@ -5887,18 +5914,18 @@ msgid "Wrong image type for avatar URL ‘%s’."
 msgstr ""
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr ""
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr ""
 
@@ -6825,22 +6852,25 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 msgid "Could not issue access token."
 msgstr ""
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
@@ -7436,6 +7466,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 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
+msgid "Couldn't update your design."
+msgstr ""
+
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
 #: lib/designsettings.php:433
 msgid "Design defaults restored."
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index feea4eb123..7b80e62217 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/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-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:22+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05: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-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -90,9 +90,9 @@ msgstr "Spara inställningar för åtkomst"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -113,6 +113,8 @@ msgstr "Ingen sådan sida"
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -133,8 +135,8 @@ msgstr "Ingen sådan sida"
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -145,7 +147,7 @@ msgstr "Ingen sådan sida"
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -311,7 +313,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Kunde inte uppdatera användare."
 
@@ -333,7 +349,8 @@ msgid "User has no profile."
 msgstr "Användaren har ingen profil."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "Kunde inte spara profil."
 
@@ -369,8 +386,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "Kunde inte spara dina utseendeinställningar."
 
@@ -378,13 +395,17 @@ 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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Kunde inte uppdatera din profils utseende."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+msgctxt "ATOM"
 msgid "Main"
 msgstr ""
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -395,31 +416,38 @@ msgstr ""
 msgid "%s timeline"
 msgstr "%s tidslinje"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s prenumerationer"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: 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:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Blockering av användare misslyckades."
 
@@ -558,7 +586,7 @@ msgstr "Kunde inte hitta målanvändare."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Smeknamnet används redan. Försök med ett annat."
@@ -568,7 +596,7 @@ msgstr "Smeknamnet används redan. Försök med ett annat."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Inte ett giltigt smeknamn."
@@ -580,7 +608,7 @@ msgstr "Inte ett giltigt smeknamn."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Hemsida är inte en giltig webbadress."
@@ -590,7 +618,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: 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)."
@@ -617,7 +645,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Beskrivning av plats är för lång (max 255 tecken)."
@@ -740,7 +768,7 @@ 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:101
+#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Ogiltig begäran-token eller verifierare."
 
@@ -761,18 +789,19 @@ msgid "Request token already authorized."
 msgstr "Begäran-token är redan auktoriserad."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -794,16 +823,17 @@ msgstr "Databasfel vid infogning av OAuth-applikationsanvändare."
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Oväntat inskick av formulär."
 
@@ -854,7 +884,7 @@ msgstr "Konto"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -875,7 +905,7 @@ msgstr "Lösenord"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -948,6 +978,7 @@ msgstr "Du kan inte ta bort en annan användares status."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: 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
@@ -967,40 +998,50 @@ msgstr "Kan inte upprepa din egen notis."
 msgid "Already repeated that notice."
 msgstr "Redan upprepat denna notis."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "API-metod hittades inte."
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Status borttagen."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Ingen status med det ID:t hittades."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "Kan inte ta bort denna notis."
 
-#: actions/apistatusesshow.php:243
+#. 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"
@@ -1133,51 +1174,49 @@ msgstr "Bara användaren kan läsa sina egna brevlådor."
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, 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:406
+#: actions/apitimelineuser.php:409
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Notis med den ID:n finns inte."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1188,107 +1227,116 @@ msgstr "API-metoden är under uppbyggnad."
 msgid "User not found."
 msgstr "API-metod hittades inte."
 
-#: actions/atompubfavoritefeed.php:70
-msgid "No such profile"
-msgstr "Ingen sådan profil"
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
+msgid "No such profile."
+msgstr "Ingen sådan profil."
 
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#. 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 "Can't add someone else's subscription"
+msgid "Cannot add someone else's subscription."
 msgstr "Kunde inte infoga ny prenumeration."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-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 "Hitta innehåll i notiser"
 
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#. 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"
 
-#: actions/atompubfavoritefeed.php:256
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "Okänd"
 
-#: actions/atompubfavoritefeed.php:263
+#. 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"
 
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
-msgid "No such profile."
-msgstr "Ingen sådan profil."
-
+#. 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"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "Grupper %s är en medlem i"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "Kunde inte infoga ny prenumeration."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:241
-msgid "Can only handle Join activities."
-msgstr ""
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
+msgstr "Hitta innehåll i notiser"
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Okänd"
 
-#: actions/atompubmembershipfeed.php:263
+#. 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"
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr "Kunde inte ta bort favoriten."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "Ingen sådan grupp"
 
-#: actions/atompubshowmembership.php:90
+#. 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"
 
-#: actions/atompubshowmembership.php:115
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "Method not supported"
+msgid "HTTP method not supported"
 msgstr "API-metod hittades inte."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1296,40 +1344,37 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
-msgid "No such profile id: %d"
+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"
+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"
+msgid "Cannot delete someone else's subscription."
 msgstr "Kunde inte spara prenumeration."
 
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "Personer som prenumererar på %s"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
 msgstr "Okänd filtyp"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1340,10 +1385,11 @@ msgstr "Ingen sådan bilaga."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Inget smeknamn."
@@ -1375,30 +1421,36 @@ msgstr ""
 "Du kan ladda upp din personliga avatar. Den maximala filstorleken är %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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "Avatarinställningar"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "Orginal"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "Förhandsgranska"
 
@@ -1433,7 +1485,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "Förlorade vår fildata."
 
@@ -1452,7 +1505,7 @@ msgstr "Misslyckades uppdatera avatar."
 msgid "Avatar deleted."
 msgstr "Avatar borttagen."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1554,6 +1607,7 @@ msgstr "Misslyckades att spara blockeringsinformation."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1563,7 +1617,7 @@ msgstr "Misslyckades att spara blockeringsinformation."
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1644,23 +1698,6 @@ msgstr "Adresstypen %s känns inte igen."
 msgid "That address has already been confirmed."
 msgstr "Denna adress har redan blivit bekräftad."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-msgstr "Kunde inte uppdatera användare."
-
 #. 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
@@ -1721,7 +1758,7 @@ msgid "Account deleted."
 msgstr "Avatar borttagen."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "Skapa ett konto"
@@ -2083,7 +2120,7 @@ msgid "Reset back to default"
 msgstr "Återställ till standardvärde"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2195,14 +2232,16 @@ msgid "Edit %s group"
 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:70 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: Client error displayed trying to edit a group while not 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:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "Du måste vara en administratör för att redigera gruppen."
 
@@ -2263,8 +2302,8 @@ msgstr "Aktuell, bekräftad e-postadress."
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Ta bort"
@@ -2289,15 +2328,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Inkommande e-post"
 
@@ -2308,13 +2347,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 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."
@@ -2328,7 +2367,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Ny"
@@ -2402,9 +2441,10 @@ 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, 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.
@@ -2420,8 +2460,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Ingen väntande bekräftelse att avbryta."
 
@@ -2432,8 +2472,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, 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.
@@ -2452,24 +2493,25 @@ msgstr "Det är inte din e-postadress."
 msgid "The email address was removed."
 msgstr "E-postadressen togs bort."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, 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:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 msgid "Incoming email address removed."
 msgstr "Inkommande e-postadress borttagen."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "Ny inkommande e-postadress tillagd."
 
@@ -2568,7 +2610,7 @@ msgstr "Väntade mig inte denna respons!"
 msgid "User being listened to does not exist."
 msgstr "Användaren som lyssnas på existerar inte."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Du kan använda den lokala prenumerationen!"
 
@@ -2697,22 +2739,19 @@ msgid ""
 msgstr ""
 "Anpassa hur din grupp ser ut genom att välja bakgrundbild och färgpalett."
 
-#. 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "Kunde inte uppdatera dina utseendeinställningar."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "Utseendeinställningar sparade."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "Gruppens logotyp"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2720,23 +2759,28 @@ msgstr ""
 "Du kan ladda upp en logotypbild för din grupp. Den maximala filstorleken är %"
 "s."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "Ladda upp"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "Beskär"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr "Välj ett kvadratiskt område i bilden som logotyp"
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "Logtyp uppdaterad."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "Misslyckades uppdatera logtyp."
 
@@ -2878,14 +2922,14 @@ msgid "Error removing the block."
 msgstr "Fel vid hävning av blockering."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2895,23 +2939,23 @@ msgstr ""
 "doc.im%%). Konfigurera din adress och dina inställningar nedan."
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM är inte tillgänglig."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "Adress för snabbmeddelanden"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Aktuell bekräftad Jabber/Gtalk-adress."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2925,7 +2969,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2935,65 +2979,65 @@ msgstr ""
 "att lägga till %s i din kompislista i din IM-klient eller hos GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Inställningar för snabbmeddelanden"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Skicka notiser till mig genom Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Posta en notis när min Jabber/GTalk-status ändras."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk 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 IM preferences form.
-#: actions/imsettings.php:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publicera ett MicroID för min Jabber/GTalk-adress."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Inställningar sparade."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Inget Jabber-ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "Kan inte normalisera detta Jabber-ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "Inte ett giltigt Jabber-ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "Detta är redan ditt Jabber-ID"
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID 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.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -3003,28 +3047,29 @@ msgstr ""
 "att %s får skicka meddelanden till dig."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 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:400
-msgid "Couldn't delete IM confirmation."
+#: actions/imsettings.php:391
+#, fuzzy
+msgid "Could not delete IM confirmation."
 msgstr "Kunde inte ta bort bekräftelse för snabbmeddelanden."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Detta är inte ditt Jabber-ID."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "Adressen för snabbmeddelanden togs bort."
 
@@ -3253,107 +3298,107 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s lämnade grupp %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Licens"
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr "Licens för denna StatusNet-webbplats"
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr "Ogiltigt licensval."
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Ogiltig välkomsttext. Maximal längd är 255 tecken."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr ""
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "Privat"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr "Alla rättigheter reserverade"
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr ""
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr "Typ"
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr "Välj licens"
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr "Licensdetaljer"
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr "Ägare"
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr "Licenstitel"
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr "Titeln på licensen."
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr "Licens-URL"
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr "URL för mer information om licensen."
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Spara licensinsällningar"
 
@@ -4132,12 +4177,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:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "Profilinställningar"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4145,19 +4190,19 @@ msgstr ""
 "dig."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "Profilinformation"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 #, 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4165,13 +4210,13 @@ msgstr "Fullständigt namn"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Hemsida"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: 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."
@@ -4179,7 +4224,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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4187,19 +4232,19 @@ 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:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "Biografi"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4207,24 +4252,24 @@ msgid "Location"
 msgstr "Plats"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 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:157
+#: actions/profilesettings.php:153
 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:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "Taggar"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4232,27 +4277,27 @@ msgstr ""
 "kommatecken eller mellanslag"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "Språk"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "Föredraget språk"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "Tidszon"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 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:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4262,7 +4307,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4270,52 +4315,49 @@ 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:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Tidszon inte valt."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:276
 #, 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, 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:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, fuzzy
+msgid "Could not save location prefs."
 msgstr "Kunde inte spara platsinställningar."
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "Kunde inte spara profil."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Inställningar sparade."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Skapa ett konto"
@@ -4712,7 +4754,7 @@ msgstr ""
 "(Du kommer få ett meddelande med e-post inom kort med instruktioner hur du "
 "bekräftar din e-postadress.)"
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4724,74 +4766,77 @@ msgstr ""
 "[kompatibel mikrobloggwebbplats](%%doc.openmublog%%), fyll i din profils URL "
 "nedan."
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Fjärrprenumerera"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Prenumerera på en fjärranvändare"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Användarens smeknamn"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "Smeknamnet på användaren du vill följa"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Profil-URL"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL till din profil på en annan kompatibel mikrobloggtjänst"
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "Prenumerera"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "Ogiltig profil-URL (dåligt format)"
 
-#: actions/remotesubscribe.php:168
+#: 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:176
-msgid "That’s a local profile! Login to subscribe."
+#: 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:183
-msgid "Couldn’t get a request token."
+#: 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:57
+#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Bara inloggade användaren kan upprepa notiser."
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Ingen notis angiven."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "Du kan inte upprepa din egna notis."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Du har redan upprepat denna notis."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Upprepad"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Upprepad!"
 
@@ -5558,70 +5603,70 @@ msgid "Save site notice"
 msgstr "Spara webbplatsnotis"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 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:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "SMS är inte tillgängligt."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "SMS-adress"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 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:133
+#: actions/smssettings.php:129
 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:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "Bekräftelsekod"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 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:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Bekräfta"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "Telefonnummer för SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 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:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "SMS-inställningar"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5630,32 +5675,32 @@ msgstr ""
 "debitera mig."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
 msgid "SMS preferences saved."
 msgstr "SMS-inställningar sparade."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "Inget telefonnummer."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr "Ingen operatör vald."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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."
@@ -5664,39 +5709,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:413
+#: actions/smssettings.php:404
 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:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 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:470
+#: actions/smssettings.php:460
 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:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "Mobiloperatör"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5707,7 +5752,7 @@ msgstr ""
 "på %s och berätta."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "Ingen kod ifylld"
 
@@ -5970,10 +6015,6 @@ msgid ""
 msgstr ""
 "Du kan bara tagga personer du prenumererar på eller som prenumererar på dig."
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "Kunde inte spara taggar."
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
@@ -6210,19 +6251,19 @@ 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:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "Profilutseende"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 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:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr "Smaklig måltid!"
 
@@ -7185,23 +7226,27 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Kunde inte infoga meddelande."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
@@ -7847,6 +7892,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Återställ"
 
+#. 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
+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
 msgid "Design defaults restored."
@@ -9196,3 +9247,27 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "No such profile"
+#~ msgstr "Ingen sådan profil"
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "Grupper %s är en medlem i"
+
+#, fuzzy
+#~ msgid "Method not supported"
+#~ msgstr "API-metod hittades inte."
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "Personer som prenumererar på %s"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "Kunde inte uppdatera användare."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "Kunde inte spara profil."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "Kunde inte spara taggar."
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 5aaee51359..3bea408a76 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-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:23+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:05:59+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 (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -87,9 +87,9 @@ msgstr "అందుబాటు అమరికలను భద్రపరచ
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -110,6 +110,8 @@ msgstr "అటువంటి పేజీ లేదు."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -130,8 +132,8 @@ msgstr "అటువంటి పేజీ లేదు."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -142,7 +144,7 @@ msgstr "అటువంటి పేజీ లేదు."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -304,7 +306,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 #, fuzzy
 msgid "Could not update user."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
@@ -327,7 +343,8 @@ msgid "User has no profile."
 msgstr "వాడుకరికి ప్రొఫైలు లేదు."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 #, fuzzy
 msgid "Could not save profile."
 msgstr "ప్రొఫైలుని భద్రపరచలేకున్నాం."
@@ -360,8 +377,8 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "మీ రూపురేఖల అమరికలని భద్రపరచలేకున్నాం."
 
@@ -369,14 +386,19 @@ msgstr "మీ రూపురేఖల అమరికలని భద్రప
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
+#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 #, fuzzy
 msgid "Could not update your design."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+#, fuzzy
+msgctxt "ATOM"
 msgid "Main"
 msgstr "ప్రధాన"
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -387,31 +409,38 @@ msgstr "ప్రధాన"
 msgid "%s timeline"
 msgstr "%s కాలరేఖ"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s చందాలు"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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 "ఇష్టాంశాలు"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "మిమ్మల్ని మీరే నిరోధించుకోలేరు!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "వాడుకరి నిరోధం విఫలమైంది."
 
@@ -549,7 +578,7 @@ msgstr "లక్ష్యిత వాడుకరిని కనుగొన
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్నారు. మరోటి ప్రయత్నించండి."
@@ -559,7 +588,7 @@ msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "సరైన పేరు కాదు."
@@ -571,7 +600,7 @@ msgstr "సరైన పేరు కాదు."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "హోమ్ పేజీ URL సరైనది కాదు."
@@ -581,7 +610,7 @@ msgstr "హోమ్ పేజీ URL సరైనది కాదు."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -609,7 +638,7 @@ msgstr[1] "వివరణ చాలా పెద్దగా ఉంది (%d 
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -733,7 +762,7 @@ msgid "Upload failed."
 msgstr "ఎక్కింపు విఫలమైంది."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:101
+#: actions/apioauthaccesstoken.php:102
 #, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "సందేశపు విషయం సరైనది కాదు"
@@ -756,18 +785,19 @@ msgid "Request token already authorized."
 msgstr "మీకు అధీకరణ లేదు."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -789,16 +819,17 @@ msgstr "అవతారాన్ని పెట్టడంలో పొరప
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -843,7 +874,7 @@ msgstr "ఖాతా"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -864,7 +895,7 @@ msgstr "సంకేతపదం"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -936,6 +967,7 @@ 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
@@ -955,40 +987,50 @@ msgstr "మీ నోటీసుని మీరే పునరావృతి
 msgid "Already repeated that notice."
 msgstr "ఇప్పటికే ఆ నోటీసుని పునరావృతించారు."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 #, fuzzy
 msgid "HTTP method not supported."
 msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "స్థితిని తొలగించాం."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "ఆ IDతో ఏ నోటీసు కనబడలేదు."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "ఈ నోటీసుని తొలగించలేము."
 
-#: actions/apistatusesshow.php:243
+#. 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 "నోటీసుని తొలగించు"
@@ -1122,51 +1164,49 @@ msgstr "ఎవరి తపాలాపెట్టెలను ఆ వాడు
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "మీ నోటీసుని మీరే పునరావృతించలేరు."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:406
+#: actions/apitimelineuser.php:409
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "ఆ ఈమెయిలు చిరునామా లేదా వాడుకరిపేరుతో వాడుకరులెవరూ లేరు."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 #, fuzzy
@@ -1178,109 +1218,117 @@ msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
 msgid "User not found."
 msgstr "వాడుకరి దొరకలేదు."
 
-#: actions/atompubfavoritefeed.php:70
-#, fuzzy
-msgid "No such profile"
-msgstr "అటువంటి ఫైలు లేదు."
-
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-#, fuzzy
-msgid "Can't add someone else's subscription"
-msgstr "కొత్త చందాని చేర్చలేకపోయాం."
-
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
-#, fuzzy
-msgid "Can only fave notices."
-msgstr "సైటు గమనికని భద్రపరచు"
-
-#: actions/atompubfavoritefeed.php:256
-#, fuzzy
-msgid "Unknown note."
-msgstr "తెలియని చర్య"
-
-#: actions/atompubfavoritefeed.php:263
-#, fuzzy
-msgid "Already a favorite."
-msgstr "ఇష్టాంశాలకు చేర్చు"
-
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
 #, fuzzy
 msgid "No such profile."
 msgstr "అటువంటి ఫైలు లేదు."
 
+#. 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 గుంపు సభ్యులు"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "%s సభ్యులుగా ఉన్న గుంపులు"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "కొత్త చందాని చేర్చలేకపోయాం."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:241
-msgid "Can only handle Join activities."
-msgstr ""
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
+msgstr "సైటు గమనికని భద్రపరచు"
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "తెలియని చర్య"
 
-#: actions/atompubmembershipfeed.php:263
+#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
+#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "అందరు సభ్యులూ"
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr "ఇష్టాంశాన్ని తొలగించలేకపోయాం."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "అటువంటి గుంపు లేదు"
 
-#: actions/atompubshowmembership.php:90
+#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
+#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member"
 msgstr "అందరు సభ్యులూ"
 
-#: actions/atompubshowmembership.php:115
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "Method not supported"
+msgid "HTTP method not supported"
 msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1288,40 +1336,37 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
-msgid "No such profile id: %d"
+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"
+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"
+msgid "Cannot delete someone else's subscription."
 msgstr "కొత్త చందాని చేర్చలేకపోయాం."
 
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "%sకి చందాచేరిన వ్యక్తులు"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
 msgstr "తెలియని ఫైలు రకం"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1332,10 +1377,11 @@ msgstr "అటువంటి జోడింపు లేదు."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "పేరు"
@@ -1366,8 +1412,9 @@ msgid "You can upload your personal avatar. The maximum file size is %s."
 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 #, fuzzy
 msgid "User without matching profile."
@@ -1375,22 +1422,27 @@ 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "అవతారపు అమరికలు"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "అసలు"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "మునుజూపు"
 
@@ -1425,7 +1477,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr ""
 
@@ -1444,7 +1497,7 @@ msgstr "అవతారపు తాజాకరణ విఫలమైంది.
 msgid "Avatar deleted."
 msgstr "అవతారాన్ని తొలగించాం."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1545,6 +1598,7 @@ msgstr "నిరోధపు సమాచారాన్ని భద్రప
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1554,7 +1608,7 @@ msgstr "నిరోధపు సమాచారాన్ని భద్రప
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1635,23 +1689,6 @@ msgstr "గుర్తుతెలియని చిరునామా రక
 msgid "That address has already been confirmed."
 msgstr "ఆ చిరునామా ఇప్పటికే నిర్ధారితమైంది."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-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
@@ -1713,7 +1750,7 @@ msgid "Account deleted."
 msgstr "అవతారాన్ని తొలగించాం."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "ఖాతాని సృష్టించుకోండి"
@@ -2075,7 +2112,7 @@ msgid "Reset back to default"
 msgstr "అప్రమేయాలని ఉపయోగించు"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2191,14 +2228,16 @@ msgid "Edit %s group"
 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:70 actions/newgroup.php:65
 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 when trying to change group logo settings while not being a group admin.
 #: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "గుంపుని మార్చడానికి మీరు నిర్వాహకులయి ఉండాలి."
 
@@ -2259,8 +2298,8 @@ msgstr "ప్రస్తుత నిర్ధారిత ఈమెయిల
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "తొలగించు"
@@ -2285,15 +2324,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr ""
 
@@ -2304,14 +2343,14 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 #, 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 #, fuzzy
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "%sకి నోటీసులు పంపించడానికి కొత్త ఈమెయిలు చిరునామా"
@@ -2325,7 +2364,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "కొత్తది"
@@ -2402,9 +2441,10 @@ msgstr "ఆ ఈమెయిల్ చిరునామా ఇప్పటేక
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, fuzzy
+msgid "Could not insert confirmation code."
 msgstr "నిర్ధారణ సంకేతాన్ని చేర్చలేకపోయాం."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
@@ -2420,8 +2460,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "రద్దుచేయడానికి వేచివున్న నిర్ధారణలేమీ లేవు."
 
@@ -2432,8 +2472,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+msgid "Could not delete email confirmation."
 msgstr "ఈమెయిల్ నిర్ధారణని తొలగించలేకున్నాం."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
@@ -2452,7 +2493,7 @@ msgstr "అది మీ ఈమెయిలు చిరునామా కా
 msgid "The email address was removed."
 msgstr "ఆ ఈమెయిలు చిరునామాని తొలగించాం."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:554
 #, fuzzy
 msgid "No incoming email address."
 msgstr "ఈమెయిలు చిరునామా లేదు."
@@ -2460,19 +2501,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.
 #: actions/emailsettings.php:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
+#: actions/smssettings.php:564 actions/smssettings.php:587
 #, fuzzy
-msgid "Couldn't update user record."
+msgid "Could not update user record."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 #, fuzzy
 msgid "Incoming email address removed."
 msgstr "ఆ ఈమెయిలు చిరునామాని తొలగించాం."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 #, fuzzy
 msgid "New incoming email address added."
 msgstr "ఈమెయిలు చిరునామా లేదు."
@@ -2567,7 +2608,7 @@ msgstr ""
 msgid "User being listened to does not exist."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "మీరు స్థానిక చందాని ఉపయోగించవచ్చు!"
 
@@ -2698,44 +2739,46 @@ msgid ""
 "palette of your choice."
 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "మీ రూపురేఖలని తాజాకరించలేకపోయాం."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "ఈమెయిలు అభిరుచులు భద్రమయ్యాయి."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "గుంపు చిహ్నం"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr "మీ గుంపుకి మీరు ఒక చిహ్నాన్ని ఎక్కించవచ్చు. ఆ ఫైలు యొక్క గరిష్ఠ పరిమాణం %s."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "ఎగుమతించు"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "కత్తిరించు"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr "చిహ్నంగా ఉండాల్సిన చతురస్త్ర ప్రదేశాన్ని బొమ్మ నుండి ఎంచుకోండి."
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "చిహ్నాన్ని తాజాకరించాం."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "చిహ్నపు తాజాకరణ విఫలమైంది."
 
@@ -2874,14 +2917,14 @@ msgid "Error removing the block."
 msgstr "నిరోధాన్ని తొలగించడంలో పొరపాటు."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2889,23 +2932,23 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM అందుబాటులో లేదు."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "IM చిరునామా"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "ప్రస్తుతం నిర్ధారించిన Jabber/GTalk చిరునామా"
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2919,7 +2962,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2927,65 +2970,65 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "IM అభిరుచులు"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:182
+#: actions/imsettings.php:178
 #, fuzzy
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "ప్రస్తుతం నిర్ధారించిన Jabber/GTalk చిరునామా"
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "అభిరుచులు భద్రమయ్యాయి."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Jabber ID లేదు."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 #, fuzzy
 msgid "Cannot normalize that Jabber ID"
 msgstr "సరైన Jabber ఐడీ కాదు"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "సరైన Jabber ఐడీ కాదు"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "ఈ Jabber ID మీకు ఇప్పటికే ఉంది"
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID ఇప్పటికే వేరొకరికి ఉంది."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2993,29 +3036,29 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "ఆ IM చిరునామా సరైనది కాదు."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:400
+#: actions/imsettings.php:391
 #, fuzzy
-msgid "Couldn't delete IM confirmation."
+msgid "Could not delete IM confirmation."
 msgstr "ఈమెయిల్ నిర్ధారణని తొలగించలేకున్నాం."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "ఇది మీ Jabber ID కాదు"
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "ఆ IM చిరునామాని తొలగించాం."
 
@@ -3234,107 +3277,107 @@ msgid "%1$s left group %2$s"
 msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "లైసెన్సు"
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr ""
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr ""
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "చెల్లని స్వాగత పాఠ్యం. గరిష్ఠ పొడవు 255 అక్షరాలు."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr ""
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr "లైసెన్సు ఎంపిక"
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "అంతరంగికం"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr ""
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr "క్రియేటివ్ కామన్స్"
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr "రకం"
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr ""
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr "లైసెన్సు వివరాలు"
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr "యజమాని"
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr ""
 
-#: actions/licenseadminpanel.php:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr ""
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr ""
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "లైసెన్సు అమరికలను భద్రపరచు"
 
@@ -4116,12 +4159,12 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "ఫ్రొఫైలు అమరికలు"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4129,19 +4172,19 @@ msgstr ""
 "తెలుసుకోగలుగుతారు."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "ప్రొఫైలు సమాచారం"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 #, 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4149,13 +4192,13 @@ msgstr "పూర్తి పేరు"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "హోమ్ పేజీ"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా"
@@ -4163,7 +4206,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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4171,19 +4214,19 @@ msgstr[0] "మీ గురించి మరియు మీ ఆసక్త
 msgstr[1] "మీ గురించి మరియు మీ ఆసక్తుల గురించి %d అక్షరాల్లో చెప్పండి"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "స్వపరిచయం"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4191,50 +4234,50 @@ msgid "Location"
 msgstr "ప్రాంతం"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:157
+#: actions/profilesettings.php:153
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "ట్యాగులు"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "భాష"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "ప్రాథాన్యతా భాష"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "కాలమండలం"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 msgid "What timezone are you normally in?"
 msgstr "మీరు సామాన్యంగా ఉండే కాలమండలం ఏది?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4242,7 +4285,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4250,54 +4293,49 @@ msgstr[0] "స్వపరిచయం చాలా పెద్దగా ఉం
 msgstr[1] "స్వపరిచయం చాలా పెద్దగా ఉంది (%d అక్షరాలు గరిష్ఠం)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "కాలమండలాన్ని ఎంచుకోలేదు."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:276
 #, 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
+#: actions/profilesettings.php:346
 #, fuzzy
-msgid "Couldn't update user for autosubscribe."
+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:409
+#: actions/profilesettings.php:404
 #, fuzzy
-msgid "Couldn't save location prefs."
+msgid "Could not save location prefs."
 msgstr "ట్యాగులని భద్రపరచలేకున్నాం."
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "ప్రొఫైలుని భద్రపరచలేకున్నాం."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
-msgstr "ట్యాగులని భద్రపరచలేకున్నాం."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "అమరికలు భద్రమయ్యాయి."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "ఖాతాని సృష్టించుకోండి"
@@ -4684,7 +4722,7 @@ msgstr ""
 "(మీ ఈమెయిలు చిరునామాని ఎలా నిర్ధారించాలో తెలిపే సూచనలతో ఒక సందేశం మీరు ఈమెయిలు ద్వారా మరి కొద్దిసేపట్లోనే "
 "అందుతుంది.)"
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4695,73 +4733,76 @@ msgstr ""
 "action.register%%). ఒకవేళ మీకు ఇప్పటికే ఏదైనా [పొసగే మైక్రోబ్లాగింగు సైటులో](%%doc.openmublog%"
 "%) ఖాతా ఉంటే, మీ ప్రొఫైలు చిరునామాని క్రింద ఇవ్వండి."
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "సుదూర చందా"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "ఈ వాడుకరికి చందాచేరు"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "వాడుకరి పేరు"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "మీరు అనుసరించాలనుకుంటున్న వాడుకరి యొక్క ముద్దుపేరు"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "ప్రొఫైలు URL"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "చందాచేరు"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "ప్రొపైల్ URL తప్పు (చెడు ఫార్మాట్)"
 
-#: actions/remotesubscribe.php:168
+#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 
-#: actions/remotesubscribe.php:176
-msgid "That’s a local profile! Login to subscribe."
+#: actions/remotesubscribe.php:175
+#, fuzzy
+msgid "That is a local profile! Login to subscribe."
 msgstr "అది స్థానిక ప్రొఫైలు! చందాచేరడానికి ప్రవేశించండి."
 
-#: actions/remotesubscribe.php:183
-msgid "Couldn’t get a request token."
-msgstr ""
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
+msgstr "ట్యాగులని భద్రపరచలేకపోయాం."
 
-#: actions/repeat.php:57
+#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "కేవలం ప్రవేశించిన వాడుకరులు మాత్రమే నోటీసులని పునరావృతించగలరు."
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "గుంపు ఏమీ పేర్కొనలేదు."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "మీ నోటీసుని మీరే పునరావృతించలేరు."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "మీరు ఇప్పటికే ఆ నోటీసుని పునరావృతించారు."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 #, fuzzy
 msgid "Repeated"
 msgstr "సృష్టితం"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "పునరావృతించారు!"
 
@@ -5526,107 +5567,107 @@ msgid "Save site notice"
 msgstr "సైటు గమనికని భద్రపరచు"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "SMS అమరికలు"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "IM అందుబాటులో లేదు."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "SMS చిరునామా"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 #, fuzzy
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "ప్రస్తుత నిర్ధారిత ఈమెయిలు చిరునామా."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:133
+#: actions/smssettings.php:129
 msgid "Awaiting confirmation on this phone number."
 msgstr "ఈ ఫోను నంబరు యొక్క నిర్ధారణకై వేచివుంది."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "నిర్ధారణ సంకేతం"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 msgid "Enter the code you received on your phone."
 msgstr ""
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "నిర్థారించు"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 #, fuzzy
 msgid "SMS phone number"
 msgstr "ఫోను నెంబరు లేదు."
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామ చిహ్నాలు లేదా ఖాళీలు లేకుండా. తప్పనిసరి."
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "SMS అభిరుచులు"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 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:315
+#: actions/smssettings.php:308
 #, fuzzy
 msgid "SMS preferences saved."
 msgstr "అభిరుచులు భద్రమయ్యాయి."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "ఫోను నెంబరు లేదు."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 #, fuzzy
 msgid "No carrier selected."
 msgstr "నోటీసుని తొలగించాం."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 #, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
@@ -5634,39 +5675,39 @@ msgid ""
 msgstr "ఆ నిర్ధారణా సంకేతం మీది కాదు!"
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
+#: actions/smssettings.php:404
 msgid "That is the wrong confirmation number."
 msgstr "అది తప్పుడు నిర్ధారణ సంఖ్య."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 msgid "That is not your phone number."
 msgstr "అది మీ ఫోను నంబర్ కాదు."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
+#: actions/smssettings.php:460
 msgid "The SMS phone number was removed."
 msgstr "ఆ IM చిరునామాని తొలగించాం."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr ""
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5674,7 +5715,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
+#: actions/smssettings.php:535
 #, fuzzy
 msgid "No code entered"
 msgstr "విషయం లేదు!"
@@ -5933,10 +5974,6 @@ msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "ట్యాగులని భద్రపరచలేకపోయాం."
-
 #: actions/tagother.php:236
 #, fuzzy
 msgid "Use this form to add tags to your subscribers or subscriptions."
@@ -6161,19 +6198,19 @@ msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "'%s' కొరకు తప్పుడు బొమ్మ రకం"
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "ఫ్రొఫైలు రూపురేఖలు"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 #, fuzzy
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr "నేపథ్య చిత్రం మరియు రంగుల ఎంపికతో మీ గుంపు ఎలా కనిపించాలో మలచుకోండి."
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr ""
 
@@ -7122,24 +7159,28 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "ట్యాగులని భద్రపరచలేకపోయాం."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
@@ -7757,6 +7798,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 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
+msgid "Couldn't update your design."
+msgstr "మీ రూపురేఖలని తాజాకరించలేకపోయాం."
+
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
 #: lib/designsettings.php:433
 msgid "Design defaults restored."
@@ -9095,3 +9142,28 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "No such profile"
+#~ msgstr "అటువంటి ఫైలు లేదు."
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "%s సభ్యులుగా ఉన్న గుంపులు"
+
+#, fuzzy
+#~ msgid "Method not supported"
+#~ msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "%sకి చందాచేరిన వ్యక్తులు"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "ప్రొఫైలుని భద్రపరచలేకున్నాం."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "ట్యాగులని భద్రపరచలేకున్నాం."
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index cd22b059e6..f16ec3a889 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:24+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:06:01+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 (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -89,9 +89,9 @@ msgstr "Erişim ayarlarını kaydet"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -112,6 +112,8 @@ msgstr "Böyle bir sayfa yok."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -132,8 +134,8 @@ msgstr "Böyle bir sayfa yok."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -144,7 +146,7 @@ msgstr "Böyle bir sayfa yok."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -315,7 +317,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Kullanıcı güncellenemedi."
 
@@ -337,7 +353,8 @@ msgid "User has no profile."
 msgstr "Kullanıcının profili yok."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "Profil kaydedilemedi."
 
@@ -370,8 +387,8 @@ msgstr[0] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "Dizayn ayarlarınız kaydedilemedi."
 
@@ -379,13 +396,18 @@ 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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Tasarımınız güncellenemedi."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+#, fuzzy
+msgctxt "ATOM"
 msgid "Main"
 msgstr "Ana"
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -396,31 +418,38 @@ msgstr "Ana"
 msgid "%s timeline"
 msgstr "%s zaman çizelgesi"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s abonelikleri"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: 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:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Kullanıcıyı engelleme başarısız oldu."
 
@@ -557,7 +586,7 @@ msgstr "Hedef kullanıcı bulunamadı."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Takma ad kullanımda. Başka bir tane deneyin."
@@ -567,7 +596,7 @@ msgstr "Takma ad kullanımda. Başka bir tane deneyin."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Geçersiz bir takma ad."
@@ -579,7 +608,7 @@ msgstr "Geçersiz bir takma ad."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
@@ -589,7 +618,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Tam isim çok uzun (en fazla: 255 karakter)."
@@ -615,7 +644,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Yer bilgisi çok uzun (en fazla 255 karakter)."
@@ -737,7 +766,7 @@ 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:101
+#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Geçersiz istek belirteci veya sağlayıcı."
 
@@ -757,18 +786,19 @@ msgid "Request token already authorized."
 msgstr "İstek belirteci zaten yetkili."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -789,16 +819,17 @@ msgstr "oauth_token_association eklerken veritabanı hatası."
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Beklenmeğen form girdisi."
 
@@ -851,7 +882,7 @@ msgstr "Hesap"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -872,7 +903,7 @@ msgstr "Parola"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -946,6 +977,7 @@ msgstr "Başka bir kullanıcının durum mesajını silemezsiniz."
 
 #. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
 #. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: 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
@@ -965,39 +997,49 @@ msgstr "Kendi durum mesajınızı tekrarlayamazsınız."
 msgid "Already repeated that notice."
 msgstr "Bu durum mesajı zaten tekrarlanmış."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTTP yöntemi desteklenmiyor."
 
-#: actions/apistatusesshow.php:141
+#. 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 "Desteklenmeyen biçim: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:152
+#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Durum silindi."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Bu ID'li bir durum mesajı bulunamadı."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "Bu durum mesajı silinemiyor."
 
-#: actions/apistatusesshow.php:243
+#. 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"
@@ -1128,51 +1170,49 @@ msgstr ""
 msgid "Only accept AtomPub for Atom feeds."
 msgstr ""
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, 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:406
+#: actions/apitimelineuser.php:409
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1184,109 +1224,117 @@ msgstr "UPA metodu yapım aşamasında."
 msgid "User not found."
 msgstr "Onay kodu bulunamadı."
 
-#: actions/atompubfavoritefeed.php:70
-#, fuzzy
-msgid "No such profile"
-msgstr "Böyle bir durum mesajı yok."
-
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-#, fuzzy
-msgid "Can't add someone else's subscription"
-msgstr "Yeni abonelik eklenemedi."
-
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
-#, fuzzy
-msgid "Can only fave notices."
-msgstr "Durum mesajını kaydederken hata oluştu."
-
-#: actions/atompubfavoritefeed.php:256
-#, fuzzy
-msgid "Unknown note."
-msgstr "Böyle bir durum mesajı yok."
-
-#: actions/atompubfavoritefeed.php:263
-#, fuzzy
-msgid "Already a favorite."
-msgstr "Favorilere ekle"
-
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
 #, fuzzy
 msgid "No such profile."
 msgstr "Böyle bir durum mesajı yok."
 
+#. 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"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "%2$s kullanıcısının üye olduğu %1$s grupları."
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "Yeni abonelik eklenemedi."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:241
-msgid "Can only handle Join activities."
-msgstr ""
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
+msgstr "Durum mesajını kaydederken hata oluştu."
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "Yeni grup"
 
-#: actions/atompubmembershipfeed.php:263
+#. 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"
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr "Favori silinemedi."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "Böyle bir kullanıcı yok."
 
-#: actions/atompubshowmembership.php:90
+#. 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"
 
-#: actions/atompubshowmembership.php:115
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "Method not supported"
+msgid "HTTP method not supported"
 msgstr "HTTP yöntemi desteklenmiyor."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1294,40 +1342,37 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
-msgid "No such profile id: %d"
+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"
+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"
+msgid "Cannot delete someone else's subscription."
 msgstr "Yeni abonelik eklenemedi."
 
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "Uzaktan abonelik"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
 msgstr "Kullanıcının profili yok."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1338,10 +1383,11 @@ msgstr "Böyle bir durum mesajı yok."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Takma ad yok"
@@ -1373,8 +1419,9 @@ msgstr ""
 "Kişisel kullanıcı resminizi yükleyebilirsiniz. Maksimum dosya boyutu %s'dir."
 
 #. 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 #, fuzzy
 msgid "User without matching profile."
@@ -1382,22 +1429,27 @@ 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "Profil ayarları"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "Orijinal"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "Önizleme"
 
@@ -1433,7 +1485,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr ""
 
@@ -1452,7 +1505,7 @@ msgstr "Avatar güncellemede hata."
 msgid "Avatar deleted."
 msgstr "Kullanıcı resmi silindi."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1554,6 +1607,7 @@ msgstr "Engelleme bilgisinin kaydedilmesi başarısızlığa uğradı."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1563,7 +1617,7 @@ msgstr "Engelleme bilgisinin kaydedilmesi başarısızlığa uğradı."
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1644,23 +1698,6 @@ msgstr "Tanınmayan adres türü %s."
 msgid "That address has already been confirmed."
 msgstr "O adres daha önce onaylanmış."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-msgstr "Kullanıcı güncellenemedi."
-
 #. 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
@@ -1721,7 +1758,7 @@ msgid "Account deleted."
 msgstr "Kullanıcı resmi silindi."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "Bir hesap oluştur"
@@ -2090,7 +2127,7 @@ msgid "Reset back to default"
 msgstr "Öntanımlıya geri dön"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2204,14 +2241,16 @@ msgid "Edit %s group"
 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:70 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: Client error displayed trying to edit a group while not 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:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "Bir grubu düzenlemek için bir yönetici olmalısınız."
 
@@ -2272,8 +2311,8 @@ msgstr "Mevcut doğrulanmış e-posta adresi."
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Geri al"
@@ -2298,15 +2337,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Gelen e-posta"
 
@@ -2317,13 +2356,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 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 "
@@ -2338,7 +2377,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Yeni"
@@ -2418,9 +2457,10 @@ 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, fuzzy
+msgid "Could not insert confirmation code."
 msgstr "Onay kodu eklenemedi."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
@@ -2436,8 +2476,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "İptal etmek için beklenen onay yok."
 
@@ -2448,8 +2488,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+msgid "Could not delete email confirmation."
 msgstr "Eposta onayı silinemedi."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
@@ -2468,7 +2509,7 @@ msgstr "Bu sizin e-posta adresiniz değil."
 msgid "The email address was removed."
 msgstr "Eposta adresi zaten var."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 actions/smssettings.php:554
 #, fuzzy
 msgid "No incoming email address."
 msgstr "Geçersiz bir eposta adresi."
@@ -2476,17 +2517,18 @@ 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, 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:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 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:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "Yeni gelen e-posta adresi eklendi."
 
@@ -2581,7 +2623,7 @@ msgstr "Bu yanıt beklenmiyordu!"
 msgid "User being listened to does not exist."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Yerel aboneliği kullanabilirsiniz!"
 
@@ -2711,48 +2753,49 @@ msgid ""
 "palette of your choice."
 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-#, fuzzy
-msgid "Couldn't update your design."
-msgstr "Kullanıcı güncellenemedi."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 #, fuzzy
 msgid "Design preferences saved."
 msgstr "Tercihler kaydedildi."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "Grup logosu"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, fuzzy, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
 "Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "Yükle"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "Kırp"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr "Resimden logo olacak bir kare alanı seçin."
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 #, fuzzy
 msgid "Logo updated."
 msgstr "Avatar güncellendi."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 #, fuzzy
 msgid "Failed updating logo."
 msgstr "Avatar güncellemede hata."
@@ -2886,14 +2929,14 @@ msgid "Error removing the block."
 msgstr "Engellemeyi kaldırırken hata."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2903,23 +2946,23 @@ msgstr ""
 "ayarlarinizi aşağıda yapın."
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "Anlık mesajlaşma mevcut değil."
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "Anlık mesajlaşma adresi"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Onaylanmış Jabber/Gtalk adresi."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2933,7 +2976,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2943,66 +2986,66 @@ msgstr ""
 "IM istemcisi veya Gtalk arkadaşlar listenize eklenmiş olmalıdır."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Tercihler kaydedildi."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Durum mesajlarını Jabber/GTalk üzerinden gönder."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk 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:175
+#: actions/imsettings.php:171
 #, fuzzy
 msgid "Send me replies through Jabber/GTalk 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:182
+#: actions/imsettings.php:178
 #, fuzzy
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Onaylanmış Jabber/Gtalk adresi."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Tercihler kaydedildi."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "JabberID yok."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "Jabber işlemlerinde bir hata oluştu."
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "Geçersiz bir Jabber ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "Bu zaten sizin Jabber ID'niz."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID 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.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -3012,29 +3055,29 @@ msgstr ""
 "mesaj yollanabilmesi için onaylamanız gerekmektedir."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 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:400
+#: actions/imsettings.php:391
 #, fuzzy
-msgid "Couldn't delete IM confirmation."
+msgid "Could not delete IM confirmation."
 msgstr "Eposta onayı silinemedi."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Bu sizin Jabber ID'niz değil."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 #, fuzzy
 msgid "The IM address was removed."
 msgstr "Bu adres kaldırılmıştı."
@@ -3227,108 +3270,108 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s'in %2$s'deki durum mesajları "
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Lisans"
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr "Bu StatusNet sitesi için lisans"
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr "Geçersiz lisans seçimi."
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr ""
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 #, fuzzy
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Geçersiz lisans başlığı. En fazla uzunluk 255 karakterdir."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr "Geçersiz lisans bağlantısı."
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr "Geçersiz lisans resmi bağlantısı."
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 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:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr "Lisans resmi boş veya geçerli bir tane olmalıdır."
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr "Lisans seçimi"
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 #, fuzzy
 msgid "Private"
 msgstr "Gizlilik"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr "Tüm Hakları Saklıdır"
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr "Creative Commons"
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr ""
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr "Lisans seç"
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr "Lisans ayrıntıları"
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr "Sahibi"
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 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:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr "Lisans Başlığı"
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr "Lisansın başlığı."
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr "Lisans Bağlantısı"
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr "Lisans hakkında daha fazla bilgi için bağlantı."
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr "Lisans Resminin Bağlantısı"
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr "Lisansla birlikte gösterilecek bir resim için bağlantı."
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Lisans ayarlarını kaydet"
 
@@ -4114,12 +4157,12 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr ""
 
 #. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "Profil ayarları"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
@@ -4127,12 +4170,12 @@ msgstr ""
 "hakkınızda daha fazla bilgi sahibi olur."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "Profil ayarları"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4141,7 +4184,7 @@ msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4149,13 +4192,13 @@ msgstr "Tam İsim"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Başlangıç Sayfası"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: actions/profilesettings.php:121
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
@@ -4164,27 +4207,27 @@ 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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, 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:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 #, 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "Hakkında"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4192,24 +4235,24 @@ msgid "Location"
 msgstr "Yer"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 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:157
+#: actions/profilesettings.php:153
 msgid "Share my current location when posting notices"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "Etiketler"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4217,27 +4260,27 @@ msgstr ""
 "boşlukla ayırabilirsiniz"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "Dil"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "Tercih edilen dil"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "Zaman dilimi"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 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:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "Bana abone olan herkese abone yap (insan olmayanlar için en iyisi)"
@@ -4245,62 +4288,56 @@ 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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, 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:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Zaman dilimi seçilmedi."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:276
 #, 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
+#: actions/profilesettings.php:346
 #, fuzzy
-msgid "Couldn't update user for autosubscribe."
+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:409
+#: actions/profilesettings.php:404
 #, fuzzy
-msgid "Couldn't save location prefs."
-msgstr "Profil kaydedilemedi."
-
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
+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:431
-#, fuzzy
-msgid "Couldn't save tags."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Ayarlar kaydedildi."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Bir hesap oluştur"
@@ -4678,7 +4715,7 @@ msgid ""
 "to confirm your email address.)"
 msgstr ""
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4686,77 +4723,78 @@ msgid ""
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Uzaktan abonelik"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 #, fuzzy
 msgid "Subscribe to a remote user"
 msgstr "Takip talebine izin verildi"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Kullanıcı takma adı"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "Takip etmek istediğiniz kullanıcının takma adı"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Profil Adresi"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "Abone ol"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr ""
 
-#: actions/remotesubscribe.php:168
+#: 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:176
-msgid "That’s a local profile! Login to subscribe."
+#: actions/remotesubscribe.php:175
+msgid "That is a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/remotesubscribe.php:183
-msgid "Couldn’t get a request token."
-msgstr ""
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
+msgstr "Yeni abonelik eklenemedi."
 
-#: actions/repeat.php:57
+#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr ""
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 #, fuzzy
 msgid "No notice specified."
 msgstr "Yeni durum mesajı"
 
-#: actions/repeat.php:76
+#: actions/repeat.php:75
 #, fuzzy
-msgid "You can't repeat your own notice."
+msgid "You cannot repeat your own notice."
 msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 #, fuzzy
 msgid "You already repeated that notice."
 msgstr "Zaten giriş yapmış durumdasıznız!"
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Sıfırla"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 #, fuzzy
 msgid "Repeated!"
 msgstr "Yarat"
@@ -5499,64 +5537,64 @@ msgid "Save site notice"
 msgstr "Yeni durum mesajı"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "Profil ayarları"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 #, 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:111
+#: actions/smssettings.php:107
 #, fuzzy
 msgid "SMS address"
 msgstr "IM adresi"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:133
+#: actions/smssettings.php:129
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:142
+#: actions/smssettings.php:138
 #, fuzzy
 msgid "Confirmation code"
 msgstr "Onay kodu yok."
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 msgid "Enter the code you received on your phone."
 msgstr ""
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
+#: actions/smssettings.php:144
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Onayla"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr ""
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 #, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
@@ -5564,48 +5602,48 @@ msgstr ""
 "verilmez"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "Tercihler kaydedildi."
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 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:315
+#: actions/smssettings.php:308
 #, fuzzy
 msgid "SMS preferences saved."
 msgstr "Tercihler kaydedildi."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 #, 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:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 #, 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:356
+#: actions/smssettings.php:348
 #, 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:384
+#: actions/smssettings.php:376
 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."
@@ -5614,42 +5652,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:413
+#: actions/smssettings.php:404
 #, 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:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 #, 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:470
+#: actions/smssettings.php:460
 #, 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:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr ""
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5657,7 +5695,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
+#: actions/smssettings.php:535
 #, fuzzy
 msgid "No code entered"
 msgstr "İçerik yok!"
@@ -5913,10 +5951,6 @@ msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "Profil kaydedilemedi."
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
@@ -6150,19 +6184,19 @@ 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:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 #, fuzzy
 msgid "Profile design"
 msgstr "Profil ayarları"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr ""
 
@@ -7114,23 +7148,27 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 #, fuzzy
 msgid "Could not issue access token."
 msgstr "Yeni abonelik eklenemedi."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr ""
 
@@ -7746,6 +7784,13 @@ msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Sıfırla"
 
+#. 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
+#, 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
 msgid "Design defaults restored."
@@ -9015,3 +9060,29 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "No such profile"
+#~ msgstr "Böyle bir durum mesajı yok."
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "%2$s kullanıcısının üye olduğu %1$s grupları."
+
+#, fuzzy
+#~ msgid "Method not supported"
+#~ msgstr "HTTP yöntemi desteklenmiyor."
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "Uzaktan abonelik"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "Kullanıcı güncellenemedi."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "Profil kaydedilemedi."
+
+#, fuzzy
+#~ msgid "Couldn't save tags."
+#~ msgstr "Profil kaydedilemedi."
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 7837653ccc..265ccfc77b 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-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:25+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:06: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-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -92,9 +92,9 @@ msgstr "Зберегти параметри доступу"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -115,6 +115,8 @@ msgstr "Немає такої сторінки."
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -135,8 +137,8 @@ msgstr "Немає такої сторінки."
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -147,7 +149,7 @@ msgstr "Немає такої сторінки."
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -314,7 +316,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Не вдалося оновити користувача."
 
@@ -336,7 +352,8 @@ msgid "User has no profile."
 msgstr "Користувач не має профілю."
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "Не вдалося зберегти профіль."
 
@@ -375,8 +392,8 @@ msgstr[2] ""
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "Не маю можливості зберегти налаштування дизайну."
 
@@ -384,13 +401,18 @@ msgstr "Не маю можливості зберегти налаштуванн
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
+#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Не вдалося оновити ваш дизайн."
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+#, fuzzy
+msgctxt "ATOM"
 msgid "Main"
 msgstr "Головна"
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -401,31 +423,38 @@ msgstr "Головна"
 msgid "%s timeline"
 msgstr "%s стрічка"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "Підписки %s"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Ви не можете блокувати самого себе!"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "Спроба заблокувати користувача невдала."
 
@@ -567,7 +596,7 @@ msgstr "Не вдалося знайти цільового користувач
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Це ім’я вже використовується. Спробуйте інше."
@@ -577,7 +606,7 @@ msgstr "Це ім’я вже використовується. Спробуйт
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Це недійсне ім’я користувача."
@@ -589,7 +618,7 @@ msgstr "Це недійсне ім’я користувача."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Веб-сторінка має недійсну URL-адресу."
@@ -599,7 +628,7 @@ msgstr "Веб-сторінка має недійсну URL-адресу."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Повне ім’я надто довге (не більше 255 символів)."
@@ -627,7 +656,7 @@ msgstr[2] "Опис надто довгий (максимум — %d знакі
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Розташування надто довге (не більше 255 символів)."
@@ -751,7 +780,7 @@ msgid "Upload failed."
 msgstr "Збій при завантаженні."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:101
+#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "Неправильний запит токену або його підтвердження."
 
@@ -771,18 +800,19 @@ msgid "Request token already authorized."
 msgstr "Токен запиту вже авторизовано."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -804,16 +834,17 @@ msgstr "Помилка бази даних при додаванні парам
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Несподіване представлення форми."
 
@@ -865,7 +896,7 @@ msgstr "Акаунт"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -886,7 +917,7 @@ msgstr "Пароль"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -960,6 +991,7 @@ 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
@@ -979,39 +1011,49 @@ msgstr "Не можна повторювати власні дописи."
 msgid "Already repeated that notice."
 msgstr "Цей допис вже повторено."
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTTP спосіб не підтримується."
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "Статус видалено."
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "Не знайдено жодних статусів з таким ID."
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "Не можна видалити цей допис."
 
-#: actions/apistatusesshow.php:243
+#. 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"
@@ -1150,51 +1192,49 @@ msgstr "Користувач може робити доповнення тіль
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Приймати лише AtomPub для веб-стрічок формату Atom."
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr "Запис Atom не повинен бути порожнім."
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr "Запис Atom має бути у правильно сформованому XML."
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr "Неможливо опрацювати дії об’єкта типу «%s»."
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, php-format
 msgid "No content for notice %d."
 msgstr "Допис %d не має змісту."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:406
+#: actions/apitimelineuser.php:409
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Повідомлення з URI \"%s\" вже існує."
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr "Запис AtomPub з невідомим цільовим URI %s"
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1205,96 +1245,108 @@ msgstr "API метод наразі знаходиться у розробці."
 msgid "User not found."
 msgstr "Сторінку не знайдено."
 
-#: actions/atompubfavoritefeed.php:70
-msgid "No such profile"
-msgstr "Немає такого профілю"
-
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr "Дописи, що їх %s позначив як обрані на %s"
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
-msgid "Can't add someone else's subscription"
-msgstr "Не вдається додати чиюсь підписку"
-
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-msgstr "Можливою є обробка лише стрічки обраних дописів."
-
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
-msgid "Can only fave notices."
-msgstr "Можна лише додавати дописи до обраних."
-
-#: actions/atompubfavoritefeed.php:256
-msgid "Unknown note."
-msgstr "Невідома примітка"
-
-#: actions/atompubfavoritefeed.php:263
-msgid "Already a favorite."
-msgstr "Вже у списку обраних."
-
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
 msgid "No such profile."
 msgstr "Немає такого профілю."
 
+#. 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
+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"
 
-#: actions/atompubmembershipfeed.php:147
-#, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "Спільноти, до яких залучений %s на %s"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
+#. 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:241
-msgid "Can only handle Join activities."
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
 msgstr "Можливою є обробка активності лише щодо приєднання нових членів."
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 msgid "Unknown group."
 msgstr "Невідома спільнота."
 
-#: actions/atompubmembershipfeed.php:263
+#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
+#: actions/atompubmembershipfeed.php:267
 msgid "Already a member."
 msgstr "Вже є учасником."
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr "Заблоковано адміністратором."
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+#, fuzzy
+msgid "Cannot delete someone else's favorite"
 msgstr "Не вдається видалити допис з чийогось списку обраних."
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "Такої спільноти не існує."
 
-#: actions/atompubshowmembership.php:90
+#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
+#: actions/atompubshowmembership.php:91
 msgid "Not a member"
 msgstr "Не є учасником"
 
-#: actions/atompubshowmembership.php:115
-msgid "Method not supported"
-msgstr "Метод не підтримується"
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
+#, fuzzy
+msgid "HTTP method not supported"
+msgstr "HTTP спосіб не підтримується."
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1302,41 +1354,38 @@ msgstr "Неможливо позбавити когось членства"
 #: actions/atompubshowsubscription.php:72
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
-#, php-format
-msgid "No such profile id: %d"
+#, fuzzy, 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
 #, fuzzy, php-format
-msgid "Profile %1$d not subscribed to profile %2$d"
-msgstr "Профіль %d не є підписаним до профілю %d"
+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
 #, fuzzy
-msgid "Cannot delete someone else's subscription"
+msgid "Cannot delete someone else's subscription."
 msgstr "Не вдається видалити чиюсь підписку"
 
-#: actions/atompubsubscriptionfeed.php:150
-#, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "Люди, до яких підписався %s на %s"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr "Можливою є обробка активності лише щодо підписок."
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr "Можливе лише слідування людьми."
 
-#: actions/atompubsubscriptionfeed.php:262
-#, php-format
-msgid "Unknown profile %s"
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
+#, fuzzy, php-format
+msgid "Unknown profile %s."
 msgstr "Невідомий профіль %s"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1347,10 +1396,11 @@ msgstr "Такого вкладення немає."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Немає імені."
@@ -1381,30 +1431,36 @@ msgid "You can upload your personal avatar. The maximum file size is %s."
 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "Налаштування аватари"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "Оригінал"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "Перегляд"
 
@@ -1439,7 +1495,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "Дані вашого файлу загублено."
 
@@ -1458,18 +1515,19 @@ msgstr "Оновлення аватари невдале."
 msgid "Avatar deleted."
 msgstr "Аватару видалено."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
-msgstr ""
+msgstr "Резерв. копія"
 
 #: actions/backupaccount.php:80
-#, fuzzy
 msgid "Only logged-in users can backup their account."
-msgstr "Лише користувачі, що знаходяться у системі, можуть повторювати дописи."
+msgstr ""
+"Лише користувачі, що знаходяться у системі, можуть зробити резервну копію "
+"свого акаунту."
 
 #: actions/backupaccount.php:84
 msgid "You may not backup your account."
-msgstr ""
+msgstr "Ви не можете створити резервну копію свого акаунту."
 
 #: actions/backupaccount.php:232
 msgid ""
@@ -1479,16 +1537,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>. Дана можливість є "
+"експериментальною і результат копіювання не буде повним; особисті дані, як "
+"то електронна адреса або ІМ-адреса не будуть долучені до резервного файлу. "
+"До того ж, прикріплені до ваших повідомлень файли і прямі повідомлення також "
+"не долучаються до резервного файлу."
 
 #: actions/backupaccount.php:255
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
-msgstr "Фон"
+msgstr "Резерв. копія"
 
 #: actions/backupaccount.php:258
 msgid "Backup your account"
-msgstr ""
+msgstr "Резервне копіювання вашого акаунту"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 #: actions/block.php:68
@@ -1560,6 +1623,7 @@ msgstr "Збереження інформації про блокування з
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1569,7 +1633,7 @@ msgstr "Збереження інформації про блокування з
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1649,23 +1713,6 @@ msgstr "Невизначений тип адреси %s."
 msgid "That address has already been confirmed."
 msgstr "Цю адресу вже підтверджено."
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-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
@@ -1697,39 +1744,36 @@ 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 "Лише користувачі, що знаходяться у системі, можуть повторювати дописи."
+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 "Ви не можете видаляти користувачів."
+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 ""
+msgstr "Ви мусите написати «%s» у даному віконці."
 
 #. 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.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
-#, fuzzy
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 msgid "Delete account"
-msgstr "Створити новий акаунт"
+msgstr "Видалити акаунт"
 
 #. TRANS: Form text for user deletion form.
 #: actions/deleteaccount.php:279
@@ -1737,6 +1781,8 @@ msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
 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.
@@ -1746,6 +1792,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.
 #: actions/deleteaccount.php:300 actions/passwordsettings.php:112
@@ -1756,15 +1804,14 @@ 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
@@ -1831,7 +1878,7 @@ 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 "Вам не дозволено видаляти цю спільноту спільноту."
+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.
@@ -2086,7 +2133,7 @@ msgid "Reset back to default"
 msgstr "Повернутись до початкових налаштувань"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2198,14 +2245,16 @@ msgid "Edit %s group"
 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:70 actions/newgroup.php:65
 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 when trying to change group logo settings while not being a group admin.
 #: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr ""
 "Ви маєте бути наділені правами адміністратора, аби відредагувати властивості "
@@ -2268,8 +2317,8 @@ msgstr "Поточна підтверджена поштова адреса."
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Видалити"
@@ -2294,15 +2343,15 @@ msgstr "Електронна адреса, на зразок «UserName@example.
 #. 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Вхідна пошта"
 
@@ -2313,13 +2362,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Створити нову адресу для надсилання повідомлень; видалити стару."
 
@@ -2334,7 +2383,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Нове"
@@ -2408,9 +2457,10 @@ msgstr "Ця електронна адреса належить іншому к
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, fuzzy
+msgid "Could not insert confirmation code."
 msgstr "Не вдалося додати код підтвердження."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
@@ -2426,8 +2476,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Не очікується підтвердження для скасування."
 
@@ -2438,8 +2488,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+msgid "Could not delete email confirmation."
 msgstr "Не вдалося видалити підтвердження поштової адреси."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
@@ -2458,24 +2509,25 @@ msgstr "Це не є вашою адресою."
 msgid "The email address was removed."
 msgstr "Адреса була видалена."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, fuzzy
+msgid "Could not update user record."
 msgstr "Не вдалося оновити запис користувача."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 msgid "Incoming email address removed."
 msgstr "Адресу вхідної пошти видалено."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "Нову адресу для вхідних повідомлень додано."
 
@@ -2572,7 +2624,7 @@ msgstr "Ця відповідь не очікується!"
 msgid "User being listened to does not exist."
 msgstr "Користувача, який слідкував за вашими повідомленнями, більше не існує."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "Ви можете користуватись локальними підписками!"
 
@@ -2703,22 +2755,19 @@ 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "Не вдалося оновити дизайн."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "Преференції дизайну збережно."
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "Логотип спільноти"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2726,23 +2775,28 @@ msgstr ""
 "Ви маєте можливість завантажити логотип для вашої спільноти. Максимальний "
 "розмір файлу становить %s."
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "Завантажити"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "Втяти"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr "Оберіть квадратну ділянку зображення, яка й буде логотипом спільноти."
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "Логотип оновлено."
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "Оновлення логотипу завершилось невдачею."
 
@@ -2884,14 +2938,14 @@ msgid "Error removing the block."
 msgstr "Помилка при розблокуванні."
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2901,23 +2955,23 @@ msgstr ""
 "повідомлень](%%doc.im%%). Вкажить свою адресу і налаштуйте опції нижче."
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "ІМ недоступний"
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "ІМ-адреса"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Поточна підтверджена адреса Jabber/GTalk."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2932,7 +2986,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2943,65 +2997,65 @@ msgstr ""
 "GTalk."
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Преференції ІМ"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Повідомляти мене через Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Надсилати дописи на сайт, коли мій статус Jabber/GTalk змінюється."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Надсилати також мені відповіді через Jabber/GTalk від людей, до яких я не "
 "підписаний."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Позначати міткою MicroID мою адресу Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Преференції збережно."
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Немає Jabber ID."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "Не можна полагодити цей Jabber ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "Це недійсний Jabber ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "Це і є ваш Jabber ID."
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID вже належить іншому користувачу."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -3011,28 +3065,29 @@ msgstr ""
 "повинні затвердити %s для відправлення вам повідомлень."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "Це помилкова адреса IM."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:400
-msgid "Couldn't delete IM confirmation."
+#: actions/imsettings.php:391
+#, fuzzy
+msgid "Could not delete IM confirmation."
 msgstr "Не вдалося видалити підтвердження ІМ."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Це не ваш Jabber ID."
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "Адреса ІМ була видалена."
 
@@ -3263,20 +3318,20 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s залишив спільноту %2$s"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "Ліцензія"
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr "Ліцензія для цього сайту StatusNet"
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr "Невірний вибір ліцензії."
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
@@ -3284,87 +3339,87 @@ msgstr ""
 "Ви повинні зазначити власника змісту повідомлень, якщо збираєтесь "
 "використовувати варіант «Всі права захищені»."
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "Помилкова назва ліцензії. Максимальна довжина — 255 символів."
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr "Помилкова URL-адреса ліцензії."
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr "Помилкова URL-адреса логотипу ліцензії."
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr "Адреса ліцензії має бути порожньою або містити коректний URL."
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr "Адреса логотипу ліцензії має бути порожньою або містити коректний URL."
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr "Вибір ліцензії"
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "Приватно"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr "Всі права захищені."
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr "Кріейтів Комонс"
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr "Тип"
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr "Оберіть ліцензію"
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr "Подробиці ліцензії"
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr "Власник"
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr "Ім’я власника усього змісту на сайті (якщо він є)."
 
-#: actions/licenseadminpanel.php:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr "Назва ліцензії"
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr "Назва ліцензії."
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr "URL-адреса ліцензії"
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr "URL-адреса додаткової інформації щодо ліцензії."
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr "URL-адреса логотипу ліцензії"
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr "URL-адреса зображення (логотипу) для показу поруч з ліцензією"
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Зберегти налаштування ліцензії"
 
@@ -3477,9 +3532,8 @@ 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 "Вам не дозволено видаляти цю спільноту спільноту."
+msgstr "Вам не дозволено створювати нові спільноті на цьому сайті."
 
 #. TRANS: Form instructions for group create form.
 #: actions/newgroup.php:117
@@ -4141,30 +4195,30 @@ 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:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "Налаштування профілю"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
 "Ви можете заповнити свій особистий профіль і люди знатимуть про вас більше."
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "Інформація профілю"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4172,20 +4226,20 @@ msgstr "Повне ім’я"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Веб-сторінка"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: 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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4194,19 +4248,19 @@ msgstr[1] "Опишіть себе та свої інтереси інтерес
 msgstr[2] "Опишіть себе та свої інтереси інтереси вкладаючись у %d символів"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "Про себе"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4214,24 +4268,24 @@ msgid "Location"
 msgstr "Розташування"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Де ви живете, на кшталт «Місто, область (регіон), країна»"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:157
+#: actions/profilesettings.php:153
 msgid "Share my current location when posting notices"
 msgstr "Показувати моє місцезнаходження при надсиланні дописів"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "Теґи"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr ""
@@ -4239,27 +4293,27 @@ msgstr ""
 "або пробілом"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "Мова"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "Мова, котрій надаєте перевагу"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "Часовий пояс"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 msgid "What timezone are you normally in?"
 msgstr "За яким часовим поясом ви живете?"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
@@ -4268,7 +4322,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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4277,54 +4331,50 @@ msgstr[1] "Біографія надто довга (не більше %d сим
 msgstr[2] "Біографія надто довга (не більше %d символів)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Часовий пояс не обрано."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:276
 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, 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:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, fuzzy
+msgid "Could not save location prefs."
 msgstr "Не вдалося зберегти налаштування розташування."
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "Не вдалося зберегти профіль."
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Налаштування збережено."
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
-#, fuzzy
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 msgid "Restore account"
-msgstr "Створити новий акаунт"
+msgstr "Відновити акаунт"
 
 #: actions/public.php:83
 #, php-format
@@ -4715,7 +4765,7 @@ msgstr ""
 "(Ви маєте негайно отримати листа електронною поштою, в якому знаходитимуться "
 "інструкції щодо підтвердження вашої електронної адреси.)"
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4726,73 +4776,76 @@ msgstr ""
 "action.register%%) новий  акаунт. Якщо ви вже маєте акаунт на [сумісному "
 "сайті](%%doc.openmublog%%), введіть URL-адресу вашого профілю нижче."
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "Віддалена підписка"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "Підписатись до віддаленого користувача"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "Ім’я користувача"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "Ім’я користувача, дописи якого ви хотіли б читати."
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "URL-адреса профілю"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL-адреса вашого профілю на іншому сумісному сервісі"
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "Підписатись"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "Недійсна URL-адреса профілю (неправильний формат)"
 
-#: actions/remotesubscribe.php:168
+#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
 "Неправильна URL-адреса профілю (немає документа YADIS, або помилковий XRDS)."
 
-#: actions/remotesubscribe.php:176
-msgid "That’s a local profile! Login to subscribe."
+#: actions/remotesubscribe.php:175
+#, fuzzy
+msgid "That is a local profile! Login to subscribe."
 msgstr "Це локальний профіль! Увійдіть аби підписатись."
 
-#: actions/remotesubscribe.php:183
-msgid "Couldn’t get a request token."
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
 msgstr "Не вдалося отримати токен запиту."
 
-#: actions/repeat.php:57
+#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "Лише користувачі, що знаходяться у системі, можуть повторювати дописи."
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "Зазначеного допису немає."
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "Ви не можете повторювати власні дописи."
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "Ви вже повторили цей допис."
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "Повторено"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "Повторено!"
 
@@ -4856,22 +4909,20 @@ 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 "Лише користувачі, що знаходяться у системі, можуть повторювати дописи."
+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 "Поки що ви не зареєстрували жодних додатків."
+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 "Завантажити файл"
+msgstr "Немає завантажених файлів"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
 #: actions/restoreaccount.php:129 lib/mediafile.php:194
@@ -4914,9 +4965,8 @@ msgstr "Система відповіла помилкою при заванта
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
 #: actions/restoreaccount.php:207
-#, fuzzy
 msgid "Not an Atom feed."
-msgstr "Не є учасником"
+msgstr "Ця стрічка не у форматі Atom."
 
 #. TRANS: Success message when a feed has been restored.
 #: actions/restoreaccount.php:241
@@ -4924,11 +4974,14 @@ 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
@@ -4936,10 +4989,11 @@ msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
+"Ви можете завантажити резервну копію у форматі <a href=\"http://"
+"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
-#, fuzzy
 msgid "Upload the file"
 msgstr "Завантажити файл"
 
@@ -5564,70 +5618,70 @@ msgid "Save site notice"
 msgstr "Зберегти повідомлення сайту"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "Налаштування СМС"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "СМС недоступно."
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "SMS-адреса"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Поточний підтверджений телефонний номер."
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:133
+#: actions/smssettings.php:129
 msgid "Awaiting confirmation on this phone number."
 msgstr "Очікування підтвердження телефонного номера."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "Код підтвердження"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 msgid "Enter the code you received on your phone."
 msgstr "Введіть код, який ви отримали телефоном."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "Підтвердити"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "Телефонний номер"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Телефонний номер та регіональний код, ніякої пунктуації чи інтервалів"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "Преференції SMS"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -5636,32 +5690,32 @@ msgstr ""
 "витрати від мого мобільного оператора."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
 msgid "SMS preferences saved."
 msgstr "Преференції SMS збережено."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "Немає телефонного номера."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr "Оператора не обрано."
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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."
@@ -5670,39 +5724,39 @@ msgstr ""
 "Перевірте вхідні повідомлення, там має бути код та подальші інструкції."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
+#: actions/smssettings.php:404
 msgid "That is the wrong confirmation number."
 msgstr "Це помилковий код підтвердження."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 msgid "That is not your phone number."
 msgstr "Це не ваш телефонний номер."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
+#: actions/smssettings.php:460
 msgid "The SMS phone number was removed."
 msgstr "Телефонний номер для SMS був видалений."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "Мобільний оператор"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5713,7 +5767,7 @@ msgstr ""
 "на %s і ми внесемо його до списку."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "Код не введено"
 
@@ -5976,10 +6030,6 @@ msgstr ""
 "Ви маєте можливість позначати теґами тих, до кого ви підписані, а також тих, "
 "хто є підписаним до вас."
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "Не вдалося зберегти теґи."
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "Скористайтесь цією формою, щоб додати теґи своїм підпискам та читачам."
@@ -6209,12 +6259,12 @@ msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Неправильний тип зображення для URL-адреси аватари «%s»."
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "Дизайн профілю"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
@@ -6222,7 +6272,7 @@ msgstr ""
 "Налаштуйте вигляд сторінки свого профілю, використовуючи фонове зображення і "
 "кольори на свій смак."
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr "Поласуйте бутербродом!"
 
@@ -6991,54 +7041,52 @@ 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 "Невідома мова «%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 ""
+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 "Зазначте ім’я користувача, до якого бажаєте підписатись."
+msgstr "Примусова підписка віддалених користувачів є неможливою."
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
 #: lib/activityimporter.php:132
-#, fuzzy
 msgid "Unknown profile."
-msgstr "Невідомий профіль %s"
+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 ""
+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 ""
+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 "Ви вже стоїте у цій спільноти."
+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 "Допис %d не має змісту."
+msgstr "Допис %s не має змісту."
 
 #. TRANS: Client exception thrown when there is no source attribute.
 #: lib/activityutils.php:200
@@ -7189,22 +7237,26 @@ msgid ""
 msgstr "Не вдалося знайти профіль і додаток, пов’язаний з токеном запиту."
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 msgid "Could not issue access token."
 msgstr "Не вдалося видати токен доступу."
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "Не вдалося видалити скасований токен."
 
@@ -7323,15 +7375,13 @@ msgid "Revoke"
 msgstr "Відкликати"
 
 #: lib/atom10feed.php:113
-#, fuzzy
 msgid "Author element must contain a name element."
-msgstr "елемент author повинен містити елемент name."
+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 "Не видаляти цю спільноту"
+msgstr "Не видаляти цей метод!"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7861,6 +7911,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 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
+msgid "Couldn't update your design."
+msgstr "Не вдалося оновити дизайн."
+
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
 #: lib/designsettings.php:433
 msgid "Design defaults restored."
@@ -7891,17 +7947,16 @@ msgid "FOAF"
 msgstr "FOAF"
 
 #: lib/feedimporter.php:75
-#, fuzzy
 msgid "Not an atom feed."
-msgstr "Не є учасником"
+msgstr "Не є стрічкою у форматі Atom."
 
 #: lib/feedimporter.php:82
 msgid "No author in the feed."
-msgstr ""
+msgstr "Немає автора в цій стрічці."
 
 #: lib/feedimporter.php:89
 msgid "Can't import without a user."
-msgstr ""
+msgstr "Неможливо імпортувати без користувача."
 
 #. TRANS: Header for feed links (h2).
 #: lib/feedlist.php:66
@@ -9238,3 +9293,30 @@ msgstr "Неправильний XML, корінь XRD відсутній."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Отримання резервної копії файлу «%s»."
+
+#~ msgid "AtomPub post with unknown attention URI %s"
+#~ msgstr "Запис AtomPub з невідомим цільовим URI %s"
+
+#~ msgid "No such profile"
+#~ msgstr "Немає такого профілю"
+
+#~ msgid "Notices %s has favorited to on %s"
+#~ msgstr "Дописи, що їх %s позначив як обрані на %s"
+
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "Спільноти, до яких залучений %s на %s"
+
+#~ msgid "Method not supported"
+#~ msgstr "Метод не підтримується"
+
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "Люди, до яких підписався %s на %s"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "Не вдалося оновити користувача."
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "Не вдалося зберегти профіль."
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "Не вдалося зберегти теґи."
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 8f0025cdc3..236a3f6708 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -14,18 +14,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:27+0000\n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:06:09+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 (r80343); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-14 13:22:39+0000\n"
+"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -92,9 +92,9 @@ msgstr "保存访问设置"
 #. TRANS: Button label in the "Edit application" form.
 #. TRANS: Button text on profile design page to save settings.
 #: actions/accessadminpanel.php:193 actions/emailsettings.php:254
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
+#: actions/imsettings.php:183 actions/othersettings.php:134
+#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
+#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
 #: actions/subscriptions.php:262 actions/useradminpanel.php:298
 #: lib/applicationeditform.php:355 lib/designsettings.php:270
 #: lib/groupeditform.php:207
@@ -115,6 +115,8 @@ msgstr "没有这个页面。"
 #. TRANS: Client error displayed if a user could not be found.
 #. TRANS: Client error when user not found updating a profile background image.
 #. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
 #. TRANS: Client error when user not found for an API action to remove a block for a user.
 #. TRANS: Client error given when a user was not found (404).
 #. TRANS: Client error when user not found for an API direct message action.
@@ -135,8 +137,8 @@ msgstr "没有这个页面。"
 #: actions/apiaccountupdatedeliverydevice.php:110
 #: actions/apiaccountupdateprofile.php:103
 #: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: 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
@@ -147,7 +149,7 @@ msgstr "没有这个页面。"
 #: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
 #: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
 #: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
 #: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
 #: actions/showfavorites.php:105 actions/userbyid.php:74
 #: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
@@ -312,7 +314,21 @@ 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 IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. TRANS: Server error thrown when user profile settings could not be updated.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #: actions/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:359
+#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:184
+#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "无法更新用户。"
 
@@ -334,7 +350,8 @@ msgid "User has no profile."
 msgstr "用户没有个人信息。"
 
 #. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:417
 msgid "Could not save profile."
 msgstr "无法保存个人信息。"
 
@@ -365,8 +382,8 @@ msgstr[0] "服务器当前的设置无法处理这么多的 POST 数据（%s byt
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
 msgstr "无法保存你的外观设置。"
 
@@ -374,13 +391,18 @@ msgstr "无法保存你的外观设置。"
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
+#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "无法更新你的外观。"
 
-#: actions/apiatomservice.php:86
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+#, fuzzy
+msgctxt "ATOM"
 msgid "Main"
 msgstr "首页"
 
+#. TRANS: Title for Atom feed. %s is a user nickname.
 #. 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.
@@ -391,31 +413,38 @@ msgstr "首页"
 msgid "%s timeline"
 msgstr "%s的时间线"
 
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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:103 actions/atompubsubscriptionfeed.php:147
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s 关注的用户"
 
-#: actions/apiatomservice.php:113 actions/atompubfavoritefeed.php:142
+#. 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 收藏夹"
 
-#: actions/apiatomservice.php:123
+#. 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:104
+#: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "你不能屏蔽自己！"
 
 #. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
 msgid "Block user failed."
 msgstr "屏蔽用户失败。"
 
@@ -550,7 +579,7 @@ msgstr "无法找到目标用户。"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:277
+#: actions/newgroup.php:136 actions/profilesettings.php:272
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "昵称已被使用，换一个吧。"
@@ -560,7 +589,7 @@ msgstr "昵称已被使用，换一个吧。"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:247
+#: actions/newgroup.php:140 actions/profilesettings.php:242
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "不是有效的昵称。"
@@ -572,7 +601,7 @@ msgstr "不是有效的昵称。"
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:252
+#: actions/newgroup.php:147 actions/profilesettings.php:247
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "主页的URL不正确。"
@@ -582,7 +611,7 @@ msgstr "主页的URL不正确。"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:256
+#: actions/newgroup.php:151 actions/profilesettings.php:251
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "全名过长(不能超过 255 个字符)。"
@@ -608,7 +637,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:269
+#: actions/newgroup.php:163 actions/profilesettings.php:264
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "位置过长(不能超过255个字符)。"
@@ -730,7 +759,7 @@ msgid "Upload failed."
 msgstr "上传失败"
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:101
+#: actions/apioauthaccesstoken.php:102
 msgid "Invalid request token or verifier."
 msgstr "无效的请求 token 或 verifier。"
 
@@ -750,18 +779,19 @@ msgid "Request token already authorized."
 msgstr "请求 token 已被授权了。"
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
 #: actions/deletenotice.php:177 actions/disfavor.php:74
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
+#: actions/groupblock.php:66 actions/grouplogo.php:324
+#: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:221 actions/recoverpassword.php:350
-#: actions/register.php:172 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:40
+#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -782,16 +812,17 @@ msgstr "插入 oauth_token_association 时数据库出错。"
 #. TRANS: Unexpected validation error on avatar upload form.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:104 actions/editapplication.php:144
-#: actions/emailsettings.php:316 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
+#: actions/emailsettings.php:316 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:125
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "未预料的表单提交。"
 
@@ -840,7 +871,7 @@ msgstr "帐号"
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group nickname (dt). Text hidden by default.
 #: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
+#: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:134
@@ -861,7 +892,7 @@ msgstr "密码"
 #. 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:128
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
@@ -931,6 +962,7 @@ 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
@@ -950,39 +982,49 @@ msgstr "不能转发你自己的消息。"
 msgid "Already repeated that notice."
 msgstr "已转发了该消息。"
 
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
-#: actions/apistatusesshow.php:117 actions/atompubfavoritefeed.php:104
-#: actions/atompubmembershipfeed.php:106 actions/atompubshowfavorite.php:116
+#. 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/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
 msgid "HTTP method not supported."
 msgstr "HTTP 方法不支持。"
 
-#: actions/apistatusesshow.php:141
+#. 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:152
+#: actions/apistatusesshow.php:155
 msgid "Status deleted."
 msgstr "消息已删除。"
 
 #. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
+#: actions/apistatusesshow.php:162
 msgid "No status with that ID found."
 msgstr "没有找到此 ID 的消息。"
 
-#: actions/apistatusesshow.php:223
+#. 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:230 actions/deletenotice.php:78
-msgid "Can't delete this notice."
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+#, fuzzy
+msgid "Cannot delete this notice."
 msgstr "无法删除这条消息。"
 
-#: actions/apistatusesshow.php:243
+#. 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"
@@ -1112,51 +1154,49 @@ msgstr "只有该用户才能添加到他们的时间线。"
 msgid "Only accept AtomPub for Atom feeds."
 msgstr "Atom feeds 只接受 AtomPub。"
 
-#: actions/apitimelineuser.php:310
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
 msgstr ""
 
-#: actions/apitimelineuser.php:315
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
 msgstr ""
 
 #. TRANS: Client error displayed when not using an Atom entry.
-#: actions/apitimelineuser.php:321 actions/atompubfavoritefeed.php:226
-#: actions/atompubmembershipfeed.php:228
-#: actions/atompubsubscriptionfeed.php:233
+#: actions/apitimelineuser.php:323 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.
 #. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:334
+#: actions/apitimelineuser.php:336
 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:347
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
 msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
-#: actions/apitimelineuser.php:378
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:381
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "搜索消息内容"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:406
+#: actions/apitimelineuser.php:409
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "已存在使用 URI \"%s\" 的消息了。"
 
-#: actions/apitimelineuser.php:437
-#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
-
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
@@ -1167,108 +1207,116 @@ msgstr "API 方法尚未实现。"
 msgid "User not found."
 msgstr "API方法没有找到。"
 
-#: actions/atompubfavoritefeed.php:70
-#, fuzzy
-msgid "No such profile"
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
+msgid "No such profile."
 msgstr "没有这个文件。"
 
-#: actions/atompubfavoritefeed.php:145
-#, php-format
-msgid "Notices %s has favorited to on %s"
-msgstr ""
-
-#: actions/atompubfavoritefeed.php:215 actions/atompubsubscriptionfeed.php:222
+#. 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 "Can't add someone else's subscription"
+msgid "Cannot add someone else's subscription."
 msgstr "无法添加新的关注。"
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubfavoritefeed.php:239
-msgid "Can only handle Favorite activities."
-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 "搜索消息内容"
 
-#: actions/atompubfavoritefeed.php:248 actions/atompubmembershipfeed.php:248
+#. 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 "搜索消息内容"
 
-#: actions/atompubfavoritefeed.php:256
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+#: actions/atompubfavoritefeed.php:259
 #, fuzzy
 msgid "Unknown note."
 msgstr "未知的"
 
-#: actions/atompubfavoritefeed.php:263
+#. TRANS: Client exception thrown when trying favorite an already favorited notice.
+#: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
 msgstr "加入收藏"
 
-#: actions/atompubmembershipfeed.php:72 actions/atompubshowfavorite.php:76
-#: actions/atompubshowmembership.php:73 actions/subscribe.php:107
-msgid "No such profile."
-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 的小组成员"
 
-#: actions/atompubmembershipfeed.php:147
-#, fuzzy, php-format
-msgid "Groups %s is a member of on %s"
-msgstr "%s 组是成员组成了"
-
-#: actions/atompubmembershipfeed.php:217
-msgid "Can't add someone else's membership"
-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 "无法添加新的关注。"
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubmembershipfeed.php:241
-msgid "Can only handle Join activities."
-msgstr ""
+#: actions/atompubmembershipfeed.php:242
+#, fuzzy
+msgid "Can only handle join activities."
+msgstr "搜索消息内容"
 
-#: actions/atompubmembershipfeed.php:256
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
 msgstr "未知的"
 
-#: actions/atompubmembershipfeed.php:263
+#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
+#: actions/atompubmembershipfeed.php:267
 #, fuzzy
 msgid "Already a member."
 msgstr "所有成员"
 
-#: actions/atompubmembershipfeed.php:270
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
 msgid "Blocked by admin."
 msgstr ""
 
-#: actions/atompubshowfavorite.php:89
+#. 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 "Can't delete someone else's favorite"
+msgid "Cannot delete someone else's favorite"
 msgstr "无法删除收藏。"
 
+#. TRANS: Client exception thrown when referencing a non-existing group.
 #: actions/atompubshowmembership.php:81
 msgid "No such group"
 msgstr "没有这个组。"
 
-#: actions/atompubshowmembership.php:90
+#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
+#: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member"
 msgstr "所有成员"
 
-#: actions/atompubshowmembership.php:115
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "Method not supported"
+msgid "HTTP method not supported"
 msgstr "HTTP 方法不支持。"
 
-#: actions/atompubshowmembership.php:150
-msgid "Can't delete someone else's membership"
-msgstr ""
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+#, 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.
@@ -1276,40 +1324,37 @@ msgstr ""
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
-msgid "No such profile id: %d"
+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"
+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"
+msgid "Cannot delete someone else's subscription."
 msgstr "无法删除自我关注。"
 
-#: actions/atompubsubscriptionfeed.php:150
-#, fuzzy, php-format
-msgid "People %s has subscribed to on %s"
-msgstr "关注了%s的用户"
-
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:246
+#: actions/atompubsubscriptionfeed.php:249
 msgid "Can only handle Follow activities."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:253
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:257
 msgid "Can only follow people."
 msgstr ""
 
-#: actions/atompubsubscriptionfeed.php:262
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
-msgid "Unknown profile %s"
+msgid "Unknown profile %s."
 msgstr "未知文件类型"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
@@ -1320,10 +1365,11 @@ msgstr "没有这个附件。"
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed when trying to change group logo settings without having a 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/grouplogo.php:87 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "没有昵称。"
@@ -1354,30 +1400,36 @@ msgid "You can upload your personal avatar. The maximum file size is %s."
 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 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:254
+#: actions/grouplogo.php:263
 msgid "Avatar settings"
 msgstr "头像设置"
 
 #. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
 #. 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:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:208 actions/grouplogo.php:272
 msgid "Original"
 msgstr "原始"
 
 #. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
 #. 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:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:220 actions/grouplogo.php:285
 msgid "Preview"
 msgstr "预览"
 
@@ -1412,7 +1464,8 @@ 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.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:361 actions/grouplogo.php:393
 msgid "Lost our file data."
 msgstr "文件数据丢失"
 
@@ -1431,7 +1484,7 @@ msgstr "更新头像失败。"
 msgid "Avatar deleted."
 msgstr "头像已删除。"
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:467
+#: actions/backupaccount.php:62 actions/profilesettings.php:462
 msgid "Backup account"
 msgstr ""
 
@@ -1532,6 +1585,7 @@ msgstr "保存屏蔽信息失败。"
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. 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.
@@ -1541,7 +1595,7 @@ msgstr "保存屏蔽信息失败。"
 #: actions/deletegroup.php:87 actions/deletegroup.php:100
 #: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
 #: actions/groupmembers.php:83 actions/groupmembers.php:90
 #: actions/grouprss.php:98 actions/grouprss.php:105
 #: actions/groupunblock.php:88 actions/joingroup.php:82
@@ -1621,23 +1675,6 @@ msgstr "不可识别的地址类型%s。"
 msgid "That address has already been confirmed."
 msgstr "此地址已被确认过了。"
 
-#. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. TRANS: Server error thrown when user profile settings could not be updated.
-#. TRANS: Server error thrown on database error updating SMS preferences.
-#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-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
@@ -1698,7 +1735,7 @@ msgid "Account deleted."
 msgstr "头像已删除。"
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:474
+#: actions/deleteaccount.php:228 actions/profilesettings.php:469
 #, fuzzy
 msgid "Delete account"
 msgstr "创建一个账户"
@@ -2053,7 +2090,7 @@ msgid "Reset back to default"
 msgstr "重置到默认"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
+#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/snapshotadminpanel.php:245 actions/tagother.php:154
 #: lib/applicationeditform.php:357
@@ -2165,14 +2202,16 @@ msgid "Edit %s group"
 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:70 actions/newgroup.php:65
 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 when trying to change group logo settings while not being a group admin.
 #: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:112
 msgid "You must be an admin to edit the group."
 msgstr "管理员才可以编辑小组。"
 
@@ -2233,8 +2272,8 @@ msgstr "当前确认的电子邮件。"
 #. 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:116 actions/emailsettings.php:183
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "移除"
@@ -2259,15 +2298,15 @@ 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:144 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/smssettings.php:158
 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:152 actions/smssettings.php:171
+#: actions/emailsettings.php:152 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "接收用 email"
 
@@ -2278,13 +2317,13 @@ 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:180 actions/smssettings.php:178
+#: actions/emailsettings.php:180 actions/smssettings.php:174
 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:189 actions/smssettings.php:186
+#: actions/emailsettings.php:189 actions/smssettings.php:182
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "生成新的电子邮件地址用于发布消息；取消旧的。"
 
@@ -2297,7 +2336,7 @@ 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:199 actions/smssettings.php:189
+#: actions/emailsettings.php:199 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "新增"
@@ -2371,9 +2410,10 @@ msgstr "此电子邮件属于其他用户。"
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/smssettings.php:365
+#, fuzzy
+msgid "Could not insert confirmation code."
 msgstr "无法插入确认码。"
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
@@ -2388,8 +2428,8 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "没有可以取消的确认。"
 
@@ -2400,8 +2440,9 @@ 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:468 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:468 actions/smssettings.php:413
+#, fuzzy
+msgid "Could not delete email confirmation."
 msgstr "无法删除电子邮件确认。"
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
@@ -2420,24 +2461,25 @@ msgstr "这个不是你的电子邮件地址。"
 msgid "The email address was removed."
 msgstr "电子邮件地址已被删除。"
 
-#: actions/emailsettings.php:528 actions/smssettings.php:568
+#: actions/emailsettings.php:528 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/smssettings.php:564 actions/smssettings.php:587
+#, fuzzy
+msgid "Could not update user record."
 msgstr "无法更新用户记录。"
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:544 actions/smssettings.php:581
+#: actions/emailsettings.php:544 actions/smssettings.php:567
 msgid "Incoming email address removed."
 msgstr "发布用的电子邮件被删除。"
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:569 actions/smssettings.php:605
+#: actions/emailsettings.php:569 actions/smssettings.php:590
 msgid "New incoming email address added."
 msgstr "已添加新的发布用的电子邮件地址。"
 
@@ -2530,7 +2572,7 @@ msgstr "未预料的响应！"
 msgid "User being listened to does not exist."
 msgstr "要查看的用户不存在。"
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
 msgid "You can use the local subscription!"
 msgstr "你可以使用本地关注！"
 
@@ -2657,44 +2699,46 @@ msgid ""
 "palette of your choice."
 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".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "无法更新你的外观。"
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "外观偏好已保存。"
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:145 actions/grouplogo.php:200
 msgid "Group logo"
 msgstr "小组logo"
 
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:157
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr "你可以给你的小组上传一个 logo。文件最大限制为%s。"
 
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:244
 msgid "Upload"
 msgstr "上传"
 
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:301
 msgid "Crop"
 msgstr "剪裁"
 
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:378
 msgid "Pick a square area of the image to be the logo."
 msgstr "请选择一块方形区域作为 logo。"
 
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:413
 msgid "Logo updated."
 msgstr "logo已更新。"
 
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:416
 msgid "Failed updating logo."
 msgstr "更新 logo 失败。"
 
@@ -2832,14 +2876,14 @@ msgid "Error removing the block."
 msgstr "取消屏蔽时出错。"
 
 #. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#: actions/imsettings.php:58
 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:74
+#: actions/imsettings.php:71
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2849,23 +2893,23 @@ msgstr ""
 "们。"
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM 不可用。"
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#: actions/imsettings.php:102 actions/imsettings.php:132
 msgid "IM address"
 msgstr "IM 地址"
 
-#: actions/imsettings.php:113
+#: actions/imsettings.php:109
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "已确认的Jabber/GTalk帐号。"
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#: actions/imsettings.php:120
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -2879,7 +2923,7 @@ msgstr ""
 #. 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:143
+#: actions/imsettings.php:139
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2889,63 +2933,63 @@ msgstr ""
 "或 GTalk 中将 %s 加为好友。"
 
 #. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "IM 首选项已保存。"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
+#: actions/imsettings.php:159
 msgid "Send me notices through Jabber/GTalk."
 msgstr "通过 Jabber/GTalk 发送通告。"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
+#: actions/imsettings.php:165
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "当我的 Jabber/GTalk 状态改变时自动发布消息。"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
+#: actions/imsettings.php:171
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr "将我没有关注的用户给我的回复通过 Jabber/GTalk 发送给我。"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:182
+#: actions/imsettings.php:178
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "公开 Jabber/GTalk 帐号的 MicroID。"
 
 #. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "首选项已保存。"
 
 #. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "没有 Jabber ID。"
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
+#: actions/imsettings.php:312
 msgid "Cannot normalize that Jabber ID"
 msgstr "无法识别此 Jabber ID"
 
 #. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
+#: actions/imsettings.php:317
 msgid "Not a valid Jabber ID"
 msgstr "不是有效的 Jabber ID"
 
 #. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "这个已经是你的 Jabber 帐号了。"
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#: actions/imsettings.php:325
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID 属于另一用户。"
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#: actions/imsettings.php:353
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2953,28 +2997,29 @@ msgid ""
 msgstr "验证码已被发送到你新增的 IM 地址。你必须允许 %s 向你发送信息。"
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "IM 地址错误。"
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:400
-msgid "Couldn't delete IM confirmation."
+#: actions/imsettings.php:391
+#, fuzzy
+msgid "Could not delete IM confirmation."
 msgstr "无法删除 IM 确认。"
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#: actions/imsettings.php:396
 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:427
+#: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "这不是你的 Jabber ID。"
 
 #. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "IM 地址已删除。"
 
@@ -3185,106 +3230,106 @@ msgid "%1$s left group %2$s"
 msgstr "%1$s离开了%2$s小组。"
 
 #. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
 msgctxt "TITLE"
 msgid "License"
 msgstr "许可协议"
 
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
 msgid "License for this StatusNet site"
 msgstr "这个 StatusNet 网站的许可协议"
 
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
 msgid "Invalid license selection."
 msgstr "无效的许可协议选择。"
 
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
 msgid ""
 "You must specify the owner of the content when using the All Rights Reserved "
 "license."
 msgstr "当使用版权所有的许可协议时，你必须指定内容的所有者。"
 
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
 msgid "Invalid license title. Maximum length is 255 characters."
 msgstr "无效的许可标题。最大长度255个字符。"
 
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
 msgid "Invalid license URL."
 msgstr "无效的许可协议 URL。"
 
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
 msgid "Invalid license image URL."
 msgstr "无效的许可协议图片 URL。"
 
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
 msgid "License URL must be blank or a valid URL."
 msgstr "许可协议 URL 必须是个有效的 URL 或者为空。"
 
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
 msgid "License image must be blank or valid URL."
 msgstr "许可协议图片 URL 必须是个有效的 URL 或者为空。"
 
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
 msgid "License selection"
 msgstr "许可协议选择"
 
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
 msgid "Private"
 msgstr "私有"
 
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
 msgstr "版权所有"
 
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
 msgstr "创作共用"
 
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
 msgid "Type"
 msgstr "类型"
 
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
 msgid "Select license"
 msgstr "选择许可协议"
 
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
 msgid "License details"
 msgstr "许可协议细节"
 
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
 msgid "Owner"
 msgstr "所有者"
 
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
 msgid "Name of the owner of the site's content (if applicable)."
 msgstr "这个网站内容的所有者姓名（如果适用）。"
 
-#: actions/licenseadminpanel.php:283
+#: actions/licenseadminpanel.php:276
 msgid "License Title"
 msgstr "许可协议标题"
 
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
 msgid "The title of the license."
 msgstr "许可协议的标题。"
 
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
 msgid "License URL"
 msgstr "许可协议 URL"
 
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
 msgid "URL for more information about the license."
 msgstr "更多许可协议信息的 URL。"
 
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
 msgid "License Image URL"
 msgstr "许可协议图片 URL。"
 
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
 msgid "URL for an image to display with the license."
 msgstr "与许可协议一起出现的图片 URL。"
 
-#: actions/licenseadminpanel.php:319
+#: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "保存许可协议设置"
 
@@ -4043,29 +4088,29 @@ 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:61
+#: actions/profilesettings.php:59
 msgid "Profile settings"
 msgstr "个人设置"
 
 #. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr "在这里更新个人信息，让大家对你了解得更多。"
 
 #. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
 msgid "Profile information"
 msgstr "个人信息"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109
 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.
-#: actions/profilesettings.php:117 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:456
 #: actions/showgroup.php:252 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:152
 msgid "Full name"
@@ -4073,39 +4118,39 @@ msgstr "全名"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
+#: actions/profilesettings.php:118 actions/register.php:461
 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "主页"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: 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:133 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:472
 #, 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:139 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:477
 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:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:479
 msgid "Bio"
 msgstr "自述"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:484
 #: actions/showgroup.php:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:180
 #: lib/userprofile.php:167
@@ -4113,50 +4158,50 @@ msgid "Location"
 msgstr "位置"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:486
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "你的地理位置，格式类似\"城市，省份，国家\""
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:157
+#: actions/profilesettings.php:153
 msgid "Share my current location when posting notices"
 msgstr "当发布消息时分享我的地理位置"
 
 #. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:165 actions/tagother.php:149
+#: actions/profilesettings.php:161 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:212
 msgid "Tags"
 msgstr "标签"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr "你的标签 (字母、数字、“-”、“. ”和“ _”)， 以逗号或空格分隔"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
 msgid "Language"
 msgstr "语言"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
 msgid "Preferred language"
 msgstr "首选语言"
 
 #. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
 msgid "Timezone"
 msgstr "时区"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
 msgid "What timezone are you normally in?"
 msgstr "你一般处于哪个时区？"
 
 #. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:193
+#: actions/profilesettings.php:189
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "自动关注任何关注我的人 (这个选项适合机器人)"
@@ -4164,58 +4209,55 @@ 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:262 actions/register.php:229
+#: actions/profilesettings.php:257 actions/register.php:229
 #, 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:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "未选择时区。"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:276
 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:295 actions/tagother.php:178
+#: actions/profilesettings.php:290 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:351
-msgid "Couldn't update user for autosubscribe."
+#: actions/profilesettings.php:346
+#, 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:409
-msgid "Couldn't save location prefs."
+#: actions/profilesettings.php:404
+#, fuzzy
+msgid "Could not save location prefs."
 msgstr "无法保存标签。"
 
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "无法保存个人信息。"
-
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
+#: actions/profilesettings.php:426 actions/tagother.php:200
+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:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "设置已保存。"
 
 #. TRANS: Page title for page where a user account can be restored from backup.
-#: actions/profilesettings.php:481 actions/restoreaccount.php:60
+#: actions/profilesettings.php:476 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "创建一个账户"
@@ -4589,7 +4631,7 @@ msgid ""
 "to confirm your email address.)"
 msgstr "(你将收到一封邮件，包含了如何确认邮件地址的说明。)"
 
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
 #, php-format
 msgid ""
 "To subscribe, you can [login](%%action.login%%), or [register](%%action."
@@ -4600,72 +4642,75 @@ msgstr ""
 "%) 一个新账户。如果你已经在另一个[兼容的微博客](%%doc.openmublog%%)有账户，请"
 "填入你的资料页 URL。"
 
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
 msgid "Remote subscribe"
 msgstr "远程关注"
 
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
 msgid "Subscribe to a remote user"
 msgstr "关注一个远程用户"
 
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
 msgid "User nickname"
 msgstr "昵称"
 
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
 msgid "Nickname of the user you want to follow"
 msgstr "希望关注的用户昵称"
 
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "资料页 URL"
 
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "你在其他兼容的微博客服务的资料页 URL"
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
 #: lib/userprofile.php:411
 msgid "Subscribe"
 msgstr "关注"
 
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
 msgid "Invalid profile URL (bad format)"
 msgstr "无效的用户 URL (格式错误)"
 
-#: actions/remotesubscribe.php:168
+#: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr "不是有效的资料页 URL (没有YADIS 文档或定义了无效的 XRDS)。"
 
-#: actions/remotesubscribe.php:176
-msgid "That’s a local profile! Login to subscribe."
+#: actions/remotesubscribe.php:175
+#, fuzzy
+msgid "That is a local profile! Login to subscribe."
 msgstr "这是一个本地用户！登录才能关注。"
 
-#: actions/remotesubscribe.php:183
-msgid "Couldn’t get a request token."
+#: actions/remotesubscribe.php:182
+#, fuzzy
+msgid "Could not get a request token."
 msgstr "无法获得一个 request token。"
 
-#: actions/repeat.php:57
+#: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
 msgstr "只有登录的用户才能重复发消息。"
 
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
 msgstr "没有指定的消息。"
 
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+#, fuzzy
+msgid "You cannot repeat your own notice."
 msgstr "你不能重复自己的消息。"
 
-#: actions/repeat.php:90
+#: actions/repeat.php:89
 msgid "You already repeated that notice."
 msgstr "你已转发过了那个消息。"
 
-#: actions/repeat.php:114 lib/noticelist.php:692
+#: actions/repeat.php:112 lib/noticelist.php:692
 msgid "Repeated"
 msgstr "已转发"
 
-#: actions/repeat.php:119
+#: actions/repeat.php:117
 msgid "Repeated!"
 msgstr "已转发！"
 
@@ -5415,102 +5460,102 @@ msgid "Save site notice"
 msgstr "保存网站公告"
 
 #. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
 msgid "SMS settings"
 msgstr "SMS 设置"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
 #, 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:97
+#: actions/smssettings.php:93
 msgid "SMS is not available."
 msgstr "SMS 不可用。"
 
 #. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
 msgid "SMS address"
 msgstr "SMS 地址"
 
 #. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "已确认的可以发送SMS短消息的电话号码。"
 
 #. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:133
+#: actions/smssettings.php:129
 msgid "Awaiting confirmation on this phone number."
 msgstr "等待确认此电话号码。"
 
 #. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:142
+#: actions/smssettings.php:138
 msgid "Confirmation code"
 msgstr "确认码"
 
 #. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
 msgid "Enter the code you received on your phone."
 msgstr "输入手机收到的验证码。"
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
+#: actions/smssettings.php:144
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "确认"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
 msgid "SMS phone number"
 msgstr "SMS 电话号码"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "电话号码，不带标点或空格，包含地区代码"
 
 #. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:195
+#: actions/smssettings.php:191
 msgid "SMS preferences"
 msgstr "SMS 偏好"
 
 #. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
 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:315
+#: actions/smssettings.php:308
 msgid "SMS preferences saved."
 msgstr "SMS设置已保存。"
 
 #. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
 msgid "No phone number."
 msgstr "没有电话号码。"
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
 msgid "No carrier selected."
 msgstr "未选择运营商。"
 
 #. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
 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:356
+#: actions/smssettings.php:348
 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:384
+#: actions/smssettings.php:376
 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."
@@ -5518,39 +5563,39 @@ msgstr ""
 "验证码已被发送到你新增的电话号码。请检查你的电话，找到验证码并按要求使用它。"
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
+#: actions/smssettings.php:404
 msgid "That is the wrong confirmation number."
 msgstr "确认码错误。"
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:427
+#: actions/smssettings.php:418
 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:448
+#: actions/smssettings.php:438
 msgid "That is not your phone number."
 msgstr "这是他人的电话号码。"
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
+#: actions/smssettings.php:460
 msgid "The SMS phone number was removed."
 msgstr "SMS 电话号码已移除。"
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:511
+#: actions/smssettings.php:499
 msgid "Mobile carrier"
 msgstr "移动运营商"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
 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:525
+#: actions/smssettings.php:513
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -5560,7 +5605,7 @@ msgstr ""
 "系 %s 以告知。"
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
+#: actions/smssettings.php:535
 msgid "No code entered"
 msgstr "没有输入验证码"
 
@@ -5816,10 +5861,6 @@ msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr "你只能给你关注或关注你的人添加标签。"
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "无法保存标签。"
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "使用这个表单给你的关注者或你关注的用户添加标签。"
@@ -6043,18 +6084,18 @@ msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "头像 URL ‘%s’ 图像格式错误。"
 
 #. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
 msgid "Profile design"
 msgstr "个人页面外观"
 
 #. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr "通过背景图片和调色板自定义你的页面外观。"
 
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
 msgstr "享受你的成果吧！"
 
@@ -6990,22 +7031,26 @@ msgid ""
 msgstr "无法找到请求 token 对应的用户和应用。"
 
 #. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
 msgid "Could not issue access token."
 msgstr "无法发行 access token。"
 
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: 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:285
+#: 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:290
+#: lib/apioauthstore.php:376
 msgid "Failed to delete revoked token."
 msgstr "删除取消的 token 失败。"
 
@@ -7638,6 +7683,12 @@ msgctxt "BUTTON"
 msgid "Reset"
 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
+msgid "Couldn't update your design."
+msgstr "无法更新你的外观。"
+
 #. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
 #: lib/designsettings.php:433
 msgid "Design defaults restored."
@@ -8955,3 +9006,28 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "从文件'%s'获取备份。"
+
+#, fuzzy
+#~ msgid "No such profile"
+#~ msgstr "没有这个文件。"
+
+#, fuzzy
+#~ msgid "Groups %s is a member of on %s"
+#~ msgstr "%s 组是成员组成了"
+
+#, fuzzy
+#~ msgid "Method not supported"
+#~ msgstr "HTTP 方法不支持。"
+
+#, fuzzy
+#~ msgid "People %s has subscribed to on %s"
+#~ msgstr "关注了%s的用户"
+
+#~ msgid "Couldn't update user."
+#~ msgstr "无法更新用户。"
+
+#~ msgid "Couldn't save profile."
+#~ msgstr "无法保存个人信息。"
+
+#~ msgid "Couldn't save tags."
+#~ msgstr "无法保存标签。"
diff --git a/plugins/Bookmark/locale/ia/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/ia/LC_MESSAGES/Bookmark.po
new file mode 100644
index 0000000000..38e99a2d2b
--- /dev/null
+++ b/plugins/Bookmark/locale/ia/LC_MESSAGES/Bookmark.po
@@ -0,0 +1,36 @@
+# Translation of StatusNet - Bookmark to Interlingua (Interlingua)
+# Expored from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Bookmark\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:06: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-14 23:54:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-bookmark\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: bookmarkform.php:162
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Salveguardar"
+
+#: importdelicious.php:340
+msgctxt "BUTTON"
+msgid "Upload"
+msgstr "Incargar"
+
+#: BookmarkPlugin.php:458
+msgid "Simple extension for supporting bookmarks."
+msgstr "Extension simple pro supportar marcapaginas."
diff --git a/plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po
new file mode 100644
index 0000000000..551e450b5b
--- /dev/null
+++ b/plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po
@@ -0,0 +1,36 @@
+# Translation of StatusNet - Bookmark to Macedonian (Македонски)
+# Expored from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Bookmark\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:06: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-14 23:54:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-bookmark\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+#: bookmarkform.php:162
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Зачувај"
+
+#: importdelicious.php:340
+msgctxt "BUTTON"
+msgid "Upload"
+msgstr "Подигни"
+
+#: BookmarkPlugin.php:458
+msgid "Simple extension for supporting bookmarks."
+msgstr "Прост додаток за поддршка на обележувачи."
diff --git a/plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po
new file mode 100644
index 0000000000..f1a2a793c8
--- /dev/null
+++ b/plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po
@@ -0,0 +1,37 @@
+# Translation of StatusNet - Bookmark to Ukrainian (Українська)
+# Expored from translatewiki.net
+#
+# Author: Boogie
+# --
+# 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-01-20 19:02+0000\n"
+"PO-Revision-Date: 2011-01-20 19:06: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-14 23:54:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-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 "Зберегти"
+
+#: importdelicious.php:340
+msgctxt "BUTTON"
+msgid "Upload"
+msgstr "Завантажити"
+
+#: BookmarkPlugin.php:458
+msgid "Simple extension for supporting bookmarks."
+msgstr "Простий додаток, що підтримує додавання закладок."
diff --git a/plugins/MobileProfile/locale/ce/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ce/LC_MESSAGES/MobileProfile.po
new file mode 100644
index 0000000000..92666bcec1
--- /dev/null
+++ b/plugins/MobileProfile/locale/ce/LC_MESSAGES/MobileProfile.po
@@ -0,0 +1,78 @@
+# Translation of StatusNet - MobileProfile to Chechen (Нохчийн)
+# Expored from translatewiki.net
+#
+# Author: Sasan700
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - MobileProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-20 19:03+0000\n"
+"PO-Revision-Date: 2011-01-20 19:07:19+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-14 13:21:16+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\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
+msgid "This page is not available in a media type you accept."
+msgstr "Агlо схьа ца гойту ишта тайпнара чун, ахьа лелош йолу."
+
+#: MobileProfilePlugin.php:310
+msgid "Home"
+msgstr "Цlехьа"
+
+#: MobileProfilePlugin.php:312
+msgid "Account"
+msgstr "Дlавазвалар"
+
+#: MobileProfilePlugin.php:314
+msgid "Connect"
+msgstr "Зlе тасар"
+
+#: MobileProfilePlugin.php:317
+msgid "Admin"
+msgstr "Адаманкуьйгалхо"
+
+#: MobileProfilePlugin.php:317
+msgid "Change site configuration"
+msgstr ""
+
+#: MobileProfilePlugin.php:321
+msgid "Invite"
+msgstr "Схьакхайкха"
+
+#: MobileProfilePlugin.php:324
+msgid "Logout"
+msgstr "Ара валар"
+
+#: MobileProfilePlugin.php:328
+msgid "Register"
+msgstr "Дlавазвалар"
+
+#: MobileProfilePlugin.php:331
+msgid "Login"
+msgstr "Вовзийта хьой"
+
+#: MobileProfilePlugin.php:335
+msgid "Search"
+msgstr "Лаха"
+
+#: MobileProfilePlugin.php:361
+msgid "Attach"
+msgstr "Тlечlагlде"
+
+#: MobileProfilePlugin.php:365
+msgid "Attach a file"
+msgstr "Тlечlагlйе хlума"
+
+#: MobileProfilePlugin.php:417
+msgid "XHTML MobileProfile output for supporting user agents."
+msgstr "XHTML MobileProfile арайокху иза лелочу декъашхошна аттон."
diff --git a/plugins/NewMenu/locale/ia/LC_MESSAGES/NewMenu.po b/plugins/NewMenu/locale/ia/LC_MESSAGES/NewMenu.po
new file mode 100644
index 0000000000..fcd2c3a77d
--- /dev/null
+++ b/plugins/NewMenu/locale/ia/LC_MESSAGES/NewMenu.po
@@ -0,0 +1,98 @@
+# Translation of StatusNet - NewMenu to Interlingua (Interlingua)
+# Expored from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - NewMenu\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-20 19:03+0000\n"
+"PO-Revision-Date: 2011-01-20 19:07: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-01-14 23:54:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-newmenu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: NewMenuPlugin.php:99
+msgid "Home"
+msgstr "Initio"
+
+#: NewMenuPlugin.php:100
+msgid "Friends timeline"
+msgstr "Chronologia de amicos"
+
+#: NewMenuPlugin.php:105
+msgid "Profile"
+msgstr "Profilo"
+
+#: NewMenuPlugin.php:106
+msgid "Your profile"
+msgstr "Tu profilo"
+
+#: NewMenuPlugin.php:110 NewMenuPlugin.php:133
+msgid "Public"
+msgstr "Public"
+
+#: NewMenuPlugin.php:111 NewMenuPlugin.php:134
+msgid "Everyone on this site"
+msgstr "Omnes in iste sito"
+
+#: NewMenuPlugin.php:115
+msgid "Settings"
+msgstr "Configurationes"
+
+#: NewMenuPlugin.php:116
+msgid "Change your personal settings"
+msgstr "Cambiar tu optiones personal"
+
+#: NewMenuPlugin.php:121
+msgid "Admin"
+msgstr "Admin"
+
+#: NewMenuPlugin.php:122
+msgid "Site configuration"
+msgstr "Configuration del sito"
+
+#: NewMenuPlugin.php:127
+msgid "Logout"
+msgstr "Clauder session"
+
+#: NewMenuPlugin.php:128
+msgid "Logout from the site"
+msgstr "Terminar le session del sito"
+
+#: NewMenuPlugin.php:138
+msgid "Login"
+msgstr "Aperir session"
+
+#: NewMenuPlugin.php:139
+msgid "Login to the site"
+msgstr "Authenticar te a iste sito"
+
+#: NewMenuPlugin.php:146
+msgid "Search"
+msgstr "Recerca"
+
+#: NewMenuPlugin.php:147
+msgid "Search the site"
+msgstr "Cercar in le sito"
+
+#: NewMenuPlugin.php:332
+msgid "IM"
+msgstr "MI"
+
+#: NewMenuPlugin.php:339
+msgid "SMS"
+msgstr "SMS"
+
+#: NewMenuPlugin.php:431
+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
new file mode 100644
index 0000000000..45f33f0c9f
--- /dev/null
+++ b/plugins/NewMenu/locale/mk/LC_MESSAGES/NewMenu.po
@@ -0,0 +1,98 @@
+# Translation of StatusNet - NewMenu to Macedonian (Македонски)
+# Expored from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - NewMenu\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-20 19:03+0000\n"
+"PO-Revision-Date: 2011-01-20 19:07: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-01-14 23:54:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-newmenu\n"
+"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
+
+#: NewMenuPlugin.php:99
+msgid "Home"
+msgstr "Почетна"
+
+#: NewMenuPlugin.php:100
+msgid "Friends timeline"
+msgstr "Хронологија на пријатели"
+
+#: NewMenuPlugin.php:105
+msgid "Profile"
+msgstr "Профил"
+
+#: NewMenuPlugin.php:106
+msgid "Your profile"
+msgstr "Вашиот профил"
+
+#: NewMenuPlugin.php:110 NewMenuPlugin.php:133
+msgid "Public"
+msgstr "Јавно"
+
+#: NewMenuPlugin.php:111 NewMenuPlugin.php:134
+msgid "Everyone on this site"
+msgstr "Секој на мрежново место"
+
+#: NewMenuPlugin.php:115
+msgid "Settings"
+msgstr "Нагодувања"
+
+#: NewMenuPlugin.php:116
+msgid "Change your personal settings"
+msgstr "Промена на личните нагодувања"
+
+#: NewMenuPlugin.php:121
+msgid "Admin"
+msgstr "Админ"
+
+#: NewMenuPlugin.php:122
+msgid "Site configuration"
+msgstr "Поставки за мрежното место"
+
+#: NewMenuPlugin.php:127
+msgid "Logout"
+msgstr "Одјава"
+
+#: NewMenuPlugin.php:128
+msgid "Logout from the site"
+msgstr "Одјава од мрежното место"
+
+#: NewMenuPlugin.php:138
+msgid "Login"
+msgstr "Најава"
+
+#: NewMenuPlugin.php:139
+msgid "Login to the site"
+msgstr "Најава на мрежното место"
+
+#: NewMenuPlugin.php:146
+msgid "Search"
+msgstr "Пребарај"
+
+#: NewMenuPlugin.php:147
+msgid "Search the site"
+msgstr "Пребарување на мрежното место"
+
+#: NewMenuPlugin.php:332
+msgid "IM"
+msgstr "НП"
+
+#: NewMenuPlugin.php:339
+msgid "SMS"
+msgstr "СМС"
+
+#: NewMenuPlugin.php:431
+msgid "A preview of the new menu layout in StatusNet 1.0."
+msgstr "Преглед на новиот распоред на менито во StatusNet 1.0."
diff --git a/plugins/NewMenu/locale/uk/LC_MESSAGES/NewMenu.po b/plugins/NewMenu/locale/uk/LC_MESSAGES/NewMenu.po
new file mode 100644
index 0000000000..71d17f40a3
--- /dev/null
+++ b/plugins/NewMenu/locale/uk/LC_MESSAGES/NewMenu.po
@@ -0,0 +1,99 @@
+# Translation of StatusNet - NewMenu to Ukrainian (Українська)
+# Expored from translatewiki.net
+#
+# Author: Boogie
+# --
+# 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-20 19:03+0000\n"
+"PO-Revision-Date: 2011-01-20 19:07: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-01-14 23:54:27+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-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:99
+msgid "Home"
+msgstr "Дім"
+
+#: NewMenuPlugin.php:100
+msgid "Friends timeline"
+msgstr "Стрічка друзів"
+
+#: NewMenuPlugin.php:105
+msgid "Profile"
+msgstr "Профіль"
+
+#: NewMenuPlugin.php:106
+msgid "Your profile"
+msgstr "Ваш профіль"
+
+#: NewMenuPlugin.php:110 NewMenuPlugin.php:133
+msgid "Public"
+msgstr "Загал"
+
+#: NewMenuPlugin.php:111 NewMenuPlugin.php:134
+msgid "Everyone on this site"
+msgstr "Всі на цьому сайті"
+
+#: NewMenuPlugin.php:115
+msgid "Settings"
+msgstr "Параметри"
+
+#: NewMenuPlugin.php:116
+msgid "Change your personal settings"
+msgstr "Змінити налаштування профілю"
+
+#: NewMenuPlugin.php:121
+msgid "Admin"
+msgstr "Адмін"
+
+#: NewMenuPlugin.php:122
+msgid "Site configuration"
+msgstr "Конфігурація сайту"
+
+#: NewMenuPlugin.php:127
+msgid "Logout"
+msgstr "Вийти"
+
+#: NewMenuPlugin.php:128
+msgid "Logout from the site"
+msgstr "Вийти з сайту"
+
+#: NewMenuPlugin.php:138
+msgid "Login"
+msgstr "Увійти"
+
+#: NewMenuPlugin.php:139
+msgid "Login to the site"
+msgstr "Увійти на сайт"
+
+#: NewMenuPlugin.php:146
+msgid "Search"
+msgstr "Пошук"
+
+#: NewMenuPlugin.php:147
+msgid "Search the site"
+msgstr "Пошук на сайті"
+
+#: NewMenuPlugin.php:332
+msgid "IM"
+msgstr "ІМ"
+
+#: NewMenuPlugin.php:339
+msgid "SMS"
+msgstr "СМС"
+
+#: NewMenuPlugin.php:431
+msgid "A preview of the new menu layout in StatusNet 1.0."
+msgstr "Попередній перегляд нового макета меню в StatusNet 1.0"
diff --git a/plugins/SQLProfile/locale/ia/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/ia/LC_MESSAGES/SQLProfile.po
new file mode 100644
index 0000000000..d07d0aa7bb
--- /dev/null
+++ b/plugins/SQLProfile/locale/ia/LC_MESSAGES/SQLProfile.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - SQLProfile to Interlingua (Interlingua)
+# Expored from translatewiki.net
+#
+# Author: McDutchie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SQLProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-20 19:03+0000\n"
+"PO-Revision-Date: 2011-01-20 19:08: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 23:56:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ia\n"
+"X-Message-Group: #out-statusnet-plugin-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
new file mode 100644
index 0000000000..55f4b91403
--- /dev/null
+++ b/plugins/SQLProfile/locale/mk/LC_MESSAGES/SQLProfile.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - SQLProfile to Macedonian (Македонски)
+# Expored from translatewiki.net
+#
+# Author: Bjankuloski06
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - SQLProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-20 19:03+0000\n"
+"PO-Revision-Date: 2011-01-20 19:08: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-14 23:56:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: mk\n"
+"X-Message-Group: #out-statusnet-plugin-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 d1c1c8e5e1..01e689d3f6 100644
--- a/plugins/SQLProfile/locale/nl/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/nl/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-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:37:11+0000\n"
+"POT-Creation-Date: 2011-01-20 19:03+0000\n"
+"PO-Revision-Date: 2011-01-20 19:08: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-14 14:17:53+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:56:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-sqlprofile\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: SQLProfilePlugin.php:41
-#, fuzzy
 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/uk/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/uk/LC_MESSAGES/SQLProfile.po
new file mode 100644
index 0000000000..5912676be1
--- /dev/null
+++ b/plugins/SQLProfile/locale/uk/LC_MESSAGES/SQLProfile.po
@@ -0,0 +1,29 @@
+# Translation of StatusNet - SQLProfile to Ukrainian (Українська)
+# Expored from translatewiki.net
+#
+# Author: Boogie
+# --
+# 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-01-20 19:03+0000\n"
+"PO-Revision-Date: 2011-01-20 19:08: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-14 23:56:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-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 ""
+"Інструмент правки для спостереження за погано індексованими запитами до бази "
+"даних."

From 7c3f820ff0047d0e223832477c5879a50a87a8e1 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 20 Jan 2011 13:05:58 -0800
Subject: [PATCH 106/314] Ticket #2999: RequireValidatedEmail plugin now also
 prevents group creation by unvalidated users.

---
 .../RequireValidatedEmailPlugin.php           | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
index 6c0ef37d51..980b7beb6e 100644
--- a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
+++ b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
@@ -235,4 +235,24 @@ class RequireValidatedEmailPlugin extends Plugin
         }
         return true;
     }
+
+    /**
+     * Prevent unvalidated folks from creating spam groups.
+     *
+     * @param Profile $profile User profile we're checking
+     * @param string $right rights key
+     * @param boolean $result if overriding, set to true/false has right
+     * @return boolean hook result value
+     */
+    function onUserRightsCheck(Profile $profile, $right, &$result)
+    {
+        if ($right == Right::CREATEGROUP) {
+            $user = User::staticGet('id', $profile->id);
+            if ($user && !$this->validated($user)) {
+                $result = false;
+                return false;
+            }
+        }
+        return true;
+    }
 }

From edeaf8a2f810a58678428cd5a0393addd152656c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 20 Jan 2011 16:08:22 -0500
Subject: [PATCH 107/314] new group message layout

---
 ...up_private_inbox.php => Group_message.php} | 12 ++--
 plugins/PrivateGroup/PrivateGroupPlugin.php   | 57 +++++++++++++++----
 2 files changed, 53 insertions(+), 16 deletions(-)
 rename plugins/PrivateGroup/{Group_private_inbox.php => Group_message.php} (93%)

diff --git a/plugins/PrivateGroup/Group_private_inbox.php b/plugins/PrivateGroup/Group_message.php
similarity index 93%
rename from plugins/PrivateGroup/Group_private_inbox.php
rename to plugins/PrivateGroup/Group_message.php
index 11142314bc..404f663a1f 100644
--- a/plugins/PrivateGroup/Group_private_inbox.php
+++ b/plugins/PrivateGroup/Group_message.php
@@ -53,7 +53,7 @@ require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
  * @see      DB_DataObject
  */
 
-class User_greeting_count extends Memcached_DataObject
+class Group_message extends Memcached_DataObject
 {
     public $__table = 'user_greeting_count'; // table name
     public $user_id;                         // int(4)  primary_key not_null
@@ -67,12 +67,12 @@ class User_greeting_count extends Memcached_DataObject
      * @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
+     * @return Group_message 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('Group_message', $k, $v);
     }
 
     /**
@@ -143,15 +143,15 @@ class User_greeting_count extends Memcached_DataObject
      *
      * @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.
+     * @return Group_message instance for this user, with count already incremented.
      */
     static function inc($user_id)
     {
-        $gc = User_greeting_count::staticGet('user_id', $user_id);
+        $gc = Group_message::staticGet('user_id', $user_id);
 
         if (empty($gc)) {
 
-            $gc = new User_greeting_count();
+            $gc = new Group_message();
 
             $gc->user_id        = $user_id;
             $gc->greeting_count = 1;
diff --git a/plugins/PrivateGroup/PrivateGroupPlugin.php b/plugins/PrivateGroup/PrivateGroupPlugin.php
index f0f904cca1..0ae1247bee 100644
--- a/plugins/PrivateGroup/PrivateGroupPlugin.php
+++ b/plugins/PrivateGroup/PrivateGroupPlugin.php
@@ -77,22 +77,59 @@ class PrivateGroupPlugin extends Plugin
                                    new ColumnDef('created',
                                                  'datetime'),
                                    new ColumnDef('modified',
-                                                 'timestamp'));
-
-        $schema->ensureTable('group_private_inbox',
-                             array(new ColumnDef('group_id',
+                                                 'timestamp')));
+                             
+        $schema->ensureTable('group_message',
+                             array(new ColumnDef('id',
+                                                 'char',
+                                                 36,
+                                                 false,
+                                                 'PRI'),
+                                   new ColumnDef('uri',
+                                                 'varchar',
+                                                 255,
+                                                 false,
+                                                 'UNI'),
+                                   new ColumnDef('from_profile',
                                                  'integer',
                                                  null,
                                                  false,
-                                                 'PRI'),
-                                   new ColumnDef('allow_privacy',
-                                                 'integer'),
-                                   new ColumnDef('allow_sender',
-                                                 'integer'),
+                                                 'MUL'),
+                                   new ColumnDef('to_group',
+                                                 'integer',
+                                                 null,
+                                                 false,
+                                                 'MUL'),
+                                   new ColumnDef('content',
+                                                 'text'),
+                                   new ColumnDef('rendered',
+                                                 'text'),
+                                   new ColumnDef('url',
+                                                 'varchar',
+                                                 255,
+                                                 false,
+                                                 'UNI'),
                                    new ColumnDef('created',
                                                  'datetime'),
                                    new ColumnDef('modified',
-                                                 'timestamp'));
+                                                 'timestamp')));
+
+
+        $schema->ensureTable('group_message_copy',
+                             array(new ColumnDef('group_message_id',
+                                                 'char',
+                                                 36,
+                                                 false,
+                                                 'PRI'),
+                                   new ColumnDef('message_uri',
+                                                 'varchar',
+                                                 255,
+                                                 false,
+                                                 'PRI'),
+                                   new ColumnDef('created',
+                                                 'datetime'),
+                                   new ColumnDef('modified',
+                                                 'timestamp')));
 
         return true;
     }

From 7dc9d9c1fecfb6af80e411fc782bb964cb5b711b Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 20 Jan 2011 15:40:59 -0800
Subject: [PATCH 108/314] Add Start/EndRegistrationData event hooks in
 finishopenidlogin: allows recaptcha to add its captcha display to the form
 (checked since addition of StartRegistrationTry)

---
 plugins/OpenID/finishopenidlogin.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugins/OpenID/finishopenidlogin.php b/plugins/OpenID/finishopenidlogin.php
index 8d498d0549..d6bd7390dd 100644
--- a/plugins/OpenID/finishopenidlogin.php
+++ b/plugins/OpenID/finishopenidlogin.php
@@ -118,11 +118,19 @@ class FinishopenidloginAction extends Action
         $this->element('p', null,
                        _m('Create a new user with this nickname.'));
         $this->elementStart('ul', 'form_data');
+
+        // Hook point for captcha etc
+        Event::handle('StartRegistrationFormData', array($this));
+
         $this->elementStart('li');
         $this->input('newname', _m('New nickname'),
                      ($this->username) ? $this->username : '',
                      _m('1-64 lowercase letters or numbers, no punctuation or spaces'));
         $this->elementEnd('li');
+
+        // Hook point for captcha etc
+        Event::handle('EndRegistrationFormData', array($this));
+
         $this->elementStart('li');
         $this->element('input', array('type' => 'checkbox',
                                       'id' => 'license',

From 7a9040e3607387d64cf5b3098ab787c37cdacac5 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 20 Jan 2011 15:47:51 -0800
Subject: [PATCH 109/314] Fix inconsistent use of 'name' vs 'fullname' in
 tw_fields member variable

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

diff --git a/plugins/TwitterBridge/twitterauthorization.php b/plugins/TwitterBridge/twitterauthorization.php
index 28b40cc4f4..cc3af58878 100644
--- a/plugins/TwitterBridge/twitterauthorization.php
+++ b/plugins/TwitterBridge/twitterauthorization.php
@@ -241,7 +241,7 @@ class TwitterauthorizationAction extends Action
 
             $this->twuid = $twitter_user->id;
             $this->tw_fields = array("screen_name" => $twitter_user->screen_name,
-                                     "name" => $twitter_user->name);
+                                     "fullname" => $twitter_user->name);
             $this->access_token = $atok;
             $this->tryLogin();
         }
@@ -373,7 +373,7 @@ class TwitterauthorizationAction extends Action
         $this->hidden('access_token_secret', $this->access_token->secret);
         $this->hidden('twuid', $this->twuid);
         $this->hidden('tw_fields_screen_name', $this->tw_fields['screen_name']);
-        $this->hidden('tw_fields_name', $this->tw_fields['name']);
+        $this->hidden('tw_fields_name', $this->tw_fields['fullname']);
 
         $this->elementStart('fieldset');
         $this->hidden('token', common_session_token());
@@ -462,7 +462,7 @@ class TwitterauthorizationAction extends Action
             return;
         }
 
-        $fullname = trim($this->tw_fields['name']);
+        $fullname = trim($this->tw_fields['fullname']);
 
         $args = array('nickname' => $nickname, 'fullname' => $fullname);
 
@@ -602,8 +602,8 @@ class TwitterauthorizationAction extends Action
 
     function bestNewNickname()
     {
-        if (!empty($this->tw_fields['name'])) {
-            $nickname = $this->nicknamize($this->tw_fields['name']);
+        if (!empty($this->tw_fields['fullname'])) {
+            $nickname = $this->nicknamize($this->tw_fields['fullname']);
             if ($this->isNewNickname($nickname)) {
                 return $nickname;
             }

From c1e4be6ab937b6be17ce3424a674af5de2188682 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 20 Jan 2011 15:49:57 -0800
Subject: [PATCH 110/314] Event hook points needed to run Recaptcha on Twitter
 registration

---
 plugins/TwitterBridge/twitterauthorization.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugins/TwitterBridge/twitterauthorization.php b/plugins/TwitterBridge/twitterauthorization.php
index cc3af58878..e78ba6a674 100644
--- a/plugins/TwitterBridge/twitterauthorization.php
+++ b/plugins/TwitterBridge/twitterauthorization.php
@@ -382,11 +382,19 @@ class TwitterauthorizationAction extends Action
         $this->element('p', null,
                        _m('Create a new user with this nickname.'));
         $this->elementStart('ul', 'form_data');
+
+        // Hook point for captcha etc
+        Event::handle('StartRegistrationFormData', array($this));
+
         $this->elementStart('li');
         $this->input('newname', _m('New nickname'),
                      ($this->username) ? $this->username : '',
                      _m('1-64 lowercase letters or numbers, no punctuation or spaces'));
         $this->elementEnd('li');
+
+        // Hook point for captcha etc
+        Event::handle('EndRegistrationFormData', array($this));
+
         $this->elementEnd('ul');
         $this->submit('create', _m('Create'));
         $this->elementEnd('fieldset');

From ddde99cd89bb16ce8fdac182d41980b43a43d593 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 20 Jan 2011 15:55:36 -0800
Subject: [PATCH 111/314] Event hook points needed for recaptcha on facebook
 login form (untested, but should be legit -- same adds as openid & twitter
 reg forms)

---
 plugins/FacebookBridge/actions/facebookfinishlogin.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugins/FacebookBridge/actions/facebookfinishlogin.php b/plugins/FacebookBridge/actions/facebookfinishlogin.php
index 022c1e98b1..7b2f274741 100644
--- a/plugins/FacebookBridge/actions/facebookfinishlogin.php
+++ b/plugins/FacebookBridge/actions/facebookfinishlogin.php
@@ -257,12 +257,20 @@ class FacebookfinishloginAction extends Action
         $this->element('p', null,
                        _m('Create a new user with this nickname.'));
         $this->elementStart('ul', 'form_data');
+
+        // Hook point for captcha etc
+        Event::handle('StartRegistrationFormData', array($this));
+
         $this->elementStart('li');
         // TRANS: Field label.
         $this->input('newname', _m('New nickname'),
                      ($this->username) ? $this->username : '',
                      _m('1-64 lowercase letters or numbers, no punctuation or spaces'));
         $this->elementEnd('li');
+
+        // Hook point for captcha etc
+        Event::handle('EndRegistrationFormData', array($this));
+
         $this->elementEnd('ul');
         // TRANS: Submit button.
         $this->submit('create', _m('BUTTON','Create'));

From 06d895ee67d59ad616f7edd94a1b0eb7ce9c8aed Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 20 Jan 2011 16:56:48 -0800
Subject: [PATCH 112/314] Add email field on openid registration; needed to
 register if RequireValidatedEmail plugin is also present.

---
 plugins/OpenID/finishopenidlogin.php | 44 ++++++++++++++++++++++++----
 1 file changed, 39 insertions(+), 5 deletions(-)

diff --git a/plugins/OpenID/finishopenidlogin.php b/plugins/OpenID/finishopenidlogin.php
index d6bd7390dd..dfabdd7903 100644
--- a/plugins/OpenID/finishopenidlogin.php
+++ b/plugins/OpenID/finishopenidlogin.php
@@ -127,6 +127,11 @@ class FinishopenidloginAction extends Action
                      ($this->username) ? $this->username : '',
                      _m('1-64 lowercase letters or numbers, no punctuation or spaces'));
         $this->elementEnd('li');
+        $this->elementStart('li');
+        $this->input('email', _('Email'), $this->getEmail(),
+                     _('Used only for updates, announcements, '.
+                       'and password recovery'));
+        $this->elementEnd('li');
 
         // Hook point for captcha etc
         Event::handle('EndRegistrationFormData', array($this));
@@ -188,6 +193,39 @@ class FinishopenidloginAction extends Action
         $this->elementEnd('form');
     }
 
+    /**
+     * Get specified e-mail from the form, or the OpenID sreg info, or the
+     * invite code.
+     *
+     * @return string
+     */
+    function getEmail()
+    {
+        $email = $this->trimmed('email');
+        if (!empty($email)) {
+            return $email;
+        }
+
+        // Pull from openid thingy
+        list($display, $canonical, $sreg) = $this->getSavedValues();
+        if (!empty($sreg['email'])) {
+            return $sreg['email'];
+        }
+
+        // Terrible hack for invites...
+        if (common_config('site', 'inviteonly')) {
+            $code = $_SESSION['invitecode'];
+            if ($code) {
+                $invite = Invitation::staticGet($code);
+
+                if ($invite && $invite->address_type == 'email') {
+                    return $invite->address;
+                }
+            }
+        }
+        return '';
+    }
+
     function tryLogin()
     {
         $consumer = oid_consumer();
@@ -355,11 +393,7 @@ class FinishopenidloginAction extends Action
             $fullname = '';
         }
 
-        if (!empty($sreg['email']) && Validate::email($sreg['email'], common_config('email', 'check_domain'))) {
-            $email = $sreg['email'];
-        } else {
-            $email = '';
-        }
+        $email = $this->getEmail();
 
         # XXX: add language
         # XXX: add timezone

From 1f4b63d533beee7018f93a9050969909631d4442 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 20 Jan 2011 17:02:34 -0800
Subject: [PATCH 113/314] Add email field to Twitter registration form; needed
 when RequireValidatedEmail plugin is present.

Since Twitter doesn't provide email address back to us here, we only prefill the field if we have an invite.
---
 .../TwitterBridge/twitterauthorization.php    | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/plugins/TwitterBridge/twitterauthorization.php b/plugins/TwitterBridge/twitterauthorization.php
index e78ba6a674..972fa527d4 100644
--- a/plugins/TwitterBridge/twitterauthorization.php
+++ b/plugins/TwitterBridge/twitterauthorization.php
@@ -391,6 +391,11 @@ class TwitterauthorizationAction extends Action
                      ($this->username) ? $this->username : '',
                      _m('1-64 lowercase letters or numbers, no punctuation or spaces'));
         $this->elementEnd('li');
+        $this->elementStart('li');
+        $this->input('email', _('Email'), $this->getEmail(),
+                     _('Used only for updates, announcements, '.
+                       'and password recovery'));
+        $this->elementEnd('li');
 
         // Hook point for captcha etc
         Event::handle('EndRegistrationFormData', array($this));
@@ -419,6 +424,32 @@ class TwitterauthorizationAction extends Action
         $this->elementEnd('form');
     }
 
+    /**
+     * Get specified e-mail from the form, or the invite code.
+     *
+     * @return string
+     */
+    function getEmail()
+    {
+        $email = $this->trimmed('email');
+        if (!empty($email)) {
+            return $email;
+        }
+
+        // Terrible hack for invites...
+        if (common_config('site', 'inviteonly')) {
+            $code = $_SESSION['invitecode'];
+            if ($code) {
+                $invite = Invitation::staticGet($code);
+
+                if ($invite && $invite->address_type == 'email') {
+                    return $invite->address;
+                }
+            }
+        }
+        return '';
+    }
+
     function message($msg)
     {
         $this->message_text = $msg;
@@ -478,6 +509,11 @@ class TwitterauthorizationAction extends Action
             $args['code'] = $invite->code;
         }
 
+        $email = $this->getEmail();
+        if (!empty($email)) {
+            $args['email'] = $email;
+        }
+
         $user = User::register($args);
 
         if (empty($user)) {

From 31895ba33aea98c7621bcda19d2e7176960aaaed Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Fri, 21 Jan 2011 01:14:53 +0100
Subject: [PATCH 114/314] Add correct punctuation for client exception.

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

diff --git a/actions/atompubmembershipfeed.php b/actions/atompubmembershipfeed.php
index 8e3db3f3de..57cf465a0c 100644
--- a/actions/atompubmembershipfeed.php
+++ b/actions/atompubmembershipfeed.php
@@ -217,7 +217,7 @@ class AtompubmembershipfeedAction extends ApiAuthAction
             $this->auth_user->id != $this->_profile->id) {
             // TRANS: Client exception thrown when trying subscribe someone else to a group.
             throw new ClientException(_("Cannot add someone else's".
-                                        " membership"), 403);
+                                        " membership."), 403);
         }
 
         $xml = file_get_contents('php://input');

From ee5479b902afb74c4712f28f9a0c29b500054580 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Fri, 21 Jan 2011 01:16:30 +0100
Subject: [PATCH 115/314] Add correct punctuation for client exception.

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

diff --git a/actions/atompubshowfavorite.php b/actions/atompubshowfavorite.php
index 328f35d8f9..1727e0c3cf 100644
--- a/actions/atompubshowfavorite.php
+++ b/actions/atompubshowfavorite.php
@@ -149,7 +149,7 @@ class AtompubshowfavoriteAction extends ApiAuthAction
             $this->auth_user->id != $this->_profile->id) {
             // TRANS: Client exception thrown when trying to remove a favorite notice of another user.
             throw new ClientException(_("Cannot delete someone else's".
-                                        " favorite"), 403);
+                                        " favorite."), 403);
         }
 
         $this->_fave->delete();

From bcd34a7f3cd7a6df6b843f7f9b0bf89a696e2111 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Fri, 21 Jan 2011 01:18:39 +0100
Subject: [PATCH 116/314] Add correct punctuation for client exceptions.

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

diff --git a/actions/atompubshowmembership.php b/actions/atompubshowmembership.php
index 4454c7fd7a..a845ea23df 100644
--- a/actions/atompubshowmembership.php
+++ b/actions/atompubshowmembership.php
@@ -78,7 +78,7 @@ class AtompubshowmembershipAction extends ApiAuthAction
 
         if (empty($this->_group)) {
             // TRANS: Client exception thrown when referencing a non-existing group.
-            throw new ClientException(_('No such group'), 404);
+            throw new ClientException(_('No such group.'), 404);
         }
 
         $kv = array('group_id' => $groupId,
@@ -88,7 +88,7 @@ class AtompubshowmembershipAction extends ApiAuthAction
 
         if (empty($this->_membership)) {
             // TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-            throw new ClientException(_('Not a member'), 404);
+            throw new ClientException(_('Not a member.'), 404);
         }
 
         return true;
@@ -113,7 +113,7 @@ class AtompubshowmembershipAction extends ApiAuthAction
             break;
         default:
             // TRANS: Client exception thrown when using an unsupported HTTP method.
-            throw new ClientException(_('HTTP method not supported'), 405);
+            throw new ClientException(_('HTTP method not supported.'), 405);
             break;
         }
         return;
@@ -149,7 +149,7 @@ class AtompubshowmembershipAction extends ApiAuthAction
             $this->auth_user->id != $this->_profile->id) {
             // TRANS: Client exception thrown when deleting someone else's membership.
             throw new ClientException(_("Cannot delete someone else's".
-                                        " membership"), 403);
+                                        " membership."), 403);
         }
 
         if (Event::handle('StartLeaveGroup', array($this->_group, $this->auth_user))) {

From 08cb576b5224c9cc3b00af197f5118bae97169cf Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Fri, 21 Jan 2011 16:35:00 +0100
Subject: [PATCH 117/314] Add translator documentation Fix L10n issues Remove
 superfluous whitespace

---
 actions/backupaccount.php    | 36 +++++++---------
 actions/deleteuser.php       | 13 +++---
 actions/designadminpanel.php | 81 +++++++++++++++++++++++-------------
 actions/disfavor.php         |  6 ++-
 actions/doc.php              |  9 ++--
 actions/profilesettings.php  |  4 ++
 lib/deleteuserform.php       |  6 +--
 7 files changed, 88 insertions(+), 67 deletions(-)

diff --git a/actions/backupaccount.php b/actions/backupaccount.php
index 4f6fb936bd..7794826760 100644
--- a/actions/backupaccount.php
+++ b/actions/backupaccount.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2010, StatusNet, Inc.
  *
  * Download a backup of your own account to the browser
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -48,17 +48,16 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class BackupaccountAction extends Action
 {
     /**
      * Returns the title of the page
-     * 
+     *
      * @return string page title
      */
-
     function title()
     {
+        // TRANS: Title for backup account page.
         return _("Backup account");
     }
 
@@ -69,7 +68,6 @@ class BackupaccountAction extends Action
      *
      * @return boolean true
      */
-
     function prepare($argarray)
     {
         parent::prepare($argarray);
@@ -77,10 +75,12 @@ class BackupaccountAction extends Action
         $cur = common_current_user();
 
         if (empty($cur)) {
+            // TRANS: Client exception thrown when trying to backup an account while not logged in.
             throw new ClientException(_('Only logged-in users can backup their account.'), 403);
         }
 
         if (!$cur->hasRight(Right::BACKUPACCOUNT)) {
+            // TRANS: Client exception thrown when trying to backup an account without having backup rights.
             throw new ClientException(_('You may not backup your account.'), 403);
         }
 
@@ -94,7 +94,6 @@ class BackupaccountAction extends Action
      *
      * @return void
      */
-
     function handle($argarray=null)
     {
         parent::handle($argarray);
@@ -109,7 +108,7 @@ class BackupaccountAction extends Action
 
     /**
      * Send a feed of the user's activities to the browser
-     * 
+     *
      * Uses the UserActivityStream class; may take a long time!
      *
      * @return void
@@ -118,7 +117,7 @@ class BackupaccountAction extends Action
     function sendFeed()
     {
         $cur = common_current_user();
-        
+
         $stream = new UserActivityStream($cur);
 
         header('Content-Disposition: attachment; filename='.$cur->nickname.'.atom');
@@ -132,13 +131,13 @@ class BackupaccountAction extends Action
      *
      * @return void
      */
-    
+
     function showContent()
     {
         $form = new BackupAccountForm($this);
         $form->show();
     }
- 
+
     /**
      * Return true if read only.
      *
@@ -148,7 +147,6 @@ class BackupaccountAction extends Action
      *
      * @return boolean is read only action?
      */
-
     function isReadOnly($args)
     {
         return false;
@@ -161,7 +159,6 @@ class BackupaccountAction extends Action
      *
      * @return string last modified http header
      */
-
     function lastModified()
     {
         // For comparison with If-Last-Modified
@@ -176,7 +173,6 @@ class BackupaccountAction extends Action
      *
      * @return string etag http header
      */
-
     function etag()
     {
         return null;
@@ -193,7 +189,6 @@ class BackupaccountAction extends Action
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class BackupAccountForm extends Form
 {
     /**
@@ -201,7 +196,6 @@ class BackupAccountForm extends Form
      *
      * @return string the form's class
      */
-
     function formClass()
     {
         return 'form_profile_backup';
@@ -212,7 +206,6 @@ class BackupAccountForm extends Form
      *
      * @return string the form's action URL
      */
-
     function action()
     {
         return common_local_url('backupaccount');
@@ -220,18 +213,18 @@ class BackupAccountForm extends Form
 
     /**
      * Output form data
-     * 
+     *
      * Really, just instructions for doing a backup.
      *
      * @return void
      */
-
     function formData()
     {
         $msg =
+            // TRANS: Information displayed on the backup account page.
             _('You can backup your account data in '.
               '<a href="http://activitystrea.ms/">Activity Streams</a> '.
-              'format.  This is an experimental feature and provides an '.
+              'format. This is an experimental feature and provides an '.
               'incomplete backup; private account '.
               'information like email and IM addresses is not backed up. '.
               'Additionally, uploaded files and direct messages are not '.
@@ -243,18 +236,19 @@ class BackupAccountForm extends Form
 
     /**
      * Buttons for the form
-     * 
+     *
      * In this case, a single submit button
      *
      * @return void
      */
-
     function formActions()
     {
         $this->out->submit('submit',
+                           // TRANS: Submit button to backup an account on the backup account page.
                            _m('BUTTON', 'Backup'),
                            'submit',
                            null,
+                           // TRANS: Title for submit button to backup an account on the backup account page.
                            _('Backup your account'));
     }
 }
diff --git a/actions/deleteuser.php b/actions/deleteuser.php
index 02ded68b31..ac96b7b5d5 100644
--- a/actions/deleteuser.php
+++ b/actions/deleteuser.php
@@ -40,7 +40,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
-
 class DeleteuserAction extends ProfileFormAction
 {
     var $user = null;
@@ -52,7 +51,6 @@ class DeleteuserAction extends ProfileFormAction
      *
      * @return boolean success flag
      */
-
     function prepare($args)
     {
         if (!parent::prepare($args)) {
@@ -64,6 +62,7 @@ class DeleteuserAction extends ProfileFormAction
         assert(!empty($cur)); // checked by parent
 
         if (!$cur->hasRight(Right::DELETEUSER)) {
+            // TRANS: Client error displayed when trying to delete a user without having the right to delete users.
             $this->clientError(_('You cannot delete users.'));
             return false;
         }
@@ -71,6 +70,7 @@ class DeleteuserAction extends ProfileFormAction
         $this->user = User::staticGet('id', $this->profile->id);
 
         if (empty($this->user)) {
+            // TRANS: Client error displayed when trying to delete a non-local user.
             $this->clientError(_('You can only delete local users.'));
             return false;
         }
@@ -87,7 +87,6 @@ class DeleteuserAction extends ProfileFormAction
      *
      * @return void
      */
-
     function handle($args)
     {
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
@@ -107,7 +106,8 @@ class DeleteuserAction extends ProfileFormAction
     }
 
     function title() {
-        return _('Delete user');
+        // TRANS: Title of delete user page.
+        return _m('TITLE','Delete user');
     }
 
     function showNoticeForm() {
@@ -130,9 +130,11 @@ class DeleteuserAction extends ProfileFormAction
                                            'action' => common_local_url('deleteuser')));
         $this->elementStart('fieldset');
         $this->hidden('token', common_session_token());
+        // TRANS: Fieldset legend on delete user page.
         $this->element('legend', _('Delete user'));
         if (Event::handle('StartDeleteUserForm', array($this, $this->user))) {
             $this->element('p', null,
+                           // TRANS: Information text to request if a user is certain that the described action has to be performed.
                            _('Are you sure you want to delete this user? '.
                              'This will clear all data about the user from the '.
                              'database, without a backup.'));
@@ -153,7 +155,7 @@ class DeleteuserAction extends ProfileFormAction
                       'submit form_action-primary',
                       'no',
                       // TRANS: Submit button title for 'No' when deleting a user.
-                      _('Do not block this user'));
+                      _('Do not delete this user'));
         $this->submit('form_action-yes',
                       // TRANS: Button label on the delete user form.
                       _m('BUTTON','Yes'),
@@ -170,7 +172,6 @@ class DeleteuserAction extends ProfileFormAction
      *
      * @return void
      */
-
     function handlePost()
     {
         if (Event::handle('StartDeleteUser', array($this, $this->user))) {
diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php
index 321a8ee5eb..dd422bce91 100644
--- a/actions/designadminpanel.php
+++ b/actions/designadminpanel.php
@@ -44,10 +44,8 @@ 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 DesignadminpanelAction extends AdminPanelAction
 {
-
     /* The default site design */
     var $design = null;
 
@@ -56,7 +54,6 @@ class DesignadminpanelAction extends AdminPanelAction
      *
      * @return string page title
      */
-
     function title()
     {
         // TRANS: Message used as title for design settings for the site.
@@ -68,9 +65,9 @@ class DesignadminpanelAction extends AdminPanelAction
      *
      * @return string instructions
      */
-
     function getInstructions()
     {
+        // TRANS: Instructions for design adminsitration panel.
         return _('Design settings for this StatusNet site');
     }
 
@@ -79,7 +76,6 @@ class DesignadminpanelAction extends AdminPanelAction
      *
      * @return void
      */
-
     function showForm()
     {
         $this->design = Design::siteDesign();
@@ -93,7 +89,6 @@ class DesignadminpanelAction extends AdminPanelAction
      *
      * @return void
      */
-
     function saveSettings()
     {
         if ($this->arg('save')) {
@@ -101,6 +96,7 @@ class DesignadminpanelAction extends AdminPanelAction
         } else if ($this->arg('defaults')) {
             $this->restoreDefaults();
         } else {
+            // TRANS: Client error displayed when the submitted form contains unexpected data.
             $this->clientError(_('Unexpected form submission.'));
         }
     }
@@ -110,7 +106,6 @@ class DesignadminpanelAction extends AdminPanelAction
      *
      * @return void
      */
-
     function saveDesignSettings()
     {
         // Workaround for PHP returning empty $_POST and $_FILES when POST
@@ -225,11 +220,10 @@ class DesignadminpanelAction extends AdminPanelAction
     }
 
     /**
-      * Restore the default design
-      *
-      * @return void
-      */
-
+     * Restore the default design
+     *
+     * @return void
+     */
     function restoreDefaults()
     {
         $this->deleteSetting('site', 'logo');
@@ -257,7 +251,6 @@ class DesignadminpanelAction extends AdminPanelAction
      *
      * @return string $filename the filename of the image
      */
-
     function saveBackgroundImage()
     {
         $filename = null;
@@ -302,7 +295,6 @@ class DesignadminpanelAction extends AdminPanelAction
      * @throws ClientException for invalid theme archives
      * @throws ServerException if trouble saving the theme files
      */
-
     function saveCustomTheme()
     {
         if (common_config('theme_upload', 'enabled') &&
@@ -327,20 +319,23 @@ class DesignadminpanelAction extends AdminPanelAction
      *
      * @return void
      */
-
     function validate(&$values)
     {
         if (!empty($values['logo']) &&
             !Validate::uri($values['logo'], array('allowed_schemes' => array('http', 'https')))) {
+            // TRANS: Client error displayed when a logo URL does is not valid.
             $this->clientError(_('Invalid logo URL.'));
         }
 
         if (!empty($values['ssllogo']) &&
             !Validate::uri($values['ssllogo'], array('allowed_schemes' => array('https')))) {
+            // TRANS: Client error displayed when an SSL logo URL is invalid.
             $this->clientError(_('Invalid SSL logo URL.'));
         }
 
         if (!in_array($values['theme'], Theme::listAvailable())) {
+            // 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.
             $this->clientError(sprintf(_("Theme not available: %s."), $values['theme']));
         }
     }
@@ -350,7 +345,6 @@ class DesignadminpanelAction extends AdminPanelAction
      *
      * @return void
      */
-
     function showStylesheets()
     {
         parent::showStylesheets();
@@ -362,7 +356,6 @@ class DesignadminpanelAction extends AdminPanelAction
      *
      * @return void
      */
-
     function showScripts()
     {
         parent::showScripts();
@@ -383,7 +376,6 @@ class DesignAdminPanelForm extends AdminForm
      *
      * @return int ID of the form
      */
-
     function id()
     {
         return 'form_design_admin_panel';
@@ -394,7 +386,6 @@ class DesignAdminPanelForm extends AdminForm
      *
      * @return string class of the form
      */
-
     function formClass()
     {
         return 'form_settings';
@@ -408,7 +399,6 @@ class DesignAdminPanelForm extends AdminForm
      *
      * @return string the method to use for submitting
      */
-
     function method()
     {
         $this->enctype = 'multipart/form-data';
@@ -421,7 +411,6 @@ class DesignAdminPanelForm extends AdminForm
      *
      * @return string URL of the action
      */
-
     function action()
     {
         return common_local_url('designadminpanel');
@@ -432,7 +421,6 @@ class DesignAdminPanelForm extends AdminForm
      *
      * @return void
      */
-
     function formData()
     {
         $this->showLogo();
@@ -445,16 +433,25 @@ class DesignAdminPanelForm extends AdminForm
     function showLogo()
     {
         $this->out->elementStart('fieldset', array('id' => 'settings_design_logo'));
+        // TRANS: Fieldset legend for form to change logo.
         $this->out->element('legend', null, _('Change logo'));
 
         $this->out->elementStart('ul', 'form_data');
 
         $this->li();
-        $this->input('logo', _('Site logo'), 'Logo for the site (full URL)');
+        $this->input('logo',
+                     // TRANS: Field label for StatusNet site logo.
+                     _('Site logo'),
+                     // TRANS: Title for field label for StatusNet site logo.
+                     'Logo for the site (full URL)');
         $this->unli();
 
         $this->li();
-        $this->input('ssllogo', _('SSL logo'), 'Logo to show on SSL pages');
+        $this->input('ssllogo',
+                     // TRANS: Field label for SSL StatusNet site logo.
+                     _('SSL logo'),
+                     // TRANS: Title for field label for SSL StatusNet site logo.
+                     'Logo to show on SSL pages');
         $this->unli();
 
         $this->out->elementEnd('ul');
@@ -466,6 +463,7 @@ class DesignAdminPanelForm extends AdminForm
     function showTheme()
     {
         $this->out->elementStart('fieldset', array('id' => 'settings_design_theme'));
+        // TRANS: Fieldset legend for form change StatusNet site's theme.
         $this->out->element('legend', null, _('Change theme'));
 
         $this->out->elementStart('ul', 'form_data');
@@ -483,17 +481,21 @@ class DesignAdminPanelForm extends AdminForm
         $themes = array_combine($themes, $themes);
 
         $this->li();
+        // TRANS: Field label for dropdown to choose site theme.
         $this->out->dropdown('theme', _('Site theme'),
+                             // TRANS: Title for field label for dropdown to choose site theme.
                              $themes, _('Theme for the site.'),
                              false, $this->value('theme'));
         $this->unli();
 
         if (common_config('theme_upload', 'enabled')) {
             $this->li();
+            // TRANS: Field label for uploading a cutom theme.
             $this->out->element('label', array('for' => 'design_upload_theme'), _('Custom theme'));
             $this->out->element('input', array('id' => 'design_upload_theme',
                                                'name' => 'design_upload_theme',
                                                'type' => 'file'));
+            // TRANS: Form instructions for uploading a cutom StatusNet theme.
             $this->out->element('p', 'form_guide', _('You can upload a custom StatusNet theme as a .ZIP archive.'));
             $this->unli();
         }
@@ -509,16 +511,19 @@ class DesignAdminPanelForm extends AdminForm
 
         $this->out->elementStart('fieldset', array('id' =>
             'settings_design_background-image'));
+        // TRANS: Fieldset legend for theme background image.
         $this->out->element('legend', null, _('Change background image'));
         $this->out->elementStart('ul', 'form_data');
 
         $this->li();
         $this->out->element('label', array('for' => 'design_background-image_file'),
+                               // TRANS: Field label for background image on theme designer page.
                                 _('Background'));
         $this->out->element('input', array('name' => 'design_background-image_file',
                                      'type' => 'file',
                                      'id' => 'design_background-image_file'));
         $this->out->element('p', 'form_guide',
+            // TRANS: Form guide for background image upload form on theme designer page.
             sprintf(_('You can upload a background image for the site. ' .
               'The maximum file size is %1$s.'), ImageFile::maxFileSize()));
         $this->out->element('input', array('name' => 'MAX_FILE_SIZE',
@@ -568,11 +573,13 @@ class DesignAdminPanelForm extends AdminForm
                                           'class' => 'radio'),
                                           // TRANS: Used as radio button label to not add a background image.
                                           _('Off'));
+            // TRANS: Form guide for turning background image on or off on theme designer page.
             $this->out->element('p', 'form_guide', _('Turn background image on or off.'));
             $this->unli();
 
             $this->li();
             $this->out->checkbox('design_background-image_repeat',
+                            // TRANS: Checkbox label to title background image on theme designer page.
                             _('Tile background image'),
                             ($design->disposition & BACKGROUND_TILE) ? true : false);
             $this->unli();
@@ -587,7 +594,8 @@ class DesignAdminPanelForm extends AdminForm
         $design = $this->out->design;
 
         $this->out->elementStart('fieldset', array('id' => 'settings_design_color'));
-        $this->out->element('legend', null, _('Change colours'));
+        // TRANS: Fieldset legend for theme colors.
+        $this->out->element('legend', null, _('Change colors'));
 
         $this->out->elementStart('ul', 'form_data');
 
@@ -597,6 +605,7 @@ class DesignAdminPanelForm extends AdminForm
             $bgcolor = new WebColor($design->backgroundcolor);
 
             $this->li();
+            // TRANS: Field label for background color selector.
             $this->out->element('label', array('for' => 'swatch-1'), _('Background'));
             $this->out->element('input', array('name' => 'design_background',
                                           'type' => 'text',
@@ -610,6 +619,7 @@ class DesignAdminPanelForm extends AdminForm
             $ccolor = new WebColor($design->contentcolor);
 
             $this->li();
+            // TRANS: Field label for content color selector.
             $this->out->element('label', array('for' => 'swatch-2'), _('Content'));
             $this->out->element('input', array('name' => 'design_content',
                                           'type' => 'text',
@@ -623,6 +633,7 @@ class DesignAdminPanelForm extends AdminForm
             $sbcolor = new WebColor($design->sidebarcolor);
 
             $this->li();
+            // TRANS: Field label for sidebar color selector.
             $this->out->element('label', array('for' => 'swatch-3'), _('Sidebar'));
             $this->out->element('input', array('name' => 'design_sidebar',
                                         'type' => 'text',
@@ -636,6 +647,7 @@ class DesignAdminPanelForm extends AdminForm
             $tcolor = new WebColor($design->textcolor);
 
             $this->li();
+            // TRANS: Field label for text color selector.
             $this->out->element('label', array('for' => 'swatch-4'), _('Text'));
             $this->out->element('input', array('name' => 'design_text',
                                         'type' => 'text',
@@ -649,6 +661,7 @@ class DesignAdminPanelForm extends AdminForm
             $lcolor = new WebColor($design->linkcolor);
 
             $this->li();
+            // TRANS: Field label for link color selector.
             $this->out->element('label', array('for' => 'swatch-5'), _('Links'));
             $this->out->element('input', array('name' => 'design_links',
                                          'type' => 'text',
@@ -674,10 +687,12 @@ class DesignAdminPanelForm extends AdminForm
     {
         if (common_config('custom_css', 'enabled')) {
             $this->out->elementStart('fieldset', array('id' => 'settings_design_advanced'));
+            // TRANS: Fieldset legend for advanced theme design settings.
             $this->out->element('legend', null, _('Advanced'));
             $this->out->elementStart('ul', 'form_data');
 
             $this->li();
+            // TRANS: Field label for custom CSS.
             $this->out->element('label', array('for' => 'css'), _('Custom CSS'));
             $this->out->element('textarea', array('name' => 'css',
                                             'id' => 'css',
@@ -699,17 +714,25 @@ class DesignAdminPanelForm extends AdminForm
 
     function formActions()
     {
-        $this->out->submit('defaults', _('Use defaults'), 'submit form_action-default',
+        // TRANS: Button text for resetting theme settings.
+        $this->out->submit('defaults', _m('BUTTON','Use defaults'), 'submit form_action-default',
+                // TRANS: Title for button for resetting theme settings.
                 'defaults', _('Restore default designs'));
 
         $this->out->element('input', array('id' => 'settings_design_reset',
                                          'type' => 'reset',
+                                         // TRANS: Button text for resetting theme settings.
                                          'value' => 'Reset',
                                          'class' => 'submit form_action-primary',
+                                         // TRANS: Title for button for resetting theme settings.
                                          'title' => _('Reset back to default')));
 
-        $this->out->submit('save', _('Save'), 'submit form_action-secondary',
-                'save', _('Save design'));
+        $this->out->submit('save',
+                           // TRANS: Button text for saving theme settings.
+                           _m('BUTTON','Save'),
+                           'submit form_action-secondary',
+                           'save',
+                           // TRANS: Title for button for saving theme settings.
+                           _('Save design'));
     }
-
 }
diff --git a/actions/disfavor.php b/actions/disfavor.php
index 3ccdd69af2..57f6f7ca18 100644
--- a/actions/disfavor.php
+++ b/actions/disfavor.php
@@ -58,6 +58,7 @@ class DisfavorAction extends Action
     {
         parent::handle($args);
         if (!common_logged_in()) {
+            // TRANS: Client error displayed when trying to remove a favorite while not logged in.
             $this->clientError(_('Not logged in.'));
             return;
         }
@@ -71,6 +72,7 @@ class DisfavorAction extends Action
         $notice = Notice::staticGet($id);
         $token  = $this->trimmed('token-'.$notice->id);
         if (!$token || $token != common_session_token()) {
+            // TRANS: Client error displayed when the session token does not match or is not given.
             $this->clientError(_('There was a problem with your session token. Try again, please.'));
             return;
         }
@@ -78,12 +80,14 @@ class DisfavorAction extends Action
         $fave->user_id   = $user->id;
         $fave->notice_id = $notice->id;
         if (!$fave->find(true)) {
+            // TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
             $this->clientError(_('This notice is not a favorite!'));
             return;
         }
         $result = $fave->delete();
         if (!$result) {
             common_log_db_error($fave, 'DELETE', __FILE__);
+            // TRANS: Server error displayed when removing a favorite from the database fails.
             $this->serverError(_('Could not delete favorite.'));
             return;
         }
@@ -91,6 +95,7 @@ class DisfavorAction extends Action
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
+            // TRANS: Title for page on which favorites can be added.
             $this->element('title', null, _('Add to favorites'));
             $this->elementEnd('head');
             $this->elementStart('body');
@@ -105,4 +110,3 @@ class DisfavorAction extends Action
         }
     }
 }
-
diff --git a/actions/doc.php b/actions/doc.php
index f876fb8beb..20cf9e2810 100644
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Documentation action.
  *
@@ -83,7 +82,6 @@ class DocAction extends Action
      *
      * @return void
      */
-
     function showPageTitle()
     {
         $this->element('h1', array('class' => 'entry-title'), $this->title());
@@ -96,7 +94,6 @@ class DocAction extends Action
      *
      * @return void.
      */
-
     function showContentBlock()
     {
         $this->elementStart('div', array('id' => 'content', 'class' => 'hentry'));
@@ -117,7 +114,6 @@ class DocAction extends Action
      *
      * @return void
      */
-
     function showContent()
     {
         $this->raw($this->output);
@@ -142,7 +138,6 @@ class DocAction extends Action
      *
      * @return boolean read-only flag (false)
      */
-
     function isReadOnly($args)
     {
         return true;
@@ -155,7 +150,9 @@ class DocAction extends Action
             $this->filename = $this->getFilename();
 
             if (empty($this->filename)) {
-                throw new ClientException(sprintf(_('No such document "%s"'), $this->title), 404);
+                // TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+                // TRANS: %s is the non-existing document.
+                throw new ClientException(sprintf(_('No such document "%s".'), $this->title), 404);
             }
 
             $c = file_get_contents($this->filename);
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 523c9df4cb..7227c5c7e9 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -213,6 +213,7 @@ class ProfilesettingsAction extends AccountSettingsAction
         // CSRF protection
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
+            // TRANS: Form validation error.
             $this->showForm(_('There was a problem with your session token. '.
                               'Try again, please.'));
             return;
@@ -459,6 +460,7 @@ class ProfilesettingsAction extends AccountSettingsAction
                 $this->elementStart('li');
                 $this->element('a',
                                array('href' => common_local_url('backupaccount')),
+                               // TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
                                _('Backup account'));
                 $this->elementEnd('li');
             }
@@ -466,6 +468,7 @@ class ProfilesettingsAction extends AccountSettingsAction
                 $this->elementStart('li');
                 $this->element('a',
                                array('href' => common_local_url('deleteaccount')),
+                               // TRANS: Option in profile settings to delete the account of the currently logged in user.
                                _('Delete account'));
                 $this->elementEnd('li');
             }
@@ -473,6 +476,7 @@ class ProfilesettingsAction extends AccountSettingsAction
                 $this->elementStart('li');
                 $this->element('a',
                                array('href' => common_local_url('restoreaccount')),
+                               // TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
                                _('Restore account'));
                 $this->elementEnd('li');
             }
diff --git a/lib/deleteuserform.php b/lib/deleteuserform.php
index 09ea8f68d1..df8b480ed4 100644
--- a/lib/deleteuserform.php
+++ b/lib/deleteuserform.php
@@ -41,7 +41,6 @@ if (!defined('STATUSNET')) {
  * @link     http://status.net/
  *
  */
-
 class DeleteUserForm extends ProfileActionForm
 {
     /**
@@ -49,7 +48,6 @@ class DeleteUserForm extends ProfileActionForm
      *
      * @return string Name of the action, lowercased.
      */
-
     function target()
     {
         return 'deleteuser';
@@ -60,9 +58,9 @@ class DeleteUserForm extends ProfileActionForm
      *
      * @return string Title of the form, internationalized
      */
-
     function title()
     {
+        // TRANS: Title of form for deleting a user.
         return _('Delete');
     }
 
@@ -71,9 +69,9 @@ class DeleteUserForm extends ProfileActionForm
      *
      * @return string description of the form, internationalized
      */
-
     function description()
     {
+        // TRANS: Description of form for deleting a user.
         return _('Delete this user');
     }
 }

From 6c0e43be9eab6fe7ee446b1c54928e13e6e08d85 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Fri, 21 Jan 2011 22:45:37 +0100
Subject: [PATCH 118/314] L10n consistency updates in wording and punctuation.
 Translator documentation added/updated. Superfluous whitespace removed.

---
 actions/joingroup.php       | 16 +++++++----
 actions/leavegroup.php      | 13 ++++++---
 actions/recoverpassword.php | 53 ++++++++++++++++++++++++++++++++-----
 actions/register.php        |  7 +++--
 lib/groupeditform.php       | 15 +++--------
 lib/webcolor.php            |  9 ++++---
 6 files changed, 77 insertions(+), 36 deletions(-)

diff --git a/actions/joingroup.php b/actions/joingroup.php
index f87e5dae29..7beaf4f64a 100644
--- a/actions/joingroup.php
+++ b/actions/joingroup.php
@@ -43,7 +43,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class JoingroupAction extends Action
 {
     var $group = null;
@@ -51,12 +50,12 @@ class JoingroupAction extends Action
     /**
      * Prepare to run
      */
-
     function prepare($args)
     {
         parent::prepare($args);
 
         if (!common_logged_in()) {
+            // TRANS: Client error displayed when trying to join a group while not logged in.
             $this->clientError(_('You must be logged in to join a group.'));
             return false;
         }
@@ -79,17 +78,20 @@ class JoingroupAction extends Action
             $local = Local_group::staticGet('nickname', $nickname);
 
             if (!$local) {
+                // TRANS: Client error displayed when trying to join a non-local group.
                 $this->clientError(_('No such group.'), 404);
                 return false;
             }
 
             $this->group = User_group::staticGet('id', $local->group_id);
         } else {
+            // TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
             $this->clientError(_('No nickname or ID.'), 404);
             return false;
         }
 
         if (!$this->group) {
+            // TRANS: Client error displayed when trying to join a non-existing group.
             $this->clientError(_('No such group.'), 404);
             return false;
         }
@@ -97,11 +99,13 @@ class JoingroupAction extends Action
         $cur = common_current_user();
 
         if ($cur->isMember($this->group)) {
+            // TRANS: Client error displayed when trying to join a group while already a member.
             $this->clientError(_('You are already a member of that group.'), 403);
             return false;
         }
 
         if (Group_block::isBlocked($this->group, $cur->getProfile())) {
+            // TRANS: Client error displayed when trying to join a group while being blocked form joining it.
             $this->clientError(_('You have been blocked from that group by the admin.'), 403);
             return false;
         }
@@ -118,7 +122,6 @@ class JoingroupAction extends Action
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
@@ -131,6 +134,8 @@ class JoingroupAction extends Action
                 Event::handle('EndJoinGroup', array($this->group, $cur));
             }
         } catch (Exception $e) {
+            // 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.
             $this->serverError(sprintf(_('Could not join user %1$s to group %2$s.'),
                                        $cur->nickname, $this->group->nickname));
         }
@@ -138,7 +143,8 @@ class JoingroupAction extends Action
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
-            $this->element('title', null, sprintf(_('%1$s joined group %2$s'),
+            // TRANS: Title for join group page after joining.
+            $this->element('title', null, sprintf(_m('TITLE','%1$s joined group %2$s'),
                                                   $cur->nickname,
                                                   $this->group->nickname));
             $this->elementEnd('head');
@@ -153,4 +159,4 @@ class JoingroupAction extends Action
                             303);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/actions/leavegroup.php b/actions/leavegroup.php
index 329b5aafe1..f5d1ccd08c 100644
--- a/actions/leavegroup.php
+++ b/actions/leavegroup.php
@@ -43,7 +43,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class LeavegroupAction extends Action
 {
     var $group = null;
@@ -51,12 +50,12 @@ class LeavegroupAction extends Action
     /**
      * Prepare to run
      */
-
     function prepare($args)
     {
         parent::prepare($args);
 
         if (!common_logged_in()) {
+            // TRANS: Client error displayed when trying to leave a group while not logged in.
             $this->clientError(_('You must be logged in to leave a group.'));
             return false;
         }
@@ -79,17 +78,20 @@ class LeavegroupAction extends Action
             $local = Local_group::staticGet('nickname', $nickname);
 
             if (!$local) {
+                // TRANS: Client error displayed when trying to leave a non-local group.
                 $this->clientError(_('No such group.'), 404);
                 return false;
             }
 
             $this->group = User_group::staticGet('id', $local->group_id);
         } else {
+            // TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
             $this->clientError(_('No nickname or ID.'), 404);
             return false;
         }
 
         if (!$this->group) {
+            // TRANS: Client error displayed when trying to leave a non-existing group.
             $this->clientError(_('No such group.'), 404);
             return false;
         }
@@ -97,6 +99,7 @@ class LeavegroupAction extends Action
         $cur = common_current_user();
 
         if (!$cur->isMember($this->group)) {
+            // TRANS: Client error displayed when trying to join a group while already a member.
             $this->clientError(_('You are not a member of that group.'), 403);
             return false;
         }
@@ -113,7 +116,6 @@ class LeavegroupAction extends Action
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
@@ -126,6 +128,8 @@ class LeavegroupAction extends Action
                 Event::handle('EndLeaveGroup', array($this->group, $cur));
             }
         } catch (Exception $e) {
+            // 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.
             $this->serverError(sprintf(_('Could not remove user %1$s from group %2$s.'),
                                        $cur->nickname, $this->group->nickname));
             return;
@@ -134,7 +138,8 @@ class LeavegroupAction extends Action
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
-            $this->element('title', null, sprintf(_('%1$s left group %2$s'),
+            // TRANS: Title for leave group page after leaving.
+            $this->element('title', null, sprintf(_m('TITLE','%1$s left group %2$s'),
                                                   $cur->nickname,
                                                   $this->group->nickname));
             $this->elementEnd('head');
diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php
index 33b0440e40..c41edaeea4 100644
--- a/actions/recoverpassword.php
+++ b/actions/recoverpassword.php
@@ -33,6 +33,7 @@ class RecoverpasswordAction extends Action
     {
         parent::handle($args);
         if (common_logged_in()) {
+            // TRANS: Client error displayed trying to recover password while already logged in.
             $this->clientError(_('You are already logged in!'));
             return;
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
@@ -41,6 +42,7 @@ class RecoverpasswordAction extends Action
             } else if ($this->arg('reset')) {
                 $this->resetPassword();
             } else {
+                // TRANS: Client error displayed when unexpected data is posted in the password recovery form.
                 $this->clientError(_('Unexpected form submission.'));
             }
         } else {
@@ -54,15 +56,16 @@ class RecoverpasswordAction extends Action
 
     function checkCode()
     {
-
         $code = $this->trimmed('code');
         $confirm = Confirm_address::staticGet('code', $code);
 
         if (!$confirm) {
+            // TRANS: Client error displayed when password recovery code is not correct.
             $this->clientError(_('No such recovery code.'));
             return;
         }
         if ($confirm->address_type != 'recover') {
+            // TRANS: Client error displayed when no proper password recovery code was submitted.
             $this->clientError(_('Not a recovery code.'));
             return;
         }
@@ -70,6 +73,7 @@ class RecoverpasswordAction extends Action
         $user = User::staticGet($confirm->user_id);
 
         if (!$user) {
+            // TRANS: Server error displayed trying to recover password without providing a user.
             $this->serverError(_('Recovery code for unknown user.'));
             return;
         }
@@ -83,6 +87,7 @@ class RecoverpasswordAction extends Action
 
         if (!$result) {
             common_log_db_error($confirm, 'DELETE', __FILE__);
+            // TRANS: Server error displayed removing a password recovery code from the database.
             $this->serverError(_('Error with confirmation code.'));
             return;
         }
@@ -94,6 +99,7 @@ class RecoverpasswordAction extends Action
             common_log(LOG_WARNING,
                        'Attempted redemption on recovery code ' .
                        'that is ' . $touched . ' seconds old. ');
+            // TRANS: Client error displayed trying to recover password with too old a recovery code.
             $this->clientError(_('This confirmation code is too old. ' .
                                    'Please start again.'));
             return;
@@ -108,6 +114,7 @@ class RecoverpasswordAction extends Action
             $result = $user->updateKeys($orig);
             if (!$result) {
                 common_log_db_error($user, 'UPDATE', __FILE__);
+                // TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
                 $this->serverError(_('Could not update user with confirmed email address.'));
                 return;
             }
@@ -149,14 +156,16 @@ class RecoverpasswordAction extends Action
             $this->elementStart('div', 'instructions');
             if ($this->mode == 'recover') {
                 $this->element('p', null,
+                               // TRANS: Page notice for password recovery page.
                                _('If you have forgotten or lost your' .
                                  ' password, you can get a new one sent to' .
                                  ' the email address you have stored' .
                                  ' in your account.'));
             } else if ($this->mode == 'reset') {
+                // TRANS: Page notice for password change page.
                 $this->element('p', null,
                                _('You have been identified. Enter a' .
-                                 ' new password below. '));
+                                 ' new password below.'));
             }
             $this->elementEnd('div');
         }
@@ -185,19 +194,24 @@ class RecoverpasswordAction extends Action
                                            'class' => 'form_settings',
                                            'action' => common_local_url('recoverpassword')));
         $this->elementStart('fieldset');
+        // TRANS: Fieldset legend for password recovery page.
         $this->element('legend', null, _('Password recovery'));
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
+        // TRANS: Field label on password recovery page.
         $this->input('nicknameoremail', _('Nickname or email address'),
                      $this->trimmed('nicknameoremail'),
+                     // TRANS: Title for field label on password recovery page.
                      _('Your nickname on this server, ' .
                         'or your registered email address.'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
         $this->element('input', array('name' => 'recover',
                                       'type' => 'hidden',
+                                      // TRANS: Field label on password recovery page.
                                       'value' => _('Recover')));
-        $this->submit('recover', _('Recover'));
+        // TRANS: Button text on password recovery page.
+        $this->submit('recover', _m('BUTTON','Recover'));
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
@@ -205,11 +219,16 @@ class RecoverpasswordAction extends Action
     function title()
     {
         switch ($this->mode) {
+         // TRANS: Title for password recovery page in password reset mode.
          case 'reset': return _('Reset password');
+         // TRANS: Title for password recovery page in password recover mode.
          case 'recover': return _('Recover password');
+         // TRANS: Title for password recovery page in email sent mode.
          case 'sent': return _('Password recovery requested');
+         // TRANS: Title for password recovery page in password saved mode.
          case 'saved': return _('Password saved.');
          default:
+            // TRANS: Title for password recovery page when an unknown action has been specified.
             return _('Unknown action');
         }
     }
@@ -228,19 +247,25 @@ class RecoverpasswordAction extends Action
                                            'class' => 'form_settings',
                                            'action' => common_local_url('recoverpassword')));
         $this->elementStart('fieldset');
+         // TRANS: Fieldset legend for password reset form.
         $this->element('legend', null, _('Password change'));
         $this->hidden('token', common_session_token());
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
+         // TRANS: Field label for password reset form.
         $this->password('newpassword', _('New password'),
-                        _('6 or more characters, and don\'t forget it!'));
+                        // TRANS: Title for field label for password reset form.
+                        _('6 or more characters, and do not forget it!'));
         $this->elementEnd('li');
         $this->elementStart('li');
+         // TRANS: Field label for password reset form where the password has to be typed again.
         $this->password('confirm', _('Confirm'),
-                        _('Same as password above'));
+                        // TRANS: Ttile for field label for password reset form where the password has to be typed again.
+                        _('Same as password above.'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
-        $this->submit('reset', _('Reset'));
+         // TRANS: Button text for password reset form.
+        $this->submit('reset', _m('BUTTON','Reset'));
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
@@ -249,6 +274,7 @@ class RecoverpasswordAction extends Action
     {
         $nore = $this->trimmed('nicknameoremail');
         if (!$nore) {
+            // TRANS: Form instructions for password recovery form.
             $this->showForm(_('Enter a nickname or email address.'));
             return;
         }
@@ -279,6 +305,7 @@ class RecoverpasswordAction extends Action
         }
 
         if (!$user) {
+            // TRANS: Information on password recovery form if no known username or e-mail address was specified.
             $this->showForm(_('No user with that email address or username.'));
             return;
         }
@@ -296,6 +323,7 @@ class RecoverpasswordAction extends Action
         }
 
         if (!$user->email && !$confirm_email) {
+            // TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
             $this->clientError(_('No registered email address for that user.'));
             return;
         }
@@ -310,10 +338,12 @@ class RecoverpasswordAction extends Action
 
         if (!$confirm->insert()) {
             common_log_db_error($confirm, 'INSERT', __FILE__);
+            // TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
             $this->serverError(_('Error saving address confirmation.'));
             return;
         }
 
+         // @todo FIXME: needs i18n.
         $body = "Hey, $user->nickname.";
         $body .= "\n\n";
         $body .= 'Someone just asked for a new password ' .
@@ -332,9 +362,11 @@ class RecoverpasswordAction extends Action
         $body .= "\n";
 
         $headers = _mail_prepare_headers('recoverpassword', $user->nickname, $user->nickname);
+        // TRANS: Subject for password recovery e-mail.
         mail_to_user($user, _('Password recovery requested'), $body, $headers, $confirm->address);
 
         $this->mode = 'sent';
+        // TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
         $this->msg = _('Instructions for recovering your password ' .
                           'have been sent to the email address registered to your ' .
                           'account.');
@@ -347,6 +379,7 @@ class RecoverpasswordAction extends Action
         # CSRF protection
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
+            // TRANS: Form validation error message.
             $this->showForm(_('There was a problem with your session token. Try again, please.'));
             return;
         }
@@ -354,6 +387,7 @@ class RecoverpasswordAction extends Action
         $user = $this->getTempUser();
 
         if (!$user) {
+            // TRANS: Client error displayed when trying to reset as password without providing a user.
             $this->clientError(_('Unexpected password reset.'));
             return;
         }
@@ -362,10 +396,12 @@ class RecoverpasswordAction extends Action
         $confirm = $this->trimmed('confirm');
 
         if (!$newpassword || strlen($newpassword) < 6) {
+            // TRANS: Reset password form validation error message.
             $this->showPasswordForm(_('Password must be 6 characters or more.'));
             return;
         }
         if ($newpassword != $confirm) {
+            // TRANS: Reset password form validation error message.
             $this->showPasswordForm(_('Password and confirmation do not match.'));
             return;
         }
@@ -378,13 +414,15 @@ class RecoverpasswordAction extends Action
 
         if (!$user->update($original)) {
             common_log_db_error($user, 'UPDATE', __FILE__);
-            $this->serverError(_('Can\'t save new password.'));
+            // TRANS: Reset password form validation error message.
+            $this->serverError(_('Cannot save new password.'));
             return;
         }
 
         $this->clearTempUser();
 
         if (!common_set_user($user->nickname)) {
+            // TRANS: Server error displayed when something does wrong with the user object during password reset.
             $this->serverError(_('Error setting user.'));
             return;
         }
@@ -392,6 +430,7 @@ class RecoverpasswordAction extends Action
         common_real_login(true);
 
         $this->mode = 'saved';
+        // TRANS: Success message for user after password reset.
         $this->msg = _('New password successfully saved. ' .
                        'You are now logged in.');
         $this->success = true;
diff --git a/actions/register.php b/actions/register.php
index 5d91aef70e..488d8901fc 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -430,16 +430,15 @@ class RegisterAction extends Action
         if (Event::handle('StartRegistrationFormData', array($this))) {
             $this->elementStart('li');
             $this->input('nickname', _('Nickname'), $this->trimmed('nickname'),
-                         _('1-64 lowercase letters or numbers, '.
-                           'no punctuation or spaces. Required.'));
+                         _('1-64 lowercase letters or numbers, no punctuation or spaces.'));
             $this->elementEnd('li');
             $this->elementStart('li');
             $this->password('password', _('Password'),
-                            _('6 or more characters. Required.'));
+                            _('6 or more characters.'));
             $this->elementEnd('li');
             $this->elementStart('li');
             $this->password('confirm', _('Confirm'),
-                            _('Same as password above. Required.'));
+                            _('Same as password above.'));
             $this->elementEnd('li');
             $this->elementStart('li');
             if ($this->invite && $this->invite->address_type == 'email') {
diff --git a/lib/groupeditform.php b/lib/groupeditform.php
index cc25f06886..8a111b4642 100644
--- a/lib/groupeditform.php
+++ b/lib/groupeditform.php
@@ -46,13 +46,11 @@ require_once INSTALLDIR.'/lib/form.php';
  *
  * @see      UnsubscribeForm
  */
-
 class GroupEditForm extends Form
 {
     /**
      * group for user to join
      */
-
     var $group = null;
 
     /**
@@ -61,7 +59,6 @@ class GroupEditForm extends Form
      * @param Action     $out   output channel
      * @param User_group $group group to join
      */
-
     function __construct($out=null, $group=null)
     {
         parent::__construct($out);
@@ -74,7 +71,6 @@ class GroupEditForm extends Form
      *
      * @return string ID of the form
      */
-
     function id()
     {
         if ($this->group) {
@@ -89,7 +85,6 @@ class GroupEditForm extends Form
      *
      * @return string of the form class
      */
-
     function formClass()
     {
         return 'form_settings';
@@ -100,7 +95,6 @@ class GroupEditForm extends Form
      *
      * @return string URL of the action
      */
-
     function action()
     {
         if ($this->group) {
@@ -116,7 +110,6 @@ class GroupEditForm extends Form
      *
      * @return void
      */
-
     function formLegend()
     {
         $this->out->element('legend', null, _('Create a new group'));
@@ -127,7 +120,6 @@ class GroupEditForm extends Form
      *
      * @return void
      */
-
     function formData()
     {
         if ($this->group) {
@@ -151,7 +143,7 @@ class GroupEditForm extends Form
         $this->out->hidden('groupid', $id);
         $this->out->input('nickname', _('Nickname'),
                           ($this->out->arg('nickname')) ? $this->out->arg('nickname') : $nickname,
-                          _('1-64 lowercase letters or numbers, no punctuation or spaces'));
+                          _('1-64 lowercase letters or numbers, no punctuation or spaces.'));
         $this->out->elementEnd('li');
         $this->out->elementStart('li');
         $this->out->input('fullname', _('Full name'),
@@ -167,8 +159,8 @@ class GroupEditForm extends Form
         if ($desclimit == 0) {
             $descinstr = _('Describe the group or topic');
         } else {
-            $descinstr = sprintf(_m('Describe the group or topic in %d character or less',
-                                    'Describe the group or topic in %d characters or less',
+            $descinstr = sprintf(_m('Describe the group or topic in %d character or less.',
+                                    'Describe the group or topic in %d characters or less.',
                                     $desclimit),
                                  $desclimit);
         }
@@ -201,7 +193,6 @@ class GroupEditForm extends Form
      *
      * @return void
      */
-
     function formActions()
     {
         $this->out->submit('submit', _m('BUTTON','Save'));
diff --git a/lib/webcolor.php b/lib/webcolor.php
index 7f264c6741..bf791bf794 100644
--- a/lib/webcolor.php
+++ b/lib/webcolor.php
@@ -45,7 +45,6 @@ class WebColor {
      *
      * @return nothing
      */
-
     function __construct($color = null)
     {
         if (isset($color)) {
@@ -77,7 +76,9 @@ class WebColor {
             if (preg_match('/(#([0-9A-Fa-f]{3,6})\b)/u', $color) > 0) {
                 $this->setHexColor($color);
             } else {
-                $errmsg = _('%s is not a valid color!');
+                // TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+                // TRANS: %s is the provided (invalid) color code.
+                $errmsg = _('%s is not a valid color! Use 3 or 6 hex characters.');
                 throw new WebColorException(sprintf($errmsg, $color));
             }
         }
@@ -115,8 +116,8 @@ class WebColor {
                                      $hexcolor[1].$hexcolor[1],
                                      $hexcolor[2].$hexcolor[2]);
         } else {
-            // TRANS: Validation error for a web colour.
-            // TRANS: %s is the provided (invalid) text for colour.
+            // TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+            // TRANS: %s is the provided (invalid) color code.
             $errmsg = _('%s is not a valid color! Use 3 or 6 hex characters.');
             throw new WebColorException(sprintf($errmsg, $hexcolor));
         }

From 4642b024cc75d35a1c11d54f7dc5c4b88f3472d0 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sat, 22 Jan 2011 20:17:19 +0100
Subject: [PATCH 119/314] Localisation updates from http://translatewiki.net.

---
 locale/ar/LC_MESSAGES/statusnet.po            | 669 +++++++++------
 locale/arz/LC_MESSAGES/statusnet.po           | 662 ++++++++------
 locale/bg/LC_MESSAGES/statusnet.po            | 673 +++++++++------
 locale/br/LC_MESSAGES/statusnet.po            | 673 +++++++++------
 locale/ca/LC_MESSAGES/statusnet.po            | 679 +++++++++------
 locale/cs/LC_MESSAGES/statusnet.po            | 673 +++++++++------
 locale/de/LC_MESSAGES/statusnet.po            | 674 +++++++++------
 locale/en_GB/LC_MESSAGES/statusnet.po         | 671 +++++++++------
 locale/eo/LC_MESSAGES/statusnet.po            | 673 +++++++++------
 locale/es/LC_MESSAGES/statusnet.po            | 679 +++++++++------
 locale/fa/LC_MESSAGES/statusnet.po            | 671 +++++++++------
 locale/fi/LC_MESSAGES/statusnet.po            | 681 +++++++++------
 locale/fr/LC_MESSAGES/statusnet.po            | 677 +++++++++------
 locale/gl/LC_MESSAGES/statusnet.po            | 679 +++++++++------
 locale/hsb/LC_MESSAGES/statusnet.po           | 731 +++++++++-------
 locale/hu/LC_MESSAGES/statusnet.po            | 674 +++++++++------
 locale/ia/LC_MESSAGES/statusnet.po            | 716 +++++++++-------
 locale/is/LC_MESSAGES/statusnet.po            | 672 +++++++++------
 locale/it/LC_MESSAGES/statusnet.po            | 677 +++++++++------
 locale/ja/LC_MESSAGES/statusnet.po            | 674 +++++++++------
 locale/ka/LC_MESSAGES/statusnet.po            | 677 +++++++++------
 locale/ko/LC_MESSAGES/statusnet.po            | 680 +++++++++------
 locale/mk/LC_MESSAGES/statusnet.po            | 749 +++++++++-------
 locale/ml/LC_MESSAGES/statusnet.po            | 811 +++++++++++-------
 locale/nb/LC_MESSAGES/statusnet.po            | 677 +++++++++------
 locale/nl/LC_MESSAGES/statusnet.po            | 715 ++++++++-------
 locale/nn/LC_MESSAGES/statusnet.po            | 675 +++++++++------
 locale/pl/LC_MESSAGES/statusnet.po            | 712 ++++++++-------
 locale/pt/LC_MESSAGES/statusnet.po            | 675 +++++++++------
 locale/pt_BR/LC_MESSAGES/statusnet.po         | 676 +++++++++------
 locale/ru/LC_MESSAGES/statusnet.po            | 676 +++++++++------
 locale/statusnet.pot                          | 607 +++++++------
 locale/sv/LC_MESSAGES/statusnet.po            | 674 +++++++++------
 locale/te/LC_MESSAGES/statusnet.po            | 671 +++++++++------
 locale/tr/LC_MESSAGES/statusnet.po            | 684 +++++++++------
 locale/uk/LC_MESSAGES/statusnet.po            | 681 +++++++++------
 locale/zh_CN/LC_MESSAGES/statusnet.po         | 671 +++++++++------
 plugins/Facebook/locale/Facebook.pot          |  14 +-
 .../locale/be-tarask/LC_MESSAGES/Facebook.po  |  20 +-
 .../locale/br/LC_MESSAGES/Facebook.po         |  20 +-
 .../locale/de/LC_MESSAGES/Facebook.po         |  20 +-
 .../locale/es/LC_MESSAGES/Facebook.po         |  20 +-
 .../locale/fr/LC_MESSAGES/Facebook.po         |  20 +-
 .../locale/gl/LC_MESSAGES/Facebook.po         |  20 +-
 .../locale/ia/LC_MESSAGES/Facebook.po         |  20 +-
 .../locale/mk/LC_MESSAGES/Facebook.po         |  22 +-
 .../locale/nb/LC_MESSAGES/Facebook.po         |  20 +-
 .../locale/nl/LC_MESSAGES/Facebook.po         |  20 +-
 .../locale/pt_BR/LC_MESSAGES/Facebook.po      |  20 +-
 .../locale/tl/LC_MESSAGES/Facebook.po         |  20 +-
 .../locale/uk/LC_MESSAGES/Facebook.po         |  20 +-
 .../locale/zh_CN/LC_MESSAGES/Facebook.po      |  20 +-
 plugins/OpenID/locale/OpenID.pot              |  18 +-
 .../OpenID/locale/br/LC_MESSAGES/OpenID.po    |  24 +-
 .../OpenID/locale/ca/LC_MESSAGES/OpenID.po    |  24 +-
 .../OpenID/locale/de/LC_MESSAGES/OpenID.po    |  24 +-
 .../OpenID/locale/fr/LC_MESSAGES/OpenID.po    |  24 +-
 .../OpenID/locale/ia/LC_MESSAGES/OpenID.po    |  24 +-
 .../OpenID/locale/mk/LC_MESSAGES/OpenID.po    |  24 +-
 .../OpenID/locale/nl/LC_MESSAGES/OpenID.po    |  24 +-
 .../OpenID/locale/tl/LC_MESSAGES/OpenID.po    |  24 +-
 .../OpenID/locale/uk/LC_MESSAGES/OpenID.po    |  24 +-
 .../locale/RegisterThrottle.pot               |  10 +-
 .../locale/de/LC_MESSAGES/RegisterThrottle.po |  19 +-
 .../locale/fr/LC_MESSAGES/RegisterThrottle.po |  19 +-
 .../locale/ia/LC_MESSAGES/RegisterThrottle.po |  19 +-
 .../locale/mk/LC_MESSAGES/RegisterThrottle.po |  19 +-
 .../locale/nl/LC_MESSAGES/RegisterThrottle.po |  19 +-
 .../locale/tl/LC_MESSAGES/RegisterThrottle.po |  20 +-
 .../locale/uk/LC_MESSAGES/RegisterThrottle.po |  19 +-
 .../locale/ru/LC_MESSAGES/SQLProfile.po       |  28 +
 .../locale/mk/LC_MESSAGES/TabFocus.po         |  10 +-
 .../TwitterBridge/locale/TwitterBridge.pot    |  18 +-
 .../locale/br/LC_MESSAGES/TwitterBridge.po    |  24 +-
 .../locale/ca/LC_MESSAGES/TwitterBridge.po    |  24 +-
 .../locale/fa/LC_MESSAGES/TwitterBridge.po    |  24 +-
 .../locale/fr/LC_MESSAGES/TwitterBridge.po    |  24 +-
 .../locale/ia/LC_MESSAGES/TwitterBridge.po    |  24 +-
 .../locale/mk/LC_MESSAGES/TwitterBridge.po    |  24 +-
 .../locale/nl/LC_MESSAGES/TwitterBridge.po    |  24 +-
 .../locale/tr/LC_MESSAGES/TwitterBridge.po    |  24 +-
 .../locale/uk/LC_MESSAGES/TwitterBridge.po    |  24 +-
 .../locale/zh_CN/LC_MESSAGES/TwitterBridge.po |  24 +-
 83 files changed, 15446 insertions(+), 10813 deletions(-)
 create mode 100644 plugins/SQLProfile/locale/ru/LC_MESSAGES/SQLProfile.po

diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index 4d58e73db5..deb8809e07 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -11,19 +11,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:04:58+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:55:43+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 (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
 "2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
 "99) ? 4 : 5 ) ) ) );\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -78,6 +78,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -89,13 +90,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "احفظ"
@@ -322,7 +323,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "تعذّر تحديث المستخدم."
@@ -346,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "لم يمكن حفظ الملف."
 
@@ -356,7 +357,7 @@ msgstr "لم يمكن حفظ الملف."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
@@ -538,7 +539,8 @@ msgid "That status is not a favorite."
 msgstr "تلك الحالة ليست مفضلة."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "تعذّر حذف المفضلة."
 
@@ -586,7 +588,7 @@ msgstr "تعذّر إيجاد المستخدم الهدف."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "الاسم المستعار مستخدم بالفعل. جرّب اسمًا آخرًا."
@@ -596,7 +598,7 @@ msgstr "الاسم المستعار مستخدم بالفعل. جرّب اسمً
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "ليس اسمًا مستعارًا صحيحًا."
@@ -608,7 +610,7 @@ msgstr "ليس اسمًا مستعارًا صحيحًا."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "الصفحة الرئيسية ليست عنونًا صالحًا."
@@ -618,7 +620,7 @@ msgstr "الصفحة الرئيسية ليست عنونًا صالحًا."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -650,7 +652,7 @@ msgstr[5] "المنظمة طويلة جدا (الأقصى %d حرفا)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -712,24 +714,28 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 #, fuzzy
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 #, fuzzy
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "لم يمكن ضم المستخدم %1$s إلى المجموعة %2$s."
@@ -741,9 +747,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -804,9 +812,12 @@ msgid "Request token already authorized."
 msgstr "لا تملك تصريحًا."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -814,7 +825,7 @@ msgstr "لا تملك تصريحًا."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -836,18 +847,20 @@ msgstr "خطأ في قاعدة البيانات أثناء حذف مستخدم 
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr ""
@@ -896,7 +909,7 @@ msgstr "الحساب"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "الاسم المستعار"
@@ -904,7 +917,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "كلمة السر"
 
@@ -1013,10 +1026,12 @@ msgstr "كرر بالفعل هذه الملاحظة."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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
@@ -1298,7 +1313,7 @@ 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"
+msgid "Cannot add someone else's membership."
 msgstr "تعذّر إدراج اشتراك جديد."
 
 #. TRANS: Client error displayed when not using the POST verb.
@@ -1334,30 +1349,51 @@ 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "تعذّر حذف المفضلة."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "لا مجموعة كهذه"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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"
+msgid "Not a member."
 msgstr "جميع الأعضاء"
 
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "لم يتم العثور على وسيلة API."
-
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
 msgstr "تعذّر حفظ الاشتراك."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1529,35 +1565,42 @@ msgstr "فشل تحديث الأفتار."
 msgid "Avatar deleted."
 msgstr "حُذف الأفتار."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "الخلفية"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1588,14 +1631,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "لا"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "لا تمنع هذا المستخدم"
 
@@ -1607,7 +1649,7 @@ msgstr "لا تمنع هذا المستخدم"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "نعم"
@@ -1623,32 +1665,6 @@ msgstr "امنع هذا المستخدم"
 msgid "Failed to save block information."
 msgstr "فشل حفظ معلومات المنع."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "لا مجموعة كهذه."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1781,7 +1797,8 @@ msgid "Account deleted."
 msgstr "حُذف الأفتار."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "أنشئ حسابًا"
@@ -1803,8 +1820,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "أكّد"
 
@@ -1876,8 +1894,10 @@ 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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 "لا اسم مستعار."
@@ -1930,10 +1950,11 @@ msgid "Delete this group"
 msgstr "احذف هذا المستخدم"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1971,98 +1992,133 @@ msgstr "لا تحذف هذا الإشعار"
 msgid "Delete this notice"
 msgstr "احذف هذا الإشعار"
 
-#: actions/deleteuser.php:67
+#. 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 "يمكنك حذف المستخدمين المحليين فقط."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "احذف المستخدم"
 
-#: actions/deleteuser.php:136
+#. 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:163 lib/deleteuserform.php:77
+#. 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.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "التصميم"
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "مسار شعار غير صالح."
 
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "مسار شعار غير صالح."
 
-#: actions/designadminpanel.php:344
+#. 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"
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "غيّر الشعار"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "شعار الموقع"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "شعار الموقع"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "غيّر السمة"
 
-#: actions/designadminpanel.php:486
+#. 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 "سمة الموقع."
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "سمة مخصصة"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "الخلفية"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2070,99 +2126,109 @@ msgid ""
 msgstr "بإمكانك رفع صورة خلفية للموقع. أقصى حجم للملف هو %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "مكّن"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 #, fuzzy
 msgid "Tile background image"
 msgstr "تغيير صورة الخلفية"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. 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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "وصلات"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "متقدم"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "CSS مخصصة"
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
 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:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "ارجع إلى المبدئي"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "أرسل"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "احفظ التصميم"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "هذا الشعار ليس مفضلًا!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "أضف إلى المفضلات"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2880,7 +2946,7 @@ msgstr ""
 "عبر الصياغة \"!اسم_المجموعة\". ألا ترى مجموعة تعجبك؟ جرّب [البحث عن مجموعة](%%"
 "%%action.groupsearch%%%%) أو [ابدأ مجموعتك!](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "أنشئ مجموعة جديدة"
 
@@ -3256,26 +3322,33 @@ msgid ""
 "Sincerely, %2$s\n"
 msgstr ""
 
-#: actions/joingroup.php:60
+#. 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 "يجب أن تلج لتنضم إلى مجموعة."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s انضم للمجموعة %2$s"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "لست عضوا في تلك المجموعة."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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"
 
@@ -3380,6 +3453,13 @@ msgstr ""
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "أرسل"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
@@ -3404,11 +3484,11 @@ msgstr "لُج"
 msgid "Login to site"
 msgstr "لُج إلى الموقع"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "تذكّرني"
 
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "لُج تلقائيًا في المستقبل؛ هذا الخيار ليس مُعدًا للحواسيب المشتركة!"
 
@@ -3789,7 +3869,8 @@ msgstr "تغيير كلمة السر"
 msgid "Change your password."
 msgstr "غيّر كلمة سرك."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "تغيير كلمة السر"
 
@@ -3797,7 +3878,8 @@ msgstr "تغيير كلمة السر"
 msgid "Old password"
 msgstr "كلمة السر القديمة"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "كلمة السر الجديدة"
 
@@ -3805,7 +3887,7 @@ msgstr "كلمة السر الجديدة"
 msgid "6 or more characters"
 msgstr "6 أحرف أو أكثر"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "نفس كلمة السر أعلاه"
 
@@ -3829,11 +3911,12 @@ msgstr "كلمة السر القديمة غير صحيحة"
 msgid "Error saving user; invalid."
 msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "تعذّر حفظ كلمة السر الجديدة."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "حُفظت كلمة السر."
 
@@ -4173,23 +4256,24 @@ msgid "Profile information"
 msgstr "معلومات الملف الشخصي"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 #, 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 msgid "Full name"
 msgstr "الاسم الكامل"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "الصفحة الرئيسية"
 
@@ -4202,7 +4286,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:472
+#: 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"
@@ -4214,27 +4298,27 @@ msgstr[4] "تكلم عن نفسك واهتمامتك في %d حرف"
 msgstr[5] "تكلم عن نفسك واهتمامتك في %d حرف"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "الموقع"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "مكان تواجدك، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\""
 
@@ -4286,7 +4370,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:257 actions/register.php:229
+#: 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)."
@@ -4298,49 +4382,50 @@ msgstr[4] "الاسم طويل جدا (الأقصى %d حرفا)."
 msgstr[5] "الاسم طويل جدا (الأقصى %d حرفا)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "لم تُختر المنطقة الزمنية."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
 #, 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "لم يمكن حفظ تفضيلات الموقع."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "أنشئ حسابًا"
@@ -4458,129 +4543,180 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "سحابة الوسوم"
 
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "أنت والج بالفعل!"
 
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "لا رمز استعادة كهذا."
 
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "ليس رمز استعادة."
 
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "رمز استعادة لمستخدم غير معروف."
 
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "خطأ في رمز التأكيد."
 
-#: actions/recoverpassword.php:97
+#. 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 "رمز التأكيد هذا قديم جدًا. من فضلك ابدأ من جديد."
 
-#: actions/recoverpassword.php:111
+#. 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 "عنوان البريد الإلكتروني المُؤكد الحالي."
 
-#: actions/recoverpassword.php:152
+#. 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:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+msgid "You have been identified. Enter a new password below."
 msgstr ""
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "استعادة كلمة السر"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "الاسم المستعار أو البريد الإلكتروني"
 
-#: actions/recoverpassword.php:193
+#. 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 ""
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "استرجع"
 
-#: actions/recoverpassword.php:208
+#. 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 "أعد ضبط كلمة السر"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "استعد كلمة السر"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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 "طُلبت استعادة كلمة السر"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "إجراء غير معروف"
 
-#: actions/recoverpassword.php:236
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
 #, fuzzy
-msgid "6 or more characters, and don't forget it!"
+msgid "6 or more characters, and do not forget it!"
 msgstr "6 أحرف أو أكثر"
 
-#: actions/recoverpassword.php:243
+#. 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
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "أعد الضبط"
 
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "أدخل اسمًا مستعارًا أو عنوان بريد إلكتروني."
 
-#: actions/recoverpassword.php:282
+#. 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 "لا يوجد عنوان بريد إلكتروني مُسجّل لهذا المستخدم."
 
-#: actions/recoverpassword.php:299
+#. 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 "لا يوجد عنوان بريد إلكتروني مُسجّل لهذا المستخدم."
 
-#: actions/recoverpassword.php:313
+#. 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 "خطأ أثناء حفظ تأكيد العنوان."
 
-#: actions/recoverpassword.php:338
+#. 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 ""
 
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
 #, fuzzy
 msgid "Unexpected password reset."
 msgstr "أعد ضبط كلمة السر"
 
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "يجب أن تكون كلمة السر 6 محارف أو أكثر."
 
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
 #, fuzzy
 msgid "Password and confirmation do not match."
 msgstr "كلمتا السر غير متطابقتين."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "خطأ أثناء ضبط المستخدم."
 
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
@@ -4596,7 +4732,7 @@ msgstr "عذرا، رمز دعوة غير صالح."
 msgid "Registration successful"
 msgstr "نجح التسجيل"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "سجّل"
 
@@ -4623,67 +4759,59 @@ msgid ""
 "link up to friends and colleagues. "
 msgstr ""
 
-#: actions/register.php:433
+#: actions/register.php:437
 #, fuzzy
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 حروف أو أكثر. مطلوب."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "نفس كلمة السر أعلاه. مطلوب."
+msgid "6 or more characters."
+msgstr "6 أحرف أو أكثر"
 
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "البريد الإلكتروني"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
-#: actions/register.php:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
-#: actions/register.php:463
+#: actions/register.php:462
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "مسار صفحتك الرئيسية أو مدونتك أو ملفك الشخصي على موقع آخر"
 
-#: actions/register.php:524
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:534
+#: 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:538
+#: 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:541
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "جميع الحقوق محفوظة."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: 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:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4702,7 +4830,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5007,7 +5135,7 @@ msgstr "المنظمة"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "الوصف"
 
@@ -5031,8 +5159,9 @@ msgstr "معلومات التطبيق"
 msgid "Reset key & secret"
 msgstr ""
 
+#. TRANS: Title of form for deleting a user.
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "احذف"
 
@@ -5155,7 +5284,7 @@ msgid "Note"
 msgstr "ملاحظة"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "الكنى"
 
@@ -7748,25 +7877,25 @@ msgstr ""
 "tracking - لم يطبق بعد.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 #, 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:153
+#: lib/common.php:158
 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "اذهب إلى المُثبّت."
 
@@ -7837,12 +7966,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "عطّل"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-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: 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".
@@ -7926,23 +8058,19 @@ msgstr "اذهب"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "مسار صفحة هذا التطبيق"
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "صِف المجموعة أو الموضوع"
 
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
 #, 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"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
 msgstr[0] "صِف المجموعة أو الموضوع"
 msgstr[1] "صِف المجموعة أو الموضوع"
 msgstr[2] "صِف المجموعة أو الموضوع"
@@ -7950,13 +8078,13 @@ msgstr[3] "صِف المجموعة أو الموضوع"
 msgstr[4] "صِف المجموعة أو الموضوع"
 msgstr[5] "صِف المجموعة أو الموضوع"
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "مكان تواجدك، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\""
 
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9119,14 +9247,9 @@ msgstr[5] ""
 msgid "about a year ago"
 msgstr "قبل سنة تقريبًا"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s ليس لونًا صحيحًا!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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 ليس لونًا صحيحًا!"
@@ -9167,27 +9290,29 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "لا ملف كهذا."
+#~ msgid "No such group"
+#~ msgstr "لا مجموعة كهذه"
 
 #, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "المجموعات التي %s عضو فيها"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
 #~ msgstr "لم يتم العثور على وسيلة API."
 
+#~ msgid "Reset"
+#~ msgstr "أعد الضبط"
+
 #, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "الأشخاص المشتركون ب%s"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
 
-#~ msgid "Couldn't update user."
-#~ msgstr "تعذّر تحديث المستخدم."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 حروف أو أكثر. مطلوب."
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "تعذّر حفظ الملف الشخصي."
+#~ msgid "Same as password above. Required."
+#~ msgstr "نفس كلمة السر أعلاه. مطلوب."
 
-#~ msgid "Couldn't save tags."
-#~ msgstr "تعذّر حفظ الوسوم."
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s ليس لونًا صحيحًا!"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index e94116d72a..717851daee 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-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:00+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:55:48+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 (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: arz\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -81,6 +81,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -92,13 +93,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
@@ -326,7 +327,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "تعذّر تحديث المستخدم."
@@ -350,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "لم يمكن حفظ الملف."
 
@@ -360,7 +361,7 @@ msgstr "لم يمكن حفظ الملف."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
@@ -543,7 +544,8 @@ msgid "That status is not a favorite."
 msgstr "الحاله دى مش محطوطه فى التفضيلات."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "تعذّر حذف المفضله."
 
@@ -592,7 +594,7 @@ msgstr "تعذّر إيجاد المستخدم الهدف."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr ""
@@ -602,7 +604,7 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "ليس اسمًا مستعارًا صحيحًا."
@@ -614,7 +616,7 @@ msgstr "ليس اسمًا مستعارًا صحيحًا."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "الصفحه الرئيسيه ليست عنونًا صالحًا."
@@ -624,7 +626,7 @@ msgstr "الصفحه الرئيسيه ليست عنونًا صالحًا."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -656,7 +658,7 @@ msgstr[5] "المنظمه طويله جدا (اكتر حاجه %d رمز)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -718,24 +720,28 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 #, fuzzy
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 #, fuzzy
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "ما نفعش يضم %1$s للجروپ %2$s."
@@ -748,9 +754,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -811,9 +819,12 @@ msgid "Request token already authorized."
 msgstr "لا تملك تصريحًا."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -821,7 +832,7 @@ msgstr "لا تملك تصريحًا."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -843,18 +854,20 @@ msgstr "خطأ قاعده البيانات أثناء إدخال المستخد
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr ""
@@ -903,7 +916,7 @@ msgstr "الحساب"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "الاسم المستعار"
@@ -911,7 +924,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "كلمه السر"
 
@@ -1021,10 +1034,12 @@ msgstr "الملاحظه اتكررت فعلا."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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
@@ -1309,7 +1324,7 @@ 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"
+msgid "Cannot add someone else's membership."
 msgstr "تعذّر إدراج اشتراك جديد."
 
 #. TRANS: Client error displayed when not using the POST verb.
@@ -1345,30 +1360,51 @@ 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "تعذّر حذف المفضله."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "لا مجموعه كهذه"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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"
+msgid "Not a member."
 msgstr "جميع الأعضاء"
 
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "الـ API method مش موجوده."
-
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
 msgstr "تعذّر حفظ الاشتراك."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1541,35 +1577,42 @@ msgstr "فشل تحديث الأفتار."
 msgid "Avatar deleted."
 msgstr "حُذف الأفتار."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "الخلفية"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1600,14 +1643,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "ملاحظة"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "لا تمنع هذا المستخدم"
 
@@ -1619,7 +1661,7 @@ msgstr "لا تمنع هذا المستخدم"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1636,32 +1678,6 @@ msgstr "امنع هذا المستخدم"
 msgid "Failed to save block information."
 msgstr "فشل حفظ معلومات المنع."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "لا مجموعه كهذه."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1795,7 +1811,8 @@ msgid "Account deleted."
 msgstr "حُذف الأفتار."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "أنشئ مجموعه جديدة"
@@ -1817,8 +1834,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "أكّد"
 
@@ -1893,8 +1911,10 @@ 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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 "لا اسم مستعار."
@@ -1947,10 +1967,11 @@ msgid "Delete this group"
 msgstr "احذف هذا المستخدم"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1988,99 +2009,134 @@ msgstr "لا تحذف هذا الإشعار"
 msgid "Delete this notice"
 msgstr "احذف هذا الإشعار"
 
-#: actions/deleteuser.php:67
+#. 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 "يمكنك حذف المستخدمين المحليين فقط."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "احذف المستخدم"
 
-#: actions/deleteuser.php:136
+#. 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:163 lib/deleteuserform.php:77
+#. 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.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "التصميم"
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "مسار شعار غير صالح."
 
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "مسار شعار غير صالح."
 
-#: actions/designadminpanel.php:344
+#. 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 "المراسله الفوريه غير متوفره."
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "غيّر الشعار"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "شعار الموقع"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "شعار الموقع"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "غيّر السمة"
 
-#: actions/designadminpanel.php:486
+#. 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 "سمه الموقع."
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 #, fuzzy
 msgid "Custom theme"
 msgstr "سمه الموقع"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "الخلفية"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, fuzzy, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2088,99 +2144,109 @@ msgid ""
 msgstr "تستطيع رفع صورتك الشخصيه. أقصى حجم للملف هو 2 م.ب."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "مكّن"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 #, fuzzy
 msgid "Tile background image"
 msgstr "تغيير صوره الخلفية"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. 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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "وصلات"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr ""
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr ""
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
 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:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "ارجع إلى المبدئي"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "أرسل"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "احفظ التصميم"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "هذا الشعار ليس مفضلًا!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "أضف إلى المفضلات"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2908,7 +2974,7 @@ msgid ""
 "%%%%)"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "أنشئ مجموعه جديدة"
 
@@ -3285,28 +3351,35 @@ msgid ""
 "Sincerely, %2$s\n"
 msgstr ""
 
-#: actions/joingroup.php:60
+#. 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 "يجب أن تلج لتُعدّل المجموعات."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s دخل جروپ %2$s"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "لست عضوا فى تلك المجموعه."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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"
 
@@ -3411,6 +3484,13 @@ msgstr ""
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "أرسل"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
@@ -3435,11 +3515,11 @@ msgstr "لُج"
 msgid "Login to site"
 msgstr "لُج إلى الموقع"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "تذكّرني"
 
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
@@ -3819,7 +3899,8 @@ msgstr "غيّر كلمه السر"
 msgid "Change your password."
 msgstr "غيّر كلمه سرك."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "تغيير كلمه السر"
 
@@ -3827,7 +3908,8 @@ msgstr "تغيير كلمه السر"
 msgid "Old password"
 msgstr "كلمه السر القديمة"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "كلمه سر جديدة"
 
@@ -3836,7 +3918,7 @@ msgstr "كلمه سر جديدة"
 msgid "6 or more characters"
 msgstr "6 حروف أو أكثر. مطلوب."
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "نفس كلمه السر أعلاه"
 
@@ -3860,11 +3942,12 @@ msgstr "كلمه السر القديمه غير صحيحة"
 msgid "Error saving user; invalid."
 msgstr "خطأ أثناء حفظ المستخدم؛ غير صالح."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "تعذّر حفظ كلمه السر الجديده."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "حُفظت كلمه السر."
 
@@ -4202,22 +4285,23 @@ msgid "Profile information"
 msgstr "معلومات الملف الشخصي"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 msgid "Full name"
 msgstr "الاسم الكامل"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "الصفحه الرئيسية"
 
@@ -4229,7 +4313,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:472
+#: 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"
@@ -4241,27 +4325,27 @@ msgstr[4] "صِف نفسك واهتماماتك"
 msgstr[5] "صِف نفسك واهتماماتك"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "الموقع"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
@@ -4313,7 +4397,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:257 actions/register.php:229
+#: 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)."
@@ -4325,49 +4409,50 @@ msgstr[4] "الاسم طويل جدا (اكتر حاجه %d رمز)."
 msgstr[5] "الاسم طويل جدا (اكتر حاجه %d رمز)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "لم تُختر المنطقه الزمنيه."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
 #, 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "لم يمكن حفظ تفضيلات الموقع."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "أنشئ مجموعه جديدة"
@@ -4485,130 +4570,181 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "سحابه الوسوم"
 
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "أنت والج بالفعل!"
 
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "لا رمز استعاده كهذا."
 
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "ليس رمز استعاده."
 
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "رمز استعاده لمستخدم غير معروف."
 
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "خطأ فى رمز التأكيد."
 
-#: actions/recoverpassword.php:97
+#. 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 "رمز التأكيد هذا قديم جدًا. من فضلك ابدأ من جديد."
 
-#: actions/recoverpassword.php:111
+#. 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 "عنوان البريد الإلكترونى المُؤكد الحالى."
 
-#: actions/recoverpassword.php:152
+#. 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:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+msgid "You have been identified. Enter a new password below."
 msgstr ""
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "استعاده كلمه السر"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "الاسم المستعار أو البريد الإلكتروني"
 
-#: actions/recoverpassword.php:193
+#. 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 ""
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "استرجع"
 
-#: actions/recoverpassword.php:208
+#. 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 "أعد ضبط كلمه السر"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "استعد كلمه السر"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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 "طُلبت استعاده كلمه السر"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "إجراء غير معروف"
 
-#: actions/recoverpassword.php:236
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
 #, fuzzy
-msgid "6 or more characters, and don't forget it!"
+msgid "6 or more characters, and do not forget it!"
 msgstr "6 حروف أو أكثر. مطلوب."
 
-#: actions/recoverpassword.php:243
+#. 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
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "أعد الضبط"
 
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "أدخل اسمًا مستعارًا أو عنوان بريد إلكترونى."
 
-#: actions/recoverpassword.php:282
+#. 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 "عنوان البريد الإلكترونى للاتصال بموقعك"
 
-#: actions/recoverpassword.php:299
+#. 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 "عنوان البريد الإلكترونى للاتصال بموقعك"
 
-#: actions/recoverpassword.php:313
+#. 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 "خطأ أثناء حفظ تأكيد العنوان."
 
-#: actions/recoverpassword.php:338
+#. 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 ""
 
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
 #, fuzzy
 msgid "Unexpected password reset."
 msgstr "أعد ضبط كلمه السر"
 
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "يجب أن تكون كلمه السر 6 محارف أو أكثر."
 
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
 #, fuzzy
 msgid "Password and confirmation do not match."
 msgstr "كلمتا السر غير متطابقتين."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "خطأ أثناء ضبط المستخدم."
 
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
@@ -4624,7 +4760,7 @@ msgstr "عذرا، رمز دعوه غير صالح."
 msgid "Registration successful"
 msgstr "نجح التسجيل"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "سجّل"
 
@@ -4651,66 +4787,59 @@ msgid ""
 "link up to friends and colleagues. "
 msgstr ""
 
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
 msgstr "6 حروف أو أكثر. مطلوب."
 
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "نفس كلمه السر أعلاه. مطلوب."
-
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "البريد الإلكتروني"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
-#: actions/register.php:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
-#: actions/register.php:463
+#: actions/register.php:462
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
-#: actions/register.php:524
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:534
+#: 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:538
+#: 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:541
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: 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:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4729,7 +4858,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5035,7 +5164,7 @@ msgstr "المنظمه"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "الوصف"
 
@@ -5059,8 +5188,9 @@ msgstr "OAuth applications"
 msgid "Reset key & secret"
 msgstr ""
 
+#. TRANS: Title of form for deleting a user.
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "احذف"
 
@@ -5185,7 +5315,7 @@ msgid "Note"
 msgstr "ملاحظة"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "الكنى"
 
@@ -7771,25 +7901,25 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 #, 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:153
+#: lib/common.php:158
 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "اذهب إلى المُثبّت."
 
@@ -7860,12 +7990,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "عطّل"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-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: 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".
@@ -7949,24 +8082,20 @@ msgstr "اذهب"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "انت مش بتملك الapplication دى."
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 #, fuzzy
 msgid "Describe the group or topic"
 msgstr "اوصف الapplication بتاعتك"
 
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
 #, 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"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
 msgstr[0] "اوصف الapplication بتاعتك"
 msgstr[1] "اوصف الapplication بتاعتك"
 msgstr[2] "اوصف الapplication بتاعتك"
@@ -7974,12 +8103,12 @@ msgstr[3] "اوصف الapplication بتاعتك"
 msgstr[4] "اوصف الapplication بتاعتك"
 msgstr[5] "اوصف الapplication بتاعتك"
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9124,14 +9253,9 @@ msgstr[5] ""
 msgid "about a year ago"
 msgstr "قبل سنه تقريبًا"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s ليس لونًا صحيحًا!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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 ليس لونًا صحيحًا!"
@@ -9172,27 +9296,21 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "لا ملف كهذا."
+#~ msgid "No such group"
+#~ msgstr "لا مجموعه كهذه"
 
 #, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "المجموعات التى %s عضو فيها"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
 #~ msgstr "الـ API method مش موجوده."
 
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "الأشخاص المشتركون ب%s"
+#~ msgid "Reset"
+#~ msgstr "أعد الضبط"
 
-#~ msgid "Couldn't update user."
-#~ msgstr "تعذّر تحديث المستخدم."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 حروف أو أكثر. مطلوب."
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "تعذّر حفظ الملف الشخصى."
+#~ msgid "Same as password above. Required."
+#~ msgstr "نفس كلمه السر أعلاه. مطلوب."
 
-#~ msgid "Couldn't save tags."
-#~ msgstr "تعذّر حفظ الوسوم."
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s ليس لونًا صحيحًا!"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 8665ea59a6..ce865ea049 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:01+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:55:56+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 (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: bg\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -75,6 +75,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -86,13 +87,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Запазване"
@@ -317,7 +318,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Грешка при обновяване на потребителя."
@@ -341,7 +342,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "Грешка при запазване на профила."
 
@@ -351,7 +352,7 @@ msgstr "Грешка при запазване на профила."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
@@ -531,7 +532,8 @@ msgid "That status is not a favorite."
 msgstr "Тази бележка не е отбелязана като любима."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Грешка при изтриване на любима бележка."
 
@@ -578,7 +580,7 @@ msgstr "Целевият потребител не беше открит."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Опитайте друг псевдоним, този вече е зает."
@@ -588,7 +590,7 @@ msgstr "Опитайте друг псевдоним, този вече е за
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Неправилен псевдоним."
@@ -600,7 +602,7 @@ msgstr "Неправилен псевдоним."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Адресът на личната страница не е правилен URL."
@@ -610,7 +612,7 @@ msgstr "Адресът на личната страница не е правил
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -638,7 +640,7 @@ msgstr[1] "Описанието е твърде дълго (до %d символ
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -696,23 +698,27 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 #, fuzzy
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Грешка при обновяване на групата."
@@ -724,9 +730,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -787,9 +795,12 @@ msgid "Request token already authorized."
 msgstr "Не сте абонирани за никого."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -797,7 +808,7 @@ msgstr "Не сте абонирани за никого."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -819,18 +830,20 @@ msgstr "Грешка в базата от данни — отговор при 
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Неочаквано изпращане на форма."
@@ -879,7 +892,7 @@ msgstr "Сметка"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Псевдоним"
@@ -887,7 +900,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Парола"
 
@@ -994,10 +1007,12 @@ msgstr "Вече сте повторили тази бележка."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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
@@ -1270,7 +1285,7 @@ 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"
+msgid "Cannot add someone else's membership."
 msgstr "Грешка при добавяне на нов абонамент."
 
 #. TRANS: Client error displayed when not using the POST verb.
@@ -1306,30 +1321,51 @@ 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "Грешка при изтриване на любима бележка."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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"
+msgid "Not a member."
 msgstr "Всички членове"
 
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "Не е открит методът в API."
-
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
 msgstr "Грешка при добавяне на нов абонамент."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1502,35 +1538,42 @@ msgstr "Неуспешно обновяване на аватара."
 msgid "Avatar deleted."
 msgstr "Аватарът е изтрит."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Фон"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1561,14 +1604,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Не"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "Да не се блокира този потребител"
 
@@ -1580,7 +1622,7 @@ msgstr "Да не се блокира този потребител"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Да"
@@ -1596,32 +1638,6 @@ msgstr "Блокиране на потребителя"
 msgid "Failed to save block information."
 msgstr "Грешка при записване данните за блокирането."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Няма такава група"
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1754,7 +1770,8 @@ msgid "Account deleted."
 msgstr "Аватарът е изтрит."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "Създаване на нова сметка"
@@ -1776,8 +1793,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Потвърждаване"
 
@@ -1849,8 +1867,10 @@ 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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 "Няма псевдоним."
@@ -1903,10 +1923,11 @@ msgid "Delete this group"
 msgstr "Изтриване на този потребител"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1944,103 +1965,138 @@ msgstr "Да не се изтрива бележката"
 msgid "Delete this notice"
 msgstr "Изтриване на бележката"
 
-#: actions/deleteuser.php:67
+#. 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 "Може да изтривате само локални потребители."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Изтриване на потребител"
 
-#: actions/deleteuser.php:136
+#. 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:163 lib/deleteuserform.php:77
+#. 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.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 #, fuzzy
 msgid "Design"
 msgstr "Версия"
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
 #, fuzzy
 msgid "Invalid logo URL."
 msgstr "Неправилен размер."
 
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "Неправилен размер."
 
-#: actions/designadminpanel.php:344
+#. 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 "Страницата не е достъпна във вида медия, който приемате"
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Смяна на логото"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Лого на сайта"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "Лого на сайта"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 #, fuzzy
 msgid "Change theme"
 msgstr "Промяна"
 
-#: actions/designadminpanel.php:486
+#. 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 "Излизане от сайта"
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 #, fuzzy
 msgid "Custom theme"
 msgstr "Нова бележка"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Фон"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2050,101 +2106,110 @@ msgstr ""
 "2MB."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Вкл."
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 #, 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 #, fuzzy
 msgid "Tile background image"
 msgstr "Смяна на изображението за фон"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. 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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "Лиценз"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr ""
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr ""
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
 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:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr ""
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Запазване"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 #, fuzzy
 msgid "Save design"
 msgstr "Запазване настройките на сайта"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "Тази бележка не е отбелязана като любима!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "Добавяне към любимите"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2874,7 +2939,7 @@ msgid ""
 "%%%%)"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Създаване на нова група"
 
@@ -3276,26 +3341,33 @@ msgstr ""
 "\n"
 "Искрено ваши, %2$s\n"
 
-#: actions/joingroup.php:60
+#. 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 "За да се присъедините към група, трябва да сте влезли."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s напусна групата %2$s"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "Не членувате в тази група."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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"
 
@@ -3400,6 +3472,13 @@ msgstr ""
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Запазване"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
@@ -3425,11 +3504,11 @@ msgstr "Вход"
 msgid "Login to site"
 msgstr "Вход в сайта"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Запомни ме"
 
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Автоматично влизане занапред. Да не се ползва на общи компютри!"
 
@@ -3821,7 +3900,8 @@ msgstr "Смяна на паролата"
 msgid "Change your password."
 msgstr "Смяна на паролата."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 #, fuzzy
 msgid "Password change"
 msgstr "Паролата е записана."
@@ -3830,7 +3910,8 @@ msgstr "Паролата е записана."
 msgid "Old password"
 msgstr "Стара парола"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Нова парола"
 
@@ -3838,7 +3919,7 @@ msgstr "Нова парола"
 msgid "6 or more characters"
 msgstr "6 или повече знака"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "Също като паролата по-горе"
 
@@ -3862,11 +3943,12 @@ msgstr "Грешна стара парола"
 msgid "Error saving user; invalid."
 msgstr "Грешка при запазване на потребител — невалидност."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "Грешка при запазване на новата парола."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Паролата е записана."
 
@@ -4202,23 +4284,24 @@ msgid "Profile information"
 msgstr "Данни на профила"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 #, 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 msgid "Full name"
 msgstr "Пълно име"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "Лична страница"
 
@@ -4231,7 +4314,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:472
+#: 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"
@@ -4239,27 +4322,27 @@ msgstr[0] "Опишете себе си и интересите си в до %d
 msgstr[1] "Опишете себе си и интересите си в до %d букви"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "Местоположение"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Къде се намирате (град, община, държава и т.н.)"
 
@@ -4312,7 +4395,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:257 actions/register.php:229
+#: 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)."
@@ -4320,49 +4403,50 @@ msgstr[0] "Биографията е твърде дълга (до %d симво
 msgstr[1] "Биографията е твърде дълга (до %d символа)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Не е избран часови пояс"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
 #, 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Грешка при запазване етикетите."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Създаване на нова сметка"
@@ -4474,35 +4558,43 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "Смяна на цветовете"
 
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Вече сте влезли!"
 
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Няма такъв код за възстановяване."
 
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Това не е код за възстановяване."
 
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Код за възстановяване на непознат потребител."
 
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Грешка в кода за потвърждение."
 
-#: actions/recoverpassword.php:97
+#. 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 "Кодът за потвърждение е твърде стар. Започнете процеса отново."
 
-#: actions/recoverpassword.php:111
+#. 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 адрес."
 
-#: actions/recoverpassword.php:152
+#. 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 "
@@ -4511,67 +4603,100 @@ msgstr ""
 "На е-пощата, с която сте регистрирани са изпратени инструкции за "
 "възстановяване на паролата."
 
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+msgid "You have been identified. Enter a new password below."
 msgstr ""
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Възстановяване на парола"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Псевдоним или е-поща"
 
-#: actions/recoverpassword.php:193
+#. 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 "Псевдонимът ви на този сървър или е-пощата, с която сте регистрирани."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Възстановяване"
 
-#: actions/recoverpassword.php:208
+#. 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 "Нова парола"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Възстановяване на паролата"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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 "Поискано е възстановяване на парола"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Непознато действие"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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 или повече знака. И не ги забравяйте!"
 
-#: actions/recoverpassword.php:243
+#. 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
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Обновяване"
 
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Въведете псевдоним или е-поща."
 
-#: actions/recoverpassword.php:282
+#. 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 "Няма потребител с такава е-поща или потребителско име."
 
-#: actions/recoverpassword.php:299
+#. 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 "Няма указана е-поща за този потребител."
 
-#: actions/recoverpassword.php:313
+#. 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 "Грешка при запазване на потвърждение за адрес"
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4579,24 +4704,35 @@ msgstr ""
 "На е-пощата, с която сте регистрирани са изпратени инструкции за "
 "възстановяване на паролата."
 
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Неочаквано подновяване на паролата."
 
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "Паролата трябва да е от поне 6 знака."
 
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Паролата и потвърждението й не съвпадат."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "Грешка в настройките на потребителя."
 
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "Новата парола е запазена. Влязохте успешно."
 
@@ -4613,7 +4749,7 @@ msgstr "Грешка в кода за потвърждение."
 msgid "Registration successful"
 msgstr "Записването е успешно."
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Регистриране"
 
@@ -4639,68 +4775,59 @@ msgid ""
 "link up to friends and colleagues. "
 msgstr ""
 
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"От 1 до 64 малки букви или цифри, без пунктоация и интервали. Задължително "
-"поле."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 или повече знака. Задължително поле."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Същото като паролата по-горе. Задължително поле."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 или повече знака"
 
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Е-поща"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Използва се само за промени, обяви или възстановяване на паролата"
 
-#: actions/register.php:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "По-дълго име, за предпочитане \"истинското\" ви име."
 
-#: actions/register.php:463
+#: actions/register.php:462
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "Адрес на личната ви страница, блог или профил в друг сайт"
 
-#: actions/register.php:524
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:534
+#: 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:538
+#: 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:541
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "Всички права запазени."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: 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:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4733,7 +4860,7 @@ msgstr ""
 "Благодарим, че се включихте в сайта и дано ползването на услугата ви носи "
 "само приятни мигове!"
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5043,7 +5170,7 @@ msgstr "Организация"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "Описание"
 
@@ -5067,8 +5194,9 @@ msgstr "Данни за приложението"
 msgid "Reset key & secret"
 msgstr ""
 
+#. TRANS: Title of form for deleting a user.
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Изтриване"
 
@@ -5188,7 +5316,7 @@ msgid "Note"
 msgstr "Бележка"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "Псевдоними"
 
@@ -7738,26 +7866,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 #, 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:153
+#: lib/common.php:158
 #, 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Влизане в сайта"
@@ -7831,12 +7959,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "Изкл."
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-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: 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".
@@ -7921,34 +8052,30 @@ msgstr ""
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "От 1 до 64 малки букви или цифри, без пунктоация и интервали"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "Адрес на страница, блог или профил в друг сайт на групата"
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "Опишете групата или темата"
 
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
 #, 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"
+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:182
+#: lib/groupeditform.php:174
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Къде се намира групата — град, община, държава и т.н. (ако е приложимо)"
 
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9060,14 +9187,9 @@ msgstr[1] ""
 msgid "about a year ago"
 msgstr "преди около година"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s не е допустим цвят!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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 шестнадесетични знака."
@@ -9108,27 +9230,30 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "Няма такъв профил."
+#~ msgid "No such group"
+#~ msgstr "Няма такава група"
 
 #, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Групи, в които участва %s"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
 #~ msgstr "Не е открит методът в API."
 
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Абонирани за %s"
+#~ msgid "Reset"
+#~ msgstr "Обновяване"
 
-#~ msgid "Couldn't update user."
-#~ msgstr "Грешка при обновяване на потребителя."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "От 1 до 64 малки букви или цифри, без пунктоация и интервали. "
+#~ "Задължително поле."
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "Грешка при запазване на профила."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 или повече знака. Задължително поле."
 
-#~ msgid "Couldn't save tags."
-#~ msgstr "Грешка при запазване етикетите."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Същото като паролата по-горе. Задължително поле."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "От 1 до 64 малки букви или цифри, без пунктоация и интервали"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s не е допустим цвят!"
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 6cfa7f1338..c40fb0c47e 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-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:10+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:56:01+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -78,6 +78,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -89,13 +90,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Enrollañ"
@@ -324,7 +325,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Dibosupl eo hizivaat an implijer."
@@ -348,7 +349,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "Dibosupl eo enrollañ ar profil."
 
@@ -358,7 +359,7 @@ msgstr "Dibosupl eo enrollañ ar profil."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
@@ -537,7 +538,8 @@ 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.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Diposupl eo dilemel ar pennroll-mañ."
 
@@ -585,7 +587,7 @@ msgstr "Dibosupl eo kavout an implijer pal."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
@@ -595,7 +597,7 @@ msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "N'eo ket ul lesanv mat."
@@ -607,7 +609,7 @@ msgstr "N'eo ket ul lesanv mat."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "N'eo ket chomlec'h al lec'hienn personel un URL reizh."
@@ -617,7 +619,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -645,7 +647,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -703,22 +705,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, 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."
@@ -730,9 +736,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -792,9 +800,12 @@ msgid "Request token already authorized."
 msgstr "N'oc'h ket aotreet."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -802,7 +813,7 @@ msgstr "N'oc'h ket aotreet."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -824,18 +835,20 @@ msgstr "Ur fazi 'zo bet en ur ensoc'hañ an avatar"
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: 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."
@@ -883,7 +896,7 @@ msgstr "Kont"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Lesanv"
@@ -891,7 +904,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Ger-tremen"
 
@@ -995,10 +1008,12 @@ msgstr "Kemenn bet adkemeret dija."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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
@@ -1272,7 +1287,7 @@ msgstr "Izili ar strollad %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"
+msgid "Cannot add someone else's membership."
 msgstr "Dibosupl eo dilemel ar c'houmanant."
 
 #. TRANS: Client error displayed when not using the POST verb.
@@ -1308,30 +1323,51 @@ msgstr "Restr ezvezant."
 #. 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "Diposupl eo dilemel ar pennroll-mañ."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "N'eus ket eus ar strollad-se"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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
 #, fuzzy
-msgid "Not a member"
+msgid "Not a member."
 msgstr "An holl izili"
 
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "N'eo ket bet kavet an hentenn API !"
-
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+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.
@@ -1500,35 +1536,42 @@ msgstr "Ur gudenn 'zo bet e-pad hizivadenn an avatar."
 msgid "Avatar deleted."
 msgstr "Dilammet eo bet an Avatar."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 "N'eus nemet an implijerien kevreet hag a c'hell adkemer alioù."
 
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Background"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1559,14 +1602,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Ket"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "Arabat stankañ an implijer-mañ"
 
@@ -1578,7 +1620,7 @@ msgstr "Arabat stankañ an implijer-mañ"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ya"
@@ -1594,32 +1636,6 @@ msgstr "Stankañ an implijer-mañ"
 msgid "Failed to save block information."
 msgstr "Dibosupl eo enrollañ an titouroù stankañ."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "N'eus ket eus ar strollad-se."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1751,7 +1767,8 @@ msgid "Account deleted."
 msgstr "Dilammet eo bet an Avatar."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "Krouiñ ur gont"
@@ -1773,8 +1790,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Kadarnaat"
 
@@ -1846,8 +1864,10 @@ msgid "You must be logged in to delete a group."
 msgstr "Ret eo deoc'h bezañ kevreet evit kuitaat ur strollad"
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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."
 
@@ -1898,10 +1918,11 @@ msgid "Delete this group"
 msgstr "Diverkañ an implijer-mañ"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1939,97 +1960,132 @@ msgstr "Arabat dilemel ar c'hemenn-mañ"
 msgid "Delete this notice"
 msgstr "Dilemel ar c'hemenn-mañ"
 
-#: actions/deleteuser.php:67
+#. 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."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Diverkañ an implijer"
 
-#: actions/deleteuser.php:136
+#. 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 ar c'hemenn-mañ"
+
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. 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.
 #. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "Design"
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
-#: actions/designadminpanel.php:335
+#. 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."
 
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "URL fall evit al logo."
 
-#: actions/designadminpanel.php:344
+#. 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."
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Cheñch al logo"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Logo al lec'hienn"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "Logo SSL"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Lakaat un dodenn all"
 
-#: actions/designadminpanel.php:486
+#. 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."
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Dodenn personelaet"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Background"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2037,98 +2093,108 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Gweredekaet"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "Adober gant ar skeudenn drekleur"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. 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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "Liammoù"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Araokaet"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "CSS personelaet"
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "Adlakaat an arventennoù dre ziouer"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Enrollañ"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "Enrollañ an design"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "N'eo ket ar c'hemenn-mañ ur pennroll !"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "Ouzhpennañ d'ar pennrolloù"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2843,7 +2909,7 @@ msgid ""
 "%%%%)"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Krouiñ ur strollad nevez"
 
@@ -3215,26 +3281,33 @@ msgid ""
 "Sincerely, %2$s\n"
 msgstr ""
 
-#: actions/joingroup.php:60
+#. 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."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s a zo bet er strollad %2$s"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "N'oc'h ket un ezel eus ar strollad-mañ."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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"
 
@@ -3339,6 +3412,13 @@ msgstr "URL skeudenn an aotre-implijout"
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Enrollañ"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Enrollañ arventennoù an aotre-implijout"
@@ -3365,11 +3445,11 @@ msgstr "Kevreañ"
 msgid "Login to site"
 msgstr "Kevreañ d'al lec'hienn"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Kaout soñj"
 
-#: actions/login.php:259 actions/register.php:493
+#: 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 "
@@ -3762,7 +3842,8 @@ msgstr "Cheñch ger-tremen"
 msgid "Change your password."
 msgstr "Cheñch ger-tremen."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Kemmañ ger-tremen"
 
@@ -3770,7 +3851,8 @@ msgstr "Kemmañ ger-tremen"
 msgid "Old password"
 msgstr "Ger-tremen kozh"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Ger-tremen nevez"
 
@@ -3778,7 +3860,7 @@ msgstr "Ger-tremen nevez"
 msgid "6 or more characters"
 msgstr "6 arouezenn pe muioc'h"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "Memestra eget ar ger tremen a-us"
 
@@ -3802,11 +3884,12 @@ msgstr "Ger-termen kozh direizh"
 msgid "Error saving user; invalid."
 msgstr "Ur fazi 'zo bet e-pad enolladenn an implijer ; diwiriek."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "Dibosupl eo enrollañ ar ger-tremen nevez."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. 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."
 
@@ -4146,23 +4229,24 @@ msgid "Profile information"
 msgstr "Titouroù ar profil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 #, 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 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:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "Pajenn degemer"
 
@@ -4175,7 +4259,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:472
+#: 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"
@@ -4183,27 +4267,27 @@ 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:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "Lec'hiadur"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: 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\""
 
@@ -4258,7 +4342,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:257 actions/register.php:229
+#: 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)."
@@ -4266,49 +4350,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:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 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:276
+#: actions/profilesettings.php:277
 #, 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, 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:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Krouiñ ur gont"
@@ -4428,35 +4513,43 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "Koumoulenn merkoù"
 
-#: actions/recoverpassword.php:36
+#. 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 !"
 
-#: actions/recoverpassword.php:62
+#. 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."
 
-#: actions/recoverpassword.php:66
+#. 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ñ."
 
-#: actions/recoverpassword.php:73
+#. 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."
 
-#: actions/recoverpassword.php:86
+#. 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."
 
-#: actions/recoverpassword.php:97
+#. 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."
 
-#: actions/recoverpassword.php:111
+#. 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."
 
-#: actions/recoverpassword.php:152
+#. 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."
@@ -4464,68 +4557,101 @@ 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:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
 msgstr "Diskleriet oc'h bet. Lakait ur ger-tremen nevez amañ da heul. "
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Adtapout ar ger-tremen"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Lesanv pe chomlec'h postel"
 
-#: actions/recoverpassword.php:193
+#. 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."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Adtapout"
 
-#: actions/recoverpassword.php:208
+#. 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"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Adtapout ar ger-tremen"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Oberiadenn dianav"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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 !"
 
-#: actions/recoverpassword.php:243
-msgid "Reset"
-msgstr "Adderaouekaat"
+#. 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"
 
-#: actions/recoverpassword.php:252
+#. 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
+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."
 
-#: actions/recoverpassword.php:282
+#. 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."
 
-#: actions/recoverpassword.php:299
+#. 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ñ."
 
-#: actions/recoverpassword.php:313
+#. 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."
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4533,24 +4659,35 @@ msgstr ""
 "Kaset eo bet deoc'h, d'ar chomlec'h postel termenet en ho kont, an titouroù "
 "ret evit gouzout penaos adtapout o ger-tremen."
 
-#: actions/recoverpassword.php:357
+#. 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."
 
-#: actions/recoverpassword.php:365
+#. 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ñ."
 
-#: actions/recoverpassword.php:369
+#. 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."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "Ur fazi 'zo bet e-pad kefluniadur an implijer."
 
-#: actions/recoverpassword.php:395
+#. 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ñ."
 
@@ -4568,7 +4705,7 @@ msgstr "Digarezit, kod pedadenn direizh."
 msgid "Registration successful"
 msgstr "Krouet eo bet ar gont."
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Krouiñ ur gont"
 
@@ -4596,69 +4733,61 @@ msgid ""
 "link up to friends and colleagues. "
 msgstr ""
 
-#: actions/register.php:433
+#: actions/register.php:437
 #, fuzzy
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 arouezenn pe muioc'h. Rekis."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Memestra hag ar ger-tremen a-us. Rekis."
+msgid "6 or more characters."
+msgstr "6 arouezenn pe muioc'h"
 
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Postel"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 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:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Anv hiroc'h, ho anv \"gwir\" a zo gwelloc'h"
 
-#: actions/register.php:463
+#: actions/register.php:462
 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:524
+#: 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:534
+#: 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:538
+#: 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:541
+#: 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:546
+#: 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:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4677,7 +4806,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -4983,7 +5112,7 @@ msgstr "Aozadur"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "Deskrivadur"
 
@@ -5006,8 +5135,9 @@ msgstr "Obererezhioù ar poellad"
 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:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Diverkañ"
 
@@ -5126,7 +5256,7 @@ msgid "Note"
 msgstr "Notenn"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "Aliasoù"
 
@@ -7646,26 +7776,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 #, 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:153
+#: lib/common.php:158
 #, 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "Mont d'ar meziant staliañ"
 
@@ -7734,11 +7864,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "Diweredekaet"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Adderaouiñ"
+#. 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: 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".
@@ -7824,34 +7958,30 @@ msgstr "Mont"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:154
-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:163
+#: lib/groupeditform.php:155
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL pajenn degemer ar poellad-mañ"
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 #, fuzzy
 msgid "Describe the group or topic"
 msgstr "Deskrivit ho poellad"
 
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
 #, 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"
+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:182
+#: lib/groupeditform.php:174
 #, 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:190
+#: lib/groupeditform.php:182
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8963,14 +9093,9 @@ msgstr[1] "tro %d miz zo"
 msgid "about a year ago"
 msgstr "bloaz zo well-wazh"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "n'eo ket %s ul liv reizh !"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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."
@@ -9011,27 +9136,29 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "N'eus ket eus ar profil-se."
+#~ msgid "No such group"
+#~ msgstr "N'eus ket eus ar strollad-se"
 
 #, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Ezel eo %s eus ar strolladoù"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
 #~ msgstr "N'eo ket bet kavet an hentenn API !"
 
+#~ msgid "Reset"
+#~ msgstr "Adderaouekaat"
+
 #, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Koumanantet da %s"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
 
-#~ msgid "Couldn't update user."
-#~ msgstr "Dibosupl eo hizivaat an implijer."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 arouezenn pe muioc'h. Rekis."
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "Dibosupl eo enrollañ ar profil."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Memestra hag ar ger-tremen a-us. Rekis."
 
-#~ msgid "Couldn't save tags."
-#~ msgstr "Dibosupl eo enrollañ ar balizennoù."
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "n'eo ket %s ul liv reizh !"
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index ffb9a43295..077907af09 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-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:15+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:56: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-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -83,6 +83,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -94,13 +95,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Desa"
@@ -335,7 +336,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "No s'ha pogut actualitzar l'usuari."
@@ -359,7 +360,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "No s'ha pogut desar el perfil."
 
@@ -369,7 +370,7 @@ msgstr "No s'ha pogut desar el perfil."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
@@ -549,7 +550,8 @@ msgid "That status is not a favorite."
 msgstr "L'estat no és un preferit."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "No s'ha pogut eliminar el preferit."
 
@@ -595,7 +597,7 @@ msgstr "No s'ha pogut trobar l'usuari de destinació."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Aquest sobrenom ja existeix. Prova un altre. "
@@ -605,7 +607,7 @@ msgstr "Aquest sobrenom ja existeix. Prova un altre. "
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Sobrenom no vàlid."
@@ -617,7 +619,7 @@ msgstr "Sobrenom no vàlid."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "La pàgina personal no és un URL vàlid."
@@ -627,7 +629,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: 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)."
@@ -654,7 +656,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "La localització és massa llarga (màx. 255 caràcters)."
@@ -711,22 +713,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, 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."
@@ -738,9 +744,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -797,9 +805,12 @@ msgid "Request token already authorized."
 msgstr "El testimoni de sol·licitud ja està autoritzat."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -807,7 +818,7 @@ msgstr "El testimoni de sol·licitud ja està autoritzat."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -830,18 +841,20 @@ msgstr "Error de la base de dades en inserir l'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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: 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."
@@ -895,7 +908,7 @@ msgstr "Compte"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Sobrenom"
@@ -903,7 +916,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Contrasenya"
 
@@ -1010,10 +1023,12 @@ msgstr "Avís duplicat."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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."
@@ -1281,7 +1296,7 @@ msgstr "%s pertinències a grup"
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
 #: actions/atompubmembershipfeed.php:219
 #, fuzzy
-msgid "Cannot add someone else's membership"
+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.
@@ -1314,29 +1329,51 @@ msgstr "No existeix el preferit."
 #. 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "No es pot eliminar el preferit d'algú altre"
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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 using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "HTTP method not supported"
-msgstr "El mètode HTTP no està implementat."
+msgid "Not a member."
+msgstr "No és un membre"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+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.
@@ -1508,35 +1545,42 @@ msgstr "Error en actualitzar avatar."
 msgid "Avatar deleted."
 msgstr "S'ha eliminat l'avatar."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 "Només els usuaris que han iniciat una sessió poden enviar avisos."
 
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Fons"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1570,14 +1614,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "No"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "No bloquis l'usuari"
 
@@ -1589,7 +1632,7 @@ msgstr "No bloquis l'usuari"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Sí"
@@ -1605,32 +1648,6 @@ msgstr "Bloca aquest usuari"
 msgid "Failed to save block information."
 msgstr "No s'ha pogut desar la informació del bloc."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "No s'ha trobat el grup."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1760,7 +1777,8 @@ msgid "Account deleted."
 msgstr "S'ha eliminat l'avatar."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "Crea un compte"
@@ -1782,8 +1800,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Confirma"
 
@@ -1857,8 +1876,10 @@ 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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."
 
@@ -1909,10 +1930,11 @@ msgid "Delete this group"
 msgstr "Elimina aquest grup"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1952,19 +1974,30 @@ msgstr "No eliminis aquest avís"
 msgid "Delete this notice"
 msgstr "Elimina aquest avís"
 
-#: actions/deleteuser.php:67
+#. 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."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Elimina l'usuari"
 
-#: actions/deleteuser.php:136
+#. 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."
@@ -1972,78 +2005,102 @@ msgstr ""
 "Esteu segur que voleu eliminar l'usuari? S'esborraran totes les dades de "
 "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
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "No eliminis aquest grup"
+
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. 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.
 #. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "Disseny"
 
-#: actions/designadminpanel.php:74
+#. 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."
 
-#: actions/designadminpanel.php:335
+#. 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."
 
-#: actions/designadminpanel.php:340
+#. 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."
 
-#: actions/designadminpanel.php:344
+#. 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."
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Canvia el logotip"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Logotip del lloc"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "Logotip SSL"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Canvia el tema"
 
-#: actions/designadminpanel.php:486
+#. 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."
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Tema personalitzat"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Fons"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2052,98 +2109,108 @@ 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:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Activada"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "Posa en mosaic la imatge de fons"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "Enllaços"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Avançat"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "CSS personalitzat"
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
 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:703 lib/designsettings.php:259
+#: 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "Torna a restaurar al valor per defecte"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Desa"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "Desa el disseny"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "Aquesta avís no és un preferit!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "Afegeix als preferits"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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 existeix el document «%s»"
 
 #. TRANS: Title for "Edit application" form.
@@ -2869,7 +2936,7 @@ msgstr ""
 "agradi? Proveu de [cercar-ne un](%%%%action.groupsearch%%%%) o [comenceu-ne "
 "un de propi!](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Crea un grup nou"
 
@@ -3276,26 +3343,33 @@ msgstr ""
 "\n"
 "Sincerely, %2$s\n"
 
-#: actions/joingroup.php:60
+#. 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."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s s'ha unit al grup %2$s"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "No ets membre d'aquest grup."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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 abandonat el grup %2$s"
 
@@ -3402,6 +3476,13 @@ msgstr "URL de la imatge de la llicència"
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Desa"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Desa els paràmetres de la llicència"
@@ -3428,11 +3509,11 @@ msgstr "Inici de sessió"
 msgid "Login to site"
 msgstr "Accedir al lloc"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Recorda'm"
 
-#: actions/login.php:259 actions/register.php:493
+#: 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 "
@@ -3827,7 +3908,8 @@ msgstr "Canvia la contrasenya"
 msgid "Change your password."
 msgstr "Canvieu la vostra contrasenya"
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Contrasenya canviada."
 
@@ -3835,7 +3917,8 @@ msgstr "Contrasenya canviada."
 msgid "Old password"
 msgstr "Antiga contrasenya"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nova contrasenya"
 
@@ -3843,7 +3926,7 @@ msgstr "Nova contrasenya"
 msgid "6 or more characters"
 msgstr "6 o més caràcters"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "Igual a la contrasenya de dalt"
 
@@ -3867,11 +3950,12 @@ msgstr "Contrasenya antiga incorrecta"
 msgid "Error saving user; invalid."
 msgstr "S'ha produït un error en desar l'usuari; no és vàlid."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "No es pot desar la nova contrasenya."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Contrasenya guardada."
 
@@ -4198,23 +4282,24 @@ msgid "Profile information"
 msgstr "Informació del perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 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:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "Pàgina personal"
 
@@ -4226,7 +4311,7 @@ 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:472
+#: 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"
@@ -4234,27 +4319,27 @@ 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:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "Ubicació"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: 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»"
 
@@ -4309,7 +4394,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:257 actions/register.php:229
+#: 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)."
@@ -4317,48 +4402,49 @@ 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:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 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:276
+#: actions/profilesettings.php:277
 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, fuzzy
 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:404
+#: actions/profilesettings.php:405
 #, fuzzy
 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:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Crea un compte"
@@ -4483,35 +4569,43 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "Núvol d'etiquetes"
 
-#: actions/recoverpassword.php:36
+#. 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ó!"
 
-#: actions/recoverpassword.php:62
+#. 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ó."
 
-#: actions/recoverpassword.php:66
+#. 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ó."
 
-#: actions/recoverpassword.php:73
+#. 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."
 
-#: actions/recoverpassword.php:86
+#. 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ó."
 
-#: actions/recoverpassword.php:97
+#. 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."
 
-#: actions/recoverpassword.php:111
+#. 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"
 
-#: actions/recoverpassword.php:152
+#. 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."
@@ -4519,69 +4613,102 @@ 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:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
 msgstr "Esteu identificat. Introduïu una contrasenya nova a continuació. "
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Recuperació de la contrasenya"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Sobrenom o adreça electrònica"
 
-#: actions/recoverpassword.php:193
+#. 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."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Recupera"
 
-#: actions/recoverpassword.php:208
+#. 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 "Reinicialitza la contrasenya"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Recupera la contrasenya"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Acció desconeguda"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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 caràcters, i no te n'oblidis!"
 
-#: actions/recoverpassword.php:243
+#. 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 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
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Reinicialitza"
 
-#: actions/recoverpassword.php:252
+#. 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."
 
-#: actions/recoverpassword.php:282
+#. 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."
 
-#: actions/recoverpassword.php:299
+#. 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."
 
-#: actions/recoverpassword.php:313
+#. 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."
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4589,23 +4716,34 @@ msgstr ""
 "S'han enviat instruccions per recuperar la vostra contrasenya a l'adreça de "
 "correu electrònic registrada."
 
-#: actions/recoverpassword.php:357
+#. 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."
 
-#: actions/recoverpassword.php:365
+#. 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."
 
-#: actions/recoverpassword.php:369
+#. 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."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+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
 msgid "Error setting user."
 msgstr "Error en configurar l'usuari."
 
-#: actions/recoverpassword.php:395
+#. 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ó."
 
@@ -4621,7 +4759,7 @@ msgstr "El codi d'invitació no és vàlid."
 msgid "Registration successful"
 msgstr "Registre satisfactori"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Registre"
 
@@ -4649,62 +4787,54 @@ msgstr ""
 "Amb aquest formulari, podeu crear un compte nou. Podeu enviar avisos i "
 "enllaçar a amics i col·legues. "
 
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 lletres en minúscula o números, sense puntuacions ni espais. Requerit."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 o més caràcters. Requerit."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Igual a la contrasenya de dalt. Requerit."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 o més caràcters"
 
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: 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:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Utilitzat només per a actualitzacions, anuncis i recuperació de contrasenya"
 
-#: actions/register.php:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Nom llarg, preferiblement el vostre nom «real»"
 
-#: actions/register.php:463
+#: actions/register.php:462
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL del teu web, blog o perfil en un altre lloc"
 
-#: actions/register.php:524
+#: 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:534
+#: 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:538
+#: 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:541
+#: 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:546
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4714,7 +4844,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:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4747,7 +4877,7 @@ msgstr ""
 "\n"
 "Gràcies per registrar-vos-hi i esperem que en gaudiu."
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5065,7 +5195,7 @@ msgstr "Organització"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "Descripció"
 
@@ -5088,8 +5218,9 @@ msgstr "Accions d'aplicació"
 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:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Elimina"
 
@@ -5216,7 +5347,7 @@ msgid "Note"
 msgstr "Avisos"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "Àlies"
 
@@ -7821,24 +7952,24 @@ 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:150
+#: lib/common.php:155
 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:153
+#: lib/common.php:158
 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "Vés a l'instal·lador."
 
@@ -7905,11 +8036,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "Desactivada"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Reinicialitza"
+#. 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: 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".
@@ -7993,33 +8128,28 @@ msgstr "Vés-hi"
 msgid "Grant this user the \"%s\" role"
 msgstr "Atorga a l'usuari el rol «%s»"
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-"1-64 lletres en minúscula o números, sense signes de puntuació o espais"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 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:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "Descriviu el grup o la temàtica"
 
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+#: lib/groupeditform.php:162
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
 msgstr[0] "Descriviu el grup o la temàtica en %d caràcter"
 msgstr[1] "Descriviu el grup o la temàtica en %d caràcters"
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
 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:190
+#: lib/groupeditform.php:182
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9224,14 +9354,9 @@ msgstr[1] "aproximadament fa %d mesos"
 msgid "about a year ago"
 msgstr "fa un any"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s no és un color vàlid!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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."
@@ -9269,29 +9394,31 @@ 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 "AtomPub post with unknown attention URI %s"
-#~ msgstr "Enviament AtomPub amb un URI %s d'atenció desconegut"
+#~ msgid "No such group"
+#~ msgstr "No s'ha trobat el grup."
 
-#~ msgid "No such profile"
-#~ msgstr "No existeix el perfil"
+#, fuzzy
+#~ msgid "HTTP method not supported"
+#~ msgstr "El mètode HTTP no està implementat."
 
-#~ msgid "Notices %s has favorited to on %s"
-#~ msgstr "Els avisos que %s ha preferit a %s"
+#~ msgid "Reset"
+#~ msgstr "Reinicialitza"
 
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Els grups en què %s és membre a %s"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 lletres en minúscula o números, sense puntuacions ni espais. "
+#~ "Requerit."
 
-#~ msgid "Method not supported"
-#~ msgstr "El mètode no està implementat"
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 o més caràcters. Requerit."
 
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "La gent a qui %s s'ha subscrit a %s"
+#~ msgid "Same as password above. Required."
+#~ msgstr "Igual a la contrasenya de dalt. Requerit."
 
-#~ msgid "Couldn't update user."
-#~ msgstr "No s'ha pogut actualitzar l'usuari."
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr ""
+#~ "1-64 lletres en minúscula o números, sense signes de puntuació o espais"
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "No s'ha pogut desar el perfil."
-
-#~ msgid "Couldn't save tags."
-#~ msgstr "No s'han pogut desar les etiquetes."
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s no és un color vàlid!"
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 9cce57cbbb..2cf23d5bb7 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-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:17+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:56:16+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 (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: cs\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n >= 2 && n <= 4) ? 1 : "
 "2 );\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -77,6 +77,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -88,13 +89,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Uložit"
@@ -328,7 +329,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Nepodařilo se aktualizovat nastavení uživatele"
@@ -352,7 +353,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "Nepodařilo se uložit profil."
 
@@ -362,7 +363,7 @@ msgstr "Nepodařilo se uložit profil."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, fuzzy, php-format
@@ -544,7 +545,8 @@ msgid "That status is not a favorite."
 msgstr "Tato hláška není oblíbená."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Nelze smazat oblíbenou položku."
 
@@ -591,7 +593,7 @@ msgstr "Nepodařilo se najít cílového uživatele."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Přezdívku již někdo používá. Zkuste jinou."
@@ -601,7 +603,7 @@ msgstr "Přezdívku již někdo používá. Zkuste jinou."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Není platnou přezdívkou."
@@ -613,7 +615,7 @@ msgstr "Není platnou přezdívkou."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Domovská stránka není platná URL."
@@ -623,7 +625,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -652,7 +654,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -711,22 +713,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, 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."
@@ -738,9 +744,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -800,9 +808,12 @@ msgid "Request token already authorized."
 msgstr "Nejste autorizován."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -810,7 +821,7 @@ msgstr "Nejste autorizován."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -832,18 +843,20 @@ msgstr "Chyba databáze při vkládání uživatele aplikace OAuth."
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: 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."
@@ -898,7 +911,7 @@ msgstr "Účet"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Přezdívka"
@@ -906,7 +919,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Heslo"
 
@@ -1014,10 +1027,12 @@ msgstr "Již jste zopakoval toto oznámení."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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
@@ -1293,7 +1308,7 @@ msgstr "členové skupiny %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"
+msgid "Cannot add someone else's membership."
 msgstr "Nelze vložit odebírání"
 
 #. TRANS: Client error displayed when not using the POST verb.
@@ -1329,30 +1344,51 @@ 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "Nelze smazat oblíbenou položku."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "Žádná taková skupina"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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"
+msgid "Not a member."
 msgstr "Všichni členové"
 
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr " API metoda nebyla nalezena."
-
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+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.
@@ -1524,35 +1560,42 @@ msgstr "Nahrávání obrázku selhalo."
 msgid "Avatar deleted."
 msgstr "Avatar smazán."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Pozadí"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1586,14 +1629,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Poznámka"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "Zablokovat tohoto uživatele"
 
@@ -1605,7 +1647,7 @@ msgstr "Zablokovat tohoto uživatele"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ano"
@@ -1621,32 +1663,6 @@ msgstr "Zablokovat tohoto uživatele"
 msgid "Failed to save block information."
 msgstr "Nepodařilo se uložit blokování."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Žádný takový uživatel."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1778,7 +1794,8 @@ msgid "Account deleted."
 msgstr "Avatar smazán."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "Zaregistrujte se"
@@ -1800,8 +1817,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Potvrdit"
 
@@ -1875,8 +1893,10 @@ msgid "You must be logged in to delete a group."
 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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."
 
@@ -1931,10 +1951,11 @@ msgid "Delete this group"
 msgstr "Odstranit tohoto uživatele"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1974,19 +1995,30 @@ msgstr "Neodstraňujte toto oznámení"
 msgid "Delete this notice"
 msgstr "Odstranit toto oznámení"
 
-#: actions/deleteuser.php:67
+#. 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."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Smazat uživatele"
 
-#: actions/deleteuser.php:136
+#. 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."
@@ -1994,80 +2026,104 @@ msgstr ""
 "Jste si jisti, že chcete smazat tohoto uživatele? To odstraní všechny údaje "
 "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:163 lib/deleteuserform.php:77
+#. 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.
 #. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "Vzhled"
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "Neplatná URL loga."
 
-#: actions/designadminpanel.php:340
+#. 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."
 
-#: actions/designadminpanel.php:344
+#. 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."
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Změňte logo"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Logo stránek"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "Logo stránek"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Změnit téma"
 
-#: actions/designadminpanel.php:486
+#. 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"
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Vlastní téma"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Pozadí"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2076,98 +2132,108 @@ 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:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "zap."
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "Dlaždicovat obrázek na pozadí"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. 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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "Odkazy"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Rozšířené"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "Vlastní CSS"
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "Reset zpět do výchozího"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Uložit"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "Uložit vzhled"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "Toto oznámení není oblíbeno!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "Přidat do oblíbených"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2891,7 +2957,7 @@ msgstr ""
 "Zkuste ji [vyhledat](%%%%action.groupsearch%%%%) nebo [založit!](%%%%action."
 "newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Vytvořit novou skupinu"
 
@@ -3298,26 +3364,33 @@ msgstr ""
 "\n"
 "S pozdravem, %2$s \n"
 
-#: actions/joingroup.php:60
+#. 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."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s se připojil(a) ke skupině %2$s"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "Nejste členem této skupiny."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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"
 
@@ -3423,6 +3496,13 @@ msgstr ""
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Uložit"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
@@ -3447,11 +3527,11 @@ msgstr "Přihlásit"
 msgid "Login to site"
 msgstr "Přihlásit se na stránky"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Zapamatuj si mě"
 
-#: actions/login.php:259 actions/register.php:493
+#: 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í! "
@@ -3842,7 +3922,8 @@ msgstr "Změnit heslo"
 msgid "Change your password."
 msgstr "Změňte své heslo."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Změna hesla"
 
@@ -3850,7 +3931,8 @@ msgstr "Změna hesla"
 msgid "Old password"
 msgstr "Staré heslo"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nové heslo"
 
@@ -3858,7 +3940,7 @@ msgstr "Nové heslo"
 msgid "6 or more characters"
 msgstr "6 a více znaků"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "Stejné jako heslo výše"
 
@@ -3882,11 +3964,12 @@ msgstr "Nesprávné staré heslo"
 msgid "Error saving user; invalid."
 msgstr "Chyba při ukládaní uživatele; neplatný."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "Nelze uložit nové heslo"
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. 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"
 
@@ -4229,23 +4312,24 @@ msgid "Profile information"
 msgstr "Nastavené Profilu"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 #, 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 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:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "Moje stránky"
 
@@ -4258,7 +4342,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:472
+#: 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"
@@ -4267,27 +4351,27 @@ 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:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "Umístění"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: 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."
 
@@ -4340,7 +4424,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:257 actions/register.php:229
+#: 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)."
@@ -4349,49 +4433,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:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 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:276
+#: actions/profilesettings.php:277
 #, 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, 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:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Zaregistrujte se"
@@ -4512,35 +4597,43 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "Tag cloud"
 
-#: actions/recoverpassword.php:36
+#. 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"
 
-#: actions/recoverpassword.php:62
+#. 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."
 
-#: actions/recoverpassword.php:66
+#. 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"
 
-#: actions/recoverpassword.php:73
+#. 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."
 
-#: actions/recoverpassword.php:86
+#. 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"
 
-#: actions/recoverpassword.php:97
+#. 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"
 
-#: actions/recoverpassword.php:111
+#. 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."
 
-#: actions/recoverpassword.php:152
+#. 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."
@@ -4548,67 +4641,101 @@ 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:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
 msgstr "Byl jste identifikován. Vložte níže nové heslo. "
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Obnovení hesla"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Zadej přezdívku nebo emailovou adresu"
 
-#: actions/recoverpassword.php:193
+#. 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"
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Obnovit"
 
-#: actions/recoverpassword.php:208
+#. 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"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Obnovit heslo"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Neznámá akce"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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!"
 
-#: actions/recoverpassword.php:243
+#. 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
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Reset"
 
-#: actions/recoverpassword.php:252
+#. 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"
 
-#: actions/recoverpassword.php:282
+#. 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."
 
-#: actions/recoverpassword.php:299
+#. 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."
 
-#: actions/recoverpassword.php:313
+#. 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"
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4616,24 +4743,35 @@ msgstr ""
 "Návod jak obnovit heslo byl odeslán na vaší emailovou adresu zaregistrovanou "
 "u vašeho účtu."
 
-#: actions/recoverpassword.php:357
+#. 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."
 
-#: actions/recoverpassword.php:365
+#. 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é"
 
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Heslo a potvrzení nesouhlasí"
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "Chyba nastavení uživatele"
 
-#: actions/recoverpassword.php:395
+#. 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."
 
@@ -4649,7 +4787,7 @@ msgstr "Litujeme, neplatný kód pozvánky."
 msgid "Registration successful"
 msgstr "Registrace úspěšná"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Registrovat"
 
@@ -4677,59 +4815,52 @@ 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:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer. Nutné."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 a více znaků. Nutné."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Stejné jako heslo uvedeno výše. Povinné."
+#: 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:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Email"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Použije se pouze pro aktualizace, oznámení a obnovu hesla."
 
-#: actions/register.php:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Delší jméno, nejlépe vaše \"skutečné\" jméno"
 
-#: actions/register.php:463
+#: actions/register.php:462
 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:524
+#: 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:534
+#: 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:538
+#: 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:541
+#: 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:546
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4738,7 +4869,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:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4771,7 +4902,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:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5088,7 +5219,7 @@ msgstr "Organizace"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "Popis"
 
@@ -5112,8 +5243,9 @@ msgstr "Akce aplikace"
 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:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Odstranit"
 
@@ -5239,7 +5371,7 @@ msgid "Note"
 msgstr "Poznámka"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "Aliasy"
 
@@ -7832,26 +7964,26 @@ msgstr ""
 "tracking - Dosud neimplementován.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 #, 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:153
+#: lib/common.php:158
 #, 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "Jdi na instalaci."
 
@@ -7923,12 +8055,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "vyp."
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Reset"
+#. 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: 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".
@@ -8012,28 +8147,24 @@ msgstr "Jdi"
 msgid "Grant this user the \"%s\" role"
 msgstr "Dát tomuto uživateli roli \"%s\""
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL domovské stránky nebo blogu skupiny nebo tématu"
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "Popište skupinu nebo téma"
 
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
 #, 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"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
 msgstr[0] "Popište skupinu nebo téma ve %d znacích"
 msgstr[1] "Popište skupinu nebo téma ve %d znacích"
 msgstr[2] "Popište skupinu nebo téma ve %d znacích"
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -8041,7 +8172,7 @@ msgstr ""
 "Umístění skupiny, pokud je nějaké, ve stylu \"město, stát (nebo region), země"
 "\""
 
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9253,14 +9384,9 @@ msgstr[2] ""
 msgid "about a year ago"
 msgstr "asi před rokem"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s není platná barva!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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ů."
@@ -9298,27 +9424,28 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "Žádný takový profil."
+#~ msgid "No such group"
+#~ msgstr "Žádná taková skupina"
 
 #, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Skupiny kterých je %s členem"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
 #~ msgstr " API metoda nebyla nalezena."
 
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Lidé přihlášení k %s"
+#~ msgid "Reset"
+#~ msgstr "Reset"
 
-#~ msgid "Couldn't update user."
-#~ msgstr "Nelze aktualizovat uživatele"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer. Nutné."
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "Nelze uložit profil"
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 a více znaků. Nutné."
 
-#~ msgid "Couldn't save tags."
-#~ msgstr "Nelze uložit tagy."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Stejné jako heslo uvedeno výše. Povinné."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s není platná barva!"
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 6e26517b57..b814ba6076 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -19,17 +19,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:19+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:56: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-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -85,6 +85,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -96,13 +97,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Speichern"
@@ -337,7 +338,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Konnte Benutzerdaten nicht aktualisieren."
@@ -361,7 +362,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "Konnte Profil nicht speichern."
 
@@ -371,7 +372,7 @@ msgstr "Konnte Profil nicht speichern."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
@@ -553,7 +554,8 @@ msgid "That status is not a favorite."
 msgstr "Diese Nachricht ist kein Favorit!"
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Konnte Favoriten nicht löschen."
 
@@ -601,7 +603,7 @@ msgstr "Konnte keine Statusmeldungen finden."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
@@ -611,7 +613,7 @@ msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ungültiger Benutzername."
@@ -623,7 +625,7 @@ msgstr "Ungültiger Benutzername."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr ""
@@ -634,7 +636,7 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Der bürgerliche Name ist zu lang (maximal 255 Zeichen)."
@@ -661,7 +663,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
@@ -718,22 +720,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, 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."
@@ -745,9 +751,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -804,9 +812,12 @@ msgid "Request token already authorized."
 msgstr "Anfrage-Token bereits autorisiert."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -814,7 +825,7 @@ msgstr "Anfrage-Token bereits autorisiert."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -835,18 +846,20 @@ msgstr "Datenbankfehler beim Einfügen von 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Unerwartete Formulareingabe."
@@ -900,7 +913,7 @@ msgstr "Profil"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Benutzername"
@@ -908,7 +921,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Passwort"
 
@@ -1016,10 +1029,12 @@ msgstr "Nachricht bereits wiederholt"
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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."
@@ -1295,7 +1310,7 @@ msgstr "%s Gruppen-Mitgliedschaften"
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
 #: actions/atompubmembershipfeed.php:219
 #, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
 msgstr "Konnte neues Abonnement nicht eintragen."
 
 #. TRANS: Client error displayed when not using the POST verb.
@@ -1329,29 +1344,51 @@ msgstr "Datei 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "Konnte Favoriten nicht löschen."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "Keine derartige Gruppe"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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 using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "HTTP method not supported"
-msgstr "HTTP-Methode wird nicht unterstützt."
+msgid "Not a member."
+msgstr "Kein Mitglied"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+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.
@@ -1522,35 +1559,42 @@ msgstr "Aktualisierung des Avatars fehlgeschlagen."
 msgid "Avatar deleted."
 msgstr "Avatar gelöscht."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Hintergrund"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1584,14 +1628,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Nein"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "Diesen Benutzer freigeben"
 
@@ -1603,7 +1646,7 @@ msgstr "Diesen Benutzer freigeben"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ja"
@@ -1619,32 +1662,6 @@ msgstr "Diesen Benutzer blockieren"
 msgid "Failed to save block information."
 msgstr "Konnte Blockierungsdaten nicht speichern."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Keine derartige Gruppe."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1774,7 +1791,8 @@ msgid "Account deleted."
 msgstr "Avatar gelöscht."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "Neues Benutzerkonto erstellen"
@@ -1796,8 +1814,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Bestätigen"
 
@@ -1870,8 +1889,10 @@ 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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"
 
@@ -1922,10 +1943,11 @@ msgid "Delete this group"
 msgstr "Diese Gruppe löschen"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1965,19 +1987,30 @@ msgstr "Diese Nachricht nicht löschen"
 msgid "Delete this notice"
 msgstr "Nachricht löschen"
 
-#: actions/deleteuser.php:67
+#. 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."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Benutzer löschen"
 
-#: actions/deleteuser.php:136
+#. 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."
@@ -1985,78 +2018,102 @@ msgstr ""
 "Bist du sicher, dass du den Benutzer löschen wisst? Alle Daten des Benutzers "
 "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 "Diese Gruppe nicht löschen"
+
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. 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.
 #. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "Design"
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr "Design-Einstellungen dieser StatusNet-Website"
 
-#: actions/designadminpanel.php:335
+#. 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"
 
-#: actions/designadminpanel.php:340
+#. 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."
 
-#: actions/designadminpanel.php:344
+#. 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"
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Logo ändern"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Seitenlogo"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "SSL-Logo"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Theme ändern"
 
-#: actions/designadminpanel.php:486
+#. 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."
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Angepasster Skin"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Hintergrund"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2066,98 +2123,108 @@ msgstr ""
 "Dateigröße beträgt %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "An"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "Hintergrundbild kacheln"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "Links"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "Eigene CSS"
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
 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:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "Standard wiederherstellen"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Speichern"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "Design speichern"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "Diese Nachricht ist kein Favorit!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "Zu Favoriten hinzufügen"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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 "Unbekanntes Dokument „%s“"
 
 #. TRANS: Title for "Edit application" form.
@@ -2886,7 +2953,7 @@ msgstr ""
 "action.groupsearch%%%%) oder deine eigene [Gruppe aufmachen!](%%%%action."
 "newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Neue Gruppe erstellen"
 
@@ -3298,26 +3365,33 @@ msgstr ""
 "\n"
 "Schöne Grüße von %2$s\n"
 
-#: actions/joingroup.php:60
+#. 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."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s ist der Gruppe %2$s beigetreten"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "Du bist kein Mitglied dieser Gruppe."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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"
 
@@ -3423,6 +3497,13 @@ msgstr "Lizenz-Bild-URl"
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Speichern"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Lizenz-Einstellungen speichern"
@@ -3448,11 +3529,11 @@ msgstr "Anmelden"
 msgid "Login to site"
 msgstr "An Seite anmelden"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Anmeldedaten merken"
 
-#: actions/login.php:259 actions/register.php:493
+#: 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!"
 
@@ -3846,7 +3927,8 @@ msgstr "Passwort ändern"
 msgid "Change your password."
 msgstr "Ändere dein Passwort."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Passwort geändert"
 
@@ -3854,7 +3936,8 @@ msgstr "Passwort geändert"
 msgid "Old password"
 msgstr "Altes Passwort"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Neues Passwort"
 
@@ -3862,7 +3945,7 @@ msgstr "Neues Passwort"
 msgid "6 or more characters"
 msgstr "6 oder mehr Zeichen"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "Gleiches Passwort wie zuvor"
 
@@ -3886,11 +3969,12 @@ msgstr "Altes Passwort falsch"
 msgid "Error saving user; invalid."
 msgstr "Fehler beim Speichern des Benutzers, ungültig."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "Konnte neues Passwort nicht speichern"
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Passwort gespeichert."
 
@@ -4218,22 +4302,23 @@ msgid "Profile information"
 msgstr "Profilinformation"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 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:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "Homepage"
 
@@ -4247,7 +4332,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:472
+#: 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"
@@ -4255,27 +4340,27 @@ 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:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "Aufenthaltsort"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: 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“"
 
@@ -4330,7 +4415,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:257 actions/register.php:229
+#: 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)."
@@ -4338,48 +4423,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:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Keine Zeitzone ausgewählt."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, 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:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Neues Benutzerkonto erstellen"
@@ -4506,35 +4592,43 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "Tag-Wolke"
 
-#: actions/recoverpassword.php:36
+#. 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!"
 
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Unbekannter Wiederherstellungscode."
 
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Kein Wiederherstellungscode."
 
-#: actions/recoverpassword.php:73
+#. 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."
 
-#: actions/recoverpassword.php:86
+#. 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."
 
-#: actions/recoverpassword.php:97
+#. 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."
 
-#: actions/recoverpassword.php:111
+#. 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."
 
-#: actions/recoverpassword.php:152
+#. 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."
@@ -4542,67 +4636,100 @@ msgstr ""
 "Wenn du dein Passwort vergessen hast, kannst du dir ein neues an deine "
 "hinterlegte Email schicken lassen."
 
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
 msgstr "Du wurdest identifiziert. Gib ein neues Passwort ein. "
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Passwort-Wiederherstellung"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Spitzname oder E-Mail-Adresse"
 
-#: actions/recoverpassword.php:193
+#. 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."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Wiederherstellung"
 
-#: actions/recoverpassword.php:208
+#. 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"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Stelle Passwort wieder her"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Unbekannter Befehl"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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!"
 
-#: actions/recoverpassword.php:243
+#. 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 "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
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: actions/recoverpassword.php:252
+#. 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."
 
-#: actions/recoverpassword.php:282
+#. 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."
 
-#: actions/recoverpassword.php:299
+#. 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."
 
-#: actions/recoverpassword.php:313
+#. 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."
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4610,23 +4737,34 @@ msgstr ""
 "Anweisungen für die Wiederherstellung deines Passworts wurden an deine "
 "hinterlegte E-Mail-Adresse geschickt."
 
-#: actions/recoverpassword.php:357
+#. 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."
 
-#: actions/recoverpassword.php:365
+#. 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."
 
-#: actions/recoverpassword.php:369
+#. 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."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "Fehler bei den Benutzereinstellungen."
 
-#: actions/recoverpassword.php:395
+#. 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."
 
@@ -4642,7 +4780,7 @@ msgstr "Entschuldigung, ungültiger Einladungscode."
 msgid "Registration successful"
 msgstr "Registrierung erfolgreich"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Registrieren"
 
@@ -4671,65 +4809,57 @@ msgstr ""
 "Hier kannst du einen neuen Zugang einrichten. Anschließend kannst du "
 "Nachrichten und Links mit deinen Freunden und Kollegen teilen. "
 
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen. Pflicht."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 oder mehr Buchstaben. Pflicht."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Gleiches Passwort wie zuvor. Pflichteingabe."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 oder mehr Zeichen"
 
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-Mail"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Wird nur für Updates, wichtige Mitteilungen und zur "
 "Passwortwiederherstellung verwendet"
 
-#: actions/register.php:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Längerer Name, bevorzugt dein bürgerlicher Name"
 
-#: actions/register.php:463
+#: actions/register.php:462
 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:524
+#: 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:534
+#: 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:538
+#: 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:541
+#: 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:546
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4738,7 +4868,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:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4771,7 +4901,7 @@ msgstr ""
 "\n"
 "Danke für deine Anmeldung, wir hoffen, dass dir der Service gefällt."
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5089,7 +5219,7 @@ msgstr "Organisation"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -5112,8 +5242,9 @@ msgstr "Programmaktionen"
 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:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Löschen"
 
@@ -5241,7 +5372,7 @@ msgid "Note"
 msgstr "Nachricht"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "Pseudonyme"
 
@@ -7842,24 +7973,24 @@ msgstr ""
 "tracking - noch nicht implementiert\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 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:153
+#: lib/common.php:158
 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "Zur Installation gehen."
 
@@ -7926,11 +8057,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "Aus"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Zurücksetzen"
+#. 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: 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".
@@ -8014,31 +8149,27 @@ msgstr "Los geht's"
 msgid "Grant this user the \"%s\" role"
 msgstr "Teile dem Benutzer die „%s“-Rolle zu"
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "Adresse der Homepage oder Blogs der Gruppe oder des Themas."
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "Beschreibe die Gruppe oder das Thema"
 
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+#: lib/groupeditform.php:162
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
 msgstr[0] "Beschreibe die Gruppe oder das Thema in einem Zeichen"
 msgstr[1] "Beschreibe die Gruppe oder das Thema in %d Zeichen"
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
 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:190
+#: lib/groupeditform.php:182
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9247,14 +9378,9 @@ msgstr[1] "vor ca. %d Monaten"
 msgid "about a year ago"
 msgstr "vor ca. einem Jahr"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "„%s“ ist keine gültige Farbe!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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."
@@ -9294,25 +9420,29 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr "Hole Backup von der Datei „%s“."
 
-#~ msgid "No such profile"
-#~ msgstr "Profil nicht gefunden."
+#~ msgid "No such group"
+#~ msgstr "Keine derartige Gruppe"
 
 #, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Gruppen, in denen „%s“ Mitglied ist"
+#~ msgid "HTTP method not supported"
+#~ msgstr "HTTP-Methode wird nicht unterstützt."
 
-#~ msgid "Method not supported"
-#~ msgstr "Methode wird nicht unterstützt"
+#~ msgid "Reset"
+#~ msgstr "Zurücksetzen"
 
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Leute, die „%s“ abonniert haben"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen. Pflicht."
 
-#~ msgid "Couldn't update user."
-#~ msgstr "Konnte Benutzerdaten nicht aktualisieren."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 oder mehr Buchstaben. Pflicht."
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "Konnte Profil nicht speichern."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Gleiches Passwort wie zuvor. Pflichteingabe."
 
-#~ msgid "Couldn't save tags."
-#~ msgstr "Konnte Tags nicht speichern."
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "„%s“ ist keine gültige Farbe!"
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 9de1abafd7..42526cb7f3 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-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:21+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:56:25+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 (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: en-gb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -78,6 +78,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -89,13 +90,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Save"
@@ -329,7 +330,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Could not update user."
@@ -353,7 +354,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "Could not save profile."
 
@@ -363,7 +364,7 @@ msgstr "Could not save profile."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, fuzzy, php-format
@@ -541,7 +542,8 @@ msgid "That status is not a favorite."
 msgstr "That status is not a favourite."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Could not delete favourite."
 
@@ -588,7 +590,7 @@ msgstr "Could not find target user."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Nickname already in use. Try another one."
@@ -598,7 +600,7 @@ msgstr "Nickname already in use. Try another one."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Not a valid nickname."
@@ -610,7 +612,7 @@ msgstr "Not a valid nickname."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Homepage is not a valid URL."
@@ -620,7 +622,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -648,7 +650,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -706,22 +708,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Could not join user %1$s to group %2$s."
@@ -733,9 +739,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -793,9 +801,12 @@ msgid "Request token already authorized."
 msgstr "You are not authorised."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -803,7 +814,7 @@ msgstr "You are not authorised."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -825,18 +836,20 @@ msgstr "Database error inserting OAuth application user."
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Unexpected form submission."
@@ -891,7 +904,7 @@ msgstr "Account"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Nickname"
@@ -899,7 +912,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Password"
 
@@ -1005,10 +1018,12 @@ msgstr "Already repeated that notice."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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
@@ -1281,7 +1296,7 @@ msgstr "%s group members"
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
 #: actions/atompubmembershipfeed.php:219
 #, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
 msgstr "Couldn't insert new subscription."
 
 #. TRANS: Client error displayed when not using the POST verb.
@@ -1317,30 +1332,51 @@ 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "Could not delete favourite."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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"
+msgid "Not a member."
 msgstr "All members"
 
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "API method not found."
-
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+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.
@@ -1512,35 +1548,42 @@ msgstr "Failed updating avatar."
 msgid "Avatar deleted."
 msgstr "Avatar deleted."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Background"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1574,14 +1617,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "No"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "Do not block this user"
 
@@ -1593,7 +1635,7 @@ msgstr "Do not block this user"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Yes"
@@ -1609,32 +1651,6 @@ msgstr "Block this user"
 msgid "Failed to save block information."
 msgstr "Failed to save block information."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "No such group."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1766,7 +1782,8 @@ msgid "Account deleted."
 msgstr "Avatar deleted."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "Create an account"
@@ -1788,8 +1805,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Confirm"
 
@@ -1863,8 +1881,10 @@ 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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."
 
@@ -1915,10 +1935,11 @@ msgid "Delete this group"
 msgstr "Delete this group"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1958,19 +1979,30 @@ msgstr "Do not delete this notice"
 msgid "Delete this notice"
 msgstr "Delete this notice"
 
-#: actions/deleteuser.php:67
+#. 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."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Delete user"
 
-#: actions/deleteuser.php:136
+#. 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."
@@ -1978,78 +2010,102 @@ msgstr ""
 "Are you sure you want to delete this user? This will clear all data about "
 "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:163 lib/deleteuserform.php:77
+#. 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.
 #. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "Design"
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "Invalid logo URL."
 
-#: actions/designadminpanel.php:340
+#. 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."
 
-#: actions/designadminpanel.php:344
+#. 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."
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Change logo"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Site logo"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "SSL logo"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Change theme"
 
-#: actions/designadminpanel.php:486
+#. 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."
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Custom theme"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Background"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2059,98 +2115,108 @@ msgstr ""
 "$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "On"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "Tile background image"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. 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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "Links"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr ""
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr ""
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
 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:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "Reset back to default"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Save"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "Save design"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "This notice is not a favourite!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "Add to favourites"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2872,7 +2938,7 @@ msgstr ""
 "for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
 "%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Create a new group"
 
@@ -3277,26 +3343,33 @@ msgstr ""
 "\n"
 "Sincerely, %2$s\n"
 
-#: actions/joingroup.php:60
+#. 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."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s joined group %2$s"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "You are not a member of that group."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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"
 
@@ -3401,6 +3474,13 @@ msgstr ""
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Save"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
@@ -3425,11 +3505,11 @@ msgstr "Login"
 msgid "Login to site"
 msgstr "Login to site"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Remember me"
 
-#: actions/login.php:259 actions/register.php:493
+#: 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!"
 
@@ -3817,7 +3897,8 @@ msgstr "Change password"
 msgid "Change your password."
 msgstr "Change your password."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Password change"
 
@@ -3825,7 +3906,8 @@ msgstr "Password change"
 msgid "Old password"
 msgstr "Old password"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "New password"
 
@@ -3833,7 +3915,7 @@ msgstr "New password"
 msgid "6 or more characters"
 msgstr "6 or more characters"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "Same as password above"
 
@@ -3857,11 +3939,12 @@ msgstr "Incorrect old password"
 msgid "Error saving user; invalid."
 msgstr "Error saving user; invalid."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "Can't save new password."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Password saved."
 
@@ -4194,23 +4277,24 @@ msgid "Profile information"
 msgstr "Profile information"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 #, 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 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:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "Homepage"
 
@@ -4223,7 +4307,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:472
+#: 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"
@@ -4231,27 +4315,27 @@ 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:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "Location"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: 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\""
 
@@ -4304,7 +4388,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:257 actions/register.php:229
+#: 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)."
@@ -4312,49 +4396,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:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Timezone not selected."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
 #, 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, 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:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Create an account"
@@ -4477,35 +4562,43 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "Tag cloud"
 
-#: actions/recoverpassword.php:36
+#. 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!"
 
-#: actions/recoverpassword.php:62
+#. 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."
 
-#: actions/recoverpassword.php:66
+#. 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."
 
-#: actions/recoverpassword.php:73
+#. 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."
 
-#: actions/recoverpassword.php:86
+#. 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."
 
-#: actions/recoverpassword.php:97
+#. 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."
 
-#: actions/recoverpassword.php:111
+#. 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."
 
-#: actions/recoverpassword.php:152
+#. 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."
@@ -4513,67 +4606,100 @@ 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:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+msgid "You have been identified. Enter a new password below."
 msgstr ""
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Password recovery"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Nickname or e-mail address"
 
-#: actions/recoverpassword.php:193
+#. 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."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Recover"
 
-#: actions/recoverpassword.php:208
+#. 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"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Recover password"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Unknown action"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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!"
 
-#: actions/recoverpassword.php:243
+#. 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
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Reset"
 
-#: actions/recoverpassword.php:252
+#. 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."
 
-#: actions/recoverpassword.php:282
+#. 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."
 
-#: actions/recoverpassword.php:299
+#. 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."
 
-#: actions/recoverpassword.php:313
+#. 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."
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4581,24 +4707,35 @@ msgstr ""
 "Instructions for recovering your password have been sent to the e-mail "
 "address registered to your account."
 
-#: actions/recoverpassword.php:357
+#. 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."
 
-#: actions/recoverpassword.php:365
+#. 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."
 
-#: actions/recoverpassword.php:369
+#. 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."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "Error setting user."
 
-#: actions/recoverpassword.php:395
+#. 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."
 
@@ -4614,7 +4751,7 @@ msgstr "Sorry, invalid invitation code."
 msgid "Registration successful"
 msgstr "Registration successful"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Register"
 
@@ -4640,59 +4777,52 @@ msgid ""
 "link up to friends and colleagues. "
 msgstr ""
 
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 or more characters. Required."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Same as password above. Required."
+#: 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:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Used only for updates, announcements, and password recovery"
 
-#: actions/register.php:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Longer name, preferably your \"real\" name"
 
-#: actions/register.php:463
+#: actions/register.php:462
 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:524
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:534
+#: 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:538
+#: 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:541
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4701,7 +4831,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:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4734,7 +4864,7 @@ msgstr ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5044,7 +5174,7 @@ msgstr "Organization"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "Description"
 
@@ -5067,8 +5197,9 @@ msgstr "Application actions"
 msgid "Reset key & secret"
 msgstr ""
 
+#. TRANS: Title of form for deleting a user.
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Delete"
 
@@ -5193,7 +5324,7 @@ msgid "Note"
 msgstr "Note"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr ""
 
@@ -7742,26 +7873,26 @@ msgstr ""
 "tracking - not yet implemented.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 #, 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:153
+#: lib/common.php:158
 #, 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "Go to the installer."
 
@@ -7829,12 +7960,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "Off"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Reset"
+#. 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: 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".
@@ -7918,34 +8052,30 @@ msgstr "Go"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL of the homepage or blog of the group or topic"
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "Describe the group or topic"
 
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
 #, 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"
+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:182
+#: lib/groupeditform.php:174
 #, 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:190
+#: lib/groupeditform.php:182
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9054,14 +9184,9 @@ msgstr[1] ""
 msgid "about a year ago"
 msgstr "about a year ago"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s is not a valid colour!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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."
@@ -9098,27 +9223,29 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "No such profile."
+#~ msgid "No such group"
+#~ msgstr "No such group."
 
 #, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Groups %s is a member of"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
 #~ msgstr "API method not found."
 
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "People subscribed to %s"
+#~ msgid "Reset"
+#~ msgstr "Reset"
 
-#~ msgid "Couldn't update user."
-#~ msgstr "Couldn't update user."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "Couldn't save profile."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 or more characters. Required."
 
-#~ msgid "Couldn't save tags."
-#~ msgstr "Couldn't save tags."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Same as password above. Required."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s is not a valid colour!"
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index ae848abf18..d4b72d3e9b 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-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:22+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:56:29+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 (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: eo\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -82,6 +82,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -93,13 +94,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Konservu"
@@ -333,7 +334,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Malsukcesis ĝisdatigi uzanton"
@@ -357,7 +358,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "Malsukcesis konservi la profilon."
 
@@ -367,7 +368,7 @@ msgstr "Malsukcesis konservi la profilon."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
@@ -545,7 +546,8 @@ msgid "That status is not a favorite."
 msgstr "La stato ne estas ŝatata."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Malsukcesis forigi ŝataton."
 
@@ -591,7 +593,7 @@ msgstr "Malsukcesis trovi celan uzanton."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "La uzantnomo jam uziĝis. Provu ion alian."
@@ -601,7 +603,7 @@ msgstr "La uzantnomo jam uziĝis. Provu ion alian."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ne valida kromnomo."
@@ -613,7 +615,7 @@ msgstr "Ne valida kromnomo."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Ĉefpaĝo ne estas valida URL."
@@ -623,7 +625,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Kompleta nomo tro longas (maksimume 255 signoj)"
@@ -650,7 +652,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Lokonomo tro longas (maksimume 255 signoj)"
@@ -707,22 +709,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, 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."
@@ -734,9 +740,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -793,9 +801,12 @@ msgid "Request token already authorized."
 msgstr ""
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -803,7 +814,7 @@ msgstr ""
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -825,18 +836,20 @@ msgstr "Datumbaza eraro enigi la uzanton de *OAuth-aplikaĵo."
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Neatendita formo-sendo."
@@ -890,7 +903,7 @@ msgstr "Konto"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Kromnomo"
@@ -898,7 +911,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Pasvorto"
 
@@ -1006,10 +1019,12 @@ msgstr "La avizo jam ripetiĝis."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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
@@ -1285,7 +1300,7 @@ msgstr "%s grupanoj"
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
 #: actions/atompubmembershipfeed.php:219
 #, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
 msgstr "Eraris enmeti novan abonon."
 
 #. TRANS: Client error displayed when not using the POST verb.
@@ -1321,31 +1336,51 @@ msgstr "Ne ekzistas tia dosiero."
 #. 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "Malsukcesis forigi ŝataton."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-#, fuzzy
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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"
+msgid "Not a member."
 msgstr "Ĉiuj grupanoj"
 
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "Metodo de API ne troviĝas."
-
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+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.
@@ -1517,35 +1552,42 @@ msgstr "Eraris ĝisdatigi vizaĝbildon."
 msgid "Avatar deleted."
 msgstr "Vizaĝbildo forigita."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Fono"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1578,14 +1620,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Ne"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "Ne bloki la uzanton"
 
@@ -1597,7 +1638,7 @@ msgstr "Ne bloki la uzanton"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Jes"
@@ -1613,32 +1654,6 @@ msgstr "Bloki la uzanton"
 msgid "Failed to save block information."
 msgstr "Eraris konservi blokado-informon."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Ne estas tiu grupo."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1770,7 +1785,8 @@ msgid "Account deleted."
 msgstr "Vizaĝbildo forigita."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "Krei konton"
@@ -1792,8 +1808,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Konfirmi"
 
@@ -1867,8 +1884,10 @@ msgid "You must be logged in to delete a group."
 msgstr "Ensalutu por eksaniĝi."
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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."
 
@@ -1923,10 +1942,11 @@ msgid "Delete this group"
 msgstr "Forigi la uzanton"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1965,19 +1985,30 @@ msgstr "Ne forigi la avizon"
 msgid "Delete this notice"
 msgstr "Forigi la avizon"
 
-#: actions/deleteuser.php:67
+#. 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."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Forigi uzanton"
 
-#: actions/deleteuser.php:136
+#. 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."
@@ -1985,80 +2016,104 @@ msgstr ""
 "Ĉu vi certe volas forigi la uzanton? Ĉiu datumo pri la uzanto viŝiĝos de la "
 "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:163 lib/deleteuserform.php:77
+#. 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.
 #. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "Aspekto"
 
-#: actions/designadminpanel.php:74
+#. 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"
 
-#: actions/designadminpanel.php:335
+#. 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."
 
-#: actions/designadminpanel.php:340
+#. 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."
 
-#: actions/designadminpanel.php:344
+#. 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."
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Ŝanĝi emblemon"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Reteja emblemo"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "Reteja emblemo"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Ŝanĝi desegnon"
 
-#: actions/designadminpanel.php:486
+#. 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"
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Propra desegno"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Fono"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2066,98 +2121,108 @@ 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:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "En"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "Ripeti la fonbildon"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. 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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "Ligiloj"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Speciala"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "Propra CSS"
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "Redefaŭltiĝi"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Konservi"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "Savi desegnon"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "Ĉi tiu avizo ne estas preferita"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "Aldoni al ŝatolisto"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2875,7 +2940,7 @@ msgstr ""
 "(%%%%action.groupsearch%%%%) aŭ [kreu vian propran grupon!](%%%%action."
 "newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Krei novan grupon"
 
@@ -3277,26 +3342,33 @@ msgstr ""
 "\n"
 "via sincere, %2$s\n"
 
-#: actions/joingroup.php:60
+#. 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."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s aniĝis al grupo %2$s"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "Vi ne estas grupano."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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"
 
@@ -3401,6 +3473,13 @@ msgstr ""
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Konservi"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
@@ -3425,11 +3504,11 @@ msgstr "Ensaluti"
 msgid "Login to site"
 msgstr "Ensaluti al la retejo"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Memoru min"
 
-#: actions/login.php:259 actions/register.php:493
+#: 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!"
 
@@ -3816,7 +3895,8 @@ msgstr "Ŝanĝi pasvorton"
 msgid "Change your password."
 msgstr "Ŝanĝi vian pasvorton."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Pasvorta ŝanĝo"
 
@@ -3824,7 +3904,8 @@ msgstr "Pasvorta ŝanĝo"
 msgid "Old password"
 msgstr "Malnova pasvorto"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nova pasvorto"
 
@@ -3832,7 +3913,7 @@ msgstr "Nova pasvorto"
 msgid "6 or more characters"
 msgstr "6 aŭ pli da literoj"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "Same kiel pasvorto supra"
 
@@ -3856,11 +3937,12 @@ msgstr "Neĝusta malnova pasvorto"
 msgid "Error saving user; invalid."
 msgstr "Eraris konservi uzanton: nevalida."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "Malsukcesis konservi novan pasvorton."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Pasvorto konservitas."
 
@@ -4186,23 +4268,24 @@ msgid "Profile information"
 msgstr "Profila informo"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 #, 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 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:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "Hejmpaĝo"
 
@@ -4215,7 +4298,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:472
+#: 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"
@@ -4223,27 +4306,27 @@ 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:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "Loko"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: 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\""
 
@@ -4296,7 +4379,7 @@ 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:257 actions/register.php:229
+#: 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)."
@@ -4304,49 +4387,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:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Horzono ne elektita"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
 #, 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, 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:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Krei konton"
@@ -4466,35 +4550,43 @@ msgstr "Kial ne [krei konton](%%action.register%%) kaj esti la unua afiŝanto!"
 msgid "Tag cloud"
 msgstr "Entikedo-nubo"
 
-#: actions/recoverpassword.php:36
+#. 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."
 
-#: actions/recoverpassword.php:62
+#. 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."
 
-#: actions/recoverpassword.php:66
+#. 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."
 
-#: actions/recoverpassword.php:73
+#. 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."
 
-#: actions/recoverpassword.php:86
+#. 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."
 
-#: actions/recoverpassword.php:97
+#. 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."
 
-#: actions/recoverpassword.php:111
+#. 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."
 
-#: actions/recoverpassword.php:152
+#. 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."
@@ -4502,67 +4594,101 @@ msgstr ""
 "Se vi forgesas aŭ perdas vian pasvorton, ni povas sendi novan pasvorton al "
 "la retpoŝtadreso konservita je via konto."
 
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
 msgstr "Vi estis identigita. Enigu sube novan pasvorton."
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Pasvorton rehavi."
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Alinomo aŭ retpoŝtadreso."
 
-#: actions/recoverpassword.php:193
+#. 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."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Rehavi"
 
-#: actions/recoverpassword.php:208
+#. 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"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Refari pasvorton"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Nekonata ago"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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!"
 
-#: actions/recoverpassword.php:243
+#. 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
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Restarigi"
 
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Alinomo aŭ retpoŝtadreso."
 
-#: actions/recoverpassword.php:282
+#. 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."
 
-#: actions/recoverpassword.php:299
+#. 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."
 
-#: actions/recoverpassword.php:313
+#. 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."
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4570,24 +4696,35 @@ msgstr ""
 "Gvidoj rehavi vian pasvorton jam sendiĝas al la retpoŝtadreso registrita je "
 "via konto."
 
-#: actions/recoverpassword.php:357
+#. 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."
 
-#: actions/recoverpassword.php:365
+#. 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."
 
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Pasvorto kaj komfirmo ne kongruas."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "Eraris agordi uzanton."
 
-#: actions/recoverpassword.php:395
+#. 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."
 
@@ -4603,7 +4740,7 @@ msgstr "Pardonon, nevalida invitkodo."
 msgid "Registration successful"
 msgstr "Registriĝo sukcesa"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Registri"
 
@@ -4631,61 +4768,53 @@ 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:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 minusklaj literoj aŭ ciferoj, neniu interpunkcio aŭ spaco. Bezonate."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 aŭ pli da literoj. Bezonate."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Same kiel supra pasvorto. Bezonate."
+#: 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:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Retpoŝto"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Uzu nur por ĝisdatigo, anonco, kaj rehavi pasvorton."
 
-#: actions/register.php:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Pli longa nomo, prefere via \"vera\" nomo."
 
-#: actions/register.php:463
+#: actions/register.php:462
 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:524
+#: 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:534
+#: 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:538
+#: 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:541
+#: 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:546
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4694,7 +4823,7 @@ msgstr ""
 "Mia teksto kaj dosiero estas atingebla per %s  krom jene: pasvorto, "
 "retpoŝtadreso, tujmesaĝilo-adreso, kaj telefonnumero."
 
-#: actions/register.php:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4726,7 +4855,7 @@ msgstr ""
 "\n"
 "Dankon pro registriĝo, kaj ni esperas al vi ĝuon de uzi ĉi servon."
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5042,7 +5171,7 @@ msgstr "Organizaĵo"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "Priskribo"
 
@@ -5065,8 +5194,9 @@ msgstr "Aplikaĵa ago"
 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:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Forigi"
 
@@ -5191,7 +5321,7 @@ msgid "Note"
 msgstr "Noto"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "Alnomo"
 
@@ -7760,26 +7890,26 @@ msgstr ""
 "tracking -ankoraŭ ne realigita.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 #, 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:153
+#: lib/common.php:158
 #, 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "Al la instalilo."
 
@@ -7850,12 +7980,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "For"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Restarigi"
+#. 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: 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".
@@ -7939,34 +8072,30 @@ msgstr "Iri"
 msgid "Grant this user the \"%s\" role"
 msgstr "Donu al la uzanto rolon \"%s\""
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 minusklaj literoj aŭ ciferoj, neniu interpunkcio aŭ spaco"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL de la hejmpaĝo aŭ blogo de la grupo aŭ temo"
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "Priskribo de grupo aŭ temo"
 
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
 #, 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"
+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:182
+#: lib/groupeditform.php:174
 #, 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:190
+#: lib/groupeditform.php:182
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9171,14 +9300,9 @@ msgstr[1] "antaŭ ĉirkaŭ %d monatoj"
 msgid "about a year ago"
 msgstr "antaŭ ĉirkaŭ unu jaro"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s ne estas valida koloro!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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."
@@ -9216,26 +9340,29 @@ msgid "Getting backup from file '%s'."
 msgstr ""
 
 #, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "Ne ekzistas tia profilo."
+#~ msgid "No such group"
+#~ msgstr "Ne estas tiu grupo."
 
 #, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Grupoj de %s"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
 #~ msgstr "Metodo de API ne troviĝas."
 
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Abonantoj de %s"
+#~ msgid "Reset"
+#~ msgstr "Restarigi"
 
-#~ msgid "Couldn't update user."
-#~ msgstr "Ne povus ĝisdatigi uzanton."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 minusklaj literoj aŭ ciferoj, neniu interpunkcio aŭ spaco. Bezonate."
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "Malsukcesis konservi la profilon."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 aŭ pli da literoj. Bezonate."
 
-#~ msgid "Couldn't save tags."
-#~ msgstr "Malsukcesis konservi markilojn."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Same kiel supra pasvorto. Bezonate."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 minusklaj literoj aŭ ciferoj, neniu interpunkcio aŭ spaco"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s ne estas valida koloro!"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 02b882b20d..155932d023 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/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-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:23+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:56: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-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -82,6 +82,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -93,13 +94,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Guardar"
@@ -334,7 +335,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "No se pudo actualizar el usuario."
@@ -358,7 +359,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "No se pudo guardar el perfil."
 
@@ -368,7 +369,7 @@ msgstr "No se pudo guardar el perfil."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, fuzzy, php-format
@@ -546,7 +547,8 @@ msgid "That status is not a favorite."
 msgstr "Este status no es un favorito."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "No se pudo borrar favorito."
 
@@ -593,7 +595,7 @@ msgstr "No se pudo encontrar ningún usuario de destino."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "El usuario ya existe. Prueba con otro."
@@ -603,7 +605,7 @@ msgstr "El usuario ya existe. Prueba con otro."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Usuario inválido"
@@ -615,7 +617,7 @@ msgstr "Usuario inválido"
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "La página de inicio no es un URL válido."
@@ -625,7 +627,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -653,7 +655,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -711,22 +713,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "No se pudo unir el usuario %s al grupo %s"
@@ -738,9 +744,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -800,9 +808,12 @@ msgid "Request token already authorized."
 msgstr "No estás 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -810,7 +821,7 @@ msgstr "No estás autorizado."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -833,18 +844,20 @@ msgstr "Error de base de datos al insertar usuario de la aplicación OAuth."
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: 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."
@@ -898,7 +911,7 @@ msgstr "Cuenta"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Usuario"
@@ -906,7 +919,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Contraseña"
 
@@ -1014,10 +1027,12 @@ msgstr "Este mensaje ya se ha repetido."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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
@@ -1292,7 +1307,7 @@ msgstr "Miembros del grupo %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"
+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.
@@ -1328,30 +1343,51 @@ 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "No se pudo borrar favorito."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "No existe ese grupo"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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"
+msgid "Not a member."
 msgstr "Todos los miembros"
 
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "Método de API no encontrado."
-
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+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.
@@ -1521,35 +1557,42 @@ msgstr "Error al actualizar la imagen."
 msgid "Avatar deleted."
 msgstr "Imagen borrada."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Fondo"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1583,14 +1626,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "No"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "No bloquear a este usuario"
 
@@ -1602,7 +1644,7 @@ msgstr "No bloquear a este usuario"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Sí"
@@ -1618,32 +1660,6 @@ msgstr "Bloquear este usuario."
 msgid "Failed to save block information."
 msgstr "No se guardó información de bloqueo."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "No existe ese grupo."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1776,7 +1792,8 @@ msgid "Account deleted."
 msgstr "Imagen borrada."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "Crear una cuenta"
@@ -1798,8 +1815,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -1874,8 +1892,10 @@ msgid "You must be logged in to delete a group."
 msgstr "Debes estar conectado para dejar un grupo."
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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."
 
@@ -1927,10 +1947,11 @@ msgid "Delete this group"
 msgstr "Borrar 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.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1970,19 +1991,30 @@ msgstr "No eliminar este mensaje"
 msgid "Delete this notice"
 msgstr "Borrar este mensaje"
 
-#: actions/deleteuser.php:67
+#. 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."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Borrar usuario"
 
-#: actions/deleteuser.php:136
+#. 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."
@@ -1990,80 +2022,104 @@ msgstr ""
 "¿Realmente deseas eliminar este usuario? Esto borrará de la base de datos "
 "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 grupo"
+
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. 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.
 #. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "Diseño"
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
-#: actions/designadminpanel.php:335
+#. 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."
 
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "URL de logotipo inválido."
 
-#: actions/designadminpanel.php:344
+#. 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."
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Cambiar logo"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Logo del sitio"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "Logo del sitio"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Cambiar el tema"
 
-#: actions/designadminpanel.php:486
+#. 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."
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Personalizar tema"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Fondo"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2073,98 +2129,108 @@ msgstr ""
 "es %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Activar"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "Imagen de fondo en mosaico"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "Vínculos"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "Personalizar CSS"
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Utilizar 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:703 lib/designsettings.php:259
+#: 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "Volver a los valores predeterminados"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Guardar"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "Guardar el diseño"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "Este mensaje no es un favorito!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "Agregar a favoritos"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2894,7 +2960,7 @@ msgstr ""
 "encuentras un grupo que te guste? ¡Intenta [buscar otro](%%%%action."
 "groupsearch%%%%) o [crea tú uno!](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Crear un nuevo grupo"
 
@@ -3303,26 +3369,33 @@ msgstr ""
 "\n"
 "Saludos cordiales, %2$s\n"
 
-#: actions/joingroup.php:60
+#. 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."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s se ha unido al grupo %2$s"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "No eres miembro de este grupo."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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"
 
@@ -3427,6 +3500,13 @@ msgstr ""
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Guardar"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
@@ -3451,11 +3531,11 @@ msgstr "Inicio de sesión"
 msgid "Login to site"
 msgstr "Ingresar a sitio"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Recordarme"
 
-#: actions/login.php:259 actions/register.php:493
+#: 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 "
@@ -3849,7 +3929,8 @@ msgstr "Cambiar contraseña"
 msgid "Change your password."
 msgstr "Cambia tu contraseña"
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Cambio de contraseña"
 
@@ -3857,7 +3938,8 @@ msgstr "Cambio de contraseña"
 msgid "Old password"
 msgstr "Antigua contraseña"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nueva contraseña"
 
@@ -3865,7 +3947,7 @@ msgstr "Nueva contraseña"
 msgid "6 or more characters"
 msgstr "6 o más caracteres"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "Igual a la contraseña de arriba"
 
@@ -3889,11 +3971,12 @@ msgstr "Contraseña antigua incorrecta."
 msgid "Error saving user; invalid."
 msgstr "Error al guardar el usuario; inválido."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "No se puede guardar la nueva contraseña."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. 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."
 
@@ -4238,7 +4321,8 @@ msgid "Profile information"
 msgstr "Información del perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4246,16 +4330,16 @@ msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 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:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "Página de inicio"
 
@@ -4268,7 +4352,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:472
+#: 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"
@@ -4276,27 +4360,27 @@ 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:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "Ubicación"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: 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\""
 
@@ -4351,7 +4435,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:257 actions/register.php:229
+#: 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)."
@@ -4359,49 +4443,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:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Zona horaria no seleccionada"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
 #, 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, 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:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Crear una cuenta"
@@ -4527,37 +4612,45 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "Nube de etiquetas"
 
-#: actions/recoverpassword.php:36
+#. 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!"
 
-#: actions/recoverpassword.php:62
+#. 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."
 
-#: actions/recoverpassword.php:66
+#. 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."
 
-#: actions/recoverpassword.php:73
+#. 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."
 
-#: actions/recoverpassword.php:86
+#. 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."
 
-#: actions/recoverpassword.php:97
+#. 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."
 
-#: actions/recoverpassword.php:111
+#. 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."
 
-#: actions/recoverpassword.php:152
+#. 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."
@@ -4565,71 +4658,105 @@ 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:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+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. "
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Recuperación de contraseña"
 
-#: actions/recoverpassword.php:191
+#. 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"
 
-#: actions/recoverpassword.php:193
+#. 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."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Recuperar"
 
-#: actions/recoverpassword.php:208
+#. 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"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Recuperar contraseña"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Acción desconocida"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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!"
 
-#: actions/recoverpassword.php:243
+#. 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
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Restablecer"
 
-#: actions/recoverpassword.php:252
+#. 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"
 
-#: actions/recoverpassword.php:282
+#. 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."
 
-#: actions/recoverpassword.php:299
+#. 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."
 
-#: actions/recoverpassword.php:313
+#. 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."
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4637,24 +4764,35 @@ msgstr ""
 "Se enviaron instrucciones para recuperar tu contraseña a la dirección de "
 "correo registrada."
 
-#: actions/recoverpassword.php:357
+#. 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."
 
-#: actions/recoverpassword.php:365
+#. 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."
 
-#: actions/recoverpassword.php:369
+#. 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."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "Error al configurar el usuario."
 
-#: actions/recoverpassword.php:395
+#. 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."
 
@@ -4670,7 +4808,7 @@ msgstr "El código de invitación no es válido."
 msgid "Registration successful"
 msgstr "Registro exitoso."
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Registrarse"
 
@@ -4698,64 +4836,55 @@ 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:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 letras en minúscula o números, sin signos de puntuación o espacios. "
-"Requerido."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 o más caracters. Requerido."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Igual a la contraseña de arriba. Requerida"
+#: 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:446 actions/register.php:450
+#: 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:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 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:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Nombre más largo, preferiblemente tu nombre \"real\""
 
-#: actions/register.php:463
+#: actions/register.php:462
 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:524
+#: 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:534
+#: 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:538
+#: 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:541
+#: 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:546
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4765,7 +4894,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:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4798,7 +4927,7 @@ msgstr ""
 "\n"
 "¡Gracias por apuntarte! Esperamos que disfrutes usando este servicio."
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5116,7 +5245,7 @@ msgstr "Organización"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "Descripción"
 
@@ -5139,8 +5268,9 @@ msgstr "Acciones de la aplicación"
 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:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Borrar"
 
@@ -5267,7 +5397,7 @@ msgid "Note"
 msgstr "Nota"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "Alias"
 
@@ -7878,26 +8008,26 @@ msgstr ""
 "tracking - aún sin implementar.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 #, 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:153
+#: lib/common.php:158
 #, 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "Ir al instalador."
 
@@ -7969,12 +8099,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "Desactivar"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Restablecer"
+#. 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: 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".
@@ -8058,28 +8191,23 @@ msgstr "Ir"
 msgid "Grant this user the \"%s\" role"
 msgstr "Otorgar al usuario el papel de \"%$\""
 
-#: lib/groupeditform.php:154
-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:163
+#: lib/groupeditform.php:155
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL de página de inicio o blog del grupo o tema"
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "Describir al grupo o tema"
 
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
 #, 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"
+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:182
+#: lib/groupeditform.php:174
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -8087,7 +8215,7 @@ msgstr ""
 "Ubicación del grupo, si existe, por ejemplo \"Ciudad, Estado (o Región), País"
 "\""
 
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9300,14 +9428,9 @@ msgstr[1] "hace aproximadamente %d meses"
 msgid "about a year ago"
 msgstr "hace un año"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "¡%s no es un color válido!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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"
@@ -9344,27 +9467,31 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "No existe tal perfil."
+#~ msgid "No such group"
+#~ msgstr "No existe ese grupo"
 
 #, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "%s es miembro de los grupos"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
 #~ msgstr "Método de API no encontrado."
 
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Personas suscritas a %s"
+#~ msgid "Reset"
+#~ msgstr "Restablecer"
 
-#~ msgid "Couldn't update user."
-#~ msgstr "No se pudo actualizar el usuario."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 letras en minúscula o números, sin signos de puntuación o espacios. "
+#~ "Requerido."
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "No se pudo guardar el perfil."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 o más caracters. Requerido."
 
-#~ msgid "Couldn't save tags."
-#~ msgstr "No se pudo guardar las etiquetas."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Igual a la contraseña de arriba. Requerida"
+
+#~ 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"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "¡%s no es un color válido!"
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index 4a1e51eac9..cb0a6fee8c 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-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:24+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:56:39+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 (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -82,6 +82,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -93,13 +94,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "ذخیره"
@@ -331,7 +332,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "نمی‌توان کاربر را به‌هنگام‌سازی کرد."
@@ -355,7 +356,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "نمی‌توان نمایه را ذخیره کرد."
 
@@ -365,7 +366,7 @@ msgstr "نمی‌توان نمایه را ذخیره کرد."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, fuzzy, php-format
@@ -539,7 +540,8 @@ msgid "That status is not a favorite."
 msgstr "این پیام یک پیام برگزیده نیست."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "نمی‌توان پیام برگزیده را حذف کرد."
 
@@ -586,7 +588,7 @@ msgstr "نمی‌توان کاربر هدف را پیدا کرد."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "این لقب در حال حاضر ثبت شده است. لطفا یکی دیگر انتخاب کنید."
@@ -596,7 +598,7 @@ msgstr "این لقب در حال حاضر ثبت شده است. لطفا یکی
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "لقب نا معتبر."
@@ -608,7 +610,7 @@ msgstr "لقب نا معتبر."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "صفحهٔ خانگی یک نشانی معتبر نیست."
@@ -618,7 +620,7 @@ msgstr "صفحهٔ خانگی یک نشانی معتبر نیست."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -645,7 +647,7 @@ msgstr[0] "توصیف خیلی طولانی است (حداکثر %d نویسه)"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -702,22 +704,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "نمی‌توان کاربر %1$s را عضو گروه %2$s کرد."
@@ -729,9 +735,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -791,9 +799,12 @@ msgid "Request token already authorized."
 msgstr "شما شناسایی نشده اید."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -801,7 +812,7 @@ msgstr "شما شناسایی نشده اید."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -823,18 +834,20 @@ msgstr "هنگام افزودن کاربر برنامهٔ OAuth در پایگا
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "ارسال غیر قابل انتظار فرم."
@@ -891,7 +904,7 @@ msgstr "حساب کاربری"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "نام کاربری"
@@ -899,7 +912,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "گذرواژه"
 
@@ -1007,10 +1020,12 @@ msgstr "قبلا آن پیام تکرار شده است."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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
@@ -1282,7 +1297,7 @@ 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"
+msgid "Cannot add someone else's membership."
 msgstr "نمی‌توان اشتراک تازه‌ای افزود."
 
 #. TRANS: Client error displayed when not using the POST verb.
@@ -1318,30 +1333,51 @@ 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "نمی‌توان پیام برگزیده را حذف کرد."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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"
+msgid "Not a member."
 msgstr "همهٔ اعضا"
 
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "رابط مورد نظر پیدا نشد."
-
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
 msgstr "نمی‌توان اشتراک را ذخیره کرد."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1515,35 +1551,42 @@ msgstr "به روز رسانی چهره موفقیت آمیر نبود."
 msgid "Avatar deleted."
 msgstr "چهره پاک شد."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "پیش‌زمینه"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1578,14 +1621,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "خیر"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "کاربر را مسدود نکن"
 
@@ -1597,7 +1639,7 @@ msgstr "کاربر را مسدود نکن"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "بله"
@@ -1613,32 +1655,6 @@ msgstr "کاربر را مسدود کن"
 msgid "Failed to save block information."
 msgstr "ذخیرهٔ ردیف اطلاعات شکست خورد."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "چنین گروهی وجود ندارد."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1770,7 +1786,8 @@ msgid "Account deleted."
 msgstr "چهره پاک شد."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "ساختن یک جساب‌کاربری"
@@ -1792,8 +1809,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "تایید"
 
@@ -1868,8 +1886,10 @@ 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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 "نام‌مستعار یا شناسه‌ای وجود ندارد."
 
@@ -1924,10 +1944,11 @@ msgid "Delete this group"
 msgstr "حذف این کاربر"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1967,19 +1988,30 @@ msgstr "این پیام را پاک نکن"
 msgid "Delete this notice"
 msgstr "این پیام را پاک کن"
 
-#: actions/deleteuser.php:67
+#. 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 "شما فقط می‌توانید کاربران محلی را پاک کنید."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "حذف کاربر"
 
-#: actions/deleteuser.php:136
+#. 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."
@@ -1987,82 +2019,106 @@ 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:163 lib/deleteuserform.php:77
+#. 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.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "طرح"
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "نشانی اینترنتی نشان نامعتبر است."
 
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "نشانی اینترنتی نشان نامعتبر است."
 
-#: actions/designadminpanel.php:344
+#. 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."
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "تغییر نشان"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "نشان وب‌گاه"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "نشان وب‌گاه"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "تغییر پوسته"
 
-#: actions/designadminpanel.php:486
+#. 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 "پوسته برای وب‌گاه"
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "پوستهٔ اختصاصی"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "پیش‌زمینه"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2072,98 +2128,108 @@ msgstr ""
 "پرونده %1 $s است."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "روشن"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "تصویر پیش‌زمینهٔ موزاییکی"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. 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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "پیوندها"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "پیشرفته"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "CSS اختصاصی"
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
 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:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "برگشت به حالت پیش گزیده"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "ذخیره‌کردن"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "ذخیره‌کردن طرح"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "این پیام یک پیام برگزیده نیست!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "افزودن به برگزیده‌ها"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2888,7 +2954,7 @@ msgstr ""
 "نمی‌بینید؟ می‌توانید برای یافتن آن [بگردید](%%%action.groupsearch%%%) !یا [آن "
 "را خودتان بسازید](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "یک گروه جدید بساز"
 
@@ -3288,26 +3354,33 @@ msgstr ""
 "\n"
 "با تشکر، %2$s\n"
 
-#: actions/joingroup.php:60
+#. 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 "برای پیوستن به یک گروه، باید وارد شده باشید."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s به گروه %2$s پیوست"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "شما یک کاربر این گروه نیستید."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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 را ترک کرد"
 
@@ -3412,6 +3485,13 @@ msgstr ""
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "ذخیره‌کردن"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
@@ -3436,11 +3516,11 @@ msgstr "ورود"
 msgid "Login to site"
 msgstr "ورود به وب‌گاه"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "مرا به یاد بسپار"
 
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "وارد شدن خودکار. نه برای کامپیوترهای مشترک!"
 
@@ -3829,7 +3909,8 @@ msgstr "تغییر گذرواژه"
 msgid "Change your password."
 msgstr "تغییر گذرواژهٔ شما"
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "تغییر گذرواژه"
 
@@ -3837,7 +3918,8 @@ msgstr "تغییر گذرواژه"
 msgid "Old password"
 msgstr "گذرواژهٔ پیشین"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "گذرواژهٔ تازه"
 
@@ -3845,7 +3927,7 @@ msgstr "گذرواژهٔ تازه"
 msgid "6 or more characters"
 msgstr "۶ نویسه یا بیش‌تر"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "مانند گذرواژهٔ بالا"
 
@@ -3869,11 +3951,12 @@ msgstr "گذرواژه پیشین اشتباه است"
 msgid "Error saving user; invalid."
 msgstr "هنگام ذخیرهٔ کاربر خطا رخ داد؛ نامعتبر است."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "نمی‌توان گذرواژهٔ جدید را ذخیره کرد."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "گذرواژه ذخیره شد."
 
@@ -4216,23 +4299,24 @@ msgid "Profile information"
 msgstr "اطلاعات نمایه"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 #, 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 msgid "Full name"
 msgstr "نام‌کامل"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "صفحهٔ خانگی"
 
@@ -4245,34 +4329,34 @@ 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:472
+#: 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:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "موقعیت"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "مکانی که شما در آن هستید، مانند «شهر، ایالت (یا استان)، کشور»"
 
@@ -4325,56 +4409,57 @@ 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:257 actions/register.php:229
+#: 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)."
 msgstr[0] "شرح‌حال خیلی طولانی است (بیشینه %d نویسه)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "منطقهٔ زمانی انتخاب نشده است."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
 #, 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "نمی‌توان تنظیمات مکانی را تنظیم کرد."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "ساختن یک جساب‌کاربری"
@@ -4496,35 +4581,43 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "ابر برچسب"
 
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "شما قبلا وارد شدید"
 
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "چنین کد بازیابی شده ای نیست"
 
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "کد بازیابی شده ای نیست."
 
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "بازیابی کد برای کاربر ناشناخته"
 
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "خطا در تایید کد"
 
-#: actions/recoverpassword.php:97
+#. 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 "این کد تایید شده بسیار قدیمی است . لطفا دباره شروع کنید ."
 
-#: actions/recoverpassword.php:111
+#. 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 نمیتوان با ایمیلی که تایید شده"
 
-#: actions/recoverpassword.php:152
+#. 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."
@@ -4533,67 +4626,101 @@ msgstr ""
 "که به نشانی پست الکترونیکی‌تان که در حساب‌تان ذخیره کرده‌اید فرستاده شده است، "
 "بگیرید."
 
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
 msgstr "هویت شما شناسایی شد. یک گذرواژه تازه را در زیر وارد کنید. "
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "بازیابی گذرواژه"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "نام کاربری یا نشانی پست الکترونیکی"
 
-#: actions/recoverpassword.php:193
+#. 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 "نام کاربری شما بر روی این سرور، یا نشانی پست الکترونیکی ثبت شدهٔ شما."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "بازیابی"
 
-#: actions/recoverpassword.php:208
+#. 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 "بازنشانی گذرواژه"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "بازیابی گذرواژه"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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 "بازیابی گذرواژه درخواست شد"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "عمل نامعلوم"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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 "۶ نویسه یا بیش‌تر، و این را فراموش نکنید!"
 
-#: actions/recoverpassword.php:243
+#. 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
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "بازنشاندن"
 
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "یک نام کاربری یا نشانی پست الکترونیکی وارد کنید."
 
-#: actions/recoverpassword.php:282
+#. 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 "هیچ کاربری با آن نشانی پست الکترونیکی یا نام کاربری وجود ندارد."
 
-#: actions/recoverpassword.php:299
+#. 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 "برای آن کاربر نشانی پست الکترونیکی ثبت شده وجود ندارد."
 
-#: actions/recoverpassword.php:313
+#. 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 "هنگام ذخیرهٔ تایید نشانی خطا رخ داد."
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4601,24 +4728,35 @@ msgstr ""
 "راهنمای چگونگی بازیابی گذرواژه به نشانی پست الکترونیکی ثبت شده در حساب شما "
 "فرستاده شده است."
 
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "گذرواژه به طور غیر منتظره ریست شد."
 
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "گذرواژه باید ۶ نویسه یا بیش‌تر باشد."
 
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "گذرواژه و تاییدیهٔ آن با هم تطابق ندارند."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "هنگام گذاشتن کاربر خطا روی داد."
 
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "گذرواژه تازه با موفقیت ذخیره شد. شما اکنون وارد شده‌اید."
 
@@ -4634,7 +4772,7 @@ msgstr "با عرض تاسف، کد دعوت نا معتبر است."
 msgid "Registration successful"
 msgstr "ثبت نام با موفقیت انجام شد."
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "ثبت نام"
 
@@ -4662,59 +4800,52 @@ msgstr ""
 "با این فرم شما می‌توانید یک حساب تازه بسازید. سپس شما می‌توانید پیام بفرستید و "
 "به دوستان و همکارانتان بپیوندید. "
 
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "۱-۶۴ حرف کوچک یا اعداد، بدون نشانه گذاری یا فاصله نیاز است."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "۶ نویسه یا بیش‌تر مورد نیاز است."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "با گذرواژهٔ بالا یکسان باشد. مورد نیاز است."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "۶ نویسه یا بیش‌تر"
 
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "پست الکترونیکی"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "تنها برای به‌هنگام‌سازی‌ها، اعلامیه‌ها و بازیابی گذرواژه به کار می‌رود"
 
-#: actions/register.php:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "نام بلند تر، به طور بهتر نام واقعیتان"
 
-#: actions/register.php:463
+#: actions/register.php:462
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "نشانی اینترنتی صفحهٔ خانگی، وبلاگ یا نمایه‌تان در یک وب‌گاه دیگر"
 
-#: actions/register.php:524
+#: 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:534
+#: 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:538
+#: 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:541
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "تمام حقوق محفوظ است."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4723,7 +4854,7 @@ msgstr ""
 "نوشته‌ها و پرونده‌های من به جز داده‌های خصوصی گذرواژه، نشانی پست الکترونیک، "
 "نشانی پیام‌رسان فوری و شماره تلفن زیر مجوز %s هستند."
 
-#: actions/register.php:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4757,7 +4888,7 @@ msgstr ""
 "از این‌که نام‌نویسی کرده‌اید، تشکر می‌کنیم و امیدواریم که از استفاده از این "
 "سرویس لذت ببرید."
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5072,7 +5203,7 @@ msgstr "سازمان"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "توصیف"
 
@@ -5095,8 +5226,9 @@ msgstr "اعمال برنامه"
 msgid "Reset key & secret"
 msgstr ""
 
+#. TRANS: Title of form for deleting a user.
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "حذف"
 
@@ -5223,7 +5355,7 @@ msgid "Note"
 msgstr "یادداشت"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "نام های مستعار"
 
@@ -7805,26 +7937,26 @@ msgstr ""
 "tracking - هنوز پیاده نشده است.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 #, 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:153
+#: lib/common.php:158
 #, 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "برو به نصاب."
 
@@ -7896,12 +8028,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "خاموش"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-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: 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".
@@ -7986,32 +8121,28 @@ msgstr "برو"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "۱-۶۴ کاراکتر کوچک یا اعداد، بدون نقطه گذاری یا فاصله"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "نشانی اینترنتی صفحهٔ‌خانگی یا وبلاگ گروه یا موضوع"
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "گروه یا موضوع را توصیف کنید"
 
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
 #, 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"
+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:182
+#: lib/groupeditform.php:174
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "مکان گروه، در صورت وجود داشتن، مانند «شهر، ایالت (یا استان)، کشور»"
 
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9205,14 +9336,9 @@ msgstr[0] ""
 msgid "about a year ago"
 msgstr "حدود یک سال پیش"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s یک رنگ صحیح نیست!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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 یک رنگ صحیح نیست! از ۳ یا ۶ نویسه مبنای شانزده استفاده کنید"
@@ -9250,27 +9376,28 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "چنین نمایه‌ای وجود ندارد."
+#~ msgid "No such group"
+#~ msgstr "چنین گروهی وجود ندارد."
 
 #, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "هست عضو %s گروه"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
 #~ msgstr "رابط مورد نظر پیدا نشد."
 
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "افراد مشترک %s"
+#~ msgid "Reset"
+#~ msgstr "بازنشاندن"
 
-#~ msgid "Couldn't update user."
-#~ msgstr "نمی‌توان کاربر را به روز کرد."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr "۱-۶۴ حرف کوچک یا اعداد، بدون نشانه گذاری یا فاصله نیاز است."
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "نمی‌توان نمایه را ذخیره کرد."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "۶ نویسه یا بیش‌تر مورد نیاز است."
 
-#~ msgid "Couldn't save tags."
-#~ msgstr "نمی‌توان نشان را ذخیره کرد."
+#~ msgid "Same as password above. Required."
+#~ msgstr "با گذرواژهٔ بالا یکسان باشد. مورد نیاز است."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "۱-۶۴ کاراکتر کوچک یا اعداد، بدون نقطه گذاری یا فاصله"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s یک رنگ صحیح نیست!"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 2da695ebd5..676b7b8f79 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -14,17 +14,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:26+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:56:45+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 (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -85,6 +85,7 @@ msgid "Save access settings"
 msgstr "Profiilikuva-asetukset"
 
 #. 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -96,13 +97,13 @@ msgstr "Profiilikuva-asetukset"
 #. 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Tallenna"
@@ -333,7 +334,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Käyttäjän päivitys epäonnistui."
@@ -357,7 +358,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "Profiilin tallennus epäonnistui."
 
@@ -367,7 +368,7 @@ msgstr "Profiilin tallennus epäonnistui."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
@@ -546,7 +547,8 @@ 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.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Ei voitu poistaa suosikkia."
 
@@ -593,7 +595,7 @@ msgstr "Ei voitu päivittää käyttäjää."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
@@ -603,7 +605,7 @@ msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Tuo ei ole kelvollinen tunnus."
@@ -615,7 +617,7 @@ msgstr "Tuo ei ole kelvollinen tunnus."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Kotisivun verkko-osoite ei ole toimiva."
@@ -625,7 +627,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -653,7 +655,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -711,22 +713,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, fuzzy, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Käyttäjä %s ei voinut liittyä ryhmään %s."
@@ -738,9 +744,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -800,9 +808,12 @@ msgid "Request token already authorized."
 msgstr "Sinulla ei ole valtuutusta tähän."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -810,7 +821,7 @@ msgstr "Sinulla ei ole valtuutusta tähän."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -835,18 +846,20 @@ msgstr "Tietokantavirhe tallennettaessa risutagiä: %s"
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: 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."
@@ -895,7 +908,7 @@ msgstr "Käyttäjätili"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Tunnus"
@@ -903,7 +916,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Salasana"
 
@@ -1011,10 +1024,12 @@ msgstr "Tätä päivitystä ei voi poistaa."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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
@@ -1289,7 +1304,7 @@ msgstr "Ryhmän %s jäsenet"
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
 #: actions/atompubmembershipfeed.php:219
 #, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
 msgstr "Ei voitu lisätä uutta tilausta."
 
 #. TRANS: Client error displayed when not using the POST verb.
@@ -1325,30 +1340,51 @@ msgstr "Tiedostoa ei ole."
 #. 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "Ei voitu poistaa suosikkia."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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
 #, fuzzy
-msgid "Not a member"
+msgid "Not a member."
 msgstr "Kaikki jäsenet"
 
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "API-metodia ei löytynyt."
-
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+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.
@@ -1520,35 +1556,42 @@ msgstr "Profiilikuvan päivittäminen epäonnistui."
 msgid "Avatar deleted."
 msgstr "Kuva poistettu."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 "Vain käyttäjä voi lukea omaa postilaatikkoaan."
 
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Tausta"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1579,14 +1622,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Ei"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "Älä estä tätä käyttäjää"
 
@@ -1598,7 +1640,7 @@ msgstr "Älä estä tätä käyttäjää"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Kyllä"
@@ -1614,32 +1656,6 @@ msgstr "Estä tämä käyttäjä"
 msgid "Failed to save block information."
 msgstr "Käyttäjän estotiedon tallennus epäonnistui."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Tuota ryhmää ei ole."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1771,7 +1787,8 @@ msgid "Account deleted."
 msgstr "Kuva poistettu."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "Luo uusi ryhmä"
@@ -1793,8 +1810,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Vahvista"
 
@@ -1870,8 +1888,10 @@ msgid "You must be logged in to delete a group."
 msgstr "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä."
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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 "Tunnusta ei ole."
@@ -1924,10 +1944,11 @@ msgid "Delete this group"
 msgstr "Poista käyttäjä"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1967,103 +1988,138 @@ msgstr "Älä poista tätä päivitystä"
 msgid "Delete this notice"
 msgstr "Poista tämä päivitys"
 
-#: actions/deleteuser.php:67
+#. 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ä."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Poista käyttäjä"
 
-#: actions/deleteuser.php:136
+#. 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."
 msgstr ""
 
+#. 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:163 lib/deleteuserform.php:77
+#. 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.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "Ulkoasu"
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
-#: actions/designadminpanel.php:335
+#. 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."
 
-#: actions/designadminpanel.php:340
+#. 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."
 
-#: actions/designadminpanel.php:344
+#. 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 "Pikaviestin ei ole käytettävissä."
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Vaihda väriä"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Palvelun ilmoitus"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "Palvelun ilmoitus"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 #, fuzzy
 msgid "Change theme"
 msgstr "Vaihda"
 
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
 #, fuzzy
 msgid "Site theme"
 msgstr "Palvelun ilmoitus"
 
+#. TRANS: Title for field label for dropdown to choose site theme.
 #: actions/designadminpanel.php:487
 #, fuzzy
 msgid "Theme for the site."
 msgstr "Kirjaudu ulos palvelusta"
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 #, fuzzy
 msgid "Custom theme"
 msgstr "Palvelun ilmoitus"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Tausta"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, fuzzy, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2071,104 +2127,114 @@ msgid ""
 msgstr "Voit ladata ryhmälle logokuvan. Maksimikoko on %s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "On"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 #, fuzzy
 msgid "Turn background image on or off."
 msgstr "Vaihda tautakuva"
 
+#. 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 #, fuzzy
 msgid "Tile background image"
 msgstr "Vaihda tautakuva"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+msgid "Change colors"
 msgstr "Vaihda väriä"
 
+#. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 #, fuzzy
 msgid "Sidebar"
 msgstr "Haku"
 
+#. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "Linkit"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr ""
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr ""
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
 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:703 lib/designsettings.php:259
+#: 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 #, fuzzy
 msgid "Reset back to default"
 msgstr "Käytä oletusasetuksia"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Tallenna"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 #, fuzzy
 msgid "Save design"
 msgstr "Ryhmän ulkoasu"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "Tämä päivitys ei ole suosikki!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "Lisää suosikkeihin"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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 "Liitettä ei ole."
 
 #. TRANS: Title for "Edit application" form.
@@ -2900,7 +2966,7 @@ msgid ""
 "%%%%)"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Luo uusi ryhmä"
 
@@ -3309,26 +3375,33 @@ msgstr ""
 "\n"
 "Terveisin, %2$s\n"
 
-#: actions/joingroup.php:60
+#. 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."
 
-#: actions/joingroup.php:141
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
 #, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%s liittyi ryhmään %s"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "Sinä et kuulu tähän ryhmään."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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"
 
@@ -3434,6 +3507,13 @@ msgstr ""
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Tallenna"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
@@ -3459,11 +3539,11 @@ msgstr "Kirjaudu sisään"
 msgid "Login to site"
 msgstr "Kirjaudu sisään"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Muista minut"
 
-#: actions/login.php:259 actions/register.php:493
+#: 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 "
@@ -3865,7 +3945,8 @@ msgstr "Vaihda salasana"
 msgid "Change your password."
 msgstr "Vaihda salasanasi."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Salasanan vaihto"
 
@@ -3873,7 +3954,8 @@ msgstr "Salasanan vaihto"
 msgid "Old password"
 msgstr "Vanha salasana"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Uusi salasana"
 
@@ -3881,7 +3963,7 @@ msgstr "Uusi salasana"
 msgid "6 or more characters"
 msgstr "6 tai useampia merkkejä"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "Sama kuin ylläoleva salasana"
 
@@ -3905,11 +3987,12 @@ msgstr "Väärä vanha salasana"
 msgid "Error saving user; invalid."
 msgstr "Virhe tapahtui käyttäjän tallentamisessa; epäkelpo."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "Uutta salasanaa ei voida tallentaa."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Salasana tallennettu."
 
@@ -4258,7 +4341,8 @@ msgid "Profile information"
 msgstr "Profiilitieto"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4267,16 +4351,16 @@ msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 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:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "Kotisivu"
 
@@ -4289,7 +4373,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:472
+#: 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"
@@ -4297,27 +4381,27 @@ 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:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "Kotipaikka"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: 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\""
@@ -4373,7 +4457,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:257 actions/register.php:229
+#: 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)."
@@ -4381,49 +4465,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:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 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:276
+#: actions/profilesettings.php:277
 #, 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, 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:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Luo uusi ryhmä"
@@ -4540,35 +4625,43 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "Tagipilvi"
 
-#: actions/recoverpassword.php:36
+#. 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!"
 
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Palautuskoodia ei ole."
 
-#: actions/recoverpassword.php:66
+#. 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."
 
-#: actions/recoverpassword.php:73
+#. 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"
 
-#: actions/recoverpassword.php:86
+#. 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."
 
-#: actions/recoverpassword.php:97
+#. 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."
 
-#: actions/recoverpassword.php:111
+#. 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."
 
-#: actions/recoverpassword.php:152
+#. 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 "
@@ -4577,69 +4670,102 @@ msgstr ""
 "Ohjeet salasanan palauttamiseksi on lähetetty sähköpostiisiosoitteeseen, "
 "joka on rekisteröity käyttäjätunnuksellesi."
 
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
 msgstr "Sinut on tunnistettu. Syötä uusi salasana alapuolelle. "
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Salasanan palautus"
 
-#: actions/recoverpassword.php:191
+#. 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"
 
-#: actions/recoverpassword.php:193
+#. 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."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Palauta"
 
-#: actions/recoverpassword.php:208
+#. 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"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Salasanan palautus"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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."
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Tuntematon toiminto"
 
-#: actions/recoverpassword.php:236
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
 #, fuzzy
-msgid "6 or more characters, and don't forget it!"
+msgid "6 or more characters, and do not forget it!"
 msgstr "6 tai useampia merkkejä äläkä unohda mitä kirjoitit!"
 
-#: actions/recoverpassword.php:243
+#. 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
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Vaihda"
 
-#: actions/recoverpassword.php:252
+#. 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"
 
-#: actions/recoverpassword.php:282
+#. 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."
 
-#: actions/recoverpassword.php:299
+#. 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."
 
-#: actions/recoverpassword.php:313
+#. 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"
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4647,24 +4773,35 @@ msgstr ""
 "Ohjeet salasanan palauttamiseksi on lähetetty sähköpostiisiosoitteeseen, "
 "joka on rekisteröity käyttäjätunnuksellesi."
 
-#: actions/recoverpassword.php:357
+#. 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."
 
-#: actions/recoverpassword.php:365
+#. 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ä."
 
-#: actions/recoverpassword.php:369
+#. 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ää."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "Virhe tapahtui käyttäjän asettamisessa."
 
-#: actions/recoverpassword.php:395
+#. 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."
@@ -4681,7 +4818,7 @@ msgstr "Virheellinen kutsukoodin."
 msgid "Registration successful"
 msgstr "Rekisteröityminen onnistui"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Rekisteröidy"
 
@@ -4707,63 +4844,54 @@ msgid ""
 "link up to friends and colleagues. "
 msgstr ""
 
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 pientä kirjainta tai numeroa, ei ääkkösiä eikä välimerkkejä tai "
-"välilyöntejä. Pakollinen."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 tai useampia merkkejä. Pakollinen."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Sama kuin ylläoleva salasana. Pakollinen."
+#: 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:446 actions/register.php:450
+#: 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:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 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:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Pitempi nimi, mieluiten oikea nimesi"
 
-#: actions/register.php:463
+#: actions/register.php:462
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite."
 
-#: actions/register.php:524
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:534
+#: 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:538
+#: 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:541
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4772,7 +4900,7 @@ msgstr ""
 "poislukien yksityinen tieto: salasana, sähköpostiosoite, IM-osoite, "
 "puhelinnumero."
 
-#: actions/register.php:589
+#: actions/register.php:588
 #, fuzzy, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4805,7 +4933,7 @@ msgstr ""
 "\n"
 "Kiitokset rekisteröitymisestäsi ja toivomme että pidät palvelustamme."
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5133,7 +5261,7 @@ msgstr "Sivutus"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "Kuvaus"
 
@@ -5156,8 +5284,9 @@ msgstr ""
 msgid "Reset key & secret"
 msgstr ""
 
+#. TRANS: Title of form for deleting a user.
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Poista"
 
@@ -5276,7 +5405,7 @@ msgid "Note"
 msgstr "Huomaa"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "Aliakset"
 
@@ -7860,26 +7989,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 #, 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:153
+#: lib/common.php:158
 #, 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Kirjaudu sisään palveluun"
@@ -7952,12 +8081,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "Off"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Vaihda"
+#. 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: 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".
@@ -8043,30 +8175,24 @@ msgstr "Mene"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:154
-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:163
+#: lib/groupeditform.php:155
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "Ryhmän tai aiheen kotisivun tai blogin osoite"
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 #, fuzzy
 msgid "Describe the group or topic"
 msgstr "Kuvaile ryhmää tai aihetta 140 merkillä"
 
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
 #, 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"
+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:182
+#: lib/groupeditform.php:174
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -8074,7 +8200,7 @@ msgstr ""
 "Ryhmän paikka, jos sellainen on, kuten \"Kaupunki, Maakunta (tai Lääni), Maa"
 "\""
 
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9210,14 +9336,9 @@ msgstr[1] ""
 msgid "about a year ago"
 msgstr "noin vuosi sitten"
 
-#: lib/webcolor.php:80
-#, fuzzy, php-format
-msgid "%s is not a valid color!"
-msgstr "Kotisivun verkko-osoite ei ole toimiva."
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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."
@@ -9254,27 +9375,33 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "Tiedostoa ei ole."
+#~ msgid "No such group"
+#~ msgstr "Tuota ryhmää ei ole."
 
 #, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Ryhmät, joiden jäsen %s on"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
 #~ msgstr "API-metodia ei löytynyt."
 
+#~ msgid "Reset"
+#~ msgstr "Vaihda"
+
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 pientä kirjainta tai numeroa, ei ääkkösiä eikä välimerkkejä tai "
+#~ "välilyöntejä. Pakollinen."
+
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 tai useampia merkkejä. Pakollinen."
+
+#~ msgid "Same as password above. Required."
+#~ msgstr "Sama kuin ylläoleva salasana. Pakollinen."
+
+#~ 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ä"
+
 #, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Ihmiset jotka ovat käyttäjän %s tilaajia"
-
-#~ msgid "Couldn't update user."
-#~ msgstr "Ei voitu päivittää käyttäjää."
-
-#~ msgid "Couldn't save profile."
-#~ msgstr "Ei voitu tallentaa profiilia."
-
-#~ msgid "Couldn't save tags."
-#~ msgstr "Tageja ei voitu tallentaa."
+#~ msgid "%s is not a valid color!"
+#~ msgstr "Kotisivun verkko-osoite ei ole toimiva."
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 34823b0cb7..66127d1518 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-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:27+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:56: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-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -86,6 +86,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -97,13 +98,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Enregistrer"
@@ -339,7 +340,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Impossible de mettre à jour l’utilisateur."
@@ -363,7 +364,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "Impossible d’enregistrer le profil."
 
@@ -373,7 +374,7 @@ msgstr "Impossible d’enregistrer le profil."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
@@ -555,7 +556,8 @@ 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.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Impossible de supprimer le favori."
 
@@ -601,7 +603,7 @@ msgstr "Impossible de trouver l’utilisateur cible."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudo déjà utilisé. Essayez-en un autre."
@@ -611,7 +613,7 @@ msgstr "Pseudo déjà utilisé. Essayez-en un autre."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Pseudo invalide."
@@ -623,7 +625,7 @@ msgstr "Pseudo invalide."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "L’adresse du site personnel n’est pas un URL valide. "
@@ -633,7 +635,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: 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)."
@@ -660,7 +662,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "L’emplacement est trop long (limité à 255 caractères maximum)."
@@ -717,22 +719,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, 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."
@@ -744,9 +750,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -803,9 +811,12 @@ msgid "Request token already authorized."
 msgstr "Le jeton de requête a déjà été autorisé."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -813,7 +824,7 @@ msgstr "Le jeton de requête a déjà été autorisé."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -838,18 +849,20 @@ msgstr ""
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: 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."
@@ -905,7 +918,7 @@ msgstr "Compte"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Pseudo"
@@ -913,7 +926,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -1021,10 +1034,12 @@ msgstr "Vous avez déjà repris cet avis."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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."
@@ -1303,7 +1318,7 @@ msgstr "Membres du groupe %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"
+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.
@@ -1339,30 +1354,51 @@ 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "Impossible de supprimer le favori."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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"
+msgid "Not a member."
 msgstr "Tous les membres"
 
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "Méthode HTTP non trouvée !"
-
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+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.
@@ -1534,35 +1570,42 @@ msgstr "La mise à jour de l’avatar a échoué."
 msgid "Avatar deleted."
 msgstr "Avatar supprimé."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Arrière plan"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1596,14 +1639,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Non"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "Ne pas bloquer cet utilisateur"
 
@@ -1615,7 +1657,7 @@ msgstr "Ne pas bloquer cet utilisateur"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Oui"
@@ -1631,32 +1673,6 @@ msgstr "Bloquer cet utilisateur"
 msgid "Failed to save block information."
 msgstr "Impossible d’enregistrer les informations de blocage."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Aucun groupe trouvé."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1786,7 +1802,8 @@ msgid "Account deleted."
 msgstr "Avatar supprimé."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "Créer un compte"
@@ -1808,8 +1825,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Confirmer"
 
@@ -1883,8 +1901,10 @@ 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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."
 
@@ -1936,10 +1956,11 @@ msgid "Delete this group"
 msgstr "Supprimer ce groupe"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1979,19 +2000,30 @@ msgstr "Ne pas supprimer cet avis"
 msgid "Delete this notice"
 msgstr "Supprimer cet avis"
 
-#: actions/deleteuser.php:67
+#. 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."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Supprimer l’utilisateur"
 
-#: actions/deleteuser.php:136
+#. 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."
@@ -1999,79 +2031,103 @@ msgstr ""
 "Voulez-vous vraiment supprimer cet utilisateur ? Ceci effacera toutes les "
 "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:163 lib/deleteuserform.php:77
+#. 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.
 #. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "Conception"
 
-#: actions/designadminpanel.php:74
+#. 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"
 
-#: actions/designadminpanel.php:335
+#. 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."
 
-#: actions/designadminpanel.php:340
+#. 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."
 
-#: actions/designadminpanel.php:344
+#. 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."
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Modifier le logo"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Logo du site"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "Logo SSL"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Modifier le thème"
 
-#: actions/designadminpanel.php:486
+#. 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."
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Thème personnalisé"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Arrière plan"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2081,98 +2137,108 @@ msgstr ""
 "maximale du fichier est de %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Activé"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "Répéter l’image d’arrière plan"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. 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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "Liens"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Avancé"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "CSS personnalisé"
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "Revenir aux valeurs par défaut"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Enregistrer"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "Sauvegarder la conception"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "Cet avis n’est pas un favori !"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "Ajouter aux favoris"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2898,7 +2964,7 @@ msgstr ""
 "intéresse ? Essayez d’en [rechercher un](%%%%action.groupsearch%%%%) ou de "
 "[créer le vôtre !](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Créer un nouveau groupe"
 
@@ -3314,26 +3380,33 @@ msgstr ""
 "\n"
 "Cordialement, %2$s\n"
 
-#: actions/joingroup.php:60
+#. 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."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s a rejoint le groupe %2$s"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "Vous n’êtes pas membre de ce groupe."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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"
 
@@ -3439,6 +3512,13 @@ msgstr "URL de l’image de la licence"
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Enregistrer"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Enregistrer les paramètres de licence"
@@ -3465,11 +3545,11 @@ msgstr "Ouvrir une session"
 msgid "Login to site"
 msgstr "Ouverture de session"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Se souvenir de moi"
 
-#: actions/login.php:259 actions/register.php:493
+#: 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 "
@@ -3867,7 +3947,8 @@ msgstr "Changer de mot de passe"
 msgid "Change your password."
 msgstr "Modifier votre mot de passe."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Modification du mot de passe"
 
@@ -3875,7 +3956,8 @@ msgstr "Modification du mot de passe"
 msgid "Old password"
 msgstr "Ancien mot de passe"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
@@ -3883,7 +3965,7 @@ msgstr "Nouveau mot de passe"
 msgid "6 or more characters"
 msgstr "6 caractères ou plus"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "Identique au mot de passe ci-dessus"
 
@@ -3907,11 +3989,12 @@ msgstr "Ancien mot de passe incorrect"
 msgid "Error saving user; invalid."
 msgstr "Erreur lors de l’enregistrement de l’utilisateur ; invalide."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "Impossible de sauvegarder le nouveau mot de passe."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. 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é."
 
@@ -4239,22 +4322,23 @@ msgid "Profile information"
 msgstr "Information de profil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 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:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "Site personnel"
 
@@ -4267,7 +4351,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:472
+#: 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"
@@ -4275,27 +4359,27 @@ 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:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "Emplacement"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: 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 »"
 
@@ -4350,7 +4434,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:257 actions/register.php:229
+#: 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)."
@@ -4358,48 +4442,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:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 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:276
+#: actions/profilesettings.php:277
 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, 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:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Créer un compte"
@@ -4524,36 +4609,44 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "Nuage de marques"
 
-#: actions/recoverpassword.php:36
+#. 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 !"
 
-#: actions/recoverpassword.php:62
+#. 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é."
 
-#: actions/recoverpassword.php:66
+#. 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."
 
-#: actions/recoverpassword.php:73
+#. 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."
 
-#: actions/recoverpassword.php:86
+#. 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."
 
-#: actions/recoverpassword.php:97
+#. 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."
 
-#: actions/recoverpassword.php:111
+#. 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."
 
-#: actions/recoverpassword.php:152
+#. 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."
@@ -4562,68 +4655,101 @@ msgstr ""
 "nouveau qui sera envoyé à votre adresse de courriel définie dans votre "
 "compte."
 
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
 msgstr "Vous avez été identifié. Entrez un nouveau mot de passe ci-dessous. "
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Récupération de mot de passe"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Pseudo ou adresse de courriel"
 
-#: actions/recoverpassword.php:193
+#. 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."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Récupérer"
 
-#: actions/recoverpassword.php:208
+#. 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"
 
-#: actions/recoverpassword.php:209
+#. 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"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Action inconnue"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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 !"
 
-#: actions/recoverpassword.php:243
+#. 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
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Réinitialiser"
 
-#: actions/recoverpassword.php:252
+#. 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."
 
-#: actions/recoverpassword.php:282
+#. 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."
 
-#: actions/recoverpassword.php:299
+#. 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."
 
-#: actions/recoverpassword.php:313
+#. 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."
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4631,23 +4757,34 @@ msgstr ""
 "Les instructions pour récupérer votre mot de passe ont été envoyées à "
 "l’adresse courriel indiquée dans votre compte."
 
-#: actions/recoverpassword.php:357
+#. 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."
 
-#: actions/recoverpassword.php:365
+#. 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."
 
-#: actions/recoverpassword.php:369
+#. 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."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "Erreur lors de la configuration de l’utilisateur."
 
-#: actions/recoverpassword.php:395
+#. 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."
@@ -4664,7 +4801,7 @@ msgstr "Désolé, code d’invitation invalide."
 msgid "Registration successful"
 msgstr "Compte créé avec succès"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Créer un compte"
 
@@ -4692,41 +4829,33 @@ 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:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces. Requis."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 caractères ou plus. Requis."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Identique au mot de passe ci-dessus. Requis."
+#: 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:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Courriel"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 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:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Nom plus long, votre \"vrai\" nom de préférence"
 
-#: actions/register.php:463
+#: actions/register.php:462
 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:524
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
@@ -4734,23 +4863,23 @@ msgstr ""
 "Je comprends que le contenu et les données de %1$s sont privés et "
 "confidentiels."
 
-#: actions/register.php:534
+#: 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:538
+#: 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:541
+#: 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:546
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4760,7 +4889,7 @@ msgstr ""
 "données personnelles : mot de passe, adresse électronique, adresse de "
 "messagerie instantanée, numéro de téléphone."
 
-#: actions/register.php:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4794,7 +4923,7 @@ msgstr ""
 "Merci pour votre inscription ! Nous vous souhaitons d’apprécier notre "
 "service."
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5113,7 +5242,7 @@ msgstr "Organisation"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "Description"
 
@@ -5136,8 +5265,9 @@ msgstr "Actions de l’application"
 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:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -5265,7 +5395,7 @@ msgid "Note"
 msgstr "Note"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "Alias"
 
@@ -7889,25 +8019,25 @@ msgstr ""
 "tracking - pas encore implémenté.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 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:153
+#: lib/common.php:158
 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "Aller au programme d’installation"
 
@@ -7974,11 +8104,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "Désactivé"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Réinitialiser"
+#. 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: 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".
@@ -8062,33 +8196,29 @@ msgstr "Aller"
 msgid "Grant this user the \"%s\" role"
 msgstr "Accorder le rôle « %s » à cet utilisateur"
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 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:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "Description du groupe ou du sujet"
 
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+#: lib/groupeditform.php:162
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
 msgstr[0] "Description du groupe ou du sujet, en %d caractère ou moins"
 msgstr[1] "Description du groupe ou du sujet, en %d caractères ou moins"
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
 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:190
+#: lib/groupeditform.php:182
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9304,14 +9434,9 @@ msgstr[1] "il y a environ %d mois"
 msgid "about a year ago"
 msgstr "il y a environ 1 an"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "&s n’est pas une couleur valide !"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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 ""
@@ -9353,30 +9478,30 @@ msgstr "XML invalide, racine XRD manquante."
 msgid "Getting backup from file '%s'."
 msgstr "Obtention de la sauvegarde depuis le fichier « %s »."
 
-#~ msgid "AtomPub post with unknown attention URI %s"
-#~ msgstr "Publication AtomPost avec l’URI d’attention inconnu %s"
+#~ msgid "No such group"
+#~ msgstr "Aucun groupe trouvé."
 
 #, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "Profil non-trouvé."
-
-#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Groupes de %s"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
 #~ msgstr "Méthode HTTP non trouvée !"
 
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Abonnés de %s"
+#~ msgid "Reset"
+#~ msgstr "Réinitialiser"
 
-#~ msgid "Couldn't update user."
-#~ msgstr "Impossible de mettre à jour l’utilisateur."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces. "
+#~ "Requis."
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "Impossible d’enregistrer le profil."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 caractères ou plus. Requis."
 
-#~ msgid "Couldn't save tags."
-#~ msgstr "Impossible d’enregistrer les marques."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Identique au mot de passe ci-dessus. Requis."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "&s n’est pas une couleur valide !"
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index f77179b069..75d26bc21c 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:28+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:56:53+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 (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -76,6 +76,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -87,13 +88,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Gardar"
@@ -328,7 +329,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Non se puido actualizar o usuario."
@@ -352,7 +353,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "Non se puido gardar o perfil."
 
@@ -362,7 +363,7 @@ msgstr "Non se puido gardar o perfil."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, fuzzy, php-format
@@ -543,7 +544,8 @@ msgid "That status is not a favorite."
 msgstr "Ese estado non é un dos favoritos."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Non se puido eliminar o favorito."
 
@@ -590,7 +592,7 @@ msgstr "Non se puido atopar o usuario de destino."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Ese alcume xa está en uso. Probe con outro."
@@ -600,7 +602,7 @@ msgstr "Ese alcume xa está en uso. Probe con outro."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "O formato do alcume non é correcto."
@@ -612,7 +614,7 @@ msgstr "O formato do alcume non é correcto."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "O URL da páxina persoal non é correcto."
@@ -622,7 +624,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -650,7 +652,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -708,22 +710,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, 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."
@@ -735,9 +741,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -796,9 +804,12 @@ msgid "Request token already authorized."
 msgstr "Non 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -806,7 +817,7 @@ msgstr "Non está autorizado."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -830,18 +841,20 @@ msgstr ""
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: 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."
@@ -895,7 +908,7 @@ msgstr "Conta"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Alcume"
@@ -903,7 +916,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Contrasinal"
 
@@ -1008,10 +1021,12 @@ msgstr "Xa repetiu esa nota."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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
@@ -1289,7 +1304,7 @@ msgstr "Membros do grupo %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"
+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.
@@ -1325,31 +1340,51 @@ 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "Non se puido eliminar o favorito."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-#, fuzzy
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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"
+msgid "Not a member."
 msgstr "Todos os membros"
 
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "Non se atopou o método da API."
-
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+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.
@@ -1520,35 +1555,42 @@ msgstr "Non se puido actualizar o avatar."
 msgid "Avatar deleted."
 msgstr "Borrouse o avatar."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Fondo"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1582,14 +1624,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Non"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "Non bloquear este usuario"
 
@@ -1601,7 +1642,7 @@ msgstr "Non bloquear este usuario"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Si"
@@ -1617,32 +1658,6 @@ msgstr "Bloquear este usuario"
 msgid "Failed to save block information."
 msgstr "Non se puido gardar a información do bloqueo."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Non existe tal grupo."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1773,7 +1788,8 @@ msgid "Account deleted."
 msgstr "Borrouse o avatar."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "Crear unha conta"
@@ -1795,8 +1811,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -1871,8 +1888,10 @@ msgid "You must be logged in to delete a group."
 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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."
 
@@ -1926,10 +1945,11 @@ msgid "Delete this group"
 msgstr "Borrar o usuario"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1969,19 +1989,30 @@ msgstr "Non borrar esta nota"
 msgid "Delete this notice"
 msgstr "Borrar esta nota"
 
-#: actions/deleteuser.php:67
+#. 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."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Borrar o usuario"
 
-#: actions/deleteuser.php:136
+#. 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."
@@ -1989,81 +2020,105 @@ msgstr ""
 "Está seguro de querer borrar este usuario? Isto borrará todos os datos do "
 "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:163 lib/deleteuserform.php:77
+#. 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.
 #. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "Deseño"
 
-#: actions/designadminpanel.php:74
+#. 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"
 
-#: actions/designadminpanel.php:335
+#. 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."
 
-#: actions/designadminpanel.php:340
+#. 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."
 
-#: actions/designadminpanel.php:344
+#. 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."
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Cambiar o logo"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Logo do sitio"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "Logo do sitio"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Cambiar o tema visual"
 
-#: actions/designadminpanel.php:486
+#. 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."
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Tema visual personalizado"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Fondo"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2073,98 +2128,108 @@ msgstr ""
 "ficheiro é de %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Activado"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "Imaxe de fondo en mosaico"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. 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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "Ligazóns"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "CSS personalizado"
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "Volver ao deseño por defecto"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Gardar"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "Gardar o deseño"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "Esta nota non é unha das favoritas!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "Engadir aos favoritos"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2894,7 +2959,7 @@ msgstr ""
 "un grupo que lle guste? Probe a [buscar un](%%%%action.groupsearch%%%%) ou "
 "[crear un pola súa conta!](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Crear un grupo novo"
 
@@ -3302,26 +3367,33 @@ msgstr ""
 "\n"
 "Cordialmente, %2$s\n"
 
-#: actions/joingroup.php:60
+#. 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."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s uniuse ao grupo %2$s"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "Non pertence a ese grupo."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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"
 
@@ -3428,6 +3500,13 @@ msgstr "URL da imaxe da licenza"
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Gardar"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Gardar a configuración de licenza"
@@ -3454,11 +3533,11 @@ msgstr "Identificarse"
 msgid "Login to site"
 msgstr "Identificarse no sitio"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Lembrádeme"
 
-#: actions/login.php:259 actions/register.php:493
+#: 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 "
@@ -3853,7 +3932,8 @@ msgstr "Cambiar o contrasinal"
 msgid "Change your password."
 msgstr "Cambiar o seu contrasinal."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Cambio de contrasinal"
 
@@ -3861,7 +3941,8 @@ msgstr "Cambio de contrasinal"
 msgid "Old password"
 msgstr "Contrasinal anterior"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Novo contrasinal"
 
@@ -3869,7 +3950,7 @@ msgstr "Novo contrasinal"
 msgid "6 or more characters"
 msgstr "Seis ou máis caracteres"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "Igual ao contrasinal anterior"
 
@@ -3893,11 +3974,12 @@ msgstr "O contrasinal anterior non é correcto"
 msgid "Error saving user; invalid."
 msgstr "Houbo un erro ao gardar o usuario. Incorrecto."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "Non se puido gardar o novo contrasinal."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. 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."
 
@@ -4236,7 +4318,8 @@ msgid "Profile information"
 msgstr "Información do perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4245,16 +4328,16 @@ msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 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:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "Páxina persoal"
 
@@ -4267,7 +4350,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:472
+#: 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"
@@ -4275,27 +4358,27 @@ 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:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "Lugar"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: 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”"
 
@@ -4350,7 +4433,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:257 actions/register.php:229
+#: 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)."
@@ -4358,49 +4441,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:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 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:276
+#: actions/profilesettings.php:277
 #, 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, 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:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Crear unha conta"
@@ -4525,37 +4609,45 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "Nube de etiquetas"
 
-#: actions/recoverpassword.php:36
+#. 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!"
 
-#: actions/recoverpassword.php:62
+#. 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."
 
-#: actions/recoverpassword.php:66
+#. 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."
 
-#: actions/recoverpassword.php:73
+#. 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."
 
-#: actions/recoverpassword.php:86
+#. 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."
 
-#: actions/recoverpassword.php:97
+#. 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."
 
-#: actions/recoverpassword.php:111
+#. 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."
 
-#: actions/recoverpassword.php:152
+#. 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."
@@ -4563,71 +4655,105 @@ 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:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
 msgstr "Acaba de identificarse. Introduza un contrasinal novo a continuación. "
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Recuperación do contrasinal"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Alcume ou enderezo de correo electrónico"
 
-#: actions/recoverpassword.php:193
+#. 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."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Recuperar"
 
-#: actions/recoverpassword.php:208
+#. 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"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Recuperar o contrasinal"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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"
 
-#: actions/recoverpassword.php:213
+#. 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"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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!"
 
-#: actions/recoverpassword.php:243
+#. 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
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Restablecer"
 
-#: actions/recoverpassword.php:252
+#. 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."
 
-#: actions/recoverpassword.php:282
+#. 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."
 
-#: actions/recoverpassword.php:299
+#. 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."
 
-#: actions/recoverpassword.php:313
+#. 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."
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4635,24 +4761,35 @@ msgstr ""
 "Enviáronse instrucións para a recuperación do seu contrasinal ao enderezo de "
 "correo electrónico rexistrado para a súa conta."
 
-#: actions/recoverpassword.php:357
+#. 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."
 
-#: actions/recoverpassword.php:365
+#. 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."
 
-#: actions/recoverpassword.php:369
+#. 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."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "Houbo un erro ao configurar o usuario."
 
-#: actions/recoverpassword.php:395
+#. 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."
 
@@ -4668,7 +4805,7 @@ msgstr "O código da invitación é incorrecto."
 msgid "Registration successful"
 msgstr "Rexistrouse correctamente"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Rexistrarse"
 
@@ -4696,65 +4833,56 @@ 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:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"Entre 1 e 64 letras minúsculas ou números, sen signos de puntuación, "
-"espazos, tiles ou eñes. Obrigatorio."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 ou máis caracteres. Obrigatorio."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "O mesmo contrasinal que o anterior. Obrigatorio."
+#: 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:446 actions/register.php:450
+#: 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:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 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:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Nome longo, preferiblemente o seu nome \"real\""
 
-#: actions/register.php:463
+#: actions/register.php:462
 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:524
+#: 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:534
+#: 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:538
+#: 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:541
+#: 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:546
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4764,7 +4892,7 @@ msgstr ""
 "datos privados: contrasinais, enderezos de correo electrónico e mensaxería "
 "instantánea e números de teléfono."
 
-#: actions/register.php:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4796,7 +4924,7 @@ msgstr ""
 "\n"
 "Grazas por rexistrarse. Esperamos que goce deste servizo."
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5114,7 +5242,7 @@ msgstr "Organización"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "Descrición"
 
@@ -5137,8 +5265,9 @@ msgstr "Accións da aplicación"
 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:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Borrar"
 
@@ -5267,7 +5396,7 @@ msgid "Note"
 msgstr "Nota"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "Pseudónimos"
 
@@ -7882,26 +8011,26 @@ 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:150
+#: lib/common.php:155
 #, 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:153
+#: lib/common.php:158
 #, 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "Ir ao instalador."
 
@@ -7973,12 +8102,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "Desactivado"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Restablecer"
+#. 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: 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".
@@ -8062,29 +8194,23 @@ msgstr "Continuar"
 msgid "Grant this user the \"%s\" role"
 msgstr "Outorgarlle a este usuario o rol \"%s\""
 
-#: lib/groupeditform.php:154
-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:163
+#: lib/groupeditform.php:155
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL do sitio web persoal ou blogue do grupo ou tema"
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "Describa o grupo ou o tema"
 
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
 #, 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"
+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:182
+#: lib/groupeditform.php:174
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -8092,7 +8218,7 @@ msgstr ""
 "Localidade do grupo, se a ten, como por exemplo \"Cidade, Provincia, "
 "Comunidade, País\""
 
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9306,14 +9432,9 @@ msgstr[1] "hai %d meses"
 msgid "about a year ago"
 msgstr "hai como un ano"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s non é unha cor correcta!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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."
@@ -9353,26 +9474,32 @@ msgid "Getting backup from file '%s'."
 msgstr ""
 
 #, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "Non existe ese perfil."
+#~ msgid "No such group"
+#~ msgstr "Non existe tal grupo."
 
 #, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Grupos aos que pertence %s"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
 #~ msgstr "Non se atopou o método da API."
 
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Persoas subscritas a %s"
+#~ msgid "Reset"
+#~ msgstr "Restablecer"
 
-#~ msgid "Couldn't update user."
-#~ msgstr "Non se puido actualizar o usuario."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "Entre 1 e 64 letras minúsculas ou números, sen signos de puntuación, "
+#~ "espazos, tiles ou eñes. Obrigatorio."
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "Non se puido gardar o perfil."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 ou máis caracteres. Obrigatorio."
 
-#~ msgid "Couldn't save tags."
-#~ msgstr "Non se puideron gardar as etiquetas."
+#~ msgid "Same as password above. Required."
+#~ msgstr "O mesmo contrasinal que o anterior. Obrigatorio."
+
+#~ 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"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s non é unha cor correcta!"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index 4ab4b4fd02..949f9f40d5 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-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:30+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:56:58+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 (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hsb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || "
 "n%100==4) ? 2 : 3)\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -77,6 +77,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -88,13 +89,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Składować"
@@ -321,7 +322,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Wužiwar njeje so dał aktualizować."
@@ -345,7 +346,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "Profil njeje so składować dał."
 
@@ -355,7 +356,7 @@ msgstr "Profil njeje so składować dał."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
@@ -394,7 +395,6 @@ msgstr "Design njeda so aktualizować."
 
 #. TRANS: Title for Atom feed.
 #: actions/apiatomservice.php:85
-#, fuzzy
 msgctxt "ATOM"
 msgid "Main"
 msgstr "Hłowny"
@@ -535,7 +535,8 @@ msgid "That status is not a favorite."
 msgstr "Tón status faworit njeje."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Faworit njeda so zhašeć."
 
@@ -581,7 +582,7 @@ msgstr "Cilowy wužiwar njeda so namakać."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Přimjeno so hižo wužiwa. Spytaj druhe."
@@ -591,7 +592,7 @@ msgstr "Přimjeno so hižo wužiwa. Spytaj druhe."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Žane płaćiwe přimjeno."
@@ -603,7 +604,7 @@ msgstr "Žane płaćiwe přimjeno."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Startowa strona njeje płaćiwy URL."
@@ -613,7 +614,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: 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)."
@@ -642,7 +643,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Městno je předołho (maks. 255 znamješkow)."
@@ -701,22 +702,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, 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ć."
@@ -728,9 +733,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -787,9 +794,12 @@ msgid "Request token already authorized."
 msgstr "Naprašowanski token hižo awtorizowany."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -797,7 +807,7 @@ msgstr "Naprašowanski token hižo awtorizowany."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -818,18 +828,20 @@ msgstr "Zmylk datoweje banki při zasunjenju 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: 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."
@@ -877,7 +889,7 @@ msgstr "Konto"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Přimjeno"
@@ -885,7 +897,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Hesło"
 
@@ -989,10 +1001,12 @@ msgstr "Tuta zdźělenka bu hižo wospjetowana."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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."
@@ -1023,9 +1037,8 @@ 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
-#, fuzzy
 msgid "Cannot delete this notice."
-msgstr "Tuta zdźělenka njeda so zničić."
+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
@@ -1227,15 +1240,13 @@ msgstr "Profil njeeksistuje."
 #. 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 "Nowy abonement njeda so přidać"
+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
-#, fuzzy
 msgid "Can only handle favorite activities."
-msgstr "Jenož zdźělenki dadźa so jako fawority składować."
+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
@@ -1262,15 +1273,14 @@ msgstr "%s skupisnkich čłonstwow"
 #. 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 "Nowy abonement njeda so přidać"
+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
-#, fuzzy
 msgid "Can only handle join activities."
-msgstr "Jenož zdźělenki dadźa so jako fawority składować."
+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
@@ -1295,52 +1305,73 @@ msgstr "Faworit njeeksistuje."
 #. 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "Faworit druheho njeda so zhašeć"
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "Skupina njeeksistuje"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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 using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "HTTP method not supported"
-msgstr "HTTP-metoda so njepodpěruje."
+msgid "Not a member."
+msgstr "Njeje čłon"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
-msgstr "Abonement druheho njeda so zhašeć"
+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
-#, fuzzy, php-format
+#, php-format
 msgid "No such profile id: %d."
-msgstr "Profilowy ID njeeksistuje: %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
-#, fuzzy, php-format
+#, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
-msgstr "Profil  %1$d njeje profil %2$d abonował"
+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
-#, fuzzy
 msgid "Cannot delete someone else's subscription."
-msgstr "Abonement druheho njeda so zhašeć"
+msgstr "Abonement druheho njeda so zhašeć."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
@@ -1355,9 +1386,9 @@ msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #: actions/atompubsubscriptionfeed.php:267
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown profile %s."
-msgstr "Njeznaty profil %s"
+msgstr "Njeznaty profil %s."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
@@ -1487,33 +1518,40 @@ msgstr "Aktualizowanje awatara je so njeporadźiło."
 msgid "Avatar deleted."
 msgstr "Awatar zničeny."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr "Konto zawěsćić"
 
-#: actions/backupaccount.php:80
+#. 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ć."
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Zawěsćenje"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr "Twoje konto zawěsćić"
 
@@ -1544,14 +1582,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Ně"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "Tutoho wužiwarja njeblokować"
 
@@ -1563,7 +1600,7 @@ msgstr "Tutoho wužiwarja njeblokować"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Haj"
@@ -1579,32 +1616,6 @@ msgstr "Tutoho wužiwarja blokować"
 msgid "Failed to save block information."
 msgstr "Njebě móžno blokěrowanske informacije składować."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Skupina njeeksistuje."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1731,7 +1742,8 @@ msgid "Account deleted."
 msgstr "Konto zhašene."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 msgid "Delete account"
 msgstr "Konto zhašeć"
 
@@ -1752,8 +1764,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Wobkrućić"
 
@@ -1823,8 +1836,10 @@ 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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."
 
@@ -1872,10 +1887,11 @@ msgid "Delete this group"
 msgstr "Tutu skupinu zhašeć"
 
 #. 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 unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1913,96 +1929,131 @@ msgstr "Tutu zdźělenku njewušmórnyć"
 msgid "Delete this notice"
 msgstr "Tutu zdźělenku wušmórnyć"
 
-#: actions/deleteuser.php:67
+#. 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ć."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Wužiwarja wušmórnyć"
 
-#: actions/deleteuser.php:136
+#. 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
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Tuitu skupinu njezhašeć"
+
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. 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.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "Design"
 
-#: actions/designadminpanel.php:74
+#. 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"
 
-#: actions/designadminpanel.php:335
+#. 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."
 
-#: actions/designadminpanel.php:340
+#. 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."
 
-#: actions/designadminpanel.php:344
+#. 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."
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Logo změnić"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Logo sydła"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "SSL-logo"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Šat změnić"
 
-#: actions/designadminpanel.php:486
+#. 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."
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Swójski šat"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Pozadk"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2011,98 +2062,108 @@ 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:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Zapinjeny"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "Pozadkowy wobraz kachlicować"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "Wotkazy"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Rozšěrjeny"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "Swójski CSS"
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
 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:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
 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:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "Na standard wróćo stajić"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Składować"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "Design składować"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "Tuta zdźělenka faworit njeje!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "K faworitam přidać"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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 "Dokument \"%s\" njeeksistuje"
 
 #. TRANS: Title for "Edit application" form.
@@ -2400,7 +2461,6 @@ msgstr "Ta e-mejlowa adresa hižo słuša k druhemu wužiwarjej."
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
 #: actions/emailsettings.php:426 actions/imsettings.php:343
 #: actions/smssettings.php:365
-#, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Wobkrućenski kod njehodźi so zasunyć."
 
@@ -2427,7 +2487,6 @@ 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:468 actions/smssettings.php:413
-#, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "E-mejlowe wobkrućenje njeda so zhašeć."
 
@@ -2455,7 +2514,6 @@ msgstr "Žana adresa za dochadźace e-mejle."
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
 #: actions/emailsettings.php:540 actions/emailsettings.php:565
 #: actions/smssettings.php:564 actions/smssettings.php:587
-#, fuzzy
 msgid "Could not update user record."
 msgstr "Datowa sadźba wužiwarja njeda so aktualizować."
 
@@ -2804,7 +2862,7 @@ msgid ""
 "%%%%)"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Nowu skupinu wutworić"
 
@@ -2977,7 +3035,6 @@ msgstr "to je wopačna IM-adresa."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
 #: actions/imsettings.php:391
-#, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "IM-wobkrućenje njeda so zhašeć."
 
@@ -3173,26 +3230,33 @@ msgid ""
 "Sincerely, %2$s\n"
 msgstr ""
 
-#: actions/joingroup.php:60
+#. 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ł."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s je do %2$s zastupił"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "Njejsy čłon teje skupiny."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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 je skupinu %2$s wopušćił"
 
@@ -3296,6 +3360,13 @@ msgstr "URL wobraza licency"
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Składować"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Licencne nastajenja składować"
@@ -3320,11 +3391,11 @@ msgstr "Přizjewić"
 msgid "Login to site"
 msgstr "Při sydle přizjewić"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Składować"
 
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
@@ -3701,7 +3772,8 @@ msgstr "Hesło změnić"
 msgid "Change your password."
 msgstr "Změń swoje hesło."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Hesło změnjene"
 
@@ -3709,7 +3781,8 @@ msgstr "Hesło změnjene"
 msgid "Old password"
 msgstr "Stare hesło"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nowe hesło"
 
@@ -3717,7 +3790,7 @@ msgstr "Nowe hesło"
 msgid "6 or more characters"
 msgstr "6 abo wjace znamješkow"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "Samsne hesło kaž horjeka"
 
@@ -3741,11 +3814,12 @@ msgstr "Wopačne stare hesło"
 msgid "Error saving user; invalid."
 msgstr "Zmylk při składowanju wužiwarja; njepłaćiwy."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "Nowe hesło njeda so składować."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. 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."
 
@@ -4068,7 +4142,8 @@ msgid "Profile information"
 msgstr "Profilowe informacije"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 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 "
@@ -4076,16 +4151,16 @@ msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 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:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "Startowa strona"
 
@@ -4097,7 +4172,7 @@ 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:472
+#: 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"
@@ -4107,27 +4182,27 @@ 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:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "Městno"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: 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\""
 
@@ -4178,7 +4253,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:257 actions/register.php:229
+#: 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)."
@@ -4188,48 +4263,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:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Časowe pasmo njeje wubrane."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
 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:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
 #, 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:346
-#, fuzzy
+#: actions/profilesettings.php:347
 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:404
-#, fuzzy
+#: actions/profilesettings.php:405
 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:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Konto wobnowić"
 
@@ -4339,125 +4413,177 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "Mróčel tafličkow"
 
-#: actions/recoverpassword.php:36
+#. 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!"
 
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Njeznaty wobnowjenski kod."
 
-#: actions/recoverpassword.php:66
+#. 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."
 
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr ""
 
-#: actions/recoverpassword.php:86
+#. 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."
 
-#: actions/recoverpassword.php:97
+#. 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."
 
-#: actions/recoverpassword.php:111
+#. 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ć."
 
-#: actions/recoverpassword.php:152
+#. 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:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
 msgstr "Sy so identifikował. Zapodaj deleka nowe hesło. "
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Wobnowjenje hesła"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Přimjeno abo e-mejlowa adresa"
 
-#: actions/recoverpassword.php:193
+#. 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."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Wobnowić"
 
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+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ć"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Hesło wobnowić"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Njeznata akcija"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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 abo wjace znamješkow, a njezabudź jo!"
 
-#: actions/recoverpassword.php:243
+#. 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 "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
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Wróćo stajić"
 
-#: actions/recoverpassword.php:252
+#. 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."
 
-#: actions/recoverpassword.php:282
+#. 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."
 
-#: actions/recoverpassword.php:299
+#. 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."
 
-#: actions/recoverpassword.php:313
+#. 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."
 
-#: actions/recoverpassword.php:338
+#. 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 ""
 
-#: actions/recoverpassword.php:357
+#. 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."
 
-#: actions/recoverpassword.php:365
+#. 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ěć."
 
-#: actions/recoverpassword.php:369
+#. 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."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+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
 msgid "Error setting user."
 msgstr "Zmylk při nastajenju wužiwarja."
 
-#: actions/recoverpassword.php:395
+#. 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."
 
@@ -4473,7 +4599,7 @@ msgstr "Wodaj, njepłaćiwy přeprošenski kod."
 msgid "Registration successful"
 msgstr "Registrowanje wuspěšne"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Registrować"
 
@@ -4499,68 +4625,59 @@ msgid ""
 "link up to friends and colleagues. "
 msgstr ""
 
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 małopisanych pismikow abo ličbow, žane interpunkciske znamješka abo "
-"mjezery. Trěbne."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 abo wjace znamješkow. Trěbne."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Jenake kaž hesło horjeka. Trěbne."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 abo wjace znamješkow"
 
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-mejl"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
-#: actions/register.php:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Dlěše mjeno, wosebje twoje \"woprawdźite\" mjeno"
 
-#: actions/register.php:463
+#: actions/register.php:462
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
-#: actions/register.php:524
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:534
+#: 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:538
+#: 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:541
+#: 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:546
+#: 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:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4579,7 +4696,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -4631,14 +4748,12 @@ 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 "To je lokalny profil! Přizjew so, zo by abonował."
 
 #: actions/remotesubscribe.php:182
-#, fuzzy
 msgid "Could not get a request token."
-msgstr "Přistupny token njeda so wudać."
+msgstr "Přistupny token njeda so wobstarać."
 
 #: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
@@ -4649,7 +4764,6 @@ msgid "No notice specified."
 msgstr "Žana zdźělenka podata."
 
 #: actions/repeat.php:75
-#, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "Njemóžeš swójsku zdźělenku wospjetować."
 
@@ -4875,7 +4989,7 @@ msgstr "Organizacija"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "Wopisanje"
 
@@ -4898,8 +5012,9 @@ msgstr "Aplikaciske akcije"
 msgid "Reset key & secret"
 msgstr ""
 
+#. TRANS: Title of form for deleting a user.
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Zničić"
 
@@ -5017,7 +5132,7 @@ msgid "Note"
 msgstr "Přispomnjenka"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "Aliasy"
 
@@ -6919,7 +7034,7 @@ msgstr ""
 #. TRANS: Client error thrown when authentication fails.
 #: lib/apiauth.php:266 lib/apiauth.php:293
 msgid "Could not authenticate you."
-msgstr ""
+msgstr "Njebě móžno će awtentifikować."
 
 #. TRANS: Server error displayed when trying to create an anynymous OAuth consumer.
 #: lib/apioauthstore.php:45
@@ -6947,9 +7062,8 @@ msgid "Database error inserting OAuth application user."
 msgstr "Zmylk datoweje banki při zasunjenju wužiwarja OAuth-aplikacije."
 
 #: lib/apioauthstore.php:345
-#, fuzzy
 msgid "Database error updating OAuth application user."
-msgstr "Zmylk datoweje banki při zasunjenju wužiwarja OAuth-aplikacije."
+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
@@ -7155,14 +7269,14 @@ msgstr "Wužiwar nima poslednju powěsć."
 #: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
-msgstr ""
+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 ""
+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
@@ -7494,24 +7608,24 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 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:153
+#: lib/common.php:158
 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "K instalaciji"
 
@@ -7578,11 +7692,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "Wupinjeny"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Wróćo stajić"
+#. 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: 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".
@@ -7665,37 +7783,31 @@ msgstr "Start"
 msgid "Grant this user the \"%s\" role"
 msgstr "Tutomu wužiwarjej rólu \"%s\" dać"
 
-#: lib/groupeditform.php:154
-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:163
+#: lib/groupeditform.php:155
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL startoweje strony abo bloga skupiny abo temy."
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "Skupinu abo temu wopisać"
 
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+#: lib/groupeditform.php:162
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
 msgstr[0] "Skupinu abo temu w %d znamješce wopisać"
 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:182
+#: lib/groupeditform.php:174
 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:190
+#: lib/groupeditform.php:182
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8811,14 +8923,9 @@ msgstr[3] "před něhdźe %d měacami"
 msgid "about a year ago"
 msgstr "před něhdźe jednym lětom"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s płaćiwa barba njeje!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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 ""
@@ -8862,23 +8969,31 @@ msgstr "Njepłaćiwy XML, korjeń XRD faluje."
 msgid "Getting backup from file '%s'."
 msgstr "Wobstaruje so zawěsćenje z dataje \"%s\"-"
 
-#~ msgid "No such profile"
-#~ msgstr "Profil njeeksistuje"
+#~ msgid "No such group"
+#~ msgstr "Skupina njeeksistuje"
 
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Skupiny, w kotrychž %s je čłon na %s"
+#~ msgid "HTTP method not supported"
+#~ msgstr "HTTP-metoda so njepodpěruje"
 
-#~ msgid "Method not supported"
-#~ msgstr "Metoda so njepodpěruje."
+#~ msgid "Reset"
+#~ msgstr "Wróćo stajić"
 
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Ludźo, kotřiž su %s na %s abonowali"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 małopisanych pismikow abo ličbow, žane interpunkciske znamješka abo "
+#~ "mjezery. Trěbne."
 
-#~ msgid "Couldn't update user."
-#~ msgstr "Wužiwar njeda aktualizować."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 abo wjace znamješkow. Trěbne."
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "Profil njeda so składować."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Jenake kaž hesło horjeka. Trěbne."
 
-#~ msgid "Couldn't save tags."
-#~ msgstr "Taflički njedadźa so składować."
+#~ 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."
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s płaćiwa barba njeje!"
diff --git a/locale/hu/LC_MESSAGES/statusnet.po b/locale/hu/LC_MESSAGES/statusnet.po
index 2debe428e9..fac32f4770 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-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:31+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:01+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-01-15 11:03:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hu\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -79,6 +79,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -90,13 +91,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Mentés"
@@ -325,7 +326,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Nem sikerült frissíteni a felhasználót."
@@ -349,7 +350,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "Nem sikerült menteni a profilt."
 
@@ -359,7 +360,7 @@ msgstr "Nem sikerült menteni a profilt."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, fuzzy, php-format
@@ -538,7 +539,8 @@ 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.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Nem sikerült törölni a kedvencet."
 
@@ -584,7 +586,7 @@ msgstr "A cél felhasználó nem található."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: 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."
@@ -594,7 +596,7 @@ msgstr "A becenév már foglalt. Próbálj meg egy másikat."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Nem érvényes becenév."
@@ -606,7 +608,7 @@ msgstr "Nem érvényes becenév."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "A honlap érvénytelen URL-cím."
@@ -616,7 +618,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -644,7 +646,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -702,22 +704,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, 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."
@@ -729,9 +735,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -790,9 +798,12 @@ msgid "Request token already authorized."
 msgstr "Nincs jogosultságod."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -800,7 +811,7 @@ msgstr "Nincs jogosultságod."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -821,18 +832,20 @@ msgstr ""
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: 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."
@@ -881,7 +894,7 @@ msgstr "Kontó"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Becenév"
@@ -889,7 +902,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Jelszó"
 
@@ -996,10 +1009,12 @@ msgstr "Már megismételted azt a hírt."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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
@@ -1274,7 +1289,7 @@ msgstr "%s csoport tagjai"
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
 #: actions/atompubmembershipfeed.php:219
 #, fuzzy
-msgid "Cannot add someone else's membership"
+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.
@@ -1310,30 +1325,51 @@ 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "Nem sikerült törölni a kedvencet."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "Nincs ilyen csoport"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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"
+msgid "Not a member."
 msgstr "Összes tag"
 
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "Az API-metódus nem található."
-
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+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.
@@ -1505,35 +1541,42 @@ msgstr "Nem sikerült felölteni az avatart."
 msgid "Avatar deleted."
 msgstr "Avatar törölve."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Háttér"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1564,14 +1607,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Nem"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "Ne blokkoljuk ezt a felhasználót"
 
@@ -1583,7 +1625,7 @@ msgstr "Ne blokkoljuk ezt a felhasználót"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Igen"
@@ -1599,32 +1641,6 @@ msgstr "Felhasználó blokkolása"
 msgid "Failed to save block information."
 msgstr "Nem sikerült elmenteni a blokkolási információkat."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Nincs ilyen csoport."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1756,7 +1772,8 @@ msgid "Account deleted."
 msgstr "Avatar törölve."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "Felhasználó törlése"
@@ -1778,8 +1795,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Megerősítés"
 
@@ -1851,8 +1869,10 @@ msgid "You must be logged in to delete a group."
 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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ó."
 
@@ -1907,10 +1927,11 @@ msgid "Delete this group"
 msgstr "Töröljük ezt a felhasználót"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1948,19 +1969,30 @@ msgstr "Ne töröljük ezt a hírt"
 msgid "Delete this notice"
 msgstr "Töröljük ezt a hírt"
 
-#: actions/deleteuser.php:67
+#. 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."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Felhasználó törlése"
 
-#: actions/deleteuser.php:136
+#. 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."
@@ -1968,80 +2000,104 @@ msgstr ""
 "Biztosan törölni szeretnéd ezt a felhasználót? Ezzel minden róla szóló "
 "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:163 lib/deleteuserform.php:77
+#. 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.
 #. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "Megjelenés"
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
-#: actions/designadminpanel.php:335
+#. 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."
 
-#: actions/designadminpanel.php:340
+#. 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."
 
-#: actions/designadminpanel.php:344
+#. 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 ""
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Logó megváltoztatása"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Oldal logója"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "Oldal logója"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Téma megváltoztatása"
 
-#: actions/designadminpanel.php:486
+#. 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."
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr ""
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Háttér"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2049,98 +2105,108 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Be"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "Háttérkép csempézése"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. 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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "Hivatkozások"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr ""
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr ""
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
 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:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "Visszaállítás az alapértelmezettre"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Mentés"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "Design mentése"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "Ez a hír nincs a kedvenceid között!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "Hozzáadás a kedvencekhez"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2856,7 +2922,7 @@ msgid ""
 "%%%%)"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Új csoport létrehozása"
 
@@ -3224,28 +3290,35 @@ msgid ""
 "Sincerely, %2$s\n"
 msgstr ""
 
-#: actions/joingroup.php:60
+#. 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."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s csatlakozott a(z) %2$s csoporthoz"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "Nem vagy tagja annak a csoportnak."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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 ""
+msgstr "%1$s csatlakozott a(z) %2$s csoporthoz"
 
 #. TRANS: User admin panel title
 #: actions/licenseadminpanel.php:55
@@ -3348,6 +3421,13 @@ msgstr ""
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Mentés"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
@@ -3372,11 +3452,11 @@ msgstr "Bejelentkezés"
 msgid "Login to site"
 msgstr "Bejelentkezés az oldalra"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Emlékezz rám"
 
-#: actions/login.php:259 actions/register.php:493
+#: 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 "
@@ -3753,7 +3833,8 @@ msgstr "Jelszó megváltoztatása"
 msgid "Change your password."
 msgstr "Változtasd meg a jelszavadat."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Jelszó megváltoztatása"
 
@@ -3761,7 +3842,8 @@ msgstr "Jelszó megváltoztatása"
 msgid "Old password"
 msgstr "Régi jelszó"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Új jelszó"
 
@@ -3769,7 +3851,7 @@ msgstr "Új jelszó"
 msgid "6 or more characters"
 msgstr "6 vagy több karakter"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "Ugyanaz mint a fenti jelszó"
 
@@ -3793,11 +3875,12 @@ msgstr "Érvénytelen a régi jelszó"
 msgid "Error saving user; invalid."
 msgstr "Hiba a felhasználó mentésekor; érvénytelen."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "Az új jelszót nem sikerült elmenteni."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Jelszó elmentve."
 
@@ -4140,23 +4223,24 @@ msgid "Profile information"
 msgstr "Személyes profil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 #, 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 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:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "Honlap"
 
@@ -4171,7 +4255,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:472
+#: 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"
@@ -4179,27 +4263,27 @@ 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:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "Helyszín"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: 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\""
 
@@ -4254,7 +4338,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:257 actions/register.php:229
+#: 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)."
@@ -4262,49 +4346,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:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 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:276
+#: actions/profilesettings.php:277
 #, 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, 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:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr ""
 
@@ -4419,124 +4504,176 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "Címkefelhő"
 
-#: actions/recoverpassword.php:36
+#. 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!"
 
-#: actions/recoverpassword.php:62
+#. 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."
 
-#: actions/recoverpassword.php:66
+#. 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."
 
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr ""
 
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr ""
 
-#: actions/recoverpassword.php:97
+#. 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 ""
 
-#: actions/recoverpassword.php:111
+#. 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."
 
-#: actions/recoverpassword.php:152
+#. 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:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+msgid "You have been identified. Enter a new password below."
 msgstr ""
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Jelszó visszaállítása"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Becenév vagy email cím"
 
-#: actions/recoverpassword.php:193
+#. 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 ""
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Alaphelyzetbe állítás"
 
-#: actions/recoverpassword.php:208
+#. 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"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Elfelejtett jelszó"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Ismeretlen művelet"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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!"
 
-#: actions/recoverpassword.php:243
+#. 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
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Alaphelyzet"
 
-#: actions/recoverpassword.php:252
+#. 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."
 
-#: actions/recoverpassword.php:282
+#. 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 ""
 
-#: actions/recoverpassword.php:299
+#. 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 ""
 
-#: actions/recoverpassword.php:313
+#. 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 ""
 
-#: actions/recoverpassword.php:338
+#. 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 ""
 
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr ""
 
-#: actions/recoverpassword.php:365
+#. 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."
 
-#: actions/recoverpassword.php:369
+#. 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."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "Hiba a felhasználó beállításakor."
 
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
@@ -4552,7 +4689,7 @@ msgstr ""
 msgid "Registration successful"
 msgstr "A regisztráció sikeres"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Regisztráció"
 
@@ -4578,71 +4715,63 @@ msgid ""
 "link up to friends and colleagues. "
 msgstr ""
 
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 kisbetű vagy számjegy, nem lehet írásjel vagy szóköz benne. Szükséges."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 vagy több karakter. Kötelező."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Ugyanaz mint a jelszó fentebb. Szükséges."
+#: 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:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 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:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Hosszabb név, célszerűen a \"valódi\" neved"
 
-#: actions/register.php:463
+#: actions/register.php:462
 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:524
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:534
+#: 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:538
+#: 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:541
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: 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:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4661,7 +4790,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -4964,7 +5093,7 @@ msgstr "Szervezet"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "Leírás"
 
@@ -4987,8 +5116,9 @@ msgstr ""
 msgid "Reset key & secret"
 msgstr ""
 
+#. TRANS: Title of form for deleting a user.
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Törlés"
 
@@ -5106,7 +5236,7 @@ msgid "Note"
 msgstr "Megjegyzés"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "Álnevek"
 
@@ -7575,26 +7705,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 #, 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:153
+#: lib/common.php:158
 #, 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "Menj a telepítőhöz."
 
@@ -7663,12 +7793,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "Ki"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Alaphelyzet"
+#. 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: 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".
@@ -7752,27 +7885,23 @@ msgstr "Menjünk"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 kisbetű vagy számjegy, nem lehet benne írásjel vagy szóköz"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "A csoporthoz vagy témához tartozó honlap illetve blog URL-je"
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "Jellemezd a csoportot vagy a témát"
 
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
 #, 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"
+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:182
+#: lib/groupeditform.php:174
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -7780,7 +7909,7 @@ msgstr ""
 "A csoport földrajzi elhelyezkedése, ha van ilyen, pl. \"Város, Megye, Ország"
 "\""
 
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8943,14 +9072,9 @@ msgstr[1] ""
 msgid "about a year ago"
 msgstr "körülbelül egy éve"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr ""
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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 ""
@@ -8987,27 +9111,27 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "Nincs ilyen profil."
+#~ msgid "No such group"
+#~ msgstr "Nincs ilyen csoport"
 
 #, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "A legtöbb tagból álló csoportok"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
 #~ msgstr "Az API-metódus nem található."
 
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Senki sem követ figyelemmel."
+#~ msgid "Reset"
+#~ msgstr "Alaphelyzet"
 
-#~ msgid "Couldn't update user."
-#~ msgstr "Nem sikerült frissíteni a felhasználót."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 kisbetű vagy számjegy, nem lehet írásjel vagy szóköz benne. "
+#~ "Szükséges."
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "Nem sikerült elmenteni a profilt."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 vagy több karakter. Kötelező."
 
-#~ msgid "Couldn't save tags."
-#~ msgstr "Nem sikerült a címkéket elmenteni."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Ugyanaz mint a jelszó fentebb. Szükséges."
+
+#~ 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"
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index 635f29d291..3c99af5802 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-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:33+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57: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-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -74,6 +74,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -85,13 +86,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salveguardar"
@@ -326,7 +327,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Non poteva actualisar le usator."
@@ -350,7 +351,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "Non poteva salveguardar le profilo."
 
@@ -360,7 +361,7 @@ msgstr "Non poteva salveguardar le profilo."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
@@ -401,7 +402,6 @@ msgstr "Non poteva actualisar le apparentia."
 
 #. TRANS: Title for Atom feed.
 #: actions/apiatomservice.php:85
-#, fuzzy
 msgctxt "ATOM"
 msgid "Main"
 msgstr "Principal"
@@ -540,7 +540,8 @@ msgid "That status is not a favorite."
 msgstr "Iste stato non es favorite."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Non poteva deler le favorite."
 
@@ -586,7 +587,7 @@ msgstr "Non poteva trovar le usator de destination."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonymo ja in uso. Proba un altere."
@@ -596,7 +597,7 @@ msgstr "Pseudonymo ja in uso. Proba un altere."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Non un pseudonymo valide."
@@ -608,7 +609,7 @@ msgstr "Non un pseudonymo valide."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Le pagina personal non es un URL valide."
@@ -618,7 +619,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Le nomine complete es troppo longe (maximo 255 characteres)."
@@ -645,7 +646,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Loco es troppo longe (maximo 255 characteres)."
@@ -702,22 +703,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, 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."
@@ -729,9 +734,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -788,9 +795,12 @@ msgid "Request token already authorized."
 msgstr "Indicio de requesta jam autorisate."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -798,7 +808,7 @@ msgstr "Indicio de requesta jam autorisate."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -820,18 +830,20 @@ msgstr ""
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: 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."
@@ -885,7 +897,7 @@ msgstr "Conto"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Pseudonymo"
@@ -893,7 +905,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Contrasigno"
 
@@ -1001,10 +1013,12 @@ msgstr "Iste nota ha ja essite repetite."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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."
@@ -1035,7 +1049,6 @@ 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
-#, fuzzy
 msgid "Cannot delete this notice."
 msgstr "Non pote deler iste nota."
 
@@ -1240,15 +1253,13 @@ msgstr "Profilo non existe."
 #. 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 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
-#, fuzzy
 msgid "Can only handle favorite activities."
-msgstr "Solmente le activitates Favorite es possibile."
+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
@@ -1275,15 +1286,14 @@ msgstr "Membratos del gruppo %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 pote adder le membrato de un altere persona"
+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
-#, fuzzy
 msgid "Can only handle join activities."
-msgstr "Solmente le activitates \"Join\" es possibile."
+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
@@ -1308,29 +1318,51 @@ msgstr "Iste favorite non 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "Non pote deler le favorite de un altere persona."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "Gruppo non existe"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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 using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "HTTP method not supported"
-msgstr "Methodo HTTP non supportate."
+msgid "Not a member."
+msgstr "Non es membro"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+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.
@@ -1338,22 +1370,21 @@ msgstr "Non pote deler le membrato de un altere persona"
 #: actions/atompubshowsubscription.php:72
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
-#, fuzzy, php-format
+#, 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
-#, fuzzy, php-format
+#, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
-msgstr "Le profilo %1$d non es subscribite al profilo %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
-#, fuzzy
 msgid "Cannot delete someone else's subscription."
-msgstr "Non pote deler le subscription de un altere persona"
+msgstr "Non pote deler le subscription de un altere persona."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
@@ -1368,9 +1399,9 @@ msgstr "Pote solmente sequer personas."
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #: actions/atompubsubscriptionfeed.php:267
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown profile %s."
-msgstr "Profilo incognite: %s"
+msgstr "Profilo %s incognite."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
@@ -1500,24 +1531,30 @@ msgstr "Actualisation del avatar fallite."
 msgid "Avatar deleted."
 msgstr "Avatar delite."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr "Facer un copia de reserva del conto"
 
-#: actions/backupaccount.php:80
+#. 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."
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
+#, 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 an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
@@ -1527,12 +1564,14 @@ msgstr ""
 "como adresses de e-mail e de messageria instantanee non es copiate. In "
 "addition, le files incargate e le messages directe non es copiate."
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Copia de reserva"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr "Facer un copia de reserva de tu conto"
 
@@ -1566,14 +1605,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "No"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "Non blocar iste usator"
 
@@ -1585,7 +1623,7 @@ msgstr "Non blocar iste usator"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Si"
@@ -1601,32 +1639,6 @@ msgstr "Blocar iste usator"
 msgid "Failed to save block information."
 msgstr "Falleva de salveguardar le information del blocada."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Gruppo non existe."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1753,7 +1765,8 @@ msgid "Account deleted."
 msgstr "Conto delite."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 msgid "Delete account"
 msgstr "Deler conto"
 
@@ -1778,8 +1791,9 @@ msgstr ""
 "datos</a> ante le deletion."
 
 #. 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -1852,8 +1866,10 @@ 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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."
 
@@ -1904,10 +1920,11 @@ msgid "Delete this group"
 msgstr "Deler iste gruppo"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1947,19 +1964,30 @@ msgstr "Non deler iste nota"
 msgid "Delete this notice"
 msgstr "Deler iste nota"
 
-#: actions/deleteuser.php:67
+#. 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."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Deler usator"
 
-#: actions/deleteuser.php:136
+#. 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."
@@ -1967,80 +1995,104 @@ msgstr ""
 "Es tu secur de voler deler iste usator? Isto radera tote le datos super le "
 "usator del base de datos, sin copia de reserva."
 
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Non deler iste gruppo"
+
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. 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.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "Apparentia"
 
-#: actions/designadminpanel.php:74
+#. 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"
 
-#: actions/designadminpanel.php:335
+#. 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."
 
-#: actions/designadminpanel.php:340
+#. 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."
 
-#: actions/designadminpanel.php:344
+#. 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."
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Cambiar logotypo"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Logotypo del sito"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "Logotypo SSL"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Cambiar thema"
 
-#: actions/designadminpanel.php:486
+#. 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."
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Apparentia personalisate"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Fundo"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2050,98 +2102,108 @@ msgstr ""
 "file es %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Active"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "Tegular le imagine de fundo"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "Ligamines"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Avantiate"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "CSS personalisate"
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
 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:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
 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:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "Revenir al predefinitiones"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Salveguardar"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "Salveguardar apparentia"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "Iste nota non es favorite!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "Adder al favorites"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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 "Le documento \"%s\" non existe."
 
 #. TRANS: Title for "Edit application" form.
@@ -2444,7 +2506,6 @@ msgstr "Iste adresse de e-mail pertine ja a un altere usator."
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
 #: actions/emailsettings.php:426 actions/imsettings.php:343
 #: actions/smssettings.php:365
-#, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Non poteva inserer le codice de confirmation."
 
@@ -2474,7 +2535,6 @@ 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:468 actions/smssettings.php:413
-#, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Non poteva deler confirmation de e-mail."
 
@@ -2502,7 +2562,6 @@ msgstr "Nulle adresse de e-mail entrante."
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
 #: actions/emailsettings.php:540 actions/emailsettings.php:565
 #: actions/smssettings.php:564 actions/smssettings.php:587
-#, fuzzy
 msgid "Could not update user record."
 msgstr "Non poteva actualisar le datos del usator."
 
@@ -2866,7 +2925,7 @@ msgstr ""
 "vide un gruppo que te place? Tenta [cercar un](%%%%action.groupsearch%%%%) o "
 "[crear le tue!](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Crear un nove gruppo"
 
@@ -3054,7 +3113,6 @@ msgstr "Iste adresse de messageria instantanee es erronee."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
 #: actions/imsettings.php:391
-#, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "Non poteva deler confirmation de messageria instantanee."
 
@@ -3272,26 +3330,33 @@ msgstr ""
 "\n"
 "Sincermente, %2$s\n"
 
-#: actions/joingroup.php:60
+#. 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."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s se jungeva al gruppo %2$s"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "Tu non es membro de iste gruppo."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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 quitava le gruppo %2$s"
 
@@ -3397,6 +3462,13 @@ msgstr "URL del imagine del licentia"
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Salveguardar"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Salveguardar configurationes de licentia"
@@ -3422,11 +3494,11 @@ msgstr "Aperir session"
 msgid "Login to site"
 msgstr "Authenticar te a iste sito"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Memorar me"
 
-#: actions/login.php:259 actions/register.php:493
+#: 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 "
@@ -3818,7 +3890,8 @@ msgstr "Cambiar contrasigno"
 msgid "Change your password."
 msgstr "Cambiar tu contrasigno."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Cambio del contrasigno"
 
@@ -3826,7 +3899,8 @@ msgstr "Cambio del contrasigno"
 msgid "Old password"
 msgstr "Ancian contrasigno"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nove contrasigno"
 
@@ -3834,7 +3908,7 @@ msgstr "Nove contrasigno"
 msgid "6 or more characters"
 msgstr "6 o plus characteres"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "Identic al contrasigno hic supra"
 
@@ -3858,11 +3932,12 @@ msgstr "Ancian contrasigno incorrecte"
 msgid "Error saving user; invalid."
 msgstr "Error de salveguardar le usator; invalide."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "Non pote salveguardar le nove contrasigno."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Contrasigno salveguardate."
 
@@ -4189,22 +4264,23 @@ msgid "Profile information"
 msgstr "Information de profilo"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 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:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "Pagina personal"
 
@@ -4216,7 +4292,7 @@ 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:472
+#: 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"
@@ -4224,27 +4300,27 @@ 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:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "Loco"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: 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\""
 
@@ -4298,7 +4374,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:257 actions/register.php:229
+#: 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)."
@@ -4306,48 +4382,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:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Fuso horari non seligite."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
 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:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
 #, 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:346
-#, fuzzy
+#: actions/profilesettings.php:347
 msgid "Could not update user for autosubscribe."
-msgstr "Non poteva actualisar usator pro autosubscription."
+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:404
-#, fuzzy
+#: actions/profilesettings.php:405
 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:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Restaurar conto"
 
@@ -4470,35 +4545,43 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "Etiquettario"
 
-#: actions/recoverpassword.php:36
+#. 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!"
 
-#: actions/recoverpassword.php:62
+#. 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."
 
-#: actions/recoverpassword.php:66
+#. 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."
 
-#: actions/recoverpassword.php:73
+#. 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."
 
-#: actions/recoverpassword.php:86
+#. 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."
 
-#: actions/recoverpassword.php:97
+#. 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."
 
-#: actions/recoverpassword.php:111
+#. 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."
 
-#: actions/recoverpassword.php:152
+#. 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."
@@ -4506,67 +4589,100 @@ 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:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
 msgstr "Tu ha essite identificate. Entra un nove contrasigno hic infra. "
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Recuperation de contrasigno"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Pseudonymo o adresse de e-mail"
 
-#: actions/recoverpassword.php:193
+#. 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."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Recuperar"
 
-#: actions/recoverpassword.php:208
+#. 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 "Reinitialisar contrasigno"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Recuperar contrasigno"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Action incognite"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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 plus characteres, e non oblida lo!"
 
-#: actions/recoverpassword.php:243
+#. 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 "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
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Reinitialisar"
 
-#: actions/recoverpassword.php:252
+#. 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."
 
-#: actions/recoverpassword.php:282
+#. 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."
 
-#: actions/recoverpassword.php:299
+#. 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."
 
-#: actions/recoverpassword.php:313
+#. 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."
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4574,23 +4690,34 @@ msgstr ""
 "Instructiones pro recuperar tu contrasigno ha essite inviate al adresse de e-"
 "mail registrate in tu conto."
 
-#: actions/recoverpassword.php:357
+#. 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."
 
-#: actions/recoverpassword.php:365
+#. 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."
 
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Contrasigno e confirmation non corresponde."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+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
 msgid "Error setting user."
 msgstr "Error durante le configuration del usator."
 
-#: actions/recoverpassword.php:395
+#. 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."
 
@@ -4606,7 +4733,7 @@ msgstr "Pardono, le codice de invitation es invalide."
 msgid "Registration successful"
 msgstr "Registration succedite"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Crear conto"
 
@@ -4634,62 +4761,55 @@ 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:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 minusculas o numeros, sin punctuation o spatios. Requirite."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 o plus characteres. Requirite."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Identic al contrasigno hic supra. Requirite."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 o plus characteres"
 
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Usate solmente pro actualisationes, notificationes e recuperation de "
 "contrasigno"
 
-#: actions/register.php:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Nomine plus longe, preferibilemente tu nomine \"real\""
 
-#: actions/register.php:463
+#: actions/register.php:462
 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:524
+#: 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:534
+#: 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:538
+#: 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:541
+#: 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:546
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4699,7 +4819,7 @@ msgstr ""
 "contrasigno, adresse de e-mail, adresse de messageria instantanee, numero de "
 "telephono."
 
-#: actions/register.php:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4731,7 +4851,7 @@ msgstr ""
 "\n"
 "Gratias pro inscriber te, e nos spera que iste servicio te place."
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -4791,12 +4911,10 @@ msgstr ""
 "invalide)."
 
 #: actions/remotesubscribe.php:175
-#, fuzzy
 msgid "That is a local profile! Login to subscribe."
-msgstr "Isto es un profilo local! Aperi un session pro subscriber."
+msgstr "Isto es un profilo local! Aperi session pro subscriber."
 
 #: actions/remotesubscribe.php:182
-#, fuzzy
 msgid "Could not get a request token."
 msgstr "Non poteva obtener un indicio de requesta."
 
@@ -4809,7 +4927,6 @@ msgid "No notice specified."
 msgstr "Nulle nota specificate."
 
 #: actions/repeat.php:75
-#, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "Tu non pote repeter tu proprie nota."
 
@@ -5047,7 +5164,7 @@ msgstr "Organisation"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "Description"
 
@@ -5070,8 +5187,9 @@ msgstr "Actiones de application"
 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:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Deler"
 
@@ -5199,7 +5317,7 @@ msgid "Note"
 msgstr "Nota"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "Aliases"
 
@@ -7220,10 +7338,9 @@ msgstr ""
 "OAuth."
 
 #: lib/apioauthstore.php:345
-#, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr ""
-"Error del base de datos durante le insertion del usator del application "
+"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.
@@ -7787,24 +7904,24 @@ msgstr ""
 "tracking - non ancora implementate.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 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:153
+#: lib/common.php:158
 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "Ir al installator."
 
@@ -7871,11 +7988,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "Non active"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Reinitialisar"
+#. 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: 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".
@@ -7958,32 +8079,28 @@ msgstr "Ir"
 msgid "Grant this user the \"%s\" role"
 msgstr "Conceder le rolo \"%s\" a iste usator"
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 minusculas o numeros, sin punctuation o spatios"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL del pagina initial o blog del gruppo o topico."
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "Describe le gruppo o topico"
 
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+#: lib/groupeditform.php:162
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
 msgstr[0] "Describe le gruppo o topico in %d character o minus"
 msgstr[1] "Describe le gruppo o topico in %d characteres o minus"
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
 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:190
+#: lib/groupeditform.php:182
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9191,14 +9308,9 @@ msgstr[1] "circa %d menses retro"
 msgid "about a year ago"
 msgstr "circa un anno retro"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s non es un color valide!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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."
@@ -9234,29 +9346,27 @@ msgstr "XML invalide, radice XRD mancante."
 msgid "Getting backup from file '%s'."
 msgstr "Obtene copia de reserva ex file '%s'."
 
-#~ msgid "AtomPub post with unknown attention URI %s"
-#~ msgstr "Message AtomPub con URI de attention incognite %s"
+#~ msgid "No such group"
+#~ msgstr "Gruppo non existe"
 
-#~ msgid "No such profile"
-#~ msgstr "Profilo non existe"
+#~ msgid "HTTP method not supported"
+#~ msgstr "Methodo HTTP non supportate"
 
-#~ msgid "Notices %s has favorited to on %s"
-#~ msgstr "Notas que %s ha addite al favorites in %s"
+#~ msgid "Reset"
+#~ msgstr "Reinitialisar"
 
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Gruppos del quales %s es membro in %s"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr "1-64 minusculas o numeros, sin punctuation o spatios. Requirite."
 
-#~ msgid "Method not supported"
-#~ msgstr "Methodo non supportate"
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 o plus characteres. Requirite."
 
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Personas al quales %s ha subscribite in %s"
+#~ msgid "Same as password above. Required."
+#~ msgstr "Identic al contrasigno hic supra. Requirite."
 
-#~ msgid "Couldn't update user."
-#~ msgstr "Non poteva actualisar usator."
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 minusculas o numeros, sin punctuation o spatios"
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "Non poteva salveguardar profilo."
-
-#~ msgid "Couldn't save tags."
-#~ msgstr "Non poteva salveguardar etiquettas."
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s non es un color valide!"
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index f9cbcf30a2..1b8b209700 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:34+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:10+0000\n"
 "Language-Team: Icelandic <http://translatewiki.net/wiki/Portal:is>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: is\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -80,6 +80,7 @@ msgid "Save access settings"
 msgstr "Stillingar fyrir mynd"
 
 #. 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -91,13 +92,13 @@ msgstr "Stillingar fyrir mynd"
 #. 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
@@ -326,7 +327,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 #, fuzzy
 msgid "Could not update user."
@@ -351,7 +352,7 @@ msgstr "Notandi hefur enga persónulega síðu."
 
 #. 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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 #, fuzzy
 msgid "Could not save profile."
 msgstr "Gat ekki vistað persónulega síðu."
@@ -362,7 +363,7 @@ msgstr "Gat ekki vistað persónulega síðu."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
@@ -542,7 +543,8 @@ msgid "That status is not a favorite."
 msgstr "Þetta babl er ekki í uppáhaldi!"
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Gat ekki eytt uppáhaldi."
 
@@ -595,7 +597,7 @@ msgstr "Gat ekki uppfært notanda."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
@@ -605,7 +607,7 @@ msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ekki tækt stuttnefni."
@@ -617,7 +619,7 @@ msgstr "Ekki tækt stuttnefni."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Heimasíða er ekki gild vefslóð."
@@ -627,7 +629,7 @@ msgstr "Heimasíða er ekki gild vefslóð."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -655,7 +657,7 @@ msgstr[1] "Staðsetning er of löng (í mesta lagi %d stafir)."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -713,23 +715,27 @@ msgid "Group not found."
 msgstr "Fannst ekki."
 
 #. 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 #, fuzzy
 msgid "You are already a member of that group."
 msgstr "Þú ert nú þegar meðlimur í þessum hópi"
 
 #. 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Gat ekki skráð hópmeðlimi."
@@ -742,9 +748,11 @@ msgstr "Þú ert ekki meðlimur í þessum hópi."
 
 #. 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -805,9 +813,12 @@ msgid "Request token already authorized."
 msgstr "Þú ert ekki áskrifandi."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -815,7 +826,7 @@ msgstr "Þú ert ekki áskrifandi."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -838,18 +849,20 @@ msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s"
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Bjóst ekki við innsendingu eyðublaðs."
@@ -898,7 +911,7 @@ msgstr "Aðgangur"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Stuttnefni"
@@ -906,7 +919,7 @@ msgstr "Stuttnefni"
 #. 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Lykilorð"
 
@@ -1015,10 +1028,12 @@ msgstr "Get ekki eytt þessu babli."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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
@@ -1293,7 +1308,7 @@ msgstr "Hópmeðlimir %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"
+msgid "Cannot add someone else's membership."
 msgstr "Gat ekki sett inn nýja áskrift."
 
 #. TRANS: Client error displayed when not using the POST verb.
@@ -1329,30 +1344,51 @@ msgstr "Ekkert svoleiðis babl."
 #. 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "Gat ekki eytt uppáhaldi."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+msgid "No such group."
 msgstr "Enginn þannig hópur."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
 #: actions/atompubshowmembership.php:91
 #, fuzzy
-msgid "Not a member"
+msgid "Not a member."
 msgstr "Allir meðlimir"
 
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "Aðferð í forritsskilum fannst ekki!"
-
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
 msgstr "Gat ekki vistað áskrift."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1528,34 +1564,41 @@ msgstr "Mistókst að uppfæra mynd"
 msgid "Avatar deleted."
 msgstr "Mynd hefur verið uppfærð."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 "Aðeins notandinn getur lesið hans eigin pósthólf."
 
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr ""
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1586,14 +1629,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Athugasemd"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 #, fuzzy
 msgid "Do not block this user"
 msgstr "Opna á þennan notanda"
@@ -1606,7 +1648,7 @@ msgstr "Opna á þennan notanda"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1623,32 +1665,6 @@ msgstr "Loka á þennan notanda"
 msgid "Failed to save block information."
 msgstr "Mistókst að vista upplýsingar um notendalokun"
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Enginn þannig hópur."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1784,7 +1800,8 @@ msgid "Account deleted."
 msgstr "Mynd hefur verið uppfærð."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "Búa til nýjan hóp"
@@ -1806,8 +1823,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Staðfesta"
 
@@ -1882,8 +1900,10 @@ msgid "You must be logged in to delete a group."
 msgstr "Þú verður aða hafa skráð þig inn til að ganga úr hóp."
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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 "Ekkert stuttnefni."
@@ -1936,10 +1956,11 @@ msgid "Delete this group"
 msgstr "Eyða þessu babli"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1978,108 +1999,143 @@ msgstr "Get ekki eytt þessu babli."
 msgid "Delete this notice"
 msgstr "Eyða þessu babli"
 
-#: actions/deleteuser.php:67
+#. 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 "Gat ekki uppfært notanda."
 
+#. 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 "Þú getur ekki eytt stöðu annars notanda."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
+msgid "Delete user"
+msgstr "Eyða"
+
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
 #, fuzzy
 msgid "Delete user"
 msgstr "Eyða"
 
-#: actions/deleteuser.php:136
+#. 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 "Get ekki eytt þessu babli."
+
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
 #, fuzzy
 msgid "Delete this user"
 msgstr "Eyða þessu babli"
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr ""
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
 #, fuzzy
 msgid "Invalid logo URL."
 msgstr "Ótæk stærð."
 
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "Ótæk stærð."
 
-#: actions/designadminpanel.php:344
+#. 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 "Þessi síða er ekki aðgengileg í "
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 #, fuzzy
 msgid "Change logo"
 msgstr "Breyta"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Babl vefsíðunnar"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "Babl vefsíðunnar"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 #, fuzzy
 msgid "Change theme"
 msgstr "Breyta"
 
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
 #, fuzzy
 msgid "Site theme"
 msgstr "Babl vefsíðunnar"
 
+#. TRANS: Title for field label for dropdown to choose site theme.
 #: actions/designadminpanel.php:487
 #, fuzzy
 msgid "Theme for the site."
 msgstr "Skrá þig út af síðunni"
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 #, fuzzy
 msgid "Custom theme"
 msgstr "Babl vefsíðunnar"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr ""
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, fuzzy, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2087,102 +2143,110 @@ msgid ""
 msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr ""
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr ""
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
 #, fuzzy
-msgid "Change colours"
+msgid "Change colors"
 msgstr "Breyta lykilorðinu þínu"
 
+#. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 #, fuzzy
 msgid "Content"
 msgstr "Tengjast"
 
+#. TRANS: Field label for sidebar color selector.
 #. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 #, fuzzy
 msgid "Sidebar"
 msgstr "Leita"
 
+#. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 msgid "Text"
 msgstr "Texti"
 
+#. TRANS: Field label for link color selector.
 #. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 #, fuzzy
 msgid "Links"
 msgstr "Innskráning"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr ""
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr ""
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
 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:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr ""
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Vista"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr ""
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "Þetta babl er ekki í uppáhaldi!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "Bæta við sem uppáhaldsbabli"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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 "Ekkert svoleiðis babl."
 
 #. TRANS: Title for "Edit application" form.
@@ -2926,7 +2990,7 @@ msgid ""
 "%%%%)"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Búa til nýjan hóp"
 
@@ -3336,26 +3400,33 @@ msgstr ""
 "\n"
 "Með bestu kveðju, %2$s\n"
 
-#: actions/joingroup.php:60
+#. 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 "Þú verður að hafa skráð þig inn til að bæta þér í hóp."
 
-#: actions/joingroup.php:141
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
 #, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%s bætti sér í hópinn %s"
 
-#: actions/leavegroup.php:60
+#. 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 "Þú verður aða hafa skráð þig inn til að ganga úr hóp."
 
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "Þú ert ekki meðlimur í þessum hópi."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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 "Staða %1$s á %2$s"
 
@@ -3461,6 +3532,13 @@ msgstr ""
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Vista"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
@@ -3486,11 +3564,11 @@ msgstr "Innskráning"
 msgid "Login to site"
 msgstr "Skrá þig inn á síðuna"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Muna eftir mér"
 
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Sjálfvirk innskráning í framtíðinni. Ekki nota þetta á tölvu sem aðrir deila "
@@ -3895,7 +3973,8 @@ msgstr "Breyta lykilorði"
 msgid "Change your password."
 msgstr "Breyta lykilorðinu þínu."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Lykilorðabreyting"
 
@@ -3903,7 +3982,8 @@ msgstr "Lykilorðabreyting"
 msgid "Old password"
 msgstr "Eldra lykilorð"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nýtt lykilorð"
 
@@ -3911,7 +3991,7 @@ msgstr "Nýtt lykilorð"
 msgid "6 or more characters"
 msgstr "6 eða fleiri tákn"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "Sama og lykilorðið hér fyrir ofan"
 
@@ -3935,11 +4015,12 @@ msgstr "Rangt eldra lykilorð"
 msgid "Error saving user; invalid."
 msgstr "Villa kom upp í vistun notanda: ótækt."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "Get ekki vistað nýja lykilorðið."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Lykilorð vistað."
 
@@ -4284,23 +4365,24 @@ msgid "Profile information"
 msgstr "Upplýsingar á persónulegri síðu"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 msgid "Full name"
 msgstr "Fullt nafn"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "Heimasíða"
 
@@ -4315,7 +4397,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:472
+#: 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"
@@ -4323,28 +4405,28 @@ msgstr[0] "Lýstu þér og áhugamálum þínum í 140 táknum"
 msgstr[1] "Lýstu þér og áhugamálum þínum í 140 táknum"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: actions/profilesettings.php:135 actions/register.php:476
 #, fuzzy
 msgid "Describe yourself and your interests"
 msgstr "Lýstu þér og þínum "
 
 #. TRANS: Text area label in form for profile settings where users can provide.
 #. TRANS: their biography.
-#: actions/profilesettings.php:139 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
 msgid "Bio"
 msgstr "Lýsing"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "Staðsetning"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Staðsetning þín, eins og \"borg, sýsla, land\""
 
@@ -4399,7 +4481,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:257 actions/register.php:229
+#: 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)."
@@ -4407,49 +4489,50 @@ msgstr[0] "Staðsetning er of löng (í mesta lagi %d stafir)."
 msgstr[1] "Staðsetning er of löng (í mesta lagi %d stafir)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Tímabelti ekki valið."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
 #, fuzzy
 msgid "Language is too long (maximum 50 characters)."
 msgstr "Tungumál er of langt (í mesta lagi 50 stafir)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Ógilt merki: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, fuzzy
 msgid "Could not update user for autosubscribe."
 msgstr "Gat ekki uppfært notanda í sjálfvirka áskrift."
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
-#: actions/profilesettings.php:404
+#: actions/profilesettings.php:405
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Gat ekki vistað merki."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 msgid "Could not save tags."
 msgstr "Gat ekki vistað merki."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
 msgid "Settings saved."
 msgstr "Stillingar vistaðar."
 
+#. 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Búa til nýjan hóp"
@@ -4560,37 +4643,45 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "Merkjaský"
 
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Þú ert nú þegar innskráð(ur)!"
 
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Enginn svoleiðis staðfestingarlykill."
 
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Þetta er ekki staðfestingarlykill."
 
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Lykill fyrir endurheimtingu óþekkts notanda."
 
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Villa kom upp varðandi staðfestingarlykilinn."
 
-#: actions/recoverpassword.php:97
+#. 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 ""
 "Þessi staðfestingarlykill er of gamall. Vinsamlegast byrjaðu aftur upp á "
 "nýtt."
 
-#: actions/recoverpassword.php:111
+#. 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 "Gat ekki uppfært notanda með staðfestu tölvupóstfangi."
 
-#: actions/recoverpassword.php:152
+#. 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 "
@@ -4599,69 +4690,102 @@ msgstr ""
 "Leiðbeiningar um það hvernig þú getur endurheimt lykilorðið þitt hafa verið "
 "sendar á tölvupóstfangið sem er tengt notendaaðganginum þínum."
 
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+msgid "You have been identified. Enter a new password below."
 msgstr ""
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 #, fuzzy
 msgid "Password recovery"
 msgstr "Beiðni um að endurheimta lykilorð hefur verið send inn"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 #, fuzzy
 msgid "Nickname or email address"
 msgstr "Sláðu inn stuttnefni eða tölvupóstfang."
 
-#: actions/recoverpassword.php:193
+#. 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 "Stuttnefnið þitt á þessum vefþjóni eða skráða tölvupóstfangið."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Endurheimta"
 
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Recover"
+msgstr "Endurheimta"
+
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
 msgid "Reset password"
 msgstr "Endurstilla lykilorð"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Endurheimta lykilorð"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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 "Beiðni um að endurheimta lykilorð hefur verið send inn"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Óþekkt aðgerð"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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 eða fleiri tákn og ekki gleyma því!"
 
-#: actions/recoverpassword.php:243
+#. 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 og lykilorðið hér fyrir ofan"
+
+#. 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
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Endurstilla"
 
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Sláðu inn stuttnefni eða tölvupóstfang."
 
-#: actions/recoverpassword.php:282
+#. 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 "Enginn notandi með þetta tölvupóstfang eða notendanafn"
 
-#: actions/recoverpassword.php:299
+#. 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 "Ekkert tölvupóstfang á skrá fyrir þennan notanda."
 
-#: actions/recoverpassword.php:313
+#. 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 "Villa kom upp í vistun netfangsstaðfestingar."
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4669,24 +4793,35 @@ msgstr ""
 "Leiðbeiningar um það hvernig þú getur endurheimt lykilorðið þitt hafa verið "
 "sendar á tölvupóstfangið sem er tengt notendaaðganginum þínum."
 
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Bjóst ekki við endurstillingu lykilorðs."
 
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "Lykilorð verður að vera 6 tákn eða fleiri."
 
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Lykilorð og staðfesting passa ekki saman."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+msgid "Cannot save new password."
+msgstr "Get ekki vistað nýja lykilorðið."
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
 msgid "Error setting user."
 msgstr "Villa kom upp í stillingu notanda."
 
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "Tókst að vista nýtt lykilorð. Þú ert núna innskráð(ur)"
 
@@ -4703,7 +4838,7 @@ msgstr "Villa kom upp varðandi staðfestingarlykilinn."
 msgid "Registration successful"
 msgstr "Nýskráning tókst"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Nýskrá"
 
@@ -4729,70 +4864,62 @@ msgid ""
 "link up to friends and colleagues. "
 msgstr ""
 
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 lágstafir eða tölustafir, engin greinarmerki eða bil. Nauðsynlegt."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 eða fleiri tákn. Nauðsynlegt"
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 eða fleiri tákn"
 
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Tölvupóstur"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "Aðeins notað fyrir uppfærslur, tilkynningar og endurheimtingu lykilorða."
 
-#: actions/register.php:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Lengra nafn, ákjósalegast að það sé \"rétta\" nafnið þitt"
 
-#: actions/register.php:463
+#: actions/register.php:462
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 "Veffang heimasíðunnar þinnar, bloggsins þíns eða persónulegrar síðu á öðru "
 "vefsvæði"
 
-#: actions/register.php:524
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:534
+#: 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:538
+#: 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:541
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: 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:589
+#: actions/register.php:588
 #, fuzzy, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4825,7 +4952,7 @@ msgstr ""
 "\n"
 "Takk fyrir að skrá þig og við vonum að þú njótir þjónustunnar."
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5148,7 +5275,7 @@ msgstr "Uppröðun"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "Lýsing"
 
@@ -5171,8 +5298,9 @@ msgstr ""
 msgid "Reset key & secret"
 msgstr ""
 
+#. TRANS: Title of form for deleting a user.
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Eyða"
 
@@ -5291,7 +5419,7 @@ msgid "Note"
 msgstr "Athugasemd"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr ""
 
@@ -7871,26 +7999,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Enginn staðfestingarlykill."
 
 #. 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:153
+#: lib/common.php:158
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Boðskort sent á eftirfarandi aðila:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Skrá þig inn á síðuna"
@@ -7961,12 +8089,16 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr ""
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
 #, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Endurstilla"
+msgid "Change colours"
+msgstr "Breyta lykilorðinu þínu"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+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".
@@ -8052,34 +8184,30 @@ msgstr "Áfram"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "Vefslóð vefsíðu hópsins eða umfjöllunarefnisins"
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 #, fuzzy
 msgid "Describe the group or topic"
 msgstr "Lýstu hópnum eða umfjöllunarefninu með 140 táknum"
 
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
 #, 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"
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
 msgstr[0] "Lýstu hópnum eða umfjöllunarefninu með 140 táknum"
 msgstr[1] "Lýstu hópnum eða umfjöllunarefninu með 140 táknum"
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "Staðsetning hópsins, ef einhver, eins og \"Borg, landshluti, land\""
 
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9205,14 +9333,9 @@ msgstr[1] ""
 msgid "about a year ago"
 msgstr "fyrir um einu ári síðan"
 
-#: lib/webcolor.php:80
-#, fuzzy, php-format
-msgid "%s is not a valid color!"
-msgstr "Heimasíða er ekki gild vefslóð."
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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 "Heimasíða er ekki gild vefslóð."
@@ -9251,27 +9374,30 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "Ekkert svoleiðis babl."
+#~ msgid "No such group"
+#~ msgstr "Enginn þannig hópur."
 
 #, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Hópar sem %s er meðlimur í"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
 #~ msgstr "Aðferð í forritsskilum fannst ekki!"
 
+#~ msgid "Reset"
+#~ msgstr "Endurstilla"
+
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil. Nauðsynlegt."
+
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 eða fleiri tákn. Nauðsynlegt"
+
+#~ msgid "Same as password above. Required."
+#~ msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil"
+
 #, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Fólk sem eru áskrifendur að %s"
-
-#~ msgid "Couldn't update user."
-#~ msgstr "Gat ekki uppfært notanda."
-
-#~ msgid "Couldn't save profile."
-#~ msgstr "Gat ekki vistað persónulega síðu."
-
-#~ msgid "Couldn't save tags."
-#~ msgstr "Gat ekki vistað merki."
+#~ msgid "%s is not a valid color!"
+#~ msgstr "Heimasíða er ekki gild vefslóð."
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 223452403d..510b1d11e7 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-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:35+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57: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 (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: it\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -78,6 +78,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -89,13 +90,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salva"
@@ -328,7 +329,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Impossibile aggiornare l'utente."
@@ -352,7 +353,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "Impossibile salvare il profilo."
 
@@ -362,7 +363,7 @@ msgstr "Impossibile salvare il profilo."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, fuzzy, php-format
@@ -542,7 +543,8 @@ msgid "That status is not a favorite."
 msgstr "Questo messaggio non è un preferito."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Impossibile eliminare un preferito."
 
@@ -589,7 +591,7 @@ msgstr "Impossibile trovare l'utente destinazione."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Soprannome già in uso. Prova con un altro."
@@ -599,7 +601,7 @@ msgstr "Soprannome già in uso. Prova con un altro."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Non è un soprannome valido."
@@ -611,7 +613,7 @@ msgstr "Non è un soprannome valido."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "L'indirizzo della pagina web non è valido."
@@ -621,7 +623,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -649,7 +651,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -707,22 +709,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s."
@@ -734,9 +740,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -796,9 +804,12 @@ msgid "Request token already authorized."
 msgstr "Autorizzazione non presente."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -806,7 +817,7 @@ msgstr "Autorizzazione non presente."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -829,18 +840,20 @@ msgstr "Errore nel database nell'inserire l'applicazione utente OAuth."
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: 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."
@@ -895,7 +908,7 @@ msgstr "Account"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Soprannome"
@@ -903,7 +916,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Password"
 
@@ -1011,10 +1024,12 @@ msgstr "Hai già ripetuto quel messaggio."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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
@@ -1289,7 +1304,7 @@ msgstr "Membri del gruppo %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"
+msgid "Cannot add someone else's membership."
 msgstr "Impossibile inserire un nuovo abbonamento."
 
 #. TRANS: Client error displayed when not using the POST verb.
@@ -1325,30 +1340,51 @@ 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "Impossibile eliminare un preferito."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "Nessun gruppo"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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"
+msgid "Not a member."
 msgstr "Tutti i membri"
 
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "Metodo delle API non trovato."
-
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+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.
@@ -1521,35 +1557,42 @@ msgstr "Aggiornamento dell'immagine non riuscito."
 msgid "Avatar deleted."
 msgstr "Immagine eliminata."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Sfondo"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1583,14 +1626,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "No"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "Non bloccare questo utente"
 
@@ -1602,7 +1644,7 @@ msgstr "Non bloccare questo utente"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Sì"
@@ -1618,32 +1660,6 @@ msgstr "Blocca questo utente"
 msgid "Failed to save block information."
 msgstr "Salvataggio delle informazioni per il blocco non riuscito."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Nessuna gruppo."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1775,7 +1791,8 @@ msgid "Account deleted."
 msgstr "Immagine eliminata."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "Crea un account"
@@ -1797,8 +1814,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Conferma"
 
@@ -1872,8 +1890,10 @@ msgid "You must be logged in to delete a group."
 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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."
 
@@ -1928,10 +1948,11 @@ msgid "Delete this group"
 msgstr "Elimina questo utente"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1971,19 +1992,30 @@ msgstr "Non eliminare il messaggio"
 msgid "Delete this notice"
 msgstr "Elimina questo messaggio"
 
-#: actions/deleteuser.php:67
+#. 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."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Elimina utente"
 
-#: actions/deleteuser.php:136
+#. 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."
@@ -1991,80 +2023,104 @@ msgstr ""
 "Vuoi eliminare questo utente? Questa azione eliminerà tutti i dati "
 "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:163 lib/deleteuserform.php:77
+#. 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.
 #. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "Aspetto"
 
-#: actions/designadminpanel.php:74
+#. 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"
 
-#: actions/designadminpanel.php:335
+#. 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."
 
-#: actions/designadminpanel.php:340
+#. 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."
 
-#: actions/designadminpanel.php:344
+#. 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."
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Modifica logo"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Logo del sito"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "Logo del sito"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Modifica tema"
 
-#: actions/designadminpanel.php:486
+#. 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."
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Tema personalizzato"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Sfondo"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2074,98 +2130,108 @@ msgstr ""
 "file è di %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "On"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "Affianca l'immagine di sfondo"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. 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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "Collegamenti"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Avanzate"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "CSS personalizzato"
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "Reimposta i valori predefiniti"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Salva"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "Salva aspetto"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "Questo messaggio non è un preferito!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "Aggiungi ai preferiti"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2894,7 +2960,7 @@ msgstr ""
 "nomegruppo\". Non trovi un gruppo che ti piace? Prova a [cercarne uno](%%%%"
 "action.groupsearch%%%%) o [crea il tuo!](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Crea un nuovo gruppo"
 
@@ -3304,26 +3370,33 @@ msgstr ""
 "\n"
 "Cordiali saluti, %2$s\n"
 
-#: actions/joingroup.php:60
+#. 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."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s fa ora parte del gruppo %2$s"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "Non fai parte di quel gruppo."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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"
 
@@ -3430,6 +3503,13 @@ msgstr "Indirizzo immagine licenza"
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Salva"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Salva impostazioni licenza"
@@ -3454,11 +3534,11 @@ msgstr "Accedi"
 msgid "Login to site"
 msgstr "Accedi al sito"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Ricordami"
 
-#: actions/login.php:259 actions/register.php:493
+#: 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!"
 
@@ -3849,7 +3929,8 @@ msgstr "Modifica password"
 msgid "Change your password."
 msgstr "Modifica la tua password."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Modifica password"
 
@@ -3857,7 +3938,8 @@ msgstr "Modifica password"
 msgid "Old password"
 msgstr "Vecchia password"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nuova password"
 
@@ -3865,7 +3947,7 @@ msgstr "Nuova password"
 msgid "6 or more characters"
 msgstr "6 o più caratteri"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "Stessa password di sopra"
 
@@ -3889,11 +3971,12 @@ msgstr "Vecchia password non corretta"
 msgid "Error saving user; invalid."
 msgstr "Errore nel salvare l'utente; non valido."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "Impossibile salvare la nuova password."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Password salvata."
 
@@ -4238,7 +4321,8 @@ msgid "Profile information"
 msgstr "Informazioni sul profilo"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4246,16 +4330,16 @@ msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 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:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "Pagina web"
 
@@ -4268,7 +4352,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:472
+#: 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"
@@ -4276,27 +4360,27 @@ 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:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "Ubicazione"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: 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\""
 
@@ -4350,7 +4434,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:257 actions/register.php:229
+#: 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)."
@@ -4358,49 +4442,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:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Fuso orario non selezionato"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
 #, 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, 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:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Crea un account"
@@ -4521,35 +4606,43 @@ msgstr "Perché non [crei un accout](%%action.register%%) e ne scrivi uno tu!"
 msgid "Tag cloud"
 msgstr "Insieme delle etichette"
 
-#: actions/recoverpassword.php:36
+#. 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!"
 
-#: actions/recoverpassword.php:62
+#. 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."
 
-#: actions/recoverpassword.php:66
+#. 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."
 
-#: actions/recoverpassword.php:73
+#. 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."
 
-#: actions/recoverpassword.php:86
+#. 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."
 
-#: actions/recoverpassword.php:97
+#. 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."
 
-#: actions/recoverpassword.php:111
+#. 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."
 
-#: actions/recoverpassword.php:152
+#. 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."
@@ -4557,68 +4650,102 @@ 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:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
 msgstr "Identificazione avvenuta. Inserisci la nuova password. "
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Recupero password"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Soprannome o indirizzo email"
 
-#: actions/recoverpassword.php:193
+#. 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."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Recupera"
 
-#: actions/recoverpassword.php:208
+#. 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"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Recupera la password"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Azione sconosciuta"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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!"
 
-#: actions/recoverpassword.php:243
+#. 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
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Reimposta"
 
-#: actions/recoverpassword.php:252
+#. 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."
 
-#: actions/recoverpassword.php:282
+#. 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."
 
-#: actions/recoverpassword.php:299
+#. 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."
 
-#: actions/recoverpassword.php:313
+#. 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."
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4626,24 +4753,35 @@ msgstr ""
 "Le istruzioni per recuperare la tua password sono state inviate "
 "all'indirizzo email registrato nel tuo account."
 
-#: actions/recoverpassword.php:357
+#. 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."
 
-#: actions/recoverpassword.php:365
+#. 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."
 
-#: actions/recoverpassword.php:369
+#. 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."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "Errore nell'impostare l'utente."
 
-#: actions/recoverpassword.php:395
+#. 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."
 
@@ -4659,7 +4797,7 @@ msgstr "Codice di invito non valido."
 msgid "Registration successful"
 msgstr "Registrazione riuscita"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Registrati"
 
@@ -4688,61 +4826,53 @@ msgstr ""
 "successivamente inviare messaggi e metterti in contatto con i tuoi amici e "
 "colleghi. "
 
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 lettere minuscole o numeri, niente punteggiatura o spazi; richiesto"
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 o più caratteri; richiesta"
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Stessa password di sopra; richiesta"
+#: 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:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Email"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Usata solo per aggiornamenti, annunci e recupero password"
 
-#: actions/register.php:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Nome completo, preferibilmente il tuo \"vero\" nome"
 
-#: actions/register.php:463
+#: actions/register.php:462
 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:524
+#: 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:534
+#: 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:538
+#: 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:541
+#: 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:546
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4752,7 +4882,7 @@ msgstr ""
 "dati personali: password, indirizzo email, indirizzo messaggistica "
 "istantanea e numero di telefono."
 
-#: actions/register.php:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4786,7 +4916,7 @@ msgstr ""
 "Grazie per la tua iscrizione e speriamo tu possa divertiti usando questo "
 "servizio."
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5101,7 +5231,7 @@ msgstr "Organizzazione"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "Descrizione"
 
@@ -5124,8 +5254,9 @@ msgstr "Azioni applicazione"
 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:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Elimina"
 
@@ -5251,7 +5382,7 @@ msgid "Note"
 msgstr "Nota"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "Alias"
 
@@ -7857,20 +7988,20 @@ msgstr ""
 "tracking - non ancora implementato\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 #, 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:153
+#: lib/common.php:158
 #, 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:156
+#: lib/common.php:161
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 "Potrebbe essere necessario lanciare il programma d'installazione per "
@@ -7878,7 +8009,7 @@ 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "Vai al programma d'installazione."
 
@@ -7950,12 +8081,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "Off"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Reimposta"
+#. 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: 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".
@@ -8039,34 +8173,29 @@ msgstr "Vai"
 msgid "Grant this user the \"%s\" role"
 msgstr "Concedi a questo utente il ruolo \"%s\""
 
-#: lib/groupeditform.php:154
-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:163
+#: lib/groupeditform.php:155
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL della pagina web, blog del gruppo o l'argomento"
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "Descrivi il gruppo o l'argomento"
 
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
 #, 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"
+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:182
+#: lib/groupeditform.php:174
 #, 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:190
+#: lib/groupeditform.php:182
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9278,14 +9407,9 @@ msgstr[1] "circa %d mesi fa"
 msgid "about a year ago"
 msgstr "circa un anno fa"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s non è un colore valido."
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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."
@@ -9322,27 +9446,30 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "Nessun profilo."
+#~ msgid "No such group"
+#~ msgstr "Nessun gruppo"
 
 #, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Gruppi di cui %s fa parte"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
 #~ msgstr "Metodo delle API non trovato."
 
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Persone abbonate a %s"
+#~ msgid "Reset"
+#~ msgstr "Reimposta"
 
-#~ msgid "Couldn't update user."
-#~ msgstr "Impossibile aggiornare l'utente."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 lettere minuscole o numeri, niente punteggiatura o spazi; richiesto"
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "Impossibile salvare il profilo."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 o più caratteri; richiesta"
 
-#~ msgid "Couldn't save tags."
-#~ msgstr "Impossibile salvare le etichette."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Stessa password di sopra; richiesta"
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr ""
+#~ "1-64 lettere minuscole o numeri, senza spazi o simboli di punteggiatura"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s non è un colore valido."
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index ef1f2708cc..4e13fa0e9d 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-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:36+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:16+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 (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -80,6 +80,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -91,13 +92,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "保存"
@@ -331,7 +332,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "ユーザを更新できませんでした。"
@@ -355,7 +356,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "プロフィールを保存できませんでした。"
 
@@ -365,7 +366,7 @@ msgstr "プロフィールを保存できませんでした。"
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, fuzzy, php-format
@@ -540,7 +541,8 @@ msgid "That status is not a favorite."
 msgstr "そのステータスはお気に入りではありません。"
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "お気に入りを取り消すことができません。"
 
@@ -588,7 +590,7 @@ msgstr "ターゲットユーザーを見つけられません。"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "そのニックネームは既に使用されています。他のものを試してみて下さい。"
@@ -598,7 +600,7 @@ msgstr "そのニックネームは既に使用されています。他のもの
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "有効なニックネームではありません。"
@@ -610,7 +612,7 @@ msgstr "有効なニックネームではありません。"
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "ホームページのURLが不適切です。"
@@ -620,7 +622,7 @@ msgstr "ホームページのURLが不適切です。"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -647,7 +649,7 @@ msgstr[0] "記述が長すぎます。（最長%d字）"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -704,22 +706,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "ユーザ %1$s はグループ %2$s に参加できません。"
@@ -731,9 +737,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -794,9 +802,12 @@ msgid "Request token already authorized."
 msgstr "認証されていません。"
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -804,7 +815,7 @@ msgstr "認証されていません。"
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -826,18 +837,20 @@ msgstr "OAuth アプリケーションユーザの追加時ＤＢエラー。"
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "予期せぬフォーム送信です。"
@@ -886,7 +899,7 @@ msgstr "アカウント"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "ニックネーム"
@@ -894,7 +907,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "パスワード"
 
@@ -1003,10 +1016,12 @@ msgstr "すでにつぶやきを繰り返しています。"
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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
@@ -1279,7 +1294,7 @@ 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"
+msgid "Cannot add someone else's membership."
 msgstr "サブスクリプションを追加できません"
 
 #. TRANS: Client error displayed when not using the POST verb.
@@ -1315,30 +1330,51 @@ 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "お気に入りを取り消すことができません。"
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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"
+msgid "Not a member."
 msgstr "全てのメンバー"
 
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "API メソッドが見つかりません。"
-
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
 msgstr "フォローを保存できません。"
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1511,35 +1547,42 @@ msgstr "アバターの更新に失敗しました。"
 msgid "Avatar deleted."
 msgstr "アバターが削除されました。"
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "バックグラウンド"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1574,14 +1617,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "ノート"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "このユーザをアンブロックする"
 
@@ -1593,7 +1635,7 @@ msgstr "このユーザをアンブロックする"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "はい"
@@ -1609,32 +1651,6 @@ msgstr "このユーザをブロックする"
 msgid "Failed to save block information."
 msgstr "ブロック情報の保存に失敗しました。"
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "そのようなグループはありません。"
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1766,7 +1782,8 @@ msgid "Account deleted."
 msgstr "アバターが削除されました。"
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "新しいグループを作成"
@@ -1788,8 +1805,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "パスワード確認"
 
@@ -1864,8 +1882,10 @@ 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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 "ニックネームがありません。"
@@ -1921,10 +1941,11 @@ msgid "Delete this group"
 msgstr "このユーザを削除"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1964,19 +1985,30 @@ msgstr "このつぶやきを削除できません。"
 msgid "Delete this notice"
 msgstr "このつぶやきを削除"
 
-#: actions/deleteuser.php:67
+#. 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 "ローカルユーザのみ削除できます。"
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "ユーザ削除"
 
-#: actions/deleteuser.php:136
+#. 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."
@@ -1984,81 +2016,105 @@ 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:163 lib/deleteuserform.php:77
+#. 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.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "デザイン"
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "不正なロゴ URL"
 
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "不正なロゴ URL"
 
-#: actions/designadminpanel.php:344
+#. 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 "ＩＭ が利用不可。"
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "ロゴの変更"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "サイトロゴ"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "サイトロゴ"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "テーマ変更"
 
-#: actions/designadminpanel.php:486
+#. 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 "サイトのテーマ"
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 #, fuzzy
 msgid "Custom theme"
 msgstr "サイトテーマ"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "バックグラウンド"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2068,98 +2124,108 @@ msgstr ""
 "イズは %1$s。"
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "オン"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "タイルバックグラウンドイメージ"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. 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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "リンク"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr ""
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr ""
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
 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:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "デフォルトへリセットする"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "保存"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "デザインの保存"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "このつぶやきはお気に入りではありません!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "お気に入りに加える"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2895,7 +2961,7 @@ msgstr ""
 "うか[探してみる](%%%%action.groupsearch%%%%)か、あなた自身で[始めてください!]"
 "(%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "新しいグループを作成"
 
@@ -3300,26 +3366,33 @@ msgstr ""
 "\n"
 "%2$s\n"
 
-#: actions/joingroup.php:60
+#. 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 "グループに入るためにはログインしなければなりません。"
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s はグループ %2$s に参加しました"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "あなたはそのグループのメンバーではありません。"
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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 に残りました。"
 
@@ -3424,6 +3497,13 @@ msgstr ""
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "保存"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
@@ -3448,11 +3528,11 @@ msgstr "ログイン"
 msgid "Login to site"
 msgstr "サイトへログイン"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "ログイン状態を保持"
 
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "以降は自動的にログインする。共用コンピューターでは避けましょう！"
 
@@ -3844,7 +3924,8 @@ msgstr "パスワードの変更"
 msgid "Change your password."
 msgstr "パスワードを変更します。"
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "パスワード変更"
 
@@ -3852,7 +3933,8 @@ msgstr "パスワード変更"
 msgid "Old password"
 msgstr "古いパスワード"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "新しいパスワード"
 
@@ -3860,7 +3942,7 @@ msgstr "新しいパスワード"
 msgid "6 or more characters"
 msgstr "6文字以上"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "上と同じパスワード"
 
@@ -3884,11 +3966,12 @@ msgstr "古いパスワードが間違っています。"
 msgid "Error saving user; invalid."
 msgstr "ユーザ保存エラー; 不正なユーザ"
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "新しいパスワードを保存できません。"
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "パスワードが保存されました。"
 
@@ -4232,23 +4315,24 @@ msgid "Profile information"
 msgstr "プロファイル情報"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 #, 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 msgid "Full name"
 msgstr "フルネーム"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "ホームページ"
 
@@ -4261,34 +4345,34 @@ 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:472
+#: 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:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "場所"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "自分のいる場所。例：「都市, 都道府県 (または地域), 国」"
 
@@ -4341,56 +4425,57 @@ 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:257 actions/register.php:229
+#: 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)."
 msgstr[0] "自己紹介が長すぎます (最長%d文字)。"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "タイムゾーンが選ばれていません。"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
 #, 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "場所情報を保存できません。"
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "新しいグループを作成"
@@ -4516,35 +4601,43 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "タグクラウド"
 
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "既にログイン済みです。"
 
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "そのような回復コードはありません。"
 
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "回復コードではありません。"
 
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "不明なユーザのための回復コード。"
 
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "確認コードにエラーがあります。"
 
-#: actions/recoverpassword.php:97
+#. 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 "確認コードが古すぎます。もう一度やり直してください。"
 
-#: actions/recoverpassword.php:111
+#. 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 "確認されたメールアドレスでユーザを更新できません。"
 
-#: actions/recoverpassword.php:152
+#. 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."
@@ -4552,90 +4645,135 @@ msgstr ""
 "あなたのパスワードを忘れるか紛失したなら、あなたはアカウントに格納したメール"
 "アドレスに新しいものを送らせることができます。"
 
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
 msgstr "あなたは特定されました。 以下の新しいパスワードを入力してください。 "
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "パスワード回復"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "ニックネームまたはメールアドレス"
 
-#: actions/recoverpassword.php:193
+#. 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 "このサーバでのニックネーム、または登録したメールアドレス。"
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "回復"
 
-#: actions/recoverpassword.php:208
+#. 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 "パスワードをリセット"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "パスワードを回復"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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 "パスワード回復がリクエストされました"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "不明なアクション"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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文字以上。忘れないでください！"
 
-#: actions/recoverpassword.php:243
+#. 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
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "リセット"
 
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "ニックネームかメールアドレスを入力してください。"
 
-#: actions/recoverpassword.php:282
+#. 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 "そのメールアドレスかユーザ名をもっているユーザがありません。"
 
-#: actions/recoverpassword.php:299
+#. 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 "そのユーザにはメールアドレスの登録がありません。"
 
-#: actions/recoverpassword.php:313
+#. 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 "アドレス確認保存エラー"
 
-#: actions/recoverpassword.php:338
+#. 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 "登録されたメールアドレスにパスワードの回復方法をお送りしました。"
 
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "予期せぬパスワードのリセットです。"
 
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "パスワードは6字以上でなければいけません。"
 
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "パスワードと確認が一致しません。"
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "ユーザ設定エラー"
 
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "新しいパスワードの保存に成功しました。ログインしています。"
 
@@ -4651,7 +4789,7 @@ msgstr "すみません、不正な招待コード。"
 msgid "Registration successful"
 msgstr "登録成功"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "登録"
 
@@ -4680,67 +4818,59 @@ msgstr ""
 "このフォームで新しいアカウントを作成できます。 次につぶやきを投稿して、友人や"
 "同僚にリンクできます。 "
 
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く。必須です。"
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6文字以上。必須です。"
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "上のパスワードと同じです。 必須。"
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6文字以上"
 
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "メール"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "更新、アナウンス、パスワードリカバリーでのみ使用されます。"
 
-#: actions/register.php:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "長い名前"
 
-#: actions/register.php:463
+#: actions/register.php:462
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"
 
-#: actions/register.php:524
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:534
+#: 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:538
+#: 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:541
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: 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:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4773,7 +4903,7 @@ msgstr ""
 "参加してくださってありがとうございます。私たちはあなたがこのサービスを楽しん"
 "で使ってくれることを願っています。"
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5093,7 +5223,7 @@ msgstr "組織"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "概要"
 
@@ -5116,8 +5246,9 @@ msgstr "アプリケーションアクション"
 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:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "削除"
 
@@ -5245,7 +5376,7 @@ msgid "Note"
 msgstr "ノート"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "別名"
 
@@ -7812,20 +7943,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 #, 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:153
+#: lib/common.php:158
 #, 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:156
+#: lib/common.php:161
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 "あなたは、これを修理するためにインストーラを動かしたがっているかもしれませ"
@@ -7833,7 +7964,7 @@ 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "インストーラへ。"
 
@@ -7905,12 +8036,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "オフ"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-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: 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".
@@ -7994,32 +8128,28 @@ msgstr "移動"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "グループやトピックのホームページやブログの URL"
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "グループやトピックを記述"
 
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
 #, 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"
+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:182
+#: lib/groupeditform.php:174
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "グループの場所, 例えば \"都市, 都道府県 (または 地域), 国\""
 
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9192,14 +9322,9 @@ msgstr[0] ""
 msgid "about a year ago"
 msgstr "約 1 年前"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%sは有効な色ではありません!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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進数を使ってください。"
@@ -9235,27 +9360,30 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "そのようなファイルはありません。"
+#~ msgid "No such group"
+#~ msgstr "そのようなグループはありません。"
 
 #, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "グループ %s はメンバー"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
 #~ msgstr "API メソッドが見つかりません。"
 
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "人々は %s をフォローしました。"
+#~ msgid "Reset"
+#~ msgstr "リセット"
 
-#~ msgid "Couldn't update user."
-#~ msgstr "ユーザを更新できません"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く。必須で"
+#~ "す。"
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "プロファイルを保存できません"
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6文字以上。必須です。"
 
-#~ msgid "Couldn't save tags."
-#~ msgstr "タグを保存できません。"
+#~ msgid "Same as password above. Required."
+#~ msgstr "上のパスワードと同じです。 必須。"
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%sは有効な色ではありません!"
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
index d5dcbd0f7a..efccf498bc 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-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:37+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57: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 (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ka\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -74,6 +74,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -85,13 +86,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "შეინახე"
@@ -324,7 +325,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "მომხმარებლის განახლება ვერ მოხერხდა."
@@ -348,7 +349,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "პროფილის შენახვა ვერ მოხერხდა."
 
@@ -358,7 +359,7 @@ msgstr "პროფილის შენახვა ვერ მოხერ
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, fuzzy, php-format
@@ -532,7 +533,8 @@ msgid "That status is not a favorite."
 msgstr "ეს სტატუსი არა არის ფავორიტი."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "ფავორიტის წაშლა ვერ მოხერხდა."
 
@@ -579,7 +581,7 @@ msgstr "სასურველი მომხმარებელი ვე
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "მეტსახელი უკვე გამოყენებულია. სცადე სხვა."
@@ -589,7 +591,7 @@ msgstr "მეტსახელი უკვე გამოყენებუ
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "მეტსახელი არასწორია."
@@ -601,7 +603,7 @@ msgstr "მეტსახელი არასწორია."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "სასტარტო გვერდი არასწორი URL-ია."
@@ -611,7 +613,7 @@ msgstr "სასტარტო გვერდი არასწორი URL
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -638,7 +640,7 @@ msgstr[0] "აღწერა ძალიან გრძელია (არ
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -695,22 +697,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "ვერ მოხერხდა მომხმარებელ %1$s-სთან ერთად ჯგუფ %2$s-ში გაერთიანება."
@@ -722,9 +728,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -783,9 +791,12 @@ msgid "Request token already authorized."
 msgstr "თქვენ არ ხართ ავტორიზირებული."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -793,7 +804,7 @@ msgstr "თქვენ არ ხართ ავტორიზირებუ
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -815,18 +826,20 @@ msgstr "ბაზამ დაუშვა შეცდომა OAuth აპლ
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr ""
@@ -875,7 +888,7 @@ msgstr "ანგარიში"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "მეტსახელი"
@@ -883,7 +896,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "პაროლი"
 
@@ -991,10 +1004,12 @@ msgstr "ეს შეტყობინება უკვე გამეორ
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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
@@ -1266,7 +1281,7 @@ 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"
+msgid "Cannot add someone else's membership."
 msgstr "ახალი გამოწერის ჩასმა ვერ მოხერხდა."
 
 #. TRANS: Client error displayed when not using the POST verb.
@@ -1301,30 +1316,51 @@ 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "ფავორიტის წაშლა ვერ მოხერხდა."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-#, fuzzy
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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 using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "HTTP method not supported"
-msgstr "API მეთოდი ვერ მოიძებნა."
+msgid "Not a member."
+msgstr "ტელეფონის ნომერი არ არის."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
 msgstr "საკუთარი გამოწერის წაშლა ვერ ხერხდება."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1497,35 +1533,42 @@ msgstr "ავატარის განახლება ვერ მოხ
 msgid "Avatar deleted."
 msgstr "ავატარი წაიშალა."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "ფონი"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1556,14 +1599,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "არა"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "არ დაბლოკო ეს მომხმარებელი"
 
@@ -1575,7 +1617,7 @@ msgstr "არ დაბლოკო ეს მომხმარებელი
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "დიახ"
@@ -1591,32 +1633,6 @@ msgstr "დაბლოკე ეს მომხმარებელი"
 msgid "Failed to save block information."
 msgstr "დაბლოკვის შესახებ ინფორმაციის შენახვა ვერ მოხერხდა."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "ასეთი ჯგუფი ვერ მოიძებნა."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1748,7 +1764,8 @@ msgid "Account deleted."
 msgstr "ავატარი წაიშალა."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "გახსენი ანგარიში"
@@ -1770,8 +1787,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "ვადასტურებ"
 
@@ -1845,8 +1863,10 @@ 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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 უცნობია."
 
@@ -1901,10 +1921,11 @@ msgid "Delete this group"
 msgstr "ამ მომხმარებლის წაშლა"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1942,19 +1963,30 @@ msgstr "არ წაშალო ეს შეტყობინება"
 msgid "Delete this notice"
 msgstr "შეტყობინების წაშლა"
 
-#: actions/deleteuser.php:67
+#. 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 "თქვენ მხოლოდ ადგილობრივი მომხმარებლების წაშლა გძალუძთ."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "მომხმარებლის წაშლა"
 
-#: actions/deleteuser.php:136
+#. 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."
@@ -1962,81 +1994,105 @@ 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:163 lib/deleteuserform.php:77
+#. 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.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "ამ მომხმარებლის წაშლა"
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "ლოგოს არასწორი URL-ი"
 
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "ლოგოს არასწორი URL-ი"
 
-#: actions/designadminpanel.php:344
+#. 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."
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "შეცვალე ლოგო"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "საიტის ლოგო"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "საიტის ლოგო"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "შეცვალე იერსახე"
 
-#: actions/designadminpanel.php:486
+#. 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 "იერსახე ამ საიტისთვის"
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "საკუთარი იერსახე"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "ფონი"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2046,98 +2102,108 @@ msgstr ""
 "ზომაა %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "ჩართვა"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "გაამრავლე ფონური სურათი"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. 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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "ბმულები"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "მეტი პარამეტრები"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "საკუთარი CSS"
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
 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:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "პირვანდელის პარამეტრების დაბრუნება"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "შენახვა"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "შეინახე დიზაინი"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "ეს შეტყობინება არ არის რჩეული!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "რჩეულებში დამატება"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2862,7 +2928,7 @@ msgstr ""
 "ხედავთ მოსაწონ ჯგუფს? სცადეთ [ძიება](%%%%action.groupsearch%%%%) ან "
 "[შექმენით საკუთარი!](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "შექმენი ახალი ჯგუფი"
 
@@ -3268,26 +3334,33 @@ msgstr ""
 "\n"
 "პატივისცემით, %2$s\n"
 
-#: actions/joingroup.php:60
+#. 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 "გჯუფში გაწევრიანებისათვის საჭიროა ავტორიზაცია."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s გაწევრიანდა ჯგუფში %2$s"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "თვენ არ ხართ ამ ჯგუფის წევრი."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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"
 
@@ -3392,6 +3465,13 @@ msgstr ""
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "შენახვა"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
@@ -3416,11 +3496,11 @@ msgstr "შესვლა"
 msgid "Login to site"
 msgstr "საიტზე შესვლა"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "დამიმახსოვრე"
 
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "მომავალში ავტომატურად შემიყვანე; არა საზიარო კომპიუტერებისათვის!"
 
@@ -3807,7 +3887,8 @@ msgstr "შეცვალეთ პაროლი"
 msgid "Change your password."
 msgstr "შეცვალეთ თქვენი პაროლი."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "პაროლის შეცვლა"
 
@@ -3815,7 +3896,8 @@ msgstr "პაროლის შეცვლა"
 msgid "Old password"
 msgstr "ძველი პაროლი"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "ახალი პაროლი"
 
@@ -3823,7 +3905,7 @@ msgstr "ახალი პაროლი"
 msgid "6 or more characters"
 msgstr "6 ან მეტი სიმბოლო"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "იგივე რაც ზედა პაროლი"
 
@@ -3847,11 +3929,12 @@ msgstr "არასწორი ძველი პაროლი"
 msgid "Error saving user; invalid."
 msgstr "შეცდომა მომხმარებლის შენახვისას; არასწორი."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "ვერ ვინახავ ახალ პაროლს."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "პაროლი შენახულია."
 
@@ -4191,23 +4274,24 @@ msgid "Profile information"
 msgstr "ინფორმაცია პროფილზე"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 #, 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 msgid "Full name"
 msgstr "სრული სახელი"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "ვებ. გვერსი"
 
@@ -4220,34 +4304,34 @@ 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:472
+#: 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:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "მდებარეობა"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "რომელ ქალაქში, რეგიონში, ქვეყანაში ხართ?"
 
@@ -4301,56 +4385,57 @@ 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:257 actions/register.php:229
+#: 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)."
 msgstr[0] "ბიოგრაფია ძალიან გრძელია (არაუმეტეს %d სიმბოლო)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "დროის სარტყელი არ არის არჩეული."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
 #, 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "მდებარეობის პარამეტრების შენახვა ვერ მოხერხდა."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "გახსენი ანგარიში"
@@ -4468,36 +4553,44 @@ msgstr "[დარეგისტრირდი](%%action.register%%) და 
 msgid "Tag cloud"
 msgstr "სანიშნეების ღრუბელი"
 
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "თქვენ უკვე ავტორიზირებული ხართ!"
 
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "ასეთი აღსადგენი კოდი არ არსებობს."
 
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "ეს არ არის აღსადგენი კოდი."
 
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "აღსადგენი კოდი უცნობი მომხმარებლისთვის."
 
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "სადასტურე კოდს შეცდომა აქვს."
 
-#: actions/recoverpassword.php:97
+#. 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 "სადასტურე კოდი ძალიან გრძელია. გთხოვთ ხელახლა დაიწყოთ."
 
-#: actions/recoverpassword.php:111
+#. 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 ""
 "მომხმარებლის განახლება დადასტურებული ელ. ფოსტის მისამართით ვერ მოხერხდა."
 
-#: actions/recoverpassword.php:152
+#. 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."
@@ -4505,67 +4598,101 @@ msgstr ""
 "თუ დაგავიწყდათ, ან დაკარგეთ თქვენი პაროლი, შეგიძლიათ მიიღოთ ახალი, თქვენს "
 "ანგარიშში მითითებულ ელ. ფოსტის მისამართზე."
 
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
 msgstr "თქვენ იდენტიფიცირებული ხართ, შეიყვანეთ ახალი პაროლი ქვევით. "
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "პაროლის აღდგენა"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "მეტსახელი ან ელ. ფოსტის მისამართი"
 
-#: actions/recoverpassword.php:193
+#. 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 "თქვენი მეტსახელი ამ სერვერზე, ან რეგისტრირებული ელ. ფოსტის მისამართი."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "აღდგენა"
 
-#: actions/recoverpassword.php:208
+#. 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 "პაროლის გადაყენება"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "პაროლის აღდგენა"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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 "პაროლის აღდგენა მოთხოვნილია"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "უცნობი მოქმედება"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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 ან მეტი სიმბოლო, და არ დაგავიწყდეთ!"
 
-#: actions/recoverpassword.php:243
+#. 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
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "გადაყენება"
 
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "შეიყვანეთ მეტსახელი ან ელ. ფოსტის მისამართი."
 
-#: actions/recoverpassword.php:282
+#. 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 "ასეთი ელ. ფოსტის მისამართით ან სახელით არ არსებობს."
 
-#: actions/recoverpassword.php:299
+#. 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 "ამ მომხმარებლისთვის ვერ მოიძებნა რეგისტრირებული ელ. ფოსტის მისამართი."
 
-#: actions/recoverpassword.php:313
+#. 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 "მისამართის დადასტურების სენახვისას მოხდა შეცდომა."
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4573,24 +4700,35 @@ msgstr ""
 "პაროლის აღსადგენი ინსტრუქციები გამოიგზავნა თქვენს ანგარიშთან ასოცირებულ ელ. "
 "ფოსტაზე."
 
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "პაროლის მოულოდნელი გადაყენება."
 
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "პაროლი უნდა შედგებოდეს 6 ან მეტი სიმბოლოსგან."
 
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "პაროლი და დასტური არ ემთხვევა."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "მომხმარებელის დაყენებისას მოხდა შეცდომა."
 
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "ახალი პაროლი წარმატებით იქნა შენახული. თქვენ ახლა ავტორიზირებული ხართ."
 
@@ -4606,7 +4744,7 @@ msgstr "ბოდიშს გიხდით, მოსაწვევი კ
 msgid "Registration successful"
 msgstr "რეგისტრაცია წარმატებით დასრულდა"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "რეგისტრაცია"
 
@@ -4634,40 +4772,31 @@ msgstr ""
 "ამ ფორმით შეგიძლიათ შექმნათ ახალი ანგარიში. შემდგომ შეძლებთ შეტყობინებების "
 "დაპოსტვას და მეგობრებთან და კოლეგებთან ურთიერთობას. "
 
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1–64 პატარა ასოები ან ციფრები. პუნქტუაციები ან სივრცეები დაუშვებელია. "
-"სავალდებულო."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 ან მეტი სიმბოლო. სავალდებულო."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "იგივე, რაც პაროლი ზევით. სავალდებულო."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 ან მეტი სიმბოლო"
 
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "ელ. ფოსტა"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 "გამოიყენება მხოლოდ განახლებებისთვის, განცხადებებისთვის და პაროლის აღსადგენად"
 
-#: actions/register.php:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "გრძელი სახელი, სასურველია თქვენი ნამდვილი სახელი"
 
-#: actions/register.php:463
+#: actions/register.php:462
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "თქვენი ვებ. გვერდის URL, ბლოგი, ან პროფილი სხვა საიტზე"
 
-#: actions/register.php:524
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
@@ -4675,23 +4804,23 @@ msgstr ""
 "მე ვაცნობიერებ, რომ %1$s–ის შიგთავსი და მონაცემები არის პირადული და "
 "კონციდენციალური."
 
-#: actions/register.php:534
+#: 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:538
+#: 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:541
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "ყველა უფლება დაცულია."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4700,7 +4829,7 @@ msgstr ""
 "ჩემი ტექსტი და ფაილები ხელმისაწვდომია %s–ით, გარდა ამ პირადი ინფორმაციისა: "
 "პაროლი, ელ. ფოსტის მისამართი, IM მისამართი და ტელეფონის ნომერი."
 
-#: actions/register.php:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4733,7 +4862,7 @@ msgstr ""
 "\n"
 "გმადლობთ რომ დარეგისტრირდით. იმედი გვაქვს ისიამოვნებთ ამ სერვისით."
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5049,7 +5178,7 @@ msgstr "ორგანიზაცია"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "აღწერა"
 
@@ -5072,8 +5201,9 @@ msgstr "აპლიკაციის მოქმედებები"
 msgid "Reset key & secret"
 msgstr "გასაღების და საიდუმლოს გადაყენება"
 
+#. TRANS: Title of form for deleting a user.
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "წაშლა"
 
@@ -5197,7 +5327,7 @@ msgid "Note"
 msgstr "შენიშვნა"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr ""
 
@@ -7731,26 +7861,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 #, 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:153
+#: lib/common.php:158
 #, 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "გადადი ამ ინსტალატორზე."
 
@@ -7822,12 +7952,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "გამორთვა"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-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: 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".
@@ -7910,26 +8043,22 @@ msgstr "წინ"
 msgid "Grant this user the \"%s\" role"
 msgstr "მიანიჭე ამ მომხმარებელს \"%s\" როლი"
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1–64 პატარა ასოები ან ციფრები. პუნქტუაციები ან სივრცეები დაუშვებელია"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "საწყისი გვერდის URL, ან ჯგუფის/თემის ბლოგი"
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "აღწერე ჯგუფი ან თემა"
 
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
 #, 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"
+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:182
+#: lib/groupeditform.php:174
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -7937,7 +8066,7 @@ msgstr ""
 "ჯგუფის მდებარეობა არსებობის შემთხვევაში. მაგ.: \"ქალაქი, ქვეყანა (ან რეგიონი)"
 "\""
 
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9110,14 +9239,9 @@ msgstr[0] ""
 msgid "about a year ago"
 msgstr "დაახლოებით 1 წლის წინ"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s არ არის სწორი ფერი!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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 ""
@@ -9157,26 +9281,31 @@ msgid "Getting backup from file '%s'."
 msgstr ""
 
 #, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "ასეთი პროფილი არ არსებობს."
+#~ msgid "No such group"
+#~ msgstr "ასეთი ჯგუფი ვერ მოიძებნა."
 
 #, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "%1$s-ს ის ჯგუფები რომლებშიც გაერთიანებულია %2$s."
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
 #~ msgstr "API მეთოდი ვერ მოიძებნა."
 
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "%s-ს გამოწერა დასრულდა წარმატებით."
+#~ msgid "Reset"
+#~ msgstr "გადაყენება"
 
-#~ msgid "Couldn't update user."
-#~ msgstr "მომხმარებლის განახლება ვერ მოხერხდა."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1–64 პატარა ასოები ან ციფრები. პუნქტუაციები ან სივრცეები დაუშვებელია. "
+#~ "სავალდებულო."
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "პროფილის შენახვა ვერ მოხერხდა."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 ან მეტი სიმბოლო. სავალდებულო."
 
-#~ msgid "Couldn't save tags."
-#~ msgstr "სანიშნეების შენახვა ვერ მოხერხდა."
+#~ msgid "Same as password above. Required."
+#~ msgstr "იგივე, რაც პაროლი ზევით. სავალდებულო."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr ""
+#~ "1–64 პატარა ასოები ან ციფრები. პუნქტუაციები ან სივრცეები დაუშვებელია"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s არ არის სწორი ფერი!"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 5b2e992bb7..b34e7ec6a8 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-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:39+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:23+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 (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ko\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -76,6 +76,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -87,13 +88,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "저장"
@@ -320,7 +321,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "이용자를 업데이트 할 수 없습니다."
@@ -344,7 +345,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "프로필을 저장 할 수 없습니다."
 
@@ -354,7 +355,7 @@ msgstr "프로필을 저장 할 수 없습니다."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, fuzzy, php-format
@@ -529,7 +530,8 @@ msgid "That status is not a favorite."
 msgstr "이 소식은 관심소식이 아닙니다."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "관심소식을 삭제할 수 없습니다."
 
@@ -576,7 +578,7 @@ msgstr "타겟 이용자를 찾을 수 없습니다."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십시오."
@@ -586,7 +588,7 @@ msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "유효한 별명이 아닙니다"
@@ -598,7 +600,7 @@ msgstr "유효한 별명이 아닙니다"
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "홈페이지 주소형식이 올바르지 않습니다."
@@ -608,7 +610,7 @@ msgstr "홈페이지 주소형식이 올바르지 않습니다."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -635,7 +637,7 @@ msgstr[0] "설명이 너무 깁니다. (최대 %d 글자)"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -692,22 +694,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "이용자 %1$s 의 그룹 %2$s 가입에 실패했습니다."
@@ -719,9 +725,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -781,9 +789,12 @@ msgid "Request token already authorized."
 msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -791,7 +802,7 @@ msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -813,18 +824,20 @@ msgstr "OAuth 응용 프로그램 사용자 추가 중 데이터베이스 오류
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "잘못된 폼 제출"
@@ -879,7 +892,7 @@ msgstr "계정"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "별명"
@@ -887,7 +900,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "비밀 번호"
 
@@ -995,10 +1008,12 @@ msgstr "이미 재전송된 소식입니다."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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
@@ -1269,7 +1284,7 @@ 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"
+msgid "Cannot add someone else's membership."
 msgstr "예약 구독을 추가 할 수 없습니다."
 
 #. TRANS: Client error displayed when not using the POST verb.
@@ -1305,30 +1320,51 @@ 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "관심소식을 삭제할 수 없습니다."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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"
+msgid "Not a member."
 msgstr "모든 회원"
 
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "API 메서드 발견 안 됨."
-
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
 msgstr "구독을 저장할 수 없습니다."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1500,35 +1536,42 @@ msgstr "아바타 업데이트 실패"
 msgid "Avatar deleted."
 msgstr "아바타가 삭제되었습니다."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "배경"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1561,14 +1604,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "아니오"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "이용자를 차단하지 않는다."
 
@@ -1580,7 +1622,7 @@ msgstr "이용자를 차단하지 않는다."
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "예"
@@ -1596,32 +1638,6 @@ msgstr "이 사용자 차단하기"
 msgid "Failed to save block information."
 msgstr "정보차단을 저장하는데 실패했습니다."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "그러한 그룹이 없습니다."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1754,7 +1770,8 @@ msgid "Account deleted."
 msgstr "아바타가 삭제되었습니다."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "새 계정 만들기"
@@ -1776,8 +1793,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "인증"
 
@@ -1849,8 +1867,10 @@ 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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 "별명이 없습니다."
@@ -1903,10 +1923,11 @@ msgid "Delete this group"
 msgstr "이 사용자 삭제"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1947,98 +1968,133 @@ msgstr "이 통지를 지울 수 없습니다."
 msgid "Delete this notice"
 msgstr "이 게시글 삭제하기"
 
-#: actions/deleteuser.php:67
+#. 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 "이용자를 업데이트 할 수 없습니다."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "이용자 삭제"
 
-#: actions/deleteuser.php:136
+#. 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:163 lib/deleteuserform.php:77
+#. 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.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "디자인"
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "잘못된 로고 URL 입니다."
 
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "잘못된 로고 URL 입니다."
 
-#: actions/designadminpanel.php:344
+#. 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 "인스턴트 메신저를 사용할 수 없습니다."
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "로고 변경"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "사이트 로고"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "사이트 로고"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "테마 바꾸기"
 
-#: actions/designadminpanel.php:486
+#. 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 "사이트에 대한 테마"
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "사용자 지정 테마"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "배경"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2047,98 +2103,108 @@ msgstr ""
 "사이트의 배경 이미지를 업로드할 수 있습니다. 최대 파일 크기는 %1$s 입니다."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "켜기"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "배경 이미지를 반복 나열"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. 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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "링크"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "고급 검색"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "사용자 정의 CSS"
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
 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:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr ""
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "저장"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "디자인 저장"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "이 메시지는 favorite이 아닙니다."
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "좋아하는 게시글로 추가하기"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2858,7 +2924,7 @@ msgid ""
 "%%%%)"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "새 그룹을 만듭니다."
 
@@ -3248,26 +3314,33 @@ msgstr ""
 "\n"
 "%2$s 보냄\n"
 
-#: actions/joingroup.php:60
+#. 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 "그룹가입을 위해서는 로그인이 필요합니다."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s의 상태 (%2$s에서)"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "당신은 해당 그룹의 멤버가 아닙니다."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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에서)"
 
@@ -3373,6 +3446,13 @@ msgstr "라이선스 이미지 URL"
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "저장"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
@@ -3397,11 +3477,11 @@ msgstr "로그인"
 msgid "Login to site"
 msgstr "사이트에 로그인하세요."
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "자동 로그인"
 
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "앞으로는 자동으로 로그인합니다. 공용 컴퓨터에서는 이용하지 마십시오!"
 
@@ -3790,7 +3870,8 @@ msgstr "비밀번호 바꾸기"
 msgid "Change your password."
 msgstr "비밀번호를 변경하세요."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "비밀번호 변경"
 
@@ -3798,7 +3879,8 @@ msgstr "비밀번호 변경"
 msgid "Old password"
 msgstr "기존 비밀 번호"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "새로운 비밀 번호"
 
@@ -3806,7 +3888,7 @@ msgstr "새로운 비밀 번호"
 msgid "6 or more characters"
 msgstr "6글자 이상"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "위와 같은 비밀 번호"
 
@@ -3830,11 +3912,12 @@ msgstr "기존 비밀 번호가 틀렸습니다"
 msgid "Error saving user; invalid."
 msgstr "사용자 저장 오류; 무효한 사용자"
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "새 비밀번호를 저장 할 수 없습니다."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "비밀 번호 저장"
 
@@ -4171,23 +4254,24 @@ msgid "Profile information"
 msgstr "프로필 정보"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 #, 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 msgid "Full name"
 msgstr "실명"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "홈페이지"
 
@@ -4200,34 +4284,34 @@ 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:472
+#: 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:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "위치"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "당신은 어디에 삽니까? \"시, 도 (or 군,구), 나라\""
 
@@ -4278,56 +4362,57 @@ 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:257 actions/register.php:229
+#: 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)."
 msgstr[0] "설명이 너무 깁니다. (최대 %d 글자)"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "타임존이 설정 되지 않았습니다."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
 #, 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "태그를 저장할 수 없습니다."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "새 계정 만들기"
@@ -4443,126 +4528,178 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "태그 클라우드"
 
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "당신은 이미 로그인되어 있습니다."
 
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "그러한 복구 코드는 없습니다."
 
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "복구 코드가 아닙니다."
 
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "알 수 없는 취소를 위한 리커버리 코드"
 
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "확인 코드 오류"
 
-#: actions/recoverpassword.php:97
+#. 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 "이 인증 코드는 오래됐습니다. 다시 발급 받아 주십시오."
 
-#: actions/recoverpassword.php:111
+#. 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 "이 이메일 주소로 사용자를 업데이트 할 수 없습니다."
 
-#: actions/recoverpassword.php:152
+#. 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:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+msgid "You have been identified. Enter a new password below."
 msgstr ""
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "비밀 번호 복구"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 #, fuzzy
 msgid "Nickname or email address"
 msgstr "별명이나 이메일 계정을 입력하십시오."
 
-#: actions/recoverpassword.php:193
+#. 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 "이 서버에서 당신의 닉네임 혹은 당신의 등록된 이메일주소"
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "복구"
 
-#: actions/recoverpassword.php:208
+#. 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 "비밀 번호 초기화"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "비밀 번호 복구"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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 "비밀 번호 복구가 요청되었습니다."
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "알려지지 않은 행동"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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글자 이상, 잊어 버리지 마십시오!"
 
-#: actions/recoverpassword.php:243
+#. 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
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "초기화"
 
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "별명이나 이메일 계정을 입력하십시오."
 
-#: actions/recoverpassword.php:282
+#. 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 "그러한 이메일 주소나 계정을 가진 사용자는 없습니다."
 
-#: actions/recoverpassword.php:299
+#. 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 "그 사용자는 등록된 메일주소가 없습니다."
 
-#: actions/recoverpassword.php:313
+#. 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 "주소 확인 저장 에러"
 
-#: actions/recoverpassword.php:338
+#. 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 "가입하신 이메일로 비밀 번호 재발급에 관한 안내를 보냈습니다."
 
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "잘못된 비밀 번호 지정"
 
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "비밀 번호는 6자 이상이어야 합니다."
 
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "비밀 번호가 일치하지 않습니다."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "사용자 세팅 오류"
 
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 "새로운 비밀 번호를 성공적으로 저장했습니다. 귀하는 이제 로그인 되었습니다."
@@ -4580,7 +4717,7 @@ msgstr "확인 코드 오류"
 msgid "Registration successful"
 msgstr "회원 가입이 성공적입니다."
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "등록"
 
@@ -4606,68 +4743,59 @@ msgid ""
 "link up to friends and colleagues. "
 msgstr ""
 
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다. 필수 "
-"입력."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6글자 이상이 필요합니다."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "위와 같은 비밀 번호. 필수 사항."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6글자 이상"
 
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "메일"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "업데이트나 공지, 비밀번호 찾기에 사용하세요."
 
-#: actions/register.php:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "더욱 긴 이름을 요구합니다."
 
-#: actions/register.php:463
+#: actions/register.php:462
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "귀하의 홈페이지, 블로그 혹은 다른 사이트의 프로필 페이지 URL"
 
-#: actions/register.php:524
+#: 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:534
+#: 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:538
+#: 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:541
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: 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:589
+#: actions/register.php:588
 #, fuzzy, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4700,7 +4828,7 @@ msgstr ""
 "\n"
 "다시 한번 가입하신 것을 환영하면서 즐거운 서비스가 되셨으면 합니다."
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5010,7 +5138,7 @@ msgstr "기관 이름이 필요합니다."
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "설명"
 
@@ -5033,8 +5161,9 @@ msgstr "인증 코드가 없습니다."
 msgid "Reset key & secret"
 msgstr ""
 
+#. TRANS: Title of form for deleting a user.
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "삭제"
 
@@ -5154,7 +5283,7 @@ msgid "Note"
 msgstr "설명"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr ""
 
@@ -7686,26 +7815,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 #, 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:153
+#: lib/common.php:158
 #, 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "이 사이트에 로그인"
 
@@ -7775,12 +7904,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "끄기"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-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: 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".
@@ -7866,32 +7998,28 @@ msgstr "이동"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다."
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "그룹 혹은 토픽의 홈페이지나 블로그 URL"
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "응용프로그램 삭제"
 
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
 #, 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"
+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:182
+#: lib/groupeditform.php:174
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "그룹의 위치, \"시/군/구, 도, 국가\""
 
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8990,14 +9118,9 @@ msgstr[0] ""
 msgid "about a year ago"
 msgstr "1년 전"
 
-#: lib/webcolor.php:80
-#, fuzzy, php-format
-msgid "%s is not a valid color!"
-msgstr "홈페이지 주소형식이 올바르지 않습니다."
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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 "홈페이지 주소형식이 올바르지 않습니다."
@@ -9033,27 +9156,32 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "해당하는 파일이 없습니다."
+#~ msgid "No such group"
+#~ msgstr "그러한 그룹이 없습니다."
 
 #, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "%s 사용자가 멤버인 그룹"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
 #~ msgstr "API 메서드 발견 안 됨."
 
+#~ msgid "Reset"
+#~ msgstr "초기화"
+
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다. 필"
+#~ "수 입력."
+
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6글자 이상이 필요합니다."
+
+#~ msgid "Same as password above. Required."
+#~ msgstr "위와 같은 비밀 번호. 필수 사항."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr ""
+#~ "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다."
+
 #, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "%s에 의해 구독되는 사람들"
-
-#~ msgid "Couldn't update user."
-#~ msgstr "사용자를 업데이트 할 수 없습니다."
-
-#~ msgid "Couldn't save profile."
-#~ msgstr "프로필을 저장 할 수 없습니다."
-
-#~ msgid "Couldn't save tags."
-#~ msgstr "태그를 저장할 수 없습니다."
+#~ msgid "%s is not a valid color!"
+#~ msgstr "홈페이지 주소형식이 올바르지 않습니다."
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 6a7aa4d753..61c475668d 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-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:40+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57: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-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -77,6 +77,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -88,13 +89,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Зачувај"
@@ -328,7 +329,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Не можев да го подновам корисникот."
@@ -352,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "Не може да се зачува профил."
 
@@ -362,7 +363,7 @@ msgstr "Не може да се зачува профил."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
@@ -403,7 +404,6 @@ msgstr "Не може да се поднови Вашиот изглед."
 
 #. TRANS: Title for Atom feed.
 #: actions/apiatomservice.php:85
-#, fuzzy
 msgctxt "ATOM"
 msgid "Main"
 msgstr "Главна"
@@ -543,7 +543,8 @@ msgid "That status is not a favorite."
 msgstr "Тој статус не Ви е бендисан."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Не можам да ја избришам бендисаната забелешка."
 
@@ -590,7 +591,7 @@ msgstr "Не можев да го пронајдам целниот корисн
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Тој прекар е во употреба. Одберете друг."
@@ -600,7 +601,7 @@ msgstr "Тој прекар е во употреба. Одберете друг.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Неправилен прекар."
@@ -612,7 +613,7 @@ msgstr "Неправилен прекар."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Главната страница не е важечка URL-адреса."
@@ -622,7 +623,7 @@ msgstr "Главната страница не е важечка URL-адрес
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Полното име е предолго (највеќе 255 знаци)."
@@ -649,7 +650,7 @@ msgstr[1] "Описот е предолг (дозволено е највеќе
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Местоположбата е предолга (највеќе 255 знаци)."
@@ -706,22 +707,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Не можам да го зачленам корисникот %1$s во групата 2$s."
@@ -733,9 +738,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -792,9 +799,12 @@ msgid "Request token already authorized."
 msgstr "Жетонот за барање е веќе овластен."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -802,7 +812,7 @@ msgstr "Жетонот за барање е веќе овластен."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -823,18 +833,20 @@ msgstr "Грешка во базата при вметнувањето на auth
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Неочекувано поднесување на образец."
@@ -888,7 +900,7 @@ msgstr "Сметка"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Прекар"
@@ -896,7 +908,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Лозинка"
 
@@ -1004,10 +1016,12 @@ msgstr "Забелешката е веќе повторена."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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."
@@ -1038,9 +1052,8 @@ 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
@@ -1242,15 +1255,13 @@ msgstr "Нема таков профил."
 #. 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 "Не можам да додадам туѓа претплата"
+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 "Може да работи само со активности за бендисување."
+msgstr "Може да работи само со бендисани активности."
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
 #: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
@@ -1277,13 +1288,12 @@ 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 "Не можам да додадам туѓо членство"
+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 "Може да работи само со активности за зачленување."
 
@@ -1310,52 +1320,73 @@ 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 "Не можам да избришам туѓа бендисана ставка."
+msgid "Cannot delete someone else's favorite."
+msgstr "Не можам да избришам туѓo бендисанo."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "Нема такваа група"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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 using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "HTTP method not supported"
-msgstr "HTML-методот не е поддржан."
+msgid "Not a member."
+msgstr "Не членувате"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
-msgstr "Не можам да избришам туѓо членство"
+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
+#, php-format
 msgid "No such profile id: %d."
-msgstr "Нема таква назнака на профил: %d"
+msgstr "Нема таква назнака на профил: %d."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
 #. TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.
 #: actions/atompubshowsubscription.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
-msgstr "Профилот %1$d не е претплатен на профилот %2$d"
+msgstr "Профилот %1$d не е претплатен на профилот %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 "Не можам да избришам туѓа претплата"
+msgstr "Не можам да избришам туѓа претплата."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
@@ -1370,9 +1401,9 @@ msgstr "Може само да следи луѓе."
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #: actions/atompubsubscriptionfeed.php:267
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown profile %s."
-msgstr "Непознат профил %s"
+msgstr "Непознат профил %s."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
@@ -1503,23 +1534,29 @@ msgstr "Подновата на аватарот не успеа."
 msgid "Avatar deleted."
 msgstr "Аватарот е избришан."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr "Резервна сметка"
 
-#: actions/backupaccount.php:80
+#. 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 "Не можете да направите резрвна верзија на Вашата сметка."
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
+#, 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 an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
@@ -1529,12 +1566,14 @@ msgstr ""
 "се зачуваат лични податоци како е-пошта и адреса за НП. Покрај ова, во "
 "резервата не се зачувуваат и подигнатите податотеки и непосредните пораки."
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Резерва"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr "Направете резервна верзија на сметката"
 
@@ -1569,14 +1608,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Не"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "Не го блокирај корисников"
 
@@ -1588,7 +1626,7 @@ msgstr "Не го блокирај корисников"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Да"
@@ -1604,32 +1642,6 @@ msgstr "Блокирај го корисников"
 msgid "Failed to save block information."
 msgstr "Не можев да ги снимам инофрмациите за блокот."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Нема таква група."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1756,7 +1768,8 @@ msgid "Account deleted."
 msgstr "Сметката е избришана."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 msgid "Delete account"
 msgstr "Избриши сметка"
 
@@ -1780,8 +1793,9 @@ msgstr ""
 "\">резервна верзија на податоците</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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Потврди"
 
@@ -1854,8 +1868,10 @@ 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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."
 
@@ -1906,10 +1922,11 @@ msgid "Delete this group"
 msgstr "Избриши ја групава"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1932,7 +1949,7 @@ msgstr ""
 #. TRANS: Fieldset legend for the delete notice form.
 #: actions/deletenotice.php:117 actions/deletenotice.php:148
 msgid "Delete notice"
-msgstr "Бриши забелешка"
+msgstr "Избриши забелешка"
 
 #. TRANS: Message for the delete notice form.
 #: actions/deletenotice.php:152
@@ -1947,21 +1964,32 @@ msgstr "Не ја бриши оваа забелешка"
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
 #: actions/deletenotice.php:166 lib/noticelist.php:673
 msgid "Delete this notice"
-msgstr "Бриши ја оваа забелешка"
+msgstr "Избриши ја оваа забелешка"
 
-#: actions/deleteuser.php:67
+#. 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 "Може да бришете само локални корисници."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
-msgstr "Бриши корисник"
+msgstr "Избриши корисник"
 
-#: actions/deleteuser.php:136
+#. 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."
@@ -1969,78 +1997,102 @@ 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:163 lib/deleteuserform.php:77
+#. 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.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "Изглед"
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr "Нагодувања на изгледот на ова StatusNet-мрежно место."
 
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "Погрешен URL на лого."
 
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
 msgid "Invalid SSL logo URL."
 msgstr "Неважечка URL-адреса на SSL-логото."
 
-#: actions/designadminpanel.php:344
+#. 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."
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Промени лого"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Лого на мрежното место"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "SSL-лого"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Промени изглед"
 
-#: actions/designadminpanel.php:486
+#. 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 "Изглед за мрежното место."
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Прилагоден мотив"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 msgid "Change background image"
-msgstr "Промена на слика на позадина"
+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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Позадина"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2050,98 +2102,108 @@ msgstr ""
 "големина на податотеката е %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Вкл."
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "Позадината во квадрати"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. 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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "Врски"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Напредно"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "Прилагодено CSS"
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
 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:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "Врати по основно"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Зачувај"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "Зачувај изглед"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "Оваа забелешка не Ви е бендисана!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "Додај во бендисани"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2446,9 +2508,8 @@ msgstr "Таа е-поштенска адреса е веќе зафатена 
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
 #: actions/emailsettings.php:426 actions/imsettings.php:343
 #: actions/smssettings.php:365
-#, fuzzy
 msgid "Could not insert confirmation code."
-msgstr "Потврдниот код не може да се внесе."
+msgstr "Не можев да го внесам потврдниот код."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
 #: actions/emailsettings.php:433
@@ -2476,7 +2537,6 @@ 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:468 actions/smssettings.php:413
-#, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Не можев да ја избришам потврдата по е-пошта."
 
@@ -2504,7 +2564,6 @@ msgstr "Нема приемна е-поштенска адреса."
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
 #: actions/emailsettings.php:540 actions/emailsettings.php:565
 #: actions/smssettings.php:564 actions/smssettings.php:587
-#, fuzzy
 msgid "Could not update user record."
 msgstr "Не можев да ја подновам корисничката евиденција."
 
@@ -2872,7 +2931,7 @@ msgstr ""
 "[ја пронајдете](%%%%action.groupsearch%%%%) или [започнете своја!](%%%%"
 "action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Создај нова група"
 
@@ -3059,7 +3118,6 @@ msgstr "Ова е погрешната IM адреса."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
 #: actions/imsettings.php:391
-#, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "Не можев да ја избришам потврдата на IM."
 
@@ -3205,7 +3263,7 @@ msgstr "Можете да додадете и лична порака во по
 #: actions/invite.php:231
 msgctxt "BUTTON"
 msgid "Send"
-msgstr "Прати"
+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
@@ -3277,26 +3335,33 @@ msgstr ""
 "\n"
 "Со почит, %2$s\n"
 
-#: actions/joingroup.php:60
+#. 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 "Мора да сте најавени за да можете да се зачлените во група."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s се зачлени во групата %2$s"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "Не членувате во таа група."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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"
 
@@ -3406,6 +3471,13 @@ msgstr "URL-адреса за сликата на лиценцата"
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Зачувај"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Зачувај нагодувања на лиценцата"
@@ -3430,11 +3502,11 @@ msgstr "Најава"
 msgid "Login to site"
 msgstr "Најавете се"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Запамети ме"
 
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Отсега врши автоматска најава. Не треба да се користи за јавни сметачи!"
@@ -3775,7 +3847,7 @@ msgstr "Види изгледи на профилот"
 #. TRANS: Tooltip for checkbox.
 #: actions/othersettings.php:130
 msgid "Show or hide profile designs."
-msgstr "Прикажи или сокриј профилни изгледи."
+msgstr "Прикажи или скриј изгледи на профилот."
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
 #: actions/othersettings.php:162
@@ -3826,7 +3898,8 @@ msgstr "Промени ја лозинката"
 msgid "Change your password."
 msgstr "Променете си ја лозинката."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Промена на лозинка"
 
@@ -3834,7 +3907,8 @@ msgstr "Промена на лозинка"
 msgid "Old password"
 msgstr "Стара лозинка"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Нова лозинка"
 
@@ -3842,7 +3916,7 @@ msgstr "Нова лозинка"
 msgid "6 or more characters"
 msgstr "6 или повеќе знаци"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "Исто како лозинката погоре"
 
@@ -3866,11 +3940,12 @@ msgstr "Неточна стара лозинка"
 msgid "Error saving user; invalid."
 msgstr "Грешка во зачувувањето на корисникот; неправилен."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "Не можам да ја зачувам новата лозинка."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Лозинката е зачувана."
 
@@ -4198,22 +4273,23 @@ msgid "Profile information"
 msgstr "Информации за профил"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 msgid "Full name"
 msgstr "Цело име"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "Домашна страница"
 
@@ -4226,7 +4302,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:472
+#: 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"
@@ -4234,27 +4310,27 @@ msgstr[0] "Опишете се себеси и своите интереси с
 msgstr[1] "Опишете се себеси и своите интереси со %d знаци."
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "Местоположба"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Каде се наоѓате, на пр. „Град, Област, Земја“."
 
@@ -4310,7 +4386,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:257 actions/register.php:229
+#: 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)."
@@ -4318,48 +4394,47 @@ msgstr[0] "Биографијата е предолга (највеќе до %d
 msgstr[1] "Биографијата е предолга (највеќе до %d знаци)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Не е избрана часовна зона."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
-#, fuzzy
+#: actions/profilesettings.php:347
 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:404
-#, fuzzy
+#: actions/profilesettings.php:405
 msgid "Could not save location prefs."
-msgstr "Не можев да ги зачувам нагодувањата за местоположба"
+msgstr "Не можев да ги зачувам нагодувањата за местоположба."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Врати сметка"
 
@@ -4483,35 +4558,43 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "Облак од ознаки"
 
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Веќе сте најавени!"
 
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Нема таков код за спасување."
 
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Ова не е код за спасување."
 
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Код за пронаоѓање за непознат корисник."
 
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Грешка со кодот за потврдување."
 
-#: actions/recoverpassword.php:97
+#. 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 "Овој код потврден код е престар. Почнете од почеток."
 
-#: actions/recoverpassword.php:111
+#. 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 "Не можев да го подновам корисникот со потврдена е-поштенска адреса."
 
-#: actions/recoverpassword.php:152
+#. 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."
@@ -4519,69 +4602,102 @@ msgstr ""
 "Ако ја имате заборавено или загубено лозинката, можете да побарате да Ви се "
 "испрати нова по е-поштата која сте ја назначиле за сметката."
 
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
 msgstr "Препознаени сте. Внесете нова лозинка подполу. "
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Враќање на лозинката"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Прекар или е-поштенска адреса"
 
-#: actions/recoverpassword.php:193
+#. 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 ""
 "Вашиот прекар на овој опслужувач или адресата за е-пошта со која се "
 "регистриравте."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Пронајди"
 
-#: actions/recoverpassword.php:208
+#. 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 "Рестетирај ја лозинката"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Пронаоѓање на лозинка"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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 "Побарано е пронаоѓање на лозинката"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Непознато дејство"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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 или повеќе знаци и не заборавајте!"
 
-#: actions/recoverpassword.php:243
+#. 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
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Врати одново"
 
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Внесете прекар или е-пошта"
 
-#: actions/recoverpassword.php:282
+#. 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 "Нема корисник со таа е-поштенска адреса или корисничко име."
 
-#: actions/recoverpassword.php:299
+#. 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 "Нема регистрирана адреса за е-пошта за тој корисник."
 
-#: actions/recoverpassword.php:313
+#. 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 "Грешка при зачувувањето на потврдата за адреса."
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4589,23 +4705,34 @@ msgstr ""
 "Упатството за пронаоѓање на Вашата лозинка е испратено до адресата за е-"
 "пошта што е регистрирана со Вашата сметка."
 
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Неочекувано подновување на лозинката."
 
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
 msgid "Password must be 6 characters or more."
 msgstr "Лозинката мора да има барем 6 знаци."
 
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Двете лозинки не се совпаѓаат."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "Грешка во поставувањето на корисникот."
 
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "Новата лозинка е успешно зачувана. Сега сте најавени."
 
@@ -4621,7 +4748,7 @@ msgstr "Жалиме, неважечки код за поканата."
 msgid "Registration successful"
 msgstr "Регистрацијата е успешна"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Регистрирај се"
 
@@ -4649,63 +4776,54 @@ msgstr ""
 "Со овој образец можете да создадете нова сметка. Потоа ќе можете да "
 "објавувате забелешки и да се поврзувате со пријатели и колеги. "
 
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 мали букви или бројки, без интерпункциски знаци и празни места. "
-"Задолжително поле."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "Барем 6 знаци. Задолжително поле."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Исто што и лозинката погоре. Задолжително поле."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 или повеќе знаци"
 
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Е-пошта"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Се користи само за подновувања, објави и повраќање на лозинка."
 
-#: actions/register.php:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Подолго име, по можност Вашето вистинско име и презиме"
 
-#: actions/register.php:463
+#: actions/register.php:462
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL на Вашата домашна страница, блог или профил на друго мрежно место."
 
-#: actions/register.php:524
+#: 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:534
+#: 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:538
+#: 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:541
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "Сите права задржани."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4714,7 +4832,7 @@ msgstr ""
 "Мојот текст и податотеки се достапни под %s, освен следниве приватни "
 "податоци: лозинка, е-пошта, IM-адреса и телефонски број."
 
-#: actions/register.php:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4748,7 +4866,7 @@ msgstr ""
 "Ви благодариме што се зачленивте и Ви пожелуваме пријатни мигови со оваа "
 "служба."
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -4808,12 +4926,10 @@ msgstr ""
 "неважечки XRDS)."
 
 #: actions/remotesubscribe.php:175
-#, fuzzy
 msgid "That is a local profile! Login to subscribe."
-msgstr "Тоа е локален профил! најавете се за да се претплатите."
+msgstr "Тоа е локален профил! Најавете се за да се претплатите."
 
 #: actions/remotesubscribe.php:182
-#, fuzzy
 msgid "Could not get a request token."
 msgstr "Не можев да добијам жетон за барање."
 
@@ -4826,7 +4942,6 @@ msgid "No notice specified."
 msgstr "Нема назначено забелешка."
 
 #: actions/repeat.php:75
-#, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "Не можете да повторувате сопствена забелешка."
 
@@ -5067,7 +5182,7 @@ msgstr "Организација"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "Опис"
 
@@ -5090,10 +5205,11 @@ msgstr "Дејства на програмот"
 msgid "Reset key & secret"
 msgstr "Клуч за промена и тајна"
 
+#. TRANS: Title of form for deleting a user.
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
-msgstr "Бриши"
+msgstr "Избриши"
 
 #: actions/showapplication.php:261
 msgid "Application info"
@@ -5220,7 +5336,7 @@ msgid "Note"
 msgstr "Забелешка"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "Алијаси"
 
@@ -6912,7 +7028,7 @@ msgstr "Помош"
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
 #: lib/action.php:867
 msgid "About"
-msgstr "За"
+msgstr "За нас"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
 #: lib/action.php:870
@@ -7249,11 +7365,9 @@ msgstr ""
 "програмот."
 
 #: lib/apioauthstore.php:345
-#, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr ""
-"Грешка во базата на податоци при вметнувањето на корисникот на OAuth-"
-"програмот."
+"Грешка во базата на податоци при подновата на корисникот на OAuth-програмот."
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
 #: lib/apioauthstore.php:371
@@ -7818,24 +7932,24 @@ msgstr ""
 "tracking - сè уште не е имплементирано.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 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:153
+#: lib/common.php:158
 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "Оди на инсталаторот."
 
@@ -7902,11 +8016,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "Искл."
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-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: 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".
@@ -7989,32 +8107,28 @@ msgstr "Оди"
 msgid "Grant this user the \"%s\" role"
 msgstr "Додели улога „%s“ на корисников"
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 мали букви или бројки. Без интерпукциски знаци и празни места."
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL на страницата или блогот на групата или темата"
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "Опишете ја групата или темата"
 
-#: lib/groupeditform.php:170
-#, 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"
+#: lib/groupeditform.php:162
+#, 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:182
+#: lib/groupeditform.php:174
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Местоположба на групата (ако има). На пр. „Град, Сој. држава/област, Земја“"
 
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8652,7 +8766,7 @@ msgstr "Расположиви знаци"
 #: lib/messageform.php:185 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
-msgstr "Прати"
+msgstr "Испрати"
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:165
@@ -9220,14 +9334,9 @@ msgstr[1] "пред околу %d месеци"
 msgid "about a year ago"
 msgstr "пред една година"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s не е важечка боја!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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 ""
@@ -9266,29 +9375,29 @@ msgstr "Неважечки XML. Нема XRD-корен."
 msgid "Getting backup from file '%s'."
 msgstr "Земам резерва на податотеката „%s“."
 
-#~ msgid "AtomPub post with unknown attention URI %s"
-#~ msgstr "AtomPub-објава со непознат URI за внимание %s"
+#~ msgid "No such group"
+#~ msgstr "Нема такваа група"
 
-#~ msgid "No such profile"
-#~ msgstr "Нема таков профил"
+#~ msgid "HTTP method not supported"
+#~ msgstr "HTML-методот не е поддржан"
 
-#~ msgid "Notices %s has favorited to on %s"
-#~ msgstr "Забелешки на %s што ги бендисува %s"
+#~ msgid "Reset"
+#~ msgstr "Врати одново"
 
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Групи на %s кадешто членува %s"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 мали букви или бројки, без интерпункциски знаци и празни места. "
+#~ "Задолжително поле."
 
-#~ msgid "Method not supported"
-#~ msgstr "Методот не е поддржан"
+#~ msgid "6 or more characters. Required."
+#~ msgstr "Барем 6 знаци. Задолжително поле."
 
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Луѓе на %s на коишто се претплатил %s"
+#~ msgid "Same as password above. Required."
+#~ msgstr "Исто што и лозинката погоре. Задолжително поле."
 
-#~ msgid "Couldn't update user."
-#~ msgstr "Не можев да го подновам корисникот."
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 мали букви или бројки. Без интерпукциски знаци и празни места."
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "Не можам да го зачувам профилот."
-
-#~ msgid "Couldn't save tags."
-#~ msgstr "Не можев да ги зачувам ознаките."
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s не е важечка боја!"
diff --git a/locale/ml/LC_MESSAGES/statusnet.po b/locale/ml/LC_MESSAGES/statusnet.po
index ed13e9423b..af2c804132 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-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:41+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57: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-01-15 11:03:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ml\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -74,6 +74,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -85,13 +86,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "സേവ് ചെയ്യുക"
@@ -316,7 +317,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "ഉപയോക്തൃ വിവരങ്ങൾ പുതുക്കാൻ കഴിഞ്ഞില്ല."
@@ -340,7 +341,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr ""
 
@@ -350,7 +351,7 @@ msgstr ""
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
@@ -387,7 +388,6 @@ msgstr "താങ്കളുടെ രൂപകല്പന പുതുക്
 
 #. TRANS: Title for Atom feed.
 #: actions/apiatomservice.php:85
-#, fuzzy
 msgctxt "ATOM"
 msgid "Main"
 msgstr "മുഖ്യം"
@@ -524,7 +524,8 @@ msgid "That status is not a favorite."
 msgstr ""
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr ""
 
@@ -570,7 +571,7 @@ msgstr "ലക്ഷ്യമിട്ട ഉപയോക്താവിനെ 
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "വിളിപ്പേര് മുമ്പേ ഉപയോഗത്തിലുണ്ട്. മറ്റൊരെണ്ണം ശ്രമിക്കുക."
@@ -580,7 +581,7 @@ msgstr "വിളിപ്പേര് മുമ്പേ ഉപയോഗത്
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "സാധുവായ വിളിപ്പേര് അല്ല."
@@ -592,7 +593,7 @@ msgstr "സാധുവായ വിളിപ്പേര് അല്ല."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "ഹോംപേജിന്റെ യൂ.ആർ.എൽ. സാധുവല്ല."
@@ -602,7 +603,7 @@ msgstr "ഹോംപേജിന്റെ യൂ.ആർ.എൽ. സാധുവ
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "പൂർണ്ണ നാമത്തിന്റെ നീളം വളരെ കൂടുതലാണ് (പരമാവധി 255 അക്ഷരങ്ങൾ)."
@@ -629,7 +630,7 @@ msgstr[1] ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr ""
@@ -686,22 +687,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "%2$s എന്ന സംഘത്തിൽ %1$s എന്ന ഉപയോക്താവിനെ ചേർക്കാൻ കഴിഞ്ഞില്ല."
@@ -713,9 +718,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -772,9 +779,12 @@ msgid "Request token already authorized."
 msgstr "അഭ്യർത്ഥനാ ചീട്ട് മുമ്പേ തന്നെ അംഗീകരിക്കപ്പെട്ടതാണ്."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -782,7 +792,7 @@ msgstr "അഭ്യർത്ഥനാ ചീട്ട് മുമ്പേ ത
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -803,18 +813,20 @@ msgstr ""
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "അപ്രതീക്ഷിത ഫോം സമർപ്പിക്കൽ."
@@ -862,7 +874,7 @@ msgstr "അംഗത്വം"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "വിളിപ്പേര്"
@@ -870,7 +882,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "രഹസ്യവാക്ക്"
 
@@ -974,10 +986,12 @@ msgstr "ആ അറിയിപ്പ് മുമ്പേ തന്നെ ആ
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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."
@@ -1008,9 +1022,8 @@ 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
@@ -1096,7 +1109,7 @@ msgstr ""
 #: actions/apitimelinepublic.php:193 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
-msgstr "%s പൊതു സമയരേഖ"
+msgstr "%s സാർവ്വജനിക സമയരേഖ"
 
 #. TRANS: Subtitle for site timeline. %s is the StatusNet sitename.
 #: actions/apitimelinepublic.php:199 actions/publicrss.php:105
@@ -1179,9 +1192,9 @@ msgstr ""
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
 #: actions/apitimelineuser.php:381
-#, fuzzy, php-format
+#, php-format
 msgid "No content for notice %d."
-msgstr "ഉള്ളടക്കമൊന്നും %s എന്ന അറിയിപ്പിനു നൽകിയിട്ടില്ല."
+msgstr "%d എന്ന അറിയിപ്പിനു ഉള്ളടക്കമില്ല"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #: actions/apitimelineuser.php:409
@@ -1245,13 +1258,12 @@ 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 "മറ്റൊരാളുടെ അംഗത്വം മായ്ക്കാനാവില്ല."
+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 "പങ്ക് ചേരൽ പ്രക്രിയകൾ മാത്രം കൈകാര്യം ചെയ്യാനേ കഴിയൂ."
 
@@ -1278,29 +1290,51 @@ 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "മറ്റൊരാളുടെ അംഗത്വം മായ്ക്കാനാവില്ല."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "അത്തരത്തിൽ ഒരു സംഘം ഇല്ല"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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 using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "HTTP method not supported"
-msgstr "എച്ച്.റ്റി.റ്റി.പി. രീതി പിന്തുണയ്ക്കുന്നില്ല."
+msgid "Not a member."
+msgstr "അംഗം അല്ല"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
 msgstr "മറ്റൊരാളുടെ അംഗത്വം മായ്ക്കാനാവില്ല."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1469,35 +1503,42 @@ msgstr "അവതാരം അപ്‌ലോഡ് ചെയ്യുന്ന
 msgid "Avatar deleted."
 msgstr ""
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "പശ്ചാത്തലം"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1528,14 +1569,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "അല്ല"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "ഈ ഉപയോക്താവിനെ തടയരുത്"
 
@@ -1547,7 +1587,7 @@ msgstr "ഈ ഉപയോക്താവിനെ തടയരുത്"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "അതെ"
@@ -1563,32 +1603,6 @@ msgstr "ഈ ഉപയോക്താവിനെ തടയുക"
 msgid "Failed to save block information."
 msgstr "തടയലിന്റെ വിവരങ്ങൾ സേവ് ചെയ്യുന്നതിൽ പരാജയപ്പെട്ടു."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "അങ്ങനെ ഒരു സംഘം ഇല്ല."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1715,7 +1729,8 @@ msgid "Account deleted."
 msgstr "അംഗത്വം മായ്ച്ചിരിക്കുന്നു."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 msgid "Delete account"
 msgstr "അംഗത്വം മായ്ക്കുക"
 
@@ -1737,8 +1752,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "സ്ഥിരീകരിക്കുക"
 
@@ -1808,8 +1824,10 @@ 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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 "വിളിപ്പേരോ ഐ.ഡി.യോ ഇല്ല."
 
@@ -1857,10 +1875,11 @@ msgid "Delete this group"
 msgstr "ഈ സംഘത്തെ മായ്ക്കുക"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1900,19 +1919,30 @@ msgstr "ഈ അറിയിപ്പ് മായ്ക്കരുത്"
 msgid "Delete this notice"
 msgstr "ഈ അറിയിപ്പ് മായ്ക്കുക"
 
-#: actions/deleteuser.php:67
+#. 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 "താങ്കൾക്ക് പ്രാദേശിക ഉപയോക്താക്കളെ മാത്രമേ നീക്കം ചെയ്യാൻ കഴിയൂ."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "ഉപയോക്താവിനെ നീക്കം ചെയ്യുക"
 
-#: actions/deleteuser.php:136
+#. 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."
@@ -1920,78 +1950,102 @@ 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:163 lib/deleteuserform.php:77
+#. 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.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "രൂപകല്പന"
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr "ഈ സ്റ്റാറ്റസ്‌നെറ്റ് സൈറ്റിന്റെ രൂപകല്പനാ സജ്ജീകരണങ്ങൾ"
 
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "ലോഗോ യൂ.ആർ.എൽ. അസാധുവാണ്."
 
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
 msgid "Invalid SSL logo URL."
 msgstr "അസാധുവായ എസ്.എസ്.എൽ. ലോഗോ യൂ.ആർ.എൽ."
 
-#: actions/designadminpanel.php:344
+#. 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."
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "ലോഗോ മാറ്റുക"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "സൈറ്റിന്റെ ലോഗോ"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "എസ്.എസ്.എൽ. ലോഗോ"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "ദൃശ്യരൂപം മാറ്റുക"
 
-#: actions/designadminpanel.php:486
+#. 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 "ഈ സൈറ്റിന്റെ ദൃശ്യരൂപം."
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "ഐച്ഛിക ദൃശ്യരൂപം"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 msgid "Change background image"
-msgstr "പശ്ചാത്തല ചിത്രം മാറ്റുക"
+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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "പശ്ചാത്തലം"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2001,98 +2055,108 @@ msgstr ""
 "വലിപ്പം %1$s ആയിരിക്കണം."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "സജ്ജം"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
-msgstr ""
+msgstr "പശ്ചാത്തലചിത്രം ആവർത്തിച്ചു ചേർക്കുക"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. 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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "കണ്ണികൾ"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "വിപുലം"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "സ്വന്തം സി.എസ്.എസ്."
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
 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:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "മുമ്പ് സ്വതേയുണ്ടായിരുന്നതിലേയ്ക്ക് പുനഃസ്ഥാപിക്കുക"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "സേവ് ചെയ്യുക"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "രൂപകല്പന സേവ്‌ ചെയ്യുക"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr ""
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr ""
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2394,7 +2458,6 @@ msgstr "ആ ഇമെയിൽ വിലാസം മറ്റൊരു ഉപ
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
 #: actions/emailsettings.php:426 actions/imsettings.php:343
 #: actions/smssettings.php:365
-#, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "സ്ഥിരീകരണ കോഡ് ഉൾപ്പെടുത്താൻ കഴിഞ്ഞില്ല."
 
@@ -2424,7 +2487,6 @@ 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:468 actions/smssettings.php:413
-#, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "ഇമെയിൽ സ്ഥിരീകരണം നീക്കം ചെയ്യാൻ കഴിഞ്ഞില്ല."
 
@@ -2533,11 +2595,11 @@ msgstr ""
 
 #: actions/file.php:34
 msgid "No notice ID."
-msgstr ""
+msgstr "അറിയിപ്പിന്റെ ഐ.ഡി. ഇല്ല."
 
 #: actions/file.php:38
 msgid "No notice."
-msgstr ""
+msgstr "അറിയിപ്പ് ഇല്ല."
 
 #: actions/file.php:42
 msgid "No attachments."
@@ -2800,8 +2862,13 @@ msgid ""
 "for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
 "%%%%)"
 msgstr ""
+"സമാന താത്പര്യങ്ങളുള്ള ആൾക്കാരെ കണ്ടെത്താൻ %%%%site.name%%%% സംഘങ്ങൾ സഹായമാവുന്നു. ഒരു "
+"സംഘത്തിൽ ചേർന്നു കഴിഞ്ഞാൽ \"!groupname\" എന്ന് ഉപയോഗിച്ച് സംഘത്തിലെ എല്ലാവർക്കുമായി "
+"സന്ദേശമയയ്ക്കാൻ സാധിക്കും. താങ്കൾക്ക് താത്പര്യമുള്ള സംഘം കണ്ടെത്താനായില്ലേ? [തിരഞ്ഞു നോക്കുക](%%"
+"%%action.groupsearch%%%%) അല്ലെങ്കിൽ [താങ്കൾ തന്നെ ഒരെണ്ണം തുടങ്ങുക!](%%%%action."
+"newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "പുതിയൊരു സംഘം സൃഷ്ടിക്കുക"
 
@@ -2811,6 +2878,9 @@ msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
+"%%site.name%% സൈറ്റിൽ അവയുടെ പേരിനേയോ, പ്രദേശത്തിനേയോ, വിവരണത്തിനേയോ അടിസ്ഥാനമാക്കി "
+"സംഘങ്ങൾ തിരയുക. ഒന്നിലധികം പദങ്ങൾ ഉണ്ടെങ്കിൽ അവയ്ക്കിടയിൽ ഇട നൽകുക; ഓരോ പദത്തിലും മൂന്നോ "
+"അതിലധികമോ അക്ഷരങ്ങൾ ഉണ്ടായിരിക്കണം."
 
 #: actions/groupsearch.php:58
 msgid "Group search"
@@ -2909,6 +2979,8 @@ msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
+"ജാബ്ബർ അല്ലെങ്കിൽ ജിറ്റോക് വിലാസം, \"UserName@example.org\" എന്ന രീതിയിൽ. ആദ്യം %s "
+"താങ്കളുടെ ഐ.എം. ക്ലയന്റിലോ ജിറ്റോക്കിലോ സുഹൃത്തുക്കളുടെ പട്ടികയിലുണ്ടെന്നുറപ്പാക്കുക."
 
 #. TRANS: Form legend for IM preferences form.
 #: actions/imsettings.php:154
@@ -2983,9 +3055,8 @@ msgstr "ഇത് തെറ്റായ ഐ.എം. വിലാസമാണ്.
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
 #: actions/imsettings.php:391
-#, fuzzy
 msgid "Could not delete IM confirmation."
-msgstr "ഇമെയിൽ സ്ഥിരീകരണം നീക്കം ചെയ്യാൻ കഴിഞ്ഞില്ല."
+msgstr "ഐ.എം. സ്ഥിരീകരണം നീക്കം ചെയ്യാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
 #: actions/imsettings.php:396
@@ -3015,7 +3086,7 @@ msgstr ""
 
 #: actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."
-msgstr ""
+msgstr "ഇതാണ് താങ്കളുടെ ഇൻബോക്സ്, താങ്കൾക്ക് വരുന്ന സ്വകാര്യസന്ദേശങ്ങൾ ഇവിടെയാണെത്തുക."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
 #: actions/invite.php:40
@@ -3027,7 +3098,7 @@ msgstr "ക്ഷണം പ്രവർത്തന രഹിതമാക്ക
 #: actions/invite.php:44
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
-msgstr ""
+msgstr "%s ഉപയോഗിക്കാൻ മറ്റുപയോക്താക്കളെ ക്ഷണിക്കാൻ താങ്കൾ ലോഗിൻ ചെയ്തിരിക്കണം."
 
 #. TRANS: Form validation message when providing an e-mail address that does not validate.
 #. TRANS: %s is an invalid e-mail address.
@@ -3170,26 +3241,33 @@ msgid ""
 "Sincerely, %2$s\n"
 msgstr ""
 
-#: actions/joingroup.php:60
+#. 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 "ഒരു സംഘത്തിൽ ചേരാൻ താങ്കൾ ലോഗിൻ ചെയ്തിരിക്കേണ്ടതാണ്."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s %2$s എന്ന സംഘത്തിൽ ചേർന്നു"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "താങ്കൾ ആ സംഘത്തിൽ അംഗമല്ല."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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 എന്ന സംഘത്തിൽ നിന്നും ഒഴിവായി"
 
@@ -3294,6 +3372,13 @@ msgstr "അനുമതി ചിത്ര യൂ.ആർ.എൽ."
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "സേവ് ചെയ്യുക"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "അനുമതി സജ്ജീകരണങ്ങൾ സേവ് ചെയ്യുക"
@@ -3318,11 +3403,11 @@ msgstr "പ്രവേശിക്കുക"
 msgid "Login to site"
 msgstr "സൈറ്റിലേക്ക് പ്രവേശിക്കുക"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "എന്നെ ഓർത്തുവെയ്ക്കുക"
 
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "ഭാവിയിൽ സ്വയം ലോഗിൻ ചെയ്യുക; പങ്ക് വെച്ച് ഉപയോഗിക്കുന്ന കമ്പ്യൂട്ടറുകളിൽ പാടില്ല!"
 
@@ -3696,7 +3781,8 @@ msgstr "രഹസ്യവാക്ക് മാറ്റുക"
 msgid "Change your password."
 msgstr "താങ്കളുടെ രഹസ്യവാക്ക് മാറ്റുക."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "രഹസ്യവാക്ക് മാറ്റൽ"
 
@@ -3704,7 +3790,8 @@ msgstr "രഹസ്യവാക്ക് മാറ്റൽ"
 msgid "Old password"
 msgstr "പഴയ രഹസ്യവാക്ക്"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "പുതിയ രഹസ്യവാക്ക്"
 
@@ -3712,7 +3799,7 @@ msgstr "പുതിയ രഹസ്യവാക്ക്"
 msgid "6 or more characters"
 msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "മുകളിലുള്ള രഹസ്യവാക്ക് തന്നെ"
 
@@ -3736,11 +3823,12 @@ msgstr "പഴയ രഹസ്യവാക്ക് തെറ്റാണ്"
 msgid "Error saving user; invalid."
 msgstr ""
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "പുതിയ രഹസ്യവാക്ക് സേവ് ചെയ്യാനായില്ല."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "രഹസ്യവാക്ക് സേവ് ചെയ്തിരിക്കുന്നു."
 
@@ -4061,22 +4149,23 @@ msgid "Profile information"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 msgid "Full name"
 msgstr "പൂർണ്ണനാമം"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "ഹോംപേജ്"
 
@@ -4088,7 +4177,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:472
+#: 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"
@@ -4096,27 +4185,27 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "സ്ഥലം"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "താങ്കളെവിടെയാണ്, അതായത് \"നഗരം, സംസ്ഥാനം (അഥവ പ്രദേശം), രാജ്യം\" എന്ന്"
 
@@ -4167,7 +4256,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:257 actions/register.php:229
+#: 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)."
@@ -4175,55 +4264,56 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "സമയമേഖല തിരഞ്ഞെടുത്തിട്ടില്ല."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "എന്റെ സ്ഥാനം പങ്ക് വെയ്ക്കരുത്"
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 msgid "Could not save tags."
-msgstr ""
+msgstr "റ്റാഗുകൾ സേവ് ചെയ്യാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Confirmation shown when user profile settings are saved.
 #. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "അംഗത്വം പുനഃക്രമീകരിക്കുക"
 
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
-msgstr ""
+msgstr "താളിന്റെ പരിധിയ്ക്ക് (%s) പുറത്താണ്."
 
 #: actions/public.php:92
 msgid "Could not retrieve public stream."
@@ -4232,11 +4322,11 @@ msgstr ""
 #: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
-msgstr ""
+msgstr "സാർവ്വജനിക സമയരേഖ, താൾ %d"
 
 #: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
-msgstr ""
+msgstr "സാർവ്വജനിക സമയരേഖ"
 
 #: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
@@ -4326,35 +4416,43 @@ msgstr ""
 msgid "Tag cloud"
 msgstr ""
 
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "താങ്കൾ മുമ്പേതന്നെ ലോഗിൻ ചെയ്തിട്ടുണ്ട്!"
 
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr ""
 
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr ""
 
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr ""
 
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "സ്ഥിരീകരണ കോഡിൽ പിഴവുണ്ട്."
 
-#: actions/recoverpassword.php:97
+#. 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 "ഈ സ്ഥിരീകരണ കോഡ് വളരെ പഴക്കമേറിയതാണ്. ദയവായി ആദ്യം മുതൽ വീണ്ടും ശ്രമിക്കുക."
 
-#: actions/recoverpassword.php:111
+#. 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 ""
 
-#: actions/recoverpassword.php:152
+#. 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."
@@ -4362,68 +4460,101 @@ msgstr ""
 "താങ്കളുടെ രഹസ്യവാക്ക് നഷ്ടപ്പെടുകയോ മറക്കുകയോ ചെയ്താൽ, താങ്കളുടെ അംഗത്വത്തിനൊപ്പം "
 "സൂക്ഷിച്ചിട്ടുള്ള ഇമെയിൽ വിലാസത്തിലേക്ക് പുതിയ ഒരെണ്ണം അയച്ചു വാങ്ങാനാകുന്നതാണ്."
 
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
 msgstr "താങ്കൾ തിരിച്ചറിയപ്പെട്ടിരിക്കുന്നു. താഴെ പുതിയ രഹസ്യവാക്ക് നൽകുക. "
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "രഹസ്യവാക്ക് വീണ്ടെടുക്കൽ"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "വിളിപ്പേര് അല്ലെങ്കിൽ ഇമെയിൽ വിലാസം"
 
-#: actions/recoverpassword.php:193
+#. 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 ""
 "ഈ സെർവറിലെ താങ്കളുടെ വിളിപ്പേര്, അഥവാ താങ്കൾ രജിസ്റ്റർ ചെയ്തിട്ടുള്ള ഇമെയിൽ വിലാസം."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "വീണ്ടെടുക്കുക"
 
-#: actions/recoverpassword.php:208
+#. 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 "രഹസ്യവാക്ക് പുനഃക്രമീകരിക്കുക"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "രഹസ്യവാക്ക് വീണ്ടെടുക്കുക"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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 "രഹസ്യവാക്ക് വീണ്ടെടുക്കൽ ആവശ്യപ്പെട്ടിരിക്കുന്നു"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "അജ്ഞാതമായ പ്രവൃത്തി"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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 "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ, അത് മറക്കരുത്!"
 
-#: actions/recoverpassword.php:243
+#. 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
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "പുനഃക്രമീകരിക്കുക"
 
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "ഒരു വിളിപ്പേരോ ഇമെയിൽ വിലാസമോ നൽകുക."
 
-#: actions/recoverpassword.php:282
+#. 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 "ആ ഇമെയിൽ വിലാസമോ ഉപയോക്തൃനാമമോ ഉപയോഗിക്കുന്ന ഒരു ഉപയോക്താവും ഇല്ല."
 
-#: actions/recoverpassword.php:299
+#. 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 "ആ ഉപയോക്താവ് ഇമെയിൽ വിലാസമൊന്നും നൽകിയിട്ടില്ല."
 
-#: actions/recoverpassword.php:313
+#. 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 "വിലാസത്തിന്റെ സ്ഥിരീകരണം സേവ് ചെയ്യുമ്പോൾ പിഴവുണ്ടായി."
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4431,23 +4562,34 @@ msgstr ""
 "താങ്കളുടെ രഹസ്യവാക്ക് പുനഃസ്ഥാപിക്കാനുള്ള നിർദ്ദേശങ്ങൾ താങ്കളുടെ അംഗതത്തോടൊപ്പം നൽകിയിട്ടുള്ള "
 "ഇമെയിൽ വിലാസത്തിലേയ്ക്ക് അയച്ചിട്ടുണ്ട്."
 
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "അപ്രതീക്ഷിത രഹസ്യവാക്ക് പുനഃക്രമീകരണം."
 
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
 msgid "Password must be 6 characters or more."
 msgstr "രഹസ്യവാക്കിന് ആറോ അതിലധികമോ അക്ഷരങ്ങളുണ്ടായിരിക്കണം."
 
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "രഹസ്യവാക്കും സ്ഥിരീകരണവും യോജിക്കുന്നില്ല."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "ഉപയോക്താവിനെ സജ്ജീകരിക്കുന്നതിൽ പിഴവുണ്ടായി."
 
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "പുതിയ രഹസ്യവാക്ക് വിജയകരമായി സേവ് ചെയ്തു. താങ്കൾക്ക് ലോഗിൻ ചെയ്യാവുന്നതാണ്."
 
@@ -4463,7 +4605,7 @@ msgstr "ക്ഷമിക്കുക, ക്ഷണത്തിന്റെ ക
 msgid "Registration successful"
 msgstr "അംഗത്വമെടുക്കൽ വിജയകരം"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "അംഗത്വമെടുക്കുക"
 
@@ -4489,66 +4631,63 @@ msgid ""
 "link up to friends and colleagues. "
 msgstr ""
 
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ. ആവശ്യമാണ്."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "മുകളിൽ നിലകിയിരിക്കുന്ന രഹസ്യവാക്കിനു തുല്യമായത്. നിർബന്ധമാണ്."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ"
 
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "ഇമെയിൽ"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
+"പുതുക്കൽ വിവരങ്ങൾക്കും, അറിയിപ്പുകൾക്കും, രഹസ്യവാക്ക് വീണ്ടെടുക്കൽ പ്രവർത്തനത്തിനും മാത്രം "
+"ഉപയോഗിച്ചത്"
 
-#: actions/register.php:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "വലിയ പേര്, താങ്കളുടെ \"യഥാർത്ഥ\" പേര് നൽകാൻ താത്പര്യപ്പെടുന്നു"
 
-#: actions/register.php:463
+#: actions/register.php:462
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
+"താങ്കളുടെ ഹോംപേജിന്റെ, ബ്ലോഗിന്റെ അല്ലെങ്കിൽ മറ്റൊരു സൈറ്റിലെ താങ്കളെക്കുറിച്ചുള്ള "
+"താളിലേയ്ക്കുള്ള യൂ.ആർ.എൽ."
 
-#: actions/register.php:524
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:534
+#: 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:538
+#: actions/register.php:537
 msgid "My text and files remain under my own copyright."
-msgstr ""
+msgstr "എന്റെ എഴുത്തുകളും പ്രമാണങ്ങളും എന്റെ സ്വന്തം പകർപ്പവകാശത്തിലായിരിക്കും."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "എല്ലാ അവകാശങ്ങളും സംരക്ഷിതം."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: 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:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4567,7 +4706,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -4624,9 +4763,8 @@ msgid "That is a local profile! Login to subscribe."
 msgstr "വരിക്കാരനാകുന്നതിൽ നിന്നും ആ ഉപയോക്താവ് താങ്കളെ തടഞ്ഞിരിക്കുന്നു."
 
 #: actions/remotesubscribe.php:182
-#, fuzzy
 msgid "Could not get a request token."
-msgstr "അസാധുവായ അഭ്യർത്ഥനാ ചീട്ട്."
+msgstr "അഭ്യർത്ഥനാ ചീട്ട് ലഭ്യമാക്കാനായില്ല."
 
 #: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
@@ -4637,7 +4775,6 @@ msgid "No notice specified."
 msgstr "അറിയിപ്പുകളൊന്നും വ്യക്തമാക്കിയിട്ടില്ല."
 
 #: actions/repeat.php:75
-#, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "താങ്കൾക്ക് താങ്കളുടെ തന്നെ അറിയിപ്പ് ആവർത്തിക്കാനാവില്ല."
 
@@ -4741,7 +4878,7 @@ 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 ""
+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
@@ -4756,7 +4893,7 @@ msgstr ""
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
 #: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
 msgid "System error uploading file."
-msgstr ""
+msgstr "പ്രമാണം അപ്‌ലോഡ് ചെയ്തുകൊണ്ടിരിക്കെ സിസ്റ്റം പിഴവുണ്ടായി."
 
 #. TRANS: Client exception thrown when a feed is not an Atom feed.
 #: actions/restoreaccount.php:207
@@ -4835,7 +4972,7 @@ msgstr ""
 
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 msgid "Save site settings"
-msgstr ""
+msgstr "സൈറ്റ് സജ്ജീകരണങ്ങൾ ചേവ് ചെയ്യുക"
 
 #: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
@@ -4863,7 +5000,7 @@ msgstr "സംഘടന"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "വിവരണം"
 
@@ -4886,8 +5023,9 @@ msgstr ""
 msgid "Reset key & secret"
 msgstr ""
 
+#. TRANS: Title of form for deleting a user.
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "മായ്ക്കുക"
 
@@ -4920,6 +5058,8 @@ msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
+"ശ്രദ്ധിക്കുക: HMAC-SHA1 ഒപ്പുകളാണ് ഞങ്ങൾ പിന്തുണയ്ക്കുന്നത്. പ്ലെയിൻ-ടെക്സ്റ്റ് ഒപ്പ് രീതി ഞങ്ങൾ "
+"പിന്തുണയ്ക്കുന്നില്ല."
 
 #: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
@@ -5005,7 +5145,7 @@ msgid "Note"
 msgstr "കുറിപ്പ്"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr ""
 
@@ -5065,7 +5205,7 @@ msgstr "സൃഷ്ടിച്ചിരിക്കുന്നു"
 #: actions/showgroup.php:461
 msgctxt "LABEL"
 msgid "Members"
-msgstr ""
+msgstr "അംഗങ്ങൾ"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
 #. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
@@ -5242,11 +5382,11 @@ msgstr "ഈ സ്റ്റാറ്റസ്‌നെറ്റ് സൈറ്
 
 #: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
-msgstr ""
+msgstr "സൈറ്റിന്റെ പേര് ശൂന്യമായിരിക്കരുത്."
 
 #: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
-msgstr ""
+msgstr "താങ്കളെ ബന്ധപ്പെടാനായി സാധുവായ ഇമെയിൽ വിലാസമുണ്ടായിരിക്കണം."
 
 #: actions/siteadminpanel.php:159
 #, php-format
@@ -5255,7 +5395,7 @@ msgstr "അപരിചിതമായ ഭാഷ \"%s\"."
 
 #: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
-msgstr ""
+msgstr "എഴുത്തുകളുടെ ഏറ്റവും ചെറിയ പരിധി 0 ആണ് (പരിധിയില്ല)."
 
 #: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
@@ -5319,11 +5459,11 @@ msgstr "പരിധികൾ"
 
 #: actions/siteadminpanel.php:274
 msgid "Text limit"
-msgstr ""
+msgstr "എഴുത്തിന്റെ പരിധി"
 
 #: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
-msgstr ""
+msgstr "അറിയിപ്പുകളിലെ അക്ഷരങ്ങളുടെ പരമാവധി പരിധി."
 
 #: actions/siteadminpanel.php:278
 msgid "Dupe limit"
@@ -5346,7 +5486,7 @@ msgstr ""
 #. TRANS: Server error displayed when saving a site-wide notice was impossible.
 #: actions/sitenoticeadminpanel.php:101
 msgid "Unable to save site notice."
-msgstr ""
+msgstr "സൈറ്റ് അറിയിപ്പ് സേവ് ചെയ്യാനായില്ല."
 
 #. TRANS: Client error displayed when a site-wide notice was longer than allowed.
 #: actions/sitenoticeadminpanel.php:112
@@ -5366,12 +5506,12 @@ msgstr ""
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
 msgid "Save site notice"
-msgstr ""
+msgstr "സൈറ്റ് അറിയിപ്പ് സേവ് ചെയ്യുക"
 
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:57
 msgid "SMS settings"
-msgstr ""
+msgstr "എസ്.എം.എസ്. സജ്ജീകരണങ്ങൾ"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -5379,6 +5519,8 @@ msgstr ""
 #, 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
@@ -5393,12 +5535,12 @@ msgstr "എസ്.എം.എസ്. വിലാസം"
 #. TRANS: Form guide in SMS settings form.
 #: actions/smssettings.php:116
 msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
+msgstr "ഇപ്പോഴത്തെ സ്ഥിരീകരിച്ച എസ്.എം.എസ്. സജ്ജമായ ഫോൺ നമ്പർ."
 
 #. TRANS: Form guide in IM settings form.
 #: actions/smssettings.php:129
 msgid "Awaiting confirmation on this phone number."
-msgstr ""
+msgstr "ഈ ഫോൺ നമ്പരിൽ നിന്നുള്ള സ്ഥിരീകരണത്തിനായി കാക്കുന്നു."
 
 #. TRANS: Field label for SMS address input in SMS settings form.
 #: actions/smssettings.php:138
@@ -5408,7 +5550,7 @@ msgstr "സ്ഥിരീകരണ കോഡ്"
 #. TRANS: Form field instructions in SMS settings form.
 #: actions/smssettings.php:140
 msgid "Enter the code you received on your phone."
-msgstr ""
+msgstr "താങ്കളുടെ ഫോണിൽ ലഭിച്ച കോഡ് നൽകുക."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
 #: actions/smssettings.php:144
@@ -5419,7 +5561,7 @@ msgstr "സ്ഥിരീകരിക്കുക"
 #. TRANS: Field label for SMS phone number input in SMS settings form.
 #: actions/smssettings.php:149
 msgid "SMS phone number"
-msgstr ""
+msgstr "എസ്.എം.എസ്. ഫോൺ നമ്പർ."
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:152
@@ -5429,7 +5571,7 @@ msgstr ""
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:191
 msgid "SMS preferences"
-msgstr ""
+msgstr "എസ്.എം.എസ്. ക്രമീകരണങ്ങൾ"
 
 #. TRANS: Checkbox label in SMS preferences form.
 #: actions/smssettings.php:197
@@ -5441,7 +5583,7 @@ msgstr ""
 #. TRANS: Confirmation message for successful SMS preferences save.
 #: actions/smssettings.php:308
 msgid "SMS preferences saved."
-msgstr ""
+msgstr "എസ്.എം.എസ്. ക്രമീകരണങ്ങൾ സേവ് ചെയ്യപ്പെട്ടിട്ടുണ്ട്."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
 #: actions/smssettings.php:330
@@ -5456,12 +5598,12 @@ msgstr ""
 #. TRANS: Message given saving SMS phone number that is already set.
 #: actions/smssettings.php:344
 msgid "That is already your phone number."
-msgstr ""
+msgstr "അതാണ് താങ്കളുടെ ഫോൺ നമ്പരായി മുമ്പേ ഉള്ളത്."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
 #: actions/smssettings.php:348
 msgid "That phone number already belongs to another user."
-msgstr ""
+msgstr "ആ ഫോൺ നമ്പർ മുമ്പേ തന്നെ മറ്റൊരു ഉപയോക്താവിന് അവകാശപ്പെട്ടതാണ്."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
 #: actions/smssettings.php:376
@@ -5469,27 +5611,29 @@ 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
 msgid "That is the wrong confirmation number."
-msgstr ""
+msgstr "അത് തെറ്റായ സ്ഥിരീകരണ സംഖ്യയാണ്."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 #: actions/smssettings.php:418
 msgid "SMS confirmation cancelled."
-msgstr ""
+msgstr "എസ്.എം.എസ്. സ്ഥിരീകരണം റദ്ദാക്കി."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
 #: actions/smssettings.php:438
 msgid "That is not your phone number."
-msgstr ""
+msgstr "അത് താങ്കളുടെ ഫോൺ നമ്പരല്ല."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
 #: actions/smssettings.php:460
 msgid "The SMS phone number was removed."
-msgstr ""
+msgstr "എസ്.എം.എസ്. ഫോൺ നമ്പർ നീക്കം ചെയ്തിരിക്കുന്നു."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
 #: actions/smssettings.php:499
@@ -5513,7 +5657,7 @@ msgstr ""
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
 msgid "No code entered"
-msgstr ""
+msgstr "യാതൊരു കോഡും ചേർത്തിട്ടില്ല"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
@@ -5563,7 +5707,7 @@ msgstr ""
 
 #: actions/snapshotadminpanel.php:226
 msgid "Report URL"
-msgstr ""
+msgstr "യൂ.ആർ.എൽ. അറിയിക്കുക"
 
 #: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
@@ -5734,7 +5878,7 @@ msgstr ""
 #: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
-msgstr ""
+msgstr "റ്റാഗ് %s"
 
 #: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
@@ -5766,7 +5910,7 @@ msgstr ""
 
 #: actions/tagrss.php:35
 msgid "No such tag."
-msgstr ""
+msgstr "അത്തരത്തിൽ ഒരു റ്റാഗില്ല."
 
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
@@ -6140,12 +6284,12 @@ msgstr "പ്രമാണത്തിന്റെ പേര് അസാധു
 #. TRANS: Exception thrown when joining a group fails.
 #: classes/Group_member.php:51
 msgid "Group join failed."
-msgstr ""
+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 ""
+msgstr "സംഘത്തിന്റെ ഭാഗമല്ല."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
 #: classes/Group_member.php:72
@@ -6577,7 +6721,7 @@ msgstr "തിരയുക"
 #. TRANS: Menu item for site administration
 #: lib/action.php:620 lib/adminpanelaction.php:387
 msgid "Site notice"
-msgstr ""
+msgstr "സൈറ്റ് അറിയിപ്പ്"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
 #: lib/action.php:687
@@ -6587,7 +6731,7 @@ msgstr ""
 #. TRANS: DT element for page notice. String is hidden in default CSS.
 #: lib/action.php:757
 msgid "Page notice"
-msgstr ""
+msgstr "താളിലെ അറിയിപ്പ്"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
 #: lib/action.php:858
@@ -7444,24 +7588,24 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 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:153
+#: lib/common.php:158
 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr ""
 
@@ -7491,7 +7635,7 @@ msgstr ""
 #: lib/connectsettingsaction.php:120
 msgctxt "MENU"
 msgid "Connections"
-msgstr ""
+msgstr "ബന്ധങ്ങൾ"
 
 #. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
 #: lib/connectsettingsaction.php:122
@@ -7526,11 +7670,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "രഹിതം"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-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: 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".
@@ -7613,31 +7761,27 @@ msgstr "പോകൂ"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 msgid "URL of the homepage or blog of the group or topic."
 msgstr ""
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "സംഘത്തെക്കുറിച്ചോ വിഷയത്തെക്കുറിച്ചോ വിവരിക്കുക"
 
-#: lib/groupeditform.php:170
-#, 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:162
+#, 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] "സംഘത്തെക്കുറിച്ചോ വിഷയത്തെക്കുറിച്ചോ വിവരിക്കുക"
+msgstr[1] "സംഘത്തെക്കുറിച്ചോ വിഷയത്തെക്കുറിച്ചോ വിവരിക്കുക"
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -7755,7 +7899,7 @@ msgstr ""
 
 #: lib/imagefile.php:95
 msgid "Partial upload."
-msgstr ""
+msgstr "ഭാഗിക അപ്‌ലോഡ്."
 
 #: lib/imagefile.php:111
 msgid "Not an image or corrupt file."
@@ -8031,7 +8175,7 @@ msgstr ""
 #: lib/mail.php:680
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
-msgstr ""
+msgstr "%1$s (@%2$s) താങ്കളുടെ ശ്രദ്ധയ്ക്കായി ഒരു അറിയിപ്പ് അയച്ചിരിക്കുന്നു"
 
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's long name, $2$s is the StatusNet sitename,
@@ -8102,7 +8246,7 @@ msgstr "ക്ഷമിക്കുക, ഇങ്ങോട്ട് ഇമെയ
 #: lib/mailhandler.php:229
 #, php-format
 msgid "Unsupported message type: %s"
-msgstr ""
+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
@@ -8145,7 +8289,7 @@ msgstr ""
 
 #: lib/messageform.php:120
 msgid "Send a direct notice"
-msgstr ""
+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
@@ -8258,7 +8402,7 @@ msgstr ""
 
 #: lib/noticelist.php:619
 msgid "Repeated by"
-msgstr ""
+msgstr "ആവർത്തിച്ചത്"
 
 #: lib/noticelist.php:646
 msgid "Reply to this notice"
@@ -8270,7 +8414,7 @@ msgstr "മറുപടി"
 
 #: lib/noticelist.php:691
 msgid "Notice repeated"
-msgstr ""
+msgstr "അറിയിപ്പ് ആവർത്തിച്ചിരിക്കുന്നു"
 
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
@@ -8299,7 +8443,7 @@ msgstr ""
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
 #: lib/oauthstore.php:362
 msgid "Duplicate notice."
-msgstr ""
+msgstr "അറിയിപ്പിന്റെ പകർപ്പ്."
 
 #: lib/oauthstore.php:507
 msgid "Couldn't insert new subscription."
@@ -8627,7 +8771,7 @@ msgstr ""
 
 #: lib/userprofile.php:236 lib/userprofile.php:250
 msgid "User actions"
-msgstr ""
+msgstr "ഉപയോക്തൃ പ്രവൃത്തികൾ"
 
 #: lib/userprofile.php:239
 msgid "User deletion in progress..."
@@ -8651,7 +8795,7 @@ msgstr "സന്ദേശം"
 
 #: lib/userprofile.php:331
 msgid "Moderate"
-msgstr ""
+msgstr "മാധ്യസ്ഥം വഹിക്കുക"
 
 #: lib/userprofile.php:369
 msgid "User role"
@@ -8729,14 +8873,9 @@ msgstr[1] "ഏകദേശം %d മാസം മുമ്പ്"
 msgid "about a year ago"
 msgstr "ഏകദേശം ഒരു വർഷം മുമ്പ്"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s ഒരു സാധുവായ നിറമല്ല!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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 ""
@@ -8772,8 +8911,20 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Method not supported"
-#~ msgstr "പിന്തുണയില്ലാത്ത മാർഗ്ഗമാണ്"
+#~ msgid "No such group"
+#~ msgstr "അത്തരത്തിൽ ഒരു സംഘം ഇല്ല"
 
-#~ msgid "Couldn't update user."
-#~ msgstr "ഉപയോക്തൃ വിവരങ്ങൾ പുതുക്കാൻ കഴിഞ്ഞില്ല."
+#~ msgid "HTTP method not supported"
+#~ msgstr "എച്ച്.റ്റി.റ്റി.പി. രീതി പിന്തുണയ്ക്കുന്നില്ല."
+
+#~ msgid "Reset"
+#~ msgstr "പുനഃക്രമീകരിക്കുക"
+
+#~ msgid "6 or more characters. Required."
+#~ msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ. ആവശ്യമാണ്."
+
+#~ msgid "Same as password above. Required."
+#~ msgstr "മുകളിൽ നിലകിയിരിക്കുന്ന രഹസ്യവാക്കിനു തുല്യമായത്. നിർബന്ധമാണ്."
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s ഒരു സാധുവായ നിറമല്ല!"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index d3a99f627d..76c7252f28 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/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-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:51+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:39+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 (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -76,6 +76,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -87,13 +88,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Lagre"
@@ -324,7 +325,7 @@ msgstr "Du må angi en verdi for parameteren 'device' med en av: sms, im, none."
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Kunne ikke oppdatere bruker."
@@ -348,7 +349,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "Kunne ikke lagre profil."
 
@@ -358,7 +359,7 @@ msgstr "Kunne ikke lagre profil."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
@@ -537,7 +538,8 @@ msgid "That status is not a favorite."
 msgstr "Den statusen er ikke en favoritt."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Kunne ikke slette favoritt."
 
@@ -583,7 +585,7 @@ msgstr "Kunne ikke finne målbruker."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Det nicket er allerede i bruk. Prøv et annet."
@@ -593,7 +595,7 @@ msgstr "Det nicket er allerede i bruk. Prøv et annet."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ugyldig nick."
@@ -605,7 +607,7 @@ msgstr "Ugyldig nick."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Hjemmesiden er ikke en gyldig URL."
@@ -615,7 +617,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Fullt navn er for langt (maks 255 tegn)."
@@ -642,7 +644,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Plasseringen er for lang (maks 255 tegn)."
@@ -699,22 +701,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Kunne ikke legge bruker %1$s til gruppe %2$s."
@@ -726,9 +732,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -788,9 +796,12 @@ msgid "Request token already authorized."
 msgstr "Du er ikke autorisert."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -798,7 +809,7 @@ msgstr "Du er ikke autorisert."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -819,18 +830,20 @@ msgstr "Databasefeil ved innsetting av 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Uventet skjemainnsending."
@@ -884,7 +897,7 @@ msgstr "Konto"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Nick"
@@ -892,7 +905,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Passord"
 
@@ -1000,10 +1013,12 @@ msgstr "Allerede gjentatt den notisen."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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."
@@ -1271,7 +1286,7 @@ msgstr "%s gruppemedlemmer"
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
 #: actions/atompubmembershipfeed.php:219
 #, fuzzy
-msgid "Cannot add someone else's membership"
+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.
@@ -1307,30 +1322,51 @@ 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "Kunne ikke slette favoritt."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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"
+msgid "Not a member."
 msgstr "Alle medlemmer"
 
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "HTTP-metoden støttes ikke."
-
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+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.
@@ -1499,35 +1535,42 @@ msgstr "Oppdatering av avatar mislyktes."
 msgid "Avatar deleted."
 msgstr "Avatar slettet."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Bakgrunn"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1561,14 +1604,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Nei"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "Ikke blokker denne brukeren"
 
@@ -1580,7 +1622,7 @@ msgstr "Ikke blokker denne brukeren"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ja"
@@ -1596,32 +1638,6 @@ msgstr "Blokker denne brukeren"
 msgid "Failed to save block information."
 msgstr "Kunne ikke lagre blokkeringsinformasjon."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Ingen slik gruppe."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1751,7 +1767,8 @@ msgid "Account deleted."
 msgstr "Avatar slettet."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "Opprett en konto"
@@ -1773,8 +1790,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Bekreft"
 
@@ -1849,8 +1867,10 @@ 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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."
 
@@ -1901,10 +1921,11 @@ msgid "Delete this group"
 msgstr "Slett denne gruppen"
 
 #. 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 unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1944,19 +1965,30 @@ msgstr "Ikke slett denne notisen"
 msgid "Delete this notice"
 msgstr "Slett denne notisen"
 
-#: actions/deleteuser.php:67
+#. 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."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Slett bruker"
 
-#: actions/deleteuser.php:136
+#. 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."
@@ -1964,78 +1996,102 @@ msgstr ""
 "Er du sikker på at du vil slette denne brukeren? Dette vil slette alle data "
 "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:163 lib/deleteuserform.php:77
+#. 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.
 #. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "Utseende"
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "Ugyldig logo-URL."
 
-#: actions/designadminpanel.php:340
+#. 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."
 
-#: actions/designadminpanel.php:344
+#. 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."
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Endre logo"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Nettstedslogo"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "SSL-logo"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Endre tema"
 
-#: actions/designadminpanel.php:486
+#. 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."
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Egendefinert tema"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Bakgrunn"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2044,98 +2100,108 @@ 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:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "På"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "Gjenta bakgrunnsbildet"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. 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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "Lenker"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Avansert"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "Egendefinert CSS"
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
 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:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "Tilbakestill til standardverdier"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Lagre"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "Lagre utseende"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "Denne notisen er ikke en favoritt!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "Legg til i favoritter"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2855,7 +2921,7 @@ msgstr ""
 "Prøv å [søke etter en](%%%%action.groupsearch%%%%) eller [start din egen.](%%"
 "%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Opprett en ny gruppe"
 
@@ -3253,26 +3319,33 @@ msgstr ""
 "\n"
 "Vennlig hilsen, %2$s\n"
 
-#: actions/joingroup.php:60
+#. 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."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s ble med i gruppen %2$s"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "Du er ikke et medlem av den gruppen."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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"
 
@@ -3376,6 +3449,13 @@ msgstr "Lisensbildeadresse"
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Lagre"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Lagre lisensinnstillinger"
@@ -3400,11 +3480,11 @@ msgstr "Logg inn"
 msgid "Login to site"
 msgstr "Logg inn på nettstedet"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Husk meg"
 
-#: actions/login.php:259 actions/register.php:493
+#: 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!"
@@ -3793,7 +3873,8 @@ msgstr "Endre passord"
 msgid "Change your password."
 msgstr "Endre passordet ditt."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Endre passord"
 
@@ -3801,7 +3882,8 @@ msgstr "Endre passord"
 msgid "Old password"
 msgstr "Gammelt passord"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nytt passord"
 
@@ -3809,7 +3891,7 @@ msgstr "Nytt passord"
 msgid "6 or more characters"
 msgstr "6 eller flere tegn"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "Samme som passord ovenfor"
 
@@ -3833,11 +3915,12 @@ msgstr "Feil gammelt passord"
 msgid "Error saving user; invalid."
 msgstr "Feil ved lagring av bruker; ugyldig."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "Klarer ikke å lagre nytt passord."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. 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"
 
@@ -4164,22 +4247,23 @@ msgid "Profile information"
 msgstr "Profilinformasjon"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 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:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "Hjemmesiden"
 
@@ -4191,7 +4275,7 @@ 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:472
+#: 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"
@@ -4199,27 +4283,27 @@ 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:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "Plassering"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: 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»"
 
@@ -4273,7 +4357,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:257 actions/register.php:229
+#: 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)."
@@ -4281,48 +4365,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:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Tidssone ikke valgt."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, 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:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Opprett en konto"
@@ -4446,35 +4531,43 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "Merkelappsky"
 
-#: actions/recoverpassword.php:36
+#. 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!"
 
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Ingen slik gjenopprettingskode."
 
-#: actions/recoverpassword.php:66
+#. 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."
 
-#: actions/recoverpassword.php:73
+#. 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."
 
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Bekreftelseskodefeil."
 
-#: actions/recoverpassword.php:97
+#. 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."
 
-#: actions/recoverpassword.php:111
+#. 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."
 
-#: actions/recoverpassword.php:152
+#. 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."
@@ -4482,67 +4575,101 @@ 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:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
 msgstr "Du har blitt identifisert. Skriv inn et nytt passord nedenfor. "
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Passordgjenoppretting"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Kallenavn eller e-postadresse"
 
-#: actions/recoverpassword.php:193
+#. 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."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Gjenopprett"
 
-#: actions/recoverpassword.php:208
+#. 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"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Gjenopprett passord"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Ukjent handling"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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!"
 
-#: actions/recoverpassword.php:243
+#. 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
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Nullstill"
 
-#: actions/recoverpassword.php:252
+#. 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."
 
-#: actions/recoverpassword.php:282
+#. 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."
 
-#: actions/recoverpassword.php:299
+#. 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."
 
-#: actions/recoverpassword.php:313
+#. 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."
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4550,23 +4677,34 @@ msgstr ""
 "Instruksjoner om hvordan du kan gjenopprette ditt passord har blitt sendt "
 "til din registrerte e-postadresse."
 
-#: actions/recoverpassword.php:357
+#. 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."
 
-#: actions/recoverpassword.php:365
+#. 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."
 
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Passord og bekreftelse samsvarer ikke."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "Feil ved innstilling av bruker."
 
-#: actions/recoverpassword.php:395
+#. 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."
 
@@ -4582,7 +4720,7 @@ msgstr "Beklager, ugyldig invitasjonskode."
 msgid "Registration successful"
 msgstr "Registrering vellykket"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Registrer"
 
@@ -4610,59 +4748,52 @@ 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:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 små bokstaver eller tall, ingen punktum eller mellomrom. Påkrevd."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 eller flere tegn. Påkrevd."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Samme som passord over. Kreves."
+#: 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:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-post"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Kun brukt for oppdateringer, kunngjøringer og passordgjenoppretting"
 
-#: actions/register.php:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Lengre navn, helst ditt \"ekte\" navn"
 
-#: actions/register.php:463
+#: actions/register.php:462
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
 
-#: actions/register.php:524
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:534
+#: 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:538
+#: 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:541
+#: 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:546
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4671,7 +4802,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:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4704,7 +4835,7 @@ msgstr ""
 "\n"
 "Takk for at du registrerte deg og vi håper du kommer til å like tjenesten."
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5018,7 +5149,7 @@ msgstr "Organisasjon"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -5041,8 +5172,9 @@ msgstr "Programhandlinger"
 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:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Slett"
 
@@ -5171,7 +5303,7 @@ msgid "Note"
 msgstr "Merk"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "Alias"
 
@@ -7712,26 +7844,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 #, 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:153
+#: lib/common.php:158
 #, 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Log inn på nettstedet"
@@ -7803,12 +7935,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "Av"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Nullstill"
+#. 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: 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".
@@ -7898,33 +8033,29 @@ msgstr "Gå"
 msgid "Grant this user the \"%s\" role"
 msgstr "Innvilg denne brukeren rollen «%s»"
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 små bokstaver eller tall, ingen punktum eller mellomrom"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "Nettadresse til hjemmesiden for dette programmet"
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "Beskriv programmet ditt"
 
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
 #, 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"
+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:182
+#: lib/groupeditform.php:174
 #, 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:190
+#: lib/groupeditform.php:182
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9134,14 +9265,9 @@ msgstr[1] ""
 msgid "about a year ago"
 msgstr "omtrent ett år siden"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s er ikke en gyldig farge."
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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."
@@ -9178,32 +9304,29 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "AtomPub post with unknown attention URI %s"
-#~ msgstr "AtomPub-innlegg med ukjent oppmerksomhets-URI %s"
-
-#~ msgid "No such profile"
-#~ msgstr "Ingen slik profil"
-
-#~ msgid "Notices %s has favorited to on %s"
-#~ msgstr "Notiser som %s har lagt til som favoritt på %s"
+#~ msgid "No such group"
+#~ msgstr "Ingen slik gruppe."
 
 #, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "%1$s grupper %2$s er et medlem av."
+#~ msgid "HTTP method not supported"
+#~ msgstr "HTTP-metoden støttes ikke."
 
-#, fuzzy
-#~ msgid "Method not supported"
-#~ msgstr "API-metode ikke funnet!"
+#~ msgid "Reset"
+#~ msgstr "Nullstill"
 
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Fjernabonner"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 små bokstaver eller tall, ingen punktum eller mellomrom. Påkrevd."
 
-#~ msgid "Couldn't update user."
-#~ msgstr "Klarte ikke å oppdatere bruker."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 eller flere tegn. Påkrevd."
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "Klarte ikke å lagre profil."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Samme som passord over. Kreves."
 
-#~ msgid "Couldn't save tags."
-#~ msgstr "Kunne ikke lagre merkelapper."
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 små bokstaver eller tall, ingen punktum eller mellomrom"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s er ikke en gyldig farge."
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 9ae3a24e62..b511008396 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-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:43+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:32+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -77,6 +77,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -88,13 +89,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Opslaan"
@@ -330,7 +331,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Het was niet mogelijk de gebruiker bij te werken."
@@ -354,7 +355,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "Het was niet mogelijk het profiel op te slaan."
 
@@ -364,7 +365,7 @@ msgstr "Het was niet mogelijk het profiel op te slaan."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
@@ -405,10 +406,9 @@ msgstr "Het was niet mogelijk uw ontwerp bij te werken."
 
 #. TRANS: Title for Atom feed.
 #: actions/apiatomservice.php:85
-#, fuzzy
 msgctxt "ATOM"
 msgid "Main"
-msgstr "Hoofdmenu"
+msgstr "Overzicht"
 
 #. TRANS: Title for Atom feed. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
@@ -544,7 +544,8 @@ 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.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr ""
 "Het was niet mogelijk deze mededeling van uw favorietenlijst te verwijderen."
@@ -593,7 +594,7 @@ msgstr "Het was niet mogelijk de doelgebruiker te vinden."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr ""
@@ -604,7 +605,7 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ongeldige gebruikersnaam!"
@@ -616,7 +617,7 @@ msgstr "Ongeldige gebruikersnaam!"
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "De thuispagina is geen geldige URL."
@@ -626,7 +627,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "De volledige naam is te lang (maximaal 255 tekens)."
@@ -653,7 +654,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "De locatie is te lang (maximaal 255 tekens)."
@@ -710,22 +711,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, 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."
@@ -737,9 +742,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -796,9 +803,12 @@ msgid "Request token already authorized."
 msgstr "Het verzoektoken is al geautoriseerd."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -806,7 +816,7 @@ msgstr "Het verzoektoken is al geautoriseerd."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -831,18 +841,20 @@ msgstr ""
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: 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."
@@ -896,7 +908,7 @@ msgstr "Gebruikersgegevens"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Gebruikersnaam"
@@ -904,7 +916,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -1012,10 +1024,12 @@ msgstr "U hebt die mededeling al herhaald."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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."
@@ -1046,7 +1060,6 @@ 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
-#, fuzzy
 msgid "Cannot delete this notice."
 msgstr "Deze mededeling kan niet verwijderd worden."
 
@@ -1251,13 +1264,11 @@ msgstr "Het profiel bestaat niet."
 #. 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 "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
-#, fuzzy
 msgid "Can only handle favorite activities."
 msgstr ""
 "Het is alleen mogelijk om activiteiten met betrekking tot favorieten af te "
@@ -1288,13 +1299,12 @@ msgstr "groepslidmaatschappen van %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 "Het is niet mogelijk om een lidmaatschap van een ander toe te voegen"
+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
-#, fuzzy
 msgid "Can only handle join activities."
 msgstr ""
 "Het is alleen mogelijk om activiteiten met betrekking tot lidmaatschap af te "
@@ -1323,50 +1333,71 @@ msgstr "De favoriet bestaat niet."
 #. 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 "Het is niet mogelijk om een favoriet van een ander te verwijderen"
+msgid "Cannot delete someone else's favorite."
+msgstr "Het is niet mogelijk om een favoriet van een ander te verwijderen."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "Deze groep bestaat niet"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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 using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "HTTP method not supported"
-msgstr "HTTP-methode wordt niet ondersteund."
+msgid "Not a member."
+msgstr "Geen lid"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
-msgstr "Het is niet mogelijk om een lidmaatschap van een ander te verwijderen"
+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
-#, fuzzy, php-format
+#, 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
-#, fuzzy, php-format
+#, 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
-#, fuzzy
 msgid "Cannot delete someone else's subscription."
 msgstr ""
 "Het is niet mogelijk het abonnement van een andere gebruiker op te zeggen."
@@ -1386,9 +1417,9 @@ msgstr "Het is alleen mogelijk om mensen te volgen."
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #: actions/atompubsubscriptionfeed.php:267
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown profile %s."
-msgstr "Onbekend profiel %s"
+msgstr "Onbekend profiel %s."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
@@ -1519,23 +1550,29 @@ msgstr "Het bijwerken van de avatar is mislukt."
 msgid "Avatar deleted."
 msgstr "De avatar is verwijderd."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr "Reservekopie van gebruiker maken"
 
-#: actions/backupaccount.php:80
+#. 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."
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
+#, 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 an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
@@ -1545,12 +1582,14 @@ msgstr ""
 "privégegevens van de gebruiker zoals e-mailadres en IM-adres worden niet "
 "meegenomen. Hetzelfde geldt voor geüploade bestanden en directe berichten."
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Reservekopie"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr "Uw gebruiker back-uppen"
 
@@ -1584,14 +1623,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Nee"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "Gebruiker niet blokkeren"
 
@@ -1603,7 +1641,7 @@ msgstr "Gebruiker niet blokkeren"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ja"
@@ -1619,32 +1657,6 @@ msgstr "Deze gebruiker blokkeren"
 msgid "Failed to save block information."
 msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "De opgegeven groep bestaat niet."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1771,7 +1783,8 @@ msgid "Account deleted."
 msgstr "De gebruiker is verwijderd."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 msgid "Delete account"
 msgstr "Gebruiker verwijderen"
 
@@ -1796,8 +1809,9 @@ msgstr ""
 "alvorens uw gebruiker te verwijderen."
 
 #. 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Bevestigen"
 
@@ -1872,8 +1886,10 @@ 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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."
 
@@ -1925,10 +1941,11 @@ msgid "Delete this group"
 msgstr "Groep verwijderen"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1968,19 +1985,30 @@ msgstr "Deze mededeling niet verwijderen"
 msgid "Delete this notice"
 msgstr "Deze mededeling verwijderen"
 
-#: actions/deleteuser.php:67
+#. 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."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Gebruiker verwijderen"
 
-#: actions/deleteuser.php:136
+#. 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."
@@ -1989,78 +2017,102 @@ msgstr ""
 "worden alle gegevens van deze gebruiker uit de database verwijderd. Het is "
 "niet mogelijk ze terug te zetten."
 
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "Verwijder deze groep niet"
+
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. 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.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "Uiterlijk"
 
-#: actions/designadminpanel.php:74
+#. 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"
 
-#: actions/designadminpanel.php:335
+#. 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."
 
-#: actions/designadminpanel.php:340
+#. 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."
 
-#: actions/designadminpanel.php:344
+#. 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."
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Logo wijzigen"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Websitelogo"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "SSL-logo"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Vormgeving wijzigen"
 
-#: actions/designadminpanel.php:486
+#. 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."
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Aangepaste vormgeving"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Achtergrond"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2070,98 +2122,108 @@ msgstr ""
 "bestandsgrootte is %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Aan"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "Achtergrondafbeelding naast elkaar"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "Verwijzingen"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Uitgebreid"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "Aangepaste CSS"
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
 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:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
 msgid "Restore default designs"
 msgstr "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:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "Standaardinstellingen toepassen"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Opslaan"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "Ontwerp opslaan"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "Deze mededeling staat niet op uw favorietenlijst."
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "Aan favorieten toevoegen"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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 "Onbekend document \"%s\""
 
 #. TRANS: Title for "Edit application" form.
@@ -2465,7 +2527,6 @@ msgstr "Dit e-mailadres is al geregistreerd door een andere gebruiker."
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
 #: actions/emailsettings.php:426 actions/imsettings.php:343
 #: actions/smssettings.php:365
-#, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "De bevestigingscode kon niet ingevoegd worden."
 
@@ -2495,7 +2556,6 @@ 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:468 actions/smssettings.php:413
-#, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "De e-mailbevestiging kon niet verwijderd worden."
 
@@ -2523,9 +2583,8 @@ msgstr "Geen binnenkomend e-mailadres"
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
 #: actions/emailsettings.php:540 actions/emailsettings.php:565
 #: actions/smssettings.php:564 actions/smssettings.php:587
-#, fuzzy
 msgid "Could not update user record."
-msgstr "Kan de gebruikersgegevens niet vernieuwen"
+msgstr "Kan de gebruikersgegevens niet vernieuwen."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #: actions/emailsettings.php:544 actions/smssettings.php:567
@@ -2896,7 +2955,7 @@ msgstr ""
 "[doorzoek dan de groepen](%%%%action.groupsearch%%%%) of [start zelf een "
 "groep!](%%%%action.newgroup%%%%)."
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Nieuwe groep aanmaken"
 
@@ -3085,7 +3144,6 @@ msgstr "Dat is het verkeerde IM-adres."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
 #: actions/imsettings.php:391
-#, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "De IM-bevestiging kon niet verwijderd worden."
 
@@ -3303,26 +3361,33 @@ msgstr ""
 "\n"
 "Met vriendelijke groet, %2$s\n"
 
-#: actions/joingroup.php:60
+#. 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."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s is lid geworden van de groep %2$s"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "U bent geen lid van deze groep"
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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 heeft de groep %2$s verlaten"
 
@@ -3428,6 +3493,13 @@ msgstr "URL voor licentieafbeelding"
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Opslaan"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Licentieinstellingen opslaan"
@@ -3454,11 +3526,11 @@ msgstr "Aanmelden"
 msgid "Login to site"
 msgstr "Aanmelden"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Aanmeldgegevens onthouden"
 
-#: actions/login.php:259 actions/register.php:493
+#: 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!"
 
@@ -3852,7 +3924,8 @@ msgstr "Wachtwoord wijzigen"
 msgid "Change your password."
 msgstr "Wachtwoord wijzigen"
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Wachtwoord wijzigen"
 
@@ -3860,7 +3933,8 @@ msgstr "Wachtwoord wijzigen"
 msgid "Old password"
 msgstr "Huidige wachtwoord"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
@@ -3868,7 +3942,7 @@ msgstr "Nieuw wachtwoord"
 msgid "6 or more characters"
 msgstr "Zes of meer tekens"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "Gelijk aan het wachtwoord hierboven"
 
@@ -3892,11 +3966,12 @@ msgstr "Het oude wachtwoord is onjuist"
 msgid "Error saving user; invalid."
 msgstr "Fout bij opslaan gebruiker; ongeldig."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "Het was niet mogelijk het nieuwe wachtwoord op te slaan."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. 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."
 
@@ -4224,22 +4299,23 @@ msgid "Profile information"
 msgstr "Profielinformatie"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 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:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "Startpagina"
 
@@ -4251,7 +4327,7 @@ 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:472
+#: 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"
@@ -4259,27 +4335,27 @@ 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:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "Locatie"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: 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\""
 
@@ -4334,7 +4410,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:257 actions/register.php:229
+#: 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)."
@@ -4342,50 +4418,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:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 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:276
+#: actions/profilesettings.php:277
 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:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
 #, 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:346
-#, fuzzy
+#: actions/profilesettings.php:347
 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:404
-#, fuzzy
+#: actions/profilesettings.php:405
 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:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Gebruiker terugladen van back-up"
 
@@ -4509,37 +4584,45 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "Woordwolk"
 
-#: actions/recoverpassword.php:36
+#. 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!"
 
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Onbekende herstelcode."
 
-#: actions/recoverpassword.php:66
+#. 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."
 
-#: actions/recoverpassword.php:73
+#. 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."
 
-#: actions/recoverpassword.php:86
+#. 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."
 
-#: actions/recoverpassword.php:97
+#. 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."
 
-#: actions/recoverpassword.php:111
+#. 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."
 
-#: actions/recoverpassword.php:152
+#. 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."
@@ -4548,69 +4631,102 @@ msgstr ""
 "nieuw wachtwoord toegezonden te krijgen op het e-mailadres dat bij uw "
 "gebruiker staat opgeslagen."
 
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
 msgstr "U bent geïdentificeerd. Voer hieronder een nieuw wachtwoord in. "
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Wachtwoordherstel"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Gebruikersnaam of e-mailadres"
 
-#: actions/recoverpassword.php:193
+#. 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."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Herstellen"
 
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+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"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Wachtwoord herstellen"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Onbekende handeling"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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 "Zes of meer tekens, en vergeet uw wachtwoord niet!"
 
-#: actions/recoverpassword.php:243
-msgid "Reset"
-msgstr "Herstellen"
+#. 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 "Gelijk aan het wachtwoord hierboven"
 
-#: actions/recoverpassword.php:252
+#. 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
+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."
 
-#: actions/recoverpassword.php:282
+#. 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."
 
-#: actions/recoverpassword.php:299
+#. 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."
 
-#: actions/recoverpassword.php:313
+#. 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."
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4618,23 +4734,34 @@ msgstr ""
 "De instructies om uw wachtwoord te herstellen zijn verstuurd naar het e-"
 "mailadres dat voor uw gebruiker is geregistreerd."
 
-#: actions/recoverpassword.php:357
+#. 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."
 
-#: actions/recoverpassword.php:365
+#. 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."
 
-#: actions/recoverpassword.php:369
+#. 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."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+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
 msgid "Error setting user."
 msgstr "Er is een fout opgetreden tijdens het instellen van de gebruiker."
 
-#: actions/recoverpassword.php:395
+#. 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."
 
@@ -4650,7 +4777,7 @@ msgstr "Sorry. De uitnodigingscode is ongeldig."
 msgid "Registration successful"
 msgstr "De registratie is voltooid"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Registreren"
 
@@ -4678,60 +4805,53 @@ 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:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties. Verplicht."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "Zes of meer tekens. Verplicht"
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Gelijk aan het wachtwoord hierboven. Verplicht"
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "Zes of meer tekens"
 
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel"
 
-#: actions/register.php:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Een langere naam, mogelijk uw echte naam"
 
-#: actions/register.php:463
+#: actions/register.php:462
 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:524
+#: 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:534
+#: 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:538
+#: 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:541
+#: 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:546
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4740,7 +4860,7 @@ msgstr ""
 "Mijn teksten en bestanden zijn beschikbaar onder %s, behalve de volgende "
 "privégegevens: wachtwoord, e-mailadres, IM-adres, telefoonnummer."
 
-#: actions/register.php:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4774,7 +4894,7 @@ msgstr ""
 "Dank u wel voor het registreren en we hopen dat deze dienst u biedt wat u "
 "ervan verwacht."
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -4834,12 +4954,10 @@ msgstr ""
 "gedefinieerd)."
 
 #: actions/remotesubscribe.php:175
-#, fuzzy
 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
-#, fuzzy
 msgid "Could not get a request token."
 msgstr "Het was niet mogelijk een verzoektoken te krijgen."
 
@@ -4852,7 +4970,6 @@ msgid "No notice specified."
 msgstr "Er is geen mededeling opgegeven."
 
 #: actions/repeat.php:75
-#, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "U kunt uw eigen mededeling niet herhalen."
 
@@ -5093,7 +5210,7 @@ msgstr "Organisatie"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "Beschrijving"
 
@@ -5116,8 +5233,9 @@ msgstr "Applicatiehandelingen"
 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:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -5247,7 +5365,7 @@ msgid "Note"
 msgstr "Opmerking"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "Aliassen"
 
@@ -7300,7 +7418,6 @@ msgstr ""
 "applicatiegebruiker."
 
 #: lib/apioauthstore.php:345
-#, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr ""
 "Er is een databasefout opgetreden tijdens het toevoegen van de OAuth "
@@ -7877,25 +7994,25 @@ msgstr ""
 "tracking - nog niet beschikbaar\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 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:153
+#: lib/common.php:158
 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "Naar het installatieprogramma gaan."
 
@@ -7962,11 +8079,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "Uit"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Opnieuw instellen"
+#. 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: 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".
@@ -8049,32 +8170,28 @@ msgstr "OK"
 msgid "Grant this user the \"%s\" role"
 msgstr "Deze gebruiker de rol \"%s\" geven"
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "De URL van de thuispagina of de blog van de groep of het onderwerp"
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "Beschrijf de groep of het onderwerp"
 
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+#: lib/groupeditform.php:162
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
 msgstr[0] "Beschrijf de group in %d teken of minder"
 msgstr[1] "Beschrijf de group in %d tekens of minder"
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
 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:190
+#: lib/groupeditform.php:182
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9287,14 +9404,9 @@ msgstr[1] "ongeveer %d maanden geleden"
 msgid "about a year ago"
 msgstr "ongeveer een jaar geleden"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s is geen geldige kleur."
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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."
@@ -9335,29 +9447,28 @@ msgstr "Ongeldige XML. De XRD-root mist."
 msgid "Getting backup from file '%s'."
 msgstr "De back-up wordt uit het bestand \"%s\" geladen."
 
-#~ msgid "AtomPub post with unknown attention URI %s"
-#~ msgstr "Het AtomPubbericht met onbekende aandachts-URI is %s"
+#~ msgid "No such group"
+#~ msgstr "Deze groep bestaat niet"
 
-#~ msgid "No such profile"
-#~ msgstr "Het profiel bestaat niet"
+#~ msgid "HTTP method not supported"
+#~ msgstr "HTTP-methode wordt niet ondersteund."
 
-#~ msgid "Notices %s has favorited to on %s"
-#~ msgstr "Mededelingen die %s als favoriet heeft aangemerkt op %s"
+#~ msgid "Reset"
+#~ msgstr "Herstellen"
 
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Groepen waar %s lid van is op %s"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 kleine letters of cijfers, geen leestekens of spaties. Verplicht."
 
-#~ msgid "Method not supported"
-#~ msgstr "Methode wordt niet ondersteund"
+#~ msgid "6 or more characters. Required."
+#~ msgstr "Zes of meer tekens. Verplicht"
 
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Mensen waarop %s geabonneerd is op %s"
+#~ msgid "Same as password above. Required."
+#~ msgstr "Gelijk aan het wachtwoord hierboven. Verplicht"
 
-#~ msgid "Couldn't update user."
-#~ msgstr "De gebruiker kon gebruiker niet bijwerkt worden."
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties"
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "Het profiel kon niet opgeslagen worden."
-
-#~ msgid "Couldn't save tags."
-#~ msgstr "Het was niet mogelijk de labels op te slaan."
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s is geen geldige kleur."
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 939097338b..3179ecd008 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-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:44+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:36+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 (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nn\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -82,6 +82,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -93,13 +94,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
@@ -327,7 +328,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Kan ikkje oppdatera brukar."
@@ -351,7 +352,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "Kan ikkje lagra profil."
 
@@ -361,7 +362,7 @@ msgstr "Kan ikkje lagra profil."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
@@ -542,7 +543,8 @@ msgid "That status is not a favorite."
 msgstr "Denne notisen er ikkje ein favoritt!"
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Kunne ikkje slette favoritt."
 
@@ -590,7 +592,7 @@ msgstr "Kan ikkje oppdatera brukar."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
@@ -600,7 +602,7 @@ msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ikkje eit gyldig brukarnamn."
@@ -612,7 +614,7 @@ msgstr "Ikkje eit gyldig brukarnamn."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Heimesida er ikkje ei gyldig internettadresse."
@@ -622,7 +624,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -650,7 +652,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -708,23 +710,27 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 #, fuzzy
 msgid "You are already a member of that group."
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Kunne ikkje bli med i gruppa."
@@ -737,9 +743,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -800,9 +808,12 @@ msgid "Request token already authorized."
 msgstr "Du tingar ikkje oppdateringar til den profilen."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -810,7 +821,7 @@ msgstr "Du tingar ikkje oppdateringar til den profilen."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -833,18 +844,20 @@ msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s"
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Uventa skjemasending."
@@ -893,7 +906,7 @@ msgstr "Konto"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Kallenamn"
@@ -901,7 +914,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Passord"
 
@@ -1010,10 +1023,12 @@ msgstr "Kan ikkje sletta notisen."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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
@@ -1289,7 +1304,7 @@ msgstr "%s medlemmar i gruppa"
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
 #: actions/atompubmembershipfeed.php:219
 #, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
 msgstr "Kan ikkje leggja til ny tinging."
 
 #. TRANS: Client error displayed when not using the POST verb.
@@ -1325,30 +1340,51 @@ 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "Kunne ikkje slette favoritt."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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"
+msgid "Not a member."
 msgstr "Alle medlemmar"
 
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "Fann ikkje API-metode."
-
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+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.
@@ -1522,34 +1558,41 @@ msgstr "Feil ved oppdatering av brukarbilete."
 msgid "Avatar deleted."
 msgstr "Lasta opp brukarbilete."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr ""
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1580,14 +1623,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Merknad"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 #, fuzzy
 msgid "Do not block this user"
 msgstr "Lås opp brukaren"
@@ -1600,7 +1642,7 @@ msgstr "Lås opp brukaren"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1617,32 +1659,6 @@ msgstr "Blokkér denne brukaren"
 msgid "Failed to save block information."
 msgstr "Lagring av informasjon feila."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Denne gruppa finst ikkje."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1777,7 +1793,8 @@ msgid "Account deleted."
 msgstr "Lasta opp brukarbilete."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "Opprett ei ny gruppe"
@@ -1799,8 +1816,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Godta"
 
@@ -1876,8 +1894,10 @@ msgid "You must be logged in to delete a group."
 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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."
@@ -1928,10 +1948,11 @@ msgid "Delete this group"
 msgstr "Slett denne gruppa"
 
 #. 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 unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1973,106 +1994,141 @@ msgstr "Kan ikkje sletta notisen."
 msgid "Delete this notice"
 msgstr "Slett denne notisen"
 
-#: actions/deleteuser.php:67
+#. 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."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. 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"
 
-#: actions/deleteuser.php:136
+#. 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:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
 #, fuzzy
 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:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr ""
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
 #, fuzzy
 msgid "Invalid logo URL."
 msgstr "Ugyldig storleik."
 
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
 #, fuzzy
 msgid "Invalid SSL logo URL."
 msgstr "Ugyldig storleik."
 
-#: actions/designadminpanel.php:344
+#. 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"
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Endra"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Statusmelding"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "SSL-logo"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 #, fuzzy
 msgid "Change theme"
 msgstr "Endra"
 
-#: actions/designadminpanel.php:486
+#. 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"
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 #, fuzzy
 msgid "Custom theme"
 msgstr "Statusmelding"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr ""
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, fuzzy, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2080,101 +2136,109 @@ msgid ""
 msgstr "Du kan lasta opp ein logo for gruppa."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr ""
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr ""
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
 #, fuzzy
-msgid "Change colours"
+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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 #, 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 #, fuzzy
 msgid "Links"
 msgstr "Logg inn"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr ""
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr ""
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
 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:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr ""
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Lagra"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr ""
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "Denne notisen er ikkje ein favoritt!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "Legg til i favorittar"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2913,7 +2977,7 @@ msgid ""
 "%%%%)"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Opprett ei ny gruppe"
 
@@ -3312,26 +3376,33 @@ msgstr ""
 "\n"
 "Beste helsing, %2$s\n"
 
-#: actions/joingroup.php:60
+#. 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."
 
-#: actions/joingroup.php:141
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
 #, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%s blei medlem av gruppe %s"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "Du er ikkje medlem av den gruppa."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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"
 
@@ -3437,6 +3508,13 @@ msgstr ""
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Lagra"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
@@ -3462,11 +3540,11 @@ msgstr "Logg inn"
 msgid "Login to site"
 msgstr "Logg inn "
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Hugs meg"
 
-#: actions/login.php:259 actions/register.php:493
+#: 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)."
 
@@ -3866,7 +3944,8 @@ msgstr "Endra passord"
 msgid "Change your password."
 msgstr "Endra passordet ditt"
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Endra passord"
 
@@ -3874,7 +3953,8 @@ msgstr "Endra passord"
 msgid "Old password"
 msgstr "Gamalt passord"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nytt passord"
 
@@ -3882,7 +3962,7 @@ msgstr "Nytt passord"
 msgid "6 or more characters"
 msgstr "6 eller fleire teikn"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "Samme passord som over"
 
@@ -3906,11 +3986,12 @@ msgstr "Det gamle passordet stemmer ikkje"
 msgid "Error saving user; invalid."
 msgstr "Feil ved lagring av brukar; fungerer ikkje."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "Klarar ikkje lagra nytt passord."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Lagra passord."
 
@@ -4254,7 +4335,8 @@ msgid "Profile information"
 msgstr "Profil informasjon"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4262,16 +4344,16 @@ msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 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:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "Heimeside"
 
@@ -4284,7 +4366,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:472
+#: 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"
@@ -4292,28 +4374,28 @@ 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:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "Plassering"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: 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»"
 
@@ -4367,7 +4449,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:257 actions/register.php:229
+#: 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)."
@@ -4375,49 +4457,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:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Tidssone er ikkje valt."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
 #, 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, 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:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Opprett ei ny gruppe"
@@ -4533,35 +4616,43 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "Emne sky"
 
-#: actions/recoverpassword.php:36
+#. 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!"
 
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Opprettingskoden finst ikkje."
 
-#: actions/recoverpassword.php:66
+#. 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."
 
-#: actions/recoverpassword.php:73
+#. 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."
 
-#: actions/recoverpassword.php:86
+#. 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."
 
-#: actions/recoverpassword.php:97
+#. 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."
 
-#: actions/recoverpassword.php:111
+#. 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."
 
-#: actions/recoverpassword.php:152
+#. 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 "
@@ -4570,69 +4661,102 @@ msgstr ""
 "Instruksjonar for å få att passordet ditt er send til epostadressa som er "
 "lagra i kontoen din."
 
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+msgid "You have been identified. Enter a new password below."
 msgstr ""
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 #, fuzzy
 msgid "Password recovery"
 msgstr "Passord opphenting etterspurt"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 #, fuzzy
 msgid "Nickname or email address"
 msgstr "Skriv inn kallenamn eller epostadresse."
 
-#: actions/recoverpassword.php:193
+#. 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."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Gjenopprett"
 
-#: actions/recoverpassword.php:208
+#. 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"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Hent fram passord"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Uventa handling."
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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."
 
-#: actions/recoverpassword.php:243
+#. 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
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Avbryt"
 
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Skriv inn kallenamn eller epostadresse."
 
-#: actions/recoverpassword.php:282
+#. 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."
 
-#: actions/recoverpassword.php:299
+#. 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."
 
-#: actions/recoverpassword.php:313
+#. 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."
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4640,23 +4764,34 @@ msgstr ""
 "Instruksjonar for å få att passordet ditt er send til epostadressa som er "
 "lagra i kontoen din."
 
-#: actions/recoverpassword.php:357
+#. 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."
 
-#: actions/recoverpassword.php:365
+#. 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."
 
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Passord og stadfesting stemmer ikkje."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "Feil ved å setja brukar."
 
-#: actions/recoverpassword.php:395
+#. 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."
 
@@ -4673,7 +4808,7 @@ msgstr "Feil med stadfestingskode."
 msgid "Registration successful"
 msgstr "Registreringa gikk bra"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Registrér"
 
@@ -4699,62 +4834,53 @@ msgid ""
 "link up to friends and colleagues. "
 msgstr ""
 
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom. "
-"Kravd."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 eller fleire teikn. Kravd."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Samme som passord over. Påkrevd."
+#: 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:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Epost"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 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:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Lengre namn, fortrinnsvis ditt «ekte» namn"
 
-#: actions/register.php:463
+#: actions/register.php:462
 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:524
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:534
+#: 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:538
+#: 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:541
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4763,7 +4889,7 @@ msgstr ""
 " unnateke privatdata: passord, epostadresse, ljonmeldingsadresse og "
 "telefonnummer."
 
-#: actions/register.php:589
+#: actions/register.php:588
 #, fuzzy, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4795,7 +4921,7 @@ msgstr ""
 "\n"
 "Takk for at du blei med, og vi håpar du vil lika tenesta!"
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5116,7 +5242,7 @@ msgstr "Paginering"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "Beskriving"
 
@@ -5139,8 +5265,9 @@ msgstr ""
 msgid "Reset key & secret"
 msgstr ""
 
+#. TRANS: Title of form for deleting a user.
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Slett"
 
@@ -5259,7 +5386,7 @@ msgid "Note"
 msgstr "Merknad"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr ""
 
@@ -7830,26 +7957,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 #, 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:153
+#: lib/common.php:158
 #, 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Logg inn or sida"
@@ -7918,12 +8045,16 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr ""
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
 #, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Avbryt"
+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
+msgid "Use defaults"
+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".
@@ -8009,35 +8140,30 @@ msgstr "Gå"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:154
-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:163
+#: lib/groupeditform.php:155
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL til heimesida eller bloggen for gruppa eller emnet"
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 #, fuzzy
 msgid "Describe the group or topic"
 msgstr "Beskriv gruppa eller emnet med 140 teikn"
 
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
 #, 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"
+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:182
+#: lib/groupeditform.php:174
 #, 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:190
+#: lib/groupeditform.php:182
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9168,14 +9294,9 @@ msgstr[1] ""
 msgid "about a year ago"
 msgstr "omtrent eitt år sidan"
 
-#: lib/webcolor.php:80
-#, fuzzy, php-format
-msgid "%s is not a valid color!"
-msgstr "Heimesida er ikkje ei gyldig internettadresse."
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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."
@@ -9212,26 +9333,32 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "No such profile"
-#~ msgstr "Denne notisen finst ikkje"
+#~ msgid "No such group"
+#~ msgstr "Denne gruppa finst ikkje."
 
 #, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Grupper %s er medlem av"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
 #~ msgstr "Fann ikkje API-metode."
 
+#~ msgid "Reset"
+#~ msgstr "Avbryt"
+
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 små bokstavar eller tal, ingen punktum (og liknande) eller "
+#~ "mellomrom. Kravd."
+
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 eller fleire teikn. Kravd."
+
+#~ msgid "Same as password above. Required."
+#~ msgstr "Samme som passord over. Påkrevd."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr ""
+#~ "1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom"
+
 #, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Mennesker som tingar %s"
-
-#~ msgid "Couldn't update user."
-#~ msgstr "Kan ikkje oppdatera brukar."
-
-#~ msgid "Couldn't save profile."
-#~ msgstr "Kan ikkje lagra profil."
-
-#~ msgid "Couldn't save tags."
-#~ msgstr "Kan ikkje lagra merkelapp."
+#~ msgid "%s is not a valid color!"
+#~ msgstr "Heimesida er ikkje ei gyldig internettadresse."
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index 9b7a806e4c..75da79f151 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-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:53+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:43+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 (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-core\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -79,6 +79,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -90,13 +91,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Zapisz"
@@ -330,7 +331,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Nie można zaktualizować użytkownika."
@@ -354,7 +355,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "Nie można zapisać profilu."
 
@@ -364,7 +365,7 @@ msgstr "Nie można zapisać profilu."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
@@ -408,10 +409,9 @@ msgstr "Nie można zaktualizować wyglądu."
 
 #. TRANS: Title for Atom feed.
 #: actions/apiatomservice.php:85
-#, fuzzy
 msgctxt "ATOM"
 msgid "Main"
-msgstr "Główna"
+msgstr "Główny"
 
 #. TRANS: Title for Atom feed. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
@@ -548,7 +548,8 @@ msgid "That status is not a favorite."
 msgstr "Ten stan nie jest ulubiony."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Nie można usunąć ulubionego wpisu."
 
@@ -595,7 +596,7 @@ msgstr "Nie można odnaleźć użytkownika docelowego."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonim jest już używany. Spróbuj innego."
@@ -605,7 +606,7 @@ msgstr "Pseudonim jest już używany. Spróbuj innego."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "To nie jest prawidłowy pseudonim."
@@ -617,7 +618,7 @@ msgstr "To nie jest prawidłowy pseudonim."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Strona domowa nie jest prawidłowym adresem URL."
@@ -627,7 +628,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: 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)."
@@ -655,7 +656,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
@@ -713,22 +714,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, 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."
@@ -740,9 +745,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -799,9 +806,12 @@ msgid "Request token already authorized."
 msgstr "Token żądania został już upoważniony."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -809,7 +819,7 @@ msgstr "Token żądania został już upoważniony."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -830,18 +840,20 @@ msgstr "Błąd bazy danych podczas wprowadzania 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: 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."
@@ -895,7 +907,7 @@ msgstr "Konto"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Pseudonim"
@@ -903,7 +915,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Hasło"
 
@@ -1011,10 +1023,12 @@ msgstr "Już powtórzono ten wpis."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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."
@@ -1045,7 +1059,6 @@ 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
-#, fuzzy
 msgid "Cannot delete this notice."
 msgstr "Nie można usunąć tego wpisu."
 
@@ -1250,13 +1263,11 @@ msgstr "Nie ma takiego profilu."
 #. 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 "Nie można dodać subskrypcji innej osoby"
+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
-#, fuzzy
 msgid "Can only handle favorite activities."
 msgstr "Można obsługiwać tylko działania ulubionych."
 
@@ -1285,13 +1296,12 @@ msgstr "%s członków grupy"
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
 #: actions/atompubmembershipfeed.php:219
 #, fuzzy
-msgid "Cannot add someone else's membership"
+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
-#, fuzzy
 msgid "Can only handle join activities."
 msgstr "Można obsługiwać tylko działania dołączania."
 
@@ -1318,29 +1328,51 @@ msgstr "Nie ma takiego ulubionego wpisu."
 #. 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "Nie można usunąć ulubionego wpisu innej osoby"
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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 using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "HTTP method not supported"
-msgstr "Metoda HTTP nie jest obsługiwana."
+msgid "Not a member."
+msgstr "Nie jest członkiem"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+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.
@@ -1348,22 +1380,21 @@ msgstr "Nie można usunąć członkostwa innej osoby"
 #: actions/atompubshowsubscription.php:72
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
-#, fuzzy, php-format
+#, php-format
 msgid "No such profile id: %d."
-msgstr "Nie ma takiego identyfikatora profilu: %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
-#, fuzzy, php-format
+#, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
-msgstr "Profil %1$d nie jest subskrybowany do profilu %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
-#, fuzzy
 msgid "Cannot delete someone else's subscription."
-msgstr "Nie można usunąć subskrypcji innej osoby"
+msgstr "Nie można usunąć subskrypcji innej osoby."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
@@ -1378,9 +1409,9 @@ msgstr "Można obserwować tylko osoby."
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #: actions/atompubsubscriptionfeed.php:267
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown profile %s."
-msgstr "Nieznany profil %s"
+msgstr "Nieznany profil %s."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
@@ -1509,24 +1540,30 @@ msgstr "Zaktualizowanie awatara nie powiodło się."
 msgid "Avatar deleted."
 msgstr "Usunięto awatar."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr "Wykonaj kopię zapasową konta"
 
-#: actions/backupaccount.php:80
+#. 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."
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
+#, 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 an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
@@ -1537,12 +1574,14 @@ msgstr ""
 "zachowywane w kopii zapasowej. Ponadto nie są zachowywane wysłane pliki i "
 "bezpośrednie wiadomości."
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Kopia zapasowa"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr "Wykonuje kopię zapasową konta"
 
@@ -1576,14 +1615,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Nie"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "Nie blokuj tego użytkownika"
 
@@ -1595,7 +1633,7 @@ msgstr "Nie blokuj tego użytkownika"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Tak"
@@ -1611,32 +1649,6 @@ msgstr "Zablokuj tego użytkownika"
 msgid "Failed to save block information."
 msgstr "Zapisanie informacji o blokadzie nie powiodło się."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Nie ma takiej grupy."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1763,7 +1775,8 @@ msgid "Account deleted."
 msgstr "Usunięto konto."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 msgid "Delete account"
 msgstr "Usuń konto"
 
@@ -1787,8 +1800,9 @@ msgstr ""
 "przed usunięciem."
 
 #. 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Potwierdź"
 
@@ -1860,8 +1874,10 @@ 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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."
 
@@ -1912,10 +1928,11 @@ msgid "Delete this group"
 msgstr "Usuń tę grupę"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1955,19 +1972,30 @@ msgstr "Nie usuwaj tego wpisu"
 msgid "Delete this notice"
 msgstr "Usuń ten wpis"
 
-#: actions/deleteuser.php:67
+#. 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."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Usuń użytkownika"
 
-#: actions/deleteuser.php:136
+#. 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."
@@ -1975,78 +2003,102 @@ msgstr ""
 "Na pewno usunąć tego użytkownika? Wyczyści to wszystkie dane o użytkowniku z "
 "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 tej grupy"
+
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. 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.
 #. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "Wygląd"
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr "Ustawienia wyglądu tej witryny StatusNet"
 
-#: actions/designadminpanel.php:335
+#. 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."
 
-#: actions/designadminpanel.php:340
+#. 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."
 
-#: actions/designadminpanel.php:344
+#. 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."
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Zmień logo"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Logo witryny"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "Logo SSL"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Zmień motyw"
 
-#: actions/designadminpanel.php:486
+#. 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."
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Własny motyw"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Tło"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2054,98 +2106,108 @@ 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:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Włączone"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "Kafelkowy obraz tła"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+#, fuzzy
+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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "Odnośniki"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "Własny plik CSS"
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Użycie domyślnych"
 
+#. 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:703 lib/designsettings.php:259
+#: 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "Przywróć domyślne ustawienia"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Zapisz"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "Zapisz wygląd"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "Ten wpis nie jest ulubiony."
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "Dodaj do ulubionych"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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 "Nie ma takiego dokumentu \\\"%s\\\""
 
 #. TRANS: Title for "Edit application" form.
@@ -2448,7 +2510,6 @@ msgstr "Ten adres e-mail należy już do innego użytkownika."
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
 #: actions/emailsettings.php:426 actions/imsettings.php:343
 #: actions/smssettings.php:365
-#, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Nie można wprowadzić kodu potwierdzającego."
 
@@ -2478,7 +2539,6 @@ 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:468 actions/smssettings.php:413
-#, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Nie można usunąć potwierdzenia adresu e-mail."
 
@@ -2506,7 +2566,6 @@ msgstr "Brak przychodzącego adresu e-mail."
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
 #: actions/emailsettings.php:540 actions/emailsettings.php:565
 #: actions/smssettings.php:564 actions/smssettings.php:587
-#, fuzzy
 msgid "Could not update user record."
 msgstr "Nie można zaktualizować wpisu użytkownika."
 
@@ -2867,7 +2926,7 @@ msgstr ""
 "która cię interesuje? Spróbuj ją [znaleźć](%%%%action.groupsearch%%%%) lub "
 "[założyć własną.](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Utwórz nową grupę"
 
@@ -3054,7 +3113,6 @@ msgstr "To jest błędny adres komunikatora."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
 #: actions/imsettings.php:391
-#, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "Nie można usunąć potwierdzenia komunikatora."
 
@@ -3277,26 +3335,33 @@ msgstr ""
 "\n"
 "Z poważaniem, %2$s\n"
 
-#: actions/joingroup.php:60
+#. 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."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "Użytkownik %1$s dołączył do grupy %2$s"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "Nie jesteś członkiem tej grupy."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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 "Użytkownik %1$s opuścił grupę %2$s"
 
@@ -3402,6 +3467,13 @@ msgstr "Adres URL obrazu licencji"
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Zapisz"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Zapisz ustawienia licencji"
@@ -3426,11 +3498,11 @@ msgstr "Zaloguj się"
 msgid "Login to site"
 msgstr "Zaloguj się na witrynie"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Zapamiętaj mnie"
 
-#: actions/login.php:259 actions/register.php:493
+#: 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 "
@@ -3821,7 +3893,8 @@ msgstr "Zmień hasło"
 msgid "Change your password."
 msgstr "Zmień hasło."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Zmiana hasła"
 
@@ -3829,7 +3902,8 @@ msgstr "Zmiana hasła"
 msgid "Old password"
 msgstr "Poprzednie hasło"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nowe hasło"
 
@@ -3837,7 +3911,7 @@ msgstr "Nowe hasło"
 msgid "6 or more characters"
 msgstr "6 lub więcej znaków"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "Takie samo jak powyższe hasło"
 
@@ -3861,11 +3935,12 @@ msgstr "Niepoprawne poprzednie hasło"
 msgid "Error saving user; invalid."
 msgstr "Błąd podczas zapisywania użytkownika; nieprawidłowy."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "Nie można zapisać nowego hasła."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. 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."
 
@@ -4193,22 +4268,23 @@ msgid "Profile information"
 msgstr "Informacje o profilu"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 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:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "Strona domowa"
 
@@ -4220,7 +4296,7 @@ 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:472
+#: 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"
@@ -4229,27 +4305,27 @@ 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:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "Położenie"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: 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\""
 
@@ -4303,7 +4379,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:257 actions/register.php:229
+#: 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)."
@@ -4312,48 +4388,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:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Nie wybrano strefy czasowej."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
-#, fuzzy
+#: actions/profilesettings.php:347
 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:404
-#, fuzzy
+#: actions/profilesettings.php:405
 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:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Przywróć konto"
 
@@ -4476,35 +4551,43 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "Chmura znaczników"
 
-#: actions/recoverpassword.php:36
+#. 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."
 
-#: actions/recoverpassword.php:62
+#. 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."
 
-#: actions/recoverpassword.php:66
+#. 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."
 
-#: actions/recoverpassword.php:73
+#. 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."
 
-#: actions/recoverpassword.php:86
+#. 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."
 
-#: actions/recoverpassword.php:97
+#. 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."
 
-#: actions/recoverpassword.php:111
+#. 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."
 
-#: actions/recoverpassword.php:152
+#. 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."
@@ -4512,67 +4595,100 @@ 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:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
 msgstr "Zostałeś zidentyfikowany. Podaj poniżej nowe hasło. "
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Przywrócenie hasła"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Pseudonim lub adres e-mail"
 
-#: actions/recoverpassword.php:193
+#. 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."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Przywróć"
 
-#: actions/recoverpassword.php:208
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+#, fuzzy
+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"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Przywróć hasło"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Nieznane działanie"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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 lub więcej znaków, i nie zapomnij go."
 
-#: actions/recoverpassword.php:243
+#. 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 "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
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Przywróć"
 
-#: actions/recoverpassword.php:252
+#. 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."
 
-#: actions/recoverpassword.php:282
+#. 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."
 
-#: actions/recoverpassword.php:299
+#. 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."
 
-#: actions/recoverpassword.php:313
+#. 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."
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4580,23 +4696,34 @@ msgstr ""
 "Instrukcje przywracania hasła zostały wysłane na adres e-mail zarejestrowany "
 "z twoim kontem."
 
-#: actions/recoverpassword.php:357
+#. 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."
 
-#: actions/recoverpassword.php:365
+#. 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."
 
-#: actions/recoverpassword.php:369
+#. 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."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+#, fuzzy
+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
 msgid "Error setting user."
 msgstr "Błąd podczas ustawiania użytkownika."
 
-#: actions/recoverpassword.php:395
+#. 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."
 
@@ -4612,7 +4739,7 @@ msgstr "Nieprawidłowy kod zaproszenia."
 msgid "Registration successful"
 msgstr "Rejestracja powiodła się"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Zarejestruj się"
 
@@ -4641,60 +4768,52 @@ 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:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 małe litery lub liczby, bez spacji i znaków przestankowych. Wymagane."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 lub więcej znaków. Wymagane."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Takie samo jak powyższe hasło. Wymagane."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 lub więcej znaków"
 
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Używane tylko do aktualizacji, ogłoszeń i przywracania hasła"
 
-#: actions/register.php:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Dłuższa nazwa, najlepiej twoje \"prawdziwe\" imię i nazwisko"
 
-#: actions/register.php:463
+#: actions/register.php:462
 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:524
+#: 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:534
+#: 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:538
+#: 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:541
+#: 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:546
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4703,7 +4822,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:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4736,7 +4855,7 @@ msgstr ""
 "Dziękujemy za zarejestrowanie się i mamy nadzieję, że używanie tej usługi "
 "sprawi ci przyjemność."
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -4796,12 +4915,10 @@ msgstr ""
 "nieprawidłowe XRDS)."
 
 #: actions/remotesubscribe.php:175
-#, fuzzy
 msgid "That is a local profile! Login to subscribe."
 msgstr "To jest profil lokalny. Zaloguj się, aby subskrybować."
 
 #: actions/remotesubscribe.php:182
-#, fuzzy
 msgid "Could not get a request token."
 msgstr "Nie można uzyskać tokenu żądana."
 
@@ -4814,7 +4931,6 @@ msgid "No notice specified."
 msgstr "Nie podano wpisu."
 
 #: actions/repeat.php:75
-#, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "Nie można powtórzyć własnego wpisu."
 
@@ -5051,7 +5167,7 @@ msgstr "Organizacja"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "Opis"
 
@@ -5074,8 +5190,9 @@ msgstr "Czynności aplikacji"
 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:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Usuń"
 
@@ -5203,7 +5320,7 @@ msgid "Note"
 msgstr "Wpis"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "Aliasy"
 
@@ -7238,9 +7355,8 @@ msgid "Database error inserting OAuth application user."
 msgstr "Błąd bazy danych podczas wprowadzania użytkownika aplikacji OAuth."
 
 #: lib/apioauthstore.php:345
-#, fuzzy
 msgid "Database error updating OAuth application user."
-msgstr "Błąd bazy danych podczas wprowadzania użytkownika aplikacji OAuth."
+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
@@ -7809,24 +7925,24 @@ msgstr ""
 "tracking - jeszcze nie zaimplementowano\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 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:153
+#: lib/common.php:158
 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "Przejdź do instalatora."
 
@@ -7891,11 +8007,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "Wyłączone"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Przywróć"
+#. 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: 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".
@@ -7978,34 +8098,30 @@ msgstr "Przejdź"
 msgid "Grant this user the \"%s\" role"
 msgstr "Nadaj użytkownikowi rolę \"%s\""
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 małe litery lub liczby, bez spacji i znaków przestankowych"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "Adres URL strony domowej lub bloga grupy, albo temat."
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "Opisz grupę lub temat"
 
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d character or less"
-msgid_plural "Describe the group or topic in %d characters or less"
+#: lib/groupeditform.php:162
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
 msgstr[0] "Opisz grupę lub temat w %d znaku"
 msgstr[1] "Opisz grupę lub temat w %d znakach"
 msgstr[2] "Opisz grupę lub temat w %d znakach"
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
 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:190
+#: lib/groupeditform.php:182
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9227,14 +9343,9 @@ msgstr[2] "około %d miesięcy temu"
 msgid "about a year ago"
 msgstr "około rok temu"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s nie jest prawidłowym kolorem."
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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 ""
@@ -9274,29 +9385,28 @@ msgstr "Nieprawidłowy kod XML, brak głównego XRD."
 msgid "Getting backup from file '%s'."
 msgstr "Pobieranie kopii zapasowej z pliku \"%s\"."
 
-#~ msgid "AtomPub post with unknown attention URI %s"
-#~ msgstr "Wpis AtomPub z nieznanym adresem URI %s uwagi"
+#~ msgid "No such group"
+#~ msgstr "Nie ma takiej grupy."
 
-#~ msgid "No such profile"
-#~ msgstr "Nie ma takiego profilu"
+#~ msgid "HTTP method not supported"
+#~ msgstr "Metoda HTTP nie jest obsługiwana"
 
-#~ msgid "Notices %s has favorited to on %s"
-#~ msgstr "Wpisy %s został oznaczone jako ulubione na %s"
+#~ msgid "Reset"
+#~ msgstr "Przywróć"
 
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Grupy %s są członkiem w witrynie %s"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 małe litery lub liczby, bez spacji i znaków przestankowych. Wymagane."
 
-#~ msgid "Method not supported"
-#~ msgstr "Metoda nie jest obsługiwana"
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 lub więcej znaków. Wymagane."
 
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Osoby %s są subskrybowane w witrynie %s"
+#~ msgid "Same as password above. Required."
+#~ msgstr "Takie samo jak powyższe hasło. Wymagane."
 
-#~ msgid "Couldn't update user."
-#~ msgstr "Nie można zaktualizować użytkownika."
+#~ 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"
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "Nie można zapisać profilu."
-
-#~ msgid "Couldn't save tags."
-#~ msgstr "Nie można zapisać znaczników."
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s nie jest prawidłowym kolorem."
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 6458ba3b88..41b430c4c2 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/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-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:54+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:46+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 (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -80,6 +80,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -91,13 +92,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Gravar"
@@ -330,7 +331,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Não foi possível actualizar o utilizador."
@@ -354,7 +355,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "Não foi possível gravar o perfil."
 
@@ -364,7 +365,7 @@ msgstr "Não foi possível gravar o perfil."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
@@ -544,7 +545,8 @@ msgid "That status is not a favorite."
 msgstr "Esse estado não é um favorito."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Não foi possível eliminar o favorito."
 
@@ -592,7 +594,7 @@ msgstr "Não foi possível encontrar o utilizador de destino."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Utilizador já é usado. Tente outro."
@@ -602,7 +604,7 @@ msgstr "Utilizador já é usado. Tente outro."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Utilizador não é válido."
@@ -614,7 +616,7 @@ msgstr "Utilizador não é válido."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Página de ínicio não é uma URL válida."
@@ -624,7 +626,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -652,7 +654,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -710,22 +712,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, 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."
@@ -737,9 +743,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -799,9 +807,12 @@ msgid "Request token already authorized."
 msgstr "Não tem autorização."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -809,7 +820,7 @@ msgstr "Não tem autorização."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -831,18 +842,20 @@ msgstr "Erro na base de dados ao inserir o utilizador da aplicação OAuth."
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: 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."
@@ -897,7 +910,7 @@ msgstr "Conta"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Utilizador"
@@ -905,7 +918,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Senha"
 
@@ -1013,10 +1026,12 @@ msgstr "Já repetiu essa nota."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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
@@ -1290,7 +1305,7 @@ msgstr "Membros do grupo %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"
+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.
@@ -1326,30 +1341,51 @@ 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "Não foi possível eliminar o favorito."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "Grupo não existe"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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"
+msgid "Not a member."
 msgstr "Todos os membros"
 
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "Método da API não encontrado."
-
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+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.
@@ -1521,35 +1557,42 @@ msgstr "Falha ao actualizar avatar."
 msgid "Avatar deleted."
 msgstr "Avatar apagado."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Fundo"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1583,14 +1626,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Não"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "Não bloquear este utilizador"
 
@@ -1602,7 +1644,7 @@ msgstr "Não bloquear este utilizador"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Sim"
@@ -1618,32 +1660,6 @@ msgstr "Bloquear este utilizador"
 msgid "Failed to save block information."
 msgstr "Não foi possível gravar informação do bloqueio."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Grupo não foi encontrado."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1775,7 +1791,8 @@ msgid "Account deleted."
 msgstr "Avatar apagado."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "Criar uma conta"
@@ -1797,8 +1814,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Confirmação"
 
@@ -1873,8 +1891,10 @@ msgid "You must be logged in to delete a group."
 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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."
 
@@ -1929,10 +1949,11 @@ msgid "Delete this group"
 msgstr "Apagar este utilizador"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1972,19 +1993,30 @@ msgstr "Não apagar esta nota"
 msgid "Delete this notice"
 msgstr "Apagar esta nota"
 
-#: actions/deleteuser.php:67
+#. 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."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Apagar utilizador"
 
-#: actions/deleteuser.php:136
+#. 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."
@@ -1992,82 +2024,106 @@ 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."
 
+#. 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:163 lib/deleteuserform.php:77
+#. 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.
 #. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "Estilo"
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
-#: actions/designadminpanel.php:335
+#. 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."
 
-#: actions/designadminpanel.php:340
+#. 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."
 
-#: actions/designadminpanel.php:344
+#. 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."
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Alterar logotipo"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Logotipo do site"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 #, fuzzy
 msgid "SSL logo"
 msgstr "Logotipo do site"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Alterar tema"
 
-#: actions/designadminpanel.php:486
+#. 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."
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Tema personalizado"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Fundo"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2077,98 +2133,108 @@ msgstr ""
 "é %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Ligar"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "Repetir imagem de fundo em mosaico"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. 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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "Links"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Avançado"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "CSS personalizado"
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
 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:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "Repor predefinição"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Gravar"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "Gravar o estilo"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "Esta nota não é uma favorita!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "Adicionar às favoritas"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2897,7 +2963,7 @@ msgstr ""
 "encontra nenhum grupo de que gosta? Tente [pesquisar um grupo](%%action."
 "groupsearch%%) ou [crie o seu!](%%action.newgroup%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Criar um grupo novo"
 
@@ -3306,26 +3372,33 @@ msgstr ""
 "\n"
 "Sinceramente, %2$s\n"
 
-#: actions/joingroup.php:60
+#. 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."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s juntou-se ao grupo %2$s"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "Não é um membro desse grupo."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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"
 
@@ -3430,6 +3503,13 @@ msgstr ""
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Gravar"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
@@ -3454,11 +3534,11 @@ msgstr "Entrar"
 msgid "Login to site"
 msgstr "Iniciar sessão no site"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Lembrar-me neste computador"
 
-#: actions/login.php:259 actions/register.php:493
+#: 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 "
@@ -3847,7 +3927,8 @@ msgstr "Modificar senha"
 msgid "Change your password."
 msgstr "Modificar a sua senha."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Mudança da senha"
 
@@ -3855,7 +3936,8 @@ msgstr "Mudança da senha"
 msgid "Old password"
 msgstr "Antiga"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nova"
 
@@ -3863,7 +3945,7 @@ msgstr "Nova"
 msgid "6 or more characters"
 msgstr "6 ou mais caracteres"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "Repita a senha nova"
 
@@ -3887,11 +3969,12 @@ msgstr "Senha antiga incorrecta."
 msgid "Error saving user; invalid."
 msgstr "Erro ao guardar utilizador; inválido."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "Não é possível guardar a nova senha."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Senha gravada."
 
@@ -4236,23 +4319,24 @@ msgid "Profile information"
 msgstr "Informação do perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 #, 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 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:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "Página pessoal"
 
@@ -4265,7 +4349,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:472
+#: 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"
@@ -4273,27 +4357,27 @@ 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:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "Localidade"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: 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\""
 
@@ -4346,7 +4430,7 @@ 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:257 actions/register.php:229
+#: 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)."
@@ -4354,49 +4438,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:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 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:276
+#: actions/profilesettings.php:277
 #, 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, 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:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Criar uma conta"
@@ -4520,37 +4605,45 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "Nuvem de categorias"
 
-#: actions/recoverpassword.php:36
+#. 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!"
 
-#: actions/recoverpassword.php:62
+#. 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."
 
-#: actions/recoverpassword.php:66
+#. 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."
 
-#: actions/recoverpassword.php:73
+#. 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."
 
-#: actions/recoverpassword.php:86
+#. 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."
 
-#: actions/recoverpassword.php:97
+#. 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."
 
-#: actions/recoverpassword.php:111
+#. 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."
 
-#: actions/recoverpassword.php:152
+#. 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."
@@ -4558,69 +4651,103 @@ 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:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
 msgstr "Identificação positiva. Introduza abaixo uma senha nova. "
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Recuperação da senha"
 
-#: actions/recoverpassword.php:191
+#. 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"
 
-#: actions/recoverpassword.php:193
+#. 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."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Recuperar"
 
-#: actions/recoverpassword.php:208
+#. 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"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Recuperar senha"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Acção desconhecida"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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!"
 
-#: actions/recoverpassword.php:243
+#. 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
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Reiniciar"
 
-#: actions/recoverpassword.php:252
+#. 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."
 
-#: actions/recoverpassword.php:282
+#. 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."
 
-#: actions/recoverpassword.php:299
+#. 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."
 
-#: actions/recoverpassword.php:313
+#. 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."
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4628,24 +4755,35 @@ msgstr ""
 "Instruções para recuperação da sua senha foram enviadas para o correio "
 "electrónico registado na sua conta."
 
-#: actions/recoverpassword.php:357
+#. 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."
 
-#: actions/recoverpassword.php:365
+#. 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."
 
-#: actions/recoverpassword.php:369
+#. 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."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "Erro ao configurar utilizador."
 
-#: actions/recoverpassword.php:395
+#. 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."
 
@@ -4661,7 +4799,7 @@ msgstr "Desculpe, código de convite inválido."
 msgid "Registration successful"
 msgstr "Registo efectuado"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Registar"
 
@@ -4689,64 +4827,56 @@ 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:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 letras minúsculas ou números, sem pontuação ou espaços. Obrigatório."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 ou mais caracteres. Obrigatório."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Repita a senha acima. Obrigatório."
+#: 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:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Correio"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 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:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Nome mais longo, de preferência o seu nome \"verdadeiro\""
 
-#: actions/register.php:463
+#: actions/register.php:462
 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:524
+#: 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:534
+#: 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:538
+#: 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:541
+#: 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:546
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4756,7 +4886,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:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4789,7 +4919,7 @@ msgstr ""
 "\n"
 "Obrigado por se ter registado e esperamos que se divirta usando este serviço."
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5105,7 +5235,7 @@ msgstr "Organização"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "Descrição"
 
@@ -5128,8 +5258,9 @@ msgstr "Operações da aplicação"
 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:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Apagar"
 
@@ -5258,7 +5389,7 @@ msgid "Note"
 msgstr "Anotação"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "Nomes alternativos"
 
@@ -7858,26 +7989,26 @@ msgstr ""
 "tracking - ainda não implementado.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 #, 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:153
+#: lib/common.php:158
 #, 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "Ir para o instalador."
 
@@ -7949,12 +8080,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "Desligar"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Reiniciar"
+#. 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: 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".
@@ -8038,33 +8172,29 @@ msgstr "Prosseguir"
 msgid "Grant this user the \"%s\" role"
 msgstr "Atribuir a este utilizador a função \"%s\""
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL da página ou do blogue, deste grupo ou assunto"
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "Descreva o grupo ou assunto"
 
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
 #, 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"
+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:182
+#: lib/groupeditform.php:174
 #, 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:190
+#: lib/groupeditform.php:182
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9274,14 +9404,9 @@ msgstr[1] "há cerca de %d meses atrás"
 msgid "about a year ago"
 msgstr "há cerca de um ano"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s não é uma cor válida!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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."
@@ -9318,27 +9443,29 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "Perfil não foi encontrado."
+#~ msgid "No such group"
+#~ msgstr "Grupo não existe"
 
 #, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Grupos de que %s é membro"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
 #~ msgstr "Método da API não encontrado."
 
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Pessoas que subscrevem %s"
+#~ msgid "Reset"
+#~ msgstr "Reiniciar"
 
-#~ msgid "Couldn't update user."
-#~ msgstr "Não foi possível actualizar o utilizador."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 letras minúsculas ou números, sem pontuação ou espaços. Obrigatório."
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "Não foi possível gravar o perfil."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 ou mais caracteres. Obrigatório."
 
-#~ msgid "Couldn't save tags."
-#~ msgstr "Não foi possível gravar as categorias."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Repita a senha acima. Obrigatório."
+
+#~ 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"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s não é uma cor válida!"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index a11dc37a54..84d6080221 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-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:55+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57:51+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 (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -81,6 +81,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -92,13 +93,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salvar"
@@ -333,7 +334,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Não foi possível atualizar o usuário."
@@ -357,7 +358,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "Não foi possível salvar o perfil."
 
@@ -367,7 +368,7 @@ msgstr "Não foi possível salvar o perfil."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
@@ -551,7 +552,8 @@ msgid "That status is not a favorite."
 msgstr "Essa mensagem não é favorita!"
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Não foi possível excluir a favorita."
 
@@ -597,7 +599,7 @@ msgstr "Não foi possível encontrar usuário de destino."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Esta identificação já está em uso. Tente outro."
@@ -607,7 +609,7 @@ msgstr "Esta identificação já está em uso. Tente outro."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Não é uma identificação válida."
@@ -619,7 +621,7 @@ msgstr "Não é uma identificação válida."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "A URL informada não é válida."
@@ -629,7 +631,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "O nome completo é muito extenso (máx. 255 caracteres)"
@@ -656,7 +658,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "A localização é muito extensa (máx. 255 caracteres)."
@@ -713,22 +715,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, 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."
@@ -740,9 +746,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -799,9 +807,12 @@ msgid "Request token already authorized."
 msgstr "O token solicitado já foi 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -809,7 +820,7 @@ msgstr "O token solicitado já foi autorizado."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -831,18 +842,20 @@ msgstr "Erro no banco de dados durante a inserção de 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: 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."
@@ -897,7 +910,7 @@ msgstr "Conta"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Usuário"
@@ -905,7 +918,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Senha"
 
@@ -1013,10 +1026,12 @@ msgstr "Você já repetiu essa mensagem."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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."
@@ -1282,7 +1297,7 @@ msgstr "Membros do grupo %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"
+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.
@@ -1315,29 +1330,51 @@ 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "Não é possível excluir a Favorita de outra pessoa"
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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
-msgid "Not a member"
-msgstr "Não é um membro"
-
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "HTTP method not supported"
-msgstr "O método HTTP não é suportado."
+msgid "Not a member."
+msgstr "Não é um membro"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+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.
@@ -1507,23 +1544,29 @@ msgstr "Não foi possível atualizar o avatar."
 msgid "Avatar deleted."
 msgstr "O avatar foi excluído."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr "Fazer backup da conta"
 
-#: actions/backupaccount.php:80
+#. 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."
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
+#, 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 an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
@@ -1533,13 +1576,15 @@ msgstr ""
 "endereços de e-mail e de mensagens instantâneas não são copiados. Além "
 "disso, arquivos enviados e mensagens diretas também não entram no backup."
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Fundo"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1574,14 +1619,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Não"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "Não bloquear este usuário"
 
@@ -1593,7 +1637,7 @@ msgstr "Não bloquear este usuário"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Sim"
@@ -1609,32 +1653,6 @@ msgstr "Bloquear este usuário"
 msgid "Failed to save block information."
 msgstr "Não foi possível salvar a informação de bloqueio."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Esse grupo não existe."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1764,7 +1782,8 @@ msgid "Account deleted."
 msgstr "O avatar foi excluído."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "Criar uma conta"
@@ -1786,8 +1805,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -1861,8 +1881,10 @@ 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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."
 
@@ -1913,10 +1935,11 @@ msgid "Delete this group"
 msgstr "Excluir 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.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1956,19 +1979,30 @@ msgstr "Não excluir esta mensagem."
 msgid "Delete this notice"
 msgstr "Excluir esta mensagem"
 
-#: actions/deleteuser.php:67
+#. 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."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Excluir usuário"
 
-#: actions/deleteuser.php:136
+#. 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."
@@ -1976,80 +2010,104 @@ msgstr ""
 "Tem certeza que deseja excluir este usuário? Isso eliminará todos os dados "
 "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:163 lib/deleteuserform.php:77
+#. 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.
 #. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "Aparência"
 
-#: actions/designadminpanel.php:74
+#. 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."
 
-#: actions/designadminpanel.php:335
+#. 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."
 
-#: actions/designadminpanel.php:340
+#. 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."
 
-#: actions/designadminpanel.php:344
+#. 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."
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Alterar a logo"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Logo do site"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "Logo do SSL"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Alterar o tema"
 
-#: actions/designadminpanel.php:486
+#. 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."
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Tema personalizado"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Fundo"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2059,98 +2117,108 @@ msgstr ""
 "arquivo é de %1 $s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Ativado"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "Ladrilhar a imagem de fundo"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. 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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "Links"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Avançado"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "CSS personalizado"
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "Restaura de volta ao padrão"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Salvar"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "Salvar a aparência"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "Esta mensagem não é uma favorita!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "Adicionar às favoritas"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2879,7 +2947,7 @@ msgstr ""
 "\". Não encontrou um grupo que lhe agrade? Experimente [procurar por um](%%%%"
 "action.groupsearch%%%%) ou [criar o seu próprio!](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Criar um novo grupo"
 
@@ -3285,26 +3353,33 @@ msgstr ""
 "\n"
 "Cordialmente, %2$s\n"
 
-#: actions/joingroup.php:60
+#. 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."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s associou-se ao grupo %2$s"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "Você não é um membro desse grupo."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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"
 
@@ -3415,6 +3490,13 @@ msgstr "URL da imagem da licença"
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Salvar"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Salvar as configurações da licença"
@@ -3440,11 +3522,11 @@ msgstr "Entrar"
 msgid "Login to site"
 msgstr "Autenticar-se no site"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Lembrar neste computador"
 
-#: actions/login.php:259 actions/register.php:493
+#: 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 "
@@ -3840,7 +3922,8 @@ msgstr "Alterar a senha"
 msgid "Change your password."
 msgstr "Altere a sua senha"
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Alterar a senha"
 
@@ -3848,7 +3931,8 @@ msgstr "Alterar a senha"
 msgid "Old password"
 msgstr "Senha anterior"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Senha nova"
 
@@ -3856,7 +3940,7 @@ msgstr "Senha nova"
 msgid "6 or more characters"
 msgstr "No mínimo 6 caracteres"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "Igual à senha acima"
 
@@ -3880,11 +3964,12 @@ msgstr "A senha anterior está errada"
 msgid "Error saving user; invalid."
 msgstr "Erro ao salvar usuário; inválido."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "Não é possível salvar a nova senha."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. 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."
 
@@ -4211,22 +4296,23 @@ msgid "Profile information"
 msgstr "Informações do perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 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:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "Site"
 
@@ -4238,7 +4324,7 @@ 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:472
+#: 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"
@@ -4246,27 +4332,27 @@ 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:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "Localização"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: 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\""
 
@@ -4320,7 +4406,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:257 actions/register.php:229
+#: 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)."
@@ -4328,48 +4414,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:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 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:276
+#: actions/profilesettings.php:277
 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, 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:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Criar uma conta"
@@ -4493,36 +4580,44 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "Nuvem de etiquetas"
 
-#: actions/recoverpassword.php:36
+#. 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!"
 
-#: actions/recoverpassword.php:62
+#. 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."
 
-#: actions/recoverpassword.php:66
+#. 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"
 
-#: actions/recoverpassword.php:73
+#. 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."
 
-#: actions/recoverpassword.php:86
+#. 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."
 
-#: actions/recoverpassword.php:97
+#. 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."
 
-#: actions/recoverpassword.php:111
+#. 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."
 
-#: actions/recoverpassword.php:152
+#. 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."
@@ -4530,69 +4625,103 @@ 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:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
 msgstr "Você foi identificado. Digite uma nova senha abaixo. "
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Recuperação de senha"
 
-#: actions/recoverpassword.php:191
+#. 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"
 
-#: actions/recoverpassword.php:193
+#. 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."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Recuperar"
 
-#: actions/recoverpassword.php:208
+#. 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"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Recuperar a senha"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Ação desconhecida"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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!"
 
-#: actions/recoverpassword.php:243
+#. 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
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Restaurar"
 
-#: actions/recoverpassword.php:252
+#. 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."
 
-#: actions/recoverpassword.php:282
+#. 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."
 
-#: actions/recoverpassword.php:299
+#. 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."
 
-#: actions/recoverpassword.php:313
+#. 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."
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4600,23 +4729,34 @@ msgstr ""
 "As instruções para recuperar a sua senha foram enviadas para o endereço de e-"
 "mail informado no seu cadastro."
 
-#: actions/recoverpassword.php:357
+#. 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."
 
-#: actions/recoverpassword.php:365
+#. 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."
 
-#: actions/recoverpassword.php:369
+#. 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."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "Erro na configuração do usuário."
 
-#: actions/recoverpassword.php:395
+#. 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á "
@@ -4634,7 +4774,7 @@ msgstr "Desculpe, mas o código do convite é inválido."
 msgid "Registration successful"
 msgstr "Registro realizado com sucesso"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Registrar-se"
 
@@ -4662,38 +4802,30 @@ 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:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 letras minúsculas ou números, sem pontuação ou espaços. Obrigatório."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "No mínimo 6 caracteres. Obrigatório."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Igual à senha acima. Obrigatório."
+#: 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:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 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:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Nome completo, de preferência seu nome \"real\""
 
-#: actions/register.php:463
+#: actions/register.php:462
 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:524
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
@@ -4701,23 +4833,23 @@ msgstr ""
 "Eu entendo que o conteúdo e os dados de %1$s são particulares e "
 "confidenciais."
 
-#: actions/register.php:534
+#: 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:538
+#: 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:541
+#: 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:546
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4727,7 +4859,7 @@ msgstr ""
 "particulares: senha, endereço de e-mail, endereço do mensageiro instantâneo "
 "e número de telefone."
 
-#: actions/register.php:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4760,7 +4892,7 @@ msgstr ""
 "\n"
 "Obrigado por se registrar e esperamos que você aproveite o serviço."
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5078,7 +5210,7 @@ msgstr "Organização"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "Descrição"
 
@@ -5101,8 +5233,9 @@ msgstr "Ações da aplicação"
 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:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Excluir"
 
@@ -5229,7 +5362,7 @@ msgid "Note"
 msgstr "Mensagem"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "Apelidos"
 
@@ -7831,26 +7964,26 @@ msgstr ""
 "tracking -  não implementado ainda\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 #, 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:153
+#: lib/common.php:158
 #, 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "Ir para o instalador."
 
@@ -7921,12 +8054,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "Desativado"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Restaurar"
+#. 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: 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".
@@ -8010,27 +8146,23 @@ msgstr "Ir"
 msgid "Grant this user the \"%s\" role"
 msgstr "Associa o papel \"%s\" a este usuário"
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 letras minúsculas ou números, sem pontuações ou espaços"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL para o site ou blog do grupo ou tópico"
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "Descreva o grupo ou tópico"
 
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
 #, 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"
+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:182
+#: lib/groupeditform.php:174
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -8038,7 +8170,7 @@ msgstr ""
 "Localização do grupo, caso tenha alguma, como \"cidade, estado (ou região), "
 "país\""
 
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9249,14 +9381,9 @@ msgstr[1] "há cerca de %d meses atrás"
 msgid "about a year ago"
 msgstr "cerca de 1 ano atrás"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s não é uma cor válida!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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."
@@ -9295,28 +9422,29 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "AtomPub post with unknown attention URI %s"
-#~ msgstr "Publicação AtomPub com uma URI de atenção desconhecida %s"
-
-#~ msgid "No such profile"
-#~ msgstr "Este perfil não existe"
+#~ msgid "No such group"
+#~ msgstr "Esse grupo não existe."
 
 #, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Grupos dos quais %s é membro"
+#~ msgid "HTTP method not supported"
+#~ msgstr "O método HTTP não é suportado."
 
-#~ msgid "Method not supported"
-#~ msgstr "O método não é suportado"
+#~ msgid "Reset"
+#~ msgstr "Restaurar"
 
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Assinantes de %s"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 letras minúsculas ou números, sem pontuação ou espaços. Obrigatório."
 
-#~ msgid "Couldn't update user."
-#~ msgstr "Não foi possível atualizar o usuário."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "No mínimo 6 caracteres. Obrigatório."
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "Não foi possível salvar o perfil."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Igual à senha acima. Obrigatório."
 
-#~ msgid "Couldn't save tags."
-#~ msgstr "Não foi possível salvar as etiquetas."
+#~ 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"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s não é uma cor válida!"
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 3580dd1b6b..6a1e10d2c7 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -16,18 +16,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:56+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57: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-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -83,6 +83,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -94,13 +95,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Сохранить"
@@ -333,7 +334,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Не удаётся обновить пользователя."
@@ -357,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "Не удаётся сохранить профиль."
 
@@ -367,7 +368,7 @@ msgstr "Не удаётся сохранить профиль."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
@@ -551,7 +552,8 @@ msgid "That status is not a favorite."
 msgstr "Этот статус не входит в число ваших любимых."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Не удаётся удалить любимую запись."
 
@@ -599,7 +601,7 @@ msgstr "Не удаётся найти целевого пользователя
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Такое имя уже используется. Попробуйте какое-нибудь другое."
@@ -609,7 +611,7 @@ msgstr "Такое имя уже используется. Попробуйте
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Неверное имя."
@@ -621,7 +623,7 @@ msgstr "Неверное имя."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "URL Главной страницы неверен."
@@ -631,7 +633,7 @@ msgstr "URL Главной страницы неверен."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Полное имя слишком длинное (максимум 255 символов)."
@@ -659,7 +661,7 @@ msgstr[2] "Слишком длинное описание (максимум %d 
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Слишком длинное месторасположение (максимум 255 символов)."
@@ -717,22 +719,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Не удаётся присоединить пользователя %1$s к группе %2$s."
@@ -744,9 +750,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -803,9 +811,12 @@ msgid "Request token already authorized."
 msgstr "Ключ запроса уже авторизован."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -813,7 +824,7 @@ msgstr "Ключ запроса уже авторизован."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -834,18 +845,20 @@ msgstr "Ошибка базы данных при вставке oauth_token_ass
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Нетиповое подтверждение формы."
@@ -900,7 +913,7 @@ msgstr "Аккаунт"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Имя"
@@ -908,7 +921,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Пароль"
 
@@ -1016,10 +1029,12 @@ msgstr "Запись уже повторена."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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."
@@ -1294,7 +1309,7 @@ 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"
+msgid "Cannot add someone else's membership."
 msgstr "Не удаётся вставить новую подписку."
 
 #. TRANS: Client error displayed when not using the POST verb.
@@ -1330,30 +1345,51 @@ 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "Не удаётся удалить любимую запись."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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"
+msgid "Not a member."
 msgstr "Все участники"
 
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "HTTP-метод не поддерживается."
-
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
 msgstr "Невозможно удалить подписку на самого себя."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1524,35 +1560,42 @@ msgstr "Неудача при обновлении аватары."
 msgid "Avatar deleted."
 msgstr "Аватар удалён."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Фон"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1586,14 +1629,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Нет"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "Не блокировать этого пользователя"
 
@@ -1605,7 +1647,7 @@ msgstr "Не блокировать этого пользователя"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Да"
@@ -1621,32 +1663,6 @@ msgstr "Заблокировать пользователя."
 msgid "Failed to save block information."
 msgstr "Не удаётся сохранить информацию о блокировании."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Нет такой группы."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1776,7 +1792,8 @@ msgid "Account deleted."
 msgstr "Аватар удалён."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "Создать новый аккаунт"
@@ -1798,8 +1815,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Подтверждение"
 
@@ -1873,8 +1891,10 @@ 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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."
 
@@ -1925,10 +1945,11 @@ msgid "Delete this group"
 msgstr "Удалить эту группу"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1968,19 +1989,30 @@ msgstr "Не удалять эту запись"
 msgid "Delete this notice"
 msgstr "Удалить эту запись"
 
-#: actions/deleteuser.php:67
+#. 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 "Вы можете удалять только внутренних пользователей."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Удалить пользователя"
 
-#: actions/deleteuser.php:136
+#. 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."
@@ -1988,78 +2020,102 @@ 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:163 lib/deleteuserform.php:77
+#. 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.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "Оформление"
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr "Настройки оформления для этого сайта StatusNet"
 
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "Неверный URL логотипа."
 
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
 msgid "Invalid SSL logo URL."
 msgstr "Неверный URL логотипа SSL."
 
-#: actions/designadminpanel.php:344
+#. 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."
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Изменить логотип"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Логотип сайта"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "Логотип SSL"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Изменить тему"
 
-#: actions/designadminpanel.php:486
+#. 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 "Тема для сайта."
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Особая тема"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Фон"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2069,98 +2125,108 @@ msgstr ""
 "составляет %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Включить"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "Растянуть фоновое изображение"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. 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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "Ссылки"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Расширенный"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "Особый CSS"
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
 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:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "Восстановить значения по умолчанию"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Сохранить"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "Сохранить оформление"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "Эта запись не входит в число ваших любимых записей!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "Добавить в любимые"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2893,7 +2959,7 @@ msgstr ""
 "группу, которая вас интересует? Попробуйте [найти её](%%%%action.groupsearch%"
 "%%%) или [создайте собственную](%%%%action.newgroup%%%%)!"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Создать новую группу"
 
@@ -3306,26 +3372,33 @@ msgstr ""
 "\n"
 "С уважением, %2$s\n"
 
-#: actions/joingroup.php:60
+#. 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 "Вы должны авторизоваться для вступления в группу."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s вступил в группу %2$s"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "Вы не являетесь членом этой группы."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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"
 
@@ -3431,6 +3504,13 @@ msgstr "URL изображения лицензии"
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Сохранить"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Сохранить настройки лицензии"
@@ -3455,11 +3535,11 @@ msgstr "Вход"
 msgid "Login to site"
 msgstr "Авторизоваться"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Запомнить меня"
 
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Автоматическии входить в дальнейшем. Не для общедоступных компьютеров!"
 
@@ -3850,7 +3930,8 @@ msgstr "Изменение пароля"
 msgid "Change your password."
 msgstr "Измените ваш пароль."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Пароль сохранён."
 
@@ -3858,7 +3939,8 @@ msgstr "Пароль сохранён."
 msgid "Old password"
 msgstr "Старый пароль"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Новый пароль"
 
@@ -3866,7 +3948,7 @@ msgstr "Новый пароль"
 msgid "6 or more characters"
 msgstr "6 или больше знаков"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "Тот же пароль, что и выше"
 
@@ -3890,11 +3972,12 @@ msgstr "Некорректный старый пароль"
 msgid "Error saving user; invalid."
 msgstr "Ошибка сохранения пользователя; неверное имя."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "Не удаётся сохранить новый пароль."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Пароль сохранён."
 
@@ -4219,23 +4302,24 @@ msgid "Profile information"
 msgstr "Информация профиля"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 msgid "Full name"
 msgstr "Полное имя"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "Главная"
 
@@ -4247,7 +4331,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:472
+#: 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"
@@ -4256,27 +4340,27 @@ msgstr[1] "Опишите себя и свои увлечения при пом
 msgstr[2] "Опишите себя и свои увлечения при помощи %d символов"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "Месторасположение"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Где вы находитесь, например «Город, область, страна»"
 
@@ -4329,7 +4413,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:257 actions/register.php:229
+#: 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)."
@@ -4338,48 +4422,49 @@ msgstr[1] "Слишком длинная биография (максимум %d
 msgstr[2] "Слишком длинная биография (максимум %d символов)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Часовой пояс не выбран."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Не удаётся сохранить настройки местоположения."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Создать новый аккаунт"
@@ -4502,35 +4587,43 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "Облако тегов"
 
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Вы уже авторизованы!"
 
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Нет такого кода восстановления."
 
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Нет кода восстановления."
 
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Код восстановления неизвестного пользователя."
 
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Ошибка, связанная с кодом подтверждения."
 
-#: actions/recoverpassword.php:97
+#. 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 "Код подтверждения слишком старый. Попробуйте ещё раз."
 
-#: actions/recoverpassword.php:111
+#. 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 "Не удаётся обновить пользователя с подтверждённым электронным адресом."
 
-#: actions/recoverpassword.php:152
+#. 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."
@@ -4538,67 +4631,100 @@ msgstr ""
 "Если вы забыли или потеряли свой пароль, вы можете запросить новый пароль на "
 "email-адрес вашей учётной записи."
 
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
 msgstr "Вы опознаны системой. Введите новый пароль ниже. "
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Восстановление пароля"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Имя или email-адрес"
 
-#: actions/recoverpassword.php:193
+#. 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 "Ваше имя на этом сервере или электронный адрес регистрации."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Восстановление"
 
-#: actions/recoverpassword.php:208
+#. 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 "Переустановить пароль"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Восстановление пароля"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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 "Запрошено восстановление пароля"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Неизвестное действие"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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 или более символов, и не забывайте его!"
 
-#: actions/recoverpassword.php:243
+#. 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
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Сбросить"
 
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Введите имя или электронный адрес."
 
-#: actions/recoverpassword.php:282
+#. 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 "Нет пользователя с таким электронным адресом или именем."
 
-#: actions/recoverpassword.php:299
+#. 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 "Нет зарегистрированных электронных адресов для этого пользователя."
 
-#: actions/recoverpassword.php:313
+#. 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 "Ошибка сохранения подтверждённого адреса."
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4606,23 +4732,34 @@ msgstr ""
 "Инструкции по восстановлению пароля посланы на электронный адрес, который Вы "
 "указали при регистрации вашего аккаунта."
 
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Нетиповая переустановка пароля."
 
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
 msgid "Password must be 6 characters or more."
 msgstr "Пароль должен быть длиной не менее 6 символов."
 
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Пароль и его подтверждение не совпадают."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "Ошибка в установках пользователя."
 
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "Новый пароль успешно сохранён. Вы авторизовались."
 
@@ -4638,7 +4775,7 @@ msgstr "Извините, неверный пригласительный код
 msgid "Registration successful"
 msgstr "Регистрация успешна!"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Регистрация"
 
@@ -4669,38 +4806,30 @@ msgstr ""
 "получите возможность публиковать короткие сообщения и устанавливать связи с "
 "друзьями и коллегами. "
 
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 латинских строчных букв или цифр, без пробелов. Обязательное поле."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 или более символов. Обязательное поле."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Тот же пароль что и сверху. Обязательное поле."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 или больше знаков"
 
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Email"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Нужна только для обновлений, осведомлений и восстановления пароля."
 
-#: actions/register.php:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Полное имя, предпочтительно Ваше настоящее имя"
 
-#: actions/register.php:463
+#: actions/register.php:462
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "Адрес твоей страницы, дневника или профиля на другом портале"
 
-#: actions/register.php:524
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
@@ -4708,23 +4837,23 @@ msgstr ""
 "Я понимаю, что содержание и данные %1$s являются частными и "
 "конфиденциальными."
 
-#: actions/register.php:534
+#: 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:538
+#: 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:541
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "Все права защищены."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4733,7 +4862,7 @@ msgstr ""
 "Мои тексты и файлы доступны на условиях %s, за исключением следующей личной "
 "информации: пароля, почтового адреса, номера мессенджера и номера телефона."
 
-#: actions/register.php:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4767,7 +4896,7 @@ msgstr ""
 "Спасибо за то, что присоединились к нам, надеемся, что вы получите "
 "удовольствие от использования данного сервиса!"
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5080,7 +5209,7 @@ msgstr "Организация"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "Описание"
 
@@ -5103,8 +5232,9 @@ msgstr "Действия приложения"
 msgid "Reset key & secret"
 msgstr "Сбросить ключ и секретную фразу"
 
+#. TRANS: Title of form for deleting a user.
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Удалить"
 
@@ -5232,7 +5362,7 @@ msgid "Note"
 msgstr "Запись"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "Алиасы"
 
@@ -7839,24 +7969,24 @@ msgstr ""
 "tracking — пока не реализовано.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 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:153
+#: lib/common.php:158
 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "Перейти к установщику"
 
@@ -7923,11 +8053,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "Выключено"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-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: 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".
@@ -8011,34 +8145,30 @@ msgstr "Перейти"
 msgid "Grant this user the \"%s\" role"
 msgstr "Назначить этому пользователю роль «%s»"
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 латинских строчных буквы или цифры, без пробелов"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "Адрес домашней страницы или блога группы или темы."
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "Опишите группу или тему"
 
-#: lib/groupeditform.php:170
-#, 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"
+#: lib/groupeditform.php:162
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
 msgstr[0] "Опишите группу или тему, используя до %d символов"
 msgstr[1] "Опишите группу или тему, используя до %d символов"
 msgstr[2] "Опишите группу или тему, используя до %d символов"
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Местонахождение группы, если есть, например «Город, область (или регион), "
 "страна»."
 
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9258,14 +9388,9 @@ msgstr[2] "около %d месяцев назад"
 msgid "about a year ago"
 msgstr "около года назад"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s не допустимым подходящим цветом!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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 ""
@@ -9309,30 +9434,29 @@ msgstr "Неверный XML, отсутствует корень XRD."
 msgid "Getting backup from file '%s'."
 msgstr "Получение резервной копии из файла «%s»."
 
-#~ msgid "AtomPub post with unknown attention URI %s"
-#~ msgstr "Запись AtomPub с неизвестным целевым URI %s"
+#~ msgid "No such group"
+#~ msgstr "Нет такой группы."
 
 #, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "Нет такого профиля."
-
-#, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Группы, в которых состоит %s"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
 #~ msgstr "HTTP-метод не поддерживается."
 
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Люди подписанные на %s"
+#~ msgid "Reset"
+#~ msgstr "Сбросить"
 
-#~ msgid "Couldn't update user."
-#~ msgstr "Не удаётся обновить пользователя."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 латинских строчных букв или цифр, без пробелов. Обязательное поле."
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "Не удаётся сохранить профиль."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 или более символов. Обязательное поле."
 
-#~ msgid "Couldn't save tags."
-#~ msgstr "Не удаётся сохранить теги."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Тот же пароль что и сверху. Обязательное поле."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 латинских строчных буквы или цифры, без пробелов"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s не допустимым подходящим цветом!"
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 78785a5200..920ce732cc 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-01-20 19:02+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+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"
@@ -70,6 +70,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -81,13 +82,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr ""
@@ -312,7 +313,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr ""
@@ -336,7 +337,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr ""
 
@@ -346,7 +347,7 @@ msgstr ""
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
@@ -519,7 +520,8 @@ msgid "That status is not a favorite."
 msgstr ""
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr ""
 
@@ -565,7 +567,7 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr ""
@@ -575,7 +577,7 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr ""
@@ -587,7 +589,7 @@ msgstr ""
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr ""
@@ -597,7 +599,7 @@ msgstr ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr ""
@@ -624,7 +626,7 @@ msgstr[1] ""
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr ""
@@ -681,22 +683,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr ""
@@ -708,9 +714,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -767,9 +775,12 @@ msgid "Request token already authorized."
 msgstr ""
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -777,7 +788,7 @@ msgstr ""
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -798,18 +809,20 @@ msgstr ""
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr ""
@@ -857,7 +870,7 @@ msgstr ""
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr ""
@@ -865,7 +878,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr ""
 
@@ -969,10 +982,12 @@ msgstr ""
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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."
@@ -1234,7 +1249,7 @@ msgstr ""
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
 #: actions/atompubmembershipfeed.php:219
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
 msgstr ""
 
 #. TRANS: Client error displayed when not using the POST verb.
@@ -1265,27 +1280,49 @@ 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"
+msgid "Cannot delete someone else's favorite."
 msgstr ""
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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 using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-msgid "HTTP method not supported"
+msgid "Not a member."
 msgstr ""
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1453,33 +1490,40 @@ msgstr ""
 msgid "Avatar deleted."
 msgstr ""
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr ""
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1510,14 +1554,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr ""
 
@@ -1529,7 +1572,7 @@ msgstr ""
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr ""
@@ -1545,32 +1588,6 @@ msgstr ""
 msgid "Failed to save block information."
 msgstr ""
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr ""
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1697,7 +1714,8 @@ msgid "Account deleted."
 msgstr ""
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 msgid "Delete account"
 msgstr ""
 
@@ -1718,8 +1736,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr ""
 
@@ -1789,8 +1808,10 @@ 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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 ""
 
@@ -1838,10 +1859,11 @@ msgid "Delete this group"
 msgstr ""
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1879,96 +1901,129 @@ msgstr ""
 msgid "Delete this notice"
 msgstr ""
 
-#: actions/deleteuser.php:67
+#. 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 ""
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr ""
 
-#: actions/deleteuser.php:136
+#. 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
+msgid "Do not delete this user"
+msgstr ""
+
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. 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.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr ""
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr ""
 
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
 msgid "Invalid SSL logo URL."
 msgstr ""
 
-#: actions/designadminpanel.php:344
+#. 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 ""
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr ""
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr ""
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr ""
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr ""
 
-#: actions/designadminpanel.php:486
+#. 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 ""
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr ""
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr ""
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -1976,98 +2031,106 @@ msgid ""
 msgstr ""
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr ""
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr ""
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. 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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr ""
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr ""
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr ""
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
 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:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr ""
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr ""
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr ""
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr ""
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr ""
 
-#: actions/doc.php:158
+#. 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\""
+msgid "No such document \"%s\"."
 msgstr ""
 
 #. TRANS: Title for "Edit application" form.
@@ -2764,7 +2827,7 @@ msgid ""
 "%%%%)"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr ""
 
@@ -3118,26 +3181,33 @@ msgid ""
 "Sincerely, %2$s\n"
 msgstr ""
 
-#: actions/joingroup.php:60
+#. 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 ""
 
-#: actions/joingroup.php:141
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
 #, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr ""
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr ""
 
-#: actions/leavegroup.php:137
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
 #, php-format
+msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr ""
 
@@ -3241,6 +3311,13 @@ msgstr ""
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr ""
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr ""
@@ -3265,11 +3342,11 @@ msgstr ""
 msgid "Login to site"
 msgstr ""
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr ""
 
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
@@ -3641,7 +3718,8 @@ msgstr ""
 msgid "Change your password."
 msgstr ""
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr ""
 
@@ -3649,7 +3727,8 @@ msgstr ""
 msgid "Old password"
 msgstr ""
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr ""
 
@@ -3657,7 +3736,7 @@ msgstr ""
 msgid "6 or more characters"
 msgstr ""
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr ""
 
@@ -3681,11 +3760,12 @@ msgstr ""
 msgid "Error saving user; invalid."
 msgstr ""
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr ""
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr ""
 
@@ -4006,22 +4086,23 @@ msgid "Profile information"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 msgid "Full name"
 msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr ""
 
@@ -4033,7 +4114,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:472
+#: 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"
@@ -4041,27 +4122,27 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
@@ -4112,7 +4193,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:257 actions/register.php:229
+#: 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)."
@@ -4120,46 +4201,47 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr ""
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
 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:290 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
 #, 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:346
+#: actions/profilesettings.php:347
 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:404
+#: actions/profilesettings.php:405
 msgid "Could not save location prefs."
 msgstr ""
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr ""
 
@@ -4269,123 +4351,170 @@ msgstr ""
 msgid "Tag cloud"
 msgstr ""
 
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr ""
 
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr ""
 
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr ""
 
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr ""
 
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr ""
 
-#: actions/recoverpassword.php:97
+#. 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 ""
 
-#: actions/recoverpassword.php:111
+#. 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 ""
 
-#: actions/recoverpassword.php:152
+#. 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:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+msgid "You have been identified. Enter a new password below."
 msgstr ""
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr ""
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr ""
 
-#: actions/recoverpassword.php:193
+#. 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 ""
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr ""
 
-#: actions/recoverpassword.php:208
+#. 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 ""
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr ""
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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 ""
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr ""
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+msgid "6 or more characters, and do not forget it!"
 msgstr ""
 
-#: actions/recoverpassword.php:243
+#. 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
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr ""
 
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr ""
 
-#: actions/recoverpassword.php:282
+#. 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 ""
 
-#: actions/recoverpassword.php:299
+#. 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 ""
 
-#: actions/recoverpassword.php:313
+#. 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 ""
 
-#: actions/recoverpassword.php:338
+#. 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 ""
 
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr ""
 
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
 msgid "Password must be 6 characters or more."
 msgstr ""
 
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr ""
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr ""
 
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
 
@@ -4401,7 +4530,7 @@ msgstr ""
 msgid "Registration successful"
 msgstr ""
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr ""
 
@@ -4427,66 +4556,58 @@ msgid ""
 "link up to friends and colleagues. "
 msgstr ""
 
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr ""
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
+#: actions/register.php:437
+msgid "6 or more characters."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr ""
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
 
-#: actions/register.php:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
-#: actions/register.php:463
+#: actions/register.php:462
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
-#: actions/register.php:524
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:534
+#: 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:538
+#: 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:541
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: 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:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4505,7 +4626,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -4798,7 +4919,7 @@ msgstr ""
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr ""
 
@@ -4821,8 +4942,9 @@ msgstr ""
 msgid "Reset key & secret"
 msgstr ""
 
+#. TRANS: Title of form for deleting a user.
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr ""
 
@@ -4940,7 +5062,7 @@ msgid "Note"
 msgstr ""
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr ""
 
@@ -7378,24 +7500,24 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 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:153
+#: lib/common.php:158
 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr ""
 
@@ -7460,10 +7582,14 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr ""
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
+#. 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: Error message displayed if design settings could not be saved.
@@ -7547,31 +7673,27 @@ msgstr ""
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 msgid "URL of the homepage or blog of the group or topic."
 msgstr ""
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr ""
 
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
 #, 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"
+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:182
+#: lib/groupeditform.php:174
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8657,14 +8779,9 @@ msgstr[1] ""
 msgid "about a year ago"
 msgstr ""
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr ""
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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 ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 7b80e62217..dd2445baee 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/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-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:58+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:57: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-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -78,6 +78,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -89,13 +90,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Spara"
@@ -326,7 +327,7 @@ msgstr "Du måste ange ett värdet på parametern 'device': sms, im, none"
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Kunde inte uppdatera användare."
@@ -350,7 +351,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "Kunde inte spara profil."
 
@@ -360,7 +361,7 @@ msgstr "Kunde inte spara profil."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
@@ -539,7 +540,8 @@ msgid "That status is not a favorite."
 msgstr "Denna status är inte en favorit."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Kunde inte ta bort favoriten."
 
@@ -586,7 +588,7 @@ msgstr "Kunde inte hitta målanvändare."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Smeknamnet används redan. Försök med ett annat."
@@ -596,7 +598,7 @@ msgstr "Smeknamnet används redan. Försök med ett annat."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Inte ett giltigt smeknamn."
@@ -608,7 +610,7 @@ msgstr "Inte ett giltigt smeknamn."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Hemsida är inte en giltig webbadress."
@@ -618,7 +620,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: 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)."
@@ -645,7 +647,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Beskrivning av plats är för lång (max 255 tecken)."
@@ -702,22 +704,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, 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."
@@ -729,9 +735,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -789,9 +797,12 @@ msgid "Request token already authorized."
 msgstr "Begäran-token är redan auktoriserad."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -799,7 +810,7 @@ msgstr "Begäran-token är redan auktoriserad."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -821,18 +832,20 @@ msgstr "Databasfel vid infogning av OAuth-applikationsanvändare."
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: 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."
@@ -886,7 +899,7 @@ msgstr "Konto"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Smeknamn"
@@ -894,7 +907,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Lösenord"
 
@@ -1001,10 +1014,12 @@ msgstr "Redan upprepat denna notis."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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
@@ -1276,7 +1291,7 @@ msgstr "%s gruppmedlemmar"
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
 #: actions/atompubmembershipfeed.php:219
 #, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
 msgstr "Kunde inte infoga ny prenumeration."
 
 #. TRANS: Client error displayed when not using the POST verb.
@@ -1312,30 +1327,51 @@ 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "Kunde inte ta bort favoriten."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "Ingen sådan grupp"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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"
+msgid "Not a member."
 msgstr "Alla medlemmar"
 
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "API-metod hittades inte."
-
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+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.
@@ -1505,35 +1541,42 @@ msgstr "Misslyckades uppdatera avatar."
 msgid "Avatar deleted."
 msgstr "Avatar borttagen."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Bakgrund"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1567,14 +1610,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Nej"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "Blockera inte denna användare"
 
@@ -1586,7 +1628,7 @@ msgstr "Blockera inte denna användare"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ja"
@@ -1602,32 +1644,6 @@ msgstr "Blockera denna användare"
 msgid "Failed to save block information."
 msgstr "Misslyckades att spara blockeringsinformation."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Ingen sådan grupp."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1758,7 +1774,8 @@ msgid "Account deleted."
 msgstr "Avatar borttagen."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "Skapa ett konto"
@@ -1780,8 +1797,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Bekräfta"
 
@@ -1855,8 +1873,10 @@ 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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."
 
@@ -1907,10 +1927,11 @@ msgid "Delete this group"
 msgstr "Ta bort denna grupp"
 
 #. 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 unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1950,19 +1971,30 @@ msgstr "Ta inte bort denna notis"
 msgid "Delete this notice"
 msgstr "Ta bort denna notis"
 
-#: actions/deleteuser.php:67
+#. 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."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Ta bort användare"
 
-#: actions/deleteuser.php:136
+#. 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."
@@ -1970,78 +2002,102 @@ msgstr ""
 "Är du säker på att du vill ta bort denna användare? Det kommer rensa all "
 "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:163 lib/deleteuserform.php:77
+#. 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.
 #. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "Utseende"
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
-#: actions/designadminpanel.php:335
+#. 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."
 
-#: actions/designadminpanel.php:340
+#. 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."
 
-#: actions/designadminpanel.php:344
+#. 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."
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Byt logotyp"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Webbplatslogotyp"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "SSL-logotyp"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Byt tema"
 
-#: actions/designadminpanel.php:486
+#. 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."
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Anpassat tema"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Bakgrund"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2051,98 +2107,108 @@ msgstr ""
 "filstorleken är %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "På"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "Upprepa bakgrundsbild"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. 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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "Länkar"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "Anpassad CSS"
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
 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:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "Återställ till standardvärde"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Spara"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "Spara utseende"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "Denna notis är inte en favorit!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "Lägg till i favoriter"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2865,7 +2931,7 @@ msgstr ""
 "inte någon grupp du gillar? Prova att [söka efter en](%%%%action.groupsearch%"
 "%%%) eller [starta din egen!](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Skapa en ny grupp"
 
@@ -3274,26 +3340,33 @@ msgstr ""
 "\n"
 "Vänliga hälsningar, %2$s\n"
 
-#: actions/joingroup.php:60
+#. 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."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s gick med i grupp %2$s"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "Du är inte en medlem i den gruppen."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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"
 
@@ -3398,6 +3471,13 @@ msgstr ""
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Spara"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Spara licensinsällningar"
@@ -3422,11 +3502,11 @@ msgstr "Logga in"
 msgid "Login to site"
 msgstr "Logga in på webbplatsen"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Kom ihåg mig"
 
-#: actions/login.php:259 actions/register.php:493
+#: 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!"
 
@@ -3815,7 +3895,8 @@ msgstr "Byt lösenord"
 msgid "Change your password."
 msgstr "Byt ditt lösenord."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Byte av lösenord"
 
@@ -3823,7 +3904,8 @@ msgstr "Byte av lösenord"
 msgid "Old password"
 msgstr "Gammalt lösenord"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Nytt lösenord"
 
@@ -3831,7 +3913,7 @@ msgstr "Nytt lösenord"
 msgid "6 or more characters"
 msgstr "Minst 6 tecken"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "Samma som lösenordet ovan"
 
@@ -3855,11 +3937,12 @@ msgstr "Felaktigt gammalt lösenord"
 msgid "Error saving user; invalid."
 msgstr "Fel vid sparande av användare; ogiltig."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "Kan inte spara nytt lösenord."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. 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."
 
@@ -4195,23 +4278,24 @@ msgid "Profile information"
 msgstr "Profilinformation"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 #, 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 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:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "Hemsida"
 
@@ -4224,7 +4308,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:472
+#: 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"
@@ -4232,27 +4316,27 @@ 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:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "Plats"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: 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\""
 
@@ -4307,7 +4391,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:257 actions/register.php:229
+#: 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)."
@@ -4315,49 +4399,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:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Tidszon inte valt."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
 #, 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, 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:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Skapa ett konto"
@@ -4481,35 +4566,43 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "Taggmoln"
 
-#: actions/recoverpassword.php:36
+#. 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!"
 
-#: actions/recoverpassword.php:62
+#. 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."
 
-#: actions/recoverpassword.php:66
+#. 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."
 
-#: actions/recoverpassword.php:73
+#. 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."
 
-#: actions/recoverpassword.php:86
+#. 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."
 
-#: actions/recoverpassword.php:97
+#. 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."
 
-#: actions/recoverpassword.php:111
+#. 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."
 
-#: actions/recoverpassword.php:152
+#. 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."
@@ -4517,68 +4610,101 @@ 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:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
 msgstr "Du har blivit identifierad. Ange ett nytt lösenord nedan. "
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Återskapande av lösenord"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Smeknamn eller e-postadress"
 
-#: actions/recoverpassword.php:193
+#. 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."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Återskapa"
 
-#: actions/recoverpassword.php:208
+#. 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"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Återskapa lösenord"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Okänd funktion"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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!"
 
-#: actions/recoverpassword.php:243
+#. 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
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Återställ"
 
-#: actions/recoverpassword.php:252
+#. 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."
 
-#: actions/recoverpassword.php:282
+#. 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."
 
-#: actions/recoverpassword.php:299
+#. 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."
 
-#: actions/recoverpassword.php:313
+#. 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."
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4586,24 +4712,35 @@ msgstr ""
 "Instruktioner för att återställa ditt lösenord har skickats till e-"
 "postadressen som är registrerat till ditt konto "
 
-#: actions/recoverpassword.php:357
+#. 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."
 
-#: actions/recoverpassword.php:365
+#. 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."
 
-#: actions/recoverpassword.php:369
+#. 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."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "Fel uppstog i användarens inställning"
 
-#: actions/recoverpassword.php:395
+#. 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."
 
@@ -4619,7 +4756,7 @@ msgstr "Tyvärr, ogiltig inbjudningskod."
 msgid "Registration successful"
 msgstr "Registreringen genomförd"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Registrera"
 
@@ -4647,64 +4784,55 @@ 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:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 små bokstäver eller nummer, inga punkter eller mellanslag. Måste fyllas "
-"i."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "Minst 6 tecken. Måste fyllas i."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Samma som lösenordet ovan. Måste fyllas i."
+#: 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:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-post"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 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:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Längre namn, förslagsvis ditt \"verkliga\" namn"
 
-#: actions/register.php:463
+#: actions/register.php:462
 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:524
+#: 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:534
+#: 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:538
+#: 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:541
+#: 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:546
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4713,7 +4841,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:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4746,7 +4874,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:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5062,7 +5190,7 @@ msgstr "Organisation"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "Beskrivning"
 
@@ -5085,8 +5213,9 @@ msgstr "Åtgärder för applikation"
 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:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -5214,7 +5343,7 @@ msgid "Note"
 msgstr "Notis"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "Alias"
 
@@ -7800,26 +7929,26 @@ msgstr ""
 "tracking - inte implementerat än.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 #, 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:153
+#: lib/common.php:158
 #, 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "Gå till installeraren."
 
@@ -7886,11 +8015,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "Av"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Återställ"
+#. 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: 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".
@@ -7974,33 +8107,29 @@ msgstr "Gå"
 msgid "Grant this user the \"%s\" role"
 msgstr "Bevilja denna användare \"%s\"-rollen"
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL till gruppen eller ämnets hemsida eller blogg"
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "Beskriv gruppen eller ämnet"
 
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
 #, 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"
+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:182
+#: lib/groupeditform.php:174
 #, 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:190
+#: lib/groupeditform.php:182
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9204,14 +9333,9 @@ msgstr[1] "för ungefär %d månader sedan"
 msgid "about a year ago"
 msgstr "för ett år sedan"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s är inte en giltig färg!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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."
@@ -9248,26 +9372,30 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "No such profile"
-#~ msgstr "Ingen sådan profil"
+#~ msgid "No such group"
+#~ msgstr "Ingen sådan grupp"
 
 #, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Grupper %s är en medlem i"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
 #~ msgstr "API-metod hittades inte."
 
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Personer som prenumererar på %s"
+#~ msgid "Reset"
+#~ msgstr "Återställ"
 
-#~ msgid "Couldn't update user."
-#~ msgstr "Kunde inte uppdatera användare."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 små bokstäver eller nummer, inga punkter eller mellanslag. Måste "
+#~ "fyllas i."
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "Kunde inte spara profil."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "Minst 6 tecken. Måste fyllas i."
 
-#~ msgid "Couldn't save tags."
-#~ msgstr "Kunde inte spara taggar."
+#~ msgid "Same as password above. Required."
+#~ msgstr "Samma som lösenordet ovan. Måste fyllas i."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s är inte en giltig färg!"
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 3bea408a76..3cdea242a4 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-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:05:59+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:58:01+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 (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -75,6 +75,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -86,13 +87,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "భద్రపరచు"
@@ -319,7 +320,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 #, fuzzy
 msgid "Could not update user."
@@ -344,7 +345,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 #, fuzzy
 msgid "Could not save profile."
 msgstr "ప్రొఫైలుని భద్రపరచలేకున్నాం."
@@ -355,7 +356,7 @@ msgstr "ప్రొఫైలుని భద్రపరచలేకున్
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
@@ -532,7 +533,8 @@ msgid "That status is not a favorite."
 msgstr "ఆ నోటీసు ఇష్టాంశం కాదు."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "ఇష్టాంశాన్ని తొలగించలేకపోయాం."
 
@@ -578,7 +580,7 @@ msgstr "లక్ష్యిత వాడుకరిని కనుగొన
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్నారు. మరోటి ప్రయత్నించండి."
@@ -588,7 +590,7 @@ msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "సరైన పేరు కాదు."
@@ -600,7 +602,7 @@ msgstr "సరైన పేరు కాదు."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "హోమ్ పేజీ URL సరైనది కాదు."
@@ -610,7 +612,7 @@ msgstr "హోమ్ పేజీ URL సరైనది కాదు."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -638,7 +640,7 @@ msgstr[1] "వివరణ చాలా పెద్దగా ఉంది (%d 
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -696,22 +698,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "వాడుకరి %1$sని %2$s గుంపులో చేర్చలేకపోయాం"
@@ -723,9 +729,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -785,9 +793,12 @@ msgid "Request token already authorized."
 msgstr "మీకు అధీకరణ లేదు."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -795,7 +806,7 @@ msgstr "మీకు అధీకరణ లేదు."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -817,18 +828,20 @@ msgstr "అవతారాన్ని పెట్టడంలో పొరప
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr ""
@@ -876,7 +889,7 @@ msgstr "ఖాతా"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "పేరు"
@@ -884,7 +897,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "సంకేతపదం"
 
@@ -990,10 +1003,12 @@ msgstr "ఇప్పటికే ఆ నోటీసుని పునరావ
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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
@@ -1268,7 +1283,7 @@ 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"
+msgid "Cannot add someone else's membership."
 msgstr "కొత్త చందాని చేర్చలేకపోయాం."
 
 #. TRANS: Client error displayed when not using the POST verb.
@@ -1304,30 +1319,51 @@ 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "ఇష్టాంశాన్ని తొలగించలేకపోయాం."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
-msgstr "అటువంటి గుంపు లేదు"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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"
+msgid "Not a member."
 msgstr "అందరు సభ్యులూ"
 
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
-
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
 msgstr "కొత్త చందాని చేర్చలేకపోయాం."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1497,35 +1533,42 @@ msgstr "అవతారపు తాజాకరణ విఫలమైంది.
 msgid "Avatar deleted."
 msgstr "అవతారాన్ని తొలగించాం."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "నేపథ్యం"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1558,14 +1601,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "కాదు"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "ఈ వాడుకరిని నిరోధించకు"
 
@@ -1577,7 +1619,7 @@ msgstr "ఈ వాడుకరిని నిరోధించకు"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "అవును"
@@ -1593,32 +1635,6 @@ msgstr "ఈ వాడుకరిని నిరోధించు"
 msgid "Failed to save block information."
 msgstr "నిరోధపు సమాచారాన్ని భద్రపరచడంలో విఫలమయ్యాం."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "అటువంటి గుంపు లేదు."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1750,7 +1766,8 @@ msgid "Account deleted."
 msgstr "అవతారాన్ని తొలగించాం."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "ఖాతాని సృష్టించుకోండి"
@@ -1772,8 +1789,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "నిర్థారించు"
 
@@ -1846,8 +1864,10 @@ 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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 లేదు."
 
@@ -1898,10 +1918,11 @@ msgid "Delete this group"
 msgstr "ఈ గుంపుని తొలగించు"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1939,19 +1960,30 @@ msgstr "ఈ నోటీసుని తొలగించకు"
 msgid "Delete this notice"
 msgstr "ఈ నోటీసుని తొలగించు"
 
-#: actions/deleteuser.php:67
+#. 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 "మీరు స్థానిక వాడుకరులను మాత్రమే తొలగించగలరు."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "వాడుకరిని తొలగించు"
 
-#: actions/deleteuser.php:136
+#. 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."
@@ -1959,79 +1991,103 @@ 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:163 lib/deleteuserform.php:77
+#. 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.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "రూపురేఖలు"
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "చిహ్నపు URL చెల్లదు."
 
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
 msgid "Invalid SSL logo URL."
 msgstr "SSL చిహ్నపు URL చెల్లదు."
 
-#: actions/designadminpanel.php:344
+#. 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."
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "చిహ్నాన్ని మార్చు"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "సైటు చిహ్నం"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "SSL చిహ్నం"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "అలంకారాన్ని మార్చు"
 
-#: actions/designadminpanel.php:486
+#. 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 "సైటుకి అలంకారం."
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 #, fuzzy
 msgid "Custom theme"
 msgstr "సైటు అలంకారం"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "నేపథ్యం"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2039,102 +2095,112 @@ msgid ""
 msgstr "సైటుకి మీరు నేపథ్యపు చిత్రాన్ని ఎక్కించవచ్చు. గరిష్ఠ ఫైలు పరిమాణం %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "ఆన్"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 #, 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 #, fuzzy
 msgid "Tile background image"
 msgstr "నేపథ్య చిత్రాన్ని మార్చు"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. 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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "లంకెలు"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "ఉన్నత"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "ప్రత్యేక CSS"
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
 #, 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:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 #, fuzzy
 msgid "Reset back to default"
 msgstr "అప్రమేయాలని ఉపయోగించు"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "భద్రపరచు"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "రూపురేఖలని భద్రపరచు"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "ఈ నోటీసు ఇష్టాంశం కాదు!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "ఇష్టాంశాలకు చేర్చు"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2862,7 +2928,7 @@ msgstr ""
 "గుంపు లోని సభ్యులందరికీ సందేశాలని పంపించవచ్చు. మీకు నచ్చిన గుంపు కనబడలేదా? [దాని కోసం వెతకండి](%%"
 "%%action.groupsearch%%%%) లేదా [మీరే కొత్తది సృష్టించండి!](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "కొత్త గుంపుని సృష్టించు"
 
@@ -3253,26 +3319,33 @@ msgstr ""
 "\n"
 "వినమ్రతతో, %2$s\n"
 
-#: actions/joingroup.php:60
+#. 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 "గుంపుల్లో చేరడానికి మీరు ప్రవేశించి ఉండాలి."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s %2$s గుంపులో చేరారు"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "మీరు ఆ గుంపులో సభ్యులు కాదు."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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 వైదొలిగారు"
 
@@ -3377,6 +3450,13 @@ msgstr ""
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "భద్రపరచు"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "లైసెన్సు అమరికలను భద్రపరచు"
@@ -3401,11 +3481,11 @@ msgstr "ప్రవేశించండి"
 msgid "Login to site"
 msgstr "సైటు లోనికి ప్రవేశించు"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "నన్ను గుర్తుంచుకో"
 
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "భవిష్యత్తులో ఆటోమెటిగ్గా లోనికి ప్రవేశించు; బయటి కంప్యూర్ల కొరకు కాదు!"
 
@@ -3792,7 +3872,8 @@ msgstr "సంకేతపదం మార్చుకోండి"
 msgid "Change your password."
 msgstr "మీ సంకేతపదం మార్చుకోండి."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "సంకేతపదం మార్పు"
 
@@ -3800,7 +3881,8 @@ msgstr "సంకేతపదం మార్పు"
 msgid "Old password"
 msgstr "పాత సంకేతపదం"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "కొత్త సంకేతపదం"
 
@@ -3808,7 +3890,7 @@ msgstr "కొత్త సంకేతపదం"
 msgid "6 or more characters"
 msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "పై సంకేతపదం వలెనే"
 
@@ -3832,11 +3914,12 @@ msgstr "పాత సంకేతపదం తప్పు"
 msgid "Error saving user; invalid."
 msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు: సరికాదు."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "కొత్త సంకేతపదాన్ని భద్రపరచలేము."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "సంకేతపదం భద్రమయ్యింది."
 
@@ -4177,23 +4260,24 @@ msgid "Profile information"
 msgstr "ప్రొఫైలు సమాచారం"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 #, 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 msgid "Full name"
 msgstr "పూర్తి పేరు"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "హోమ్ పేజీ"
 
@@ -4206,7 +4290,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:472
+#: 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"
@@ -4214,27 +4298,27 @@ msgstr[0] "మీ గురించి మరియు మీ ఆసక్త
 msgstr[1] "మీ గురించి మరియు మీ ఆసక్తుల గురించి %d అక్షరాల్లో చెప్పండి"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "ప్రాంతం"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
 
@@ -4285,7 +4369,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:257 actions/register.php:229
+#: 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)."
@@ -4293,49 +4377,50 @@ msgstr[0] "స్వపరిచయం చాలా పెద్దగా ఉం
 msgstr[1] "స్వపరిచయం చాలా పెద్దగా ఉంది (%d అక్షరాలు గరిష్ఠం)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "కాలమండలాన్ని ఎంచుకోలేదు."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
 #, 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "ట్యాగులని భద్రపరచలేకున్నాం."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "ఖాతాని సృష్టించుకోండి"
@@ -4455,132 +4540,184 @@ msgstr "[ఒక ఖాతాని నమోదుచేసుకుని](%%ac
 msgid "Tag cloud"
 msgstr "ట్యాగు మేఘం"
 
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
 
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
 #, fuzzy
 msgid "No such recovery code."
 msgstr "అటువంటి సందేశమేమీ లేదు."
 
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
 #, fuzzy
 msgid "Not a recovery code."
 msgstr "నమోదైన వాడుకరి కాదు."
 
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr ""
 
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "నిర్ధారణ సంకేతంలో పొరపాటు."
 
-#: actions/recoverpassword.php:97
+#. 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 "ఈ నిర్ధారణ సంకేతం చాలా పాతది. మళ్ళీ మొదలుపెట్టండి."
 
-#: actions/recoverpassword.php:111
+#. 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 "నిర్ధారిత ఈమెయిలు చిరునామాతో వాడుకరిని తాజాకరించలేకపోయాం."
 
-#: actions/recoverpassword.php:152
+#. 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:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
 msgstr "మిమ్మల్ని గుర్తించాం. మీ కొత్త సంకేతపదాన్ని క్రింత ఇవ్వండి. "
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 #, fuzzy
 msgid "Password recovery"
 msgstr "సంకేతపదం మార్పు"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "ముద్దుపేరు లేదా ఈమెయిలు చిరునామా"
 
-#: actions/recoverpassword.php:193
+#. 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 "ఈ సర్వరులో మీ పేరు, లేదా నమౌదైన మీ ఈమెయిల్ చిరునామా."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 #, fuzzy
 msgid "Recover"
 msgstr "తొలగించు"
 
-#: actions/recoverpassword.php:208
+#. 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 "కొత్త సంకేతపదం"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 #, fuzzy
 msgid "Recover password"
 msgstr "కొత్త సంకేతపదం"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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 ""
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "తెలియని చర్య"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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 లేదా అంతకంటే ఎక్కువ అక్షరాలు, మర్చిపోకండి!"
 
-#: actions/recoverpassword.php:243
+#. 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
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "రీసెట్"
 
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "పేరు లేదా ఈమెయిల్ చిరునామా ఇవ్వండి."
 
-#: actions/recoverpassword.php:282
+#. 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 "ఆ ఈమెయిలు చిరునామా లేదా వాడుకరిపేరుతో వాడుకరులెవరూ లేరు."
 
-#: actions/recoverpassword.php:299
+#. 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 "ఈ వాడుకరికై నమోదైన ఈమెయిల్ చిరునామాలు ఏమీ లేవు."
 
-#: actions/recoverpassword.php:313
+#. 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 "చిరునామా నిర్ధారణని భద్రపరచడంలో పొరపాటు."
 
-#: actions/recoverpassword.php:338
+#. 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 "మీ సంకేతపదాన్ని తిరిగి పొందడానికై అవసరమైన సూచనలని మీ ఖాతాతో నమోదైన ఈమెయిల్ చిరునామాకి పంపించాం."
 
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr ""
 
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
 #, fuzzy
 msgid "Password must be 6 characters or more."
 msgstr "సంకేతపదం 6 లేదా అంతకంటే ఎక్కవ అక్షరాలుండాలి."
 
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "సంకేతపదం మరియు నిర్ధారణ సరిపోలేదు."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 #, fuzzy
 msgid "Error setting user."
 msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు: సరికాదు."
 
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "మీ కొత్త సంకేతపదం భద్రమైంది. మీరు ఇప్పుడు లోనికి ప్రవేశించారు."
 
@@ -4596,7 +4733,7 @@ msgstr "క్షమించండి, తప్పు ఆహ్వాన స
 msgid "Registration successful"
 msgstr "నమోదు విజయవంతం"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "నమోదు"
 
@@ -4622,59 +4759,52 @@ msgid ""
 "link up to friends and colleagues. "
 msgstr ""
 
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామ చిహ్నాలు లేదా ఖాళీలు లేకుండా. తప్పనిసరి."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు. తప్పనిసరి."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "పై సంకేతపదం మరోసారి. తప్పనిసరి."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు"
 
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "ఈమెయిల్"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "తాజా విశేషాలు, ప్రకటనలు, మరియు సంకేతపదం పోయినప్పుడు మాత్రమే ఉపయోగిస్తాం."
 
-#: actions/register.php:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "పొడుగాటి పేరు, మీ \"అసలు\" పేరైతే మంచిది"
 
-#: actions/register.php:463
+#: actions/register.php:462
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా"
 
-#: actions/register.php:524
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:534
+#: 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:538
+#: 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:541
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "సర్వహక్కులూ సురక్షితం."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4683,7 +4813,7 @@ msgstr ""
 "నా పాఠ్యం మరియు దస్త్రాలు %s క్రింద లభ్యం, ఈ అంతరంగిక భోగట్టా తప్ప: సంకేతపదం, ఈమెయిల్ చిరునామా, IM "
 "చిరునామా, మరియు ఫోన్ నంబర్."
 
-#: actions/register.php:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4714,7 +4844,7 @@ msgstr ""
 "\n"
 "నమోదుచేసుకున్నందుకు కృతజ్ఞతలు మరియు ఈ సేవని ఉపయోగిస్తూ మీరు ఆనందిస్తారని మేం ఆశిస్తున్నాం."
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5027,7 +5157,7 @@ msgstr "సంస్ధ"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "వివరణ"
 
@@ -5050,8 +5180,9 @@ msgstr "ఉపకరణ చర్యలు"
 msgid "Reset key & secret"
 msgstr ""
 
+#. TRANS: Title of form for deleting a user.
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "తొలగించు"
 
@@ -5174,7 +5305,7 @@ msgid "Note"
 msgstr "గమనిక"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "మారుపేర్లు"
 
@@ -7705,26 +7836,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 #, 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:153
+#: lib/common.php:158
 #, 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 #, fuzzy
 msgid "Go to the installer."
 msgstr "సైటు లోనికి ప్రవేశించండి"
@@ -7792,11 +7923,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "ఆఫ్"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-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: 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".
@@ -7882,33 +8017,29 @@ msgstr "వెళ్ళు"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామచిహ్నాలు మరియు ఖాళీలు తప్ప"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "ఈ ఉపకరణం యొక్క హోమ్&zwnj;పేజీ చిరునామా"
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "గుంపుని లేదా విషయాన్ని వివరించండి"
 
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
 #, 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"
+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:182
+#: lib/groupeditform.php:174
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "గుంపు యొక్క ప్రాంతం, ఉంటే, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
 
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9099,14 +9230,9 @@ msgstr[1] "సుమారు %d నెలల క్రితం"
 msgid "about a year ago"
 msgstr "ఒక సంవత్సరం క్రితం"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s అనేది సరైన రంగు కాదు!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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 హెక్స్ అక్షరాలను వాడండి."
@@ -9143,27 +9269,28 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "అటువంటి ఫైలు లేదు."
+#~ msgid "No such group"
+#~ msgstr "అటువంటి గుంపు లేదు"
 
 #, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "%s సభ్యులుగా ఉన్న గుంపులు"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
 #~ msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
 
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "%sకి చందాచేరిన వ్యక్తులు"
+#~ msgid "Reset"
+#~ msgstr "రీసెట్"
 
-#~ msgid "Couldn't update user."
-#~ msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామ చిహ్నాలు లేదా ఖాళీలు లేకుండా. తప్పనిసరి."
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "ప్రొఫైలుని భద్రపరచలేకున్నాం."
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు. తప్పనిసరి."
 
-#~ msgid "Couldn't save tags."
-#~ msgstr "ట్యాగులని భద్రపరచలేకున్నాం."
+#~ msgid "Same as password above. Required."
+#~ msgstr "పై సంకేతపదం మరోసారి. తప్పనిసరి."
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామచిహ్నాలు మరియు ఖాళీలు తప్ప"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s అనేది సరైన రంగు కాదు!"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index f16ec3a889..640b8a412e 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:06:01+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:58:09+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 (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -77,6 +77,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -88,13 +89,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Kaydet"
@@ -330,7 +331,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Kullanıcı güncellenemedi."
@@ -354,7 +355,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "Profil kaydedilemedi."
 
@@ -364,7 +365,7 @@ msgstr "Profil kaydedilemedi."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
@@ -540,7 +541,8 @@ 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.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Favori silinemedi."
 
@@ -586,7 +588,7 @@ msgstr "Hedef kullanıcı bulunamadı."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Takma ad kullanımda. Başka bir tane deneyin."
@@ -596,7 +598,7 @@ msgstr "Takma ad kullanımda. Başka bir tane deneyin."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Geçersiz bir takma ad."
@@ -608,7 +610,7 @@ msgstr "Geçersiz bir takma ad."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
@@ -618,7 +620,7 @@ 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Tam isim çok uzun (en fazla: 255 karakter)."
@@ -644,7 +646,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Yer bilgisi çok uzun (en fazla 255 karakter)."
@@ -700,22 +702,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "%1$s kullanıcısı, %2$s grubuna katılamadı."
@@ -727,9 +733,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -786,9 +794,12 @@ msgid "Request token already authorized."
 msgstr "İstek belirteci zaten yetkili."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -796,7 +807,7 @@ msgstr "İstek belirteci zaten yetkili."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -817,18 +828,20 @@ msgstr "oauth_token_association eklerken veritabanı hatası."
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: 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."
@@ -884,7 +897,7 @@ msgstr "Hesap"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Takma ad"
@@ -892,7 +905,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Parola"
 
@@ -1000,10 +1013,12 @@ msgstr "Bu durum mesajı zaten tekrarlanmış."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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."
@@ -1274,7 +1289,7 @@ msgstr "%s grup üyeleri"
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
 #: actions/atompubmembershipfeed.php:219
 #, fuzzy
-msgid "Cannot add someone else's membership"
+msgid "Cannot add someone else's membership."
 msgstr "Yeni abonelik eklenemedi."
 
 #. TRANS: Client error displayed when not using the POST verb.
@@ -1310,30 +1325,51 @@ 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "Favori silinemedi."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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"
+msgid "Not a member."
 msgstr "Tüm üyeler"
 
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "HTTP yöntemi desteklenmiyor."
-
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+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.
@@ -1505,34 +1541,41 @@ msgstr "Avatar güncellemede hata."
 msgid "Avatar deleted."
 msgstr "Kullanıcı resmi silindi."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Arkaplan"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1567,14 +1610,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Hayır"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "Bu kullanıcıyı engelleme"
 
@@ -1586,7 +1628,7 @@ msgstr "Bu kullanıcıyı engelleme"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Evet"
@@ -1602,32 +1644,6 @@ msgstr "Bu kullanıcıyı engelle"
 msgid "Failed to save block information."
 msgstr "Engelleme bilgisinin kaydedilmesi başarısızlığa uğradı."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Böyle bir kullanıcı yok."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1758,7 +1774,8 @@ msgid "Account deleted."
 msgstr "Kullanıcı resmi silindi."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "Bir hesap oluştur"
@@ -1780,8 +1797,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Onayla"
 
@@ -1856,8 +1874,10 @@ msgid "You must be logged in to delete a group."
 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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"
@@ -1913,10 +1933,11 @@ msgid "Delete this group"
 msgstr "Bu kullanıcıyı sil"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1956,19 +1977,30 @@ msgstr "Bu durum mesajını silme"
 msgid "Delete this notice"
 msgstr "Bu durum mesajını sil"
 
-#: actions/deleteuser.php:67
+#. 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."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Kullanıcıyı sil"
 
-#: actions/deleteuser.php:136
+#. 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."
@@ -1976,79 +2008,103 @@ msgstr ""
 "Bu kullanıcıyı silmek istediğinizden emin misiniz? Bu, veritabanından "
 "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:163 lib/deleteuserform.php:77
+#. 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.
 #. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "Dizayn"
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr ""
 
-#: actions/designadminpanel.php:335
+#. 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ı."
 
-#: actions/designadminpanel.php:340
+#. 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ı."
 
-#: actions/designadminpanel.php:344
+#. 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"
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Değiştir"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Site logosu"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "SSL logosu"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Temayı değiştir"
 
-#: actions/designadminpanel.php:486
+#. 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."
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Özel tema"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Arkaplan"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2058,98 +2114,108 @@ msgstr ""
 "$s'dir."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Açık"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "Arkaplan resmini döşe"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. 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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "Bağlantılar"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "Özel CSS"
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
 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:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "Öntanımlıya geri dön"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Kaydet"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "Dizaynı kaydet"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "Bu durum mesajı bir favori değil!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "Favorilere ekle"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2876,7 +2942,7 @@ msgid ""
 "%%%%)"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Yeni bir grup oluştur"
 
@@ -3246,26 +3312,33 @@ msgid ""
 "Sincerely, %2$s\n"
 msgstr ""
 
-#: actions/joingroup.php:60
+#. 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."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
-msgstr ""
+msgstr "%1$s'in %2$s'deki durum mesajları "
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "Bu grubun bir üyesi değilsiniz."
 
-#: actions/leavegroup.php:137
+#. 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ı "
 
@@ -3371,6 +3444,13 @@ msgstr "Lisans Resminin Bağlantısı"
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Kaydet"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Lisans ayarlarını kaydet"
@@ -3396,11 +3476,11 @@ msgstr "Giriş"
 msgid "Login to site"
 msgstr "Siteye giriş"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Beni hatırla"
 
-#: actions/login.php:259 actions/register.php:493
+#: 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!"
@@ -3789,7 +3869,8 @@ msgstr "Parolayı değiştir"
 msgid "Change your password."
 msgstr "Parolanızı değiştirin."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Parola değiştirildi"
 
@@ -3797,7 +3878,8 @@ msgstr "Parola değiştirildi"
 msgid "Old password"
 msgstr "Eski parola"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Yeni parola"
 
@@ -3805,7 +3887,7 @@ msgstr "Yeni parola"
 msgid "6 or more characters"
 msgstr "6 veya daha fazla karakter"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "yukarıdaki parolanın aynısı"
 
@@ -3829,11 +3911,12 @@ msgstr "Eski parola yanlış"
 msgid "Error saving user; invalid."
 msgstr "Kullanıcıyı kaydetmede hata oluştu; geçersiz."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "Yeni parola kaydedilemedi."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Parola kaydedildi."
 
@@ -4175,7 +4258,8 @@ msgid "Profile information"
 msgstr "Profil ayarları"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4184,16 +4268,16 @@ msgstr ""
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 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:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "Başlangıç Sayfası"
 
@@ -4207,35 +4291,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:472
+#: 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:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "Yer"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: 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"
 
@@ -4288,56 +4372,57 @@ 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:257 actions/register.php:229
+#: 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)."
 msgstr[0] "Yer bilgisi çok uzun (azm: %d karakter)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Zaman dilimi seçilmedi."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
 #, 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, 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:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Bir hesap oluştur"
@@ -4453,36 +4538,44 @@ msgstr ""
 msgid "Tag cloud"
 msgstr ""
 
-#: actions/recoverpassword.php:36
+#. 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!"
 
-#: actions/recoverpassword.php:62
+#. 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."
 
-#: actions/recoverpassword.php:66
+#. 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."
 
-#: actions/recoverpassword.php:73
+#. 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"
 
-#: actions/recoverpassword.php:86
+#. 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ı."
 
-#: actions/recoverpassword.php:97
+#. 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."
 
-#: actions/recoverpassword.php:111
+#. 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."
 
-#: actions/recoverpassword.php:152
+#. 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 "
@@ -4491,70 +4584,103 @@ msgstr ""
 "Hesabınıza eklemiş olduğunuz eposta adresine parolanızı geri getirmek için "
 "gerekli olan talimatlar yollanmıştır."
 
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+msgid "You have been identified. Enter a new password below."
 msgstr ""
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 #, fuzzy
 msgid "Password recovery"
 msgstr "Parola geri alma isteği"
 
-#: actions/recoverpassword.php:191
+#. 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."
 
-#: actions/recoverpassword.php:193
+#. 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."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Geri al"
 
-#: actions/recoverpassword.php:208
+#. 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"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Parolanı geri al"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr ""
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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"
 
-#: actions/recoverpassword.php:243
+#. 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
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Sıfırla"
 
-#: actions/recoverpassword.php:252
+#. 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."
 
-#: actions/recoverpassword.php:282
+#. 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."
 
-#: actions/recoverpassword.php:299
+#. 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."
 
-#: actions/recoverpassword.php:313
+#. 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."
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4562,24 +4688,35 @@ msgstr ""
 "Hesabınıza eklemiş olduğunuz eposta adresine parolanızı geri getirmek için "
 "gerekli olan talimatlar yollanmıştır."
 
-#: actions/recoverpassword.php:357
+#. 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ı."
 
-#: actions/recoverpassword.php:365
+#. 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."
 
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Parola ve onaylaması birbirini tutmuyor."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "Kullanıcı ayarlamada hata oluştu."
 
-#: actions/recoverpassword.php:395
+#. 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."
 
@@ -4596,7 +4733,7 @@ msgstr "Onay kodu hatası."
 msgid "Registration successful"
 msgstr "Kayıt başarılı"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Kayıt"
 
@@ -4622,66 +4759,54 @@ msgid ""
 "link up to friends and colleagues. "
 msgstr ""
 
-#: actions/register.php:433
+#: actions/register.php:437
 #, fuzzy
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
-"verilmez"
-
-#: actions/register.php:438
-#, fuzzy
-msgid "6 or more characters. Required."
+msgid "6 or more characters."
 msgstr "6 veya daha fazla karakter"
 
-#: actions/register.php:442
-#, fuzzy
-msgid "Same as password above. Required."
-msgstr "yukarıdaki parolanın aynısı"
-
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Eposta"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 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:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr ""
 
-#: actions/register.php:463
+#: actions/register.php:462
 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:524
+#: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:534
+#: 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:538
+#: 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:541
+#: 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:546
+#: actions/register.php:545
 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4690,7 +4815,7 @@ msgstr ""
 "bu özel veriler haricinde: parola, eposta adresi, IM adresi, telefon "
 "numarası."
 
-#: actions/register.php:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4709,7 +4834,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5019,7 +5144,7 @@ msgstr "Organizasyon"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "Tanım"
 
@@ -5042,8 +5167,9 @@ msgstr ""
 msgid "Reset key & secret"
 msgstr ""
 
+#. TRANS: Title of form for deleting a user.
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Sil"
 
@@ -5162,7 +5288,7 @@ msgid "Note"
 msgstr "Not"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "Diğerisimler"
 
@@ -7688,25 +7814,25 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 #, 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:153
+#: lib/common.php:158
 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr ""
 
@@ -7777,12 +7903,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "Kapalı"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "Sıfırla"
+#. 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: 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".
@@ -7868,36 +7997,30 @@ msgstr ""
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:154
-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:163
+#: lib/groupeditform.php:155
 #, 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:168
+#: lib/groupeditform.php:160
 #, fuzzy
 msgid "Describe the group or topic"
 msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
 
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:162
 #, 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"
+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:182
+#: lib/groupeditform.php:174
 #, 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:190
+#: lib/groupeditform.php:182
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9018,14 +9141,9 @@ msgstr[0] ""
 msgid "about a year ago"
 msgstr "yaklaşık bir yıl önce"
 
-#: lib/webcolor.php:80
-#, fuzzy, php-format
-msgid "%s is not a valid color!"
-msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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."
@@ -9061,28 +9179,36 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "Böyle bir durum mesajı yok."
+#~ msgid "No such group"
+#~ msgstr "Böyle bir kullanıcı yok."
 
 #, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "%2$s kullanıcısının üye olduğu %1$s grupları."
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
 #~ msgstr "HTTP yöntemi desteklenmiyor."
 
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Uzaktan abonelik"
-
-#~ msgid "Couldn't update user."
-#~ msgstr "Kullanıcı güncellenemedi."
-
-#~ msgid "Couldn't save profile."
-#~ msgstr "Profil kaydedilemedi."
+#~ msgid "Reset"
+#~ msgstr "Sıfırla"
 
 #, fuzzy
-#~ msgid "Couldn't save tags."
-#~ msgstr "Profil kaydedilemedi."
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
+#~ "verilmez"
+
+#, fuzzy
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 veya daha fazla karakter"
+
+#, fuzzy
+#~ msgid "Same as password above. Required."
+#~ msgstr "yukarıdaki parolanın aynısı"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "%s is not a valid color!"
+#~ msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 265ccfc77b..a856164ca4 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-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:06:08+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:58: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-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -80,6 +80,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -91,13 +92,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Зберегти"
@@ -329,7 +330,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "Не вдалося оновити користувача."
@@ -353,7 +354,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "Не вдалося зберегти профіль."
 
@@ -363,7 +364,7 @@ msgstr "Не вдалося зберегти профіль."
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
@@ -548,7 +549,8 @@ msgid "That status is not a favorite."
 msgstr "Цей статус не є обраним."
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "Не можна видалити зі списку обраних."
 
@@ -596,7 +598,7 @@ msgstr "Не вдалося знайти цільового користувач
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Це ім’я вже використовується. Спробуйте інше."
@@ -606,7 +608,7 @@ msgstr "Це ім’я вже використовується. Спробуйт
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Це недійсне ім’я користувача."
@@ -618,7 +620,7 @@ msgstr "Це недійсне ім’я користувача."
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Веб-сторінка має недійсну URL-адресу."
@@ -628,7 +630,7 @@ msgstr "Веб-сторінка має недійсну URL-адресу."
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Повне ім’я надто довге (не більше 255 символів)."
@@ -656,7 +658,7 @@ msgstr[2] "Опис надто довгий (максимум — %d знакі
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Розташування надто довге (не більше 255 символів)."
@@ -714,22 +716,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Не вдалось долучити користувача %1$s до спільноти %2$s."
@@ -741,9 +747,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -800,9 +808,12 @@ msgid "Request token already authorized."
 msgstr "Токен запиту вже авторизовано."
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -810,7 +821,7 @@ msgstr "Токен запиту вже авторизовано."
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -832,18 +843,20 @@ msgstr "Помилка бази даних при додаванні парам
 
 #. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Несподіване представлення форми."
@@ -898,7 +911,7 @@ msgstr "Акаунт"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "Ім’я користувача"
@@ -906,7 +919,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Пароль"
 
@@ -1014,10 +1027,12 @@ msgstr "Цей допис вже повторено."
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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."
@@ -1291,7 +1306,7 @@ 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"
+msgid "Cannot add someone else's membership."
 msgstr "Не вдається надати комусь членство"
 
 #. TRANS: Client error displayed when not using the POST verb.
@@ -1324,29 +1339,51 @@ 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "Не вдається видалити допис з чийогось списку обраних."
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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 using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
 #, fuzzy
-msgid "HTTP method not supported"
-msgstr "HTTP спосіб не підтримується."
+msgid "Not a member."
+msgstr "Не є учасником"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
 msgstr "Неможливо позбавити когось членства"
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1515,25 +1552,31 @@ msgstr "Оновлення аватари невдале."
 msgid "Avatar deleted."
 msgstr "Аватару видалено."
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr "Резерв. копія"
 
-#: actions/backupaccount.php:80
+#. 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 "Ви не можете створити резервну копію свого акаунту."
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
+#, 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 an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
@@ -1544,12 +1587,14 @@ msgstr ""
 "До того ж, прикріплені до ваших повідомлень файли і прямі повідомлення також "
 "не долучаються до резервного файлу."
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "Резерв. копія"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr "Резервне копіювання вашого акаунту"
 
@@ -1583,14 +1628,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Ні"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "Не блокувати цього користувача"
 
@@ -1602,7 +1646,7 @@ msgstr "Не блокувати цього користувача"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Так"
@@ -1618,32 +1662,6 @@ msgstr "Блокувати користувача"
 msgid "Failed to save block information."
 msgstr "Збереження інформації про блокування завершилось невдачею."
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "Такої спільноти не існує."
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1771,7 +1789,8 @@ msgid "Account deleted."
 msgstr "Акаунт видалено."
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 msgid "Delete account"
 msgstr "Видалити акаунт"
 
@@ -1796,8 +1815,9 @@ 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "Підтвердити"
 
@@ -1870,8 +1890,10 @@ 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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 "Немає імені або ІД."
 
@@ -1922,10 +1944,11 @@ msgid "Delete this group"
 msgstr "Видалити спільноту"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1963,19 +1986,30 @@ msgstr "Не видаляти цей допис"
 msgid "Delete this notice"
 msgstr "Видалити допис"
 
-#: actions/deleteuser.php:67
+#. 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 "Ви можете видаляти лише локальних користувачів."
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Видалити користувача"
 
-#: actions/deleteuser.php:136
+#. 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."
@@ -1983,78 +2017,102 @@ 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:163 lib/deleteuserform.php:77
+#. 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.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "Дизайн"
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr "Налаштування дизайну для цього сайту StatusNet"
 
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "Помилкова URL-адреса логотипу."
 
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
 msgid "Invalid SSL logo URL."
 msgstr "Невірний SSL або URL-адреса логотипу."
 
-#: actions/designadminpanel.php:344
+#. 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."
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "Змінити логотип"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Логотип сайту"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "Логотип сайту з SSL"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "Змінити тему"
 
-#: actions/designadminpanel.php:486
+#. 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 "Тема для цього сайту."
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "Своя тема"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Фон"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2064,98 +2122,108 @@ msgstr ""
 "%1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "Увімк."
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "Замостити фон"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. 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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "Посилання"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "Додатково"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "Свій CSS"
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
 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:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "Повернутись до початкових налаштувань"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "Зберегти"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "Зберегти дизайн"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "Цей допис не є обраним!"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "Додати до обраних"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2881,7 +2949,7 @@ msgstr ""
 "повідомлення. Не бачите спільноту, яка вас цікавить? Спробуйте її [знайти](%%"
 "%%action.groupsearch%%%%) або [створіть власну!](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "Створити нову спільноту"
 
@@ -3294,26 +3362,33 @@ msgstr ""
 "\n"
 "Щиро ваші, %2$s\n"
 
-#: actions/joingroup.php:60
+#. 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 "Ви повинні спочатку увійти на сайт, аби долучитися до спільноти."
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s приєднався до спільноти %2$s"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "Ви не є учасником цієї спільноти."
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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"
 
@@ -3419,6 +3494,13 @@ msgstr "URL-адреса логотипу ліцензії"
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Зберегти"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "Зберегти налаштування ліцензії"
@@ -3443,11 +3525,11 @@ msgstr "Увійти"
 msgid "Login to site"
 msgstr "Вхід на сайт"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "Пам’ятати мене"
 
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Автоматично входити у майбутньому; не для комп’ютерів загального "
@@ -3843,7 +3925,8 @@ msgstr "Змінити пароль"
 msgid "Change your password."
 msgstr "Змінити пароль."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "Пароль замінено"
 
@@ -3851,7 +3934,8 @@ msgstr "Пароль замінено"
 msgid "Old password"
 msgstr "Старий пароль"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "Новий пароль"
 
@@ -3859,7 +3943,7 @@ msgstr "Новий пароль"
 msgid "6 or more characters"
 msgstr "6 або більше знаків"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "Такий само, як і пароль вище"
 
@@ -3883,11 +3967,12 @@ msgstr "Старий пароль є неточним"
 msgid "Error saving user; invalid."
 msgstr "Помилка при збереженні користувача; недійсний."
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "Неможна зберегти новий пароль."
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "Пароль збережено."
 
@@ -4212,22 +4297,23 @@ msgid "Profile information"
 msgstr "Інформація профілю"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 msgid "Full name"
 msgstr "Повне ім’я"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "Веб-сторінка"
 
@@ -4239,7 +4325,7 @@ 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:472
+#: 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"
@@ -4248,27 +4334,27 @@ msgstr[1] "Опишіть себе та свої інтереси інтерес
 msgstr[2] "Опишіть себе та свої інтереси інтереси вкладаючись у %d символів"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:135 actions/register.php:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "Розташування"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Де ви живете, на кшталт «Місто, область (регіон), країна»"
 
@@ -4322,7 +4408,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:257 actions/register.php:229
+#: 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)."
@@ -4331,48 +4417,49 @@ msgstr[1] "Біографія надто довга (не більше %d сим
 msgstr[2] "Біографія надто довга (не більше %d символів)."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Часовий пояс не обрано."
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "Не вдалося зберегти налаштування розташування."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Відновити акаунт"
 
@@ -4495,35 +4582,43 @@ msgstr ""
 msgid "Tag cloud"
 msgstr "Хмарка теґів"
 
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "Ви вже в системі!"
 
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "Немає такого коду відновлення."
 
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "Це не код відновлення."
 
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "Код відновлення для невідомого користувача."
 
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "Помилка з кодом підтвердження."
 
-#: actions/recoverpassword.php:97
+#. 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 "Цей код підтвердження застарілий. Будь ласка, розпочніть спочатку."
 
-#: actions/recoverpassword.php:111
+#. 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 "Не вдалося оновити користувача з підтвердженною електронною адресою."
 
-#: actions/recoverpassword.php:152
+#. 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."
@@ -4531,68 +4626,101 @@ msgstr ""
 "Якщо загубите або втратите свій пароль, його буде легко відновити за "
 "допомогою електронної адреси, яку ви зазначили у власному профілі."
 
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
 msgstr "Ідентифікація успішна. Введіть новий пароль. "
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "Відновлення паролю"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "Ім’я користувача або поштова адреса"
 
-#: actions/recoverpassword.php:193
+#. 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 ""
 "Ваше ім’я користувача на цьому сервері, або зареєстрована електронна адреса."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "Відновити"
 
-#: actions/recoverpassword.php:208
+#. 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 "Скинути пароль"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "Відновити пароль"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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 "Запит на відновлення паролю відправлено"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "Дія невідома"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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 або більше знаків, і не забудьте їх!"
 
-#: actions/recoverpassword.php:243
+#. 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
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "Скинути"
 
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "Введіть ім’я або електронну адресу."
 
-#: actions/recoverpassword.php:282
+#. 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 "Користувача з такою електронною адресою або ім’ям немає."
 
-#: actions/recoverpassword.php:299
+#. 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 "Для цього користувача немає зареєстрованої електронної адреси."
 
-#: actions/recoverpassword.php:313
+#. 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 "Помилка при збереженні підтвердження адреси."
 
-#: actions/recoverpassword.php:338
+#. 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."
@@ -4600,23 +4728,34 @@ msgstr ""
 "Інструкції з відновлення паролю було надіслано на електронну адресу, яку ви "
 "вказали у налаштуваннях вашого профілю."
 
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "Несподіване скидання паролю."
 
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
 msgid "Password must be 6 characters or more."
 msgstr "Пароль має складатись з 6-ти або більше знаків."
 
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "Пароль та підтвердження не співпадають."
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "Помилка в налаштуваннях користувача."
 
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "Новий пароль успішно збережено. Тепер ви увійшли."
 
@@ -4633,7 +4772,7 @@ msgstr "Даруйте, помилка у коді запрошення."
 msgid "Registration successful"
 msgstr "Реєстрація успішна"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "Реєстрація"
 
@@ -4661,61 +4800,52 @@ msgstr ""
 "Ця форма дозволить вам створити новий акаунт. Ви зможете робити дописи і "
 "будете в курсі справ ваших друзів та колег. "
 
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-"1-64 літери нижнього регістра і цифри, ніякої пунктуації або інтервалів. "
-"Неодмінно."
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "6 або більше знаків. Неодмінно."
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "Такий само, як і пароль вище. Неодмінно."
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 або більше знаків"
 
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Пошта"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "Використовується лише для оновлень, оголошень та відновлення паролю"
 
-#: actions/register.php:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "Повне ім’я, звісно ж ваше справжнє ім’я"
 
-#: actions/register.php:463
+#: actions/register.php:462
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL-адреса вашої веб-сторінки, блоґу, або профілю на іншому сайті"
 
-#: actions/register.php:524
+#: 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:534
+#: 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:538
+#: 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:541
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "Всі права захищені."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4724,7 +4854,7 @@ msgstr ""
 "Мої дописи і файли доступні на умовах %s, окрім цих приватних даних: пароль, "
 "електронна адреса, адреса IM, телефонний номер."
 
-#: actions/register.php:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4757,7 +4887,7 @@ msgstr ""
 "Дякуємо, що зареєструвались у нас, і, сподіваємось, вам сподобається наш "
 "сервіс."
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5073,7 +5203,7 @@ msgstr "Організація"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "Опис"
 
@@ -5096,8 +5226,9 @@ msgstr "Можливості додатку"
 msgid "Reset key & secret"
 msgstr "Призначити новий ключ і таємне слово"
 
+#. TRANS: Title of form for deleting a user.
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Видалити"
 
@@ -5225,7 +5356,7 @@ msgid "Note"
 msgstr "Зауваження"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "Додаткові імена"
 
@@ -7821,24 +7952,24 @@ msgstr ""
 "tracking — наразі не виконується\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 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:153
+#: lib/common.php:158
 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "Іти до файлу інсталяції."
 
@@ -7905,11 +8036,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "Вимк."
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-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: 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".
@@ -7992,34 +8127,29 @@ msgstr "Вперед"
 msgid "Grant this user the \"%s\" role"
 msgstr "Надати цьому користувачеві роль «%s»"
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-"1-64 літери нижнього регістру і цифри, ніякої пунктуації або інтервалів"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "URL-адреса веб-сторінки або тематичного блоґу спільноти"
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "Опишіть спільноту або тему"
 
-#: lib/groupeditform.php:170
-#, 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"
+#: lib/groupeditform.php:162
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d character or less."
+msgid_plural "Describe the group or topic in %d characters or less."
 msgstr[0] "Опишіть спільноту або тему, вкладаючись у %d знак"
 msgstr[1] "Опишіть спільноту або тему, вкладаючись у %d знаків"
 msgstr[2] "Опишіть спільноту або тему, вкладаючись у %d знаків"
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:174
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Розташування спільноти, на кшталт «Місто, область (або регіон), країна»."
 
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9243,14 +9373,9 @@ msgstr[2] "близько %d місяців тому"
 msgid "about a year ago"
 msgstr "близько року тому"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s є неприпустимим кольором!"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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-формат)"
@@ -9294,29 +9419,31 @@ msgstr "Неправильний XML, корінь XRD відсутній."
 msgid "Getting backup from file '%s'."
 msgstr "Отримання резервної копії файлу «%s»."
 
-#~ msgid "AtomPub post with unknown attention URI %s"
-#~ msgstr "Запис AtomPub з невідомим цільовим URI %s"
+#~ msgid "No such group"
+#~ msgstr "Такої спільноти не існує."
 
-#~ msgid "No such profile"
-#~ msgstr "Немає такого профілю"
+#, fuzzy
+#~ msgid "HTTP method not supported"
+#~ msgstr "HTTP спосіб не підтримується."
 
-#~ msgid "Notices %s has favorited to on %s"
-#~ msgstr "Дописи, що їх %s позначив як обрані на %s"
+#~ msgid "Reset"
+#~ msgstr "Скинути"
 
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "Спільноти, до яких залучений %s на %s"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr ""
+#~ "1-64 літери нижнього регістра і цифри, ніякої пунктуації або інтервалів. "
+#~ "Неодмінно."
 
-#~ msgid "Method not supported"
-#~ msgstr "Метод не підтримується"
+#~ msgid "6 or more characters. Required."
+#~ msgstr "6 або більше знаків. Неодмінно."
 
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "Люди, до яких підписався %s на %s"
+#~ msgid "Same as password above. Required."
+#~ msgstr "Такий само, як і пароль вище. Неодмінно."
 
-#~ msgid "Couldn't update user."
-#~ msgstr "Не вдалося оновити користувача."
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr ""
+#~ "1-64 літери нижнього регістру і цифри, ніякої пунктуації або інтервалів"
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "Не вдалося зберегти профіль."
-
-#~ msgid "Couldn't save tags."
-#~ msgstr "Не вдалося зберегти теґи."
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s є неприпустимим кольором!"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 236a3f6708..c071fa458a 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -14,18 +14,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:06:09+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 14:58: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-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-15 11:03:27+0000\n"
+"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -80,6 +80,7 @@ msgid "Save access settings"
 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 IM preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
@@ -91,13 +92,13 @@ 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/emailsettings.php:254
-#: actions/imsettings.php:183 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:197
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:205
-#: actions/subscriptions.php:262 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:254 actions/imsettings.php:183
+#: actions/othersettings.php:134 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "保存"
@@ -327,7 +328,7 @@ msgstr ""
 #: actions/confirmaddress.php:118 actions/emailsettings.php:359
 #: actions/emailsettings.php:508 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
-#: actions/profilesettings.php:321 actions/smssettings.php:301
+#: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
 msgstr "无法更新用户。"
@@ -351,7 +352,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:417
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
 msgid "Could not save profile."
 msgstr "无法保存个人信息。"
 
@@ -361,7 +362,7 @@ msgstr "无法保存个人信息。"
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
 #: actions/newapplication.php:104 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
@@ -533,7 +534,8 @@ msgid "That status is not a favorite."
 msgstr "此消息未被收藏。"
 
 #. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:91
 msgid "Could not delete favorite."
 msgstr "无法删除收藏。"
 
@@ -579,7 +581,7 @@ msgstr "无法找到目标用户。"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:136 actions/profilesettings.php:272
+#: actions/newgroup.php:136 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "昵称已被使用，换一个吧。"
@@ -589,7 +591,7 @@ msgstr "昵称已被使用，换一个吧。"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:140 actions/profilesettings.php:242
+#: actions/newgroup.php:140 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "不是有效的昵称。"
@@ -601,7 +603,7 @@ msgstr "不是有效的昵称。"
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:181 actions/editapplication.php:233
 #: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:147 actions/profilesettings.php:247
+#: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "主页的URL不正确。"
@@ -611,7 +613,7 @@ msgstr "主页的URL不正确。"
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:251
+#: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "全名过长(不能超过 255 个字符)。"
@@ -637,7 +639,7 @@ 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:264
+#: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "位置过长(不能超过255个字符)。"
@@ -693,22 +695,26 @@ 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:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:333
 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:105 lib/command.php:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:338
 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:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:350
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "无法把用户%1$s添加到%2$s小组"
@@ -720,9 +726,11 @@ 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.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:127 actions/leavegroup.php:129
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
 #: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
@@ -779,9 +787,12 @@ msgid "Request token already authorized."
 msgstr "请求 token 已被授权了。"
 
 #. 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.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
+#: actions/deletenotice.php:177 actions/disfavor.php:76
 #: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
@@ -789,7 +800,7 @@ msgstr "请求 token 已被授权了。"
 #: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
 #: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: actions/profilesettings.php:216 actions/recoverpassword.php:350
+#: 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
@@ -810,18 +821,20 @@ msgstr "插入 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Client error when submitting a form with unexpected information.
+#. 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:104 actions/editapplication.php:144
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
 #: actions/emailsettings.php:316 actions/grouplogo.php:335
 #: actions/imsettings.php:239 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "未预料的表单提交。"
@@ -873,7 +886,7 @@ msgstr "帐号"
 #: actions/apioauthauthorize.php:459 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:432
 #: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: actions/userauthorization.php:145 lib/groupeditform.php:144
 #: lib/userprofile.php:134
 msgid "Nickname"
 msgstr "昵称"
@@ -881,7 +894,7 @@ 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:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "密码"
 
@@ -985,10 +998,12 @@ msgstr "已转发了该消息。"
 #. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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."
@@ -1256,7 +1271,7 @@ 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"
+msgid "Cannot add someone else's membership."
 msgstr "无法添加新的关注。"
 
 #. TRANS: Client error displayed when not using the POST verb.
@@ -1292,30 +1307,51 @@ 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"
+msgid "Cannot delete someone else's favorite."
 msgstr "无法删除收藏。"
 
 #. TRANS: Client exception thrown when referencing a non-existing group.
-#: actions/atompubshowmembership.php:81
-msgid "No such group"
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
+#: actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:88 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:380
+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"
+msgid "Not a member."
 msgstr "所有成员"
 
-#. TRANS: Client exception thrown when using an unsupported HTTP method.
-#: actions/atompubshowmembership.php:116
-#, fuzzy
-msgid "HTTP method not supported"
-msgstr "HTTP 方法不支持。"
-
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
 #, fuzzy
-msgid "Cannot delete someone else's membership"
+msgid "Cannot delete someone else's membership."
 msgstr "无法删除自我关注。"
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
@@ -1484,35 +1520,42 @@ msgstr "更新头像失败。"
 msgid "Avatar deleted."
 msgstr "头像已删除。"
 
-#: actions/backupaccount.php:62 actions/profilesettings.php:462
+#. 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:464
 msgid "Backup account"
 msgstr ""
 
-#: actions/backupaccount.php:80
+#. 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 ""
 
-#: actions/backupaccount.php:232
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:225
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
-"\">Activity Streams</a> format.  This is an experimental feature and "
-"provides an incomplete backup; private account information like email and IM "
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
 
-#: actions/backupaccount.php:255
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
 msgstr "背景"
 
-#: actions/backupaccount.php:258
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:252
 msgid "Backup your account"
 msgstr ""
 
@@ -1545,14 +1588,13 @@ msgstr ""
 #. 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:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
 msgstr "否"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
 msgid "Do not block this user"
 msgstr "不要屏蔽这个用户"
 
@@ -1564,7 +1606,7 @@ msgstr "不要屏蔽这个用户"
 #. 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:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:185
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "是"
@@ -1580,32 +1622,6 @@ msgstr "屏蔽这个用户"
 msgid "Failed to save block information."
 msgstr "保存屏蔽信息失败。"
 
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. 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/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "没有这个组。"
-
 #. TRANS: Title for first page with list of users blocked from a group.
 #. TRANS: %s is a group nickname.
 #: actions/blockedfromgroup.php:101
@@ -1735,7 +1751,8 @@ msgid "Account deleted."
 msgstr "头像已删除。"
 
 #. TRANS: Page title for page on which a user account can be deleted.
-#: actions/deleteaccount.php:228 actions/profilesettings.php:469
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:472
 #, fuzzy
 msgid "Delete account"
 msgstr "创建一个账户"
@@ -1757,8 +1774,9 @@ msgid ""
 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:239 actions/register.php:441
+#: actions/recoverpassword.php:262 actions/register.php:440
 msgid "Confirm"
 msgstr "密码确认"
 
@@ -1831,8 +1849,10 @@ 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.
-#: actions/deletegroup.php:94 actions/joingroup.php:88
-#: actions/leavegroup.php:88
+#. 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。"
 
@@ -1882,10 +1902,11 @@ msgid "Delete this group"
 msgstr "删除这个小组"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
@@ -1923,97 +1944,132 @@ msgstr "不要删除这个消息"
 msgid "Delete this notice"
 msgstr "删除"
 
-#: actions/deleteuser.php:67
+#. 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 "你只能删除本地用户。"
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+#, fuzzy
+msgctxt "TITLE"
 msgid "Delete user"
 msgstr "删除用户"
 
-#: actions/deleteuser.php:136
+#. 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:163 lib/deleteuserform.php:77
+#. 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.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "外观"
 
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
 msgstr "这个 StatusNet 网站的外观设置"
 
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
 msgid "Invalid logo URL."
 msgstr "无效的 logo URL。"
 
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
 msgid "Invalid SSL logo URL."
 msgstr "无效的 SSL logo URL。"
 
-#: actions/designadminpanel.php:344
+#. 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。"
 
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
 msgid "Change logo"
 msgstr "更换 logo"
 
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "网站 logo"
 
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
 msgid "SSL logo"
 msgstr "网站 SSL logo"
 
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
 msgid "Change theme"
 msgstr "更换主题"
 
-#: actions/designadminpanel.php:486
+#. 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 "这个网站的主题。"
 
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
 msgid "Custom theme"
 msgstr "自定义主题"
 
-#: actions/designadminpanel.php:497
+#. 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.
 #. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
 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:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:521 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "背景"
 
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:527
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2021,98 +2077,108 @@ msgid ""
 msgstr "你可以为网站上传一个背景图像。文件大小限制在%1$s以下。"
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
 msgid "On"
 msgstr "打开"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: 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:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
 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:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
 msgid "Tile background image"
 msgstr "平铺背景图片"
 
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
+#. 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:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
 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:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
 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:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
 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:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
 msgid "Links"
 msgstr "链接"
 
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
 msgid "Advanced"
 msgstr "高级"
 
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
 msgid "Custom CSS"
 msgstr "自定义CSS"
 
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. 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.
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
 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:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
 msgid "Reset back to default"
 msgstr "重置到默认"
 
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:311
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "保存"
-
+#. TRANS: Title for button for saving theme settings.
 #. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
 msgid "Save design"
 msgstr "保存外观"
 
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:84
 msgid "This notice is not a favorite!"
 msgstr "此消息未被收藏！"
 
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:99
 msgid "Add to favorites"
 msgstr "加入收藏"
 
-#: actions/doc.php:158
-#, php-format
-msgid "No such document \"%s\""
+#. 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.
@@ -2822,7 +2888,7 @@ msgstr ""
 "组？试一下[搜索小组](%%%%action.groupsearch%%%%)或[建立自己的小组](%%%%"
 "action.newgroup%%%%)！"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr "新建一个小组"
 
@@ -3206,26 +3272,33 @@ msgstr ""
 "\n"
 "诚挚的感谢, %2$s\n"
 
-#: actions/joingroup.php:60
+#. 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 "你必须登录才能加入小组。"
 
-#: actions/joingroup.php:141
-#, php-format
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
+#, fuzzy, php-format
+msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s加入了%2$s小组"
 
-#: actions/leavegroup.php:60
+#. 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:100 lib/command.php:386
+#: actions/leavegroup.php:103 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "你不是该群小组成员。"
 
-#: actions/leavegroup.php:137
-#, php-format
+#. 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小组。"
 
@@ -3329,6 +3402,13 @@ msgstr "许可协议图片 URL。"
 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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "保存"
+
 #: actions/licenseadminpanel.php:311
 msgid "Save license settings"
 msgstr "保存许可协议设置"
@@ -3353,11 +3433,11 @@ msgstr "登录"
 msgid "Login to site"
 msgstr "登录"
 
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
 msgid "Remember me"
 msgstr "记住登录状态"
 
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "下次自动登录，请不要在公共电脑上使用此选项！"
 
@@ -3737,7 +3817,8 @@ msgstr "修改密码"
 msgid "Change your password."
 msgstr "修改你的密码"
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
 msgid "Password change"
 msgstr "修改密码"
 
@@ -3745,7 +3826,8 @@ msgstr "修改密码"
 msgid "Old password"
 msgstr "旧密码"
 
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
 msgid "New password"
 msgstr "新密码"
 
@@ -3753,7 +3835,7 @@ msgstr "新密码"
 msgid "6 or more characters"
 msgstr "6 个或更多字符"
 
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
 msgid "Same as password above"
 msgstr "与上面相同的密码"
 
@@ -3777,11 +3859,12 @@ msgstr "旧密码不正确"
 msgid "Error saving user; invalid."
 msgstr "保存用户时出错；无效。"
 
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
 msgid "Can't save new password."
 msgstr "无法保存新密码。"
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
 msgid "Password saved."
 msgstr "密码已保存。"
 
@@ -4104,22 +4187,23 @@ msgid "Profile information"
 msgstr "个人信息"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:109
+#: actions/profilesettings.php:109 actions/register.php:433
+#: lib/groupeditform.php:146
 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.
-#: actions/profilesettings.php:113 actions/register.php:456
+#: actions/profilesettings.php:113 actions/register.php:455
 #: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:152
 msgid "Full name"
 msgstr "全名"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
-#: actions/profilesettings.php:118 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:153
 msgid "Homepage"
 msgstr "主页"
 
@@ -4131,34 +4215,34 @@ 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:472
+#: 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:477
+#: 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:479
+#: 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.
-#: actions/profilesettings.php:145 actions/register.php:484
+#: actions/profilesettings.php:145 actions/register.php:483
 #: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
+#: actions/userauthorization.php:166 lib/groupeditform.php:172
 #: lib/userprofile.php:167
 msgid "Location"
 msgstr "位置"
 
 #. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:148 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "你的地理位置，格式类似\"城市，省份，国家\""
 
@@ -4209,55 +4293,56 @@ 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:257 actions/register.php:229
+#: 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)."
 msgstr[0] "自述过长(不能超过%d个字符)。"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:268 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "未选择时区。"
 
 #. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:276
+#: actions/profilesettings.php:277
 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:290 actions/tagother.php:178
+#: 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
 #. TRANS: automatically subscribe to any subscriber.
-#: actions/profilesettings.php:346
+#: actions/profilesettings.php:347
 #, 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:404
+#: actions/profilesettings.php:405
 #, fuzzy
 msgid "Could not save location prefs."
 msgstr "无法保存标签。"
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:426 actions/tagother.php:200
+#: actions/profilesettings.php:427 actions/tagother.php:200
 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:435 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 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:476 actions/restoreaccount.php:60
+#: actions/profilesettings.php:480 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "创建一个账户"
@@ -4374,123 +4459,175 @@ msgstr "现在就[注册](%%action.register%%)并发布第一个！"
 msgid "Tag cloud"
 msgstr "标签云"
 
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
 msgid "You are already logged in!"
 msgstr "你已经登录了！"
 
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
 msgid "No such recovery code."
 msgstr "没有这个恢复码。"
 
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
 msgid "Not a recovery code."
 msgstr "不是恢复码。"
 
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
 msgstr "未知用户的恢复码"
 
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
 msgid "Error with confirmation code."
 msgstr "验证码出错。"
 
-#: actions/recoverpassword.php:97
+#. 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 "验证码已过期，请重来。"
 
-#: actions/recoverpassword.php:111
+#. 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 "无法更新已确认的电子邮件。"
 
-#: actions/recoverpassword.php:152
+#. 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:158
-msgid "You have been identified. Enter a new password below. "
+#: actions/recoverpassword.php:167
+#, fuzzy
+msgid "You have been identified. Enter a new password below."
 msgstr "你的身份已被验证，请在下面输入新的密码。 "
 
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
 msgid "Password recovery"
 msgstr "恢复密码"
 
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
 msgid "Nickname or email address"
 msgstr "昵称或电子邮件"
 
-#: actions/recoverpassword.php:193
+#. 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 "你在此服务器的昵称，或登记的邮箱。"
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
 msgid "Recover"
 msgstr "恢复"
 
-#: actions/recoverpassword.php:208
+#. 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 "重置密码"
 
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
 msgid "Recover password"
 msgstr "恢复密码"
 
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. 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 "已请求密码恢复"
 
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
 msgid "Unknown action"
 msgstr "未知动作"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. 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个字符，还有，别忘记它！"
 
-#: actions/recoverpassword.php:243
+#. 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
+msgctxt "BUTTON"
 msgid "Reset"
 msgstr "重置"
 
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
 msgid "Enter a nickname or email address."
 msgstr "输入昵称或电子邮件。"
 
-#: actions/recoverpassword.php:282
+#. 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 "没有拥有这个用户名或电子邮件的用户。"
 
-#: actions/recoverpassword.php:299
+#. 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 "该用户没有登记电子邮件。"
 
-#: actions/recoverpassword.php:313
+#. 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 "保存地址确认时出错。"
 
-#: actions/recoverpassword.php:338
+#. 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 "恢复密码的说明已被发送到你登记的电子邮箱中。"
 
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
 msgid "Unexpected password reset."
 msgstr "未预料的密码重置。"
 
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
 msgid "Password must be 6 characters or more."
 msgstr "密码必须是 6 位或更多字符。"
 
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
 msgid "Password and confirmation do not match."
 msgstr "密码和确认密码不匹配。"
 
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. 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
 msgid "Error setting user."
 msgstr "保存用户设置时出错。"
 
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
 msgid "New password successfully saved. You are now logged in."
 msgstr "新密码已保存，你现在已登录。"
 
@@ -4506,7 +4643,7 @@ msgstr "对不起，无效的邀请码。"
 msgid "Registration successful"
 msgstr "注册成功"
 
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
 msgid "Register"
 msgstr "注册"
 
@@ -4534,59 +4671,52 @@ msgstr ""
 "你可以通过此表单建立一个新的账户。然后你就可以发布消息并与朋友和同事们保持联"
 "系。 "
 
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1 到 64 位的小写字母或数字，不能使用标点和空格。此项必填。"
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "至少 6 位字符。此项必填。"
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "与上面输入相同的密码。此项必填。"
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters."
+msgstr "6 个或更多字符"
 
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "电子邮件"
 
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "只用于更新、通知及密码恢复"
 
-#: actions/register.php:458
+#: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
 msgstr "更长的名字，最好是“真实姓名”"
 
-#: actions/register.php:463
+#: actions/register.php:462
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "你的主页、博客或在其他网站的URL"
 
-#: actions/register.php:524
+#: 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:534
+#: 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:538
+#: 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:541
+#: actions/register.php:540
 msgid "All rights reserved."
 msgstr "保留所有权利。"
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4595,7 +4725,7 @@ msgstr ""
 "我的文字和文件在%s下提供，除了如下隐私内容：密码、电子邮件地址、IM 地址和电话"
 "号码。"
 
-#: actions/register.php:589
+#: actions/register.php:588
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4625,7 +4755,7 @@ msgstr ""
 "\n"
 "感谢你的注册，希望你喜欢这个服务。"
 
-#: actions/register.php:613
+#: actions/register.php:612
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -4932,7 +5062,7 @@ msgstr "组织名称必填。"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:167
 msgid "Description"
 msgstr "描述"
 
@@ -4955,8 +5085,9 @@ msgstr "应用程序动作"
 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:66 lib/noticelist.php:673
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "删除"
 
@@ -5078,7 +5209,7 @@ msgid "Note"
 msgstr "注释"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:293 lib/groupeditform.php:179
 msgid "Aliases"
 msgstr "别名"
 
@@ -7595,24 +7726,24 @@ msgstr ""
 "tracking - 尚未实现。\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:150
+#: lib/common.php:155
 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:153
+#: lib/common.php:158
 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:156
+#: lib/common.php:161
 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:160
+#: lib/common.php:165
 msgid "Go to the installer."
 msgstr "去安装程序。"
 
@@ -7677,11 +7808,15 @@ msgctxt "RADIO"
 msgid "Off"
 msgstr "关闭"
 
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-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: 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".
@@ -7765,30 +7900,26 @@ msgstr "执行"
 msgid "Grant this user the \"%s\" role"
 msgstr "给这个用户添加\\\"%s\\\"权限"
 
-#: lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1 到 64 个小写字母或数字，不包含标点或空格"
-
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:155
 msgid "URL of the homepage or blog of the group or topic."
 msgstr "这个小组或主题的主页或博客 URL。"
 
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:160
 msgid "Describe the group or topic"
 msgstr "小组或主题的描述"
 
-#: lib/groupeditform.php:170
-#, 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"
+#: lib/groupeditform.php:162
+#, 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:182
+#: lib/groupeditform.php:174
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "小组的地理位置，例如“国家、省份、城市”。"
 
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:182
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8965,14 +9096,9 @@ msgstr[0] "约%d个月前"
 msgid "about a year ago"
 msgstr "约1年前"
 
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s不是有效的颜色！"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. 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个十六进制字符。"
@@ -9007,27 +9133,28 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr "从文件'%s'获取备份。"
 
-#, fuzzy
-#~ msgid "No such profile"
-#~ msgstr "没有这个文件。"
+#~ msgid "No such group"
+#~ msgstr "没有这个组。"
 
 #, fuzzy
-#~ msgid "Groups %s is a member of on %s"
-#~ msgstr "%s 组是成员组成了"
-
-#, fuzzy
-#~ msgid "Method not supported"
+#~ msgid "HTTP method not supported"
 #~ msgstr "HTTP 方法不支持。"
 
-#, fuzzy
-#~ msgid "People %s has subscribed to on %s"
-#~ msgstr "关注了%s的用户"
+#~ msgid "Reset"
+#~ msgstr "重置"
 
-#~ msgid "Couldn't update user."
-#~ msgstr "无法更新用户。"
+#~ msgid ""
+#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+#~ msgstr "1 到 64 位的小写字母或数字，不能使用标点和空格。此项必填。"
 
-#~ msgid "Couldn't save profile."
-#~ msgstr "无法保存个人信息。"
+#~ msgid "6 or more characters. Required."
+#~ msgstr "至少 6 位字符。此项必填。"
 
-#~ msgid "Couldn't save tags."
-#~ msgstr "无法保存标签。"
+#~ msgid "Same as password above. Required."
+#~ msgstr "与上面输入相同的密码。此项必填。"
+
+#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#~ msgstr "1 到 64 个小写字母或数字，不包含标点或空格"
+
+#~ msgid "%s is not a valid color!"
+#~ msgstr "%s不是有效的颜色！"
diff --git a/plugins/Facebook/locale/Facebook.pot b/plugins/Facebook/locale/Facebook.pot
index f41ee06615..b7c6dead94 100644
--- a/plugins/Facebook/locale/Facebook.pot
+++ b/plugins/Facebook/locale/Facebook.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+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"
@@ -129,28 +129,28 @@ msgstr ""
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
 msgid "Registration not allowed."
 msgstr ""
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
 msgid "Not a valid invitation code."
 msgstr ""
 
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
 msgid "Nickname not allowed."
 msgstr ""
 
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
 msgid "Nickname already in use. Try another one."
 msgstr ""
 
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
 msgid "Error connecting user to Facebook."
 msgstr ""
 
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
 msgid "Invalid username or password."
 msgstr ""
 
diff --git a/plugins/Facebook/locale/be-tarask/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/be-tarask/LC_MESSAGES/Facebook.po
index 52511e51de..cae852296f 100644
--- a/plugins/Facebook/locale/be-tarask/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/be-tarask/LC_MESSAGES/Facebook.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:05+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59:35+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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -154,28 +154,28 @@ msgstr "Злучыць"
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
 msgid "Registration not allowed."
 msgstr "Рэгістрацыя не дазволеная."
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
 msgid "Not a valid invitation code."
 msgstr "Няслушны код запрашэньня."
 
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
 msgid "Nickname not allowed."
 msgstr "Мянушка забароненая."
 
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
 msgid "Nickname already in use. Try another one."
 msgstr "Мянушка ўжо выкарыстоўваецца. Паспрабуйце іншую."
 
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
 msgid "Error connecting user to Facebook."
 msgstr "Памылка далучэньня карыстальніка да Facebook."
 
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
 msgid "Invalid username or password."
 msgstr "Няслушнае імя карыстальніка ці пароль."
 
diff --git a/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po
index 1ee2bf7f1a..c2edf3bf20 100644
--- a/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:06+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59:35+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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -138,28 +138,28 @@ msgstr "Kevreañ"
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
 msgid "Registration not allowed."
 msgstr "N'eo ket aotreet krouiñ kontoù."
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
 msgid "Not a valid invitation code."
 msgstr "N'eo ket reizh ar c'hod pedadenn."
 
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
 msgid "Nickname not allowed."
 msgstr "Lesanv nann-aotreet."
 
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
 msgid "Nickname already in use. Try another one."
 msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
 
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
 msgid "Error connecting user to Facebook."
 msgstr ""
 
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
 msgid "Invalid username or password."
 msgstr "Anv implijer pe ger-tremen direizh."
 
diff --git a/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po
index 3ae1c2fa8a..3781695ab3 100644
--- a/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:06+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -158,28 +158,28 @@ msgstr "Verbinden"
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
 msgid "Registration not allowed."
 msgstr "Registrierung nicht erlaubt."
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
 msgid "Not a valid invitation code."
 msgstr "Kein gültiger Einladungscode."
 
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
 msgid "Nickname not allowed."
 msgstr "Benutzername nicht erlaubt."
 
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
 msgid "Nickname already in use. Try another one."
 msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
 
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
 msgid "Error connecting user to Facebook."
 msgstr "Fehler beim Verbinden des Benutzers mit Facebook."
 
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
 msgid "Invalid username or password."
 msgstr "Benutzername oder Passwort falsch."
 
diff --git a/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po
index 8ba04b2829..f72df84434 100644
--- a/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po
@@ -11,13 +11,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:06+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59:36+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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -153,28 +153,28 @@ msgstr "Conectar"
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
 msgid "Registration not allowed."
 msgstr "Registro de usuario no permitido."
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
 msgid "Not a valid invitation code."
 msgstr "No es un código de invitación válido."
 
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
 msgid "Nickname not allowed."
 msgstr "Nombre de usuario no autorizado."
 
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
 msgid "Nickname already in use. Try another one."
 msgstr "El nombre de usuario ya existe. Prueba con otro."
 
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
 msgid "Error connecting user to Facebook."
 msgstr "Error de conexión del usuario a Facebook."
 
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
 msgid "Invalid username or password."
 msgstr "Nombre de usuario o contraseña inválidos."
 
diff --git a/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po
index d4bb47a5e1..02242d2348 100644
--- a/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:06+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59: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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -157,28 +157,28 @@ msgstr "Connexion"
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
 msgid "Registration not allowed."
 msgstr "Inscription non autorisée."
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
 msgid "Not a valid invitation code."
 msgstr "Le code d’invitation n’est pas valide."
 
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
 msgid "Nickname not allowed."
 msgstr "Pseudonyme non autorisé."
 
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonyme déjà utilisé. Essayez-en un autre."
 
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
 msgid "Error connecting user to Facebook."
 msgstr "Erreur de connexion de l’utilisateur à Facebook."
 
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
 msgid "Invalid username or password."
 msgstr "Nom d’utilisateur ou mot de passe incorrect."
 
diff --git a/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po
index d46ed10995..4fbedad9d1 100644
--- a/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:06+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59: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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -139,28 +139,28 @@ msgstr "Conectar"
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
 msgid "Registration not allowed."
 msgstr "Non se permite o rexistro."
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
 msgid "Not a valid invitation code."
 msgstr "O código da invitación é incorrecto."
 
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
 msgid "Nickname not allowed."
 msgstr ""
 
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
 msgid "Nickname already in use. Try another one."
 msgstr "Ese alcume xa está en uso. Probe con outro."
 
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
 msgid "Error connecting user to Facebook."
 msgstr ""
 
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
 msgid "Invalid username or password."
 msgstr "O nome de usuario ou contrasinal non son correctos."
 
diff --git a/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po
index 3f2eebf349..8aae8310f0 100644
--- a/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:06+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59: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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -152,28 +152,28 @@ msgstr "Connecter"
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
 msgid "Registration not allowed."
 msgstr "Creation de conto non permittite."
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
 msgid "Not a valid invitation code."
 msgstr "Le codice de invitation es invalide."
 
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
 msgid "Nickname not allowed."
 msgstr "Pseudonymo non permittite."
 
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonymo ja in uso. Proba un altere."
 
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
 msgid "Error connecting user to Facebook."
 msgstr "Error durante le connexion del usator a Facebook."
 
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
 msgid "Invalid username or password."
 msgstr "Nomine de usator o contrasigno invalide."
 
diff --git a/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po
index 20349393a7..93d93a6362 100644
--- a/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:06+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59: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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -152,28 +152,28 @@ msgstr "Поврзи се"
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
 msgid "Registration not allowed."
 msgstr "Регистрацијата не е дозволена."
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
 msgid "Not a valid invitation code."
 msgstr "Ова не е важечки код за покана."
 
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
 msgid "Nickname not allowed."
 msgstr "Прекарот не е дозволен."
 
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
 msgid "Nickname already in use. Try another one."
 msgstr "Прекарот е зафатен. Одберете друг."
 
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
 msgid "Error connecting user to Facebook."
 msgstr "Грешка при поврзувањето на корисникот со Facebook."
 
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
 msgid "Invalid username or password."
 msgstr "Неважечко корисничко име или лозинка."
 
@@ -201,7 +201,7 @@ msgstr "Расположиви знаци"
 #: facebooknoticeform.php:196
 msgctxt "BUTTON"
 msgid "Send"
-msgstr "Прати"
+msgstr "Испрати"
 
 #: facebookhome.php:103
 msgid "Server error: Couldn't get user!"
diff --git a/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po
index bf797b3ac4..4c05ffa666 100644
--- a/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:06+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59: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-01-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -134,28 +134,28 @@ msgstr "Koble til"
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
 msgid "Registration not allowed."
 msgstr "Registrering ikke tillatt."
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
 msgid "Not a valid invitation code."
 msgstr "Ikke en gyldig invitasjonskode."
 
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
 msgid "Nickname not allowed."
 msgstr "Kallenavn er ikke tillatt."
 
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
 msgid "Nickname already in use. Try another one."
 msgstr "Kallenavnet er allerede i bruk. Prøv et annet."
 
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
 msgid "Error connecting user to Facebook."
 msgstr ""
 
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
 msgid "Invalid username or password."
 msgstr "Ugyldig brukernavn eller passord."
 
diff --git a/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
index 794c5db7e4..74a7171f55 100644
--- a/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:59+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59: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-14 13:21:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -157,29 +157,29 @@ msgstr "Koppelen"
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
 msgid "Registration not allowed."
 msgstr "Registratie is niet toegestaan."
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
 msgid "Not a valid invitation code."
 msgstr "De uitnodigingscode is ongeldig."
 
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
 msgid "Nickname not allowed."
 msgstr "Gebruikersnaam niet toegestaan."
 
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
 msgid "Nickname already in use. Try another one."
 msgstr ""
 "De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
 
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
 msgid "Error connecting user to Facebook."
 msgstr "Fout bij het verbinden van de gebruiker met Facebook."
 
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
 msgid "Invalid username or password."
 msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
diff --git a/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po
index b6c5a45c97..b13d1750f2 100644
--- a/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:06+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59:37+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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -136,28 +136,28 @@ msgstr "Conectar"
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
 msgid "Registration not allowed."
 msgstr "Não é permitido o registro."
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
 msgid "Not a valid invitation code."
 msgstr "O código de convite é inválido."
 
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
 msgid "Nickname not allowed."
 msgstr "Apelido não permitido."
 
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
 msgid "Nickname already in use. Try another one."
 msgstr "Este apelido já está em uso. Tente outro."
 
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
 msgid "Error connecting user to Facebook."
 msgstr "Erro ao conectar o usuário ao Facebook."
 
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
 msgid "Invalid username or password."
 msgstr ""
 
diff --git a/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po
index 8d975e3a2b..0eaedbb800 100644
--- a/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:06+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59: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-01-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -158,28 +158,28 @@ msgstr "Umugnay"
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
 msgid "Registration not allowed."
 msgstr "Hindi pinapahintulutan ang pagpapatala."
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
 msgid "Not a valid invitation code."
 msgstr "Hindi isang tanggap na kodigo ng paanyaya."
 
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
 msgid "Nickname not allowed."
 msgstr "Hindi pinapahintulutan ang palayaw."
 
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
 msgid "Nickname already in use. Try another one."
 msgstr "Ginagamit na ang palayaw. Subukan ang iba."
 
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
 msgid "Error connecting user to Facebook."
 msgstr "May kamalian sa pag-ugnay ng tagagamit sa Facebook."
 
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
 msgid "Invalid username or password."
 msgstr "Hindi tanggap na pangalan ng tagagamit o hudyat."
 
diff --git a/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po
index 5f28c03f52..88aef430fd 100644
--- a/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:07+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59: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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -154,28 +154,28 @@ msgstr "Під’єднати"
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
 msgid "Registration not allowed."
 msgstr "Реєстрацію не дозволено."
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
 msgid "Not a valid invitation code."
 msgstr "Це не дійсний код запрошення."
 
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
 msgid "Nickname not allowed."
 msgstr "Нікнейм не допускається."
 
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
 msgid "Nickname already in use. Try another one."
 msgstr "Цей нікнейм вже використовується. Спробуйте інший."
 
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
 msgid "Error connecting user to Facebook."
 msgstr "Помилка при підключенні до Facebook."
 
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
 msgid "Invalid username or password."
 msgstr "Невірне ім’я або пароль."
 
diff --git a/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po
index 40c83bb8f5..f81d46986d 100644
--- a/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:07+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 14:59:38+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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -148,28 +148,28 @@ msgstr "连接"
 
 #. TRANS: Client error trying to register with registrations not allowed.
 #. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
 msgid "Registration not allowed."
 msgstr "不允许注册。"
 
 #. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
+#: FBConnectAuth.php:259
 msgid "Not a valid invitation code."
 msgstr "对不起，无效的邀请码。"
 
-#: FBConnectAuth.php:267
+#: FBConnectAuth.php:271
 msgid "Nickname not allowed."
 msgstr "昵称不被允许。"
 
-#: FBConnectAuth.php:272
+#: FBConnectAuth.php:276
 msgid "Nickname already in use. Try another one."
 msgstr "昵称已被使用，换一个吧。"
 
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
 msgid "Error connecting user to Facebook."
 msgstr "连接用户至Facebook时发生错误。"
 
-#: FBConnectAuth.php:310
+#: FBConnectAuth.php:316
 msgid "Invalid username or password."
 msgstr "用户名或密码不正确。"
 
diff --git a/plugins/OpenID/locale/OpenID.pot b/plugins/OpenID/locale/OpenID.pot
index bc49dd91e4..9bbf73f793 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+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"
@@ -447,43 +447,43 @@ 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:267 finishopenidlogin.php:277
+#: finishopenidlogin.php:271 finishopenidlogin.php:281
 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:285
+#: finishopenidlogin.php:289
 msgid "Not a valid invitation code."
 msgstr ""
 
 #. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:299
+#: finishopenidlogin.php:303
 msgid "Nickname not allowed."
 msgstr ""
 
 #. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:305
+#: finishopenidlogin.php:309
 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:313 finishopenidlogin.php:400
+#: finishopenidlogin.php:317 finishopenidlogin.php:407
 msgid "Stored OpenID not found."
 msgstr ""
 
 #. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:323
+#: finishopenidlogin.php:327
 msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 
 #. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:388
+#: finishopenidlogin.php:395
 msgid "Invalid username or password."
 msgstr ""
 
 #. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:408
+#: finishopenidlogin.php:415
 msgid "Error connecting user to OpenID."
 msgstr ""
 
diff --git a/plugins/OpenID/locale/br/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/br/LC_MESSAGES/OpenID.po
index b4b7424a14..5cb552eb7a 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:28+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:00: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: 2010-11-30 20:43:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -454,43 +454,43 @@ 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:267 finishopenidlogin.php:277
+#: finishopenidlogin.php:271 finishopenidlogin.php:281
 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:285
+#: finishopenidlogin.php:289
 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:299
+#: finishopenidlogin.php:303
 msgid "Nickname not allowed."
 msgstr "Lesanv nann-aotreet."
 
 #. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:305
+#: finishopenidlogin.php:309
 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:313 finishopenidlogin.php:400
+#: finishopenidlogin.php:317 finishopenidlogin.php:407
 msgid "Stored OpenID not found."
 msgstr ""
 
 #. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:323
+#: finishopenidlogin.php:327
 msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 
 #. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:388
+#: finishopenidlogin.php:395
 msgid "Invalid username or password."
 msgstr ""
 
 #. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:408
+#: finishopenidlogin.php:415
 msgid "Error connecting user to OpenID."
 msgstr ""
 
diff --git a/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po
index 12b2de53cc..0f608c299b 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:28+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:00:48+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: 2010-11-30 20:43:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -465,44 +465,44 @@ 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:267 finishopenidlogin.php:277
+#: finishopenidlogin.php:271 finishopenidlogin.php:281
 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:285
+#: finishopenidlogin.php:289
 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:299
+#: finishopenidlogin.php:303
 msgid "Nickname not allowed."
 msgstr "No es permet el sobrenom."
 
 #. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:305
+#: finishopenidlogin.php:309
 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:313 finishopenidlogin.php:400
+#: finishopenidlogin.php:317 finishopenidlogin.php:407
 msgid "Stored OpenID not found."
 msgstr "No s'ha trobat la connexió OpenID emmagatzemada."
 
 #. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:323
+#: finishopenidlogin.php:327
 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:388
+#: finishopenidlogin.php:395
 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:408
+#: finishopenidlogin.php:415
 msgid "Error connecting user to OpenID."
 msgstr "S'ha produït un error en connectar l'usuari amb la connexió OpenID."
 
diff --git a/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
index e9143aeb07..c2a9aa6a83 100644
--- a/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:29+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:00: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: 2010-11-30 20:43:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -489,43 +489,43 @@ 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:267 finishopenidlogin.php:277
+#: finishopenidlogin.php:271 finishopenidlogin.php:281
 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:285
+#: finishopenidlogin.php:289
 msgid "Not a valid invitation code."
 msgstr "Kein gültiger Einladungscode."
 
 #. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:299
+#: finishopenidlogin.php:303
 msgid "Nickname not allowed."
 msgstr "Benutzername nicht erlaubt."
 
 #. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:305
+#: finishopenidlogin.php:309
 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:313 finishopenidlogin.php:400
+#: finishopenidlogin.php:317 finishopenidlogin.php:407
 msgid "Stored OpenID not found."
 msgstr ""
 
 #. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:323
+#: finishopenidlogin.php:327
 msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 
 #. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:388
+#: finishopenidlogin.php:395
 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:408
+#: finishopenidlogin.php:415
 msgid "Error connecting user to OpenID."
 msgstr ""
 
diff --git a/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po
index a0a2d5d6e5..c3cf1af981 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:29+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:00: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: 2010-11-30 20:43:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -499,43 +499,43 @@ 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:267 finishopenidlogin.php:277
+#: finishopenidlogin.php:271 finishopenidlogin.php:281
 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:285
+#: finishopenidlogin.php:289
 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:299
+#: finishopenidlogin.php:303
 msgid "Nickname not allowed."
 msgstr "Pseudonyme non autorisé."
 
 #. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:305
+#: finishopenidlogin.php:309
 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:313 finishopenidlogin.php:400
+#: finishopenidlogin.php:317 finishopenidlogin.php:407
 msgid "Stored OpenID not found."
 msgstr "OpenID stocké non trouvé."
 
 #. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:323
+#: finishopenidlogin.php:327
 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:388
+#: finishopenidlogin.php:395
 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:408
+#: finishopenidlogin.php:415
 msgid "Error connecting user to OpenID."
 msgstr "Erreur de connexion de l’utilisateur à OpenID."
 
diff --git a/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po
index 3ca10002c8..a9c6ab0e9b 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:29+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:00: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: 2010-11-30 20:43:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -489,43 +489,43 @@ 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:267 finishopenidlogin.php:277
+#: finishopenidlogin.php:271 finishopenidlogin.php:281
 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:285
+#: finishopenidlogin.php:289
 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:299
+#: finishopenidlogin.php:303
 msgid "Nickname not allowed."
 msgstr "Pseudonymo non permittite."
 
 #. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:305
+#: finishopenidlogin.php:309
 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:313 finishopenidlogin.php:400
+#: finishopenidlogin.php:317 finishopenidlogin.php:407
 msgid "Stored OpenID not found."
 msgstr "Le OpenID immagazinate non esseva trovate."
 
 #. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:323
+#: finishopenidlogin.php:327
 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:388
+#: finishopenidlogin.php:395
 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:408
+#: finishopenidlogin.php:415
 msgid "Error connecting user to OpenID."
 msgstr "Error durante le connexion del usator a OpenID."
 
diff --git a/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po
index bbdee40b9f..1146039913 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:30+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:00: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: 2010-11-30 20:43:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -485,43 +485,43 @@ 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:267 finishopenidlogin.php:277
+#: finishopenidlogin.php:271 finishopenidlogin.php:281
 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:285
+#: finishopenidlogin.php:289
 msgid "Not a valid invitation code."
 msgstr "Ова не е важечки код за покана."
 
 #. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:299
+#: finishopenidlogin.php:303
 msgid "Nickname not allowed."
 msgstr "Прекарот не е дозволен."
 
 #. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:305
+#: finishopenidlogin.php:309
 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:313 finishopenidlogin.php:400
+#: finishopenidlogin.php:317 finishopenidlogin.php:407
 msgid "Stored OpenID not found."
 msgstr "Складираниот OpenID не е пронајден."
 
 #. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:323
+#: finishopenidlogin.php:327
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Создавање на сметка за OpenID што веќе има корисник."
 
 #. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:388
+#: finishopenidlogin.php:395
 msgid "Invalid username or password."
 msgstr "Неважечко корисничко име или лозинка."
 
 #. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:408
+#: finishopenidlogin.php:415
 msgid "Error connecting user to OpenID."
 msgstr "Грешка при поврзувањето на корисникот со OpenID."
 
diff --git a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
index c83d6a5def..0c5ca2d9d9 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:30+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:00: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: 2010-11-30 20:43:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -491,43 +491,43 @@ 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:267 finishopenidlogin.php:277
+#: finishopenidlogin.php:271 finishopenidlogin.php:281
 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:285
+#: finishopenidlogin.php:289
 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:299
+#: finishopenidlogin.php:303
 msgid "Nickname not allowed."
 msgstr "Deze gebruikersnaam is niet toegestaan."
 
 #. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:305
+#: finishopenidlogin.php:309
 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:313 finishopenidlogin.php:400
+#: finishopenidlogin.php:317 finishopenidlogin.php:407
 msgid "Stored OpenID not found."
 msgstr "Het opgeslagen OpenID is niet aangetroffen."
 
 #. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:323
+#: finishopenidlogin.php:327
 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:388
+#: finishopenidlogin.php:395
 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:408
+#: finishopenidlogin.php:415
 msgid "Error connecting user to OpenID."
 msgstr "Fout bij het koppelen met OpenID."
 
diff --git a/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po
index a9df86fcea..bf92b41710 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:30+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:00: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: 2010-11-30 20:43:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -502,44 +502,44 @@ 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:267 finishopenidlogin.php:277
+#: finishopenidlogin.php:271 finishopenidlogin.php:281
 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:285
+#: finishopenidlogin.php:289
 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:299
+#: finishopenidlogin.php:303
 msgid "Nickname not allowed."
 msgstr "Hindi pinayagan ang palayaw."
 
 #. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:305
+#: finishopenidlogin.php:309
 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:313 finishopenidlogin.php:400
+#: finishopenidlogin.php:317 finishopenidlogin.php:407
 msgid "Stored OpenID not found."
 msgstr "Hindi natagpuan ang nakalagak na OpenID."
 
 #. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:323
+#: finishopenidlogin.php:327
 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:388
+#: finishopenidlogin.php:395
 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:408
+#: finishopenidlogin.php:415
 msgid "Error connecting user to OpenID."
 msgstr "May kamalian sa pag-ugnay ng tagagamit sa OpenID."
 
diff --git a/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po
index 8eb976a4de..f7646149de 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: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:31+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:00: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: 2010-11-30 20:43:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:26:05+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -492,43 +492,43 @@ 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:267 finishopenidlogin.php:277
+#: finishopenidlogin.php:271 finishopenidlogin.php:281
 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:285
+#: finishopenidlogin.php:289
 msgid "Not a valid invitation code."
 msgstr "Це не дійсний код запрошення."
 
 #. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:299
+#: finishopenidlogin.php:303
 msgid "Nickname not allowed."
 msgstr "Нікнейм не допускається."
 
 #. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:305
+#: finishopenidlogin.php:309
 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:313 finishopenidlogin.php:400
+#: finishopenidlogin.php:317 finishopenidlogin.php:407
 msgid "Stored OpenID not found."
 msgstr "Збережений OpenID не знайдено."
 
 #. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:323
+#: finishopenidlogin.php:327
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Створення нового акаунту для OpenID користувачем, який вже існує."
 
 #. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:388
+#: finishopenidlogin.php:395
 msgid "Invalid username or password."
 msgstr "Невірне ім’я або пароль."
 
 #. TRANS: OpenID plugin server error. The user or user profile could not be saved.
-#: finishopenidlogin.php:408
+#: finishopenidlogin.php:415
 msgid "Error connecting user to OpenID."
 msgstr "Помилка при підключенні користувача до OpenID."
 
diff --git a/plugins/RegisterThrottle/locale/RegisterThrottle.pot b/plugins/RegisterThrottle/locale/RegisterThrottle.pot
index 3cb4394b1e..f5bfd954fa 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+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"
 
-#: RegisterThrottlePlugin.php:134 RegisterThrottlePlugin.php:185
+#: RegisterThrottlePlugin.php:134
 msgid "Cannot find IP address."
 msgstr ""
 
@@ -28,10 +28,6 @@ msgstr ""
 msgid "A banned user has registered from this address."
 msgstr ""
 
-#: RegisterThrottlePlugin.php:191
-msgid "Cannot find user after successful registration."
-msgstr ""
-
-#: RegisterThrottlePlugin.php:224
+#: RegisterThrottlePlugin.php:220
 msgid "Throttles excessive registration from a single IP address."
 msgstr ""
diff --git a/plugins/RegisterThrottle/locale/de/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/de/LC_MESSAGES/RegisterThrottle.po
index 75a4e57cf5..8dc9ff8b30 100644
--- a/plugins/RegisterThrottle/locale/de/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/de/LC_MESSAGES/RegisterThrottle.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:50+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01: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: 2010-11-30 20:43:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RegisterThrottlePlugin.php:134 RegisterThrottlePlugin.php:185
+#: RegisterThrottlePlugin.php:134
 msgid "Cannot find IP address."
 msgstr "Kann IP-Addresse nicht finden."
 
@@ -34,10 +34,9 @@ msgstr ""
 msgid "A banned user has registered from this address."
 msgstr "Ein gesperrter Benutzer hat sich von dieser Adresse registriert."
 
-#: RegisterThrottlePlugin.php:191
-msgid "Cannot find user after successful registration."
-msgstr "Kann Benutzer nach erfolgreicher Registrierung nicht finden."
-
-#: RegisterThrottlePlugin.php:224
+#: RegisterThrottlePlugin.php:220
 msgid "Throttles excessive registration from a single IP address."
 msgstr "Drosselt exzessive Registrierungen einer einzelnen IP-Adresse."
+
+#~ msgid "Cannot find user after successful registration."
+#~ msgstr "Kann Benutzer nach erfolgreicher Registrierung nicht finden."
diff --git a/plugins/RegisterThrottle/locale/fr/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/fr/LC_MESSAGES/RegisterThrottle.po
index b6992d1c35..6f5774f079 100644
--- a/plugins/RegisterThrottle/locale/fr/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/fr/LC_MESSAGES/RegisterThrottle.po
@@ -10,19 +10,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:50+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01: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: 2010-11-30 20:43:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: RegisterThrottlePlugin.php:134 RegisterThrottlePlugin.php:185
+#: RegisterThrottlePlugin.php:134
 msgid "Cannot find IP address."
 msgstr "Impossible de trouver l’adresse IP."
 
@@ -36,10 +36,9 @@ msgstr ""
 msgid "A banned user has registered from this address."
 msgstr "Un utilisateur banni s’est inscrit depuis cette adresse."
 
-#: RegisterThrottlePlugin.php:191
-msgid "Cannot find user after successful registration."
-msgstr "Impossible de trouver l’utilisateur après un enregistrement réussi."
-
-#: RegisterThrottlePlugin.php:224
+#: RegisterThrottlePlugin.php:220
 msgid "Throttles excessive registration from a single IP address."
 msgstr "Évite les inscriptions excessives depuis une même adresse IP."
+
+#~ msgid "Cannot find user after successful registration."
+#~ msgstr "Impossible de trouver l’utilisateur après un enregistrement réussi."
diff --git a/plugins/RegisterThrottle/locale/ia/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/ia/LC_MESSAGES/RegisterThrottle.po
index 2ca1bbf8ef..0720574e22 100644
--- a/plugins/RegisterThrottle/locale/ia/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/ia/LC_MESSAGES/RegisterThrottle.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:50+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01: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: 2010-11-30 20:43:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RegisterThrottlePlugin.php:134 RegisterThrottlePlugin.php:185
+#: RegisterThrottlePlugin.php:134
 msgid "Cannot find IP address."
 msgstr "Non pote trovar adresse IP."
 
@@ -33,10 +33,9 @@ msgstr "Troppo de registrationes. Face un pausa e reproba plus tarde."
 msgid "A banned user has registered from this address."
 msgstr "Un usator bannite se ha registrate ab iste adresse."
 
-#: RegisterThrottlePlugin.php:191
-msgid "Cannot find user after successful registration."
-msgstr "Non pote trovar usator post registration succedite."
-
-#: RegisterThrottlePlugin.php:224
+#: RegisterThrottlePlugin.php:220
 msgid "Throttles excessive registration from a single IP address."
 msgstr "Inhibi le creation de contos excessive ab un sol adresse IP."
+
+#~ msgid "Cannot find user after successful registration."
+#~ msgstr "Non pote trovar usator post registration succedite."
diff --git a/plugins/RegisterThrottle/locale/mk/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/mk/LC_MESSAGES/RegisterThrottle.po
index 25f2400af2..7011380d38 100644
--- a/plugins/RegisterThrottle/locale/mk/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/mk/LC_MESSAGES/RegisterThrottle.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:50+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01: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: 2010-11-30 20:43:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
-#: RegisterThrottlePlugin.php:134 RegisterThrottlePlugin.php:185
+#: RegisterThrottlePlugin.php:134
 msgid "Cannot find IP address."
 msgstr "Не можам да ја пронајдам IP-адресата."
 
@@ -33,10 +33,9 @@ msgstr "Премногу регистрации. Направете пауза 
 msgid "A banned user has registered from this address."
 msgstr "Од оваа адреса се регистрирал забранет корисник."
 
-#: RegisterThrottlePlugin.php:191
-msgid "Cannot find user after successful registration."
-msgstr "Не можам да го пронајдам корисникот по успешната регистрација."
-
-#: RegisterThrottlePlugin.php:224
+#: RegisterThrottlePlugin.php:220
 msgid "Throttles excessive registration from a single IP address."
 msgstr "Истиснува прекумерни регистрации од една IP-адреса."
+
+#~ msgid "Cannot find user after successful registration."
+#~ msgstr "Не можам да го пронајдам корисникот по успешната регистрација."
diff --git a/plugins/RegisterThrottle/locale/nl/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/nl/LC_MESSAGES/RegisterThrottle.po
index 8a6c3d10d8..0f90a2420b 100644
--- a/plugins/RegisterThrottle/locale/nl/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/nl/LC_MESSAGES/RegisterThrottle.po
@@ -10,19 +10,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:50+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01: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: 2010-11-30 20:43:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: RegisterThrottlePlugin.php:134 RegisterThrottlePlugin.php:185
+#: RegisterThrottlePlugin.php:134
 msgid "Cannot find IP address."
 msgstr "Het IP-adres kon niet gevonden worden."
 
@@ -34,10 +34,9 @@ msgstr "Te veel registraties. Wacht even en probeer het later opnieuw."
 msgid "A banned user has registered from this address."
 msgstr "Er is een geblokkeerde gebruiker die vanaf dit adres is geregistreerd."
 
-#: RegisterThrottlePlugin.php:191
-msgid "Cannot find user after successful registration."
-msgstr "Het was niet mogelijk de gebruiker te vinden na registratie."
-
-#: RegisterThrottlePlugin.php:224
+#: RegisterThrottlePlugin.php:220
 msgid "Throttles excessive registration from a single IP address."
 msgstr "Beperkt excessieve aantallen registraties vanaf één IP-adres."
+
+#~ msgid "Cannot find user after successful registration."
+#~ msgstr "Het was niet mogelijk de gebruiker te vinden na registratie."
diff --git a/plugins/RegisterThrottle/locale/tl/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/tl/LC_MESSAGES/RegisterThrottle.po
index 24128e8ba4..ae7c980e36 100644
--- a/plugins/RegisterThrottle/locale/tl/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/tl/LC_MESSAGES/RegisterThrottle.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:50+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01: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: 2010-11-30 20:43:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\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 RegisterThrottlePlugin.php:185
+#: RegisterThrottlePlugin.php:134
 msgid "Cannot find IP address."
 msgstr "Hindi matagpuan ang tirahan ng IP."
 
@@ -33,12 +33,12 @@ msgstr "Napakaraming mga pagpapatala. Magpahinga muna at subukan uli mamaya."
 msgid "A banned user has registered from this address."
 msgstr ""
 
-#: RegisterThrottlePlugin.php:191
-msgid "Cannot find user after successful registration."
-msgstr "Hindi matagpuan ang tagagamit pagkatapos ng matagumpay na pagpapatala."
-
-#: RegisterThrottlePlugin.php:224
+#: 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 "
 "IP."
+
+#~ msgid "Cannot find user after successful registration."
+#~ msgstr ""
+#~ "Hindi matagpuan ang tagagamit pagkatapos ng matagumpay na pagpapatala."
diff --git a/plugins/RegisterThrottle/locale/uk/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/uk/LC_MESSAGES/RegisterThrottle.po
index 2abe652fe1..7d2920b0ea 100644
--- a/plugins/RegisterThrottle/locale/uk/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/uk/LC_MESSAGES/RegisterThrottle.po
@@ -10,20 +10,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:50+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01: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: 2010-11-30 20:43:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-10 18:27:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-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 RegisterThrottlePlugin.php:185
+#: RegisterThrottlePlugin.php:134
 msgid "Cannot find IP address."
 msgstr "Не вдається знайти IP-адресу."
 
@@ -35,10 +35,9 @@ msgstr "Забагато реєстрацій. Випийте поки що ка
 msgid "A banned user has registered from this address."
 msgstr "Заблокований користувач був зареєстрований з цієї адреси."
 
-#: RegisterThrottlePlugin.php:191
-msgid "Cannot find user after successful registration."
-msgstr "Не вдається знайти користувача після успішної реєстрації."
-
-#: RegisterThrottlePlugin.php:224
+#: RegisterThrottlePlugin.php:220
 msgid "Throttles excessive registration from a single IP address."
 msgstr "Цей додаток обмежує кількість реєстрацій з певної IP-адреси."
+
+#~ msgid "Cannot find user after successful registration."
+#~ msgstr "Не вдається знайти користувача після успішної реєстрації."
diff --git a/plugins/SQLProfile/locale/ru/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/ru/LC_MESSAGES/SQLProfile.po
new file mode 100644
index 0000000000..47bfc8ae30
--- /dev/null
+++ b/plugins/SQLProfile/locale/ru/LC_MESSAGES/SQLProfile.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - SQLProfile to Russian (Русский)
+# Expored from translatewiki.net
+#
+# Author: Александр Сигачёв
+# --
+# 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-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01: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-20 20:16:03+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ru\n"
+"X-Message-Group: #out-statusnet-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/TabFocus/locale/mk/LC_MESSAGES/TabFocus.po b/plugins/TabFocus/locale/mk/LC_MESSAGES/TabFocus.po
index 64e5fc4157..1774841cdf 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-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:06+0000\n"
+"POT-Creation-Date: 2011-01-22 14:49+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:22:18+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-tabfocus\n"
@@ -28,5 +28,5 @@ msgid ""
 "Twitter."
 msgstr ""
 "TabFocus го менува поведението на образецот за забелешки: со пристискање на "
-"копчето Tab во местото за текст се означува копчето „Прати“, така "
+"копчето Tab во местото за текст се означува копчето „Испрати“, така "
 "поситоветувајќи се со поведението на Twitter."
diff --git a/plugins/TwitterBridge/locale/TwitterBridge.pot b/plugins/TwitterBridge/locale/TwitterBridge.pot
index e684baae0e..dc02c0154e 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+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"
@@ -242,32 +242,32 @@ msgstr ""
 msgid "Connect"
 msgstr ""
 
-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:427 twitterauthorization.php:436
 msgid "Registration not allowed."
 msgstr ""
 
-#: twitterauthorization.php:439
+#: twitterauthorization.php:443
 msgid "Not a valid invitation code."
 msgstr ""
 
-#: twitterauthorization.php:452
+#: twitterauthorization.php:456
 msgid "Nickname not allowed."
 msgstr ""
 
-#: twitterauthorization.php:457
+#: twitterauthorization.php:461
 msgid "Nickname already in use. Try another one."
 msgstr ""
 
-#: twitterauthorization.php:472
+#: twitterauthorization.php:476
 msgid "Error registering user."
 msgstr ""
 
-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:487 twitterauthorization.php:527
+#: twitterauthorization.php:547
 msgid "Error connecting user to Twitter."
 msgstr ""
 
-#: twitterauthorization.php:503
+#: twitterauthorization.php:509
 msgid "Invalid username or password."
 msgstr ""
 
diff --git a/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po
index 8fb31bea0c..49116b6544 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:13+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01: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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -247,32 +247,32 @@ msgstr "Ger-tremen"
 msgid "Connect"
 msgstr "Kevreañ"
 
-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:427 twitterauthorization.php:436
 msgid "Registration not allowed."
 msgstr "N'eo ket aotreet krouiñ kontoù."
 
-#: twitterauthorization.php:439
+#: twitterauthorization.php:443
 msgid "Not a valid invitation code."
 msgstr ""
 
-#: twitterauthorization.php:452
+#: twitterauthorization.php:456
 msgid "Nickname not allowed."
 msgstr "Lesanv nann-aotreet."
 
-#: twitterauthorization.php:457
+#: twitterauthorization.php:461
 msgid "Nickname already in use. Try another one."
 msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
 
-#: twitterauthorization.php:472
+#: twitterauthorization.php:476
 msgid "Error registering user."
 msgstr ""
 
-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:487 twitterauthorization.php:527
+#: twitterauthorization.php:547
 msgid "Error connecting user to Twitter."
 msgstr ""
 
-#: twitterauthorization.php:503
+#: twitterauthorization.php:509
 msgid "Invalid username or password."
 msgstr "Anv implijer pe ger-tremen direizh."
 
diff --git a/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po
index d7d7aff526..cb23b7a420 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:14+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01:47+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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -275,32 +275,32 @@ msgstr "Contrasenya"
 msgid "Connect"
 msgstr "Connecta"
 
-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:427 twitterauthorization.php:436
 msgid "Registration not allowed."
 msgstr "No es permet el registre."
 
-#: twitterauthorization.php:439
+#: twitterauthorization.php:443
 msgid "Not a valid invitation code."
 msgstr "No és un codi d'invitació vàlid."
 
-#: twitterauthorization.php:452
+#: twitterauthorization.php:456
 msgid "Nickname not allowed."
 msgstr "El sobrenom no és permès."
 
-#: twitterauthorization.php:457
+#: twitterauthorization.php:461
 msgid "Nickname already in use. Try another one."
 msgstr "El sobrenom ja és en ús. Proveu-ne un altre."
 
-#: twitterauthorization.php:472
+#: twitterauthorization.php:476
 msgid "Error registering user."
 msgstr "Error en registrar l'usuari."
 
-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:487 twitterauthorization.php:527
+#: twitterauthorization.php:547
 msgid "Error connecting user to Twitter."
 msgstr "Error en connectar l'usuari al Twitter."
 
-#: twitterauthorization.php:503
+#: twitterauthorization.php:509
 msgid "Invalid username or password."
 msgstr "Nom d'usuari o contrasenya no vàlida."
 
diff --git a/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po
index 1cf6c42123..2b07bbce82 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:14+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01:47+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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fa\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -247,32 +247,32 @@ msgstr "رمز عبور"
 msgid "Connect"
 msgstr "اتصال"
 
-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:427 twitterauthorization.php:436
 msgid "Registration not allowed."
 msgstr "اجازهٔ ثبت‌نام داده نشده است."
 
-#: twitterauthorization.php:439
+#: twitterauthorization.php:443
 msgid "Not a valid invitation code."
 msgstr "کد دعوت نامعتبر است."
 
-#: twitterauthorization.php:452
+#: twitterauthorization.php:456
 msgid "Nickname not allowed."
 msgstr "نام مستعار مجاز نیست."
 
-#: twitterauthorization.php:457
+#: twitterauthorization.php:461
 msgid "Nickname already in use. Try another one."
 msgstr "این نام مستعار در حال حاضر مورد استفاده است. یکی دیگر را بیازمایید."
 
-#: twitterauthorization.php:472
+#: twitterauthorization.php:476
 msgid "Error registering user."
 msgstr "خطا در ثبت نام کاربر."
 
-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:487 twitterauthorization.php:527
+#: twitterauthorization.php:547
 msgid "Error connecting user to Twitter."
 msgstr "خطا در اتصال کاربر به توییتر."
 
-#: twitterauthorization.php:503
+#: twitterauthorization.php:509
 msgid "Invalid username or password."
 msgstr "نام کاربری یا رمز عبور اشتباه است."
 
diff --git a/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po
index 0074adcaaa..53dbbcba3b 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:14+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01: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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -279,32 +279,32 @@ msgstr "Mot de passe"
 msgid "Connect"
 msgstr "Connexion"
 
-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:427 twitterauthorization.php:436
 msgid "Registration not allowed."
 msgstr "Inscription non autorisée."
 
-#: twitterauthorization.php:439
+#: twitterauthorization.php:443
 msgid "Not a valid invitation code."
 msgstr "Le code d’invitation n’est pas valide."
 
-#: twitterauthorization.php:452
+#: twitterauthorization.php:456
 msgid "Nickname not allowed."
 msgstr "Pseudonyme non autorisé."
 
-#: twitterauthorization.php:457
+#: twitterauthorization.php:461
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonyme déjà utilisé. Essayez-en un autre."
 
-#: twitterauthorization.php:472
+#: twitterauthorization.php:476
 msgid "Error registering user."
 msgstr "Erreur lors de l’inscription de l’utilisateur."
 
-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:487 twitterauthorization.php:527
+#: twitterauthorization.php:547
 msgid "Error connecting user to Twitter."
 msgstr "Erreur de connexion de l’utilisateur à Twitter."
 
-#: twitterauthorization.php:503
+#: twitterauthorization.php:509
 msgid "Invalid username or password."
 msgstr "Nom d’utilisateur ou mot de passe incorrect."
 
diff --git a/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po
index 7208474565..c4f8cd4511 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:14+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01: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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -270,32 +270,32 @@ msgstr "Contrasigno"
 msgid "Connect"
 msgstr "Connecter"
 
-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:427 twitterauthorization.php:436
 msgid "Registration not allowed."
 msgstr "Creation de conto non permittite."
 
-#: twitterauthorization.php:439
+#: twitterauthorization.php:443
 msgid "Not a valid invitation code."
 msgstr "Le codice de invitation es invalide."
 
-#: twitterauthorization.php:452
+#: twitterauthorization.php:456
 msgid "Nickname not allowed."
 msgstr "Pseudonymo non permittite."
 
-#: twitterauthorization.php:457
+#: twitterauthorization.php:461
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonymo ja in uso. Proba un altere."
 
-#: twitterauthorization.php:472
+#: twitterauthorization.php:476
 msgid "Error registering user."
 msgstr "Error durante le registration del usator."
 
-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:487 twitterauthorization.php:527
+#: twitterauthorization.php:547
 msgid "Error connecting user to Twitter."
 msgstr "Error durante le connexion del usator a Twitter."
 
-#: twitterauthorization.php:503
+#: twitterauthorization.php:509
 msgid "Invalid username or password."
 msgstr "Nomine de usator o contrasigno invalide."
 
diff --git a/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po
index 8962394f0e..eac1eba11e 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:15+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01: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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -272,32 +272,32 @@ msgstr "Лозинка"
 msgid "Connect"
 msgstr "Поврзи се"
 
-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:427 twitterauthorization.php:436
 msgid "Registration not allowed."
 msgstr "Регистрацијата не е дозволена."
 
-#: twitterauthorization.php:439
+#: twitterauthorization.php:443
 msgid "Not a valid invitation code."
 msgstr "Ова не е важечки код за покана."
 
-#: twitterauthorization.php:452
+#: twitterauthorization.php:456
 msgid "Nickname not allowed."
 msgstr "Прекарот не е дозволен."
 
-#: twitterauthorization.php:457
+#: twitterauthorization.php:461
 msgid "Nickname already in use. Try another one."
 msgstr "Прекарот е зафатен. Одберете друг."
 
-#: twitterauthorization.php:472
+#: twitterauthorization.php:476
 msgid "Error registering user."
 msgstr "Грешка при регистрирање на корисникот."
 
-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:487 twitterauthorization.php:527
+#: twitterauthorization.php:547
 msgid "Error connecting user to Twitter."
 msgstr "Грешка при поврзувањето на корисникот со Twitter."
 
-#: twitterauthorization.php:503
+#: twitterauthorization.php:509
 msgid "Invalid username or password."
 msgstr "Неважечко корисничко име или лозинка."
 
diff --git a/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po
index 6763193f09..ab4b92a4b6 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:15+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01: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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -277,33 +277,33 @@ msgstr "Wachtwoord"
 msgid "Connect"
 msgstr "Koppelen"
 
-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:427 twitterauthorization.php:436
 msgid "Registration not allowed."
 msgstr "Registratie is niet toegestaan."
 
-#: twitterauthorization.php:439
+#: twitterauthorization.php:443
 msgid "Not a valid invitation code."
 msgstr "De uitnodigingscode is ongeldig."
 
-#: twitterauthorization.php:452
+#: twitterauthorization.php:456
 msgid "Nickname not allowed."
 msgstr "Gebruikersnaam niet toegestaan."
 
-#: twitterauthorization.php:457
+#: twitterauthorization.php:461
 msgid "Nickname already in use. Try another one."
 msgstr ""
 "De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
 
-#: twitterauthorization.php:472
+#: twitterauthorization.php:476
 msgid "Error registering user."
 msgstr "Fout bij het registreren van de gebruiker."
 
-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:487 twitterauthorization.php:527
+#: twitterauthorization.php:547
 msgid "Error connecting user to Twitter."
 msgstr "Fout bij het verbinden van de gebruiker met Twitter."
 
-#: twitterauthorization.php:503
+#: twitterauthorization.php:509
 msgid "Invalid username or password."
 msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
diff --git a/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po
index 9bcd226ce5..28f190b3c3 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:15+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01:47+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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -256,32 +256,32 @@ msgstr "Parola"
 msgid "Connect"
 msgstr "Bağlan"
 
-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:427 twitterauthorization.php:436
 msgid "Registration not allowed."
 msgstr "Kayıt yapılmasına izin verilmiyor."
 
-#: twitterauthorization.php:439
+#: twitterauthorization.php:443
 msgid "Not a valid invitation code."
 msgstr "Geçerli bir davet kodu değil."
 
-#: twitterauthorization.php:452
+#: twitterauthorization.php:456
 msgid "Nickname not allowed."
 msgstr "Bu kullanıcı adına izin verilmiyor."
 
-#: twitterauthorization.php:457
+#: twitterauthorization.php:461
 msgid "Nickname already in use. Try another one."
 msgstr "Kullanıcı adı halihazırda kullanılıyor. Başka bir tane deneyin."
 
-#: twitterauthorization.php:472
+#: twitterauthorization.php:476
 msgid "Error registering user."
 msgstr "Kullanıcı kayıt hatası."
 
-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:487 twitterauthorization.php:527
+#: twitterauthorization.php:547
 msgid "Error connecting user to Twitter."
 msgstr "Twitter'a kullanıcı bağlama hatası."
 
-#: twitterauthorization.php:503
+#: twitterauthorization.php:509
 msgid "Invalid username or password."
 msgstr "Geçersiz kullanıcı adı veya parola."
 
diff --git a/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po
index 1a26acc4cc..536ecb8429 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:15+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01: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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -274,32 +274,32 @@ msgstr "Пароль"
 msgid "Connect"
 msgstr "Під’єднати"
 
-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:427 twitterauthorization.php:436
 msgid "Registration not allowed."
 msgstr "Реєстрацію не дозволено."
 
-#: twitterauthorization.php:439
+#: twitterauthorization.php:443
 msgid "Not a valid invitation code."
 msgstr "Це не дійсний код запрошення."
 
-#: twitterauthorization.php:452
+#: twitterauthorization.php:456
 msgid "Nickname not allowed."
 msgstr "Нікнейм не допускається."
 
-#: twitterauthorization.php:457
+#: twitterauthorization.php:461
 msgid "Nickname already in use. Try another one."
 msgstr "Цей нікнейм вже використовується. Спробуйте інший."
 
-#: twitterauthorization.php:472
+#: twitterauthorization.php:476
 msgid "Error registering user."
 msgstr "Помилка при реєстрації користувача."
 
-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:487 twitterauthorization.php:527
+#: twitterauthorization.php:547
 msgid "Error connecting user to Twitter."
 msgstr "Помилка при підключенні користувача до Twitter."
 
-#: twitterauthorization.php:503
+#: twitterauthorization.php:509
 msgid "Invalid username or password."
 msgstr "Недійсне ім’я або пароль."
 
diff --git a/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po
index ef027ff8d5..7b694b2eb6 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-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:15+0000\n"
+"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"PO-Revision-Date: 2011-01-22 15:01:47+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:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -264,32 +264,32 @@ msgstr "密码"
 msgid "Connect"
 msgstr "关联"
 
-#: twitterauthorization.php:423 twitterauthorization.php:432
+#: twitterauthorization.php:427 twitterauthorization.php:436
 msgid "Registration not allowed."
 msgstr "不允许注册。"
 
-#: twitterauthorization.php:439
+#: twitterauthorization.php:443
 msgid "Not a valid invitation code."
 msgstr "无效的邀请码。"
 
-#: twitterauthorization.php:452
+#: twitterauthorization.php:456
 msgid "Nickname not allowed."
 msgstr "昵称不被允许。"
 
-#: twitterauthorization.php:457
+#: twitterauthorization.php:461
 msgid "Nickname already in use. Try another one."
 msgstr "昵称已被使用，换一个吧。"
 
-#: twitterauthorization.php:472
+#: twitterauthorization.php:476
 msgid "Error registering user."
 msgstr "注册用户出错。"
 
-#: twitterauthorization.php:483 twitterauthorization.php:521
-#: twitterauthorization.php:541
+#: twitterauthorization.php:487 twitterauthorization.php:527
+#: twitterauthorization.php:547
 msgid "Error connecting user to Twitter."
 msgstr "关联用户到 Twitter 出错。"
 
-#: twitterauthorization.php:503
+#: twitterauthorization.php:509
 msgid "Invalid username or password."
 msgstr "用户名或密码不正确。"
 

From b72fe00ae3227c3ee849ec8477538685aeb7bc6f Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 23 Jan 2011 12:03:28 -0500
Subject: [PATCH 120/314] remove boilerplate from NewMenuPlugin

---
 plugins/NewMenu/NewMenuPlugin.php | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/plugins/NewMenu/NewMenuPlugin.php b/plugins/NewMenu/NewMenuPlugin.php
index cdcea5cd92..db334c6609 100644
--- a/plugins/NewMenu/NewMenuPlugin.php
+++ b/plugins/NewMenu/NewMenuPlugin.php
@@ -53,31 +53,6 @@ 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)
-    {
-        $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
      *

From c2d7a08d074fd050ea027f57caa3f290c031aa79 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 23 Jan 2011 12:57:20 -0500
Subject: [PATCH 121/314] Bookmark saving robustness fixes

First, if the tags box is empty, don't save an empty tag for the notice.

Second, if URL shortening fails, just use the regular URL.
---
 plugins/Bookmark/Bookmark.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/plugins/Bookmark/Bookmark.php b/plugins/Bookmark/Bookmark.php
index 4ee287fb65..777b50f724 100644
--- a/plugins/Bookmark/Bookmark.php
+++ b/plugins/Bookmark/Bookmark.php
@@ -214,7 +214,11 @@ class Bookmark extends Memcached_DataObject
         }
 
         if (is_string($rawtags)) {
-            $rawtags = preg_split('/[\s,]+/', $rawtags);
+            if (empty($rawtags)) {
+                $rawtags = array();
+            } else {
+                $rawtags = preg_split('/[\s,]+/', $rawtags);
+            }
         }
 
         $nb = new Bookmark();
@@ -274,10 +278,15 @@ class Bookmark extends Memcached_DataObject
 
         // Use user's preferences for short URLs, if possible
 
-        $user = User::staticGet('id', $profile->id);
+        try {
+            $user = User::staticGet('id', $profile->id);
 
-        $shortUrl = File_redirection::makeShort($url, 
-                                                empty($user) ? null : $user);
+            $shortUrl = File_redirection::makeShort($url, 
+                                                    empty($user) ? null : $user);
+        } catch (Exception $e) {
+            // Don't let this stop us.
+            $shortUrl = $url;
+        }
 
         $content = sprintf(_('"%s" %s %s %s'),
                            $title,

From 820dd293c998f3c5a15f637467ba6ce2c9793183 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 24 Jan 2011 12:22:47 -0800
Subject: [PATCH 122/314] Fix for ticket #3007: .bmp avatar uploads weren't
 being properly converted to PNG in all cases

Part of the reported issue was previuosly fixed by dc497ed0 (smaller size images being blanked).
This commit fixes the remaining bug with original-size avatars being left as BMP (which could include the 96px size for instance, which could cause problems in browsers not supporting BMP natively)

Added ImageFile::copyTo() as a convenient alias for resizeTo() when not resizing; this performs the BMP/XPM/XBM->PNG conversion if needed, or copies the original file.
Copying instead of using move_uploaded_file() is fine here since:
a) the files are cleaned up on script completion anyway (vs moving to remove it)
b) we're already performing getimagesize() and possibly load/resize on the file before this point (vs needing to move the file into a usable area to work with open_basedir restrictions that prevent working directly with uploaded files in the temp dir; since this would fail anyway, we lose nothing)

ImageFile::preferredType() now works on $this->type instead of asking for one, to make it handier to use from outside. (This is still needed in order for calling code to generate a target filename.)

Recommended for future:
* additional consolidation between the various ways of uploading avatars (touched avatarsettings, grouplogo, and apiaccountupdateprofileimage with similar minor changes)
* consolidate type checks and file naming into Avatar class
---
 actions/apiaccountupdateprofileimage.php |  5 ++--
 actions/avatarsettings.php               |  9 ++++----
 actions/grouplogo.php                    |  7 +++---
 lib/imagefile.php                        | 29 +++++++++++++++++-------
 4 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/actions/apiaccountupdateprofileimage.php b/actions/apiaccountupdateprofileimage.php
index f2886509d7..6c53e2cbc1 100644
--- a/actions/apiaccountupdateprofileimage.php
+++ b/actions/apiaccountupdateprofileimage.php
@@ -112,16 +112,17 @@ class ApiAccountUpdateProfileImageAction extends ApiAuthAction
             return;
         }
 
+        $type = $imagefile->preferredType();
         $filename = Avatar::filename(
             $user->id,
-            image_type_to_extension($imagefile->type),
+            image_type_to_extension($type),
             null,
             'tmp'.common_timestamp()
         );
 
         $filepath = Avatar::path($filename);
 
-        move_uploaded_file($imagefile->filepath, $filepath);
+        $imagefile->copyTo($filepath);
 
         $profile = $this->user->getProfile();
 
diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index 375420c5c9..10c82ebfd7 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -320,21 +320,20 @@ class AvatarsettingsAction extends AccountSettingsAction
         }
 
         $cur = common_current_user();
-
+        $type = $imagefile->preferredType();
         $filename = Avatar::filename($cur->id,
-                                     image_type_to_extension($imagefile->type),
+                                     image_type_to_extension($type),
                                      null,
                                      'tmp'.common_timestamp());
 
         $filepath = Avatar::path($filename);
-
-        move_uploaded_file($imagefile->filepath, $filepath);
+        $imagefile->copyTo($filepath);
 
         $filedata = array('filename' => $filename,
                           'filepath' => $filepath,
                           'width' => $imagefile->width,
                           'height' => $imagefile->height,
-                          'type' => $imagefile->type);
+                          'type' => $type);
 
         $_SESSION['FILEDATA'] = $filedata;
 
diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index 7b7c01b23b..d2e8fd0e91 100644
--- a/actions/grouplogo.php
+++ b/actions/grouplogo.php
@@ -353,20 +353,21 @@ class GrouplogoAction extends GroupDesignAction
             return;
         }
 
+        $type = $imagefile->preferredType();
         $filename = Avatar::filename($this->group->id,
-                                     image_type_to_extension($imagefile->type),
+                                     image_type_to_extension($type),
                                      null,
                                      'group-temp-'.common_timestamp());
 
         $filepath = Avatar::path($filename);
 
-        move_uploaded_file($imagefile->filepath, $filepath);
+        $imagefile->copyTo($filepath);
 
         $filedata = array('filename' => $filename,
                           'filepath' => $filepath,
                           'width' => $imagefile->width,
                           'height' => $imagefile->height,
-                          'type' => $imagefile->type);
+                          'type' => $type);
 
         $_SESSION['FILEDATA'] = $filedata;
 
diff --git a/lib/imagefile.php b/lib/imagefile.php
index 159deead61..56a7b7d4a2 100644
--- a/lib/imagefile.php
+++ b/lib/imagefile.php
@@ -128,7 +128,7 @@ class ImageFile
      */
     function resize($size, $x = 0, $y = 0, $w = null, $h = null)
     {
-        $targetType = $this->preferredType($this->type);
+        $targetType = $this->preferredType();
         $outname = Avatar::filename($this->id,
                                     image_type_to_extension($targetType),
                                     $size,
@@ -138,6 +138,19 @@ class ImageFile
         return $outname;
     }
 
+    /**
+     * Copy the image file to the given destination.
+     * For obscure formats, this will automatically convert to PNG;
+     * otherwise the original file will be copied as-is.
+     *
+     * @param string $outpath
+     * @return string filename
+     */
+    function copyTo($outpath)
+    {
+        return $this->resizeTo($outpath, $this->width, $this->height);
+    }
+
     /**
      * Create and save a thumbnail image.
      *
@@ -154,7 +167,7 @@ class ImageFile
     {
         $w = ($w === null) ? $this->width:$w;
         $h = ($h === null) ? $this->height:$h;
-        $targetType = $this->preferredType($this->type);
+        $targetType = $this->preferredType();
 
         if (!file_exists($this->filepath)) {
             throw new Exception(_('Lost our file.'));
@@ -247,25 +260,25 @@ class ImageFile
     /**
      * Several obscure file types should be normalized to PNG on resize.
      *
-     * @param int $type
+     * @fixme consider flattening anything not GIF or JPEG to PNG
      * @return int
      */
-    function preferredType($type)
+    function preferredType()
     {
-        if($type == IMAGETYPE_BMP) {
+        if($this->type == IMAGETYPE_BMP) {
             //we don't want to save BMP... it's an inefficient, rare, antiquated format
             //save png instead
             return IMAGETYPE_PNG;
-        } else if($type == IMAGETYPE_WBMP) {
+        } else if($this->type == IMAGETYPE_WBMP) {
             //we don't want to save WBMP... it's a rare format that we can't guarantee clients will support
             //save png instead
             return IMAGETYPE_PNG;
-        } else if($type == IMAGETYPE_XBM) {
+        } else if($this->type == IMAGETYPE_XBM) {
             //we don't want to save XBM... it's a rare format that we can't guarantee clients will support
             //save png instead
             return IMAGETYPE_PNG;
         }
-        return $type;
+        return $this->type;
     }
 
     function unlink()

From 0a3c05feb0b623a78700bafe5f08d644a2cc3bfe Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 24 Jan 2011 12:41:30 -0800
Subject: [PATCH 123/314] Fix XML API output for several profile update methods
 that returned a <user> entry but didn't set namespaces, causing XML parse
 failures.

---
 actions/apiaccountupdatedeliverydevice.php         | 2 +-
 actions/apiaccountupdateprofile.php                | 2 +-
 actions/apiaccountupdateprofilebackgroundimage.php | 2 +-
 actions/apiaccountupdateprofilecolors.php          | 2 +-
 actions/apiaccountupdateprofileimage.php           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/actions/apiaccountupdatedeliverydevice.php b/actions/apiaccountupdatedeliverydevice.php
index ec87c4c953..a9ccb4fca8 100644
--- a/actions/apiaccountupdatedeliverydevice.php
+++ b/actions/apiaccountupdatedeliverydevice.php
@@ -143,7 +143,7 @@ class ApiAccountUpdateDeliveryDeviceAction extends ApiAuthAction
 
         if ($this->format == 'xml') {
             $this->initDocument('xml');
-            $this->showTwitterXmlUser($twitter_user);
+            $this->showTwitterXmlUser($twitter_user, 'user', true);
             $this->endDocument('xml');
         } elseif ($this->format == 'json') {
             $this->initDocument('json');
diff --git a/actions/apiaccountupdateprofile.php b/actions/apiaccountupdateprofile.php
index 163dac42d8..d0b9abe9b7 100644
--- a/actions/apiaccountupdateprofile.php
+++ b/actions/apiaccountupdateprofile.php
@@ -154,7 +154,7 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction
 
         if ($this->format == 'xml') {
             $this->initDocument('xml');
-            $this->showTwitterXmlUser($twitter_user);
+            $this->showTwitterXmlUser($twitter_user, 'user', true);
             $this->endDocument('xml');
         } elseif ($this->format == 'json') {
             $this->initDocument('json');
diff --git a/actions/apiaccountupdateprofilebackgroundimage.php b/actions/apiaccountupdateprofilebackgroundimage.php
index badd8db002..f26c30198d 100644
--- a/actions/apiaccountupdateprofilebackgroundimage.php
+++ b/actions/apiaccountupdateprofilebackgroundimage.php
@@ -204,7 +204,7 @@ class ApiAccountUpdateProfileBackgroundImageAction extends ApiAuthAction
 
         if ($this->format == 'xml') {
             $this->initDocument('xml');
-            $this->showTwitterXmlUser($twitter_user);
+            $this->showTwitterXmlUser($twitter_user, 'user', true);
             $this->endDocument('xml');
         } elseif ($this->format == 'json') {
             $this->initDocument('json');
diff --git a/actions/apiaccountupdateprofilecolors.php b/actions/apiaccountupdateprofilecolors.php
index 109fbf959e..4c102c4090 100644
--- a/actions/apiaccountupdateprofilecolors.php
+++ b/actions/apiaccountupdateprofilecolors.php
@@ -188,7 +188,7 @@ class ApiAccountUpdateProfileColorsAction extends ApiAuthAction
 
         if ($this->format == 'xml') {
             $this->initDocument('xml');
-            $this->showTwitterXmlUser($twitter_user);
+            $this->showTwitterXmlUser($twitter_user, 'user', true);
             $this->endDocument('xml');
         } elseif ($this->format == 'json') {
             $this->initDocument('json');
diff --git a/actions/apiaccountupdateprofileimage.php b/actions/apiaccountupdateprofileimage.php
index 6c53e2cbc1..986a8f3f1e 100644
--- a/actions/apiaccountupdateprofileimage.php
+++ b/actions/apiaccountupdateprofileimage.php
@@ -140,7 +140,7 @@ class ApiAccountUpdateProfileImageAction extends ApiAuthAction
 
         if ($this->format == 'xml') {
             $this->initDocument('xml');
-            $this->showTwitterXmlUser($twitter_user);
+            $this->showTwitterXmlUser($twitter_user, 'user', true);
             $this->endDocument('xml');
         } elseif ($this->format == 'json') {
             $this->initDocument('json');

From e35d46b415f89b19a4e3c1f5b4f077253434330b Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 24 Jan 2011 14:16:15 -0800
Subject: [PATCH 124/314] Fix for ticket #3010: blocks are now applied against
 the original poster of repeats.

Previously, if someone you subscribe to repeats a notice by someone you've blocked, you got the message and had to just roll your eyes.
Now blocks are checked against both the current notice's posting profile, and the poster of the original if it's a repeat.
---
 classes/Notice.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/classes/Notice.php b/classes/Notice.php
index 561999966c..0910ba39b7 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -819,9 +819,18 @@ class Notice extends Memcached_DataObject
 
         // 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)) {
+            if (empty($user) || $user->hasBlocked($profile) ||
+                ($originalProfile && $user->hasBlocked($originalProfile))) {
                 unset($ni[$id]);
             }
         }

From 0fc46d16291664a3860be3fdf60278170826dee3 Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Tue, 25 Jan 2011 18:29:07 -0500
Subject: [PATCH 125/314] Rounded corner fixes for base theme.

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

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 8c364febce..3268aea39b 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -346,14 +346,12 @@ list-style-type:none;
 float:left;
 text-decoration:none;
 padding:4px 11px;
-border-radius-topleft:4px;
-border-radius-topright:4px;
+border-top-left-radius:4px;
+border-top-right-radius:4px;
 -moz-border-radius-topleft:4px;
 -moz-border-radius-topright:4px;
 -webkit-border-top-left-radius:4px;
 -webkit-border-top-right-radius:4px;
-border-radius-topleft:0;
-border-radius-topright:0;
 border-width:1px;
 border-style:solid;
 border-bottom:0;
@@ -381,13 +379,13 @@ display:block;
 width:80%;
 padding-right:10%;
 padding-left:10%;
-border-radius-toprleft:0;
+border-top-left-radius:0;
 -moz-border-radius-topleft:0;
 -webkit-border-top-left-radius:0;
-border-radius-topright:4px;
+border-top-right-radius:4px;
 -moz-border-radius-topright:4px;
 -webkit-border-top-right-radius:4px;
-border-radius-bottomright:4px;
+border-bottom-right-radius:4px;
 -moz-border-radius-bottomright:4px;
 -webkit-border-bottom-right-radius:4px;
 }
@@ -398,13 +396,10 @@ box-shadow:none;
 }
 
 body[id$=adminpanel] #content {
-border-radius-topleft:7px;
-border-radius-topright:7px;
+border-top-left-radius: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;
+border-top-right-radius:0;
 -moz-border-radius-topright:0;
 -webkit-border-top-right-radius:0;
 }
@@ -488,6 +483,7 @@ min-height:259px;
 padding:1.795%;
 float:left;
 border-radius:7px;
+border-top-left-radius:0;
 -moz-border-radius:7px;
 -moz-border-radius-topleft:0;
 -webkit-border-radius:7px;

From 8bc296bdbbbf3566ee9e98fa2ae61b5c461c103c Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Tue, 25 Jan 2011 18:32:12 -0500
Subject: [PATCH 126/314] A few wee fixes for rebase and shiny themes.

---
 theme/rebase/css/display.css |  4 ++--
 theme/shiny/css/display.css  | 11 +++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/theme/rebase/css/display.css b/theme/rebase/css/display.css
index ab75165670..d4576092a6 100644
--- a/theme/rebase/css/display.css
+++ b/theme/rebase/css/display.css
@@ -1399,7 +1399,7 @@ display:block;
     padding: 4px 4px 4px 26px;
 }
 
-.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 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 {
     background-color: #ccc !important;
     border: none;
 }
@@ -1408,7 +1408,7 @@ display:block;
     padding: 2px 4px 4px 28px;
 }
 
-.entity_actions a:hover, .entity_actions p:hover, .entity_actions .entity_subscribe input:hover, .entity_actions .entity_block input:hover, .entity_actions .entity_moderation input:hover, .entity_actions .entity_role input:hover {
+.entity_actions a:hover, .entity_actions p:hover, .entity_actions .entity_subscribe input:hover, .entity_actions .entity_block input:hover, .entity_actions .entity_moderation input:hover, .entity_actions .entity_role input:hover, .entity_actions .entity_nudge input:hover, .entity_actions .entity_delete input:hover {
     background-color: #f2f2f2 !important;
 }
 
diff --git a/theme/shiny/css/display.css b/theme/shiny/css/display.css
index 758d462ba0..cb4625093a 100644
--- a/theme/shiny/css/display.css
+++ b/theme/shiny/css/display.css
@@ -295,8 +295,8 @@ h6 {font-size: 1em;}
 #site_nav_local_views {
 	position: relative;
 	z-index: 9;
-	float: right;
-    margin: 0px 0px 20px 0px;
+	float: right;
+    margin: 0px;
     width: 290px;
 }
 
@@ -331,7 +331,7 @@ h6 {font-size: 1em;}
 }
 
 #site_nav_local_views li:first-child a {
-	border-radius-topright:4px;
+	border-top-right-radius:4px;
 	-moz-border-radius-topright:4px;
 	-webkit-border-top-right-radius:4px;
 }
@@ -368,7 +368,7 @@ h6 {font-size: 1em;}
 	border-radius: 4px;
 	-moz-border-radius: 4px;
 	-webkit-border-radius: 4px;
-	border-radius-topright: 0px;
+	border-top-right-radius: 0px;
 	-moz-border-radius-topright: 0px;
 	-webkit-border-top-right-radius: 0px;
     padding: 14px 10px 20px 10px;
@@ -382,9 +382,8 @@ h6 {font-size: 1em;}
 	padding: 0px;
     padding-top: 16px;
     padding-left: 10px;
-    margin-top: -20px;
     background-color: #262626;
-	border-radius-bottomright: 6px;
+	border-bottom-right-radius: 6px;
 	-moz-border-radius-bottomright: 6px;
 	-webkit-border-bottom-right-radius: 6px;
 }

From 1563c95cc3b88c0d0ee769af9b56618117d9b17e Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Tue, 25 Jan 2011 18:33:47 -0500
Subject: [PATCH 127/314] Wee style update for bookmarks plugin.

---
 plugins/Bookmark/bookmark.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/Bookmark/bookmark.css b/plugins/Bookmark/bookmark.css
index 6743622d2f..0e2f3df52f 100644
--- a/plugins/Bookmark/bookmark.css
+++ b/plugins/Bookmark/bookmark.css
@@ -3,4 +3,6 @@
 .bookmark-avatar { float: left; }
 .bookmark-notice-count { float: right; }
 .bookmark-info { float: left; }
-.bookmark-title { margin-left: 0px }
+.bookmark-title { margin-left: 0px; }
+#content .bookmark .entry-title { margin-left: 0px; }
+#content .bookmark .entry-content { margin-left: 0px; }

From 9fcad91d8d45f8ba326468b94d937928bf4acd1a Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 25 Jan 2011 16:26:56 -0800
Subject: [PATCH 128/314] Ticket #3014: check upload size limits client-side in
 supporting browsers

Tested successfully in:
* Firefox 4.0b9
* Safari 5.0.5
* Chrome 8.0.522
---
 js/util.js     | 55 ++++++++++++++++++++++++++++++++++++++++++++++++--
 js/util.min.js |  2 +-
 2 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/js/util.js b/js/util.js
index eace1778e2..56ecdbcb83 100644
--- a/js/util.js
+++ b/js/util.js
@@ -718,8 +718,16 @@ var SN = { // StatusNet
          */
         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>';
+            NDA.change(function(event) {
+                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);
@@ -742,6 +750,22 @@ var SN = { // StatusNet
             });
         },
 
+        /**
+         * Get PHP's MAX_FILE_SIZE setting for this form;
+         * used to apply client-side file size limit checks.
+         *
+         * @param {jQuery} form
+         * @return int max size in bytes; 0 or negative means no limit
+         */
+        maxFileSize: function(form) {
+            var max = $(form).find('input[name=MAX_FILE_SIZE]').attr('value');
+            if (max) {
+                return parseInt(max);
+            } else {
+                return 0;
+            }
+        },
+
         /**
          * For browsers with FileAPI support: make a thumbnail if possible,
          * and append it into the attachment display widget.
@@ -1217,6 +1241,32 @@ var SN = { // StatusNet
                 SN.U.StatusNetInstance.Set({Nickname: $('#form_login #nickname').val()});
                 return true;
             });
+        },
+
+        /**
+         * Add logic to any file upload forms to handle file size limits,
+         * on browsers that support basic FileAPI.
+         */
+        UploadForms: function () {
+            $('input[type=file]').change(function(event) {
+                if (typeof this.files == "object" && this.files.length > 0) {
+                    var size = 0;
+                    for (var i = 0; i < this.files.length; i++) {
+                        size += this.files[i].size;
+                    }
+
+                    var max = SN.U.maxFileSize($(this.form));
+                    if (max > 0 && size > max) {
+                        var msg = 'File too large: maximum upload size is %d bytes.';
+                        alert(msg.replace('%d', max));
+
+                        // Clear the files.
+                        $(this).val('');
+                        event.preventDefault();
+                        return false;
+                    }
+                }
+            });
         }
     }
 };
@@ -1229,6 +1279,7 @@ var SN = { // StatusNet
  * don't start them loading until after DOM-ready time!
  */
 $(document).ready(function(){
+    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 854d1d5b0d..bbbdc79622 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(){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(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.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 8535f4b07367ce217fb5723385f9a1ae2af9bd7f Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 26 Jan 2011 10:49:14 -0800
Subject: [PATCH 129/314] Add IdentiCurse 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 82074077b4..06b1348898 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -24,6 +24,7 @@ VALUES
     ('HelloTxt','HelloTxt','http://hellotxt.com/', now()),
     ('identicatools','Laconica Tools','http://bitbucketlabs.net/laconica-tools/', now()),
     ('identichat','identichat','http://identichat.prosody.im/', now()),
+    ('IdentiCurse','IdentiCurse','http://identicurse.net/', now()),
     ('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()),
     ('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()),
     ('Jiminy','Jiminy','http://code.google.com/p/jiminy/', now()),

From 73011e6344efa0bd73c0a11cef10c93b2764eb26 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 26 Jan 2011 10:49:14 -0800
Subject: [PATCH 130/314] Add IdentiCurse 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 82074077b4..06b1348898 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -24,6 +24,7 @@ VALUES
     ('HelloTxt','HelloTxt','http://hellotxt.com/', now()),
     ('identicatools','Laconica Tools','http://bitbucketlabs.net/laconica-tools/', now()),
     ('identichat','identichat','http://identichat.prosody.im/', now()),
+    ('IdentiCurse','IdentiCurse','http://identicurse.net/', now()),
     ('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()),
     ('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()),
     ('Jiminy','Jiminy','http://code.google.com/p/jiminy/', now()),

From f6cb4ea58d1d75bb2c93fe9294266f6ea7a5d4aa Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 26 Jan 2011 10:49:14 -0800
Subject: [PATCH 131/314] Add IdentiCurse 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 b13cfb3e3b..dec8080a01 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -24,6 +24,7 @@ VALUES
     ('HelloTxt','HelloTxt','http://hellotxt.com/', now()),
     ('identicatools','Laconica Tools','http://bitbucketlabs.net/laconica-tools/', now()),
     ('identichat','identichat','http://identichat.prosody.im/', now()),
+    ('IdentiCurse','IdentiCurse','http://identicurse.net/', now()),
     ('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()),
     ('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()),
     ('Jiminy','Jiminy','http://code.google.com/p/jiminy/', now()),

From ee9e368aa8815500b1bdcaffc3a6022eabc732b9 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 26 Jan 2011 14:57:52 -0800
Subject: [PATCH 132/314] Fix ticket #3016: when using non-AJAX form of the
 ostatus subscription initiation for non-local group joins, show the "group"
 field instead of a blank "user" field

---
 plugins/OStatus/actions/ostatusinit.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/plugins/OStatus/actions/ostatusinit.php b/plugins/OStatus/actions/ostatusinit.php
index 91c36203c8..9832f33c05 100644
--- a/plugins/OStatus/actions/ostatusinit.php
+++ b/plugins/OStatus/actions/ostatusinit.php
@@ -114,10 +114,15 @@ class OStatusInitAction extends Action
 
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li', array('id' => 'ostatus_nickname'));
-        // TRANS: Field label.
-        $this->input('nickname', _m('User nickname'), $this->nickname,
-                     _m('Nickname of the user you want to follow.'));
-        $this->hidden('group', $this->group); // pass-through for magic links
+        if ($this->group) {
+            // TRANS: Field label.
+            $this->input('group', _m('Group nickname'), $this->group,
+                         _m('Nickname of the group you want to join.'));
+        } else {
+            // TRANS: Field label.
+            $this->input('nickname', _m('User nickname'), $this->nickname,
+                         _m('Nickname of the user you want to follow.'));
+        }
         $this->elementEnd('li');
         $this->elementStart('li', array('id' => 'ostatus_profile'));
         // TRANS: Field label.

From c65480fb3380adced72c92cdf6e82f34c47d15a8 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 26 Jan 2011 14:57:52 -0800
Subject: [PATCH 133/314] Fix ticket #3016: when using non-AJAX form of the
 ostatus subscription initiation for non-local group joins, show the "group"
 field instead of a blank "user" field

---
 plugins/OStatus/actions/ostatusinit.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/plugins/OStatus/actions/ostatusinit.php b/plugins/OStatus/actions/ostatusinit.php
index 91c36203c8..9832f33c05 100644
--- a/plugins/OStatus/actions/ostatusinit.php
+++ b/plugins/OStatus/actions/ostatusinit.php
@@ -114,10 +114,15 @@ class OStatusInitAction extends Action
 
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li', array('id' => 'ostatus_nickname'));
-        // TRANS: Field label.
-        $this->input('nickname', _m('User nickname'), $this->nickname,
-                     _m('Nickname of the user you want to follow.'));
-        $this->hidden('group', $this->group); // pass-through for magic links
+        if ($this->group) {
+            // TRANS: Field label.
+            $this->input('group', _m('Group nickname'), $this->group,
+                         _m('Nickname of the group you want to join.'));
+        } else {
+            // TRANS: Field label.
+            $this->input('nickname', _m('User nickname'), $this->nickname,
+                         _m('Nickname of the user you want to follow.'));
+        }
         $this->elementEnd('li');
         $this->elementStart('li', array('id' => 'ostatus_profile'));
         // TRANS: Field label.

From 54e98ffe222014d6165d0ca0d0eb31163feaea60 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 26 Jan 2011 15:49:57 -0800
Subject: [PATCH 134/314] Fix ticket #3013: MAX_FILE_SIZE hidden fields were
 incorrectly placed

In order to apply to PHP's POST processing, the MAX_FILE_SIZE field must appear *before* the file upload field. They were incorrectly placed after, where they had no effect on POST processing.
---
 actions/avatarsettings.php                    | 6 +++---
 actions/designadminpanel.php                  | 8 ++++----
 actions/grouplogo.php                         | 6 +++---
 lib/applicationeditform.php                   | 8 ++++----
 lib/designsettings.php                        | 8 ++++----
 lib/noticeform.php                            | 2 +-
 plugins/MobileProfile/MobileProfilePlugin.php | 2 +-
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index 10c82ebfd7..c81c024081 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -157,13 +157,13 @@ class AvatarsettingsAction extends AccountSettingsAction
             }
 
             $this->elementStart('li', array ('id' => 'settings_attach'));
-            $this->element('input', array('name' => 'avatarfile',
-                                          'type' => 'file',
-                                          'id' => 'avatarfile'));
             $this->element('input', array('name' => 'MAX_FILE_SIZE',
                                           'type' => 'hidden',
                                           'id' => 'MAX_FILE_SIZE',
                                           'value' => ImageFile::maxFileSizeInt()));
+            $this->element('input', array('name' => 'avatarfile',
+                                          'type' => 'file',
+                                          'id' => 'avatarfile'));
             $this->elementEnd('li');
             $this->elementEnd('ul');
 
diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php
index dd422bce91..34e6de851a 100644
--- a/actions/designadminpanel.php
+++ b/actions/designadminpanel.php
@@ -516,6 +516,10 @@ class DesignAdminPanelForm extends AdminForm
         $this->out->elementStart('ul', 'form_data');
 
         $this->li();
+        $this->out->element('input', array('name' => 'MAX_FILE_SIZE',
+                                          'type' => 'hidden',
+                                          'id' => 'MAX_FILE_SIZE',
+                                          'value' => ImageFile::maxFileSizeInt()));
         $this->out->element('label', array('for' => 'design_background-image_file'),
                                // TRANS: Field label for background image on theme designer page.
                                 _('Background'));
@@ -526,10 +530,6 @@ class DesignAdminPanelForm extends AdminForm
             // TRANS: Form guide for background image upload form on theme designer page.
             sprintf(_('You can upload a background image for the site. ' .
               'The maximum file size is %1$s.'), ImageFile::maxFileSize()));
-        $this->out->element('input', array('name' => 'MAX_FILE_SIZE',
-                                          'type' => 'hidden',
-                                          'id' => 'MAX_FILE_SIZE',
-                                          'value' => ImageFile::maxFileSizeInt()));
         $this->unli();
 
         if (!empty($design->backgroundimage)) {
diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index d2e8fd0e91..e4a497cf8f 100644
--- a/actions/grouplogo.php
+++ b/actions/grouplogo.php
@@ -228,13 +228,13 @@ class GrouplogoAction extends GroupDesignAction
         }
 
         $this->elementStart('li', array ('id' => 'settings_attach'));
-        $this->element('input', array('name' => 'avatarfile',
-                                      'type' => 'file',
-                                      'id' => 'avatarfile'));
         $this->element('input', array('name' => 'MAX_FILE_SIZE',
                                       'type' => 'hidden',
                                       'id' => 'MAX_FILE_SIZE',
                                       'value' => ImageFile::maxFileSizeInt()));
+        $this->element('input', array('name' => 'avatarfile',
+                                      'type' => 'file',
+                                      'id' => 'avatarfile'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
 
diff --git a/lib/applicationeditform.php b/lib/applicationeditform.php
index f53c31feb4..ec6702cd64 100644
--- a/lib/applicationeditform.php
+++ b/lib/applicationeditform.php
@@ -168,6 +168,10 @@ class ApplicationEditForm extends Form
             $this->out->element('img', array('src' => $icon));
         }
 
+        $this->out->element('input', array('name' => 'MAX_FILE_SIZE',
+                                           'type' => 'hidden',
+                                           'id' => 'MAX_FILE_SIZE',
+                                           'value' => ImageFile::maxFileSizeInt()));
         $this->out->element('label', array('for' => 'app_icon'),
                             // TRANS: Form input field label for application icon.
                             _('Icon'));
@@ -176,10 +180,6 @@ class ApplicationEditForm extends Form
                                            'id' => 'app_icon'));
         // TRANS: Form guide.
         $this->out->element('p', 'form_guide', _('Icon for this application'));
-        $this->out->element('input', array('name' => 'MAX_FILE_SIZE',
-                                           'type' => 'hidden',
-                                           'id' => 'MAX_FILE_SIZE',
-                                           'value' => ImageFile::maxFileSizeInt()));
         $this->out->elementEnd('li');
 
         $this->out->elementStart('li');
diff --git a/lib/designsettings.php b/lib/designsettings.php
index 90296a64da..d7da0b77d8 100644
--- a/lib/designsettings.php
+++ b/lib/designsettings.php
@@ -98,6 +98,10 @@ class DesignSettingsAction extends AccountSettingsAction
         $this->element('legend', null, _('Change background image'));
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
+        $this->element('input', array('name' => 'MAX_FILE_SIZE',
+                                      'type' => 'hidden',
+                                      'id' => 'MAX_FILE_SIZE',
+                                      'value' => ImageFile::maxFileSizeInt()));
         $this->element('label', array('for' => 'design_background-image_file'),
                                 // 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.
@@ -108,10 +112,6 @@ class DesignSettingsAction extends AccountSettingsAction
         // TRANS: Instructions for form on profile design page.
         $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)) {
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 5140663569..271d360707 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -190,12 +190,12 @@ class NoticeForm extends Form
             }
 
             if (common_config('attachments', 'uploads')) {
+                $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
                 $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')));
-                $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
             }
             if ($this->action) {
                 $this->out->hidden('notice_return-to', $this->action, 'returnto');
diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php
index b042bf7edd..b50440682f 100644
--- a/plugins/MobileProfile/MobileProfilePlugin.php
+++ b/plugins/MobileProfile/MobileProfilePlugin.php
@@ -358,12 +358,12 @@ class MobileProfilePlugin extends WAP20Plugin
 
         if (common_config('attachments', 'uploads')) {
             if ($this->mobileFeatures['inputfiletype']) {
+                $form->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
                 $form->out->element('label', array('for' => 'notice_data-attach'), _m('Attach'));
                 $form->out->element('input', array('id' => 'notice_data-attach',
                                                    'type' => 'file',
                                                    'name' => 'attach',
                                                    'title' => _m('Attach a file')));
-                $form->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
             }
         }
         if ($form->action) {

From 5fee38b02565ef9b342c2d6c1ad07a0aed413258 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 26 Jan 2011 18:21:43 -0700
Subject: [PATCH 135/314] events for modifying group edit form

---
 EVENTS.txt            |   6 ++
 actions/editgroup.php | 201 ++++++++++++++++++++++--------------------
 lib/groupeditform.php |  89 ++++++++++---------
 3 files changed, 155 insertions(+), 141 deletions(-)

diff --git a/EVENTS.txt b/EVENTS.txt
index 6719ba737a..59baf51ce6 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -1057,3 +1057,9 @@ StartCloseNoticeListItemElement: Before the closing </li> of a notice list eleme
 
 EndCloseNoticeListItemElement: After the closing </li> of a notice list element
 - $nli: The notice list item being shown
+
+StartGroupEditFormData: Beginning the group edit form entries
+- $form: The form widget being shown
+
+EndGroupEditFormData: Ending the group edit form entries
+- $form: The form widget being shown
diff --git a/actions/editgroup.php b/actions/editgroup.php
index ab4dbb2836..0e04170051 100644
--- a/actions/editgroup.php
+++ b/actions/editgroup.php
@@ -177,116 +177,121 @@ class EditgroupAction extends GroupDesignAction
             return;
         }
 
-        $nickname    = Nickname::normalize($this->trimmed('nickname'));
-        $fullname    = $this->trimmed('fullname');
-        $homepage    = $this->trimmed('homepage');
-        $description = $this->trimmed('description');
-        $location    = $this->trimmed('location');
-        $aliasstring = $this->trimmed('aliases');
+        if (Event::handle('StartGroupSaveForm', array($this))) {
 
-        if ($this->nicknameExists($nickname)) {
-            // TRANS: Group edit form validation error.
-            $this->showForm(_('Nickname already in use. Try another one.'));
-            return;
-        } else if (!User_group::allowedNickname($nickname)) {
-            // TRANS: Group edit form validation error.
-            $this->showForm(_('Not a valid nickname.'));
-            return;
-        } else if (!is_null($homepage) && (strlen($homepage) > 0) &&
-                   !Validate::uri($homepage,
-                                  array('allowed_schemes' =>
-                                        array('http', 'https')))) {
-            // TRANS: Group edit form validation error.
-            $this->showForm(_('Homepage is not a valid URL.'));
-            return;
-        } else if (!is_null($fullname) && mb_strlen($fullname) > 255) {
-            // TRANS: Group edit form validation error.
-            $this->showForm(_('Full name is too long (maximum 255 characters).'));
-            return;
-        } else if (User_group::descriptionTooLong($description)) {
-            $this->showForm(sprintf(
+            $nickname    = Nickname::normalize($this->trimmed('nickname'));
+            $fullname    = $this->trimmed('fullname');
+            $homepage    = $this->trimmed('homepage');
+            $description = $this->trimmed('description');
+            $location    = $this->trimmed('location');
+            $aliasstring = $this->trimmed('aliases');
+
+            if ($this->nicknameExists($nickname)) {
                 // TRANS: Group edit form validation error.
-                _m('Description is too long (maximum %d character).',
-                  'Description is too long (maximum %d characters).',
-                  User_group::maxDescription()),
+                $this->showForm(_('Nickname already in use. Try another one.'));
+                return;
+            } else if (!User_group::allowedNickname($nickname)) {
+                // TRANS: Group edit form validation error.
+                $this->showForm(_('Not a valid nickname.'));
+                return;
+            } else if (!is_null($homepage) && (strlen($homepage) > 0) &&
+                       !Validate::uri($homepage,
+                                      array('allowed_schemes' =>
+                                            array('http', 'https')))) {
+                // TRANS: Group edit form validation error.
+                $this->showForm(_('Homepage is not a valid URL.'));
+                return;
+            } else if (!is_null($fullname) && mb_strlen($fullname) > 255) {
+                // TRANS: Group edit form validation error.
+                $this->showForm(_('Full name is too long (maximum 255 characters).'));
+                return;
+            } else if (User_group::descriptionTooLong($description)) {
+                $this->showForm(sprintf(
+                                    // TRANS: Group edit form validation error.
+                                    _m('Description is too long (maximum %d character).',
+                                       'Description is too long (maximum %d characters).',
+                                       User_group::maxDescription()),
                                     User_group::maxDescription()));
-            return;
-        } else if (!is_null($location) && mb_strlen($location) > 255) {
-            // TRANS: Group edit form validation error.
-            $this->showForm(_('Location is too long (maximum 255 characters).'));
-            return;
-        }
-
-        if (!empty($aliasstring)) {
-            $aliases = array_map('common_canonical_nickname', array_unique(preg_split('/[\s,]+/', $aliasstring)));
-        } else {
-            $aliases = array();
-        }
-
-        if (count($aliases) > common_config('group', 'maxaliases')) {
-            // TRANS: Group edit form validation error.
-            // TRANS: %d is the maximum number of allowed aliases.
-            $this->showForm(sprintf(_m('Too many aliases! Maximum %d allowed.',
-                                       'Too many aliases! Maximum %d allowed.',
-                                       common_config('group', 'maxaliases')),
-                                    common_config('group', 'maxaliases')));
-            return;
-        }
-
-        foreach ($aliases as $alias) {
-            if (!Nickname::isValid($alias)) {
+                return;
+            } else if (!is_null($location) && mb_strlen($location) > 255) {
                 // TRANS: Group edit form validation error.
-                $this->showForm(sprintf(_('Invalid alias: "%s"'), $alias));
+                $this->showForm(_('Location is too long (maximum 255 characters).'));
                 return;
             }
-            if ($this->nicknameExists($alias)) {
+
+            if (!empty($aliasstring)) {
+                $aliases = array_map('common_canonical_nickname', array_unique(preg_split('/[\s,]+/', $aliasstring)));
+            } else {
+                $aliases = array();
+            }
+
+            if (count($aliases) > common_config('group', 'maxaliases')) {
                 // TRANS: Group edit form validation error.
-                $this->showForm(sprintf(_('Alias "%s" already in use. Try another one.'),
-                                        $alias));
+                // TRANS: %d is the maximum number of allowed aliases.
+                $this->showForm(sprintf(_m('Too many aliases! Maximum %d allowed.',
+                                           'Too many aliases! Maximum %d allowed.',
+                                           common_config('group', 'maxaliases')),
+                                        common_config('group', 'maxaliases')));
                 return;
             }
-            // XXX assumes alphanum nicknames
-            if (strcmp($alias, $nickname) == 0) {
-                // TRANS: Group edit form validation error.
-                $this->showForm(_('Alias can\'t be the same as nickname.'));
-                return;
+
+            foreach ($aliases as $alias) {
+                if (!Nickname::isValid($alias)) {
+                    // TRANS: Group edit form validation error.
+                    $this->showForm(sprintf(_('Invalid alias: "%s"'), $alias));
+                    return;
+                }
+                if ($this->nicknameExists($alias)) {
+                    // TRANS: Group edit form validation error.
+                    $this->showForm(sprintf(_('Alias "%s" already in use. Try another one.'),
+                                            $alias));
+                    return;
+                }
+                // XXX assumes alphanum nicknames
+                if (strcmp($alias, $nickname) == 0) {
+                    // TRANS: Group edit form validation error.
+                    $this->showForm(_('Alias can\'t be the same as nickname.'));
+                    return;
+                }
             }
+
+            $this->group->query('BEGIN');
+
+            $orig = clone($this->group);
+
+            $this->group->nickname    = $nickname;
+            $this->group->fullname    = $fullname;
+            $this->group->homepage    = $homepage;
+            $this->group->description = $description;
+            $this->group->location    = $location;
+            $this->group->mainpage    = common_local_url('showgroup', array('nickname' => $nickname));
+
+            $result = $this->group->update($orig);
+
+            if (!$result) {
+                common_log_db_error($this->group, 'UPDATE', __FILE__);
+                // TRANS: Server error displayed when editing a group fails.
+                $this->serverError(_('Could not update group.'));
+            }
+
+            $result = $this->group->setAliases($aliases);
+
+            if (!$result) {
+                // TRANS: Server error displayed when group aliases could not be added.
+                $this->serverError(_('Could not create aliases.'));
+            }
+
+            if ($nickname != $orig->nickname) {
+                common_log(LOG_INFO, "Saving local group info.");
+                $local = Local_group::staticGet('group_id', $this->group->id);
+                $local->setNickname($nickname);
+            }
+
+            $this->group->query('COMMIT');
+
+            Event::handle('EndGroupSaveForm', array($this));
         }
 
-        $this->group->query('BEGIN');
-
-        $orig = clone($this->group);
-
-        $this->group->nickname    = $nickname;
-        $this->group->fullname    = $fullname;
-        $this->group->homepage    = $homepage;
-        $this->group->description = $description;
-        $this->group->location    = $location;
-        $this->group->mainpage    = common_local_url('showgroup', array('nickname' => $nickname));
-
-        $result = $this->group->update($orig);
-
-        if (!$result) {
-            common_log_db_error($this->group, 'UPDATE', __FILE__);
-            // TRANS: Server error displayed when editing a group fails.
-            $this->serverError(_('Could not update group.'));
-        }
-
-        $result = $this->group->setAliases($aliases);
-
-        if (!$result) {
-            // TRANS: Server error displayed when group aliases could not be added.
-            $this->serverError(_('Could not create aliases.'));
-        }
-
-        if ($nickname != $orig->nickname) {
-            common_log(LOG_INFO, "Saving local group info.");
-            $local = Local_group::staticGet('group_id', $this->group->id);
-            $local->setNickname($nickname);
-        }
-
-        $this->group->query('COMMIT');
-
         if ($this->group->nickname != $orig->nickname) {
             common_redirect(common_local_url('editgroup',
                                              array('nickname' => $nickname)),
diff --git a/lib/groupeditform.php b/lib/groupeditform.php
index cc25f06886..8e4519267b 100644
--- a/lib/groupeditform.php
+++ b/lib/groupeditform.php
@@ -147,51 +147,54 @@ class GroupEditForm extends Form
         }
 
         $this->out->elementStart('ul', 'form_data');
-        $this->out->elementStart('li');
-        $this->out->hidden('groupid', $id);
-        $this->out->input('nickname', _('Nickname'),
-                          ($this->out->arg('nickname')) ? $this->out->arg('nickname') : $nickname,
-                          _('1-64 lowercase letters or numbers, no punctuation or spaces'));
-        $this->out->elementEnd('li');
-        $this->out->elementStart('li');
-        $this->out->input('fullname', _('Full name'),
-                          ($this->out->arg('fullname')) ? $this->out->arg('fullname') : $fullname);
-        $this->out->elementEnd('li');
-        $this->out->elementStart('li');
-        $this->out->input('homepage', _('Homepage'),
-                          ($this->out->arg('homepage')) ? $this->out->arg('homepage') : $homepage,
-                          _('URL of the homepage or blog of the group or topic.'));
-        $this->out->elementEnd('li');
-        $this->out->elementStart('li');
-        $desclimit = User_group::maxDescription();
-        if ($desclimit == 0) {
-            $descinstr = _('Describe the group or topic');
-        } else {
-            $descinstr = sprintf(_m('Describe the group or topic in %d character or less',
-                                    'Describe the group or topic in %d characters or less',
-                                    $desclimit),
-                                 $desclimit);
-        }
-        $this->out->textarea('description', _('Description'),
-                             ($this->out->arg('description')) ? $this->out->arg('description') : $description,
-                             $descinstr);
-        $this->out->elementEnd('li');
-        $this->out->elementStart('li');
-        $this->out->input('location', _('Location'),
-                          ($this->out->arg('location')) ? $this->out->arg('location') : $location,
-                          _('Location for the group, if any, like "City, State (or Region), Country".'));
-        $this->out->elementEnd('li');
-        if (common_config('group', 'maxaliases') > 0) {
-            $aliases = (empty($this->group)) ? array() : $this->group->getAliases();
+        if (Event::handle('StartGroupEditFormData', array($this))) {
             $this->out->elementStart('li');
-            $this->out->input('aliases', _('Aliases'),
-                              ($this->out->arg('aliases')) ? $this->out->arg('aliases') :
-                              (!empty($aliases)) ? implode(' ', $aliases) : '',
-                              sprintf(_m('Extra nicknames for the group, separated with commas or spaces. Maximum %d alias allowed.',
-                                         'Extra nicknames for the group, separated with commas or spaces. Maximum %d aliases allowed.',
-                                         common_config('group', 'maxaliases')),
-                                      common_config('group', 'maxaliases')));;
+            $this->out->hidden('groupid', $id);
+            $this->out->input('nickname', _('Nickname'),
+                              ($this->out->arg('nickname')) ? $this->out->arg('nickname') : $nickname,
+                              _('1-64 lowercase letters or numbers, no punctuation or spaces'));
             $this->out->elementEnd('li');
+            $this->out->elementStart('li');
+            $this->out->input('fullname', _('Full name'),
+                              ($this->out->arg('fullname')) ? $this->out->arg('fullname') : $fullname);
+            $this->out->elementEnd('li');
+            $this->out->elementStart('li');
+            $this->out->input('homepage', _('Homepage'),
+                              ($this->out->arg('homepage')) ? $this->out->arg('homepage') : $homepage,
+                              _('URL of the homepage or blog of the group or topic.'));
+            $this->out->elementEnd('li');
+            $this->out->elementStart('li');
+            $desclimit = User_group::maxDescription();
+            if ($desclimit == 0) {
+                $descinstr = _('Describe the group or topic');
+            } else {
+                $descinstr = sprintf(_m('Describe the group or topic in %d character or less',
+                                        'Describe the group or topic in %d characters or less',
+                                        $desclimit),
+                                     $desclimit);
+            }
+            $this->out->textarea('description', _('Description'),
+                                 ($this->out->arg('description')) ? $this->out->arg('description') : $description,
+                                 $descinstr);
+            $this->out->elementEnd('li');
+            $this->out->elementStart('li');
+            $this->out->input('location', _('Location'),
+                              ($this->out->arg('location')) ? $this->out->arg('location') : $location,
+                              _('Location for the group, if any, like "City, State (or Region), Country".'));
+            $this->out->elementEnd('li');
+            if (common_config('group', 'maxaliases') > 0) {
+                $aliases = (empty($this->group)) ? array() : $this->group->getAliases();
+                $this->out->elementStart('li');
+                $this->out->input('aliases', _('Aliases'),
+                                  ($this->out->arg('aliases')) ? $this->out->arg('aliases') :
+                                  (!empty($aliases)) ? implode(' ', $aliases) : '',
+                                  sprintf(_m('Extra nicknames for the group, separated with commas or spaces. Maximum %d alias allowed.',
+                                             'Extra nicknames for the group, separated with commas or spaces. Maximum %d aliases allowed.',
+                                             common_config('group', 'maxaliases')),
+                                          common_config('group', 'maxaliases')));;
+                $this->out->elementEnd('li');
+            }
+            Event::handle('EndGroupEditFormData', array($this));
         }
         $this->out->elementEnd('ul');
     }

From 2682915b99a63a395e04cabf2c6cb71d3716acdd Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 26 Jan 2011 18:35:01 -0700
Subject: [PATCH 136/314] events for creating a group

---
 EVENTS.txt             |   6 +++
 classes/User_group.php | 110 ++++++++++++++++++++++-------------------
 2 files changed, 64 insertions(+), 52 deletions(-)

diff --git a/EVENTS.txt b/EVENTS.txt
index 59baf51ce6..d26c576e19 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -1063,3 +1063,9 @@ StartGroupEditFormData: Beginning the group edit form entries
 
 EndGroupEditFormData: Ending the group edit form entries
 - $form: The form widget being shown
+
+StartGroupSave: After initializing but before saving a group
+- &$group: group about to be saved
+
+EndGroupSave: After saving a group, aliases, and first member
+- $group: group that was saved
diff --git a/classes/User_group.php b/classes/User_group.php
index d402ed4773..5a9991fe9e 100644
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -512,64 +512,70 @@ class User_group extends Memcached_DataObject
         $group->mainpage    = $mainpage;
         $group->created     = common_sql_now();
 
-        $result = $group->insert();
+        if (Event::handle('StartGroupSave', array(&$group))) {
 
-        if (!$result) {
-            common_log_db_error($group, 'INSERT', __FILE__);
-            // TRANS: Server exception thrown when creating a group failed.
-            throw new ServerException(_('Could not create group.'));
-        }
-
-        if (!isset($uri) || empty($uri)) {
-            $orig = clone($group);
-            $group->uri = common_local_url('groupbyid', array('id' => $group->id));
-            $result = $group->update($orig);
-            if (!$result) {
-                common_log_db_error($group, 'UPDATE', __FILE__);
-                // TRANS: Server exception thrown when updating a group URI failed.
-                throw new ServerException(_('Could not set group URI.'));
-            }
-        }
-
-        $result = $group->setAliases($aliases);
-
-        if (!$result) {
-            // TRANS: Server exception thrown when creating group aliases failed.
-            throw new ServerException(_('Could not create aliases.'));
-        }
-
-        $member = new Group_member();
-
-        $member->group_id   = $group->id;
-        $member->profile_id = $userid;
-        $member->is_admin   = 1;
-        $member->created    = $group->created;
-
-        $result = $member->insert();
-
-        if (!$result) {
-            common_log_db_error($member, 'INSERT', __FILE__);
-            // TRANS: Server exception thrown when setting group membership failed.
-            throw new ServerException(_('Could not set group membership.'));
-        }
-
-        if ($local) {
-            $local_group = new Local_group();
-
-            $local_group->group_id = $group->id;
-            $local_group->nickname = $nickname;
-            $local_group->created  = common_sql_now();
-
-            $result = $local_group->insert();
+            $result = $group->insert();
 
             if (!$result) {
-                common_log_db_error($local_group, 'INSERT', __FILE__);
-                // TRANS: Server exception thrown when saving local group information failed.
-                throw new ServerException(_('Could not save local group info.'));
+                common_log_db_error($group, 'INSERT', __FILE__);
+                // TRANS: Server exception thrown when creating a group failed.
+                throw new ServerException(_('Could not create group.'));
             }
+
+            if (!isset($uri) || empty($uri)) {
+                $orig = clone($group);
+                $group->uri = common_local_url('groupbyid', array('id' => $group->id));
+                $result = $group->update($orig);
+                if (!$result) {
+                    common_log_db_error($group, 'UPDATE', __FILE__);
+                    // TRANS: Server exception thrown when updating a group URI failed.
+                    throw new ServerException(_('Could not set group URI.'));
+                }
+            }
+
+            $result = $group->setAliases($aliases);
+
+            if (!$result) {
+                // TRANS: Server exception thrown when creating group aliases failed.
+                throw new ServerException(_('Could not create aliases.'));
+            }
+
+            $member = new Group_member();
+
+            $member->group_id   = $group->id;
+            $member->profile_id = $userid;
+            $member->is_admin   = 1;
+            $member->created    = $group->created;
+
+            $result = $member->insert();
+
+            if (!$result) {
+                common_log_db_error($member, 'INSERT', __FILE__);
+                // TRANS: Server exception thrown when setting group membership failed.
+                throw new ServerException(_('Could not set group membership.'));
+            }
+
+            if ($local) {
+                $local_group = new Local_group();
+
+                $local_group->group_id = $group->id;
+                $local_group->nickname = $nickname;
+                $local_group->created  = common_sql_now();
+
+                $result = $local_group->insert();
+
+                if (!$result) {
+                    common_log_db_error($local_group, 'INSERT', __FILE__);
+                    // TRANS: Server exception thrown when saving local group information failed.
+                    throw new ServerException(_('Could not save local group info.'));
+                }
+            }
+
+            $group->query('COMMIT');
+
+            Event::handle('EndGroupSave', array($group));
         }
 
-        $group->query('COMMIT');
         return $group;
     }
 

From 1a96a5e695e76f4a7e91ffe10e5ca0b5ccbfccaf Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 26 Jan 2011 18:48:13 -0700
Subject: [PATCH 137/314] create privacy settings on new group

---
 plugins/PrivateGroup/PrivateGroupPlugin.php | 25 +++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/plugins/PrivateGroup/PrivateGroupPlugin.php b/plugins/PrivateGroup/PrivateGroupPlugin.php
index 0ae1247bee..9851313ff4 100644
--- a/plugins/PrivateGroup/PrivateGroupPlugin.php
+++ b/plugins/PrivateGroup/PrivateGroupPlugin.php
@@ -202,6 +202,31 @@ class PrivateGroupPlugin extends Plugin
         return true;
     }
 
+    /**
+     * Create default group privacy settings at group create time
+     *
+     * @param $group Group that was just created
+     *
+     * @result boolean hook value
+     */
+
+    function onEndGroupSave($group)
+    {
+        $gps = new Group_privacy_settings();
+
+        $gps->group_id      = $group->id;
+        $gps->allow_privacy = Group_privacy_settings::SOMETIMES;
+        $gps->allow_sender  = Group_privacy_settings::MEMBER;
+        $gps->created       = common_sql_now();
+        $gps->modified      = $gps->created;
+
+        // This will throw an exception on error
+
+        $gps->insert();
+
+        return true;
+    }
+
     function onPluginVersion(&$versions)
     {
         $versions[] = array('name' => 'PrivateGroup',

From 433ec211199aedc98e7d6949a17d6b5c2d0932f3 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 27 Jan 2011 12:07:29 -0800
Subject: [PATCH 138/314] Add $config['sessions']['gc_limit'] to limit how much
 work we do in each session GC; defaulting to killing 1000 sessions at a time.

---
 classes/Session.php | 7 +++++++
 lib/default.php     | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/classes/Session.php b/classes/Session.php
index e1c83ad4dc..166b89815a 100644
--- a/classes/Session.php
+++ b/classes/Session.php
@@ -156,6 +156,13 @@ class Session extends Memcached_DataObject
         $session->selectAdd();
         $session->selectAdd('id');
 
+        $limit = common_config('sessions', 'gc_limit');
+        if ($limit > 0) {
+            // On large sites, too many sessions to expire
+            // at once will just result in failure.
+            $session->limit($limit);
+        }
+
         $session->find();
 
         while ($session->fetch()) {
diff --git a/lib/default.php b/lib/default.php
index 85d27f5220..4b28e3238b 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -261,8 +261,9 @@ $default =
         'search' =>
         array('type' => 'fulltext'),
         'sessions' =>
-        array('handle' => false, // whether to handle sessions ourselves
-              'debug' => false), // debugging output for sessions
+        array('handle' => false,   // whether to handle sessions ourselves
+              'debug' => false,    // debugging output for sessions
+              'gc_limit' => 1000), // max sessions to expire at a time
         'design' =>
         array('backgroundcolor' => null, // null -> 'use theme default'
               'contentcolor' => null,

From a7abb2323e7d57125b9fbc903a1cecc06c27944e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 27 Jan 2011 12:27:31 -0800
Subject: [PATCH 139/314] Session GC fix: save session.modified field as UTC so
 our comparisons work.

Had to tweak statusnet.ini to remove the DB_DATAOBJECT_MYSQLTIMESTAMP bitfield constant on session.modified; while it sounds like a useful and legit setting, it actually just means that DB_DataObject silently fails to pass through any attempts to explicitly set the value. As a result, MySQL does its default behavior which is to insert the current *LOCAL* time, which is useless.
This was leading to early GC west of GMT, or late GC east of it. Early GC could at worst destroy all live sessions (whoever's session *triggered* GC is fine, as the session then gets saved right back.)
---
 classes/Session.php   |  2 ++
 classes/statusnet.ini | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/classes/Session.php b/classes/Session.php
index 166b89815a..b9daf364db 100644
--- a/classes/Session.php
+++ b/classes/Session.php
@@ -87,6 +87,7 @@ class Session extends Memcached_DataObject
             $session->id           = $id;
             $session->session_data = $session_data;
             $session->created      = common_sql_now();
+            $session->modified     = common_sql_now();
 
             $result = $session->insert();
 
@@ -108,6 +109,7 @@ class Session extends Memcached_DataObject
                 $orig = clone($session);
 
                 $session->session_data = $session_data;
+                $session->modified     = common_sql_now();
 
                 $result = $session->update($orig);
 
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index ef631e28d3..29fde93b5d 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -513,7 +513,20 @@ profile_id = K
 id = 130
 session_data = 34
 created = 142
-modified = 384
+modified = 142
+; Warning: using DB_DATAOBJECT_MYSQLTIMESTAMP (256) causes DB_DataObject
+; to SILENTLY REMOVE ATTEMPTS TO SET THIS FIELD DIRECTLY, which is pretty
+; bad because the default behavior for auto-updated TIMESTAMP fields is
+; to use local time. Local time can't be compared to UTC in any useful
+; way, so doing that breaks session GC.
+;
+; Instead we'll use the plain datetime settings so it'll actually save the
+; UTC value we provide when updating.
+;
+; Long-term fix: punch MySQL in the face until it understands that local
+; time is a tool of the cyber-devil.
+;
+;modified = 384
 
 [session__keys]
 id = K

From 7db24c32d6d627a9db84255ffbbbd3a52b491204 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sat, 29 Jan 2011 00:33:13 +0100
Subject: [PATCH 140/314] * fix some i18n and L10n issues * update/add
 translator documentation * remove superfluous whitespace

---
 actions/apitimelineuser.php         |  3 +--
 actions/atompubsubscriptionfeed.php | 10 +++++---
 actions/newgroup.php                |  5 ++--
 actions/subscriptions.php           |  4 +--
 classes/Notice.php                  | 40 ++++++++++++++---------------
 lib/accountmover.php                | 22 +++++++++-------
 lib/activity.php                    | 18 ++++++-------
 lib/activitymover.php               | 10 +++-----
 lib/activitysink.php                | 16 ++++++++----
 lib/discovery.php                   | 30 +++++-----------------
 lib/imagefile.php                   |  7 +++++
 lib/linkheader.php                  |  5 +---
 lib/logingroupnav.php               | 11 ++++----
 lib/mail.php                        | 10 +-------
 lib/profileaction.php               | 23 ++++++++++++++---
 lib/useractivitystream.php          |  3 +--
 lib/userprofile.php                 | 24 +++++++++++++++--
 lib/xrd.php                         |  5 ++--
 lib/xrdaction.php                   | 30 +++++++++++-----------
 19 files changed, 149 insertions(+), 127 deletions(-)

diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index c1e66021b6..b3b908accc 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -331,8 +331,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
         if (Event::handle('StartAtomPubNewActivity', array(&$activity, $this->user, &$saved))) {
 
             if ($activity->verb != ActivityVerb::POST) {
-                // TRANS: Client error displayed when not using the POST verb.
-                // TRANS: Do not translate POST.
+                // TRANS: Client error displayed when not using the POST verb. Do not translate POST.
                 $this->clientError(_('Can only handle POST activities.'));
                 return;
             }
diff --git a/actions/atompubsubscriptionfeed.php b/actions/atompubsubscriptionfeed.php
index 43e7933272..1b22efeac3 100644
--- a/actions/atompubsubscriptionfeed.php
+++ b/actions/atompubsubscriptionfeed.php
@@ -244,8 +244,7 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction
         if (Event::handle('StartAtomPubNewActivity', array(&$activity))) {
 
             if ($activity->verb != ActivityVerb::FOLLOW) {
-                // TRANS: Client error displayed when not using the POST verb.
-                // TRANS: Do not translate POST.
+                // TRANS: Client error displayed when not using the follow verb.
                 $this->clientError(_('Can only handle Follow activities.'));
                 return;
             }
@@ -264,14 +263,17 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction
 
             if (empty($profile)) {
                 // TRANS: Client exception thrown when subscribing to a non-existing profile.
+                // TRANS: %s is the unknown profile ID.
                 $this->clientError(sprintf(_('Unknown profile %s.'), $person->id));
                 return;
             }
 
             if (Subscription::exists($this->_profile, $profile)) {
                 // 409 Conflict
-                $this->clientError(sprintf(_('Already subscribed to %s'),
-                                           $person->id), 
+                // TRANS: Client error displayed trying to subscribe to an already subscribed profile.
+                // TRANS: %s is the profile the user already has a subscription on.
+                $this->clientError(sprintf(_('Already subscribed to %s.'),
+                                           $person->id),
                                    409);
                 return;
             }
diff --git a/actions/newgroup.php b/actions/newgroup.php
index fb7f6347d4..53c95d03f0 100644
--- a/actions/newgroup.php
+++ b/actions/newgroup.php
@@ -183,11 +183,12 @@ class NewgroupAction extends Action
         foreach ($aliases as $alias) {
             if (!Nickname::isValid($alias)) {
                 // TRANS: Group create form validation error.
+                // TRANS: %s is the invalid alias.
                 $this->showForm(sprintf(_('Invalid alias: "%s"'), $alias));
                 return;
             }
             if ($this->nicknameExists($alias)) {
-                // TRANS: Group create form validation error.
+                // TRANS: Group create form validation error. %s is the already used alias.
                 $this->showForm(sprintf(_('Alias "%s" already in use. Try another one.'),
                                         $alias));
                 return;
@@ -195,7 +196,7 @@ class NewgroupAction extends Action
             // XXX assumes alphanum nicknames
             if (strcmp($alias, $nickname) == 0) {
                 // TRANS: Group create form validation error.
-                $this->showForm(_('Alias can\'t be the same as nickname.'));
+                $this->showForm(_('Alias cannot be the same as nickname.'));
                 return;
             }
         }
diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index ddcf237e62..697577c107 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -167,15 +167,14 @@ class SubscriptionsAction extends GalleryAction
      *
      * @return array of Feed objects
      */
-
     function getFeeds()
     {
         return array(new Feed(Feed::ATOM,
                               common_local_url('AtomPubSubscriptionFeed',
                                                array('subscriber' => $this->profile->id)),
+                              // TRANS: Atom feed title. %s is a profile nickname.
                               sprintf(_('Subscription feed for %s (Atom)'),
                                       $this->profile->nickname)));
-
     }
 }
 
@@ -261,5 +260,4 @@ class SubscriptionsListItem extends SubscriptionListItem
         $this->out->elementEnd('form');
         return;
     }
-
 }
diff --git a/classes/Notice.php b/classes/Notice.php
index 0910ba39b7..e9ea479e14 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -241,7 +241,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
-     *                    
+     *
      * @fixme tag override
      *
      * @return Notice
@@ -1240,7 +1240,7 @@ class Notice extends Memcached_DataObject
      * Convert a notice into an activity for export.
      *
      * @param User $cur Current user
-     * 
+     *
      * @return Activity activity object representing this Notice.
      */
 
@@ -1253,11 +1253,11 @@ class Notice extends Memcached_DataObject
         }
 
         $act = new Activity();
-	
+
         if (Event::handle('StartNoticeAsActivity', array($this, &$act))) {
 
             $profile = $this->getProfile();
-	    
+
             $act->actor     = ActivityObject::fromProfile($profile);
             $act->verb      = ActivityVerb::POST;
             $act->objects[] = ActivityObject::fromNotice($this);
@@ -1266,7 +1266,7 @@ class Notice extends Memcached_DataObject
 
             $act->time    = strtotime($this->created);
             $act->link    = $this->bestUrl();
-	    
+
             $act->content = common_xml_safe_str($this->rendered);
             $act->id      = $this->uri;
             $act->title   = common_xml_safe_str($this->content);
@@ -1293,9 +1293,9 @@ class Notice extends Memcached_DataObject
                     $act->enclosures[] = $enclosure;
                 }
             }
-            
+
             $ctx = new ActivityContext();
-	    
+
             if (!empty($this->reply_to)) {
                 $reply = Notice::staticGet('id', $this->reply_to);
                 if (!empty($reply)) {
@@ -1303,29 +1303,29 @@ class Notice extends Memcached_DataObject
                     $ctx->replyToUrl = $reply->bestUrl();
                 }
             }
-	    
+
             $ctx->location = $this->getLocation();
-	    
+
             $conv = null;
-	    
+
             if (!empty($this->conversation)) {
                 $conv = Conversation::staticGet('id', $this->conversation);
                 if (!empty($conv)) {
                     $ctx->conversation = $conv->uri;
                 }
             }
-	    
+
             $reply_ids = $this->getReplies();
-	    
+
             foreach ($reply_ids as $id) {
                 $profile = Profile::staticGet('id', $id);
                 if (!empty($profile)) {
                     $ctx->attention[] = $profile->getUri();
                 }
             }
-	    
+
             $groups = $this->getGroups();
-	    
+
             foreach ($groups as $group) {
                 $ctx->attention[] = $group->uri;
             }
@@ -1339,7 +1339,7 @@ class Notice extends Memcached_DataObject
                 $ctx->forwardID  = $repeat->uri;
                 $ctx->forwardUrl = $repeat->bestUrl();
             }
-	    
+
             $act->context = $ctx;
 
             // Source
@@ -1349,7 +1349,7 @@ class Notice extends Memcached_DataObject
             if (!empty($atom_feed)) {
 
                 $act->source = new ActivitySource();
-		    
+
                 // XXX: we should store the actual feed ID
 
                 $act->source->id = $atom_feed;
@@ -1362,7 +1362,7 @@ class Notice extends Memcached_DataObject
                 $act->source->links['self']      = $atom_feed;
 
                 $act->source->icon = $profile->avatarUrl(AVATAR_PROFILE_SIZE);
-		    
+
                 $notice = $profile->getCurrentNotice();
 
                 if (!empty($notice)) {
@@ -1384,7 +1384,7 @@ class Notice extends Memcached_DataObject
 
             Event::handle('EndNoticeAsActivity', array($this, &$act));
         }
-	
+
         self::cacheSet(Cache::codeKey('notice:as-activity:'.$this->id), $act);
 
         return $act;
@@ -1395,7 +1395,7 @@ class Notice extends Memcached_DataObject
 
     function asAtomEntry($namespace=false,
                          $source=false,
-                         $author=true, 
+                         $author=true,
                          $cur=null)
     {
         $act = $this->asActivity();
@@ -1405,7 +1405,7 @@ class Notice extends Memcached_DataObject
 
     /**
      * Extra notice info for atom entries
-     * 
+     *
      * Clients use some extra notice info in the atom stream.
      * This gives it to them.
      *
diff --git a/lib/accountmover.php b/lib/accountmover.php
index 85c95c1132..3e9228994a 100644
--- a/lib/accountmover.php
+++ b/lib/accountmover.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2010, StatusNet, Inc.
  *
  * A class for moving an account to a new server
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -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 AccountMover extends QueueHandler
 {
     function transport()
@@ -61,14 +60,16 @@ class AccountMover extends QueueHandler
         $oprofile = Ostatus_profile::ensureProfileURI($remote);
 
         if (empty($oprofile)) {
-            throw new Exception("Can't locate account {$remote}");
+            // TRANS: Exception thrown when an account could not be located when it should be moved.
+            // TRANS: %s is the remote site.
+            throw new Exception(sprintf(_("Cannot locate account %s."),$remote));
         }
 
         list($svcDocUrl, $username) = self::getServiceDocument($remote);
 
         $sink = new ActivitySink($svcDocUrl, $username, $password);
 
-        $this->log(LOG_INFO, 
+        $this->log(LOG_INFO,
                    "Moving user {$user->nickname} ".
                    "to {$remote}.");
 
@@ -100,8 +101,10 @@ class AccountMover extends QueueHandler
         $xrd = $discovery->lookup($remote);
 
         if (empty($xrd)) {
-            throw new Exception("Can't find XRD for $remote");
-        } 
+            // TRANS: Exception thrown when a service document could not be located account move.
+            // TRANS: %s is the remote site.
+            throw new Exception(sprintf(_("Cannot find XRD for %s."),$remote));
+        }
 
         $svcDocUrl = null;
         $username  = null;
@@ -123,7 +126,9 @@ class AccountMover extends QueueHandler
         }
 
         if (empty($svcDocUrl)) {
-            throw new Exception("No AtomPub API service for $remote.");
+            // TRANS: Exception thrown when an account could not be located when it should be moved.
+            // TRANS: %s is the remote site.
+            throw new Exception(sprintf(_("No AtomPub API service for %s."),$remote));
         }
 
         return array($svcDocUrl, $username);
@@ -131,7 +136,7 @@ class AccountMover extends QueueHandler
 
     /**
      * Log some data
-     * 
+     *
      * Add a header for our class so we know who did it.
      *
      * @param int    $level   Log level, like LOG_ERR or LOG_INFO
@@ -139,7 +144,6 @@ class AccountMover extends QueueHandler
      *
      * @return void
      */
-
     protected function log($level, $message)
     {
         common_log($level, "AccountMover: " . $message);
diff --git a/lib/activity.php b/lib/activity.php
index 802d09304a..585a25de2e 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -370,11 +370,11 @@ class Activity
             $xs->element('title', null, $this->title);
 
             $xs->element('content', array('type' => 'html'), $this->content);
-            
+
             if (!empty($this->summary)) {
                 $xs->element('summary', null, $this->summary);
             }
-            
+
             if (!empty($this->link)) {
                 $xs->element('link', array('rel' => 'alternate',
                                            'type' => 'text/html'),
@@ -386,10 +386,10 @@ class Activity
         $xs->element('activity:verb', null, $this->verb);
 
         $published = self::iso8601Date($this->time);
-            
+
         $xs->element('published', null, $published);
         $xs->element('updated', null, $published);
-            
+
         if ($author) {
             $this->actor->outputTo($xs, 'author');
         }
@@ -458,7 +458,7 @@ class Activity
         }
 
         // can be either URLs or enclosure objects
-        
+
         foreach ($this->enclosures as $enclosure) {
             if (is_string($enclosure)) {
                 $xs->element('link', array('rel' => 'enclosure',
@@ -479,7 +479,7 @@ class Activity
 
         if ($source && !empty($this->source)) {
             $xs->elementStart('source');
-	    
+
             $xs->element('id', null, $this->source->id);
             $xs->element('title', null, $this->source->title);
 
@@ -488,7 +488,7 @@ class Activity
                                            'type' => 'text/html',
                                            'href' => $this->source->links['alternate']));
             }
-	    
+
             if (array_key_exists('self', $this->source->links)) {
                 $xs->element('link', array('rel' => 'self',
                                            'type' => 'application/atom+xml',
@@ -507,7 +507,7 @@ class Activity
             if (!empty($this->source->updated)) {
                 $xs->element('updated', null, $this->source->updated);
             }
-	    
+
             $xs->elementEnd('source');
         }
 
@@ -524,7 +524,7 @@ class Activity
         }
 
         // For throwing in extra elements; used for statusnet:notice_info
-	
+
         foreach ($this->extra as $el) {
             list($tag, $attrs, $content) = $el;
             $xs->element($tag, $attrs, $content);
diff --git a/lib/activitymover.php b/lib/activitymover.php
index 7032331104..495d7b4caa 100644
--- a/lib/activitymover.php
+++ b/lib/activitymover.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2010, StatusNet, Inc.
  *
  * Title of module
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -44,14 +44,13 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class ActivityMover extends QueueHandler
 {
     function transport()
     {
         return 'actmove';
     }
-    
+
     function handle($data)
     {
         list ($act, $sink, $userURI, $remoteURI) = $data;
@@ -82,7 +81,7 @@ class ActivityMover extends QueueHandler
     function moveActivity($act, $sink, $user, $remote)
     {
         if (empty($user)) {
-            throw new Exception("No such user {$act->actor->id}");
+            throw new Exception(sprintf(_("No such user %s."),$act->actor->id));
         }
 
         switch ($act->verb) {
@@ -152,7 +151,7 @@ class ActivityMover extends QueueHandler
 
     /**
      * Log some data
-     * 
+     *
      * Add a header for our class so we know who did it.
      *
      * @param int    $level   Log level, like LOG_ERR or LOG_INFO
@@ -160,7 +159,6 @@ class ActivityMover extends QueueHandler
      *
      * @return void
      */
-
     protected function log($level, $message)
     {
         common_log($level, "ActivityMover: " . $message);
diff --git a/lib/activitysink.php b/lib/activitysink.php
index fbe1f1e7ff..ec12ffb6c2 100644
--- a/lib/activitysink.php
+++ b/lib/activitysink.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2010, StatusNet, Inc.
  *
  * A remote, atompub-receiving service
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -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 ActivitySink
 {
     protected $svcDocUrl   = null;
@@ -104,6 +103,7 @@ class ActivitySink
                     break;
                 }
             }
+
             if (!$takesEntries) {
                 continue;
             }
@@ -158,12 +158,18 @@ class ActivitySink
         if ($status >= 200 && $status < 300) {
             return true;
         } else if ($status >= 400 && $status < 500) {
-            throw new ClientException("{$url} {$status} {$reason}");
+            // 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.
+            throw new ClientException(sprintf(_m('URLSTATUSREASON','%1$s %2$s %3$s'), $url, $status, $reason));
         } else if ($status >= 500 && $status < 600) {
-            throw new ServerException("{$url} {$status} {$reason}");
+            // TRANS: Server exception thrown when post to collection fails with a 500 status.
+            // TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
+            throw new ServerException(sprintf(_m('URLSTATUSREASON','%1$s %2$s %3$s'), $url, $status, $reason));
         } else {
             // That's unexpected.
-            throw new Exception("{$url} {$status} {$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.
+            throw new Exception(sprintf(_m('URLSTATUSREASON','%1$s %2$s %3$s'), $url, $status, $reason));
         }
     }
 }
diff --git a/lib/discovery.php b/lib/discovery.php
index d67ec94f00..70638cf243 100644
--- a/lib/discovery.php
+++ b/lib/discovery.php
@@ -45,7 +45,6 @@ if (!defined('STATUSNET')) {
  *
  * @see       http://groups.google.com/group/webfinger/browse_thread/thread/9f3d93a479e91bbf
  */
-
 class Discovery
 {
     const LRDD_REL    = 'lrdd';
@@ -72,12 +71,11 @@ class Discovery
 
     /**
      * Register a discovery class
-     * 
+     *
      * @param string $class Class name
      *
      * @return void
      */
-
     public function registerMethod($class)
     {
         $this->methods[] = $class;
@@ -91,7 +89,6 @@ class Discovery
      *
      * @return string normalized acct: or http(s)?: URI
      */
-
     public static function normalize($user_id)
     {
         if (substr($user_id, 0, 5) == 'http:' ||
@@ -116,7 +113,6 @@ class Discovery
      *
      * @return boolean true if $user_id is a Webfinger, else false
      */
-     
     public static function isWebfinger($user_id)
     {
         $uri = Discovery::normalize($user_id);
@@ -131,7 +127,6 @@ class Discovery
      *
      * @return XRD XRD object for the user
      */
-
     public function lookup($id)
     {
         // Normalize the incoming $id to make sure we have a uri
@@ -154,7 +149,7 @@ class Discovery
             }
         }
 
-        // TRANS: Exception.
+        // TRANS: Exception. %s is an ID.
         throw new Exception(sprintf(_('Unable to find services for %s.'), $id));
     }
 
@@ -166,7 +161,6 @@ class Discovery
      *
      * @return array $link assoc array representing the link
      */
-
     public static function getService($links, $service)
     {
         if (!is_array($links)) {
@@ -190,7 +184,6 @@ class Discovery
      *
      * @return string replaced values
      */
-
     public static function applyTemplate($template, $id)
     {
         $template = str_replace('{uri}', urlencode($id), $template);
@@ -202,10 +195,9 @@ class Discovery
      * Fetch an XRD file and parse
      *
      * @param string $url URL of the XRD
-     * 
+     *
      * @return XRD object representing the XRD file
      */
-
     public static function fetchXrd($url)
     {
         try {
@@ -236,7 +228,6 @@ class Discovery
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 interface Discovery_LRDD
 {
     /**
@@ -246,7 +237,6 @@ interface Discovery_LRDD
      *
      * @return array Links in the XRD file
      */
-
     public function discover($uri);
 }
 
@@ -263,7 +253,6 @@ interface Discovery_LRDD
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class Discovery_LRDD_Host_Meta implements Discovery_LRDD
 {
     /**
@@ -276,7 +265,6 @@ class Discovery_LRDD_Host_Meta implements Discovery_LRDD
      *
      * @return array Links in the XRD file
      */
-
     public function discover($uri)
     {
         if (Discovery::isWebfinger($uri)) {
@@ -313,7 +301,6 @@ class Discovery_LRDD_Host_Meta implements Discovery_LRDD
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class Discovery_LRDD_Link_Header implements Discovery_LRDD
 {
     /**
@@ -325,9 +312,8 @@ class Discovery_LRDD_Link_Header implements Discovery_LRDD
      *
      * @return array Links in the XRD file
      *
-     * @todo fail out of Webfinger URIs faster 
+     * @todo fail out of Webfinger URIs faster
      */
-
     public function discover($uri)
     {
         try {
@@ -353,10 +339,9 @@ class Discovery_LRDD_Link_Header implements Discovery_LRDD
      * Given a string or array of headers, returns XRD-like assoc array
      *
      * @param string|array $header string or array of strings for headers
-     * 
+     *
      * @return array Link header in XRD-like format
      */
-
     protected static function parseHeader($header)
     {
         $lh = new LinkHeader($header);
@@ -380,7 +365,6 @@ class Discovery_LRDD_Link_Header implements Discovery_LRDD
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class Discovery_LRDD_Link_HTML implements Discovery_LRDD
 {
     /**
@@ -393,9 +377,8 @@ class Discovery_LRDD_Link_HTML implements Discovery_LRDD
      *
      * @return array Links in XRD-ish assoc array
      *
-     * @todo fail out of Webfinger URIs faster 
+     * @todo fail out of Webfinger URIs faster
      */
-
     public function discover($uri)
     {
         try {
@@ -421,7 +404,6 @@ class Discovery_LRDD_Link_HTML implements Discovery_LRDD
      *
      * @return array array of associative arrays in XRD-ish format
      */
-
     public function parse($html)
     {
         $links = array();
diff --git a/lib/imagefile.php b/lib/imagefile.php
index 56a7b7d4a2..0e06720247 100644
--- a/lib/imagefile.php
+++ b/lib/imagefile.php
@@ -69,6 +69,7 @@ class ImageFile
             ($info[2] == IMAGETYPE_XBM && function_exists('imagecreatefromxbm')) ||
             ($info[2] == IMAGETYPE_PNG && function_exists('imagecreatefrompng')))) {
 
+            // TRANS: Exception thrown when trying to upload an unsupported image file format.
             throw new Exception(_('Unsupported image file format.'));
             return;
         }
@@ -92,6 +93,7 @@ class ImageFile
             return;
          case UPLOAD_ERR_PARTIAL:
             @unlink($_FILES[$param]['tmp_name']);
+            // TRANS: Exception thrown when uploading an image and that action could not be completed.
             throw new Exception(_('Partial upload.'));
             return;
          case UPLOAD_ERR_NO_FILE:
@@ -100,6 +102,7 @@ class ImageFile
          default:
             common_log(LOG_ERR, __METHOD__ . ": Unknown upload error " .
                 $_FILES[$param]['error']);
+            // TRANS: Exception thrown when uploading an image fails for an unknown reason.
             throw new Exception(_('System error uploading file.'));
             return;
         }
@@ -108,6 +111,7 @@ class ImageFile
 
         if (!$info) {
             @unlink($_FILES[$param]['tmp_name']);
+            // TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
             throw new Exception(_('Not an image or corrupt file.'));
             return;
         }
@@ -170,6 +174,7 @@ class ImageFile
         $targetType = $this->preferredType();
 
         if (!file_exists($this->filepath)) {
+            // TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
             throw new Exception(_('Lost our file.'));
             return;
         }
@@ -207,6 +212,7 @@ class ImageFile
             $image_src = imagecreatefromxbm($this->filepath);
             break;
          default:
+            // TRANS: Exception thrown when trying to resize an unknown file type.
             throw new Exception(_('Unknown file type'));
             return;
         }
@@ -247,6 +253,7 @@ class ImageFile
             imagepng($image_dest, $outpath);
             break;
          default:
+            // TRANS: Exception thrown when trying resize an unknown file type.
             throw new Exception(_('Unknown file type'));
             return;
         }
diff --git a/lib/linkheader.php b/lib/linkheader.php
index a08fb67116..dd8f88c29b 100644
--- a/lib/linkheader.php
+++ b/lib/linkheader.php
@@ -47,7 +47,6 @@ if (!defined('STATUSNET')) {
  *
  * @see       Discovery
  */
-
 class LinkHeader
 {
     var $href;
@@ -61,7 +60,6 @@ class LinkHeader
      *
      * @return LinkHeader self
      */
-
     function __construct($str)
     {
         preg_match('/^<[^>]+>/', $str, $uri_reference);
@@ -78,7 +76,7 @@ class LinkHeader
         $params = explode(';', $str);
 
         foreach ($params as $param) {
-            if (empty($param)) { 
+            if (empty($param)) {
                 continue;
             }
             list($param_name, $param_value) = explode('=', $param, 2);
@@ -108,7 +106,6 @@ class LinkHeader
      *
      * @return LinkHeader discovered header, or null on failure
      */
-
     static function getLink($response, $rel=null, $type=null)
     {
         $headers = $response->getHeader('Link');
diff --git a/lib/logingroupnav.php b/lib/logingroupnav.php
index 0fd0f45c7d..a309e7320f 100644
--- a/lib/logingroupnav.php
+++ b/lib/logingroupnav.php
@@ -44,7 +44,6 @@ require_once INSTALLDIR.'/lib/widget.php';
  *
  * @see      Widget
  */
-
 class LoginGroupNav extends Widget
 {
     var $action = null;
@@ -54,7 +53,6 @@ class LoginGroupNav extends Widget
      *
      * @param Action $action current action, used for output
      */
-
     function __construct($action=null)
     {
         parent::__construct($action);
@@ -66,7 +64,6 @@ class LoginGroupNav extends Widget
      *
      * @return void
      */
-
     function show()
     {
         $action_name = $this->action->trimmed('action');
@@ -76,13 +73,17 @@ class LoginGroupNav extends Widget
         if (Event::handle('StartLoginGroupNav', array($this->action))) {
 
             $this->action->menuItem(common_local_url('login'),
-                                    _('Login'),
+                                    // TRANS: Menu item for logging in to the StatusNet site.
+                                    _m('MENU','Login'),
+                                    // TRANS: Title for menu item for logging in to the StatusNet site.
                                     _('Login with a username and password'),
                                     $action_name === 'login');
 
             if (!(common_config('site','closed') || common_config('site','inviteonly'))) {
                 $this->action->menuItem(common_local_url('register'),
-                                        _('Register'),
+                                        // TRANS: Menu item for registering with the StatusNet site.
+                                        _m('MENU','Register'),
+                                        // TRANS: Title for menu item for registering with the StatusNet site.
                                         _('Sign up for a new account'),
                                         $action_name === 'register');
             }
diff --git a/lib/mail.php b/lib/mail.php
index 9b6b7d6988..78361a3a38 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -44,7 +44,6 @@ require_once 'Mail.php';
  *
  * @return Mail backend
  */
-
 function mail_backend()
 {
     static $backend = null;
@@ -70,7 +69,6 @@ function mail_backend()
  *
  * @return boolean success flag
  */
-
 function mail_send($recipients, $headers, $body)
 {
     // XXX: use Mail_Queue... maybe
@@ -94,7 +92,6 @@ function mail_send($recipients, $headers, $body)
  *
  * @return string mail domain, suitable for making email addresses.
  */
-
 function mail_domain()
 {
     $maildomain = common_config('mail', 'domain');
@@ -112,7 +109,6 @@ function mail_domain()
  *
  * @return string notify from address
  */
-
 function mail_notify_from()
 {
     $notifyfrom = common_config('mail', 'notifyfrom');
@@ -138,7 +134,6 @@ function mail_notify_from()
  *
  * @return boolean success flag
  */
-
 function mail_to_user(&$user, $subject, $body, $headers=array(), $address=null)
 {
     if (!$address) {
@@ -167,7 +162,6 @@ function mail_to_user(&$user, $subject, $body, $headers=array(), $address=null)
  *
  * @return success flag
  */
-
 function mail_confirm_address($user, $code, $nickname, $address)
 {
     // TRANS: Subject for address confirmation email.
@@ -202,7 +196,6 @@ function mail_confirm_address($user, $code, $nickname, $address)
  *
  * @return void
  */
-
 function mail_subscribe_notify($listenee, $listener)
 {
     $other = $listener->getProfile();
@@ -220,7 +213,6 @@ function mail_subscribe_notify($listenee, $listener)
  *
  * @return void
  */
-
 function mail_subscribe_notify_profile($listenee, $other)
 {
     if ($other->hasRight(Right::EMAILONSUBSCRIBE) &&
@@ -490,7 +482,7 @@ function mail_notify_nudge($from, $to)
     common_switch_locale($to->language);
     // TRANS: Subject for 'nudge' notification email.
     // TRANS: %s is the nudging user.
-    $subject = sprintf(_('You\'ve been nudged by %s'), $from->nickname);
+    $subject = sprintf(_('You have been nudged by %s'), $from->nickname);
 
     $from_profile = $from->getProfile();
 
diff --git a/lib/profileaction.php b/lib/profileaction.php
index 5e4e0f52a0..f777edd319 100644
--- a/lib/profileaction.php
+++ b/lib/profileaction.php
@@ -46,7 +46,6 @@ require_once INSTALLDIR.'/lib/groupminilist.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 ProfileAction extends OwnerDesignAction
 {
     var $page    = null;
@@ -74,6 +73,7 @@ class ProfileAction extends OwnerDesignAction
         $this->user = User::staticGet('nickname', $nickname);
 
         if (!$this->user) {
+            // TRANS: Client error displayed when calling a profile action without specifying a user.
             $this->clientError(_('No such user.'), 404);
             return false;
         }
@@ -81,6 +81,7 @@ class ProfileAction extends OwnerDesignAction
         $this->profile = $this->user->getProfile();
 
         if (!$this->profile) {
+            // TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
             $this->serverError(_('User has no profile.'));
             return false;
         }
@@ -122,6 +123,7 @@ class ProfileAction extends OwnerDesignAction
                                          'class' => 'section'));
         if (Event::handle('StartShowSubscriptionsMiniList', array($this))) {
             $this->elementStart('h2');
+            // TRANS: H2 text for user subscription statistics.
             $this->statsSectionLink('subscriptions', _('Subscriptions'));
             $this->elementEnd('h2');
 
@@ -131,12 +133,14 @@ class ProfileAction extends OwnerDesignAction
                 $pml = new ProfileMiniList($profile, $this);
                 $cnt = $pml->show();
                 if ($cnt == 0) {
+                    // TRANS: Text for user subscription statistics if the user has no subscriptions.
                     $this->element('p', null, _('(None)'));
                 }
             }
 
             if ($cnt > PROFILES_PER_MINILIST) {
                 $this->elementStart('p');
+                // TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
                 $this->statsSectionLink('subscriptions', _('All subscriptions'), 'more');
                 $this->elementEnd('p');
             }
@@ -156,6 +160,7 @@ class ProfileAction extends OwnerDesignAction
         if (Event::handle('StartShowSubscribersMiniList', array($this))) {
 
             $this->elementStart('h2');
+            // TRANS: H2 text for user subscriber statistics.
             $this->statsSectionLink('subscribers', _('Subscribers'));
             $this->elementEnd('h2');
 
@@ -165,12 +170,14 @@ class ProfileAction extends OwnerDesignAction
                 $sml = new SubscribersMiniList($profile, $this);
                 $cnt = $sml->show();
                 if ($cnt == 0) {
+                    // TRANS: Text for user subscriber statistics if user has no subscribers.
                     $this->element('p', null, _('(None)'));
                 }
             }
 
             if ($cnt > PROFILES_PER_MINILIST) {
                 $this->elementStart('p');
+                // TRANS: Text for user subscription statistics if user has more subscribers than displayed.
                 $this->statsSectionLink('subscribers', _('All subscribers'), 'more');
                 $this->elementEnd('p');
             }
@@ -194,6 +201,7 @@ class ProfileAction extends OwnerDesignAction
         $this->elementStart('div', array('id' => 'entity_statistics',
                                          'class' => 'section'));
 
+        // TRANS: H2 text for user statistics.
         $this->element('h2', null, _('Statistics'));
 
         $profile = $this->profile;
@@ -201,40 +209,47 @@ class ProfileAction extends OwnerDesignAction
         $stats = array(
             array(
                 'id' => 'user-id',
+                // TRANS: Label for user statistics.
                 'label' => _('User ID'),
                 'value' => $profile->id,
             ),
             array(
                 'id' => 'member-since',
+                // TRANS: Label for user statistics.
                 'label' => _('Member since'),
                 'value' => date('j M Y', strtotime($profile->created))
             ),
             array(
                 'id' => 'subscriptions',
+                // TRANS: Label for user statistics.
                 'label' => _('Subscriptions'),
                 'link' => common_local_url('subscriptions', $actionParams),
                 'value' => $profile->subscriptionCount(),
             ),
             array(
                 'id' => 'subscribers',
+                // TRANS: Label for user statistics.
                 'label' => _('Subscribers'),
                 'link' => common_local_url('subscribers', $actionParams),
                 'value' => $profile->subscriberCount(),
             ),
             array(
                 'id' => 'groups',
+                // TRANS: Label for user statistics.
                 'label' => _('Groups'),
                 'link' => common_local_url('usergroups', $actionParams),
                 'value' => $profile->getGroups()->N,
             ),
             array(
                 'id' => 'notices',
+                // TRANS: Label for user statistics.
                 'label' => _('Notices'),
                 'value' => $notice_count,
             ),
             array(
                 'id' => 'daily_notices',
-                // TRANS: Average count of posts made per day since account registration
+                // TRANS: Label for user statistics.
+                // TRANS: Average count of posts made per day since account registration.
                 'label' => _('Daily average'),
                 'value' => $daily_count
             )
@@ -271,6 +286,7 @@ class ProfileAction extends OwnerDesignAction
                                          'class' => 'section'));
         if (Event::handle('StartShowGroupsMiniList', array($this))) {
             $this->elementStart('h2');
+            // TRANS: H2 text for user group membership statistics.
             $this->statsSectionLink('usergroups', _('Groups'));
             $this->elementEnd('h2');
 
@@ -278,12 +294,14 @@ class ProfileAction extends OwnerDesignAction
                 $gml = new GroupMiniList($groups, $this->profile, $this);
                 $cnt = $gml->show();
                 if ($cnt == 0) {
+                    // TRANS: Text for user user group membership statistics if user is not a member of any group.
                     $this->element('p', null, _('(None)'));
                 }
             }
 
             if ($cnt > GROUPS_PER_MINILIST) {
                 $this->elementStart('p');
+                // TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
                 $this->statsSectionLink('usergroups', _('All groups'), 'more');
                 $this->elementEnd('p');
             }
@@ -313,4 +331,3 @@ class SubscribersMiniListItem extends ProfileMiniListItem
         return $aAttrs;
     }
 }
-
diff --git a/lib/useractivitystream.php b/lib/useractivitystream.php
index 7d9b02ded8..53d0107aa9 100644
--- a/lib/useractivitystream.php
+++ b/lib/useractivitystream.php
@@ -25,7 +25,6 @@
  * We extend atomusernoticefeed since it does some nice setup for us.
  *
  */
-
 class UserActivityStream extends AtomUserNoticeFeed
 {
     public $activities = array();
@@ -50,7 +49,7 @@ class UserActivityStream extends AtomUserNoticeFeed
             $this->activities[] = $obj->asActivity();
         }
     }
-    
+
     function renderEntries()
     {
         foreach ($this->activities as $act) {
diff --git a/lib/userprofile.php b/lib/userprofile.php
index 91c5fb413a..8bd68ae3d7 100644
--- a/lib/userprofile.php
+++ b/lib/userprofile.php
@@ -48,7 +48,6 @@ require_once INSTALLDIR.'/lib/widget.php';
  *
  * @see      HTMLOutputter
  */
-
 class UserProfile extends Widget
 {
     var $user = null;
@@ -73,6 +72,7 @@ class UserProfile extends Widget
 
             $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))) {
@@ -104,6 +104,7 @@ class UserProfile extends Widget
             }
 
             $this->out->elementStart('dl', 'entity_depiction');
+            // TRANS: DT element in area for user avatar.
             $this->out->element('dt', null, _('Photo'));
             $this->out->elementStart('dd');
             $this->out->element('img', array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE),
@@ -116,6 +117,7 @@ class UserProfile extends Widget
             $cur = common_current_user();
             if ($cur && $cur->id == $this->profile->id) {
                 $this->out->elementStart('dd');
+                // TRANS: Link text for changeing the avatar of the logged in user.
                 $this->out->element('a', array('href' => common_local_url('avatarsettings')), _('Edit Avatar'));
                 $this->out->elementEnd('dd');
             }
@@ -131,6 +133,7 @@ class UserProfile extends Widget
         if (Event::handle('StartProfilePageNickname', array($this->out, $this->profile))) {
 
             $this->out->elementStart('dl', 'entity_nickname');
+            // TRANS: DT for nick name in a profile.
             $this->out->element('dt', null, _('Nickname'));
             $this->out->elementStart('dd');
             $hasFN = ($this->profile->fullname) ? 'nickname url uid' : 'fn nickname url uid';
@@ -149,6 +152,7 @@ class UserProfile extends Widget
         if (Event::handle('StartProfilePageFullName', array($this->out, $this->profile))) {
             if ($this->profile->fullname) {
                 $this->out->elementStart('dl', 'entity_fn');
+                // TRANS: DT for full name in a profile.
                 $this->out->element('dt', null, _('Full name'));
                 $this->out->elementStart('dd');
                 $this->out->element('span', 'fn', $this->profile->fullname);
@@ -164,6 +168,7 @@ class UserProfile extends Widget
         if (Event::handle('StartProfilePageLocation', array($this->out, $this->profile))) {
             if ($this->profile->location) {
                 $this->out->elementStart('dl', 'entity_location');
+                // TRANS: DT for location in a profile.
                 $this->out->element('dt', null, _('Location'));
                 $this->out->element('dd', 'label', $this->profile->location);
                 $this->out->elementEnd('dl');
@@ -177,6 +182,7 @@ class UserProfile extends Widget
         if (Event::handle('StartProfilePageHomepage', array($this->out, $this->profile))) {
             if ($this->profile->homepage) {
                 $this->out->elementStart('dl', 'entity_url');
+                // TRANS: DT for URL in a profile.
                 $this->out->element('dt', null, _('URL'));
                 $this->out->elementStart('dd');
                 $this->out->element('a', array('href' => $this->profile->homepage,
@@ -194,6 +200,7 @@ class UserProfile extends Widget
         if (Event::handle('StartProfilePageBio', array($this->out, $this->profile))) {
             if ($this->profile->bio) {
                 $this->out->elementStart('dl', 'entity_note');
+                // TRANS: DT for note in a profile.
                 $this->out->element('dt', null, _('Note'));
                 $this->out->element('dd', 'note', $this->profile->bio);
                 $this->out->elementEnd('dl');
@@ -209,6 +216,7 @@ class UserProfile extends Widget
 
             if (count($tags) > 0) {
                 $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');
@@ -233,9 +241,11 @@ class UserProfile extends Widget
     {
         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');
@@ -247,6 +257,7 @@ class UserProfile extends Widget
             $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');
 
@@ -262,7 +273,9 @@ class UserProfile extends Widget
                     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
@@ -286,7 +299,9 @@ class UserProfile extends Widget
 
                             $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');
 
@@ -328,6 +343,7 @@ class UserProfile extends Widget
                             $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)) {
@@ -363,12 +379,15 @@ class UserProfile extends Widget
                             $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');
@@ -408,6 +427,7 @@ class UserProfile extends Widget
                                 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'));
     }
 }
diff --git a/lib/xrd.php b/lib/xrd.php
index 40372b9d7a..43cb2ec73c 100644
--- a/lib/xrd.php
+++ b/lib/xrd.php
@@ -26,7 +26,6 @@
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class XRD
 {
     const XML_NS = 'http://www.w3.org/2000/xmlns/';
@@ -61,12 +60,12 @@ class XRD
 
         if (!$ok) {
             // TRANS: Exception.
-            throw new Exception(_m('Invalid XML.'));
+            throw new Exception(_('Invalid XML.'));
         }
         $xrd_element = $dom->getElementsByTagName('XRD')->item(0);
         if (!$xrd_element) {
             // TRANS: Exception.
-            throw new Exception(_m('Invalid XML, missing XRD root.'));
+            throw new Exception(_('Invalid XML, missing XRD root.'));
         }
 
         // Check for host-meta host
diff --git a/lib/xrdaction.php b/lib/xrdaction.php
index b59e0f78a4..a0e7a1c415 100644
--- a/lib/xrdaction.php
+++ b/lib/xrdaction.php
@@ -31,7 +31,7 @@ class XrdAction extends Action
     const PROFILEPAGE = 'http://webfinger.net/rel/profile-page';
     const UPDATESFROM = 'http://schemas.google.com/g/2010#updates-from';
     const HCARD = 'http://microformats.org/profile/hcard';
-    
+
     public $uri;
 
     public $user;
@@ -54,39 +54,39 @@ class XrdAction extends Action
         }
 
         if (Event::handle('StartXrdActionAliases', array(&$xrd, $this->user))) {
-	    
+
             // Possible aliases for the user
-	    
+
             $uris = array($this->user->uri, $profile->profileurl);
-	    
+
             // FIXME: Webfinger generation code should live somewhere on its own
-	    
+
             $path = common_config('site', 'path');
-	    
+
             if (empty($path)) {
                 $uris[] = sprintf('acct:%s@%s', $nick, common_config('site', 'server'));
             }
-	    
+
             foreach ($uris as $uri) {
                 if ($uri != $xrd->subject) {
                     $xrd->alias[] = $uri;
                 }
             }
-	    
+
             Event::handle('EndXrdActionAliases', array(&$xrd, $this->user));
         }
 
         if (Event::handle('StartXrdActionLinks', array(&$xrd, $this->user))) {
-	    
+
             $xrd->links[] = array('rel' => self::PROFILEPAGE,
                                   'type' => 'text/html',
                                   'href' => $profile->profileurl);
-	    
+
             // hCard
             $xrd->links[] = array('rel' => self::HCARD,
                                   'type' => 'text/html',
                                   'href' => common_local_url('hcard', array('nickname' => $nick)));
-	    
+
             // XFN
             $xrd->links[] = array('rel' => 'http://gmpg.org/xfn/11',
                                   'type' => 'text/html',
@@ -96,7 +96,7 @@ class XrdAction extends Action
                                   'type' => 'application/rdf+xml',
                                   'href' => common_local_url('foaf',
                                                              array('nickname' => $nick)));
-	    
+
             $xrd->links[] = array('rel' => 'http://apinamespace.org/atom',
                                   'type' => 'application/atomsvc+xml',
                                   'href' => common_local_url('ApiAtomService', array('id' => $nick)),
@@ -108,7 +108,7 @@ class XrdAction extends Action
             } else {
                 $apiRoot = common_path('index.php/api/', true);
             }
-            
+
             $xrd->links[] = array('rel' => 'http://apinamespace.org/twitter',
                                   'href' => $apiRoot,
                                   'property' => array(array('type' => 'http://apinamespace.org/twitter/username',
@@ -120,12 +120,12 @@ class XrdAction extends Action
         header('Content-type: application/xrd+xml');
         print $xrd->toXML();
     }
-    
+
     /**
      * Given a "user id" make sure it's normalized to either a webfinger
      * acct: uri or a profile HTTP URL.
      */
-    
+
     public static function normalize($user_id)
     {
         if (substr($user_id, 0, 5) == 'http:' ||

From e6e402cefde00b54f9c59259b23616ad7eef1a44 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sat, 29 Jan 2011 23:10:15 +0100
Subject: [PATCH 141/314] Localisation updates from http://translatewiki.net.

---
 locale/ar/LC_MESSAGES/statusnet.po            | 398 ++++++-----
 locale/arz/LC_MESSAGES/statusnet.po           | 388 +++++++----
 locale/bg/LC_MESSAGES/statusnet.po            | 399 ++++++-----
 locale/br/LC_MESSAGES/statusnet.po            | 556 ++++++++-------
 locale/ca/LC_MESSAGES/statusnet.po            | 593 ++++++++--------
 locale/cs/LC_MESSAGES/statusnet.po            | 401 ++++++-----
 locale/de/LC_MESSAGES/statusnet.po            | 451 ++++++------
 locale/en_GB/LC_MESSAGES/statusnet.po         | 399 ++++++-----
 locale/eo/LC_MESSAGES/statusnet.po            | 403 ++++++-----
 locale/es/LC_MESSAGES/statusnet.po            | 404 ++++++-----
 locale/fa/LC_MESSAGES/statusnet.po            | 401 ++++++-----
 locale/fi/LC_MESSAGES/statusnet.po            | 406 ++++++-----
 locale/fr/LC_MESSAGES/statusnet.po            | 403 ++++++-----
 locale/gl/LC_MESSAGES/statusnet.po            | 406 ++++++-----
 locale/hsb/LC_MESSAGES/statusnet.po           | 455 ++++++------
 locale/hu/LC_MESSAGES/statusnet.po            | 397 ++++++-----
 locale/ia/LC_MESSAGES/statusnet.po            | 440 +++++++-----
 locale/is/LC_MESSAGES/statusnet.po            | 399 ++++++-----
 locale/it/LC_MESSAGES/statusnet.po            | 403 ++++++-----
 locale/ja/LC_MESSAGES/statusnet.po            | 403 ++++++-----
 locale/ka/LC_MESSAGES/statusnet.po            | 406 ++++++-----
 locale/ko/LC_MESSAGES/statusnet.po            | 401 ++++++-----
 locale/mk/LC_MESSAGES/statusnet.po            | 444 +++++++-----
 locale/ml/LC_MESSAGES/statusnet.po            | 476 +++++++------
 locale/nb/LC_MESSAGES/statusnet.po            | 402 ++++++-----
 locale/nl/LC_MESSAGES/statusnet.po            | 439 +++++++-----
 locale/nn/LC_MESSAGES/statusnet.po            | 401 ++++++-----
 locale/pl/LC_MESSAGES/statusnet.po            | 449 ++++++------
 locale/pt/LC_MESSAGES/statusnet.po            | 402 ++++++-----
 locale/pt_BR/LC_MESSAGES/statusnet.po         | 402 ++++++-----
 locale/ru/LC_MESSAGES/statusnet.po            | 457 ++++++------
 locale/statusnet.pot                          | 361 ++++++----
 locale/sv/LC_MESSAGES/statusnet.po            | 403 ++++++-----
 locale/te/LC_MESSAGES/statusnet.po            | 423 +++++++-----
 locale/tr/LC_MESSAGES/statusnet.po            | 406 ++++++-----
 locale/uk/LC_MESSAGES/statusnet.po            | 492 +++++++------
 locale/zh_CN/LC_MESSAGES/statusnet.po         | 648 +++++++++---------
 plugins/APC/locale/APC.pot                    |   2 +-
 .../APC/locale/be-tarask/LC_MESSAGES/APC.po   |  10 +-
 plugins/APC/locale/br/LC_MESSAGES/APC.po      |  10 +-
 plugins/APC/locale/es/LC_MESSAGES/APC.po      |  10 +-
 plugins/APC/locale/fr/LC_MESSAGES/APC.po      |  10 +-
 plugins/APC/locale/gl/LC_MESSAGES/APC.po      |  10 +-
 plugins/APC/locale/he/LC_MESSAGES/APC.po      |  10 +-
 plugins/APC/locale/ia/LC_MESSAGES/APC.po      |  10 +-
 plugins/APC/locale/id/LC_MESSAGES/APC.po      |  10 +-
 plugins/APC/locale/mk/LC_MESSAGES/APC.po      |  10 +-
 plugins/APC/locale/nb/LC_MESSAGES/APC.po      |  10 +-
 plugins/APC/locale/nl/LC_MESSAGES/APC.po      |  10 +-
 plugins/APC/locale/pl/LC_MESSAGES/APC.po      |  10 +-
 plugins/APC/locale/pt/LC_MESSAGES/APC.po      |  10 +-
 plugins/APC/locale/pt_BR/LC_MESSAGES/APC.po   |  10 +-
 plugins/APC/locale/ru/LC_MESSAGES/APC.po      |  10 +-
 plugins/APC/locale/tl/LC_MESSAGES/APC.po      |  10 +-
 plugins/APC/locale/uk/LC_MESSAGES/APC.po      |  10 +-
 plugins/APC/locale/zh_CN/LC_MESSAGES/APC.po   |  10 +-
 plugins/Adsense/locale/Adsense.pot            |   2 +-
 .../locale/be-tarask/LC_MESSAGES/Adsense.po   |  10 +-
 .../Adsense/locale/br/LC_MESSAGES/Adsense.po  |  10 +-
 .../Adsense/locale/de/LC_MESSAGES/Adsense.po  |  13 +-
 .../Adsense/locale/es/LC_MESSAGES/Adsense.po  |  10 +-
 .../Adsense/locale/fr/LC_MESSAGES/Adsense.po  |  10 +-
 .../Adsense/locale/gl/LC_MESSAGES/Adsense.po  |  10 +-
 .../Adsense/locale/ia/LC_MESSAGES/Adsense.po  |  10 +-
 .../Adsense/locale/it/LC_MESSAGES/Adsense.po  |  10 +-
 .../Adsense/locale/ka/LC_MESSAGES/Adsense.po  |  10 +-
 .../Adsense/locale/mk/LC_MESSAGES/Adsense.po  |  10 +-
 .../Adsense/locale/nl/LC_MESSAGES/Adsense.po  |  10 +-
 .../Adsense/locale/pt/LC_MESSAGES/Adsense.po  |  10 +-
 .../locale/pt_BR/LC_MESSAGES/Adsense.po       |  10 +-
 .../Adsense/locale/ru/LC_MESSAGES/Adsense.po  |  10 +-
 .../Adsense/locale/sv/LC_MESSAGES/Adsense.po  |  10 +-
 .../Adsense/locale/tl/LC_MESSAGES/Adsense.po  |  10 +-
 .../Adsense/locale/uk/LC_MESSAGES/Adsense.po  |  10 +-
 .../locale/zh_CN/LC_MESSAGES/Adsense.po       |  10 +-
 .../AnonymousFave/locale/AnonymousFave.pot    |   2 +-
 .../be-tarask/LC_MESSAGES/AnonymousFave.po    |  10 +-
 .../locale/br/LC_MESSAGES/AnonymousFave.po    |  10 +-
 .../locale/de/LC_MESSAGES/AnonymousFave.po    |  10 +-
 .../locale/es/LC_MESSAGES/AnonymousFave.po    |  10 +-
 .../locale/fr/LC_MESSAGES/AnonymousFave.po    |  10 +-
 .../locale/gl/LC_MESSAGES/AnonymousFave.po    |  10 +-
 .../locale/ia/LC_MESSAGES/AnonymousFave.po    |  10 +-
 .../locale/mk/LC_MESSAGES/AnonymousFave.po    |  10 +-
 .../locale/nl/LC_MESSAGES/AnonymousFave.po    |  10 +-
 .../locale/pt/LC_MESSAGES/AnonymousFave.po    |  10 +-
 .../locale/ru/LC_MESSAGES/AnonymousFave.po    |  10 +-
 .../locale/tl/LC_MESSAGES/AnonymousFave.po    |  10 +-
 .../locale/uk/LC_MESSAGES/AnonymousFave.po    |  10 +-
 plugins/AutoSandbox/locale/AutoSandbox.pot    |   2 +-
 .../be-tarask/LC_MESSAGES/AutoSandbox.po      |  10 +-
 .../locale/br/LC_MESSAGES/AutoSandbox.po      |  10 +-
 .../locale/de/LC_MESSAGES/AutoSandbox.po      |  10 +-
 .../locale/es/LC_MESSAGES/AutoSandbox.po      |  10 +-
 .../locale/fr/LC_MESSAGES/AutoSandbox.po      |  10 +-
 .../locale/ia/LC_MESSAGES/AutoSandbox.po      |  10 +-
 .../locale/mk/LC_MESSAGES/AutoSandbox.po      |  10 +-
 .../locale/nl/LC_MESSAGES/AutoSandbox.po      |  10 +-
 .../locale/ru/LC_MESSAGES/AutoSandbox.po      |  10 +-
 .../locale/tl/LC_MESSAGES/AutoSandbox.po      |  10 +-
 .../locale/uk/LC_MESSAGES/AutoSandbox.po      |  10 +-
 .../locale/zh_CN/LC_MESSAGES/AutoSandbox.po   |  10 +-
 plugins/Autocomplete/locale/Autocomplete.pot  |   2 +-
 .../be-tarask/LC_MESSAGES/Autocomplete.po     |  10 +-
 .../locale/br/LC_MESSAGES/Autocomplete.po     |  10 +-
 .../locale/de/LC_MESSAGES/Autocomplete.po     |  10 +-
 .../locale/es/LC_MESSAGES/Autocomplete.po     |  10 +-
 .../locale/fr/LC_MESSAGES/Autocomplete.po     |  10 +-
 .../locale/he/LC_MESSAGES/Autocomplete.po     |  10 +-
 .../locale/ia/LC_MESSAGES/Autocomplete.po     |  10 +-
 .../locale/id/LC_MESSAGES/Autocomplete.po     |  10 +-
 .../locale/ja/LC_MESSAGES/Autocomplete.po     |  10 +-
 .../locale/mk/LC_MESSAGES/Autocomplete.po     |  10 +-
 .../locale/nl/LC_MESSAGES/Autocomplete.po     |  10 +-
 .../locale/pt/LC_MESSAGES/Autocomplete.po     |  10 +-
 .../locale/pt_BR/LC_MESSAGES/Autocomplete.po  |  10 +-
 .../locale/ru/LC_MESSAGES/Autocomplete.po     |  10 +-
 .../locale/tl/LC_MESSAGES/Autocomplete.po     |  10 +-
 .../locale/uk/LC_MESSAGES/Autocomplete.po     |  10 +-
 .../locale/zh_CN/LC_MESSAGES/Autocomplete.po  |  10 +-
 plugins/Awesomeness/locale/Awesomeness.pot    |   2 +-
 .../be-tarask/LC_MESSAGES/Awesomeness.po      |  10 +-
 .../locale/fr/LC_MESSAGES/Awesomeness.po      |  10 +-
 .../locale/ia/LC_MESSAGES/Awesomeness.po      |  10 +-
 .../locale/mk/LC_MESSAGES/Awesomeness.po      |  10 +-
 .../locale/nl/LC_MESSAGES/Awesomeness.po      |  10 +-
 .../locale/ru/LC_MESSAGES/Awesomeness.po      |  10 +-
 .../locale/uk/LC_MESSAGES/Awesomeness.po      |  10 +-
 plugins/BitlyUrl/locale/BitlyUrl.pot          |   2 +-
 .../locale/be-tarask/LC_MESSAGES/BitlyUrl.po  |  10 +-
 .../locale/de/LC_MESSAGES/BitlyUrl.po         |  10 +-
 .../locale/fr/LC_MESSAGES/BitlyUrl.po         |  10 +-
 .../locale/gl/LC_MESSAGES/BitlyUrl.po         |  10 +-
 .../locale/ia/LC_MESSAGES/BitlyUrl.po         |  10 +-
 .../locale/mk/LC_MESSAGES/BitlyUrl.po         |  10 +-
 .../locale/nb/LC_MESSAGES/BitlyUrl.po         |  10 +-
 .../locale/nl/LC_MESSAGES/BitlyUrl.po         |  10 +-
 .../locale/ru/LC_MESSAGES/BitlyUrl.po         |  10 +-
 .../locale/uk/LC_MESSAGES/BitlyUrl.po         |  10 +-
 plugins/Blacklist/locale/Blacklist.pot        |   2 +-
 .../locale/be-tarask/LC_MESSAGES/Blacklist.po |  10 +-
 .../locale/br/LC_MESSAGES/Blacklist.po        |  10 +-
 .../locale/de/LC_MESSAGES/Blacklist.po        |  10 +-
 .../locale/es/LC_MESSAGES/Blacklist.po        |  10 +-
 .../locale/fr/LC_MESSAGES/Blacklist.po        |  10 +-
 .../locale/ia/LC_MESSAGES/Blacklist.po        |  10 +-
 .../locale/mk/LC_MESSAGES/Blacklist.po        |  10 +-
 .../locale/nl/LC_MESSAGES/Blacklist.po        |  10 +-
 .../locale/ru/LC_MESSAGES/Blacklist.po        |  10 +-
 .../locale/uk/LC_MESSAGES/Blacklist.po        |  10 +-
 .../locale/zh_CN/LC_MESSAGES/Blacklist.po     |  33 +-
 plugins/BlankAd/locale/BlankAd.pot            |   2 +-
 .../locale/be-tarask/LC_MESSAGES/BlankAd.po   |  10 +-
 .../BlankAd/locale/br/LC_MESSAGES/BlankAd.po  |  10 +-
 .../BlankAd/locale/de/LC_MESSAGES/BlankAd.po  |  10 +-
 .../BlankAd/locale/es/LC_MESSAGES/BlankAd.po  |  10 +-
 .../BlankAd/locale/fr/LC_MESSAGES/BlankAd.po  |  10 +-
 .../BlankAd/locale/he/LC_MESSAGES/BlankAd.po  |  10 +-
 .../BlankAd/locale/ia/LC_MESSAGES/BlankAd.po  |  10 +-
 .../BlankAd/locale/mk/LC_MESSAGES/BlankAd.po  |  10 +-
 .../BlankAd/locale/nb/LC_MESSAGES/BlankAd.po  |  10 +-
 .../BlankAd/locale/nl/LC_MESSAGES/BlankAd.po  |  10 +-
 .../BlankAd/locale/pt/LC_MESSAGES/BlankAd.po  |  10 +-
 .../BlankAd/locale/ru/LC_MESSAGES/BlankAd.po  |  10 +-
 .../BlankAd/locale/tl/LC_MESSAGES/BlankAd.po  |  10 +-
 .../BlankAd/locale/uk/LC_MESSAGES/BlankAd.po  |  10 +-
 .../locale/zh_CN/LC_MESSAGES/BlankAd.po       |  10 +-
 plugins/BlogspamNet/locale/BlogspamNet.pot    |   2 +-
 .../be-tarask/LC_MESSAGES/BlogspamNet.po      |  10 +-
 .../locale/br/LC_MESSAGES/BlogspamNet.po      |  10 +-
 .../locale/de/LC_MESSAGES/BlogspamNet.po      |  10 +-
 .../locale/es/LC_MESSAGES/BlogspamNet.po      |  10 +-
 .../locale/fr/LC_MESSAGES/BlogspamNet.po      |  10 +-
 .../locale/he/LC_MESSAGES/BlogspamNet.po      |  10 +-
 .../locale/ia/LC_MESSAGES/BlogspamNet.po      |  10 +-
 .../locale/mk/LC_MESSAGES/BlogspamNet.po      |  10 +-
 .../locale/nb/LC_MESSAGES/BlogspamNet.po      |  10 +-
 .../locale/nl/LC_MESSAGES/BlogspamNet.po      |  10 +-
 .../locale/pt/LC_MESSAGES/BlogspamNet.po      |  10 +-
 .../locale/ru/LC_MESSAGES/BlogspamNet.po      |  10 +-
 .../locale/tl/LC_MESSAGES/BlogspamNet.po      |  10 +-
 .../locale/uk/LC_MESSAGES/BlogspamNet.po      |  10 +-
 .../locale/zh_CN/LC_MESSAGES/BlogspamNet.po   |  10 +-
 plugins/Bookmark/locale/Bookmark.pot          |   2 +-
 .../locale/ia/LC_MESSAGES/Bookmark.po         |  10 +-
 .../locale/mk/LC_MESSAGES/Bookmark.po         |  10 +-
 .../locale/nl/LC_MESSAGES/Bookmark.po         |  10 +-
 .../locale/ru/LC_MESSAGES/Bookmark.po         |  37 +
 .../locale/uk/LC_MESSAGES/Bookmark.po         |  10 +-
 .../locale/zh_CN/LC_MESSAGES/Bookmark.po      |  37 +
 plugins/CacheLog/locale/CacheLog.pot          |   2 +-
 .../locale/be-tarask/LC_MESSAGES/CacheLog.po  |  10 +-
 .../locale/br/LC_MESSAGES/CacheLog.po         |  10 +-
 .../locale/es/LC_MESSAGES/CacheLog.po         |  10 +-
 .../locale/fr/LC_MESSAGES/CacheLog.po         |  10 +-
 .../locale/he/LC_MESSAGES/CacheLog.po         |  10 +-
 .../locale/ia/LC_MESSAGES/CacheLog.po         |  10 +-
 .../locale/mk/LC_MESSAGES/CacheLog.po         |  10 +-
 .../locale/nb/LC_MESSAGES/CacheLog.po         |  10 +-
 .../locale/nl/LC_MESSAGES/CacheLog.po         |  10 +-
 .../locale/pt/LC_MESSAGES/CacheLog.po         |  10 +-
 .../locale/ru/LC_MESSAGES/CacheLog.po         |  10 +-
 .../locale/tl/LC_MESSAGES/CacheLog.po         |  10 +-
 .../locale/uk/LC_MESSAGES/CacheLog.po         |  10 +-
 .../locale/zh_CN/LC_MESSAGES/CacheLog.po      |  10 +-
 .../locale/CasAuthentication.pot              |   2 +-
 .../LC_MESSAGES/CasAuthentication.po          |  10 +-
 .../br/LC_MESSAGES/CasAuthentication.po       |  10 +-
 .../es/LC_MESSAGES/CasAuthentication.po       |  10 +-
 .../fr/LC_MESSAGES/CasAuthentication.po       |  10 +-
 .../ia/LC_MESSAGES/CasAuthentication.po       |  10 +-
 .../mk/LC_MESSAGES/CasAuthentication.po       |  10 +-
 .../nl/LC_MESSAGES/CasAuthentication.po       |  10 +-
 .../pt_BR/LC_MESSAGES/CasAuthentication.po    |  10 +-
 .../ru/LC_MESSAGES/CasAuthentication.po       |  10 +-
 .../uk/LC_MESSAGES/CasAuthentication.po       |  10 +-
 .../zh_CN/LC_MESSAGES/CasAuthentication.po    |  10 +-
 .../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     |  10 +-
 plugins/Comet/locale/br/LC_MESSAGES/Comet.po  |  10 +-
 plugins/Comet/locale/de/LC_MESSAGES/Comet.po  |  10 +-
 plugins/Comet/locale/es/LC_MESSAGES/Comet.po  |  10 +-
 plugins/Comet/locale/fr/LC_MESSAGES/Comet.po  |  10 +-
 plugins/Comet/locale/he/LC_MESSAGES/Comet.po  |  10 +-
 plugins/Comet/locale/ia/LC_MESSAGES/Comet.po  |  10 +-
 plugins/Comet/locale/id/LC_MESSAGES/Comet.po  |  10 +-
 plugins/Comet/locale/mk/LC_MESSAGES/Comet.po  |  10 +-
 plugins/Comet/locale/nb/LC_MESSAGES/Comet.po  |  10 +-
 plugins/Comet/locale/nl/LC_MESSAGES/Comet.po  |  10 +-
 plugins/Comet/locale/pt/LC_MESSAGES/Comet.po  |  10 +-
 .../Comet/locale/pt_BR/LC_MESSAGES/Comet.po   |  10 +-
 plugins/Comet/locale/ru/LC_MESSAGES/Comet.po  |  10 +-
 plugins/Comet/locale/tl/LC_MESSAGES/Comet.po  |  10 +-
 plugins/Comet/locale/uk/LC_MESSAGES/Comet.po  |  10 +-
 .../Comet/locale/zh_CN/LC_MESSAGES/Comet.po   |  10 +-
 .../locale/DirectionDetector.pot              |   2 +-
 .../LC_MESSAGES/DirectionDetector.po          |  10 +-
 .../br/LC_MESSAGES/DirectionDetector.po       |  10 +-
 .../de/LC_MESSAGES/DirectionDetector.po       |  10 +-
 .../es/LC_MESSAGES/DirectionDetector.po       |  10 +-
 .../fr/LC_MESSAGES/DirectionDetector.po       |  10 +-
 .../he/LC_MESSAGES/DirectionDetector.po       |  10 +-
 .../ia/LC_MESSAGES/DirectionDetector.po       |  10 +-
 .../id/LC_MESSAGES/DirectionDetector.po       |  10 +-
 .../ja/LC_MESSAGES/DirectionDetector.po       |  10 +-
 .../lb/LC_MESSAGES/DirectionDetector.po       |  10 +-
 .../mk/LC_MESSAGES/DirectionDetector.po       |  10 +-
 .../nb/LC_MESSAGES/DirectionDetector.po       |  10 +-
 .../nl/LC_MESSAGES/DirectionDetector.po       |  10 +-
 .../pt/LC_MESSAGES/DirectionDetector.po       |  10 +-
 .../ru/LC_MESSAGES/DirectionDetector.po       |  10 +-
 .../tl/LC_MESSAGES/DirectionDetector.po       |  10 +-
 .../uk/LC_MESSAGES/DirectionDetector.po       |  10 +-
 .../zh_CN/LC_MESSAGES/DirectionDetector.po    |  10 +-
 plugins/DiskCache/locale/DiskCache.pot        |   2 +-
 .../locale/be-tarask/LC_MESSAGES/DiskCache.po |  10 +-
 .../locale/br/LC_MESSAGES/DiskCache.po        |  10 +-
 .../locale/de/LC_MESSAGES/DiskCache.po        |  10 +-
 .../locale/es/LC_MESSAGES/DiskCache.po        |  10 +-
 .../locale/fr/LC_MESSAGES/DiskCache.po        |  10 +-
 .../locale/he/LC_MESSAGES/DiskCache.po        |  10 +-
 .../locale/ia/LC_MESSAGES/DiskCache.po        |  10 +-
 .../locale/id/LC_MESSAGES/DiskCache.po        |  10 +-
 .../locale/mk/LC_MESSAGES/DiskCache.po        |  10 +-
 .../locale/nb/LC_MESSAGES/DiskCache.po        |  10 +-
 .../locale/nl/LC_MESSAGES/DiskCache.po        |  10 +-
 .../locale/pt/LC_MESSAGES/DiskCache.po        |  10 +-
 .../locale/pt_BR/LC_MESSAGES/DiskCache.po     |  10 +-
 .../locale/ru/LC_MESSAGES/DiskCache.po        |  10 +-
 .../locale/tl/LC_MESSAGES/DiskCache.po        |  10 +-
 .../locale/uk/LC_MESSAGES/DiskCache.po        |  10 +-
 .../locale/zh_CN/LC_MESSAGES/DiskCache.po     |  10 +-
 plugins/Disqus/locale/Disqus.pot              |   2 +-
 .../locale/be-tarask/LC_MESSAGES/Disqus.po    |  10 +-
 .../Disqus/locale/br/LC_MESSAGES/Disqus.po    |  10 +-
 .../Disqus/locale/de/LC_MESSAGES/Disqus.po    |  10 +-
 .../Disqus/locale/es/LC_MESSAGES/Disqus.po    |  10 +-
 .../Disqus/locale/fr/LC_MESSAGES/Disqus.po    |  10 +-
 .../Disqus/locale/ia/LC_MESSAGES/Disqus.po    |  10 +-
 .../Disqus/locale/mk/LC_MESSAGES/Disqus.po    |  10 +-
 .../Disqus/locale/nb/LC_MESSAGES/Disqus.po    |  10 +-
 .../Disqus/locale/nl/LC_MESSAGES/Disqus.po    |  10 +-
 .../Disqus/locale/ru/LC_MESSAGES/Disqus.po    |  10 +-
 .../Disqus/locale/tl/LC_MESSAGES/Disqus.po    |  10 +-
 .../Disqus/locale/uk/LC_MESSAGES/Disqus.po    |  10 +-
 .../Disqus/locale/zh_CN/LC_MESSAGES/Disqus.po |  10 +-
 plugins/Echo/locale/Echo.pot                  |   2 +-
 .../Echo/locale/be-tarask/LC_MESSAGES/Echo.po |  10 +-
 plugins/Echo/locale/br/LC_MESSAGES/Echo.po    |  10 +-
 plugins/Echo/locale/de/LC_MESSAGES/Echo.po    |  10 +-
 plugins/Echo/locale/es/LC_MESSAGES/Echo.po    |  10 +-
 plugins/Echo/locale/fi/LC_MESSAGES/Echo.po    |  10 +-
 plugins/Echo/locale/fr/LC_MESSAGES/Echo.po    |  10 +-
 plugins/Echo/locale/he/LC_MESSAGES/Echo.po    |  10 +-
 plugins/Echo/locale/ia/LC_MESSAGES/Echo.po    |  10 +-
 plugins/Echo/locale/id/LC_MESSAGES/Echo.po    |  10 +-
 plugins/Echo/locale/lb/LC_MESSAGES/Echo.po    |  10 +-
 plugins/Echo/locale/mk/LC_MESSAGES/Echo.po    |  10 +-
 plugins/Echo/locale/nb/LC_MESSAGES/Echo.po    |  10 +-
 plugins/Echo/locale/nl/LC_MESSAGES/Echo.po    |  10 +-
 plugins/Echo/locale/pt/LC_MESSAGES/Echo.po    |  10 +-
 plugins/Echo/locale/pt_BR/LC_MESSAGES/Echo.po |  10 +-
 plugins/Echo/locale/ru/LC_MESSAGES/Echo.po    |  10 +-
 plugins/Echo/locale/tl/LC_MESSAGES/Echo.po    |  10 +-
 plugins/Echo/locale/uk/LC_MESSAGES/Echo.po    |  10 +-
 plugins/Echo/locale/zh_CN/LC_MESSAGES/Echo.po |  10 +-
 .../locale/EmailAuthentication.pot            |   2 +-
 .../LC_MESSAGES/EmailAuthentication.po        |  10 +-
 .../br/LC_MESSAGES/EmailAuthentication.po     |  10 +-
 .../de/LC_MESSAGES/EmailAuthentication.po     |  10 +-
 .../es/LC_MESSAGES/EmailAuthentication.po     |  10 +-
 .../fr/LC_MESSAGES/EmailAuthentication.po     |  10 +-
 .../he/LC_MESSAGES/EmailAuthentication.po     |  10 +-
 .../ia/LC_MESSAGES/EmailAuthentication.po     |  10 +-
 .../id/LC_MESSAGES/EmailAuthentication.po     |  10 +-
 .../ja/LC_MESSAGES/EmailAuthentication.po     |  10 +-
 .../mk/LC_MESSAGES/EmailAuthentication.po     |  10 +-
 .../nb/LC_MESSAGES/EmailAuthentication.po     |  10 +-
 .../nl/LC_MESSAGES/EmailAuthentication.po     |  10 +-
 .../pt/LC_MESSAGES/EmailAuthentication.po     |  10 +-
 .../pt_BR/LC_MESSAGES/EmailAuthentication.po  |  10 +-
 .../ru/LC_MESSAGES/EmailAuthentication.po     |  10 +-
 .../tl/LC_MESSAGES/EmailAuthentication.po     |  10 +-
 .../uk/LC_MESSAGES/EmailAuthentication.po     |  10 +-
 .../zh_CN/LC_MESSAGES/EmailAuthentication.po  |  10 +-
 plugins/EmailSummary/locale/EmailSummary.pot  |   2 +-
 .../be-tarask/LC_MESSAGES/EmailSummary.po     |  10 +-
 .../locale/br/LC_MESSAGES/EmailSummary.po     |  10 +-
 .../locale/fr/LC_MESSAGES/EmailSummary.po     |  10 +-
 .../locale/he/LC_MESSAGES/EmailSummary.po     |  10 +-
 .../locale/ia/LC_MESSAGES/EmailSummary.po     |  10 +-
 .../locale/id/LC_MESSAGES/EmailSummary.po     |  10 +-
 .../locale/mk/LC_MESSAGES/EmailSummary.po     |  10 +-
 .../locale/nl/LC_MESSAGES/EmailSummary.po     |  10 +-
 .../locale/ru/LC_MESSAGES/EmailSummary.po     |  10 +-
 .../locale/uk/LC_MESSAGES/EmailSummary.po     |  10 +-
 .../locale/zh_CN/LC_MESSAGES/EmailSummary.po  |  27 +
 plugins/Facebook/locale/Facebook.pot          |   2 +-
 .../locale/be-tarask/LC_MESSAGES/Facebook.po  |  10 +-
 .../locale/br/LC_MESSAGES/Facebook.po         |  10 +-
 .../locale/ca/LC_MESSAGES/Facebook.po         | 546 +++++++++++++++
 .../locale/de/LC_MESSAGES/Facebook.po         |  10 +-
 .../locale/es/LC_MESSAGES/Facebook.po         |  10 +-
 .../locale/fr/LC_MESSAGES/Facebook.po         |  10 +-
 .../locale/gl/LC_MESSAGES/Facebook.po         |  10 +-
 .../locale/ia/LC_MESSAGES/Facebook.po         |  10 +-
 .../locale/mk/LC_MESSAGES/Facebook.po         |  10 +-
 .../locale/nb/LC_MESSAGES/Facebook.po         |  10 +-
 .../locale/nl/LC_MESSAGES/Facebook.po         |  10 +-
 .../locale/pt_BR/LC_MESSAGES/Facebook.po      |  10 +-
 .../locale/tl/LC_MESSAGES/Facebook.po         |  10 +-
 .../locale/uk/LC_MESSAGES/Facebook.po         |  10 +-
 .../locale/zh_CN/LC_MESSAGES/Facebook.po      |  27 +-
 .../FacebookBridge/locale/FacebookBridge.pot  |  30 +-
 .../locale/br/LC_MESSAGES/FacebookBridge.po   |  38 +-
 .../locale/ca/LC_MESSAGES/FacebookBridge.po   |  38 +-
 .../locale/ia/LC_MESSAGES/FacebookBridge.po   |  38 +-
 .../locale/mk/LC_MESSAGES/FacebookBridge.po   |  38 +-
 .../locale/nl/LC_MESSAGES/FacebookBridge.po   |  38 +-
 .../locale/uk/LC_MESSAGES/FacebookBridge.po   |  38 +-
 plugins/FirePHP/locale/FirePHP.pot            |   2 +-
 .../FirePHP/locale/de/LC_MESSAGES/FirePHP.po  |  10 +-
 .../FirePHP/locale/es/LC_MESSAGES/FirePHP.po  |  10 +-
 .../FirePHP/locale/fi/LC_MESSAGES/FirePHP.po  |  10 +-
 .../FirePHP/locale/fr/LC_MESSAGES/FirePHP.po  |  10 +-
 .../FirePHP/locale/he/LC_MESSAGES/FirePHP.po  |  10 +-
 .../FirePHP/locale/ia/LC_MESSAGES/FirePHP.po  |  10 +-
 .../FirePHP/locale/id/LC_MESSAGES/FirePHP.po  |  10 +-
 .../FirePHP/locale/ja/LC_MESSAGES/FirePHP.po  |  10 +-
 .../FirePHP/locale/mk/LC_MESSAGES/FirePHP.po  |  10 +-
 .../FirePHP/locale/nb/LC_MESSAGES/FirePHP.po  |  10 +-
 .../FirePHP/locale/nl/LC_MESSAGES/FirePHP.po  |  10 +-
 .../FirePHP/locale/pt/LC_MESSAGES/FirePHP.po  |  10 +-
 .../FirePHP/locale/ru/LC_MESSAGES/FirePHP.po  |  10 +-
 .../FirePHP/locale/tl/LC_MESSAGES/FirePHP.po  |  10 +-
 .../FirePHP/locale/uk/LC_MESSAGES/FirePHP.po  |  10 +-
 .../locale/zh_CN/LC_MESSAGES/FirePHP.po       |  10 +-
 .../FollowEveryone/locale/FollowEveryone.pot  |   2 +-
 .../locale/de/LC_MESSAGES/FollowEveryone.po   |  10 +-
 .../locale/fr/LC_MESSAGES/FollowEveryone.po   |  10 +-
 .../locale/he/LC_MESSAGES/FollowEveryone.po   |  10 +-
 .../locale/ia/LC_MESSAGES/FollowEveryone.po   |  10 +-
 .../locale/mk/LC_MESSAGES/FollowEveryone.po   |  10 +-
 .../locale/nl/LC_MESSAGES/FollowEveryone.po   |  10 +-
 .../locale/ru/LC_MESSAGES/FollowEveryone.po   |  10 +-
 .../locale/uk/LC_MESSAGES/FollowEveryone.po   |  10 +-
 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    |  10 +-
 .../GeoURL/locale/de/LC_MESSAGES/GeoURL.po    |  10 +-
 .../GeoURL/locale/eo/LC_MESSAGES/GeoURL.po    |  10 +-
 .../GeoURL/locale/es/LC_MESSAGES/GeoURL.po    |  10 +-
 .../GeoURL/locale/fr/LC_MESSAGES/GeoURL.po    |  10 +-
 .../GeoURL/locale/he/LC_MESSAGES/GeoURL.po    |  10 +-
 .../GeoURL/locale/ia/LC_MESSAGES/GeoURL.po    |  10 +-
 .../GeoURL/locale/id/LC_MESSAGES/GeoURL.po    |  10 +-
 .../GeoURL/locale/mk/LC_MESSAGES/GeoURL.po    |  10 +-
 .../GeoURL/locale/nb/LC_MESSAGES/GeoURL.po    |  10 +-
 .../GeoURL/locale/nl/LC_MESSAGES/GeoURL.po    |  10 +-
 .../GeoURL/locale/pl/LC_MESSAGES/GeoURL.po    |  10 +-
 .../GeoURL/locale/pt/LC_MESSAGES/GeoURL.po    |  10 +-
 .../GeoURL/locale/ru/LC_MESSAGES/GeoURL.po    |  10 +-
 .../GeoURL/locale/tl/LC_MESSAGES/GeoURL.po    |  10 +-
 .../GeoURL/locale/uk/LC_MESSAGES/GeoURL.po    |  10 +-
 plugins/Geonames/locale/Geonames.pot          |   2 +-
 .../locale/br/LC_MESSAGES/Geonames.po         |  10 +-
 .../locale/ca/LC_MESSAGES/Geonames.po         |  10 +-
 .../locale/de/LC_MESSAGES/Geonames.po         |  10 +-
 .../locale/eo/LC_MESSAGES/Geonames.po         |  10 +-
 .../locale/es/LC_MESSAGES/Geonames.po         |  10 +-
 .../locale/fr/LC_MESSAGES/Geonames.po         |  10 +-
 .../locale/he/LC_MESSAGES/Geonames.po         |  10 +-
 .../locale/ia/LC_MESSAGES/Geonames.po         |  10 +-
 .../locale/id/LC_MESSAGES/Geonames.po         |  10 +-
 .../locale/mk/LC_MESSAGES/Geonames.po         |  10 +-
 .../locale/nb/LC_MESSAGES/Geonames.po         |  10 +-
 .../locale/nl/LC_MESSAGES/Geonames.po         |  10 +-
 .../locale/pt/LC_MESSAGES/Geonames.po         |  10 +-
 .../locale/pt_BR/LC_MESSAGES/Geonames.po      |  10 +-
 .../locale/ru/LC_MESSAGES/Geonames.po         |  10 +-
 .../locale/tl/LC_MESSAGES/Geonames.po         |  10 +-
 .../locale/uk/LC_MESSAGES/Geonames.po         |  10 +-
 .../locale/zh_CN/LC_MESSAGES/Geonames.po      |  10 +-
 .../locale/GoogleAnalytics.pot                |   2 +-
 .../locale/br/LC_MESSAGES/GoogleAnalytics.po  |  10 +-
 .../locale/de/LC_MESSAGES/GoogleAnalytics.po  |  10 +-
 .../locale/es/LC_MESSAGES/GoogleAnalytics.po  |  10 +-
 .../locale/fr/LC_MESSAGES/GoogleAnalytics.po  |  10 +-
 .../locale/he/LC_MESSAGES/GoogleAnalytics.po  |  10 +-
 .../locale/ia/LC_MESSAGES/GoogleAnalytics.po  |  10 +-
 .../locale/id/LC_MESSAGES/GoogleAnalytics.po  |  10 +-
 .../locale/mk/LC_MESSAGES/GoogleAnalytics.po  |  10 +-
 .../locale/nb/LC_MESSAGES/GoogleAnalytics.po  |  10 +-
 .../locale/nl/LC_MESSAGES/GoogleAnalytics.po  |  10 +-
 .../locale/pt/LC_MESSAGES/GoogleAnalytics.po  |  10 +-
 .../pt_BR/LC_MESSAGES/GoogleAnalytics.po      |  10 +-
 .../locale/ru/LC_MESSAGES/GoogleAnalytics.po  |  10 +-
 .../locale/tl/LC_MESSAGES/GoogleAnalytics.po  |  10 +-
 .../locale/uk/LC_MESSAGES/GoogleAnalytics.po  |  10 +-
 .../zh_CN/LC_MESSAGES/GoogleAnalytics.po      |  10 +-
 plugins/Gravatar/locale/Gravatar.pot          |   2 +-
 .../locale/de/LC_MESSAGES/Gravatar.po         |  10 +-
 .../locale/es/LC_MESSAGES/Gravatar.po         |  10 +-
 .../locale/fr/LC_MESSAGES/Gravatar.po         |  10 +-
 .../locale/ia/LC_MESSAGES/Gravatar.po         |  10 +-
 .../locale/mk/LC_MESSAGES/Gravatar.po         |  10 +-
 .../locale/nl/LC_MESSAGES/Gravatar.po         |  10 +-
 .../locale/pl/LC_MESSAGES/Gravatar.po         |  10 +-
 .../locale/pt/LC_MESSAGES/Gravatar.po         |  10 +-
 .../locale/tl/LC_MESSAGES/Gravatar.po         |  10 +-
 .../locale/uk/LC_MESSAGES/Gravatar.po         |  10 +-
 .../locale/zh_CN/LC_MESSAGES/Gravatar.po      |  10 +-
 .../GroupFavorited/locale/GroupFavorited.pot  |   2 +-
 .../locale/br/LC_MESSAGES/GroupFavorited.po   |  10 +-
 .../locale/de/LC_MESSAGES/GroupFavorited.po   |  10 +-
 .../locale/es/LC_MESSAGES/GroupFavorited.po   |  10 +-
 .../locale/fr/LC_MESSAGES/GroupFavorited.po   |  10 +-
 .../locale/ia/LC_MESSAGES/GroupFavorited.po   |  10 +-
 .../locale/mk/LC_MESSAGES/GroupFavorited.po   |  10 +-
 .../locale/nl/LC_MESSAGES/GroupFavorited.po   |  10 +-
 .../locale/ru/LC_MESSAGES/GroupFavorited.po   |  10 +-
 .../locale/te/LC_MESSAGES/GroupFavorited.po   |  10 +-
 .../locale/tl/LC_MESSAGES/GroupFavorited.po   |  10 +-
 .../locale/uk/LC_MESSAGES/GroupFavorited.po   |  10 +-
 plugins/Imap/locale/Imap.pot                  |   2 +-
 plugins/Imap/locale/br/LC_MESSAGES/Imap.po    |  10 +-
 plugins/Imap/locale/fr/LC_MESSAGES/Imap.po    |  10 +-
 plugins/Imap/locale/ia/LC_MESSAGES/Imap.po    |  10 +-
 plugins/Imap/locale/mk/LC_MESSAGES/Imap.po    |  10 +-
 plugins/Imap/locale/nb/LC_MESSAGES/Imap.po    |  10 +-
 plugins/Imap/locale/nl/LC_MESSAGES/Imap.po    |  10 +-
 plugins/Imap/locale/ru/LC_MESSAGES/Imap.po    |  10 +-
 plugins/Imap/locale/tl/LC_MESSAGES/Imap.po    |  10 +-
 plugins/Imap/locale/uk/LC_MESSAGES/Imap.po    |  10 +-
 plugins/Imap/locale/zh_CN/LC_MESSAGES/Imap.po |  10 +-
 .../InProcessCache/locale/InProcessCache.pot  |   2 +-
 .../locale/fr/LC_MESSAGES/InProcessCache.po   |  10 +-
 .../locale/ia/LC_MESSAGES/InProcessCache.po   |  10 +-
 .../locale/mk/LC_MESSAGES/InProcessCache.po   |  10 +-
 .../locale/nl/LC_MESSAGES/InProcessCache.po   |  10 +-
 .../locale/ru/LC_MESSAGES/InProcessCache.po   |  10 +-
 .../locale/uk/LC_MESSAGES/InProcessCache.po   |  10 +-
 .../InfiniteScroll/locale/InfiniteScroll.pot  |   2 +-
 .../locale/de/LC_MESSAGES/InfiniteScroll.po   |  10 +-
 .../locale/es/LC_MESSAGES/InfiniteScroll.po   |  10 +-
 .../locale/fr/LC_MESSAGES/InfiniteScroll.po   |  10 +-
 .../locale/he/LC_MESSAGES/InfiniteScroll.po   |  10 +-
 .../locale/ia/LC_MESSAGES/InfiniteScroll.po   |  10 +-
 .../locale/id/LC_MESSAGES/InfiniteScroll.po   |  10 +-
 .../locale/ja/LC_MESSAGES/InfiniteScroll.po   |  10 +-
 .../locale/mk/LC_MESSAGES/InfiniteScroll.po   |  10 +-
 .../locale/nb/LC_MESSAGES/InfiniteScroll.po   |  10 +-
 .../locale/nl/LC_MESSAGES/InfiniteScroll.po   |  10 +-
 .../pt_BR/LC_MESSAGES/InfiniteScroll.po       |  10 +-
 .../locale/ru/LC_MESSAGES/InfiniteScroll.po   |  10 +-
 .../locale/tl/LC_MESSAGES/InfiniteScroll.po   |  10 +-
 .../locale/uk/LC_MESSAGES/InfiniteScroll.po   |  10 +-
 .../zh_CN/LC_MESSAGES/InfiniteScroll.po       |  10 +-
 .../locale/LdapAuthentication.pot             |   2 +-
 .../es/LC_MESSAGES/LdapAuthentication.po      |  10 +-
 .../fr/LC_MESSAGES/LdapAuthentication.po      |  10 +-
 .../he/LC_MESSAGES/LdapAuthentication.po      |  10 +-
 .../ia/LC_MESSAGES/LdapAuthentication.po      |  10 +-
 .../id/LC_MESSAGES/LdapAuthentication.po      |  10 +-
 .../ja/LC_MESSAGES/LdapAuthentication.po      |  10 +-
 .../mk/LC_MESSAGES/LdapAuthentication.po      |  10 +-
 .../nb/LC_MESSAGES/LdapAuthentication.po      |  10 +-
 .../nl/LC_MESSAGES/LdapAuthentication.po      |  10 +-
 .../pt_BR/LC_MESSAGES/LdapAuthentication.po   |  10 +-
 .../ru/LC_MESSAGES/LdapAuthentication.po      |  10 +-
 .../tl/LC_MESSAGES/LdapAuthentication.po      |  10 +-
 .../uk/LC_MESSAGES/LdapAuthentication.po      |  10 +-
 .../zh_CN/LC_MESSAGES/LdapAuthentication.po   |  10 +-
 .../locale/LdapAuthorization.pot              |   2 +-
 .../es/LC_MESSAGES/LdapAuthorization.po       |  10 +-
 .../fr/LC_MESSAGES/LdapAuthorization.po       |  10 +-
 .../he/LC_MESSAGES/LdapAuthorization.po       |  10 +-
 .../ia/LC_MESSAGES/LdapAuthorization.po       |  10 +-
 .../id/LC_MESSAGES/LdapAuthorization.po       |  10 +-
 .../mk/LC_MESSAGES/LdapAuthorization.po       |  10 +-
 .../nb/LC_MESSAGES/LdapAuthorization.po       |  10 +-
 .../nl/LC_MESSAGES/LdapAuthorization.po       |  10 +-
 .../pt_BR/LC_MESSAGES/LdapAuthorization.po    |  10 +-
 .../ru/LC_MESSAGES/LdapAuthorization.po       |  10 +-
 .../tl/LC_MESSAGES/LdapAuthorization.po       |  10 +-
 .../uk/LC_MESSAGES/LdapAuthorization.po       |  10 +-
 .../zh_CN/LC_MESSAGES/LdapAuthorization.po    |  10 +-
 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/fr/LC_MESSAGES/LinkPreview.po      |  10 +-
 .../locale/he/LC_MESSAGES/LinkPreview.po      |  10 +-
 .../locale/ia/LC_MESSAGES/LinkPreview.po      |  10 +-
 .../locale/mk/LC_MESSAGES/LinkPreview.po      |  10 +-
 .../locale/nl/LC_MESSAGES/LinkPreview.po      |  10 +-
 .../locale/pt/LC_MESSAGES/LinkPreview.po      |  10 +-
 .../locale/ru/LC_MESSAGES/LinkPreview.po      |  10 +-
 .../locale/uk/LC_MESSAGES/LinkPreview.po      |  10 +-
 plugins/Linkback/locale/Linkback.pot          |   2 +-
 .../locale/de/LC_MESSAGES/Linkback.po         |  10 +-
 .../locale/es/LC_MESSAGES/Linkback.po         |  10 +-
 .../locale/fr/LC_MESSAGES/Linkback.po         |  10 +-
 .../locale/he/LC_MESSAGES/Linkback.po         |  10 +-
 .../locale/ia/LC_MESSAGES/Linkback.po         |  10 +-
 .../locale/id/LC_MESSAGES/Linkback.po         |  10 +-
 .../locale/mk/LC_MESSAGES/Linkback.po         |  10 +-
 .../locale/nb/LC_MESSAGES/Linkback.po         |  10 +-
 .../locale/nl/LC_MESSAGES/Linkback.po         |  10 +-
 .../locale/ru/LC_MESSAGES/Linkback.po         |  10 +-
 .../locale/tl/LC_MESSAGES/Linkback.po         |  10 +-
 .../locale/uk/LC_MESSAGES/Linkback.po         |  10 +-
 .../locale/zh_CN/LC_MESSAGES/Linkback.po      |  10 +-
 plugins/LogFilter/locale/LogFilter.pot        |   2 +-
 .../locale/fr/LC_MESSAGES/LogFilter.po        |  10 +-
 .../locale/he/LC_MESSAGES/LogFilter.po        |  10 +-
 .../locale/ia/LC_MESSAGES/LogFilter.po        |  10 +-
 .../locale/mk/LC_MESSAGES/LogFilter.po        |  10 +-
 .../locale/nl/LC_MESSAGES/LogFilter.po        |  10 +-
 .../locale/pt/LC_MESSAGES/LogFilter.po        |  10 +-
 .../locale/ru/LC_MESSAGES/LogFilter.po        |  10 +-
 .../locale/uk/LC_MESSAGES/LogFilter.po        |  10 +-
 plugins/Mapstraction/locale/Mapstraction.pot  |   2 +-
 .../locale/br/LC_MESSAGES/Mapstraction.po     |  10 +-
 .../locale/de/LC_MESSAGES/Mapstraction.po     |  10 +-
 .../locale/fi/LC_MESSAGES/Mapstraction.po     |  10 +-
 .../locale/fr/LC_MESSAGES/Mapstraction.po     |  10 +-
 .../locale/gl/LC_MESSAGES/Mapstraction.po     |  10 +-
 .../locale/ia/LC_MESSAGES/Mapstraction.po     |  10 +-
 .../locale/mk/LC_MESSAGES/Mapstraction.po     |  10 +-
 .../locale/nb/LC_MESSAGES/Mapstraction.po     |  10 +-
 .../locale/nl/LC_MESSAGES/Mapstraction.po     |  10 +-
 .../locale/ru/LC_MESSAGES/Mapstraction.po     |  10 +-
 .../locale/ta/LC_MESSAGES/Mapstraction.po     |  10 +-
 .../locale/tl/LC_MESSAGES/Mapstraction.po     |  10 +-
 .../locale/uk/LC_MESSAGES/Mapstraction.po     |  10 +-
 .../locale/zh_CN/LC_MESSAGES/Mapstraction.po  |  10 +-
 plugins/Memcache/locale/Memcache.pot          |   2 +-
 .../locale/de/LC_MESSAGES/Memcache.po         |  10 +-
 .../locale/es/LC_MESSAGES/Memcache.po         |  10 +-
 .../locale/fr/LC_MESSAGES/Memcache.po         |  10 +-
 .../locale/he/LC_MESSAGES/Memcache.po         |  10 +-
 .../locale/ia/LC_MESSAGES/Memcache.po         |  10 +-
 .../locale/mk/LC_MESSAGES/Memcache.po         |  10 +-
 .../locale/nb/LC_MESSAGES/Memcache.po         |  10 +-
 .../locale/nl/LC_MESSAGES/Memcache.po         |  10 +-
 .../locale/pt/LC_MESSAGES/Memcache.po         |  10 +-
 .../locale/pt_BR/LC_MESSAGES/Memcache.po      |  10 +-
 .../locale/ru/LC_MESSAGES/Memcache.po         |  10 +-
 .../locale/tl/LC_MESSAGES/Memcache.po         |  10 +-
 .../locale/uk/LC_MESSAGES/Memcache.po         |  10 +-
 .../locale/zh_CN/LC_MESSAGES/Memcache.po      |  10 +-
 plugins/Memcached/locale/Memcached.pot        |   2 +-
 .../locale/de/LC_MESSAGES/Memcached.po        |  10 +-
 .../locale/es/LC_MESSAGES/Memcached.po        |  10 +-
 .../locale/fr/LC_MESSAGES/Memcached.po        |  10 +-
 .../locale/he/LC_MESSAGES/Memcached.po        |  10 +-
 .../locale/ia/LC_MESSAGES/Memcached.po        |  10 +-
 .../locale/id/LC_MESSAGES/Memcached.po        |  10 +-
 .../locale/ja/LC_MESSAGES/Memcached.po        |  10 +-
 .../locale/mk/LC_MESSAGES/Memcached.po        |  10 +-
 .../locale/nb/LC_MESSAGES/Memcached.po        |  10 +-
 .../locale/nl/LC_MESSAGES/Memcached.po        |  10 +-
 .../locale/pt/LC_MESSAGES/Memcached.po        |  10 +-
 .../locale/ru/LC_MESSAGES/Memcached.po        |  10 +-
 .../locale/tl/LC_MESSAGES/Memcached.po        |  10 +-
 .../locale/uk/LC_MESSAGES/Memcached.po        |  10 +-
 .../locale/zh_CN/LC_MESSAGES/Memcached.po     |  10 +-
 plugins/Meteor/locale/Meteor.pot              |   2 +-
 .../Meteor/locale/de/LC_MESSAGES/Meteor.po    |  10 +-
 .../Meteor/locale/fr/LC_MESSAGES/Meteor.po    |  10 +-
 .../Meteor/locale/ia/LC_MESSAGES/Meteor.po    |  10 +-
 .../Meteor/locale/id/LC_MESSAGES/Meteor.po    |  10 +-
 .../Meteor/locale/mk/LC_MESSAGES/Meteor.po    |  10 +-
 .../Meteor/locale/nb/LC_MESSAGES/Meteor.po    |  10 +-
 .../Meteor/locale/nl/LC_MESSAGES/Meteor.po    |  10 +-
 .../Meteor/locale/tl/LC_MESSAGES/Meteor.po    |  10 +-
 .../Meteor/locale/uk/LC_MESSAGES/Meteor.po    |  10 +-
 .../Meteor/locale/zh_CN/LC_MESSAGES/Meteor.po |  10 +-
 plugins/Minify/locale/Minify.pot              |   2 +-
 .../Minify/locale/de/LC_MESSAGES/Minify.po    |  10 +-
 .../Minify/locale/fr/LC_MESSAGES/Minify.po    |  10 +-
 .../Minify/locale/ia/LC_MESSAGES/Minify.po    |  10 +-
 .../Minify/locale/mk/LC_MESSAGES/Minify.po    |  10 +-
 .../Minify/locale/nb/LC_MESSAGES/Minify.po    |  10 +-
 .../Minify/locale/nl/LC_MESSAGES/Minify.po    |  10 +-
 .../Minify/locale/ru/LC_MESSAGES/Minify.po    |  10 +-
 .../Minify/locale/tl/LC_MESSAGES/Minify.po    |  10 +-
 .../Minify/locale/uk/LC_MESSAGES/Minify.po    |  10 +-
 .../Minify/locale/zh_CN/LC_MESSAGES/Minify.po |  10 +-
 .../MobileProfile/locale/MobileProfile.pot    |   2 +-
 .../locale/bg/LC_MESSAGES/MobileProfile.po    |  10 +-
 .../locale/br/LC_MESSAGES/MobileProfile.po    |  10 +-
 .../locale/ce/LC_MESSAGES/MobileProfile.po    |  10 +-
 .../locale/fr/LC_MESSAGES/MobileProfile.po    |  10 +-
 .../locale/gl/LC_MESSAGES/MobileProfile.po    |  10 +-
 .../locale/ia/LC_MESSAGES/MobileProfile.po    |  10 +-
 .../locale/mk/LC_MESSAGES/MobileProfile.po    |  10 +-
 .../locale/nb/LC_MESSAGES/MobileProfile.po    |  10 +-
 .../locale/nl/LC_MESSAGES/MobileProfile.po    |  10 +-
 .../locale/ru/LC_MESSAGES/MobileProfile.po    |  10 +-
 .../locale/ta/LC_MESSAGES/MobileProfile.po    |  10 +-
 .../locale/te/LC_MESSAGES/MobileProfile.po    |  10 +-
 .../locale/tl/LC_MESSAGES/MobileProfile.po    |  10 +-
 .../locale/uk/LC_MESSAGES/MobileProfile.po    |  10 +-
 .../locale/zh_CN/LC_MESSAGES/MobileProfile.po |  10 +-
 plugins/ModHelper/locale/ModHelper.pot        |   2 +-
 .../locale/es/LC_MESSAGES/ModHelper.po        |  10 +-
 .../locale/fr/LC_MESSAGES/ModHelper.po        |  10 +-
 .../locale/he/LC_MESSAGES/ModHelper.po        |  10 +-
 .../locale/ia/LC_MESSAGES/ModHelper.po        |  10 +-
 .../locale/mk/LC_MESSAGES/ModHelper.po        |  10 +-
 .../locale/nl/LC_MESSAGES/ModHelper.po        |  10 +-
 .../locale/ru/LC_MESSAGES/ModHelper.po        |  10 +-
 .../locale/uk/LC_MESSAGES/ModHelper.po        |  10 +-
 plugins/ModPlus/locale/ModPlus.pot            |   2 +-
 .../ModPlus/locale/fr/LC_MESSAGES/ModPlus.po  |  10 +-
 .../ModPlus/locale/ia/LC_MESSAGES/ModPlus.po  |  10 +-
 .../ModPlus/locale/mk/LC_MESSAGES/ModPlus.po  |  10 +-
 .../ModPlus/locale/nl/LC_MESSAGES/ModPlus.po  |  10 +-
 .../ModPlus/locale/uk/LC_MESSAGES/ModPlus.po  |  10 +-
 plugins/NewMenu/locale/NewMenu.pot            |  40 +-
 .../NewMenu/locale/ia/LC_MESSAGES/NewMenu.po  |  48 +-
 .../NewMenu/locale/mk/LC_MESSAGES/NewMenu.po  |  48 +-
 .../NewMenu/locale/nl/LC_MESSAGES/NewMenu.po  |  48 +-
 .../NewMenu/locale/uk/LC_MESSAGES/NewMenu.po  |  48 +-
 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            |  52 +-
 .../OStatus/locale/fr/LC_MESSAGES/OStatus.po  |  63 +-
 .../OStatus/locale/ia/LC_MESSAGES/OStatus.po  |  63 +-
 .../OStatus/locale/mk/LC_MESSAGES/OStatus.po  |  63 +-
 .../OStatus/locale/nl/LC_MESSAGES/OStatus.po  |  63 +-
 .../OStatus/locale/uk/LC_MESSAGES/OStatus.po  |  63 +-
 .../locale/OpenExternalLinkTarget.pot         |   2 +-
 .../de/LC_MESSAGES/OpenExternalLinkTarget.po  |  10 +-
 .../es/LC_MESSAGES/OpenExternalLinkTarget.po  |  10 +-
 .../fr/LC_MESSAGES/OpenExternalLinkTarget.po  |  10 +-
 .../he/LC_MESSAGES/OpenExternalLinkTarget.po  |  10 +-
 .../ia/LC_MESSAGES/OpenExternalLinkTarget.po  |  10 +-
 .../mk/LC_MESSAGES/OpenExternalLinkTarget.po  |  10 +-
 .../nb/LC_MESSAGES/OpenExternalLinkTarget.po  |  10 +-
 .../nl/LC_MESSAGES/OpenExternalLinkTarget.po  |  10 +-
 .../ru/LC_MESSAGES/OpenExternalLinkTarget.po  |  10 +-
 .../uk/LC_MESSAGES/OpenExternalLinkTarget.po  |  10 +-
 .../LC_MESSAGES/OpenExternalLinkTarget.po     |  14 +-
 plugins/OpenID/locale/OpenID.pot              |  40 +-
 .../OpenID/locale/br/LC_MESSAGES/OpenID.po    |  48 +-
 .../OpenID/locale/ca/LC_MESSAGES/OpenID.po    |  48 +-
 .../OpenID/locale/de/LC_MESSAGES/OpenID.po    |  48 +-
 .../OpenID/locale/fr/LC_MESSAGES/OpenID.po    |  48 +-
 .../OpenID/locale/ia/LC_MESSAGES/OpenID.po    |  48 +-
 .../OpenID/locale/mk/LC_MESSAGES/OpenID.po    |  48 +-
 .../OpenID/locale/nl/LC_MESSAGES/OpenID.po    |  48 +-
 .../OpenID/locale/tl/LC_MESSAGES/OpenID.po    |  48 +-
 .../OpenID/locale/uk/LC_MESSAGES/OpenID.po    |  48 +-
 plugins/OpenX/locale/OpenX.pot                |   2 +-
 plugins/OpenX/locale/br/LC_MESSAGES/OpenX.po  |  10 +-
 plugins/OpenX/locale/de/LC_MESSAGES/OpenX.po  |  10 +-
 plugins/OpenX/locale/fr/LC_MESSAGES/OpenX.po  |  10 +-
 plugins/OpenX/locale/ia/LC_MESSAGES/OpenX.po  |  10 +-
 plugins/OpenX/locale/mk/LC_MESSAGES/OpenX.po  |  10 +-
 plugins/OpenX/locale/nl/LC_MESSAGES/OpenX.po  |  10 +-
 plugins/OpenX/locale/uk/LC_MESSAGES/OpenX.po  |  10 +-
 .../PiwikAnalytics/locale/PiwikAnalytics.pot  |   2 +-
 .../locale/de/LC_MESSAGES/PiwikAnalytics.po   |  10 +-
 .../locale/es/LC_MESSAGES/PiwikAnalytics.po   |  10 +-
 .../locale/fr/LC_MESSAGES/PiwikAnalytics.po   |  10 +-
 .../locale/he/LC_MESSAGES/PiwikAnalytics.po   |  10 +-
 .../locale/ia/LC_MESSAGES/PiwikAnalytics.po   |  10 +-
 .../locale/id/LC_MESSAGES/PiwikAnalytics.po   |  10 +-
 .../locale/mk/LC_MESSAGES/PiwikAnalytics.po   |  10 +-
 .../locale/nb/LC_MESSAGES/PiwikAnalytics.po   |  10 +-
 .../locale/nl/LC_MESSAGES/PiwikAnalytics.po   |  10 +-
 .../pt_BR/LC_MESSAGES/PiwikAnalytics.po       |  10 +-
 .../locale/ru/LC_MESSAGES/PiwikAnalytics.po   |  10 +-
 .../locale/tl/LC_MESSAGES/PiwikAnalytics.po   |  10 +-
 .../locale/uk/LC_MESSAGES/PiwikAnalytics.po   |  10 +-
 plugins/PostDebug/locale/PostDebug.pot        |   2 +-
 .../locale/de/LC_MESSAGES/PostDebug.po        |  10 +-
 .../locale/es/LC_MESSAGES/PostDebug.po        |  10 +-
 .../locale/fi/LC_MESSAGES/PostDebug.po        |  10 +-
 .../locale/fr/LC_MESSAGES/PostDebug.po        |  10 +-
 .../locale/he/LC_MESSAGES/PostDebug.po        |  10 +-
 .../locale/ia/LC_MESSAGES/PostDebug.po        |  10 +-
 .../locale/id/LC_MESSAGES/PostDebug.po        |  10 +-
 .../locale/ja/LC_MESSAGES/PostDebug.po        |  10 +-
 .../locale/mk/LC_MESSAGES/PostDebug.po        |  10 +-
 .../locale/nb/LC_MESSAGES/PostDebug.po        |  10 +-
 .../locale/nl/LC_MESSAGES/PostDebug.po        |  10 +-
 .../locale/pt_BR/LC_MESSAGES/PostDebug.po     |  10 +-
 .../locale/ru/LC_MESSAGES/PostDebug.po        |  10 +-
 .../locale/tl/LC_MESSAGES/PostDebug.po        |  10 +-
 .../locale/uk/LC_MESSAGES/PostDebug.po        |  10 +-
 .../locale/PoweredByStatusNet.pot             |   2 +-
 .../br/LC_MESSAGES/PoweredByStatusNet.po      |  10 +-
 .../ca/LC_MESSAGES/PoweredByStatusNet.po      |  10 +-
 .../de/LC_MESSAGES/PoweredByStatusNet.po      |  10 +-
 .../fr/LC_MESSAGES/PoweredByStatusNet.po      |  10 +-
 .../gl/LC_MESSAGES/PoweredByStatusNet.po      |  10 +-
 .../ia/LC_MESSAGES/PoweredByStatusNet.po      |  10 +-
 .../mk/LC_MESSAGES/PoweredByStatusNet.po      |  10 +-
 .../nl/LC_MESSAGES/PoweredByStatusNet.po      |  10 +-
 .../pt/LC_MESSAGES/PoweredByStatusNet.po      |  10 +-
 .../ru/LC_MESSAGES/PoweredByStatusNet.po      |  10 +-
 .../tl/LC_MESSAGES/PoweredByStatusNet.po      |  10 +-
 .../uk/LC_MESSAGES/PoweredByStatusNet.po      |  10 +-
 plugins/PtitUrl/locale/PtitUrl.pot            |   2 +-
 .../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          |   2 +-
 .../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 +-
 .../locale/af/LC_MESSAGES/Realtime.po         |  10 +-
 .../locale/br/LC_MESSAGES/Realtime.po         |  10 +-
 .../locale/ca/LC_MESSAGES/Realtime.po         |  10 +-
 .../locale/fr/LC_MESSAGES/Realtime.po         |  10 +-
 .../locale/ia/LC_MESSAGES/Realtime.po         |  10 +-
 .../locale/mk/LC_MESSAGES/Realtime.po         |  10 +-
 .../locale/ne/LC_MESSAGES/Realtime.po         |  10 +-
 .../locale/nl/LC_MESSAGES/Realtime.po         |  10 +-
 .../locale/tr/LC_MESSAGES/Realtime.po         |  10 +-
 .../locale/uk/LC_MESSAGES/Realtime.po         |  10 +-
 plugins/Recaptcha/locale/Recaptcha.pot        |   2 +-
 .../locale/de/LC_MESSAGES/Recaptcha.po        |  10 +-
 .../locale/fr/LC_MESSAGES/Recaptcha.po        |  10 +-
 .../locale/ia/LC_MESSAGES/Recaptcha.po        |  10 +-
 .../locale/mk/LC_MESSAGES/Recaptcha.po        |  10 +-
 .../locale/nb/LC_MESSAGES/Recaptcha.po        |  10 +-
 .../locale/nl/LC_MESSAGES/Recaptcha.po        |  10 +-
 .../locale/pt/LC_MESSAGES/Recaptcha.po        |  10 +-
 .../locale/ru/LC_MESSAGES/Recaptcha.po        |  10 +-
 .../locale/tl/LC_MESSAGES/Recaptcha.po        |  10 +-
 .../locale/uk/LC_MESSAGES/Recaptcha.po        |  10 +-
 .../locale/RegisterThrottle.pot               |   2 +-
 .../locale/de/LC_MESSAGES/RegisterThrottle.po |  13 +-
 .../locale/fr/LC_MESSAGES/RegisterThrottle.po |  13 +-
 .../locale/ia/LC_MESSAGES/RegisterThrottle.po |  13 +-
 .../locale/mk/LC_MESSAGES/RegisterThrottle.po |  13 +-
 .../locale/nl/LC_MESSAGES/RegisterThrottle.po |  13 +-
 .../locale/tl/LC_MESSAGES/RegisterThrottle.po |  14 +-
 .../locale/uk/LC_MESSAGES/RegisterThrottle.po |  13 +-
 .../locale/RequireValidatedEmail.pot          |   2 +-
 .../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          |  10 +-
 .../ReverseUsernameAuthentication.po          |  10 +-
 .../ReverseUsernameAuthentication.po          |  10 +-
 .../ReverseUsernameAuthentication.po          |  10 +-
 .../ReverseUsernameAuthentication.po          |  10 +-
 .../ReverseUsernameAuthentication.po          |  10 +-
 .../ReverseUsernameAuthentication.po          |  10 +-
 .../ReverseUsernameAuthentication.po          |  10 +-
 .../ReverseUsernameAuthentication.po          |  10 +-
 .../ReverseUsernameAuthentication.po          |  10 +-
 .../ReverseUsernameAuthentication.po          |  10 +-
 plugins/SQLProfile/locale/SQLProfile.pot      |   2 +-
 .../locale/ia/LC_MESSAGES/SQLProfile.po       |  10 +-
 .../locale/mk/LC_MESSAGES/SQLProfile.po       |  10 +-
 .../locale/nl/LC_MESSAGES/SQLProfile.po       |  10 +-
 .../locale/ru/LC_MESSAGES/SQLProfile.po       |  10 +-
 .../locale/uk/LC_MESSAGES/SQLProfile.po       |  10 +-
 plugins/Sample/locale/Sample.pot              |   2 +-
 .../Sample/locale/br/LC_MESSAGES/Sample.po    |  10 +-
 .../Sample/locale/de/LC_MESSAGES/Sample.po    |  10 +-
 .../Sample/locale/fr/LC_MESSAGES/Sample.po    |  10 +-
 .../Sample/locale/ia/LC_MESSAGES/Sample.po    |  10 +-
 .../Sample/locale/lb/LC_MESSAGES/Sample.po    |  10 +-
 .../Sample/locale/mk/LC_MESSAGES/Sample.po    |  10 +-
 .../Sample/locale/nl/LC_MESSAGES/Sample.po    |  10 +-
 .../Sample/locale/ru/LC_MESSAGES/Sample.po    |  10 +-
 .../Sample/locale/tl/LC_MESSAGES/Sample.po    |  10 +-
 .../Sample/locale/uk/LC_MESSAGES/Sample.po    |  10 +-
 .../Sample/locale/zh_CN/LC_MESSAGES/Sample.po |  10 +-
 plugins/ShareNotice/locale/ShareNotice.pot    |   2 +-
 .../locale/br/LC_MESSAGES/ShareNotice.po      |  10 +-
 .../locale/ca/LC_MESSAGES/ShareNotice.po      |  10 +-
 .../locale/de/LC_MESSAGES/ShareNotice.po      |  10 +-
 .../locale/fr/LC_MESSAGES/ShareNotice.po      |  10 +-
 .../locale/ia/LC_MESSAGES/ShareNotice.po      |  10 +-
 .../locale/mk/LC_MESSAGES/ShareNotice.po      |  10 +-
 .../locale/nl/LC_MESSAGES/ShareNotice.po      |  10 +-
 .../locale/tl/LC_MESSAGES/ShareNotice.po      |  10 +-
 .../locale/uk/LC_MESSAGES/ShareNotice.po      |  10 +-
 plugins/SimpleUrl/locale/SimpleUrl.pot        |   2 +-
 .../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  |  10 +-
 .../Sitemap/locale/fr/LC_MESSAGES/Sitemap.po  |  10 +-
 .../Sitemap/locale/ia/LC_MESSAGES/Sitemap.po  |  10 +-
 .../Sitemap/locale/mk/LC_MESSAGES/Sitemap.po  |  10 +-
 .../Sitemap/locale/nl/LC_MESSAGES/Sitemap.po  |  10 +-
 .../Sitemap/locale/ru/LC_MESSAGES/Sitemap.po  |  10 +-
 .../Sitemap/locale/tl/LC_MESSAGES/Sitemap.po  |  10 +-
 .../Sitemap/locale/uk/LC_MESSAGES/Sitemap.po  |  10 +-
 .../locale/SlicedFavorites.pot                |   2 +-
 .../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  |   2 +-
 .../locale/fr/LC_MESSAGES/SphinxSearch.po     |  10 +-
 .../locale/ia/LC_MESSAGES/SphinxSearch.po     |  10 +-
 .../locale/mk/LC_MESSAGES/SphinxSearch.po     |  10 +-
 .../locale/nl/LC_MESSAGES/SphinxSearch.po     |  10 +-
 .../locale/ru/LC_MESSAGES/SphinxSearch.po     |  10 +-
 .../locale/tl/LC_MESSAGES/SphinxSearch.po     |  10 +-
 .../locale/uk/LC_MESSAGES/SphinxSearch.po     |  10 +-
 plugins/SubMirror/locale/SubMirror.pot        |  10 +-
 .../locale/fr/LC_MESSAGES/SubMirror.po        |  18 +-
 .../locale/ia/LC_MESSAGES/SubMirror.po        |  18 +-
 .../locale/mk/LC_MESSAGES/SubMirror.po        |  18 +-
 .../locale/nl/LC_MESSAGES/SubMirror.po        |  18 +-
 .../locale/tl/LC_MESSAGES/SubMirror.po        |  18 +-
 .../locale/uk/LC_MESSAGES/SubMirror.po        |  18 +-
 .../locale/SubscriptionThrottle.pot           |   2 +-
 .../de/LC_MESSAGES/SubscriptionThrottle.po    |  10 +-
 .../es/LC_MESSAGES/SubscriptionThrottle.po    |  10 +-
 .../fr/LC_MESSAGES/SubscriptionThrottle.po    |  10 +-
 .../he/LC_MESSAGES/SubscriptionThrottle.po    |  10 +-
 .../ia/LC_MESSAGES/SubscriptionThrottle.po    |  10 +-
 .../id/LC_MESSAGES/SubscriptionThrottle.po    |  10 +-
 .../mk/LC_MESSAGES/SubscriptionThrottle.po    |  10 +-
 .../nb/LC_MESSAGES/SubscriptionThrottle.po    |  10 +-
 .../nl/LC_MESSAGES/SubscriptionThrottle.po    |  10 +-
 .../ru/LC_MESSAGES/SubscriptionThrottle.po    |  10 +-
 .../tl/LC_MESSAGES/SubscriptionThrottle.po    |  10 +-
 .../uk/LC_MESSAGES/SubscriptionThrottle.po    |  10 +-
 plugins/TabFocus/locale/TabFocus.pot          |   2 +-
 .../locale/br/LC_MESSAGES/TabFocus.po         |  10 +-
 .../locale/es/LC_MESSAGES/TabFocus.po         |  10 +-
 .../locale/fr/LC_MESSAGES/TabFocus.po         |  10 +-
 .../locale/gl/LC_MESSAGES/TabFocus.po         |  10 +-
 .../locale/he/LC_MESSAGES/TabFocus.po         |  10 +-
 .../locale/ia/LC_MESSAGES/TabFocus.po         |  10 +-
 .../locale/id/LC_MESSAGES/TabFocus.po         |  10 +-
 .../locale/mk/LC_MESSAGES/TabFocus.po         |  10 +-
 .../locale/nb/LC_MESSAGES/TabFocus.po         |  10 +-
 .../locale/nl/LC_MESSAGES/TabFocus.po         |  10 +-
 .../locale/ru/LC_MESSAGES/TabFocus.po         |  10 +-
 .../locale/tl/LC_MESSAGES/TabFocus.po         |  10 +-
 .../locale/uk/LC_MESSAGES/TabFocus.po         |  10 +-
 plugins/TightUrl/locale/TightUrl.pot          |   2 +-
 .../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_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  |  10 +-
 .../TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po  |  10 +-
 .../TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po  |  10 +-
 .../TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po  |  10 +-
 .../TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po  |  10 +-
 .../TinyMCE/locale/ia/LC_MESSAGES/TinyMCE.po  |  10 +-
 .../TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po  |  10 +-
 .../TinyMCE/locale/mk/LC_MESSAGES/TinyMCE.po  |  10 +-
 .../TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po  |  10 +-
 .../TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po  |  10 +-
 .../locale/pt_BR/LC_MESSAGES/TinyMCE.po       |  10 +-
 .../TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po  |  10 +-
 .../TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po  |  10 +-
 .../TinyMCE/locale/uk/LC_MESSAGES/TinyMCE.po  |  10 +-
 .../TwitterBridge/locale/TwitterBridge.pot    |  34 +-
 .../locale/br/LC_MESSAGES/TwitterBridge.po    |  42 +-
 .../locale/ca/LC_MESSAGES/TwitterBridge.po    |  42 +-
 .../locale/fa/LC_MESSAGES/TwitterBridge.po    |  42 +-
 .../locale/fr/LC_MESSAGES/TwitterBridge.po    |  42 +-
 .../locale/ia/LC_MESSAGES/TwitterBridge.po    |  42 +-
 .../locale/mk/LC_MESSAGES/TwitterBridge.po    |  42 +-
 .../locale/nl/LC_MESSAGES/TwitterBridge.po    |  42 +-
 .../locale/tr/LC_MESSAGES/TwitterBridge.po    |  42 +-
 .../locale/uk/LC_MESSAGES/TwitterBridge.po    |  42 +-
 .../locale/zh_CN/LC_MESSAGES/TwitterBridge.po |  42 +-
 plugins/UserFlag/locale/UserFlag.pot          |   2 +-
 .../locale/ca/LC_MESSAGES/UserFlag.po         |  10 +-
 .../locale/fr/LC_MESSAGES/UserFlag.po         |  10 +-
 .../locale/ia/LC_MESSAGES/UserFlag.po         |  10 +-
 .../locale/mk/LC_MESSAGES/UserFlag.po         |  10 +-
 .../locale/nl/LC_MESSAGES/UserFlag.po         |  10 +-
 .../locale/pt/LC_MESSAGES/UserFlag.po         |  10 +-
 .../locale/ru/LC_MESSAGES/UserFlag.po         |  10 +-
 .../locale/uk/LC_MESSAGES/UserFlag.po         |  10 +-
 plugins/UserLimit/locale/UserLimit.pot        |   2 +-
 .../locale/br/LC_MESSAGES/UserLimit.po        |  10 +-
 .../locale/de/LC_MESSAGES/UserLimit.po        |  10 +-
 .../locale/es/LC_MESSAGES/UserLimit.po        |  10 +-
 .../locale/fi/LC_MESSAGES/UserLimit.po        |  10 +-
 .../locale/fr/LC_MESSAGES/UserLimit.po        |  10 +-
 .../locale/gl/LC_MESSAGES/UserLimit.po        |  10 +-
 .../locale/he/LC_MESSAGES/UserLimit.po        |  10 +-
 .../locale/ia/LC_MESSAGES/UserLimit.po        |  10 +-
 .../locale/id/LC_MESSAGES/UserLimit.po        |  10 +-
 .../locale/lb/LC_MESSAGES/UserLimit.po        |  10 +-
 .../locale/lv/LC_MESSAGES/UserLimit.po        |  10 +-
 .../locale/mk/LC_MESSAGES/UserLimit.po        |  10 +-
 .../locale/nb/LC_MESSAGES/UserLimit.po        |  10 +-
 .../locale/nl/LC_MESSAGES/UserLimit.po        |  10 +-
 .../locale/pt/LC_MESSAGES/UserLimit.po        |  10 +-
 .../locale/pt_BR/LC_MESSAGES/UserLimit.po     |  10 +-
 .../locale/ru/LC_MESSAGES/UserLimit.po        |  10 +-
 .../locale/tl/LC_MESSAGES/UserLimit.po        |  10 +-
 .../locale/tr/LC_MESSAGES/UserLimit.po        |  10 +-
 .../locale/uk/LC_MESSAGES/UserLimit.po        |  10 +-
 plugins/WikiHashtags/locale/WikiHashtags.pot  |   2 +-
 .../locale/br/LC_MESSAGES/WikiHashtags.po     |  10 +-
 .../locale/de/LC_MESSAGES/WikiHashtags.po     |  10 +-
 .../locale/fr/LC_MESSAGES/WikiHashtags.po     |  10 +-
 .../locale/he/LC_MESSAGES/WikiHashtags.po     |  10 +-
 .../locale/ia/LC_MESSAGES/WikiHashtags.po     |  10 +-
 .../locale/id/LC_MESSAGES/WikiHashtags.po     |  10 +-
 .../locale/mk/LC_MESSAGES/WikiHashtags.po     |  10 +-
 .../locale/nb/LC_MESSAGES/WikiHashtags.po     |  10 +-
 .../locale/nl/LC_MESSAGES/WikiHashtags.po     |  10 +-
 .../locale/pt_BR/LC_MESSAGES/WikiHashtags.po  |  10 +-
 .../locale/ru/LC_MESSAGES/WikiHashtags.po     |  10 +-
 .../locale/tl/LC_MESSAGES/WikiHashtags.po     |  10 +-
 .../locale/tr/LC_MESSAGES/WikiHashtags.po     |  10 +-
 .../locale/uk/LC_MESSAGES/WikiHashtags.po     |  10 +-
 .../WikiHowProfile/locale/WikiHowProfile.pot  |   2 +-
 .../locale/fr/LC_MESSAGES/WikiHowProfile.po   |  10 +-
 .../locale/ia/LC_MESSAGES/WikiHowProfile.po   |  10 +-
 .../locale/mk/LC_MESSAGES/WikiHowProfile.po   |  10 +-
 .../locale/nl/LC_MESSAGES/WikiHowProfile.po   |  10 +-
 .../locale/ru/LC_MESSAGES/WikiHowProfile.po   |  10 +-
 .../locale/tl/LC_MESSAGES/WikiHowProfile.po   |  10 +-
 .../locale/tr/LC_MESSAGES/WikiHowProfile.po   |  10 +-
 .../locale/uk/LC_MESSAGES/WikiHowProfile.po   |  10 +-
 plugins/XCache/locale/XCache.pot              |   2 +-
 .../XCache/locale/br/LC_MESSAGES/XCache.po    |  10 +-
 .../XCache/locale/es/LC_MESSAGES/XCache.po    |  10 +-
 .../XCache/locale/fi/LC_MESSAGES/XCache.po    |  10 +-
 .../XCache/locale/fr/LC_MESSAGES/XCache.po    |  10 +-
 .../XCache/locale/gl/LC_MESSAGES/XCache.po    |  10 +-
 .../XCache/locale/he/LC_MESSAGES/XCache.po    |  10 +-
 .../XCache/locale/ia/LC_MESSAGES/XCache.po    |  10 +-
 .../XCache/locale/id/LC_MESSAGES/XCache.po    |  10 +-
 .../XCache/locale/mk/LC_MESSAGES/XCache.po    |  10 +-
 .../XCache/locale/nb/LC_MESSAGES/XCache.po    |  10 +-
 .../XCache/locale/nl/LC_MESSAGES/XCache.po    |  10 +-
 .../XCache/locale/pt_BR/LC_MESSAGES/XCache.po |  10 +-
 .../XCache/locale/ru/LC_MESSAGES/XCache.po    |  10 +-
 .../XCache/locale/tl/LC_MESSAGES/XCache.po    |  10 +-
 .../XCache/locale/tr/LC_MESSAGES/XCache.po    |  10 +-
 .../XCache/locale/uk/LC_MESSAGES/XCache.po    |  10 +-
 plugins/YammerImport/locale/YammerImport.pot  |   2 +-
 .../locale/br/LC_MESSAGES/YammerImport.po     |  10 +-
 .../locale/fr/LC_MESSAGES/YammerImport.po     |  10 +-
 .../locale/gl/LC_MESSAGES/YammerImport.po     |  10 +-
 .../locale/ia/LC_MESSAGES/YammerImport.po     |  10 +-
 .../locale/mk/LC_MESSAGES/YammerImport.po     |  10 +-
 .../locale/nl/LC_MESSAGES/YammerImport.po     |  10 +-
 .../locale/ru/LC_MESSAGES/YammerImport.po     |  10 +-
 .../locale/tr/LC_MESSAGES/YammerImport.po     |  10 +-
 .../locale/uk/LC_MESSAGES/YammerImport.po     |  10 +-
 1104 files changed, 15732 insertions(+), 12356 deletions(-)
 create mode 100644 plugins/Bookmark/locale/ru/LC_MESSAGES/Bookmark.po
 create mode 100644 plugins/Bookmark/locale/zh_CN/LC_MESSAGES/Bookmark.po
 create mode 100644 plugins/EmailSummary/locale/zh_CN/LC_MESSAGES/EmailSummary.po
 create mode 100644 plugins/Facebook/locale/ca/LC_MESSAGES/Facebook.po

diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index deb8809e07..142ff0c7fe 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Arabic (العربية)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Brion
 # Author: Meno25
@@ -11,19 +11,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:55:43+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:47:36+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 (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
 "2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
 "99) ? 4 : 5 ) ) ) );\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -94,7 +94,7 @@ msgstr "حفظ إعدادت الوصول"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -132,6 +132,7 @@ msgstr "لا صفحة كهذه."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -334,14 +335,15 @@ msgstr "تعذّر تحديث المستخدم."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "ليس للمستخدم ملف شخصي."
 
@@ -686,18 +688,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -708,7 +708,7 @@ msgstr ""
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "المجموعة غير موجودة."
@@ -906,11 +906,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "الاسم المستعار"
 
@@ -1227,28 +1228,27 @@ msgstr ""
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "ابحث عن محتويات في الإشعارات"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "لا ملف بهذه الهوية."
@@ -1418,23 +1418,30 @@ msgstr "لست مُشتركًا بأي أحد."
 msgid "Cannot delete someone else's subscription."
 msgstr "تعذّر حفظ الاشتراك."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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."
@@ -1540,34 +1547,34 @@ msgid "No file uploaded."
 msgstr "لم يُرفع ملف."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr ""
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "فشل تحديث الأفتار."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr ""
 
@@ -1761,8 +1768,9 @@ msgid "Conversation"
 msgstr "محادثة"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "الإشعارات"
 
@@ -1787,7 +1795,7 @@ msgstr ""
 #. 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."
+msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1798,7 +1806,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 #, fuzzy
 msgid "Delete account"
 msgstr "أنشئ حسابًا"
@@ -2343,7 +2351,8 @@ msgstr "استخدم هذا النموذج لتعديل المجموعة."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "كنية غير صالحة: \"%s\""
@@ -2355,7 +2364,7 @@ msgstr "تعذر تحديث المجموعة."
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "تعذّر إنشاء الكنى."
 
@@ -2852,17 +2861,17 @@ msgid "Crop"
 msgstr "مجموعات"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "حُدّث الشعار."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "فشل رفع الشعار."
 
@@ -2922,7 +2931,9 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "الإشعارات التي فضلها %1$s في %2$s!"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "مجموعات"
@@ -3476,7 +3487,7 @@ msgstr "اسم المستخدم أو كلمة السر غير صحيحان."
 msgid "Error setting user. You are probably not authorized."
 msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح."
 
-#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "لُج"
 
@@ -3576,6 +3587,11 @@ msgstr "لست عضوًا في هذه المجموعة"
 msgid "Use this form to create a new group."
 msgstr "استخدم هذا النموذج لإنشاء مجموعة جديدة."
 
+#. TRANS: Group create form validation error.
+#: actions/newgroup.php:199
+msgid "Alias cannot be the same as nickname."
+msgstr ""
+
 #: actions/newmessage.php:71 actions/newmessage.php:234
 msgid "New message"
 msgstr "رسالة جديدة"
@@ -4264,9 +4280,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "الاسم الكامل"
 
@@ -4310,10 +4327,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "الموقع"
 
@@ -4328,9 +4346,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "الوسوم"
 
@@ -4425,7 +4444,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "أنشئ حسابًا"
@@ -4732,7 +4751,7 @@ msgstr "عذرا، رمز دعوة غير صالح."
 msgid "Registration successful"
 msgstr "نجح التسجيل"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "سجّل"
 
@@ -4868,8 +4887,9 @@ msgstr "مسار الملف الشخصي"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "اشترك"
 
@@ -5020,7 +5040,9 @@ msgid "File upload stopped by extension."
 msgstr "أوقفت إضافة رفع الملف."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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 ""
 
@@ -5140,8 +5162,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "إحصاءات"
 
@@ -5272,14 +5295,16 @@ msgid "Group profile"
 msgstr "ملف المجموعة الشخصي"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
+#. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "ملاحظة"
 
@@ -5324,8 +5349,11 @@ msgid "Members"
 msgstr "الأعضاء"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(لا شيء)"
@@ -5935,7 +5963,7 @@ 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:116
+#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -5943,7 +5971,7 @@ 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:120
+#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -5953,7 +5981,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -5984,7 +6012,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -5998,23 +6026,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, fuzzy, php-format
 msgid "%s is not listening to anyone."
 msgstr "%1$s يستمع الآن إلى إشعاراتك على %2$s."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "جابر"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "رسائل قصيرة"
 
@@ -6047,12 +6076,14 @@ msgstr "لا مدخل هوية."
 msgid "Tag %s"
 msgstr "الوسوم"
 
+#. TRANS: H2 for user profile information.
 #: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "ملف المستخدم الشخصي"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "صورة"
 
@@ -6594,26 +6625,26 @@ msgid "Problem saving notice."
 msgstr "مشكلة أثناء حفظ الإشعار."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:914
+#: classes/Notice.php:923
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1013
+#: classes/Notice.php:1022
 #, 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6716,25 +6747,46 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 msgid "Could not create group."
 msgstr "تعذّر إنشاء المجموعة."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:526
+#: classes/User_group.php:530
 msgid "Could not set group URI."
 msgstr "تعذّر إنشاء المجموعة."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:549
+#: classes/User_group.php:553
 msgid "Could not set group membership."
 msgstr "تعذّر ضبط عضوية المجموعة."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:564
+#: classes/User_group.php:568
 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6872,7 +6924,8 @@ msgid "Create an account"
 msgstr "أنشئ حسابًا"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "سجّل"
@@ -6884,7 +6937,8 @@ msgid "Login to the site"
 msgstr "لُج إلى الموقع"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "لُج"
@@ -7120,6 +7174,23 @@ msgstr ""
 msgid "No content for notice %s."
 msgstr "ابحث عن محتويات في الإشعارات"
 
+#: lib/activitymover.php:84
+#, fuzzy, php-format
+msgid "No such user %s."
+msgstr "لا مستخدم كهذا."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7580,7 +7651,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "الموقع: %s"
@@ -7588,7 +7659,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "الصفحة الرئيسية: %s"
@@ -7877,25 +7948,25 @@ msgstr ""
 "tracking - لم يطبق بعد.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 #, 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:158
+#: lib/common.php:164
 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "اذهب إلى المُثبّت."
 
@@ -7987,6 +8058,12 @@ msgstr "تعذّر تحديث تصميمك."
 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 "استخدم هذا النموذج لتعدل تطبيقك."
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "ألغِ تفضيل هذا الإشعار"
@@ -8193,38 +8270,44 @@ msgstr "وسوم في إشعارات مجموعة %s"
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
-#: lib/imagefile.php:72
+#. 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:90
+#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %s."
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
 #, fuzzy
 msgid "Partial upload."
 msgstr "لم يُرفع ملف."
 
-#: lib/imagefile.php:111
+#. 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 ""
 
-#: lib/imagefile.php:160
+#. 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 "لا ملف كهذا."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8236,7 +8319,7 @@ msgstr[4] "ميجابايت"
 msgstr[5] "ميجابايت"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8248,7 +8331,7 @@ msgstr[4] "كيلوبايت"
 msgstr[5] "كيلوبايت"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8273,23 +8356,25 @@ msgstr "مصدر صندوق وارد غير معروف %d."
 msgid "Leave"
 msgstr "غادر"
 
-#: lib/logingroupnav.php:80
+#. TRANS: Title for menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "لُج باسم مستخدم وكلمة سر"
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8320,14 +8405,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8339,7 +8424,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:263
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8366,14 +8451,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "عنوان بريد إلكتروني جديد للإرسال إلى %s"
@@ -8381,7 +8466,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:321
+#: lib/mail.php:313
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8396,34 +8481,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "حالة %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, 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:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8441,7 +8526,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "رسالة خاصة جديدة من %s"
@@ -8450,7 +8535,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8471,7 +8556,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:607
+#: lib/mail.php:599
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "لقد أضاف %s (@%s) إشعارك إلى مفضلاته"
@@ -8481,7 +8566,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8503,7 +8588,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8513,7 +8598,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:680
+#: lib/mail.php:672
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "لقد أرسل %s (@%s) إشعارًا إليك"
@@ -8524,7 +8609,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8836,36 +8921,46 @@ msgstr "وسوم في إشعارات %s"
 msgid "Unknown"
 msgstr "غير معروفة"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "الاشتراكات"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "جميع الاشتراكات"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "المشتركون"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "جميع المشتركين"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "هوية المستخدم"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "عضو منذ"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. TRANS: Label for user statistics.
+#. TRANS: Average count of posts made per day since account registration.
+#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "المُعدّل اليومي"
 
-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "كل المجموعات"
 
@@ -9123,48 +9218,60 @@ msgstr "ألغِ الاشتراك"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "ليس للمستخدم ملف شخصي."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "عدّل الأفتار"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "تصرفات المستخدم"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr "حذف المستخدم قيد التنفيذ..."
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "عدّل إعدادات الملف الشخصي"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "عدّل"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "أرسل رسالة مباشرة إلى هذا المستخدم"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "رسالة"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr "راقب"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "دور المستخدم"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "إداري"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "مراقب"
@@ -9274,13 +9381,13 @@ msgstr[4] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرف
 msgstr[5] "هذه طويلة جدًا. أطول حجم للإشعار %d  حرفًا."
 
 #. TRANS: Exception.
-#: lib/xrd.php:64
+#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "حجم غير صالح."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
@@ -9289,30 +9396,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "No such group"
-#~ msgstr "لا مجموعة كهذه"
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "لم يتم العثور على وسيلة API."
-
-#~ msgid "Reset"
-#~ msgstr "أعد الضبط"
-
-#, fuzzy
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6 حروف أو أكثر. مطلوب."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "نفس كلمة السر أعلاه. مطلوب."
-
-#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-#~ msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "%s ليس لونًا صحيحًا!"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index 717851daee..d04af4271e 100644
--- a/locale/arz/LC_MESSAGES/statusnet.po
+++ b/locale/arz/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Egyptian Spoken Arabic (مصرى)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Dudi
 # Author: Ghaly
@@ -11,19 +11,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:55:48+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:47:38+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 (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: arz\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -97,7 +97,7 @@ msgstr "اذف إعدادت الموقع"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 #, fuzzy
@@ -136,6 +136,7 @@ msgstr "لا وسم كهذا."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -338,14 +339,15 @@ msgstr "تعذّر تحديث المستخدم."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "ليس للمستخدم ملف شخصى."
 
@@ -692,18 +694,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -714,7 +714,7 @@ msgstr ""
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "لم يوجد."
@@ -913,11 +913,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "الاسم المستعار"
 
@@ -1236,28 +1237,27 @@ msgstr ""
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "ابحث عن محتويات فى الإشعارات"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "لا ملف بهذه الهويه."
@@ -1429,23 +1429,30 @@ msgstr "لست مُشتركًا بأى أحد."
 msgid "Cannot delete someone else's subscription."
 msgstr "تعذّر حفظ الاشتراك."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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."
@@ -1552,34 +1559,34 @@ msgid "No file uploaded."
 msgstr "لا ملف شخصى مُحدّد."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr ""
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "فشل تحديث الأفتار."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr ""
 
@@ -1775,8 +1782,9 @@ msgid "Conversation"
 msgstr "محادثة"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "الإشعارات"
 
@@ -1801,7 +1809,7 @@ msgstr ""
 #. 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."
+msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1812,7 +1820,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 #, fuzzy
 msgid "Delete account"
 msgstr "أنشئ مجموعه جديدة"
@@ -2363,7 +2371,8 @@ msgstr "استخدم هذا النموذج لتعديل المجموعه."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "كنيه غير صالحة: \"%s\""
@@ -2375,7 +2384,7 @@ msgstr "تعذر تحديث المجموعه."
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "تعذّر إنشاء الكنى."
 
@@ -2883,17 +2892,17 @@ msgid "Crop"
 msgstr "مجموعات"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "حُدّث الشعار."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "فشل رفع الشعار."
 
@@ -2954,7 +2963,9 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "مجموعات"
@@ -3507,7 +3518,7 @@ msgstr "اسم المستخدم أو كلمه السر غير صحيحان."
 msgid "Error setting user. You are probably not authorized."
 msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح."
 
-#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "لُج"
 
@@ -3607,6 +3618,11 @@ msgstr "لست عضوا فى تلك المجموعه."
 msgid "Use this form to create a new group."
 msgstr "استخدم هذا النموذج لإنشاء مجموعه جديده."
 
+#. TRANS: Group create form validation error.
+#: actions/newgroup.php:199
+msgid "Alias cannot be the same as nickname."
+msgstr ""
+
 #: actions/newmessage.php:71 actions/newmessage.php:234
 msgid "New message"
 msgstr "رساله جديدة"
@@ -4292,9 +4308,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "الاسم الكامل"
 
@@ -4337,10 +4354,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "الموقع"
 
@@ -4355,9 +4373,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "الوسوم"
 
@@ -4452,7 +4471,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "أنشئ مجموعه جديدة"
@@ -4760,7 +4779,7 @@ msgstr "عذرا، رمز دعوه غير صالح."
 msgid "Registration successful"
 msgstr "نجح التسجيل"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "سجّل"
 
@@ -4896,8 +4915,9 @@ msgstr "مسار الملف الشخصي"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "اشترك"
 
@@ -5048,7 +5068,9 @@ msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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 ""
 
@@ -5169,8 +5191,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "إحصاءات"
 
@@ -5303,14 +5326,16 @@ msgid "Group profile"
 msgstr "ملف المجموعه الشخصي"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
+#. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "ملاحظة"
 
@@ -5355,8 +5380,11 @@ msgid "Members"
 msgstr "الأعضاء"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(لا شيء)"
@@ -5972,7 +6000,7 @@ 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:116
+#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -5980,7 +6008,7 @@ 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:120
+#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -5990,7 +6018,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6021,7 +6049,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6035,23 +6063,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, fuzzy, php-format
 msgid "%s is not listening to anyone."
 msgstr "لست مُشتركًا بأى أحد."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "جابر"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "رسائل قصيرة"
 
@@ -6084,12 +6113,14 @@ msgstr "لا مدخل هويه."
 msgid "Tag %s"
 msgstr "الوسوم"
 
+#. TRANS: H2 for user profile information.
 #: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "ملف المستخدم الشخصي"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "صورة"
 
@@ -6631,26 +6662,26 @@ msgid "Problem saving notice."
 msgstr "مشكله أثناء حفظ الإشعار."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:914
+#: classes/Notice.php:923
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1013
+#: classes/Notice.php:1022
 #, 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "آر تى @%1$s %2$s"
@@ -6752,26 +6783,47 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 msgid "Could not create group."
 msgstr "تعذّر إنشاء المجموعه."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:526
+#: classes/User_group.php:530
 msgid "Could not set group URI."
 msgstr "تعذّر إنشاء المجموعه."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:549
+#: classes/User_group.php:553
 msgid "Could not set group membership."
 msgstr "تعذّر ضبط عضويه المجموعه."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:564
+#: classes/User_group.php:568
 #, 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6915,7 +6967,8 @@ msgid "Create an account"
 msgstr "أنشئ مجموعه جديدة"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 #, fuzzy
 msgctxt "MENU"
 msgid "Register"
@@ -6929,7 +6982,8 @@ msgid "Login to the site"
 msgstr "لُج إلى الموقع"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 #, fuzzy
 msgctxt "MENU"
 msgid "Login"
@@ -7171,6 +7225,23 @@ msgstr ""
 msgid "No content for notice %s."
 msgstr "ابحث عن محتويات فى الإشعارات"
 
+#: lib/activitymover.php:84
+#, fuzzy, php-format
+msgid "No such user %s."
+msgstr "لا مستخدم كهذا."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7638,7 +7709,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "الموقع: %s"
@@ -7646,7 +7717,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "الصفحه الرئيسية: %s"
@@ -7901,25 +7972,25 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 #, 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:158
+#: lib/common.php:164
 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "اذهب إلى المُثبّت."
 
@@ -8011,6 +8082,12 @@ msgstr "تعذّر تحديث تصميمك."
 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 بتاعتك."
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "ألغِ تفضيل هذا الإشعار"
@@ -8217,38 +8294,44 @@ msgstr "عدّل خصائص مجموعه %s"
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
-#: lib/imagefile.php:72
+#. 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:90
+#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %s."
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
 #, fuzzy
 msgid "Partial upload."
 msgstr "رُفع الأفتار."
 
-#: lib/imagefile.php:111
+#. 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 ""
 
-#: lib/imagefile.php:160
+#. 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 "لا ملف كهذا."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8260,7 +8343,7 @@ msgstr[4] "ميجابايت"
 msgstr[5] "ميجابايت"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8272,7 +8355,7 @@ msgstr[4] "كيلوبايت"
 msgstr[5] "كيلوبايت"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8297,24 +8380,26 @@ msgstr "مصدر الـinbox مش معروف %d."
 msgid "Leave"
 msgstr "غادر"
 
-#: lib/logingroupnav.php:80
+#. 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 "اسم مستخدم أو كلمه سر غير صالحه."
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8333,14 +8418,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8352,7 +8437,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:263
+#: lib/mail.php:255
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8369,14 +8454,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, fuzzy, php-format
 msgid "New email address for posting to %s"
 msgstr "أنشئ عنوان بريد إلكترونى لترسل إليه؛ ألغِ القديم."
@@ -8384,7 +8469,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:321
+#: lib/mail.php:313
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8399,35 +8484,35 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "حاله %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 #, 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:472
+#: lib/mail.php:464
 #, 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:493
+#: lib/mail.php:485
 #, php-format
-msgid "You've been nudged by %s"
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8445,7 +8530,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "رساله خاصه جديده من %s"
@@ -8454,7 +8539,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8475,7 +8560,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:607
+#: lib/mail.php:599
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "أرسل لى بريدًا إلكرتونيًا عندما يضيف أحدهم إشعارى مفضله."
@@ -8485,7 +8570,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8507,7 +8592,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8517,7 +8602,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:680
+#: lib/mail.php:672
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
@@ -8528,7 +8613,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8839,36 +8924,46 @@ msgstr "ليس للمستخدم إشعار أخير"
 msgid "Unknown"
 msgstr "مش معروف"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "الاشتراكات"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "جميع الاشتراكات"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "المشتركون"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "جميع المشتركين"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "هويه المستخدم"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "عضو منذ"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. TRANS: Label for user statistics.
+#. TRANS: Average count of posts made per day since account registration.
+#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr ""
 
-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "كل المجموعات"
 
@@ -9127,50 +9222,62 @@ msgstr "ألغِ الاشتراك"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "ليس للمستخدم ملف شخصى."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "عدّل الأفتار"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "تصرفات المستخدم"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr ""
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "عدّل إعدادات الملف الشخصي"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "عدّل"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "أرسل رساله مباشره إلى هذا المستخدم"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "رسالة"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr ""
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 #, fuzzy
 msgid "User role"
 msgstr "ملف المستخدم الشخصي"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 #, fuzzy
 msgctxt "role"
 msgid "Administrator"
 msgstr "الإداريون"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr ""
@@ -9280,13 +9387,13 @@ msgstr[4] "هذا الملف كبير جدًا. إن أقصى حجم للملف
 msgstr[5] "هذا الملف كبير جدًا. إن أقصى حجم للملفات هو %d."
 
 #. TRANS: Exception.
-#: lib/xrd.php:64
+#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "حجم غير صالح."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
@@ -9295,22 +9402,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "No such group"
-#~ msgstr "لا مجموعه كهذه"
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "الـ API method مش موجوده."
-
-#~ msgid "Reset"
-#~ msgstr "أعد الضبط"
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6 حروف أو أكثر. مطلوب."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "نفس كلمه السر أعلاه. مطلوب."
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "%s ليس لونًا صحيحًا!"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index ce865ea049..6cb8c4cd2c 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Bulgarian (Български)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: DCLXVI
 # Author: Turin
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:55:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:47:39+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 (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: bg\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -91,7 +91,7 @@ msgstr "Запазване настройките за достъп"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -129,6 +129,7 @@ msgstr "Няма такака страница."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -329,14 +330,15 @@ msgstr "Грешка при обновяване на потребителя."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Потребителят няма профил."
 
@@ -670,18 +672,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -692,7 +692,7 @@ msgstr ""
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Групата не е открита."
@@ -889,11 +889,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Псевдоним"
 
@@ -1200,28 +1201,27 @@ msgstr ""
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Търсене в съдържанието на бележките"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Не е открита бележка с такъв идентификатор."
@@ -1390,23 +1390,30 @@ msgstr "Не сте абонирани за този профил"
 msgid "Cannot delete someone else's subscription."
 msgstr "Грешка при добавяне на нов абонамент."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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."
@@ -1513,34 +1520,34 @@ msgid "No file uploaded."
 msgstr "Няма качен файл."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr ""
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Неуспешно обновяване на аватара."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr ""
 
@@ -1734,8 +1741,9 @@ msgid "Conversation"
 msgstr "Разговор"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Бележки"
 
@@ -1760,7 +1768,7 @@ msgstr ""
 #. 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."
+msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1771,7 +1779,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 #, fuzzy
 msgid "Delete account"
 msgstr "Създаване на нова сметка"
@@ -2329,7 +2337,8 @@ msgstr "Използвайте тази бланка за създаване н
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Неправилен псевдоним: \"%s\""
@@ -2341,7 +2350,7 @@ msgstr "Грешка при обновяване на групата."
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 #, fuzzy
 msgid "Could not create aliases."
 msgstr "Грешка при отбелязване като любима."
@@ -2847,18 +2856,18 @@ msgid "Crop"
 msgstr "Изрязване"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 #, 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "Лотого е обновено."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "Неуспешно обновяване на логото."
 
@@ -2919,7 +2928,9 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Бележки от %1$s в %2$s."
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Групи"
@@ -3496,7 +3507,7 @@ msgstr "Грешно име или парола."
 msgid "Error setting user. You are probably not authorized."
 msgstr "Забранено."
 
-#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Вход"
 
@@ -3604,6 +3615,11 @@ msgstr "Не членувате в тази група."
 msgid "Use this form to create a new group."
 msgstr "Използвайте тази бланка за създаване на нова група."
 
+#. TRANS: Group create form validation error.
+#: actions/newgroup.php:199
+msgid "Alias cannot be the same as nickname."
+msgstr ""
+
 #: actions/newmessage.php:71 actions/newmessage.php:234
 msgid "New message"
 msgstr "Ново съобщение"
@@ -4292,9 +4308,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "Пълно име"
 
@@ -4334,10 +4351,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "Местоположение"
 
@@ -4352,9 +4370,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "Етикети"
 
@@ -4446,7 +4465,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Създаване на нова сметка"
@@ -4749,7 +4768,7 @@ msgstr "Грешка в кода за потвърждение."
 msgid "Registration successful"
 msgstr "Записването е успешно."
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Регистриране"
 
@@ -4904,8 +4923,9 @@ msgstr "Адрес на профила"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "Абониране"
 
@@ -5057,7 +5077,9 @@ msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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 "Системна грешка при качване на файл."
 
@@ -5175,8 +5197,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Статистики"
 
@@ -5304,14 +5327,16 @@ msgid "Group profile"
 msgstr "Профил на групата"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
+#. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Бележка"
 
@@ -5356,8 +5381,11 @@ msgid "Members"
 msgstr "Членове"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Без)"
@@ -5957,7 +5985,7 @@ 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:116
+#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -5965,7 +5993,7 @@ 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:120
+#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -5975,7 +6003,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6006,7 +6034,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6020,23 +6048,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s не получава ничии бележки."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "SMS"
 
@@ -6069,12 +6098,14 @@ msgstr "Липсват аргументи return-to."
 msgid "Tag %s"
 msgstr "Етикети"
 
+#. TRANS: H2 for user profile information.
 #: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Потребителски профил"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Снимка"
 
@@ -6623,26 +6654,26 @@ msgid "Problem saving notice."
 msgstr "Проблем при записване на бележката."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:914
+#: classes/Notice.php:923
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1013
+#: classes/Notice.php:1022
 #, 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6747,25 +6778,46 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 msgid "Could not create group."
 msgstr "Грешка при създаване на групата."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:526
+#: classes/User_group.php:530
 msgid "Could not set group URI."
 msgstr "Грешка при създаване на групата."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:549
+#: classes/User_group.php:553
 msgid "Could not set group membership."
 msgstr "Грешка при създаване на групата."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:564
+#: classes/User_group.php:568
 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6906,7 +6958,8 @@ msgid "Create an account"
 msgstr "Създаване на нова сметка"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Регистриране"
@@ -6918,7 +6971,8 @@ msgid "Login to the site"
 msgstr "Влизане в сайта"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Вход"
@@ -7155,6 +7209,23 @@ msgstr ""
 msgid "No content for notice %s."
 msgstr "Търсене в съдържанието на бележките"
 
+#: lib/activitymover.php:84
+#, fuzzy, php-format
+msgid "No such user %s."
+msgstr "Няма такъв потребител"
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7619,7 +7690,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Местоположение: %s"
@@ -7627,7 +7698,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Домашна страница: %s"
@@ -7866,26 +7937,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 #, 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:158
+#: lib/common.php:164
 #, 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Влизане в сайта"
@@ -7981,6 +8052,12 @@ msgstr "Грешка при обновяване на потребителя."
 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 "Използвайте тази бланка за създаване на нова група."
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "Отбелязване като любимо"
@@ -8180,35 +8257,41 @@ msgstr "Етикети в бележките към групата %s"
 msgid "This page is not available in a media type you accept"
 msgstr "Страницата не е достъпна във вида медия, който приемате"
 
-#: lib/imagefile.php:72
+#. 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:90
+#: lib/imagefile.php:91
 #, fuzzy, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Може да качите лого за групата ви."
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Частично качване на файла."
 
-#: lib/imagefile.php:111
+#. 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 "Файлът не е изображение или е повреден."
 
-#: lib/imagefile.php:160
+#. 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 "Няма такъв файл."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8216,7 +8299,7 @@ msgstr[0] "MB"
 msgstr[1] "MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8224,7 +8307,7 @@ msgstr[0] "kB"
 msgstr[1] "kB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8245,23 +8328,25 @@ msgstr "Непознат език \"%s\"."
 msgid "Leave"
 msgstr "Напускане"
 
-#: lib/logingroupnav.php:80
+#. TRANS: Title for menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Вход с име и парола"
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8280,14 +8365,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8299,7 +8384,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:263
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8326,14 +8411,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Нов адрес на е-поща за публикщуване в %s"
@@ -8341,7 +8426,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:321
+#: lib/mail.php:313
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8356,34 +8441,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "Състояние на %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, 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:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8401,7 +8486,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "Ново лично съобщение от %s"
@@ -8410,7 +8495,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8431,7 +8516,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:607
+#: lib/mail.php:599
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) отбеляза бележката ви като любима"
@@ -8441,7 +8526,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8463,7 +8548,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8473,7 +8558,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:680
+#: lib/mail.php:672
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) отбеляза бележката ви като любима"
@@ -8484,7 +8569,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8791,37 +8876,47 @@ msgstr "Етикети в бележките на %s"
 msgid "Unknown"
 msgstr "Непознато"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Абонаменти"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Всички абонаменти"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Абонати"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Всички абонати"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 #, fuzzy
 msgid "User ID"
 msgstr "Потребител"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Участник от"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. TRANS: Label for user statistics.
+#. TRANS: Average count of posts made per day since account registration.
+#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr ""
 
-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Всички групи"
 
@@ -9078,49 +9173,61 @@ msgstr "Отписване"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Потребителят няма профил."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "Редактиране на аватара"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "Потребителски действия"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr ""
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "Редактиране на профила"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "Редактиране"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "Изпращате на пряко съобщение до този потребител."
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "Съобщение"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 #, fuzzy
 msgid "Moderate"
 msgstr "Модератор"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "Потребителска роля"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "Администратор"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "Модератор"
@@ -9214,13 +9321,13 @@ msgstr[1] ""
 "$d."
 
 #. TRANS: Exception.
-#: lib/xrd.php:64
+#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Неправилен размер."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
@@ -9229,31 +9336,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "No such group"
-#~ msgstr "Няма такава група"
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "Не е открит методът в API."
-
-#~ msgid "Reset"
-#~ msgstr "Обновяване"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr ""
-#~ "От 1 до 64 малки букви или цифри, без пунктоация и интервали. "
-#~ "Задължително поле."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6 или повече знака. Задължително поле."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "Същото като паролата по-горе. Задължително поле."
-
-#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-#~ msgstr "От 1 до 64 малки букви или цифри, без пунктоация и интервали"
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "%s не е допустим цвят!"
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index c40fb0c47e..810dd18b7e 100644
--- a/locale/br/LC_MESSAGES/statusnet.po
+++ b/locale/br/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Fohanno
 # Author: Fulup
@@ -12,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:56:01+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:47: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-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -94,7 +94,7 @@ msgstr "Enrollañ an arventennoù moned"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -132,6 +132,7 @@ msgstr "N'eus ket eus ar bajenn-se."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -209,6 +210,8 @@ msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
 "something yourself."
 msgstr ""
+"Klaskit koumanantiñ da vuioc'h a dud, [lakaat hoc'h anv en ur strollad] (%%"
+"action.groups%%) pe postañ un dra bennak hoc'h-unan."
 
 #. 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.
@@ -336,14 +339,15 @@ msgstr "Dibosupl eo hizivaat an implijer."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "An implijer-mañ n'eus profil ebet dezhañ."
 
@@ -396,7 +400,6 @@ msgstr "Dibosupl eo hizivaat ho design."
 
 #. TRANS: Title for Atom feed.
 #: actions/apiatomservice.php:85
-#, fuzzy
 msgctxt "ATOM"
 msgid "Main"
 msgstr "Pennañ"
@@ -427,13 +430,13 @@ msgstr "Koumanantoù %s"
 #. 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 "Pennrolloù"
+msgstr "%s Pennrolloù"
 
 #. 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 "Izili ar strollad %s"
 
@@ -506,12 +509,11 @@ msgstr ""
 
 #. TRANS: Client error displayed trying to direct message self (403).
 #: actions/apidirectmessagenew.php:154
-#, fuzzy
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 "Na gasit ket a gemennadenn deoc'h c'hwi ho unan ; lavarit an traoù-se en ho "
-"penn kentoc'h."
+"penn kentoc'h..."
 
 #. 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.
@@ -568,7 +570,6 @@ 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
-#, fuzzy
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Rankout a reoc'h reiñ daou id pe lesanv."
 
@@ -621,7 +622,6 @@ msgstr "N'eo ket chomlec'h al lec'hienn personel un URL reizh."
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
 #: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
-#, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Re hir eo an anv klok (255 arouezenn d'ar muiañ)."
 
@@ -636,7 +636,7 @@ msgstr "Re hir eo an anv klok (255 arouezenn d'ar muiañ)."
 #: actions/apigroupcreate.php:201 actions/editapplication.php:201
 #: actions/editgroup.php:209 actions/newapplication.php:178
 #: actions/newgroup.php:156
-#, fuzzy, php-format
+#, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
 msgstr[0] "Re hir eo an deskrivadur (%d arouezenn d'ar muiañ)."
@@ -649,7 +649,6 @@ msgstr[1] "Re hir eo an deskrivadur (%d arouezenn d'ar muiañ)."
 #: actions/apigroupcreate.php:215 actions/editgroup.php:216
 #: actions/newgroup.php:163 actions/profilesettings.php:265
 #: actions/register.php:235
-#, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Re hir eo al lec'hiadur (255 arouezenn d'ar muiañ)."
 
@@ -661,7 +660,7 @@ msgstr "Re hir eo al lec'hiadur (255 arouezenn d'ar muiañ)."
 #. TRANS: %d is the maximum number of allowed aliases.
 #: actions/apigroupcreate.php:236 actions/editgroup.php:229
 #: actions/newgroup.php:176
-#, fuzzy, php-format
+#, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
 msgstr[0] "Re a aliasoù ! %d d'ar muiañ."
@@ -677,18 +676,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Ne c'hell ket an alias bezañ ar memes hini eget al lesanv."
 
@@ -699,7 +696,7 @@ msgstr "Ne c'hell ket an alias bezañ ar memes hini eget al lesanv."
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "N'eo ket bet kavet ar strollad."
@@ -789,15 +786,13 @@ 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
-#, fuzzy
 msgid "Invalid request token."
-msgstr "Fichenn direizh."
+msgstr "Jedouer reked direizh."
 
 #. 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'oc'h ket aotreet."
+msgstr "Aotreet eo bet ar jedouer reked dija."
 
 #. 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.
@@ -893,11 +888,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Lesanv"
 
@@ -955,6 +951,8 @@ msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
 msgstr ""
+"Distroit d'an arload, mar plij, hag ebarzhit ar c'hod surentez amañ dindan "
+"evit echuiñ an argerzh."
 
 #. 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.
@@ -971,6 +969,8 @@ msgid ""
 "Please return to %s and enter the following security code to complete the "
 "process."
 msgstr ""
+"Distroit d'an arload %s, mar plij, hag ebarzhit ar c'hod surentez amañ "
+"dindan evit echuiñ an argerzh."
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
@@ -1016,16 +1016,15 @@ msgstr "Kemenn bet adkemeret dija."
 #: actions/atompubshowmembership.php:116
 #: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
-#, fuzzy
 msgid "HTTP method not supported."
-msgstr "N'eo ket bet kavet an hentenn API !"
+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
+#, php-format
 msgid "Unsupported format: %s"
-msgstr "Diembreget eo ar furmad-se."
+msgstr "Diembreget eo ar furmad : %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
 #: actions/apistatusesshow.php:155
@@ -1040,25 +1039,24 @@ 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 ""
+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
-#, fuzzy
 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
-#, fuzzy, php-format
+#, php-format
 msgid "Deleted notice %d"
-msgstr "Dilemel un ali"
+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 ""
+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.
@@ -1201,28 +1199,27 @@ msgstr ""
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Klask alioù en danvez"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
@@ -1234,9 +1231,8 @@ 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
-#, fuzzy
 msgid "User not found."
-msgstr "N'eo ket bet kavet an hentenn API !"
+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.
@@ -1249,9 +1245,8 @@ msgstr "N'eus ket eus ar profil-se."
 #. 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 "Dibosupl eo dilemel ar c'houmanant."
+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
@@ -1267,15 +1262,13 @@ msgstr "Klask alioù en danvez"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
 #: actions/atompubfavoritefeed.php:259
-#, fuzzy
 msgid "Unknown note."
-msgstr "Dianav"
+msgstr "Notenn dianav."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
 #: actions/atompubfavoritefeed.php:267
-#, fuzzy
 msgid "Already a favorite."
-msgstr "Ouzhpennañ d'ar pennrolloù"
+msgstr "Er pennroll dija."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
@@ -1299,20 +1292,18 @@ msgstr "Klask alioù en danvez"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
 #: actions/atompubmembershipfeed.php:259
-#, fuzzy
 msgid "Unknown group."
-msgstr "Dianav"
+msgstr "Strollad dianav."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
 #: actions/atompubmembershipfeed.php:267
-#, fuzzy
 msgid "Already a member."
-msgstr "An holl izili"
+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 ""
+msgstr "Stanket gant ar merour."
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
 #: actions/atompubshowfavorite.php:90
@@ -1322,9 +1313,8 @@ msgstr "Restr ezvezant."
 
 #. 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 "Diposupl eo dilemel ar pennroll-mañ."
+msgstr "Diposupl eo dilemel pennroll un den all."
 
 #. 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.
@@ -1360,9 +1350,8 @@ 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
-#, fuzzy
 msgid "Not a member."
-msgstr "An holl izili"
+msgstr "N'eo ket ezel."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
@@ -1375,39 +1364,45 @@ msgstr "Dibosupl eo dilemel ar c'houmanant."
 #: actions/atompubshowsubscription.php:72
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
-#, fuzzy, php-format
+#, php-format
 msgid "No such profile id: %d."
-msgstr "N'eus ket eus ar profil-se."
+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
-#, fuzzy, php-format
+#, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
-msgstr "N'oc'h ket koumanantet d'ar profil-se."
+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
-#, fuzzy
 msgid "Cannot delete someone else's subscription."
-msgstr "Dibosupl eo dilemel ar c'houmanant."
+msgstr "Dibosupl eo dilemel koumanant un den all."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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
+#, php-format
 msgid "Unknown profile %s."
-msgstr "Dizanv eo seurt ar restr"
+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
@@ -1450,6 +1445,7 @@ msgstr "Avatar"
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
+"Gallout a rit kargañ hoc'h avatar personel. Ment vrasañ ar restr zo %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.
@@ -1511,47 +1507,46 @@ msgid "No file uploaded."
 msgstr "N'eus bet enporzhiet restr ebet."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: actions/avatarsettings.php:345
 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr "Kollet eo bet roadennoù."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: 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:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
-msgstr ""
+msgstr "Saveteiñ ar gont"
 
 #. 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 "N'eus nemet an implijerien kevreet hag a c'hell adkemer alioù."
+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 ""
+msgstr "Ne c'hallit ket saveteiñ ho kont."
 
 #. TRANS: Information displayed on the backup account page.
 #: actions/backupaccount.php:225
@@ -1565,15 +1560,14 @@ msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:248
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
-msgstr "Background"
+msgstr "Eilenn savete"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
 msgid "Backup your account"
-msgstr ""
+msgstr "Saveteiñ ho kont"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 #: actions/block.php:68
@@ -1709,9 +1703,8 @@ msgstr "Kadarnaet eo bet dija ar chomlec'h-mañ."
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
 #: actions/confirmaddress.php:132
-#, fuzzy
 msgid "Could not delete address confirmation."
-msgstr "Diposubl eo dilemel ar postel kadarnadur."
+msgstr "Dibosubl eo dilemel kadarnadur ar chomlec'h."
 
 #. TRANS: Title for the contact address confirmation action.
 #: actions/confirmaddress.php:150
@@ -1731,47 +1724,44 @@ msgid "Conversation"
 msgstr "Kaozeadenn"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Ali"
 
 #. 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 "N'eus nemet an implijerien kevreet hag a c'hell adkemer alioù."
+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
-#, fuzzy
 msgid "You cannot delete your account."
-msgstr "N'hallit ket diverkañ implijerien."
+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 ""
+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
-#, php-format
-msgid "You must write  \"%s\" exactly in the box."
-msgstr ""
+#, 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
-#, fuzzy
 msgid "Account deleted."
-msgstr "Dilammet eo bet an Avatar."
+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:472
-#, fuzzy
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 msgid "Delete account"
-msgstr "Krouiñ ur gont"
+msgstr "Dilemel ar gont"
 
 #. TRANS: Form text for user deletion form.
 #: actions/deleteaccount.php:279
@@ -1799,15 +1789,14 @@ msgstr "Kadarnaat"
 #. 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 "N'hallit ket diverkañ implijerien."
+msgstr "Ebarzhit \"%s\" evit kadarnaat e fell deoc'h dilemel ho kont."
 
 #. TRANS: Button title for user account deletion.
 #: actions/deleteaccount.php:323
-#, fuzzy
 msgid "Permanently delete your account"
-msgstr "N'hallit ket diverkañ implijerien."
+msgstr "Dilemel ho kont da vat"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 #: actions/deleteapplication.php:62
@@ -1859,9 +1848,8 @@ msgstr "Dilemel ar poelad-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 "Ret eo deoc'h bezañ kevreet evit kuitaat ur strollad"
+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.
@@ -1873,16 +1861,15 @@ 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
-#, fuzzy
 msgid "You are not allowed to delete this group."
-msgstr "N'oc'h ket ezel eus ar strollad-mañ."
+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
-#, fuzzy, php-format
+#, php-format
 msgid "Could not delete group %s."
-msgstr "Diposubl eo hizivaat ar strollad."
+msgstr "Dibosubl eo dilemel ar strollad %s."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
@@ -1907,15 +1894,13 @@ 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 c'hemenn-mañ"
+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 "Diverkañ an implijer-mañ"
+msgstr "Dilemel ar strollad-mañ"
 
 #. 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.
@@ -1972,10 +1957,9 @@ msgstr "Ne c'helloc'h nemet dilemel an implijerien lec'hel."
 
 #. TRANS: Title of delete user page.
 #: actions/deleteuser.php:110
-#, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
-msgstr "Diverkañ an implijer"
+msgstr "Dilemel an implijer"
 
 #. TRANS: Fieldset legend on delete user page.
 #: actions/deleteuser.php:134
@@ -1991,9 +1975,8 @@ 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 ar c'hemenn-mañ"
+msgstr "Arabat dilemel an implijer-mañ"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
 #. TRANS: Description of form for deleting a user.
@@ -2019,9 +2002,8 @@ msgstr "URL fall evit al logo."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
 #: actions/designadminpanel.php:333
-#, fuzzy
 msgid "Invalid SSL logo URL."
-msgstr "URL fall evit al logo."
+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.
@@ -2306,7 +2288,8 @@ msgstr "Leunit ar furmskrid-mañ evit kemmañ dibarzhioù ar strollad."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Alias fall : \"%s\""
@@ -2318,7 +2301,7 @@ 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:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "Dibosupl eo krouiñ an aliasoù."
 
@@ -2818,18 +2801,18 @@ msgid "Crop"
 msgstr "Adframmañ"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 #, 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "Logo hizivaet."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "N'eo ket bet kaset da benn an hizivadenn."
 
@@ -2889,7 +2872,9 @@ msgstr "Lakaat an implijer-mañ da verour"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Hizivadenn izili %1$s e %2$s !"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Strolladoù"
@@ -3437,7 +3422,7 @@ 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 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Kevreañ"
 
@@ -3540,6 +3525,12 @@ msgstr "N'oc'h ket ezel eus ar strollad-mañ."
 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:199
+#, 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
 msgid "New message"
 msgstr "Kemennadenn nevez"
@@ -4237,9 +4228,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "Anv klok"
 
@@ -4279,10 +4271,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "Lec'hiadur"
 
@@ -4297,9 +4290,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "Balizennoù"
 
@@ -4393,7 +4387,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Krouiñ ur gont"
@@ -4558,9 +4552,8 @@ msgstr ""
 "a vo kaset deoc'h d'ar chomlec'h postel termenet en ho kont."
 
 #: actions/recoverpassword.php:167
-#, fuzzy
 msgid "You have been identified. Enter a new password below."
-msgstr "Diskleriet oc'h bet. Lakait ur ger-tremen nevez amañ da heul. "
+msgstr "Diskleriet oc'h bet. Lakait ur ger-tremen nevez amañ da heul."
 
 #. TRANS: Fieldset legend for password recovery page.
 #: actions/recoverpassword.php:198
@@ -4705,7 +4698,7 @@ msgstr "Digarezit, kod pedadenn direizh."
 msgid "Registration successful"
 msgstr "Krouet eo bet ar gont."
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Krouiñ ur gont"
 
@@ -4846,8 +4839,9 @@ msgstr "URL ar profil"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "En em enskrivañ"
 
@@ -5000,7 +4994,9 @@ msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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 ""
 
@@ -5117,8 +5113,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Stadegoù"
 
@@ -5244,14 +5241,16 @@ 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:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Notenn"
 
@@ -5295,8 +5294,11 @@ msgid "Members"
 msgstr "Izili"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Hini ebet)"
@@ -5903,7 +5905,7 @@ 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:116
+#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -5911,7 +5913,7 @@ 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:120
+#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -5923,7 +5925,7 @@ 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:129
+#: actions/subscribers.php:127
 #, fuzzy, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -5956,7 +5958,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -5970,23 +5972,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "Ne heuilh %s den ebet."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "SMS"
 
@@ -6019,12 +6022,14 @@ msgstr "Arguzenn ID ebet."
 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"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Skeudenn"
 
@@ -6558,25 +6563,25 @@ 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:914
+#: classes/Notice.php:923
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1013
+#: classes/Notice.php:1022
 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6677,25 +6682,46 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 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:526
+#: classes/User_group.php:530
 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:549
+#: classes/User_group.php:553
 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:564
+#: classes/User_group.php:568
 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6833,7 +6859,8 @@ msgid "Create an account"
 msgstr "Krouiñ ur gont"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "En em enskrivañ"
@@ -6845,7 +6872,8 @@ msgid "Login to the site"
 msgstr "Kevreañ d'al lec'hienn"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Kevreañ"
@@ -7075,6 +7103,23 @@ msgstr ""
 msgid "No content for notice %s."
 msgstr "Klask alioù en danvez"
 
+#: lib/activitymover.php:84
+#, fuzzy, php-format
+msgid "No such user %s."
+msgstr "N'eus ket eus an implijer-se."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7524,7 +7569,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Lec'hiadur : %s"
@@ -7532,7 +7577,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Lec'hienn Web : %s"
@@ -7776,26 +7821,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 #, 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:158
+#: lib/common.php:164
 #, 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "Mont d'ar meziant staliañ"
 
@@ -7886,6 +7931,12 @@ msgstr "Dibosupl eo hizivaat ho design."
 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 : "
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "Tennañ eus ar pennrolloù"
@@ -8087,36 +8138,42 @@ msgstr ""
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
-#: lib/imagefile.php:72
+#. 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:90
+#: 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."
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Enporzhiadenn diglok."
 
-#: lib/imagefile.php:111
+#. 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 ""
 
-#: lib/imagefile.php:160
+#. 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."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8124,7 +8181,7 @@ msgstr[0] "%d&nbsp;Mo"
 msgstr[1] "%d&nbsp;Mo"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8132,7 +8189,7 @@ msgstr[0] "%d&nbsp;Ko"
 msgstr[1] "%d&nbsp;Ko"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8153,24 +8210,26 @@ msgstr "Yezh \"%s\" dizanv."
 msgid "Leave"
 msgstr "Kuitaat"
 
-#: lib/logingroupnav.php:80
+#. 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."
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8189,14 +8248,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8208,7 +8267,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:263
+#: lib/mail.php:255
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8225,14 +8284,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Chomlec'h postel nevez evit embann e %s"
@@ -8240,7 +8299,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:321
+#: lib/mail.php:313
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8255,34 +8314,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "Statud %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, 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:493
-#, php-format
-msgid "You've been nudged by %s"
-msgstr ""
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
+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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8300,7 +8359,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "Kemenadenn personel nevez a-berzh %s"
@@ -8309,7 +8368,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8330,7 +8389,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:607
+#: lib/mail.php:599
 #, 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."
@@ -8340,7 +8399,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8362,7 +8421,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8375,7 +8434,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:680
+#: lib/mail.php:672
 #, 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"
@@ -8386,7 +8445,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8697,36 +8756,46 @@ msgstr "N'eus ali nevez evit an implijer-mañ"
 msgid "Unknown"
 msgstr "Dianav"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Koumanantoù"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "An holl koumanantoù"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Ar re koumanantet"
 
-#: lib/profileaction.php:161
+#. 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"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "ID an implijer"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Ezel abaoe"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. 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"
 
-#: lib/profileaction.php:264
+#. 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ù"
 
@@ -8985,48 +9054,60 @@ msgstr "Digoumanantiñ"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "An implijer-mañ n'eus profil ebet dezhañ."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "Kemmañ an Avatar"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "Obererezh an implijer"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr "Diverkadenn an implijer o vont war-raok..."
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "Kemmañ arventennoù ar profil"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "Aozañ"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "Kas ur gemennadenn war-eeun d'an implijer-mañ"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "Kemennadenn"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr "Habaskaat"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "Rol an implijer"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "Merour"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "Habasker"
@@ -9120,13 +9201,13 @@ msgstr[1] ""
 "arouezenn ho peus lakaet."
 
 #. TRANS: Exception.
-#: lib/xrd.php:64
+#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Ment direizh."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
@@ -9135,30 +9216,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "No such group"
-#~ msgstr "N'eus ket eus ar strollad-se"
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "N'eo ket bet kavet an hentenn API !"
-
-#~ msgid "Reset"
-#~ msgstr "Adderaouekaat"
-
-#, fuzzy
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6 arouezenn pe muioc'h. Rekis."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "Memestra hag ar ger-tremen a-us. Rekis."
-
-#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-#~ msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "n'eo ket %s ul liv reizh !"
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index 077907af09..b42a5321df 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Catalan (Català)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Aleator
 # Author: Brion
@@ -16,17 +16,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:56:11+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:47:42+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 (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -99,7 +99,7 @@ msgstr "Desa els paràmetres d'accés"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -137,6 +137,7 @@ msgstr "No existeix la pàgina."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -347,14 +348,15 @@ msgstr "No s'ha pogut actualitzar l'usuari."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "L'usuari no té perfil."
 
@@ -411,7 +413,6 @@ msgstr "No s'ha pogut actualitzar el vostre disseny."
 
 #. TRANS: Title for Atom feed.
 #: actions/apiatomservice.php:85
-#, fuzzy
 msgctxt "ATOM"
 msgid "Main"
 msgstr "Principal"
@@ -685,18 +686,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "L'àlies no pot ser el mateix que el sobrenom."
 
@@ -707,7 +706,7 @@ msgstr "L'àlies no pot ser el mateix que el sobrenom."
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "No s'ha trobat el grup."
@@ -905,11 +904,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Sobrenom"
 
@@ -1059,7 +1059,6 @@ 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
-#, fuzzy
 msgid "Cannot delete this notice."
 msgstr "No es pot eliminar l'avís."
 
@@ -1214,28 +1213,27 @@ msgstr "L'enviament Atom ha de ser un XML ben format."
 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.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: 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.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "L'avís amb URI «%s» amb ja existeix."
@@ -1261,15 +1259,13 @@ msgstr "No existeix el perfil."
 #. 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 "No es pot afegir la subscripció d'algú altre"
+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
-#, fuzzy
 msgid "Can only handle favorite activities."
-msgstr "Només es poden gestionar les activitats de preferència."
+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
@@ -1295,14 +1291,12 @@ msgstr "%s pertinències a grup"
 
 #. 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 es pot afegir la pertinència d'algú altre"
+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
-#, fuzzy
 msgid "Can only handle join activities."
 msgstr "Només es poden gestionar les activitats d'unió."
 
@@ -1328,9 +1322,8 @@ msgstr "No existeix el preferit."
 
 #. 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 es pot eliminar el preferit d'algú altre"
+msgstr "No es pot eliminar què ha preferit algú altre."
 
 #. 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.
@@ -1366,55 +1359,59 @@ 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
-#, fuzzy
 msgid "Not a member."
-msgstr "No és un membre"
+msgstr "No és un membre."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
-#, fuzzy
 msgid "Cannot delete someone else's membership."
-msgstr "No es pot eliminar la pertinència d'algú altre"
+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
-#, fuzzy, php-format
+#, 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
-#, fuzzy, php-format
+#, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
-msgstr "El perfil %d no està subscrit al perfil %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
-#, fuzzy
 msgid "Cannot delete someone else's subscription."
-msgstr "No es pot eliminar la subscripció d'algú altre"
+msgstr "No es pot eliminar la subscripció d'algú altre."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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
-#, fuzzy, php-format
+#, 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
+#, fuzzy, php-format
+msgid "Already subscribed to %s."
+msgstr "Ja hi esteu subscrit!"
+
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
 msgid "No such attachment."
@@ -1518,7 +1515,7 @@ msgid "No file uploaded."
 msgstr "No s'ha carregat cap fitxer."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: actions/avatarsettings.php:345
 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 "
@@ -1526,41 +1523,42 @@ 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 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:385
+#: 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:389
+#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Error en actualitzar avatar."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
-msgstr ""
+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
-#, fuzzy
 msgid "Only logged-in users can backup their account."
-msgstr "Només els usuaris que han iniciat una sessió poden enviar avisos."
+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 ""
+msgstr "No podeu fer una còpia de seguretat del compte."
 
 #. TRANS: Information displayed on the backup account page.
 #: actions/backupaccount.php:225
@@ -1571,18 +1569,23 @@ msgid ""
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
+"Podeu fer una còpia de seguretat de les dades del vostre compte en format <a "
+"href=\"http://activitystrea.ms/\">Activity Streams</a>. Es tracta d'una "
+"característica experimental i proporciona una còpia de seguretat que no és "
+"completa; informació del compte privada, com ara les adreces electròniques o "
+"de MI, no són incloses. Per altra banda, els fitxers pujats i els missatges "
+"directes tampoc es copien."
 
 #. TRANS: Submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:248
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
-msgstr "Fons"
+msgstr "Còpia de seguretat"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
 msgid "Backup your account"
-msgstr ""
+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
@@ -1741,47 +1744,44 @@ msgid "Conversation"
 msgstr "Conversa"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Avisos"
 
 #. 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 "Només els usuaris que han iniciat una sessió poden enviar avisos."
+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
-#, fuzzy
 msgid "You cannot delete your account."
-msgstr "No podeu eliminar els usuaris."
+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 ""
+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 ""
+#, fuzzy, 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
-#, fuzzy
 msgid "Account deleted."
-msgstr "S'ha eliminat l'avatar."
+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:472
-#, fuzzy
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 msgid "Delete account"
-msgstr "Crea un compte"
+msgstr "Elimina el compte"
 
 #. TRANS: Form text for user deletion form.
 #: actions/deleteaccount.php:279
@@ -1789,6 +1789,8 @@ msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
 msgstr ""
+"Això <strong>eliminarà permanentment</strong> les dades del vostre compte "
+"d'aquest 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.
@@ -1798,6 +1800,8 @@ msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
 "deletion."
 msgstr ""
+"És molt recomanable que <a href=\"%s\">feu una còpia de seguretat de les "
+"vostres dades</a> abans d'eliminar res."
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
@@ -1809,15 +1813,14 @@ msgstr "Confirma"
 #. 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 "No podeu eliminar els usuaris."
+msgstr "Introduïu «%s» per a confirmar que voleu eliminar el vostre compte."
 
 #. TRANS: Button title for user account deletion.
 #: actions/deleteaccount.php:323
-#, fuzzy
 msgid "Permanently delete your account"
-msgstr "No podeu eliminar els usuaris."
+msgstr "Elimina permanentment el compte"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 #: actions/deleteapplication.php:62
@@ -1986,7 +1989,6 @@ msgstr "Només podeu eliminar usuaris locals."
 
 #. TRANS: Title of delete user page.
 #: actions/deleteuser.php:110
-#, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Elimina l'usuari"
@@ -2007,9 +2009,8 @@ 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 grup"
+msgstr "No eliminis aquest usuari"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
 #. TRANS: Description of form for deleting a user.
@@ -2133,7 +2134,6 @@ msgstr "Posa en mosaic la imatge de fons"
 
 #. TRANS: Fieldset legend for theme colors.
 #: actions/designadminpanel.php:598
-#, fuzzy
 msgid "Change colors"
 msgstr "Canvia els colors"
 
@@ -2173,7 +2173,6 @@ msgstr "CSS personalitzat"
 
 #. TRANS: Button text for resetting theme settings.
 #: actions/designadminpanel.php:718
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Utilitza els paràmetres per defecte"
@@ -2209,7 +2208,7 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\"."
 msgstr "No existeix el document «%s»"
 
@@ -2320,7 +2319,8 @@ msgstr "Utilitza aquest formulari per editar el grup."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "L'àlies no és vàlid «%s»"
@@ -2332,7 +2332,7 @@ 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:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "No s'han pogut crear els àlies."
 
@@ -2514,7 +2514,6 @@ msgstr "L'adreça electrònica ja pertany a un altre usuari."
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
 #: actions/emailsettings.php:426 actions/imsettings.php:343
 #: actions/smssettings.php:365
-#, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "No s'ha pogut inserir el codi de confirmació."
 
@@ -2544,7 +2543,6 @@ 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:468 actions/smssettings.php:413
-#, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "No s'ha pogut eliminar la confirmació de correu electrònic."
 
@@ -2572,7 +2570,6 @@ msgstr "No hi ha cap direcció de correu electrònic entrant."
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
 #: actions/emailsettings.php:540 actions/emailsettings.php:565
 #: actions/smssettings.php:564 actions/smssettings.php:587
-#, fuzzy
 msgid "Could not update user record."
 msgstr "No s'ha pogut actualitzar el registre de l'usuari."
 
@@ -2841,17 +2838,17 @@ msgid "Crop"
 msgstr "Retalla"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "Logo actualitzat."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "Error en actualitzar logo."
 
@@ -2911,7 +2908,9 @@ msgstr "Fes aquest usuari administrador"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Actualitzacions dels membres de %1$s el %2$s!"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Grups"
@@ -3125,7 +3124,6 @@ msgstr "Aquesta adreça de missatgeria instantània és incorrecta."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
 #: actions/imsettings.php:391
-#, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "No s'ha pogut eliminar la confirmació de MI."
 
@@ -3350,7 +3348,7 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s s'ha unit al grup %2$s"
@@ -3368,7 +3366,7 @@ msgstr "No ets membre d'aquest grup."
 
 #. TRANS: Title for leave group page after leaving.
 #: actions/leavegroup.php:142
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s ha abandonat el grup %2$s"
@@ -3501,7 +3499,7 @@ msgstr ""
 "S'ha produït un error en definir l'usuari. Probablement no hi esteu "
 "autoritzat."
 
-#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Inici de sessió"
 
@@ -3595,15 +3593,20 @@ 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
-#, fuzzy
 msgid "You are not allowed to create groups on this site."
-msgstr "No teniu permisos per eliminar el grup."
+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:199
+#, fuzzy
+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
 msgid "New message"
 msgstr "Nou missatge"
@@ -4290,9 +4293,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "Nom complet"
 
@@ -4331,10 +4335,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "Ubicació"
 
@@ -4349,9 +4354,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "Etiquetes"
 
@@ -4421,13 +4427,11 @@ msgstr "L'etiqueta no és 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
-#, fuzzy
 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
-#, fuzzy
 msgid "Could not save location prefs."
 msgstr "No s'han pogut desar les preferències d'ubicació."
 
@@ -4444,10 +4448,9 @@ 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:480 actions/restoreaccount.php:60
-#, fuzzy
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 msgid "Restore account"
-msgstr "Crea un compte"
+msgstr "Restaura el compte"
 
 #: actions/public.php:83
 #, php-format
@@ -4614,9 +4617,8 @@ msgstr ""
 "nova a partir de l'adreça electrònica que s'ha associat al vostre compte."
 
 #: actions/recoverpassword.php:167
-#, fuzzy
 msgid "You have been identified. Enter a new password below."
-msgstr "Esteu identificat. Introduïu una contrasenya nova a continuació. "
+msgstr "Esteu identificat. Introduïu una contrasenya nova a continuació."
 
 #. TRANS: Fieldset legend for password recovery page.
 #: actions/recoverpassword.php:198
@@ -4642,7 +4644,6 @@ msgstr "Recupera"
 
 #. TRANS: Button text on password recovery page.
 #: actions/recoverpassword.php:214
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Recupera"
@@ -4670,15 +4671,13 @@ msgstr "Acció desconeguda"
 
 #. 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 caràcters, i no te n'oblidis!"
+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
-#, fuzzy
 msgid "Same as password above."
-msgstr "Igual a la contrasenya de dalt"
+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.
@@ -4733,7 +4732,6 @@ msgstr "La contrasenya i la confirmació no coincideixen."
 
 #. TRANS: Reset password form validation error message.
 #: actions/recoverpassword.php:418
-#, fuzzy
 msgid "Cannot save new password."
 msgstr "No es pot desar la nova contrasenya."
 
@@ -4759,7 +4757,7 @@ msgstr "El codi d'invitació no és vàlid."
 msgid "Registration successful"
 msgstr "Registre satisfactori"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Registre"
 
@@ -4788,9 +4786,8 @@ msgstr ""
 "enllaçar a amics i col·legues. "
 
 #: actions/register.php:437
-#, fuzzy
 msgid "6 or more characters."
-msgstr "6 o més caràcters"
+msgstr "6 o més caràcters."
 
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:445 actions/register.php:449
@@ -4921,8 +4918,9 @@ msgstr "URL del perfil"
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "URL del teu 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "Subscriu-m'hi"
 
@@ -4937,12 +4935,10 @@ msgstr ""
 "XRDS vàlid)."
 
 #: actions/remotesubscribe.php:175
-#, fuzzy
 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
-#, fuzzy
 msgid "Could not get a request token."
 msgstr "No s'ha pogut obtenir un testimoni de sol·licitud."
 
@@ -4955,7 +4951,6 @@ msgid "No notice specified."
 msgstr "No s'ha especificat cap avís."
 
 #: actions/repeat.php:75
-#, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "No podeu repetir el vostre propi avís."
 
@@ -5030,22 +5025,20 @@ 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
-#, fuzzy
 msgid "Only logged-in users can restore their account."
-msgstr "Només els usuaris que han iniciat una sessió poden enviar avisos."
+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
-#, fuzzy
 msgid "You may not restore your account."
-msgstr "No teniu cap aplicació registrada encara."
+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
-#, fuzzy
 msgid "No uploaded file."
-msgstr "Puja un fitxer"
+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
@@ -5084,15 +5077,16 @@ 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.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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
-#, fuzzy
 msgid "Not an Atom feed."
-msgstr "No és un membre"
+msgstr "No és un canal Atom."
 
 #. TRANS: Success message when a feed has been restored.
 #: actions/restoreaccount.php:241
@@ -5100,11 +5094,13 @@ msgid ""
 "Feed has been restored. Your old posts should now appear in search and your "
 "profile page."
 msgstr ""
+"S'ha restaurat el canal. Els apunts antics haurien d'aparèixer ja a la cerca "
+"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 ""
+msgstr "Es restaurarà el perfil. Espereu uns pocs minuts per als resultats."
 
 #. TRANS: Form instructions for feed restore.
 #: actions/restoreaccount.php:342
@@ -5112,12 +5108,13 @@ msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
+"Podeu pujar una còpia de seguretat de flux en format <a href=\"http://"
+"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
-#, fuzzy
 msgid "Upload the file"
-msgstr "Puja un fitxer"
+msgstr "Puja el fitxer"
 
 #: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
@@ -5200,8 +5197,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Estadístiques"
 
@@ -5335,14 +5333,16 @@ 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:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Avisos"
 
@@ -5386,8 +5386,11 @@ msgid "Members"
 msgstr "Membres"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Cap)"
@@ -6004,7 +6007,7 @@ 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:116
+#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6014,7 +6017,7 @@ 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:120
+#: 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?"
@@ -6024,7 +6027,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6057,7 +6060,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6077,23 +6080,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s no escolta a ningú."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "SMS"
 
@@ -6126,12 +6130,14 @@ msgstr "No hi ha cap argument ID."
 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"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
 
@@ -6693,25 +6699,25 @@ 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:914
+#: classes/Notice.php:923
 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:1013
+#: classes/Notice.php:1022
 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6814,25 +6820,46 @@ 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:516
+#: classes/User_group.php:520
 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:526
+#: classes/User_group.php:530
 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:549
+#: classes/User_group.php:553
 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:564
+#: classes/User_group.php:568
 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
+#, fuzzy, php-format
+msgid "Cannot locate account %s."
+msgstr "No podeu eliminar el vostre compte."
+
+#. 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6969,7 +6996,8 @@ msgid "Create an account"
 msgstr "Crea un compte"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registre"
@@ -6981,7 +7009,8 @@ msgid "Login to the site"
 msgstr "Inicia una sessió al lloc"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Inici de sessió"
@@ -7173,54 +7202,70 @@ 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 "Llengua desconeguda «%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 ""
+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
-#, fuzzy
 msgid "Cannot force remote user to subscribe."
-msgstr "Especifiqueu el nom de l'usuari al qual voleu subscriure-us."
+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
-#, fuzzy
 msgid "Unknown profile."
-msgstr "Perfil desconegut %s"
+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 ""
+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
-#, fuzzy
 msgid "User is already a member of this group."
-msgstr "Ja sou membre del grup."
+msgstr "L'usuari ja és membre d'aquest grup."
 
 #. 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
-#, fuzzy, php-format
+#, php-format
 msgid "No content for notice %s."
-msgstr "No hi ha contingut de l'avís %d"
+msgstr "No hi ha contingut a l'avís %s."
+
+#: lib/activitymover.php:84
+#, fuzzy, php-format
+msgid "No such user %s."
+msgstr "No existeix l'usuari."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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
@@ -7382,9 +7427,9 @@ 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
-#, fuzzy
 msgid "Database error updating OAuth application user."
-msgstr "Error de la base de dades en inserir l'usuari de l'aplicació OAuth."
+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
@@ -7510,15 +7555,13 @@ msgid "Revoke"
 msgstr "Revoca"
 
 #: lib/atom10feed.php:113
-#, fuzzy
 msgid "Author element must contain a name element."
-msgstr "l'element autor ha de contenir un element nom."
+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
-#, fuzzy
 msgid "Do not use this method!"
-msgstr "No eliminis aquest grup"
+msgstr "No feu servir aquest mètode!"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7668,7 +7711,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Localització: %s"
@@ -7676,7 +7719,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Pàgina web: %s"
@@ -7952,24 +7995,24 @@ 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:155
+#: lib/common.php:161
 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:158
+#: lib/common.php:164
 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "Vés a l'instal·lador."
 
@@ -8057,6 +8100,12 @@ msgstr "No s'ha pogut actualitzar el vostre disseny."
 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
+#, fuzzy, php-format
+msgid "Unable to find services for %s."
+msgstr "No s'ha pogut revocar l'accés de l'aplicació: %s"
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "Deixa de tenir com a preferit aquest avís"
@@ -8082,17 +8131,16 @@ msgid "FOAF"
 msgstr "FOAF"
 
 #: lib/feedimporter.php:75
-#, fuzzy
 msgid "Not an atom feed."
-msgstr "No és un membre"
+msgstr "No és un canal atom."
 
 #: lib/feedimporter.php:82
 msgid "No author in the feed."
-msgstr ""
+msgstr "No hi ha cap autor al canal."
 
 #: lib/feedimporter.php:89
 msgid "Can't import without a user."
-msgstr ""
+msgstr "No es pot importar sense un usuari."
 
 #. TRANS: Header for feed links (h2).
 #: lib/feedlist.php:66
@@ -8137,11 +8185,11 @@ msgid "Describe the group or topic"
 msgstr "Descriviu el grup o la temàtica"
 
 #: lib/groupeditform.php:162
-#, fuzzy, php-format
+#, 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"
+msgstr[0] "Descriviu el grup o la temàtica en %d caràcter o menys."
+msgstr[1] "Descriviu el grup o la temàtica en %d caràcters o menys."
 
 #: lib/groupeditform.php:174
 msgid ""
@@ -8258,35 +8306,41 @@ msgstr "Etiquetes en els avisos del grup %s"
 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."
 
-#: lib/imagefile.php:72
+#. 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:90
+#: 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."
 
-#: lib/imagefile.php:95
+#. 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."
 
-#: lib/imagefile.php:111
+#. 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."
 
-#: lib/imagefile.php:160
+#. 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."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8294,7 +8348,7 @@ msgstr[0] "%dMB"
 msgstr[1] "%dMB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8302,7 +8356,7 @@ msgstr[0] "%dkB"
 msgstr[1] "%dkB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8323,23 +8377,25 @@ msgstr "Font %d de la safata d'entrada desconeguda."
 msgid "Leave"
 msgstr "Deixa"
 
-#: lib/logingroupnav.php:80
+#. 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"
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8371,14 +8427,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:246
+#: lib/mail.php:238
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s ara està escoltant els teus avisos a %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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8393,7 +8449,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:263
+#: lib/mail.php:255
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8420,14 +8476,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nou correu electrònic per publicar a %s"
@@ -8435,7 +8491,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:321
+#: lib/mail.php:313
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8458,34 +8514,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "%s estat"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, 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:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8513,7 +8569,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "Nou missatge privat de %s"
@@ -8522,7 +8578,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8557,7 +8613,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:607
+#: lib/mail.php:599
 #, 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"
@@ -8567,7 +8623,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8605,7 +8661,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8618,7 +8674,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:680
+#: lib/mail.php:672
 #, 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ó"
@@ -8629,7 +8685,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8964,36 +9020,46 @@ msgstr "Etiquetes en els avisos de %s"
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Subscripcions"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Totes les subscripcions"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Subscriptors"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Tots els subscriptors"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "ID de l'usuari"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Membre des de"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. 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"
 
-#: lib/profileaction.php:264
+#. 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"
 
@@ -9246,48 +9312,60 @@ 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."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "Edita l'avatar"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "Accions de l'usuari"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr "S'està eliminant l'usuari..."
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "Edita la configuració del perfil"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "Edita"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "Envia un missatge directe a aquest usuari"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "Missatge"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr "Modera"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "Rol de l'usuari"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrador"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderador"
@@ -9379,12 +9457,12 @@ 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:64
+#: lib/xrd.php:63
 msgid "Invalid XML."
 msgstr "L'XML no és vàlid."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr "L'XML no és vàlid, hi manca l'arrel XRD."
 
@@ -9393,32 +9471,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 "No such group"
-#~ msgstr "No s'ha trobat el grup."
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "El mètode HTTP no està implementat."
-
-#~ msgid "Reset"
-#~ msgstr "Reinicialitza"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr ""
-#~ "1-64 lletres en minúscula o números, sense puntuacions ni espais. "
-#~ "Requerit."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6 o més caràcters. Requerit."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "Igual a la contrasenya de dalt. Requerit."
-
-#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-#~ msgstr ""
-#~ "1-64 lletres en minúscula o números, sense signes de puntuació o espais"
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "%s no és un color vàlid!"
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 2cf23d5bb7..cdd975a7c0 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Czech (Česky)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Brion
 # Author: Koo6
@@ -11,18 +11,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:56:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:47:44+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 (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: cs\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n >= 2 && n <= 4) ? 1 : "
 "2 );\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -93,7 +93,7 @@ msgstr "uložit nastavení přístupu"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -131,6 +131,7 @@ msgstr "Tady žádná taková stránka není."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -340,14 +341,15 @@ msgstr "Nepodařilo se aktualizovat nastavení uživatele"
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Uživatel nemá profil."
 
@@ -685,18 +687,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Alias nemůže být stejný jako přezdívka."
 
@@ -707,7 +707,7 @@ msgstr "Alias nemůže být stejný jako přezdívka."
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Skupina nebyla nalezena."
@@ -908,11 +908,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Přezdívka"
 
@@ -1222,28 +1223,27 @@ msgstr ""
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: 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.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Oznámení s tímto id neexistuje."
@@ -1413,23 +1413,30 @@ msgstr "Nejste přihlášen k tomuto profilu."
 msgid "Cannot delete someone else's subscription."
 msgstr "Nelze smazat odebírání sebe sama"
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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."
@@ -1535,34 +1542,34 @@ msgid "No file uploaded."
 msgstr "žádný soubor nebyl nahrán."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: actions/avatarsettings.php:345
 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr "Ztratili jsme údaje souboru."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: 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:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr ""
 
@@ -1758,8 +1765,9 @@ msgid "Conversation"
 msgstr "Konverzace"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Sdělení"
 
@@ -1784,7 +1792,7 @@ msgstr ""
 #. 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."
+msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1795,7 +1803,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 #, fuzzy
 msgid "Delete account"
 msgstr "Zaregistrujte se"
@@ -2345,7 +2353,8 @@ msgstr "Použijte tento formulář k úpravám skupiny."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Neplatný alias: \"%s\""
@@ -2357,7 +2366,7 @@ 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:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "Nelze vytvořit aliasy."
 
@@ -2862,17 +2871,17 @@ msgid "Crop"
 msgstr "Oříznout"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "Logo aktualizováno."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "Nepodařilo se aktualizovat logo."
 
@@ -2932,7 +2941,9 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Novinky od členů %1$s na %2$s!"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Skupiny"
@@ -3519,7 +3530,7 @@ msgstr "Neplatné jméno nebo heslo"
 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 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Přihlásit"
 
@@ -3621,6 +3632,12 @@ msgstr "Nejste členem této skupiny."
 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:199
+#, 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
 msgid "New message"
 msgstr "Nová zpráva"
@@ -4320,9 +4337,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "Celé jméno"
 
@@ -4363,10 +4381,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "Umístění"
 
@@ -4381,9 +4400,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "Tagy"
 
@@ -4476,7 +4496,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Zaregistrujte se"
@@ -4642,9 +4662,8 @@ msgstr ""
 "mailovou adresu, kterou jste uložili ve vašem účtu."
 
 #: actions/recoverpassword.php:167
-#, fuzzy
 msgid "You have been identified. Enter a new password below."
-msgstr "Byl jste identifikován. Vložte níže nové heslo. "
+msgstr "Byl jste identifikován. Vložte níže nové heslo."
 
 #. TRANS: Fieldset legend for password recovery page.
 #: actions/recoverpassword.php:198
@@ -4787,7 +4806,7 @@ msgstr "Litujeme, neplatný kód pozvánky."
 msgid "Registration successful"
 msgstr "Registrace úspěšná"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Registrovat"
 
@@ -4945,8 +4964,9 @@ msgstr "Adresa Profilu"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "Odebírat"
 
@@ -5108,7 +5128,9 @@ 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.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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"
 
@@ -5224,8 +5246,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistiky"
 
@@ -5359,14 +5382,16 @@ 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:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Poznámka"
 
@@ -5410,8 +5435,11 @@ msgid "Members"
 msgstr "Členové"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(nic)"
@@ -6022,7 +6050,7 @@ 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:116
+#: actions/subscribers.php:114
 #, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
@@ -6033,7 +6061,7 @@ 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:120
+#: 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í?"
@@ -6043,7 +6071,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6076,7 +6104,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6095,23 +6123,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s nikoho nesleduje."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "SMS"
 
@@ -6144,12 +6173,14 @@ msgstr "Žádný argument ID."
 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"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Fotka"
 
@@ -6711,26 +6742,26 @@ 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:914
+#: classes/Notice.php:923
 #, 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:1013
+#: classes/Notice.php:1022
 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6831,25 +6862,46 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 msgid "Could not create group."
 msgstr "Nelze vytvořit skupinu."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:526
+#: classes/User_group.php:530
 msgid "Could not set group URI."
 msgstr "Nelze nastavit URI skupiny."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:549
+#: classes/User_group.php:553
 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:564
+#: classes/User_group.php:568
 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6986,7 +7038,8 @@ msgid "Create an account"
 msgstr "Zaregistrujte se"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrovat"
@@ -6998,7 +7051,8 @@ msgid "Login to the site"
 msgstr "Přihlásit se na stránky"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Přihlásit"
@@ -7232,6 +7286,23 @@ msgstr ""
 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."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7681,7 +7752,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Poloha: %s"
@@ -7689,7 +7760,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Domovská stránka: %s"
@@ -7964,26 +8035,26 @@ msgstr ""
 "tracking - Dosud neimplementován.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 #, 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:158
+#: lib/common.php:164
 #, 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "Jdi na instalaci."
 
@@ -8076,6 +8147,12 @@ msgstr "Nelze uložit vzhled."
 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."
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "Odebrat toto oznámení z oblíbených"
@@ -8278,35 +8355,41 @@ msgstr "Značky v oznámeních skupiny %s"
 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."
 
-#: lib/imagefile.php:72
+#. 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:90
+#: 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."
 
-#: lib/imagefile.php:95
+#. 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í."
 
-#: lib/imagefile.php:111
+#. 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."
 
-#: lib/imagefile.php:160
+#. 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."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8315,7 +8398,7 @@ msgstr[1] "MB"
 msgstr[2] "MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8324,7 +8407,7 @@ msgstr[1] "kB"
 msgstr[2] "kB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8346,23 +8429,25 @@ msgstr "Neznámý zdroj inboxu %d."
 msgid "Leave"
 msgstr "Opustit"
 
-#: lib/logingroupnav.php:80
+#. 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."
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8394,14 +8479,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8415,7 +8500,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:263
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8442,14 +8527,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nová e-mailová adresa pro psaní na %s"
@@ -8457,7 +8542,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:321
+#: lib/mail.php:313
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8480,34 +8565,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "status %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, 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:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8536,7 +8621,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "Nová soukromá zpráva od %s"
@@ -8545,7 +8630,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8580,7 +8665,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:607
+#: lib/mail.php:599
 #, 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é"
@@ -8590,7 +8675,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8629,7 +8714,7 @@ msgstr ""
 " %6$s \n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8642,7 +8727,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:680
+#: lib/mail.php:672
 #, 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"
@@ -8653,7 +8738,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8985,36 +9070,46 @@ msgstr "Značky v oznámeních %s"
 msgid "Unknown"
 msgstr "Neznámé"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Odběry"
 
-#: lib/profileaction.php:126
+#. 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"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Odběratelé"
 
-#: lib/profileaction.php:161
+#. 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é"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "ID uživatele"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Členem od"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. 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"
 
-#: lib/profileaction.php:264
+#. 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"
 
@@ -9272,48 +9367,60 @@ msgstr "Odhlásit"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Uživatel nemá profil."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "Upravit avatar"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "Akce uživatele"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr "Probíhá mazání uživatele..."
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "Upravit nastavení profilu"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "Editovat"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "Odeslat přímou zprávu tomuto uživateli"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "Zpráva"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr "Moderovat"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "Role uživatele"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrátor"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderátor"
@@ -9408,13 +9515,13 @@ 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: Exception.
-#: lib/xrd.php:64
+#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Neplatná velikost"
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
@@ -9423,29 +9530,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "No such group"
-#~ msgstr "Žádná taková skupina"
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr " API metoda nebyla nalezena."
-
-#~ msgid "Reset"
-#~ msgstr "Reset"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer. Nutné."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6 a více znaků. Nutné."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "Stejné jako heslo uvedeno výše. Povinné."
-
-#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-#~ msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer"
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "%s není platná barva!"
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index b814ba6076..7ef400e1c5 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Apmon
 # Author: Bavatar
@@ -19,17 +19,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:56:20+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:47: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-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -101,7 +101,7 @@ msgstr "Zugangs-Einstellungen speichern"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -139,6 +139,7 @@ msgstr "Seite nicht vorhanden"
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -349,14 +350,15 @@ msgstr "Konnte Benutzerdaten nicht aktualisieren."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Benutzer hat kein Profil."
 
@@ -584,7 +586,6 @@ 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
-#, fuzzy
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Zwei gültige IDs oder Benutzernamen müssen angegeben werden."
 
@@ -692,18 +693,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Alias kann nicht das gleiche wie der Spitzname sein."
 
@@ -714,7 +713,7 @@ msgstr "Alias kann nicht das gleiche wie der Spitzname sein."
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Gruppe nicht gefunden!"
@@ -910,11 +909,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Benutzername"
 
@@ -1065,7 +1065,6 @@ 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 "Die Nachricht konnte nicht gelöscht werden."
 
@@ -1201,54 +1200,52 @@ 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
-#, fuzzy
 msgid "Only the user can add to their own timeline."
-msgstr "Nur der Benutzer selbst kann seinen Posteingang lesen."
+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
 msgid "Only accept AtomPub for Atom feeds."
-msgstr ""
+msgstr "Es wird nur AtomPub als Atom Feed akzeptiert"
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
 #: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
-msgstr ""
+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
 msgid "Atom post must be well-formed XML."
-msgstr ""
+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/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
-msgstr ""
+msgstr "Atom-Post muss ein Atom-Eintrag sein."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
-msgstr ""
+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:347
+#: 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:381
+#: 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.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Nachricht mit URI „%s“ existiert bereits."
@@ -1333,13 +1330,12 @@ 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 ""
+msgstr "blockiert vom Administrator"
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
 #: actions/atompubshowfavorite.php:90
-#, fuzzy
 msgid "No such favorite."
-msgstr "Datei nicht gefunden."
+msgstr "Favorit nicht gefunden."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
 #: actions/atompubshowfavorite.php:151
@@ -1381,7 +1377,6 @@ msgstr "Keine derartige 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 "Kein Mitglied"
 
@@ -1396,7 +1391,7 @@ msgstr "Konnte Selbst-Abonnement nicht löschen."
 #: actions/atompubshowsubscription.php:72
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
-#, fuzzy, php-format
+#, php-format
 msgid "No such profile id: %d."
 msgstr "Keine Profil-Id: %d"
 
@@ -1413,23 +1408,30 @@ msgstr "Du hast dieses Profil nicht abonniert."
 msgid "Cannot delete someone else's subscription."
 msgstr "Konnte Selbst-Abonnement nicht löschen."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
-msgstr ""
+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
-#, fuzzy, php-format
+#, 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."
@@ -1533,37 +1535,37 @@ msgid "No file uploaded."
 msgstr "Keine Datei hoch geladen."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: actions/avatarsettings.php:345
 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"
 
 #. 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr "Daten verloren."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Aktualisierung des Avatars fehlgeschlagen."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
-msgstr ""
+msgstr "Backup-Konto"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
 #: actions/backupaccount.php:79
@@ -1588,10 +1590,9 @@ msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:248
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
-msgstr "Hintergrund"
+msgstr "Backup"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
@@ -1755,8 +1756,9 @@ msgid "Conversation"
 msgstr "Unterhaltung"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Nachrichten"
 
@@ -1768,7 +1770,6 @@ 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
-#, fuzzy
 msgid "You cannot delete your account."
 msgstr "Du kannst keine Benutzer löschen."
 
@@ -1781,21 +1782,19 @@ msgstr ""
 #. 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."
+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 gelöscht."
+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:472
-#, fuzzy
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 msgid "Delete account"
-msgstr "Neues Benutzerkonto erstellen"
+msgstr "Konto löschen"
 
 #. TRANS: Form text for user deletion form.
 #: actions/deleteaccount.php:279
@@ -1999,7 +1998,6 @@ msgstr "Du kannst nur lokale Benutzer löschen."
 
 #. TRANS: Title of delete user page.
 #: actions/deleteuser.php:110
-#, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Benutzer löschen"
@@ -2020,9 +2018,8 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-#, fuzzy
 msgid "Do not delete this user"
-msgstr "Diese Gruppe nicht löschen"
+msgstr "Diesen Benutzer nicht löschen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
 #. TRANS: Description of form for deleting a user.
@@ -2147,7 +2144,6 @@ msgstr "Hintergrundbild kacheln"
 
 #. TRANS: Fieldset legend for theme colors.
 #: actions/designadminpanel.php:598
-#, fuzzy
 msgid "Change colors"
 msgstr "Farben ändern"
 
@@ -2223,7 +2219,7 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\"."
 msgstr "Unbekanntes Dokument „%s“"
 
@@ -2335,7 +2331,8 @@ msgstr "Benutze dieses Formular, um die Gruppe zu bearbeiten."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Ungültiges Stichwort: „%s“"
@@ -2347,7 +2344,7 @@ 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:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "Konnte keinen Favoriten erstellen."
 
@@ -2858,17 +2855,17 @@ msgid "Crop"
 msgstr "Zuschneiden"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "Logo aktualisiert."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "Aktualisierung des Logos fehlgeschlagen."
 
@@ -2928,7 +2925,9 @@ msgstr "Diesen Benutzer zum Admin ernennen"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Aktualisierungen von %1$s auf %2$s!"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Gruppen"
@@ -3521,7 +3520,7 @@ 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 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Anmelden"
 
@@ -3622,6 +3621,12 @@ msgstr "Du darfst diese Gruppe nicht löschen."
 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:199
+#, 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
 msgid "New message"
 msgstr "Neue Nachricht"
@@ -4309,9 +4314,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "Bürgerlicher Name"
 
@@ -4352,10 +4358,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "Aufenthaltsort"
 
@@ -4370,9 +4377,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "Tags"
 
@@ -4465,7 +4473,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Neues Benutzerkonto erstellen"
@@ -4637,9 +4645,8 @@ msgstr ""
 "hinterlegte Email schicken lassen."
 
 #: actions/recoverpassword.php:167
-#, fuzzy
 msgid "You have been identified. Enter a new password below."
-msgstr "Du wurdest identifiziert. Gib ein neues Passwort ein. "
+msgstr "Du wurdest identifiziert. Gib ein neues Passwort ein."
 
 #. TRANS: Fieldset legend for password recovery page.
 #: actions/recoverpassword.php:198
@@ -4697,7 +4704,6 @@ 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
-#, fuzzy
 msgid "Same as password above."
 msgstr "Gleiches Passwort wie zuvor"
 
@@ -4780,7 +4786,7 @@ msgstr "Entschuldigung, ungültiger Einladungscode."
 msgid "Registration successful"
 msgstr "Registrierung erfolgreich"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Registrieren"
 
@@ -4810,7 +4816,6 @@ msgstr ""
 "Nachrichten und Links mit deinen Freunden und Kollegen teilen. "
 
 #: actions/register.php:437
-#, fuzzy
 msgid "6 or more characters."
 msgstr "6 oder mehr Zeichen"
 
@@ -4945,8 +4950,9 @@ msgstr "Profil-URL"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "Abonnieren"
 
@@ -5108,7 +5114,9 @@ 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.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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."
 
@@ -5139,7 +5147,6 @@ 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 "Datei hochladen"
 
@@ -5224,8 +5231,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistik"
 
@@ -5360,14 +5368,16 @@ 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:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Nachricht"
 
@@ -5411,8 +5421,11 @@ msgid "Members"
 msgstr "Mitglieder"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Kein)"
@@ -6027,7 +6040,7 @@ 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:116
+#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6037,7 +6050,7 @@ 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:120
+#: 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?"
@@ -6047,7 +6060,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6080,7 +6093,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6099,23 +6112,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s hat niemanden abonniert."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "SMS"
 
@@ -6148,12 +6162,14 @@ msgstr "Kein ID-Argument."
 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"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
 
@@ -6717,27 +6733,27 @@ 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:914
+#: classes/Notice.php:923
 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:1013
+#: classes/Notice.php:1022
 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6842,25 +6858,46 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 msgid "Could not create group."
 msgstr "Konnte Gruppe nicht erstellen."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:526
+#: classes/User_group.php:530
 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:549
+#: classes/User_group.php:553
 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:564
+#: classes/User_group.php:568
 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6997,7 +7034,8 @@ msgid "Create an account"
 msgstr "Neues Benutzerkonto erstellen"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrieren"
@@ -7009,7 +7047,8 @@ msgid "Login to the site"
 msgstr "Auf der Seite anmelden"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Anmelden"
@@ -7247,6 +7286,23 @@ msgstr ""
 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."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7691,7 +7747,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Standort: %s"
@@ -7699,7 +7755,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Homepage: %s"
@@ -7973,24 +8029,24 @@ msgstr ""
 "tracking - noch nicht implementiert\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 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:158
+#: lib/common.php:164
 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "Zur Installation gehen."
 
@@ -8078,6 +8134,12 @@ msgstr "Konnte dein Design nicht aktualisieren."
 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."
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "Aus Favoriten entfernen"
@@ -8278,35 +8340,41 @@ msgstr "Tags in den Nachrichten der Gruppe „%s“"
 msgid "This page is not available in a media type you accept"
 msgstr "Dies Seite liegt in keinem von dir akzeptierten Mediatype vor."
 
-#: lib/imagefile.php:72
+#. 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:90
+#: 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."
 
-#: lib/imagefile.php:95
+#. 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."
 
-#: lib/imagefile.php:111
+#. 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."
 
-#: lib/imagefile.php:160
+#. 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."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8314,7 +8382,7 @@ msgstr[0] "%d MB"
 msgstr[1] "%d MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8322,7 +8390,7 @@ msgstr[0] "%d KB"
 msgstr[1] "%d KB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8343,23 +8411,25 @@ msgstr "Unbekannte inbox-Quelle %d."
 msgid "Leave"
 msgstr "Verlassen"
 
-#: lib/logingroupnav.php:80
+#. 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"
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8391,14 +8461,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8413,7 +8483,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:263
+#: lib/mail.php:255
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8441,14 +8511,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Neue E-Mail-Adresse, um auf „%s“ zu schreiben"
@@ -8456,7 +8526,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:321
+#: lib/mail.php:313
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8479,19 +8549,19 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "%s Status"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
@@ -8500,15 +8570,15 @@ msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8537,7 +8607,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "Neue private Nachricht von „%s“"
@@ -8546,7 +8616,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8581,7 +8651,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:607
+#: lib/mail.php:599
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) hat deine Nachricht als Favorit gespeichert"
@@ -8591,7 +8661,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8623,7 +8693,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8636,7 +8706,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:680
+#: lib/mail.php:672
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
@@ -8649,7 +8719,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8985,36 +9055,46 @@ msgstr "Tags in den Nachrichten von „%s“"
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Abonnements"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Alle Abonnements"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Abonnenten"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Alle Abonnenten"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "Benutzer-ID"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Mitglied seit"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. 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"
 
-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Alle Gruppen"
 
@@ -9270,48 +9350,60 @@ msgstr "Abbestellen"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Benutzer „%1$s“ (%2$d) hat kein Profil."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "Avatar bearbeiten"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "Benutzeraktionen"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr "Löschung des Benutzers in Arbeit …"
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "Profil-Einstellungen ändern"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "Direkte Nachricht an Benutzer versenden"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "Nachricht"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr "Moderieren"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "Benutzerrolle"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrator"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
@@ -9405,12 +9497,12 @@ msgstr[1] ""
 "Nachricht zu lang - maximal %1$d Zeichen erlaubt, du hast %2$d gesendet."
 
 #. TRANS: Exception.
-#: lib/xrd.php:64
+#: lib/xrd.php:63
 msgid "Invalid XML."
 msgstr "Ungültiges XML."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
@@ -9419,30 +9511,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Hole Backup von der Datei „%s“."
-
-#~ msgid "No such group"
-#~ msgstr "Keine derartige Gruppe"
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "HTTP-Methode wird nicht unterstützt."
-
-#~ msgid "Reset"
-#~ msgstr "Zurücksetzen"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr ""
-#~ "1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen. Pflicht."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6 oder mehr Buchstaben. Pflicht."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "Gleiches Passwort wie zuvor. Pflichteingabe."
-
-#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-#~ msgstr "1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen"
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "„%s“ ist keine gültige Farbe!"
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 42526cb7f3..349bd0b5a4 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to British English (British English)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Brion
 # Author: Bruce89
@@ -13,17 +13,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:56:25+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:47:47+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 (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: en-gb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -94,7 +94,7 @@ msgstr "Save access settings"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -132,6 +132,7 @@ msgstr "No such page."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -341,14 +342,15 @@ msgstr "Could not update user."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "User has no profile."
 
@@ -680,18 +682,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Alias can't be the same as nickname."
 
@@ -702,7 +702,7 @@ msgstr "Alias can't be the same as nickname."
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Group not found."
@@ -901,11 +901,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Nickname"
 
@@ -1211,28 +1212,27 @@ msgstr ""
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: 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.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Notice with that id does not exist."
@@ -1401,23 +1401,30 @@ msgstr "You are not subscribed to that profile."
 msgid "Cannot delete someone else's subscription."
 msgstr "Could not delete self-subscription."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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."
@@ -1523,34 +1530,34 @@ msgid "No file uploaded."
 msgstr "No file uploaded."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: actions/avatarsettings.php:345
 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr "Lost our file data."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Failed updating avatar."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr ""
 
@@ -1746,8 +1753,9 @@ msgid "Conversation"
 msgstr "Conversation"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Notices"
 
@@ -1772,7 +1780,7 @@ msgstr ""
 #. 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."
+msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1783,7 +1791,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 #, fuzzy
 msgid "Delete account"
 msgstr "Create an account"
@@ -2328,7 +2336,8 @@ msgstr "Use this form to edit the group."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Invalid alias: \"%s\""
@@ -2340,7 +2349,7 @@ 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:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "Could not create aliases."
 
@@ -2843,17 +2852,17 @@ msgid "Crop"
 msgstr "Crop"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "Logo updated."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "Failed updating logo."
 
@@ -2913,7 +2922,9 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Updates from members of %1$s on %2$s!"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Groups"
@@ -3497,7 +3508,7 @@ msgstr "Incorrect username or password."
 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 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Login"
 
@@ -3598,6 +3609,12 @@ msgstr "You are not allowed to delete this group."
 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:199
+#, 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
 msgid "New message"
 msgstr "New message"
@@ -4285,9 +4302,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "Full name"
 
@@ -4327,10 +4345,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "Location"
 
@@ -4345,9 +4364,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "Tags"
 
@@ -4439,7 +4459,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Create an account"
@@ -4751,7 +4771,7 @@ msgstr "Sorry, invalid invitation code."
 msgid "Registration successful"
 msgstr "Registration successful"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Register"
 
@@ -4907,8 +4927,9 @@ msgstr "Profile URL"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "Subscribe"
 
@@ -5063,7 +5084,9 @@ msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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."
 
@@ -5179,8 +5202,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistics"
 
@@ -5312,14 +5336,16 @@ 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:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Note"
 
@@ -5363,8 +5389,11 @@ msgid "Members"
 msgstr "Members"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(None)"
@@ -5969,7 +5998,7 @@ 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:116
+#: actions/subscribers.php:114
 #, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
@@ -5980,7 +6009,7 @@ 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:120
+#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -5990,7 +6019,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6023,7 +6052,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6037,23 +6066,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s is not listening to anyone."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "SMS"
 
@@ -6086,12 +6116,14 @@ msgstr "No ID argument."
 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"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Photo"
 
@@ -6637,25 +6669,25 @@ msgid "Problem saving notice."
 msgstr "Problem saving notice."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:914
+#: classes/Notice.php:923
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1013
+#: classes/Notice.php:1022
 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6756,25 +6788,46 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 msgid "Could not create group."
 msgstr "Could not create group."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:526
+#: classes/User_group.php:530
 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:549
+#: classes/User_group.php:553
 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:564
+#: classes/User_group.php:568
 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6911,7 +6964,8 @@ msgid "Create an account"
 msgstr "Create an account"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Register"
@@ -6923,7 +6977,8 @@ msgid "Login to the site"
 msgstr "Login to the site"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Login"
@@ -7157,6 +7212,23 @@ msgstr ""
 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."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7597,7 +7669,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Location: %s"
@@ -7605,7 +7677,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Homepage: %s"
@@ -7873,26 +7945,26 @@ msgstr ""
 "tracking - not yet implemented.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 #, 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:158
+#: lib/common.php:164
 #, 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "Go to the installer."
 
@@ -7981,6 +8053,12 @@ msgstr "Couldn't update your design."
 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."
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "Disfavour this notice"
@@ -8180,35 +8258,41 @@ msgstr "Tags in %s group's notices"
 msgid "This page is not available in a media type you accept"
 msgstr "This page is not available in a media type you accept"
 
-#: lib/imagefile.php:72
+#. 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:90
+#: 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."
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Partial upload."
 
-#: lib/imagefile.php:111
+#. 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."
 
-#: lib/imagefile.php:160
+#. 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."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8216,7 +8300,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8224,7 +8308,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8245,23 +8329,25 @@ msgstr ""
 msgid "Leave"
 msgstr "Leave"
 
-#: lib/logingroupnav.php:80
+#. 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"
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8280,14 +8366,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8299,7 +8385,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:263
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8326,14 +8412,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "New e-mail address for posting to %s"
@@ -8341,7 +8427,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:321
+#: lib/mail.php:313
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8364,34 +8450,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "%s status"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, 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:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8409,7 +8495,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "New private message from %s"
@@ -8418,7 +8504,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8439,7 +8525,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:607
+#: lib/mail.php:599
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) added your notice as a favorite"
@@ -8449,7 +8535,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8471,7 +8557,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8481,7 +8567,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:680
+#: lib/mail.php:672
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) sent a notice to your attention"
@@ -8492,7 +8578,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8795,36 +8881,46 @@ msgstr "Tags in %s's notices"
 msgid "Unknown"
 msgstr "Unknown"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Subscriptions"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "All subscriptions"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Subscribers"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "All subscribers"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "User ID"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Member since"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. TRANS: Label for user statistics.
+#. TRANS: Average count of posts made per day since account registration.
+#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr ""
 
-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "All groups"
 
@@ -9076,48 +9172,60 @@ msgstr "Unsubscribe"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "User %1$s (%2$d) has no profile record."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "Edit Avatar"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "User actions"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr ""
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "Edit profile settings"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "Edit"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "Send a direct message to this user"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "Message"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr "Moderate"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "User role"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrator"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
@@ -9207,13 +9315,13 @@ 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:64
+#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Invalid size."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
@@ -9222,30 +9330,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "No such group"
-#~ msgstr "No such group."
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "API method not found."
-
-#~ msgid "Reset"
-#~ msgstr "Reset"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6 or more characters. Required."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "Same as password above. Required."
-
-#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-#~ msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "%s is not a valid colour!"
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index d4b72d3e9b..0fbd73e560 100644
--- a/locale/eo/LC_MESSAGES/statusnet.po
+++ b/locale/eo/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Esperanto (Esperanto)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AVRS
 # Author: Brion
@@ -17,17 +17,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:56:29+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:47:48+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 (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: eo\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -98,7 +98,7 @@ msgstr "Konservu atingan agordon"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -136,6 +136,7 @@ msgstr "Ne estas tiu paĝo."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -345,14 +346,15 @@ msgstr "Malsukcesis ĝisdatigi uzanton"
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "La uzanto ne havas profilon."
 
@@ -681,18 +683,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "La alinomo devas ne esti sama al la kromnomo."
 
@@ -703,7 +703,7 @@ msgstr "La alinomo devas ne esti sama al la kromnomo."
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Grupo ne troviĝas."
@@ -900,11 +900,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Kromnomo"
 
@@ -1214,28 +1215,27 @@ msgstr ""
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: 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.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Avizo kun tiu identigaĵo ne ekzistas."
@@ -1405,23 +1405,30 @@ msgstr "Vi ne abonis tiun profilon."
 msgid "Cannot delete someone else's subscription."
 msgstr "Ne eblas forigi abonon al vi mem."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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 dosiertipo"
 
+#. 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."
@@ -1527,34 +1534,34 @@ msgid "No file uploaded."
 msgstr "Neniu dosiero alŝutiĝas."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: actions/avatarsettings.php:345
 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr "Perdiĝis nia dosiera datumo."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Eraris ĝisdatigi vizaĝbildon."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr ""
 
@@ -1749,8 +1756,9 @@ msgid "Conversation"
 msgstr "Konversacio"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Avizoj"
 
@@ -1775,7 +1783,7 @@ msgstr ""
 #. 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."
+msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1786,7 +1794,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 #, fuzzy
 msgid "Delete account"
 msgstr "Krei konton"
@@ -2334,7 +2342,8 @@ msgstr "Uzas ĉi tiun formularon por redakti la grupon."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Nevalida alinomo: \"%s\""
@@ -2346,7 +2355,7 @@ 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:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "Malsukcesis krei alinomon."
 
@@ -2845,17 +2854,17 @@ msgid "Crop"
 msgstr "Tranĉi"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "Emblemo ĝisdatigita."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "Malsukcesis ĝisdatigi emblemon."
 
@@ -2915,7 +2924,9 @@ msgstr "Estrigi la uzanton"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Ĝisdatigoj de grupano de %1$s ĉe %2$s!"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Grupoj"
@@ -3496,7 +3507,7 @@ msgstr "Malĝusta uzantnomo aŭ pasvorto."
 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 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Ensaluti"
 
@@ -3596,6 +3607,12 @@ msgstr "Vi ne estas grupano."
 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:199
+#, 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
 msgid "New message"
 msgstr "Nova mesaĝo"
@@ -4276,9 +4293,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "Plena nomo"
 
@@ -4318,10 +4336,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "Loko"
 
@@ -4336,9 +4355,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "Markiloj"
 
@@ -4430,7 +4450,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Krei konton"
@@ -4595,7 +4615,6 @@ msgstr ""
 "la retpoŝtadreso konservita je via konto."
 
 #: actions/recoverpassword.php:167
-#, fuzzy
 msgid "You have been identified. Enter a new password below."
 msgstr "Vi estis identigita. Enigu sube novan pasvorton."
 
@@ -4740,7 +4759,7 @@ msgstr "Pardonon, nevalida invitkodo."
 msgid "Registration successful"
 msgstr "Registriĝo sukcesa"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Registri"
 
@@ -4897,8 +4916,9 @@ msgstr "Profila URL"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "Aboni"
 
@@ -5060,7 +5080,9 @@ msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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."
 
@@ -5156,7 +5178,7 @@ msgstr "Aplikaĵa profilo"
 #. TRANS: Form input field label for application icon.
 #: actions/showapplication.php:159 lib/applicationeditform.php:173
 msgid "Icon"
-msgstr "Ikono"
+msgstr "Bildsimbolo"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
@@ -5176,8 +5198,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistiko"
 
@@ -5309,14 +5332,16 @@ 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:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Noto"
 
@@ -5360,8 +5385,11 @@ msgid "Members"
 msgstr "Grupanoj"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(nenio)"
@@ -5969,7 +5997,7 @@ 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:116
+#: actions/subscribers.php:114
 #, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
@@ -5978,7 +6006,7 @@ 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:120
+#: 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?"
@@ -5988,7 +6016,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6021,7 +6049,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6039,23 +6067,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s ne abonas iun ajn."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "SMS"
 
@@ -6088,12 +6117,14 @@ msgstr "Neniu ID-argumento"
 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"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
 
@@ -6638,26 +6669,26 @@ msgid "Problem saving notice."
 msgstr "Malsukcesis konservi avizon."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:914
+#: classes/Notice.php:923
 #, 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:1013
+#: classes/Notice.php:1022
 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6758,25 +6789,46 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 msgid "Could not create group."
 msgstr "Malsukcesis krei grupon."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:526
+#: classes/User_group.php:530
 msgid "Could not set group URI."
 msgstr "Malsukcesis ĝisdatigi grupan URI."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:549
+#: classes/User_group.php:553
 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:564
+#: classes/User_group.php:568
 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6913,7 +6965,8 @@ msgid "Create an account"
 msgstr "Krei konton"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registriĝi"
@@ -6925,7 +6978,8 @@ msgid "Login to the site"
 msgstr "Ensaluti al la retejo"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Ensaluti"
@@ -7162,6 +7216,23 @@ msgstr ""
 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."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7608,7 +7679,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Loko: %s"
@@ -7616,7 +7687,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Hejmpaĝo: %s"
@@ -7890,26 +7961,26 @@ msgstr ""
 "tracking -ankoraŭ ne realigita.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 #, 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:158
+#: lib/common.php:164
 #, 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "Al la instalilo."
 
@@ -8001,6 +8072,12 @@ msgstr "Malsukcesis ĝisdatigi vian desegnon."
 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."
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "Neŝati la avizon"
@@ -8202,36 +8279,42 @@ msgstr "Etikedoj en avizoj de grupo %s"
 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"
 
-#: lib/imagefile.php:72
+#. 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:90
+#: 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."
 
-#: lib/imagefile.php:95
+#. 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."
 
-#: lib/imagefile.php:111
+#. 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."
 
-#: lib/imagefile.php:160
+#. 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."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8239,7 +8322,7 @@ msgstr[0] "MB"
 msgstr[1] "MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8247,7 +8330,7 @@ msgstr[0] "kB"
 msgstr[1] "kB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8268,23 +8351,25 @@ msgstr "Nekonata alvenkesta fonto %d"
 msgid "Leave"
 msgstr "Forlasi"
 
-#: lib/logingroupnav.php:80
+#. 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."
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8315,14 +8400,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8336,7 +8421,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:263
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8363,14 +8448,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nova retpoŝta adreso por afiŝi ĉe %s"
@@ -8378,7 +8463,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:321
+#: lib/mail.php:313
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8401,34 +8486,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "%s stato"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, 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:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8457,7 +8542,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "Nova privata mesaĝo de %s"
@@ -8466,7 +8551,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8501,7 +8586,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:607
+#: lib/mail.php:599
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) ŝatis vian avizon"
@@ -8511,7 +8596,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8549,7 +8634,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8562,7 +8647,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:680
+#: lib/mail.php:672
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) afiŝis avizon al vi"
@@ -8573,7 +8658,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8906,36 +8991,46 @@ msgstr "Etikedoj en avizoj de %s"
 msgid "Unknown"
 msgstr "Nekonata"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Abonatoj"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Ĉiuj abonatoj"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Abonantoj"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Ĉiuj abonantoj"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "ID de uzanto"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Ano ekde"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. 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"
 
-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Ĉiuj grupoj"
 
@@ -9192,48 +9287,60 @@ msgstr "Malaboni"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "La uzanto ne havas profilon."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "Redakti vizaĝbildon"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "Nekonata ago"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr "Forigante uzanton..."
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "Redakti profilan agordon"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "Redakti"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "Sendi rektan mesaĝon a ĉi tiu uzanto"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "Mesaĝo"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr "Moderigi"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "Uzanta rolo"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administranto"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderanto"
@@ -9323,13 +9430,13 @@ 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:64
+#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Grando nevalida."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
@@ -9338,31 +9445,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "No such group"
-#~ msgstr "Ne estas tiu grupo."
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "Metodo de API ne troviĝas."
-
-#~ msgid "Reset"
-#~ msgstr "Restarigi"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr ""
-#~ "1-64 minusklaj literoj aŭ ciferoj, neniu interpunkcio aŭ spaco. Bezonate."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6 aŭ pli da literoj. Bezonate."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "Same kiel supra pasvorto. Bezonate."
-
-#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-#~ msgstr "1-64 minusklaj literoj aŭ ciferoj, neniu interpunkcio aŭ spaco"
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "%s ne estas valida koloro!"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 155932d023..b99bd515cd 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Brion
 # Author: Crazymadlover
@@ -17,17 +17,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:56:33+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:47:49+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 (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -98,7 +98,7 @@ msgstr "Guardar la configuración de acceso"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -136,6 +136,7 @@ msgstr "No existe tal página."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -346,14 +347,15 @@ msgstr "No se pudo actualizar el usuario."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "El usuario no tiene un perfil."
 
@@ -685,18 +687,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "El alias no puede ser el mismo que el usuario."
 
@@ -707,7 +707,7 @@ msgstr "El alias no puede ser el mismo que el usuario."
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Grupo no encontrado."
@@ -908,11 +908,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Usuario"
 
@@ -1222,28 +1223,27 @@ msgstr ""
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Buscar en el contenido de mensajes"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "No existe ningún mensaje con ese ID."
@@ -1412,23 +1412,30 @@ msgstr "No te has suscrito a ese perfil."
 msgid "Cannot delete someone else's subscription."
 msgstr "No se pudo eliminar la auto-suscripción."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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."
@@ -1532,34 +1539,34 @@ msgid "No file uploaded."
 msgstr "Ningún archivo fue subido."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: actions/avatarsettings.php:345
 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr "Se perdió nuestros datos de archivo."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: 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:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr ""
 
@@ -1756,8 +1763,9 @@ msgid "Conversation"
 msgstr "Conversación"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Mensajes"
 
@@ -1782,7 +1790,7 @@ msgstr ""
 #. 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."
+msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1793,7 +1801,7 @@ msgstr "Imagen borrada."
 
 #. 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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 #, fuzzy
 msgid "Delete account"
 msgstr "Crear una cuenta"
@@ -2342,7 +2350,8 @@ msgstr "Usa este formulario para editar el grupo."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Alias inválido: \"%s\""
@@ -2354,7 +2363,7 @@ 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:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "No fue posible crear alias."
 
@@ -2865,17 +2874,17 @@ msgid "Crop"
 msgstr "Cortar"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "Logo actualizado."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "Error al actualizar el logo."
 
@@ -2935,7 +2944,9 @@ msgstr "Convertir a este usuario en administrador"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "¡Actualizaciones de miembros de %1$s en %2$s!"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Grupos"
@@ -3523,7 +3534,7 @@ msgstr "Nombre de usuario o contraseña incorrectos."
 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 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Inicio de sesión"
 
@@ -3628,6 +3639,12 @@ msgstr "No eres miembro de este grupo."
 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:199
+#, 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
 msgid "New message"
 msgstr "Nuevo Mensaje "
@@ -4330,9 +4347,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "Nombre completo"
 
@@ -4372,10 +4390,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "Ubicación"
 
@@ -4390,9 +4409,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "Etiquetas"
 
@@ -4486,7 +4506,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Crear una cuenta"
@@ -4659,11 +4679,10 @@ msgstr ""
 "correo electrónico que has registrado en tu cuenta."
 
 #: actions/recoverpassword.php:167
-#, fuzzy
 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. "
+"continuación."
 
 #. TRANS: Fieldset legend for password recovery page.
 #: actions/recoverpassword.php:198
@@ -4808,7 +4827,7 @@ msgstr "El código de invitación no es válido."
 msgid "Registration successful"
 msgstr "Registro exitoso."
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Registrarse"
 
@@ -4971,8 +4990,9 @@ msgstr "URL del perfil"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "Suscribirse"
 
@@ -5134,7 +5154,9 @@ 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.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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"
 
@@ -5250,8 +5272,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Estadísticas"
 
@@ -5385,14 +5408,16 @@ 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:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Nota"
 
@@ -5436,8 +5461,11 @@ msgid "Members"
 msgstr "Miembros"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Ninguno)"
@@ -6056,7 +6084,7 @@ 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:116
+#: actions/subscribers.php:114
 #, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
@@ -6067,7 +6095,7 @@ 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:120
+#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -6078,7 +6106,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6111,7 +6139,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6130,23 +6158,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s no está escuchando a nadie."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "SMS"
 
@@ -6179,12 +6208,14 @@ msgstr "No existe argumento de ID."
 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"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
 
@@ -6746,26 +6777,26 @@ 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:914
+#: classes/Notice.php:923
 #, 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:1013
+#: classes/Notice.php:1022
 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6868,25 +6899,46 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 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:526
+#: classes/User_group.php:530
 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:549
+#: classes/User_group.php:553
 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:564
+#: classes/User_group.php:568
 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -7023,7 +7075,8 @@ msgid "Create an account"
 msgstr "Crear una cuenta"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrarse"
@@ -7035,7 +7088,8 @@ msgid "Login to the site"
 msgstr "Iniciar sesión en el sitio"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Inicio de sesión"
@@ -7276,6 +7330,23 @@ msgstr ""
 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."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7726,7 +7797,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Lugar: %s"
@@ -7734,7 +7805,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Página de inicio: %s"
@@ -8008,26 +8079,26 @@ msgstr ""
 "tracking - aún sin implementar.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 #, 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:158
+#: lib/common.php:164
 #, 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "Ir al instalador."
 
@@ -8120,6 +8191,12 @@ msgstr "No fue posible actualizar tu diseño."
 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."
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "Excluir este mensaje de mis favoritos"
@@ -8322,35 +8399,41 @@ msgstr "Etiquetas en mensajes del grupo %s"
 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."
 
-#: lib/imagefile.php:72
+#. 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:90
+#: 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."
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Subida parcial"
 
-#: lib/imagefile.php:111
+#. 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."
 
-#: lib/imagefile.php:160
+#. 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."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8358,7 +8441,7 @@ msgstr[0] "MB"
 msgstr[1] "MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8366,7 +8449,7 @@ msgstr[0] "kB"
 msgstr[1] "kB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8387,23 +8470,25 @@ msgstr "Origen de bandeja de entrada %d desconocido."
 msgid "Leave"
 msgstr "Abandonar"
 
-#: lib/logingroupnav.php:80
+#. 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."
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8435,14 +8520,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8457,7 +8542,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:263
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8486,14 +8571,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nueva dirección de correo para postear a %s"
@@ -8501,7 +8586,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:321
+#: lib/mail.php:313
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8524,34 +8609,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "estado de %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, 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:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8580,7 +8665,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "Nuevo mensaje privado de %s"
@@ -8589,7 +8674,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8624,7 +8709,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:607
+#: lib/mail.php:599
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) agregó tu mensaje a los favoritos"
@@ -8634,7 +8719,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8672,7 +8757,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8685,7 +8770,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:680
+#: lib/mail.php:672
 #, 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"
@@ -8696,7 +8781,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9033,36 +9118,46 @@ msgstr "Etiquetas en mensajes de %s"
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Suscripciones"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Todas las suscripciones"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Suscriptores"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Todos los suscriptores"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "ID de usuario"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Miembro desde"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. 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"
 
-#: lib/profileaction.php:264
+#. 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"
 
@@ -9320,48 +9415,60 @@ msgstr "Cancelar suscripción"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "El usuario no tiene un perfil."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "Editar imagen"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "Acciones de usuario"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr "Eliminación de usuario en curso..."
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "Editar configuración del perfil"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "Editar"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "Enviar un mensaje directo a este usuario"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "Mensaje"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr "Moderar"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "Rol de usuario"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrador"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderador"
@@ -9451,13 +9558,13 @@ 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:64
+#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Tamaño inválido."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
@@ -9466,32 +9573,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "No such group"
-#~ msgstr "No existe ese grupo"
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "Método de API no encontrado."
-
-#~ msgid "Reset"
-#~ msgstr "Restablecer"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr ""
-#~ "1-64 letras en minúscula o números, sin signos de puntuación o espacios. "
-#~ "Requerido."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6 o más caracters. Requerido."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "Igual a la contraseña de arriba. Requerida"
-
-#~ 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"
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "¡%s no es un color válido!"
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index cb0a6fee8c..2bb0099982 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Persian (فارسی)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ArianHT
 # Author: Brion
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:56:39+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:47:50+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 (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -98,7 +98,7 @@ msgstr "ذخیرهٔ تنظیمات دسترسی"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -136,6 +136,7 @@ msgstr "چنین صفحه‌ای وجود ندارد."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -343,14 +344,15 @@ msgstr "نمی‌توان کاربر را به‌هنگام‌سازی کرد."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "کاربر هیچ نمایه‌ای ندارد."
 
@@ -676,18 +678,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "نام و نام مستعار شما نمی تواند یکی باشد ."
 
@@ -698,7 +698,7 @@ msgstr "نام و نام مستعار شما نمی تواند یکی باشد .
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "گروه یافت نشد."
@@ -901,11 +901,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "نام کاربری"
 
@@ -1211,28 +1212,27 @@ msgstr ""
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "پیدا کردن محتوای پیام‌ها"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "پیامی با آن شناسه وجود ندارد."
@@ -1402,23 +1402,30 @@ msgstr "شما مشترک آن نمایه نیستید."
 msgid "Cannot delete someone else's subscription."
 msgstr "نمی‌توان اشتراک را ذخیره کرد."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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."
@@ -1525,35 +1532,35 @@ msgid "No file uploaded."
 msgstr "هیچ پرونده‌ای بارگذاری نشد."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr "فایل اطلاعات خود را گم کرده ایم."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "به روز رسانی چهره موفقیت آمیر نبود."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr ""
 
@@ -1750,8 +1757,9 @@ msgid "Conversation"
 msgstr "مکالمه"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "پیام‌ها"
 
@@ -1776,7 +1784,7 @@ msgstr ""
 #. 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."
+msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1787,7 +1795,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 #, fuzzy
 msgid "Delete account"
 msgstr "ساختن یک جساب‌کاربری"
@@ -2343,7 +2351,8 @@ msgstr "از این روش برای ویرایش گروه استفاده کنی
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "نام‌مستعار غیر مجاز: «%s»"
@@ -2355,7 +2364,7 @@ msgstr "نمی‌توان گروه را به‌هنگام‌سازی کرد."
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "نمی‌توان نام‌های مستعار را ساخت."
 
@@ -2859,17 +2868,17 @@ msgid "Crop"
 msgstr "برش"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "نشان به‌هنگام‌سازی شد."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "به‌هنگام‌سازی نشان شکست خورد."
 
@@ -2929,7 +2938,9 @@ msgstr "کاربر را مدیر کن"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "به روز رسانی کابران %1$s در %2$s"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "گروه‌ها"
@@ -3508,7 +3519,7 @@ msgstr "نام کاربری یا گذرواژه نادرست است."
 msgid "Error setting user. You are probably not authorized."
 msgstr "خطا در تنظیم کاربر. شما احتمالا اجازهٔ این کار را ندارید."
 
-#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "ورود"
 
@@ -3609,6 +3620,12 @@ msgstr "شما یک عضو این گروه نیستید."
 msgid "Use this form to create a new group."
 msgstr "از این فرم برای ساختن یک گروه جدید استفاده کنید"
 
+#. TRANS: Group create form validation error.
+#: actions/newgroup.php:199
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "نام و نام مستعار شما نمی تواند یکی باشد ."
+
 #: actions/newmessage.php:71 actions/newmessage.php:234
 msgid "New message"
 msgstr "پیام جدید"
@@ -4307,9 +4324,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "نام‌کامل"
 
@@ -4348,10 +4366,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "موقعیت"
 
@@ -4366,9 +4385,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "برچسب‌ها"
 
@@ -4459,7 +4479,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "ساختن یک جساب‌کاربری"
@@ -4627,9 +4647,8 @@ msgstr ""
 "بگیرید."
 
 #: actions/recoverpassword.php:167
-#, fuzzy
 msgid "You have been identified. Enter a new password below."
-msgstr "هویت شما شناسایی شد. یک گذرواژه تازه را در زیر وارد کنید. "
+msgstr "هویت شما شناسایی شد. یک گذرواژه تازه را در زیر وارد کنید."
 
 #. TRANS: Fieldset legend for password recovery page.
 #: actions/recoverpassword.php:198
@@ -4772,7 +4791,7 @@ msgstr "با عرض تاسف، کد دعوت نا معتبر است."
 msgid "Registration successful"
 msgstr "ثبت نام با موفقیت انجام شد."
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "ثبت نام"
 
@@ -4931,8 +4950,9 @@ msgstr "نشانی نمایه"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "اشتراک"
 
@@ -5089,7 +5109,9 @@ msgid "File upload stopped by extension."
 msgstr "بارگذاری پرونده توسط افزونه متوقف شد."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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 "هنگام بارگذاری پرونده خطای سیستمی رخ داد."
 
@@ -5208,8 +5230,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "آمار"
 
@@ -5343,14 +5366,16 @@ msgid "Group profile"
 msgstr "نمایهٔ گروه"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
+#. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "یادداشت"
 
@@ -5394,8 +5419,11 @@ msgid "Members"
 msgstr "اعضا"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "هیچ"
@@ -6012,7 +6040,7 @@ 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:116
+#: actions/subscribers.php:114
 #, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
@@ -6023,7 +6051,7 @@ 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:120
+#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s هیچ مشترکی ندارد. می‌خواهید اولین مشترک باشید؟"
@@ -6033,7 +6061,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6066,7 +6094,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6086,23 +6114,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s هیچ‌کس را دنبال نمی‌کند."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "پیامک"
 
@@ -6136,12 +6165,14 @@ msgstr "هیچ پیوستی وجود ندارد."
 msgid "Tag %s"
 msgstr "برچسب %s"
 
+#. TRANS: H2 for user profile information.
 #: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "نمایهٔ کاربر"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "تصویر"
 
@@ -6687,25 +6718,25 @@ msgid "Problem saving notice."
 msgstr "هنگام ذخیرهٔ پیام مشکلی ایجاد شد."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:914
+#: classes/Notice.php:923
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1013
+#: classes/Notice.php:1022
 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6808,26 +6839,47 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 msgid "Could not create group."
 msgstr "نمیتوان گروه را تشکیل داد"
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:526
+#: classes/User_group.php:530
 #, fuzzy
 msgid "Could not set group URI."
 msgstr "نمیتوان گروه را تشکیل داد"
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:549
+#: classes/User_group.php:553
 msgid "Could not set group membership."
 msgstr "نمی‌توان عضویت گروه را تعیین کرد."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:564
+#: classes/User_group.php:568
 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6964,7 +7016,8 @@ msgid "Create an account"
 msgstr "ساختن یک جساب‌کاربری"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "ثبت‌نام"
@@ -6976,7 +7029,8 @@ msgid "Login to the site"
 msgstr "ورود به وب‌گاه"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "ورود"
@@ -7211,6 +7265,23 @@ msgstr ""
 msgid "No content for notice %s."
 msgstr "پیدا کردن محتوای پیام‌ها"
 
+#: lib/activitymover.php:84
+#, fuzzy, php-format
+msgid "No such user %s."
+msgstr "چنین کاربری وجود ندارد."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7659,7 +7730,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "موقعیت : %s"
@@ -7667,7 +7738,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "صفحه خانگی : %s"
@@ -7937,26 +8008,26 @@ msgstr ""
 "tracking - هنوز پیاده نشده است.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 #, 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:158
+#: lib/common.php:164
 #, 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "برو به نصاب."
 
@@ -8049,6 +8120,12 @@ msgstr "نمی‌توان ظاهر را به روز کرد."
 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 لغو کرد."
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "خارج‌کردن این پیام از برگزیده‌ها"
@@ -8247,50 +8324,56 @@ msgstr "برچسب‌ها در پیام‌های گروه %s"
 msgid "This page is not available in a media type you accept"
 msgstr "این صفحه در نوع رسانه‌ای که پذیرفته‌اید، در دسترس نیست."
 
-#: lib/imagefile.php:72
+#. 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:90
+#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "این پرونده خیلی بزرگ است. بیشینهٔ اندازهٔ پرونده %s است."
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
 #, fuzzy
 msgid "Partial upload."
 msgstr "هیچ پرونده‌ای بارگذاری نشد."
 
-#: lib/imagefile.php:111
+#. 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 "تصویر یا فایل خرابی نیست"
 
-#: lib/imagefile.php:160
+#. 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 "فایلمان گم شده"
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: 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:287
+#: 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:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8310,23 +8393,25 @@ msgstr "منبع صندوق ورودی نامعلوم است %d."
 msgid "Leave"
 msgstr "ترک کردن"
 
-#: lib/logingroupnav.php:80
+#. TRANS: Title for menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "وارد شدن با یک نام کاربری و گذرواژه"
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8358,14 +8443,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8377,7 +8462,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:263
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8404,14 +8489,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "%s ادرس ایمیل جدید برای"
@@ -8419,7 +8504,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:321
+#: lib/mail.php:313
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8442,34 +8527,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "وضعیت %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, 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:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8498,7 +8583,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "پیام خصوصی تازه از %s"
@@ -8507,7 +8592,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8542,7 +8627,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:607
+#: lib/mail.php:599
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "پیام شما را به برگزیده‌های خود اضافه کرد %s (@%s)"
@@ -8552,7 +8637,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8594,7 +8679,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8607,7 +8692,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:680
+#: lib/mail.php:672
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) به توجه شما یک پیام فرستاد"
@@ -8618,7 +8703,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8946,36 +9031,46 @@ msgstr "برچسب‌ها در پیام‌های %s"
 msgid "Unknown"
 msgstr "ناشناخته"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "اشتراک‌ها"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "تمام اشتراک‌ها"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "مشترک‌ها"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "تمام مشترک‌ها"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "شناسه کاربر"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "عضو شده از"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. TRANS: Label for user statistics.
+#. TRANS: Average count of posts made per day since account registration.
+#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "میانگین روزانه"
 
-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "تمام گروه‌ها"
 
@@ -9232,48 +9327,60 @@ msgstr "لغو اشتراک"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "کاربر هیچ نمایه‌ای ندارد."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "ویرایش اواتور"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "اعمال کاربر"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr "پاک‌کردن کاربر در حالت اجرا است..."
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "ویرایش تنظیمات نمایه"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "ویرایش"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "پیام مستقیم به این کاربر بفرستید"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "پیام"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr "اداره کردن"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "وظیفهٔ کاربر"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "رئیس"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "مدیر"
@@ -9360,13 +9467,13 @@ msgstr[0] ""
 "فرستادید."
 
 #. TRANS: Exception.
-#: lib/xrd.php:64
+#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "اندازه نادرست است."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
@@ -9375,29 +9482,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "No such group"
-#~ msgstr "چنین گروهی وجود ندارد."
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "رابط مورد نظر پیدا نشد."
-
-#~ msgid "Reset"
-#~ msgstr "بازنشاندن"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr "۱-۶۴ حرف کوچک یا اعداد، بدون نشانه گذاری یا فاصله نیاز است."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "۶ نویسه یا بیش‌تر مورد نیاز است."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "با گذرواژهٔ بالا یکسان باشد. مورد نیاز است."
-
-#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-#~ msgstr "۱-۶۴ کاراکتر کوچک یا اعداد، بدون نقطه گذاری یا فاصله"
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "%s یک رنگ صحیح نیست!"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 676b7b8f79..1205d2a243 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Finnish (Suomi)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Crt
 # Author: Jaakko
@@ -14,17 +14,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:56:45+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:47:52+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 (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -101,7 +101,7 @@ msgstr "Profiilikuva-asetukset"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -139,6 +139,7 @@ msgstr "Sivua ei ole."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -345,14 +346,15 @@ msgstr "Käyttäjän päivitys epäonnistui."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Käyttäjällä ei ole profiilia."
 
@@ -685,18 +687,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Alias ei voi olla sama kuin ryhmätunnus."
 
@@ -707,7 +707,7 @@ msgstr "Alias ei voi olla sama kuin ryhmätunnus."
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Ei löytynyt."
@@ -905,11 +905,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Tunnus"
 
@@ -1218,28 +1219,27 @@ msgstr ""
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Hae päivityksien sisällöstä"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Ei profiilia tuolla id:llä."
@@ -1409,23 +1409,30 @@ msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
 msgid "Cannot delete someone else's subscription."
 msgstr "Tilausta ei onnistuttu tallentamaan."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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 "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."
@@ -1531,34 +1538,34 @@ msgid "No file uploaded."
 msgstr "Profiilia ei ole määritelty."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr "Tiedoston data hävisi."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: 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:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr ""
 
@@ -1751,8 +1758,9 @@ msgid "Conversation"
 msgstr "Keskustelu"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Päivitykset"
 
@@ -1777,7 +1785,7 @@ msgstr ""
 #. 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."
+msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1788,7 +1796,7 @@ msgstr "Kuva 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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 #, fuzzy
 msgid "Delete account"
 msgstr "Luo uusi ryhmä"
@@ -2356,7 +2364,8 @@ msgstr "Käytä tätä lomaketta muokataksesi ryhmää."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Virheellinen alias: \"%s\""
@@ -2368,7 +2377,7 @@ 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:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "Ei voitu lisätä aliasta."
 
@@ -2876,17 +2885,17 @@ msgid "Crop"
 msgstr "Rajaa"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "Logo päivitetty."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "Logon päivittäminen epäonnistui."
 
@@ -2946,7 +2955,9 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Ryhmän  %1$s käyttäjien päivitykset palvelussa %2$s!"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Ryhmät"
@@ -3531,7 +3542,7 @@ msgstr "Väärä käyttäjätunnus tai salasana"
 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 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
@@ -3639,6 +3650,12 @@ msgstr "Sinä et kuulu tähän ryhmään."
 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:199
+#, 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
 msgid "New message"
 msgstr "Uusi viesti"
@@ -4351,9 +4368,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "Koko nimi"
 
@@ -4393,10 +4411,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "Kotipaikka"
 
@@ -4412,9 +4431,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "Tagit"
 
@@ -4508,7 +4528,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Luo uusi ryhmä"
@@ -4671,9 +4691,8 @@ msgstr ""
 "joka on rekisteröity käyttäjätunnuksellesi."
 
 #: actions/recoverpassword.php:167
-#, fuzzy
 msgid "You have been identified. Enter a new password below."
-msgstr "Sinut on tunnistettu. Syötä uusi salasana alapuolelle. "
+msgstr "Sinut on tunnistettu. Syötä uusi salasana alapuolelle."
 
 #. TRANS: Fieldset legend for password recovery page.
 #: actions/recoverpassword.php:198
@@ -4818,7 +4837,7 @@ msgstr "Virheellinen kutsukoodin."
 msgid "Registration successful"
 msgstr "Rekisteröityminen onnistui"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Rekisteröidy"
 
@@ -4977,8 +4996,9 @@ msgstr "Profiilin URL"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "Tilaa"
 
@@ -5141,7 +5161,9 @@ msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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."
 
@@ -5266,8 +5288,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Tilastot"
 
@@ -5393,14 +5416,16 @@ 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:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Huomaa"
 
@@ -5444,8 +5469,11 @@ msgid "Members"
 msgstr "Jäsenet"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 #, fuzzy
 msgid "(None)"
@@ -6060,7 +6088,7 @@ 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:116
+#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6068,7 +6096,7 @@ 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:120
+#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -6078,7 +6106,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6109,7 +6137,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6123,23 +6151,24 @@ 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:143 actions/subscriptions.php:149
+#: 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ää."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "SMS"
 
@@ -6173,12 +6202,14 @@ msgstr "Ei id parametria."
 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"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Kuva"
 
@@ -6737,26 +6768,26 @@ 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:914
+#: classes/Notice.php:923
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1013
+#: classes/Notice.php:1022
 #, 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6861,26 +6892,47 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 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:526
+#: classes/User_group.php:530
 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:549
+#: classes/User_group.php:553
 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:564
+#: classes/User_group.php:568
 #, 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -7024,7 +7076,8 @@ msgid "Create an account"
 msgstr "Luo uusi ryhmä"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 #, fuzzy
 msgctxt "MENU"
 msgid "Register"
@@ -7037,7 +7090,8 @@ msgid "Login to the site"
 msgstr "Kirjaudu sisään"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 #, fuzzy
 msgctxt "MENU"
 msgid "Login"
@@ -7275,6 +7329,23 @@ msgstr ""
 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."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7742,7 +7813,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Kotipaikka: %s"
@@ -7750,7 +7821,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Kotisivu: %s"
@@ -7989,26 +8060,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 #, 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:158
+#: lib/common.php:164
 #, 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Kirjaudu sisään palveluun"
@@ -8103,6 +8174,12 @@ msgstr "Ei voitu päivittää sinun sivusi ulkoasua."
 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ää."
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "Poista tämä päivitys suosikeista"
@@ -8305,35 +8382,41 @@ msgstr "Tagit ryhmän %s päivityksissä"
 msgid "This page is not available in a media type you accept"
 msgstr "Tämä sivu ei ole saatavilla sinulle sopivassa mediatyypissä."
 
-#: lib/imagefile.php:72
+#. 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:90
+#: 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."
 
-#: lib/imagefile.php:95
+#. 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."
 
-#: lib/imagefile.php:111
+#. 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."
 
-#: lib/imagefile.php:160
+#. 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."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8341,7 +8424,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8349,7 +8432,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8370,23 +8453,25 @@ msgstr ""
 msgid "Leave"
 msgstr "Eroa"
 
-#: lib/logingroupnav.php:80
+#. 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"
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8405,14 +8490,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8424,7 +8509,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:263
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8451,14 +8536,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Uusi sähköpostiosoite päivityksien lähettämiseen palveluun %s"
@@ -8466,7 +8551,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:321
+#: lib/mail.php:313
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8489,34 +8574,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "%s päivitys"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, 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:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8534,7 +8619,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "Uusi yksityisviesti käyttäjältä %s"
@@ -8543,7 +8628,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8564,7 +8649,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:607
+#: lib/mail.php:599
 #, 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."
@@ -8574,7 +8659,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8596,7 +8681,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8606,7 +8691,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:680
+#: lib/mail.php:672
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
@@ -8617,7 +8702,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8930,37 +9015,47 @@ msgstr "Tagit käyttäjän %s päivityksissä"
 msgid "Unknown"
 msgstr "Tuntematon toiminto"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Tilaukset"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Kaikki tilaukset"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Tilaajat"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Kaikki tilaajat"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 #, fuzzy
 msgid "User ID"
 msgstr "Käyttäjä"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Käyttäjänä alkaen"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. TRANS: Label for user statistics.
+#. TRANS: Average count of posts made per day since account registration.
+#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr ""
 
-#: lib/profileaction.php:264
+#. 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"
 
@@ -9224,52 +9319,64 @@ msgstr "Peruuta tilaus"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Käyttäjällä ei ole profiilia."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Kuva"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "Käyttäjän toiminnot"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr ""
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Profiiliasetukset"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr ""
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "Lähetä suora viesti tälle käyttäjälle"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "Viesti"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr ""
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 #, fuzzy
 msgid "User role"
 msgstr "Käyttäjän profiili"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 #, fuzzy
 msgctxt "role"
 msgid "Administrator"
 msgstr "Ylläpitäjät"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr ""
@@ -9359,13 +9466,13 @@ 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:64
+#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Koko ei kelpaa."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
@@ -9374,34 +9481,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "No such group"
-#~ msgstr "Tuota ryhmää ei ole."
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "API-metodia ei löytynyt."
-
-#~ msgid "Reset"
-#~ msgstr "Vaihda"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr ""
-#~ "1-64 pientä kirjainta tai numeroa, ei ääkkösiä eikä välimerkkejä tai "
-#~ "välilyöntejä. Pakollinen."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6 tai useampia merkkejä. Pakollinen."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "Sama kuin ylläoleva salasana. Pakollinen."
-
-#~ 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ä"
-
-#, fuzzy
-#~ msgid "%s is not a valid color!"
-#~ msgstr "Kotisivun verkko-osoite ei ole toimiva."
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 66127d1518..fdfe2a384f 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Brion
 # Author: Crochet.david
@@ -21,17 +21,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:56:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:47: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-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -102,7 +102,7 @@ msgstr "Sauvegarder les paramètres d’accès"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -140,6 +140,7 @@ msgstr "Page non trouvée."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -351,14 +352,15 @@ msgstr "Impossible de mettre à jour l’utilisateur."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Aucun profil ne correspond à cet utilisateur."
 
@@ -691,18 +693,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "L’alias ne peut pas être le même que le pseudo."
 
@@ -713,7 +713,7 @@ msgstr "L’alias ne peut pas être le même que le pseudo."
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Groupe non trouvé."
@@ -915,11 +915,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Pseudo"
 
@@ -1232,29 +1233,28 @@ msgstr "Une publication Atom doit être une entrée « Atom »."
 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.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: 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.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "L’avis d’URI « %s » existe déjà."
@@ -1423,24 +1423,31 @@ msgstr "Vous n’êtes pas abonné(e) à ce profil."
 msgid "Cannot delete someone else's subscription."
 msgstr "Impossible de supprimer l’abonnement à soi-même."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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."
@@ -1545,34 +1552,34 @@ msgid "No file uploaded."
 msgstr "Aucun fichier n’a été téléversé."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: actions/avatarsettings.php:345
 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr "Données perdues."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: 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:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr ""
 
@@ -1766,8 +1773,9 @@ msgid "Conversation"
 msgstr "Conversation"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Avis"
 
@@ -1792,7 +1800,7 @@ msgstr ""
 #. 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."
+msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1803,7 +1811,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 #, fuzzy
 msgid "Delete account"
 msgstr "Créer un compte"
@@ -2348,7 +2356,8 @@ msgstr "Remplissez ce formulaire pour modifier les options du groupe."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Alias invalide : « %s »"
@@ -2360,7 +2369,7 @@ 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:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "Impossible de créer les alias."
 
@@ -2868,17 +2877,17 @@ msgid "Crop"
 msgstr "Recadrer"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "Logo mis à jour."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "La mise à jour du logo a échoué."
 
@@ -2938,7 +2947,9 @@ msgstr "Faire de cet utilisateur un administrateur"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Mises à jour des membres de %1$s dans %2$s !"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Groupes"
@@ -3537,7 +3548,7 @@ 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 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Ouvrir une session"
 
@@ -3643,6 +3654,12 @@ msgstr "Vous n’êtes pas autorisé à supprimer ce groupe."
 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:199
+#, 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
 msgid "New message"
 msgstr "Nouveau message"
@@ -4329,9 +4346,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "Nom complet"
 
@@ -4371,10 +4389,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "Emplacement"
 
@@ -4389,9 +4408,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "Balises"
 
@@ -4484,7 +4504,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Créer un compte"
@@ -4656,9 +4676,8 @@ msgstr ""
 "compte."
 
 #: actions/recoverpassword.php:167
-#, fuzzy
 msgid "You have been identified. Enter a new password below."
-msgstr "Vous avez été identifié. Entrez un nouveau mot de passe ci-dessous. "
+msgstr "Vous avez été identifié. Entrez un nouveau mot de passe ci-dessous."
 
 #. TRANS: Fieldset legend for password recovery page.
 #: actions/recoverpassword.php:198
@@ -4801,7 +4820,7 @@ msgstr "Désolé, code d’invitation invalide."
 msgid "Registration successful"
 msgstr "Compte créé avec succès"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Créer un compte"
 
@@ -4967,8 +4986,9 @@ msgstr "URL du profil"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "S’abonner"
 
@@ -5130,7 +5150,9 @@ 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.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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."
 
@@ -5247,8 +5269,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistiques"
 
@@ -5383,14 +5406,16 @@ 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:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Note"
 
@@ -5434,8 +5459,11 @@ msgid "Members"
 msgstr "Membres"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(aucun)"
@@ -6060,7 +6088,7 @@ 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:116
+#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6070,7 +6098,7 @@ 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:120
+#: 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 ?"
@@ -6080,7 +6108,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6113,7 +6141,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6133,23 +6161,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s ne suit actuellement personne."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "SMS"
 
@@ -6182,12 +6211,14 @@ msgstr "Aucun argument d’identifiant."
 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"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Photo"
 
@@ -6751,25 +6782,25 @@ 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:914
+#: classes/Notice.php:923
 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:1013
+#: classes/Notice.php:1022
 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6874,25 +6905,46 @@ 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:516
+#: classes/User_group.php:520
 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:526
+#: classes/User_group.php:530
 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:549
+#: classes/User_group.php:553
 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:564
+#: classes/User_group.php:568
 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -7029,7 +7081,8 @@ msgid "Create an account"
 msgstr "Créer un compte"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "S’inscrire"
@@ -7041,7 +7094,8 @@ msgid "Login to the site"
 msgstr "Ouvrir une session"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Connexion"
@@ -7280,6 +7334,23 @@ msgstr ""
 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é."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7729,7 +7800,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Emplacement : %s"
@@ -7737,7 +7808,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Site Web : %s"
@@ -8019,25 +8090,25 @@ msgstr ""
 "tracking - pas encore implémenté.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 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:158
+#: lib/common.php:164
 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "Aller au programme d’installation"
 
@@ -8125,6 +8196,12 @@ msgstr "Impossible de mettre à jour votre conception."
 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."
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "Retirer des favoris"
@@ -8328,35 +8405,41 @@ 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."
 
-#: lib/imagefile.php:72
+#. 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:90
+#: 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."
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Transfert partiel."
 
-#: lib/imagefile.php:111
+#. 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."
 
-#: lib/imagefile.php:160
+#. 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."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8364,7 +8447,7 @@ msgstr[0] "%d&nbsp;Mo"
 msgstr[1] "%d&nbsp;Mo"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8372,7 +8455,7 @@ msgstr[0] "%d&nbsp;Ko"
 msgstr[1] "%d&nbsp;Ko"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8393,23 +8476,25 @@ msgstr "Source %d inconnue pour la boîte de réception."
 msgid "Leave"
 msgstr "Quitter"
 
-#: lib/logingroupnav.php:80
+#. 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"
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8441,14 +8526,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8463,7 +8548,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:263
+#: lib/mail.php:255
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8491,14 +8576,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nouvelle adresse courriel pour poster dans %s"
@@ -8506,7 +8591,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:321
+#: lib/mail.php:313
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8529,19 +8614,19 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "Statut de %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
@@ -8549,15 +8634,15 @@ msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8586,7 +8671,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "Nouveau message personnel de %s"
@@ -8595,7 +8680,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8630,7 +8715,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:607
+#: lib/mail.php:599
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) a ajouté votre avis à ses favoris"
@@ -8640,7 +8725,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8679,7 +8764,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8692,7 +8777,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:680
+#: lib/mail.php:672
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) a envoyé un avis à votre attention"
@@ -8703,7 +8788,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9038,36 +9123,46 @@ msgstr "Marques dans les avis de %s"
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Abonnements"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Tous les abonnements"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Abonnés"
 
-#: lib/profileaction.php:161
+#. 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"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "ID de l’utilisateur"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Membre depuis"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. 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"
 
-#: lib/profileaction.php:264
+#. 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"
 
@@ -9326,48 +9421,60 @@ 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."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "Modifier l’avatar"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "Actions de l’utilisateur"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr "Suppression de l'utilisateur en cours..."
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "Modifier les paramètres du profil"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "Modifier"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "Envoyer un message à cet utilisateur"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "Message"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr "Modérer"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "Rôle de l'utilisateur"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrateur"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "Modérateur"
@@ -9463,12 +9570,12 @@ msgstr[1] ""
 "envoyé %2$d."
 
 #. TRANS: Exception.
-#: lib/xrd.php:64
+#: lib/xrd.php:63
 msgid "Invalid XML."
 msgstr "XML invalide."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr "XML invalide, racine XRD manquante."
 
@@ -9477,31 +9584,3 @@ msgstr "XML invalide, racine XRD manquante."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Obtention de la sauvegarde depuis le fichier « %s »."
-
-#~ msgid "No such group"
-#~ msgstr "Aucun groupe trouvé."
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "Méthode HTTP non trouvée !"
-
-#~ msgid "Reset"
-#~ msgstr "Réinitialiser"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr ""
-#~ "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces. "
-#~ "Requis."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6 caractères ou plus. Requis."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "Identique au mot de passe ci-dessus. Requis."
-
-#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-#~ msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces"
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "&s n’est pas une couleur valide !"
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index 75d26bc21c..db84455380 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Galician (Galego)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Brion
 # Author: Gallaecio
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:56:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:47: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-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -92,7 +92,7 @@ msgstr "Gardar a configuración de acceso"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -130,6 +130,7 @@ msgstr "Esa páxina non existe."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -340,14 +341,15 @@ msgstr "Non se puido actualizar o usuario."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "O usuario non ten perfil."
 
@@ -682,18 +684,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "O pseudónimo non pode coincidir co alcume."
 
@@ -704,7 +704,7 @@ msgstr "O pseudónimo non pode coincidir co alcume."
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Non se atopou o grupo."
@@ -905,11 +905,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Alcume"
 
@@ -1218,28 +1219,27 @@ msgstr ""
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: 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.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Non hai ningunha nota con esa id."
@@ -1409,23 +1409,30 @@ msgstr "Non está subscrito a ese perfil."
 msgid "Cannot delete someone else's subscription."
 msgstr "Non se puido borrar a subscrición a si mesmo."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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."
@@ -1530,34 +1537,34 @@ msgid "No file uploaded."
 msgstr "Non se subiu ficheiro ningún."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: actions/avatarsettings.php:345
 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr "Perdéronse os datos do ficheiro."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: 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:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr ""
 
@@ -1752,8 +1759,9 @@ msgid "Conversation"
 msgstr "Conversa"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Notas"
 
@@ -1778,7 +1786,7 @@ msgstr ""
 #. 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."
+msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1789,7 +1797,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 #, fuzzy
 msgid "Delete account"
 msgstr "Crear unha conta"
@@ -2341,7 +2349,8 @@ msgstr "Utilice este formulario para editar o grupo."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Pseudónimo inválido: \"%s\""
@@ -2353,7 +2362,7 @@ 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:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "Non se puideron crear os pseudónimos."
 
@@ -2864,17 +2873,17 @@ msgid "Crop"
 msgstr "Recortar"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "Actualizouse o logo."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "Non se puido actualizar o logo."
 
@@ -2934,7 +2943,9 @@ msgstr "Converter a este usuario en administrador"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Actualizacións de membros de %1$s en %2$s!"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Grupos"
@@ -3525,7 +3536,7 @@ msgstr ""
 "Houbo un erro ao configurar o usuario. Probablemente non estea autorizado "
 "para facelo."
 
-#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Identificarse"
 
@@ -3630,6 +3641,12 @@ msgstr "Vostede non pertence a este grupo."
 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:199
+#, 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
 msgid "New message"
 msgstr "Mensaxe nova"
@@ -4328,9 +4345,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "Nome completo"
 
@@ -4370,10 +4388,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "Lugar"
 
@@ -4388,9 +4407,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "Etiquetas"
 
@@ -4484,7 +4504,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Crear unha conta"
@@ -4656,9 +4676,8 @@ msgstr ""
 "novo ao enderezo de correo electrónico da conta."
 
 #: actions/recoverpassword.php:167
-#, fuzzy
 msgid "You have been identified. Enter a new password below."
-msgstr "Acaba de identificarse. Introduza un contrasinal novo a continuación. "
+msgstr "Acaba de identificarse. Introduza un contrasinal novo a continuación."
 
 #. TRANS: Fieldset legend for password recovery page.
 #: actions/recoverpassword.php:198
@@ -4805,7 +4824,7 @@ msgstr "O código da invitación é incorrecto."
 msgid "Registration successful"
 msgstr "Rexistrouse correctamente"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Rexistrarse"
 
@@ -4969,8 +4988,9 @@ 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "Subscribirse"
 
@@ -5131,7 +5151,9 @@ 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.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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."
 
@@ -5247,8 +5269,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Estatísticas"
 
@@ -5384,14 +5407,16 @@ 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:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Nota"
 
@@ -5435,8 +5460,11 @@ msgid "Members"
 msgstr "Membros"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Ningún)"
@@ -6057,7 +6085,7 @@ 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:116
+#: actions/subscribers.php:114
 #, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
@@ -6068,7 +6096,7 @@ 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:120
+#: 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?"
@@ -6078,7 +6106,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6111,7 +6139,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6130,23 +6158,24 @@ 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:143 actions/subscriptions.php:149
+#: 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."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "SMS"
 
@@ -6179,12 +6208,14 @@ msgstr "Sen argumento ID."
 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"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Fotografía"
 
@@ -6744,26 +6775,26 @@ 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:914
+#: classes/Notice.php:923
 #, 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:1013
+#: classes/Notice.php:1022
 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6866,25 +6897,46 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 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:526
+#: classes/User_group.php:530
 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:549
+#: classes/User_group.php:553
 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:564
+#: classes/User_group.php:568
 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -7021,7 +7073,8 @@ msgid "Create an account"
 msgstr "Crear unha conta"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Rexistrarse"
@@ -7033,7 +7086,8 @@ msgid "Login to the site"
 msgstr "Identificarse no sitio"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Identificarse"
@@ -7273,6 +7327,23 @@ msgstr ""
 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."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7727,7 +7798,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Localidade: %s"
@@ -7735,7 +7806,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Sitio web: %s"
@@ -8011,26 +8082,26 @@ 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:155
+#: lib/common.php:161
 #, 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:158
+#: lib/common.php:164
 #, 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "Ir ao instalador."
 
@@ -8123,6 +8194,12 @@ msgstr "Non se puido actualizar o seu deseño."
 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."
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "Desmarcar esta nota como favorita"
@@ -8327,35 +8404,41 @@ msgstr "Etiquetas nas notas do grupo %s"
 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"
 
-#: lib/imagefile.php:72
+#. 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:90
+#: 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."
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Carga parcial."
 
-#: lib/imagefile.php:111
+#. 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."
 
-#: lib/imagefile.php:160
+#. 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."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8363,7 +8446,7 @@ msgstr[0] "MB"
 msgstr[1] "MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8371,7 +8454,7 @@ msgstr[0] "kB"
 msgstr[1] "kB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8392,23 +8475,25 @@ msgstr "Non se coñece a fonte %d da caixa de entrada."
 msgid "Leave"
 msgstr "Deixar"
 
-#: lib/logingroupnav.php:80
+#. 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"
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8439,14 +8524,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8460,7 +8545,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:263
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8488,14 +8573,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Novo enderezo de correo electrónico para publicar en %s"
@@ -8503,7 +8588,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:321
+#: lib/mail.php:313
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8526,19 +8611,19 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "Estado de %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
@@ -8546,15 +8631,15 @@ msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8583,7 +8668,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "Nova mensaxe privada de %s"
@@ -8592,7 +8677,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8627,7 +8712,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:607
+#: lib/mail.php:599
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) marcou a súa nota como favorita"
@@ -8637,7 +8722,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8676,7 +8761,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8689,7 +8774,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:680
+#: lib/mail.php:672
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) enviou unha nota á súa atención"
@@ -8700,7 +8785,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9035,36 +9120,46 @@ msgstr "Etiquetas nas notas de %s"
 msgid "Unknown"
 msgstr "Descoñecida"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Subscricións"
 
-#: lib/profileaction.php:126
+#. 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"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Subscritores"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Todos os subscritores"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "ID do usuario"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Membro dende"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. 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"
 
-#: lib/profileaction.php:264
+#. 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"
 
@@ -9324,48 +9419,60 @@ 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."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "Modificar o avatar"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "Accións do usuario"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr "Procedendo a borrar o usuario..."
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "Modificar a configuración do perfil"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "Modificar"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "Enviarlle unha mensaxe directa a este usuario"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "Mensaxe"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr "Moderar"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "Rol do usuario"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrador"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderador"
@@ -9457,13 +9564,13 @@ 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:64
+#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Tamaño non válido."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
@@ -9472,34 +9579,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "No such group"
-#~ msgstr "Non existe tal grupo."
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "Non se atopou o método da API."
-
-#~ msgid "Reset"
-#~ msgstr "Restablecer"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr ""
-#~ "Entre 1 e 64 letras minúsculas ou números, sen signos de puntuación, "
-#~ "espazos, tiles ou eñes. Obrigatorio."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6 ou máis caracteres. Obrigatorio."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "O mesmo contrasinal que o anterior. Obrigatorio."
-
-#~ 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"
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "%s non é unha cor correcta!"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index 949f9f40d5..d186e4db20 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Upper Sorbian (Hornjoserbsce)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Brion
 # Author: McDutchie
@@ -11,18 +11,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:56:58+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:47:55+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 (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hsb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || "
 "n%100==4) ? 2 : 3)\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -93,7 +93,7 @@ msgstr "Přistupne nastajenja składować"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -131,6 +131,7 @@ msgstr "Strona njeeksistuje."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -333,14 +334,15 @@ msgstr "Wužiwar njeje so dał aktualizować."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Wužiwar nima profil."
 
@@ -674,18 +676,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Alias njemóže samsny kaž přimjeno być."
 
@@ -696,7 +696,7 @@ msgstr "Alias njemóže samsny kaž přimjeno być."
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Skupina njenamakana."
@@ -886,11 +886,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Přimjeno"
 
@@ -1193,28 +1194,27 @@ msgstr "Póst za Atom dyrbi derje sformowany XML być."
 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.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: 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.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Zdźělenka z URI \"%s\" hižo eksistuje."
@@ -1272,9 +1272,8 @@ msgstr "%s skupisnkich čłonstwow"
 
 #. 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 "Čłonstwo druheho njeda so přidać"
+msgstr "Čłonstwo druheho njeda so přidać."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
@@ -1304,9 +1303,8 @@ msgstr "Faworit njeeksistuje."
 
 #. 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 "Faworit druheho njeda so zhašeć"
+msgstr "Faworit druheho njeda so zhašeć."
 
 #. 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.
@@ -1342,15 +1340,13 @@ msgstr "Skupina njeeksistuje."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
 #: actions/atompubshowmembership.php:91
-#, fuzzy
 msgid "Not a member."
-msgstr "Njeje čłon"
+msgstr "Njeje čłon."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
-#, fuzzy
 msgid "Cannot delete someone else's membership."
-msgstr "Čłonstwo druheho njeda so zhašeć"
+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.
@@ -1373,23 +1369,30 @@ msgstr "Profil  %1$d njeje profil %2$d abonował."
 msgid "Cannot delete someone else's subscription."
 msgstr "Abonement druheho njeda so zhašeć."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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 "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
+#, fuzzy, php-format
+msgid "Already subscribed to %s."
+msgstr "Hižo abonowany!"
+
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
 msgid "No such attachment."
@@ -1493,34 +1496,34 @@ msgid "No file uploaded."
 msgstr "Žana dataja nahrata."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 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:385
+#: 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:389
+#: 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:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr "Konto zawěsćić"
 
@@ -1709,8 +1712,9 @@ msgid "Conversation"
 msgstr "Konwersacija"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Zdźělenki"
 
@@ -1732,8 +1736,8 @@ 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."
+#, fuzzy, 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.
@@ -1743,7 +1747,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 msgid "Delete account"
 msgstr "Konto zhašeć"
 
@@ -1941,10 +1945,9 @@ msgstr "Móžeš jenož lokalnych wužiwarjow wušmórnyć."
 
 #. TRANS: Title of delete user page.
 #: actions/deleteuser.php:110
-#, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
-msgstr "Wužiwarja wušmórnyć"
+msgstr "Wužiwarja zhašeć"
 
 #. TRANS: Fieldset legend on delete user page.
 #: actions/deleteuser.php:134
@@ -1960,9 +1963,8 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-#, fuzzy
 msgid "Do not delete this user"
-msgstr "Tuitu skupinu njezhašeć"
+msgstr "Tutu skupinu njezhašeć"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
 #. TRANS: Description of form for deleting a user.
@@ -2086,7 +2088,6 @@ msgstr "Pozadkowy wobraz kachlicować"
 
 #. TRANS: Fieldset legend for theme colors.
 #: actions/designadminpanel.php:598
-#, fuzzy
 msgid "Change colors"
 msgstr "Barby změnić"
 
@@ -2126,7 +2127,6 @@ msgstr "Swójski CSS"
 
 #. TRANS: Button text for resetting theme settings.
 #: actions/designadminpanel.php:718
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Standardne hódnoty wužiwać"
@@ -2162,9 +2162,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\"."
-msgstr "Dokument \"%s\" njeeksistuje"
+msgstr "Dokument \"%s\" njeeksistuje."
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
@@ -2273,7 +2273,8 @@ msgstr "Wuž tutón formular, zo by skupinu wobdźěłał."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Njepłaćiwy alias: \"%s\""
@@ -2285,7 +2286,7 @@ 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:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "Aliasy njejsu so dali wutworić."
 
@@ -2772,17 +2773,17 @@ msgid "Crop"
 msgstr "Přirězać"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "Logo zaktualizowane."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "Aktualizowanje loga je so njeporadźiło."
 
@@ -2842,7 +2843,9 @@ msgstr "Tutoho wužiwarja k administratorej činić"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Aktualizacije wot  %1$s na %2$s!"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Skupiny"
@@ -3237,10 +3240,10 @@ msgstr "Dyrbiš přizjewjeny być, zo by do skupiny zastupił."
 
 #. TRANS: Title for join group page after joining.
 #: actions/joingroup.php:147
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
-msgstr "%1$s je do %2$s zastupił"
+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
@@ -3255,7 +3258,7 @@ msgstr "Njejsy čłon teje skupiny."
 
 #. TRANS: Title for leave group page after leaving.
 #: actions/leavegroup.php:142
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s je skupinu %2$s wopušćił"
@@ -3383,7 +3386,7 @@ msgstr "Wopačne wužiwarske mjeno abo hesło."
 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 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Přizjewić"
 
@@ -3482,6 +3485,12 @@ msgstr "Njesměš skupiny na tutym sydle zhašeć."
 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:199
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "Alias njemóže samsny kaž přimjeno być."
+
 #: actions/newmessage.php:71 actions/newmessage.php:234
 msgid "New message"
 msgstr "Nowa powěsć"
@@ -4151,9 +4160,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "Dospołne mjeno"
 
@@ -4194,10 +4204,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "Městno"
 
@@ -4212,9 +4223,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr ""
 
@@ -4303,7 +4315,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Konto wobnowić"
 
@@ -4456,9 +4468,8 @@ msgid ""
 msgstr ""
 
 #: actions/recoverpassword.php:167
-#, fuzzy
 msgid "You have been identified. Enter a new password below."
-msgstr "Sy so identifikował. Zapodaj deleka nowe hesło. "
+msgstr "Sy so identifikował. Zapodaj deleka nowe hesło."
 
 #. TRANS: Fieldset legend for password recovery page.
 #: actions/recoverpassword.php:198
@@ -4483,7 +4494,6 @@ msgstr "Wobnowić"
 
 #. TRANS: Button text on password recovery page.
 #: actions/recoverpassword.php:214
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Wobnowić"
@@ -4511,15 +4521,13 @@ msgstr "Njeznata akcija"
 
 #. 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 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
-#, fuzzy
 msgid "Same as password above."
-msgstr "Samsne hesło kaž horjeka"
+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.
@@ -4573,7 +4581,6 @@ msgstr "Hesło a jeho wobkrućenje so njekryjetej."
 
 #. TRANS: Reset password form validation error message.
 #: actions/recoverpassword.php:418
-#, fuzzy
 msgid "Cannot save new password."
 msgstr "Nowe hesło njeda so składować."
 
@@ -4599,7 +4606,7 @@ msgstr "Wodaj, njepłaćiwy přeprošenski kod."
 msgid "Registration successful"
 msgstr "Registrowanje wuspěšne"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Registrować"
 
@@ -4626,9 +4633,8 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:437
-#, fuzzy
 msgid "6 or more characters."
-msgstr "6 abo wjace znamješkow"
+msgstr "6 abo wjace znamješkow."
 
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:445 actions/register.php:449
@@ -4734,8 +4740,9 @@ msgstr "URL profila"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "Abonować"
 
@@ -4880,7 +4887,9 @@ 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.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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."
 
@@ -4994,8 +5003,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistika"
 
@@ -5120,14 +5130,16 @@ 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:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Přispomnjenka"
 
@@ -5171,8 +5183,11 @@ msgid "Members"
 msgstr "Čłonojo"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Žadyn)"
@@ -5751,7 +5766,7 @@ 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:116
+#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -5759,7 +5774,7 @@ 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:120
+#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s abonentow nima. Chceš prěni być?"
@@ -5769,7 +5784,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -5802,7 +5817,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -5816,23 +5831,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s na nikoho njesłucha."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "SMS"
 
@@ -5865,12 +5881,14 @@ msgstr "Žadyn argument ID."
 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"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
 
@@ -6394,25 +6412,25 @@ 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:914
+#: classes/Notice.php:923
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1013
+#: classes/Notice.php:1022
 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6513,25 +6531,46 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 msgid "Could not create group."
 msgstr "Skupina njeda so wutowrić."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:526
+#: classes/User_group.php:530
 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:549
+#: classes/User_group.php:553
 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:564
+#: classes/User_group.php:568
 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
+#, fuzzy, php-format
+msgid "Cannot locate account %s."
+msgstr "Njemóžeš swoje konto 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 ""
+
+#. 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6668,7 +6707,8 @@ msgid "Create an account"
 msgstr "Konto załožić"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrować"
@@ -6680,7 +6720,8 @@ msgid "Login to the site"
 msgstr "Při sydle přizjewić"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Přizjewjenje"
@@ -6906,6 +6947,23 @@ msgstr ""
 msgid "No content for notice %s."
 msgstr "!Žadyn wobsah za powěsć %s."
 
+#: lib/activitymover.php:84
+#, fuzzy, php-format
+msgid "No such user %s."
+msgstr "Wužiwar njeeksistuje"
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7346,7 +7404,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Městno: %s"
@@ -7354,7 +7412,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Startowa strona: %s"
@@ -7608,24 +7666,24 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 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:158
+#: lib/common.php:164
 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "K instalaciji"
 
@@ -7713,6 +7771,12 @@ msgstr "Twój design njeda so aktualizować."
 msgid "Design defaults restored."
 msgstr "Designowe standardne nastajenja wobnowjene."
 
+#. TRANS: Exception. %s is an ID.
+#: lib/discovery.php:153
+#, fuzzy, php-format
+msgid "Unable to find services for %s."
+msgstr "Njemóžno přistup za aplikaciju cofnyć: %s-"
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "Tutu zdźělenku z faworitow wotstronić"
@@ -7792,13 +7856,13 @@ msgid "Describe the group or topic"
 msgstr "Skupinu abo temu wopisać"
 
 #: lib/groupeditform.php:162
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the group or topic in %d character or less."
 msgid_plural "Describe the group or topic in %d characters or less."
-msgstr[0] "Skupinu abo temu w %d znamješce wopisać"
-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ć"
+msgstr[0] "Skupinu abo temu w %d znamješce abo mjenje wopisać"
+msgstr[1] "Skupinu abo temu w %d znamješkomaj abo mjenje wopisać"
+msgstr[2] "Skupinu abo temu w %d znamješkach abo mjenje wopisać"
+msgstr[3] "Skupinu abo temu w %d znamješkach abo mjenje wopisać"
 
 #: lib/groupeditform.php:174
 msgid ""
@@ -7916,35 +7980,41 @@ msgstr ""
 "Tuta strona we wot  tebje akceptowanym medijowym typje k dispoziciji "
 "njesteji."
 
-#: lib/imagefile.php:72
+#. 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:90
+#: 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."
 
-#: lib/imagefile.php:95
+#. 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."
 
-#: lib/imagefile.php:111
+#. 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."
 
-#: lib/imagefile.php:160
+#. 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."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -7954,7 +8024,7 @@ msgstr[2] "%d MB"
 msgstr[3] "%d MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -7964,7 +8034,7 @@ msgstr[2] "%d KB"
 msgstr[3] "%d KB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -7987,23 +8057,25 @@ msgstr "Njeznate žórło postoweho kašćika %d."
 msgid "Leave"
 msgstr "Wopušćić"
 
-#: lib/logingroupnav.php:80
+#. 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"
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8022,14 +8094,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8041,7 +8113,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:263
+#: lib/mail.php:255
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8058,14 +8130,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nowa e-mejlowa adresa za słanje do %s"
@@ -8073,7 +8145,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:321
+#: lib/mail.php:313
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8088,34 +8160,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "Status wužiwarja %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, 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:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 msgstr "Sy so wot %s 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8133,7 +8205,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "Nowa priwatna powěsć wot %s"
@@ -8142,7 +8214,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8163,7 +8235,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:607
+#: lib/mail.php:599
 #, 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ł"
@@ -8173,7 +8245,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8195,7 +8267,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8208,7 +8280,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:680
+#: lib/mail.php:672
 #, 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ł"
@@ -8219,7 +8291,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8527,36 +8599,46 @@ msgstr "Taflički w zdźělenkach wot %s"
 msgid "Unknown"
 msgstr "Njeznaty"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Abonementy"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Wšě abonementy"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Abonenća"
 
-#: lib/profileaction.php:161
+#. 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"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "Wužiwarski ID"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Čłon wot"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. 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"
 
-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Wšě skupiny"
 
@@ -8807,48 +8889,60 @@ msgstr "Wotskazać"
 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:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "Awatar wobdźěłać"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "Wužiwarske akcije"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr "Wužiwar so haša..."
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "Profilowe nastajenja wobdźěłać"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "Wobdźěłać"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "Tutomu wužiwarja direktnu powěsć pósłać"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "Powěsć"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr "Moderěrować"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "Wužiwarska róla"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrator"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
@@ -8954,12 +9048,12 @@ 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:64
+#: lib/xrd.php:63
 msgid "Invalid XML."
 msgstr "Njepłaćiwy XML."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr "Njepłaćiwy XML, korjeń XRD faluje."
 
@@ -8968,32 +9062,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\"-"
-
-#~ msgid "No such group"
-#~ msgstr "Skupina njeeksistuje"
-
-#~ msgid "HTTP method not supported"
-#~ msgstr "HTTP-metoda so njepodpěruje"
-
-#~ msgid "Reset"
-#~ msgstr "Wróćo stajić"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr ""
-#~ "1-64 małopisanych pismikow abo ličbow, žane interpunkciske znamješka abo "
-#~ "mjezery. Trěbne."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6 abo wjace znamješkow. Trěbne."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "Jenake kaž hesło horjeka. Trěbne."
-
-#~ 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."
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "%s płaćiwa barba njeje!"
diff --git a/locale/hu/LC_MESSAGES/statusnet.po b/locale/hu/LC_MESSAGES/statusnet.po
index fac32f4770..6de25147f6 100644
--- a/locale/hu/LC_MESSAGES/statusnet.po
+++ b/locale/hu/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Hungarian (Magyar)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bdamokos
 # Author: Dani
@@ -12,13 +12,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:57:01+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:48:14+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-01-20 20:41:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hu\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -95,7 +95,7 @@ msgstr "Hozzáférések beállításainak mentése"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -133,6 +133,7 @@ msgstr "Nincs ilyen lap."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -337,14 +338,15 @@ msgstr "Nem sikerült frissíteni a felhasználót."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "A felhasználónak nincs profilja."
 
@@ -676,18 +678,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Az álnév nem egyezhet meg a becenévvel."
 
@@ -698,7 +698,7 @@ msgstr "Az álnév nem egyezhet meg a becenévvel."
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "A csoport nem található."
@@ -891,11 +891,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Becenév"
 
@@ -1203,28 +1204,27 @@ msgstr ""
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: 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.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
@@ -1394,23 +1394,30 @@ msgstr "Senkinek sem iratkoztál fel a híreire."
 msgid "Cannot delete someone else's subscription."
 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/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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."
@@ -1516,34 +1523,34 @@ msgid "No file uploaded."
 msgstr "Nincs feltöltve fájl."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: actions/avatarsettings.php:345
 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr "Elvesztettük az adatainkat."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: 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:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr ""
 
@@ -1736,8 +1743,9 @@ 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/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Hírek"
 
@@ -1762,7 +1770,7 @@ msgstr ""
 #. 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."
+msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1773,7 +1781,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 #, fuzzy
 msgid "Delete account"
 msgstr "Felhasználó törlése"
@@ -2318,7 +2326,8 @@ msgstr "Ezen űrlap segítségével szerkesztheted a csoportot."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Érvénytelen álnév: „%s”"
@@ -2330,7 +2339,7 @@ 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:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "Nem sikerült létrehozni az álneveket."
 
@@ -2832,17 +2841,17 @@ msgid "Crop"
 msgstr "Levágás"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "Logó frissítve."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "Nem sikerült a logó feltöltése."
 
@@ -2902,7 +2911,9 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Csoportok"
@@ -3444,7 +3455,7 @@ msgstr "Rossz felhasználónév vagy jelszó."
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
-#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Bejelentkezés"
 
@@ -3544,6 +3555,12 @@ msgstr "Nem vagy tagja ennek a csoportnak."
 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:199
+#, 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
 msgid "New message"
 msgstr "Új üzenet"
@@ -4231,9 +4248,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "Teljes név"
 
@@ -4275,10 +4293,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "Helyszín"
 
@@ -4293,9 +4312,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "Címkék"
 
@@ -4389,7 +4409,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr ""
 
@@ -4689,7 +4709,7 @@ msgstr ""
 msgid "Registration successful"
 msgstr "A regisztráció sikeres"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Regisztráció"
 
@@ -4830,8 +4850,9 @@ msgstr "Profil URL"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "Kövessük"
 
@@ -4982,7 +5003,9 @@ 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.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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 ""
 
@@ -5098,8 +5121,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statisztika"
 
@@ -5224,14 +5248,16 @@ 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:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Megjegyzés"
 
@@ -5275,8 +5301,11 @@ msgid "Members"
 msgstr "Tagok"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(nincs)"
@@ -5871,7 +5900,7 @@ 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:116
+#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -5879,7 +5908,7 @@ 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:120
+#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -5889,7 +5918,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -5920,7 +5949,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -5934,23 +5963,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s nem követ figyelemmel senkit."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "SMS"
 
@@ -5983,12 +6013,14 @@ msgstr ""
 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"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Fénykép"
 
@@ -6507,25 +6539,25 @@ 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:914
+#: classes/Notice.php:923
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1013
+#: classes/Notice.php:1022
 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -6626,25 +6658,46 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 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:526
+#: classes/User_group.php:530
 msgid "Could not set group URI."
 msgstr ""
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:549
+#: classes/User_group.php:553
 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:564
+#: classes/User_group.php:568
 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6781,7 +6834,8 @@ msgid "Create an account"
 msgstr ""
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr ""
@@ -6793,7 +6847,8 @@ msgid "Login to the site"
 msgstr ""
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr ""
@@ -7022,6 +7077,23 @@ msgstr ""
 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ó."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7467,7 +7539,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Helyszín: %s"
@@ -7475,7 +7547,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Honlap: %s"
@@ -7705,26 +7777,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 #, 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:158
+#: lib/common.php:164
 #, 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "Menj a telepítőhöz."
 
@@ -7814,6 +7886,12 @@ msgstr "Nem sikerült frissíteni a designt."
 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 ""
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "Nem kedvelem ezt a hírt"
@@ -8018,35 +8096,41 @@ msgstr "Címkék a(z) %s csoport híreiben"
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
-#: lib/imagefile.php:72
+#. 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:90
+#: 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."
 
-#: lib/imagefile.php:95
+#. 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."
 
-#: lib/imagefile.php:111
+#. 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 ""
 
-#: lib/imagefile.php:160
+#. 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."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8054,7 +8138,7 @@ msgstr[0] "MB"
 msgstr[1] "MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8062,7 +8146,7 @@ msgstr[0] "kB"
 msgstr[1] "kB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8083,23 +8167,25 @@ msgstr ""
 msgid "Leave"
 msgstr "Távozzunk"
 
-#: lib/logingroupnav.php:80
+#. 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"
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8131,14 +8217,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8150,7 +8236,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:263
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8178,14 +8264,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
@@ -8193,7 +8279,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:321
+#: lib/mail.php:313
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8208,34 +8294,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "%s állapota"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, 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:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8264,7 +8350,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "Új privát üzenetet küldött neked %s"
@@ -8273,7 +8359,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8308,7 +8394,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:607
+#: lib/mail.php:599
 #, 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"
@@ -8318,7 +8404,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8356,7 +8442,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8366,7 +8452,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:680
+#: lib/mail.php:672
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) figyelmedbe ajánlott egy hírt"
@@ -8377,7 +8463,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8683,36 +8769,46 @@ msgstr "Címkék %s híreiben"
 msgid "Unknown"
 msgstr ""
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Feliratkozások"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Összes feliratkozás"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Feliratkozók"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Minden feliratkozott"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "Felhasználói azonosító"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Tagság kezdete:"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. TRANS: Label for user statistics.
+#. TRANS: Average count of posts made per day since account registration.
+#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr ""
 
-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Összes csoport"
 
@@ -8964,48 +9060,60 @@ msgstr ""
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "A felhasználónak nincs profilja."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr ""
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "Felhasználói műveletek"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr ""
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr ""
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "Szerkesztés"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr ""
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "Üzenet"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr "Moderálás"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "Felhasználói szerepkör"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "Adminisztrátor"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderátor"
@@ -9095,13 +9203,13 @@ 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:64
+#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Érvénytelen méret."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
@@ -9110,28 +9218,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "No such group"
-#~ msgstr "Nincs ilyen csoport"
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "Az API-metódus nem található."
-
-#~ msgid "Reset"
-#~ msgstr "Alaphelyzet"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr ""
-#~ "1-64 kisbetű vagy számjegy, nem lehet írásjel vagy szóköz benne. "
-#~ "Szükséges."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6 vagy több karakter. Kötelező."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "Ugyanaz mint a jelszó fentebb. Szükséges."
-
-#~ 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"
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index 3c99af5802..25836c924a 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:57:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:48: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-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -90,7 +90,7 @@ msgstr "Salveguardar configurationes de accesso"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -128,6 +128,7 @@ msgstr "Pagina non existe."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -338,14 +339,15 @@ msgstr "Non poteva actualisar le usator."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Le usator non ha un profilo."
 
@@ -675,18 +677,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Le alias non pote esser identic al pseudonymo."
 
@@ -697,7 +697,7 @@ msgstr "Le alias non pote esser identic al pseudonymo."
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Gruppo non trovate."
@@ -894,11 +894,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Pseudonymo"
 
@@ -1206,28 +1207,27 @@ msgstr "Le message Atom debe esser in XML ben formate."
 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.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: 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.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Un nota con le URI \"%s\" jam existe."
@@ -1285,9 +1285,8 @@ msgstr "Membratos del gruppo %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 es possibile adder le membrato de un altere persona"
+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.
@@ -1317,7 +1316,6 @@ msgstr "Iste favorite non 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 "Non pote deler le favorite de un altere persona."
 
@@ -1355,15 +1353,13 @@ msgstr "Gruppo non 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 "Non es membro"
+msgstr "Non es membro."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
-#, fuzzy
 msgid "Cannot delete someone else's membership."
-msgstr "Non pote deler le membrato de un altere persona"
+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.
@@ -1386,23 +1382,30 @@ msgstr "Le profilo %1$d non es subscribite al profilo %2$d."
 msgid "Cannot delete someone else's subscription."
 msgstr "Non pote deler le subscription de un altere persona."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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
+#, fuzzy, php-format
+msgid "Already subscribed to %s."
+msgstr "Ja subscribite!"
+
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
 msgid "No such attachment."
@@ -1506,34 +1509,34 @@ msgid "No file uploaded."
 msgstr "Nulle file incargate."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr "Datos del file perdite."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Actualisation del avatar fallite."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr "Facer un copia de reserva del conto"
 
@@ -1550,7 +1553,6 @@ msgstr "Tu non pote facer un copia de reserva de tu conto."
 
 #. TRANS: Information displayed on the backup account page.
 #: actions/backupaccount.php:225
-#, 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 "
@@ -1732,8 +1734,9 @@ msgid "Conversation"
 msgstr "Conversation"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Notas"
 
@@ -1755,8 +1758,8 @@ 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."
+#, fuzzy, 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.
@@ -1766,7 +1769,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 msgid "Delete account"
 msgstr "Deler conto"
 
@@ -1976,7 +1979,6 @@ msgstr "Tu pote solmente deler usatores local."
 
 #. TRANS: Title of delete user page.
 #: actions/deleteuser.php:110
-#, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Deler usator"
@@ -1997,9 +1999,8 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-#, fuzzy
 msgid "Do not delete this user"
-msgstr "Non deler iste gruppo"
+msgstr "Non deler iste usator"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
 #. TRANS: Description of form for deleting a user.
@@ -2126,7 +2127,6 @@ msgstr "Tegular le imagine de fundo"
 
 #. TRANS: Fieldset legend for theme colors.
 #: actions/designadminpanel.php:598
-#, fuzzy
 msgid "Change colors"
 msgstr "Cambiar colores"
 
@@ -2166,7 +2166,6 @@ msgstr "CSS personalisate"
 
 #. TRANS: Button text for resetting theme settings.
 #: actions/designadminpanel.php:718
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Usar predefinitiones"
@@ -2202,7 +2201,7 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\"."
 msgstr "Le documento \"%s\" non existe."
 
@@ -2313,7 +2312,8 @@ msgstr "Usa iste formulario pro modificar le gruppo."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Alias invalide: \"%s\""
@@ -2325,7 +2325,7 @@ 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:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "Non poteva crear aliases."
 
@@ -2830,17 +2830,17 @@ msgid "Crop"
 msgstr "Taliar"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "Logotypo actualisate."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "Falleva de actualisar le logotypo."
 
@@ -2900,7 +2900,9 @@ msgstr "Facer iste usator un administrator"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Actualisationes de membros de %1$s in %2$s!"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Gruppos"
@@ -3337,7 +3339,7 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s se jungeva al gruppo %2$s"
@@ -3355,7 +3357,7 @@ msgstr "Tu non es membro de iste gruppo."
 
 #. TRANS: Title for leave group page after leaving.
 #: actions/leavegroup.php:142
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s quitava le gruppo %2$s"
@@ -3486,7 +3488,7 @@ 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 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Aperir session"
 
@@ -3587,6 +3589,12 @@ msgstr "Tu non ha le permission de crear gruppos in iste sito."
 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:199
+#, fuzzy
+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
 msgid "New message"
 msgstr "Nove message"
@@ -4271,9 +4279,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "Nomine complete"
 
@@ -4312,10 +4321,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "Loco"
 
@@ -4330,9 +4340,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "Etiquettas"
 
@@ -4422,7 +4433,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Restaurar conto"
 
@@ -4590,9 +4601,8 @@ msgstr ""
 "adresse de e-mail specificate in tu conto."
 
 #: actions/recoverpassword.php:167
-#, fuzzy
 msgid "You have been identified. Enter a new password below."
-msgstr "Tu ha essite identificate. Entra un nove contrasigno hic infra. "
+msgstr "Tu ha essite identificate. Entra un nove contrasigno hic infra."
 
 #. TRANS: Fieldset legend for password recovery page.
 #: actions/recoverpassword.php:198
@@ -4616,7 +4626,6 @@ msgstr "Recuperar"
 
 #. TRANS: Button text on password recovery page.
 #: actions/recoverpassword.php:214
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Recuperar"
@@ -4644,15 +4653,13 @@ msgstr "Action incognite"
 
 #. 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 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
-#, fuzzy
 msgid "Same as password above."
-msgstr "Identic al contrasigno hic supra"
+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.
@@ -4707,7 +4714,6 @@ msgstr "Contrasigno e confirmation non corresponde."
 
 #. TRANS: Reset password form validation error message.
 #: actions/recoverpassword.php:418
-#, fuzzy
 msgid "Cannot save new password."
 msgstr "Non pote salveguardar le nove contrasigno."
 
@@ -4733,7 +4739,7 @@ msgstr "Pardono, le codice de invitation es invalide."
 msgid "Registration successful"
 msgstr "Registration succedite"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Crear conto"
 
@@ -4762,9 +4768,8 @@ msgstr ""
 "notas e mitter te in contacto con amicos e collegas. "
 
 #: actions/register.php:437
-#, fuzzy
 msgid "6 or more characters."
-msgstr "6 o plus characteres"
+msgstr "6 o plus characteres."
 
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:445 actions/register.php:449
@@ -4895,8 +4900,9 @@ msgstr "URL del profilo"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "Subscriber"
 
@@ -5051,7 +5057,9 @@ 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.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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."
 
@@ -5169,8 +5177,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statisticas"
 
@@ -5305,14 +5314,16 @@ 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:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Nota"
 
@@ -5356,8 +5367,11 @@ msgid "Members"
 msgstr "Membros"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Nulle)"
@@ -5970,7 +5984,7 @@ 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:116
+#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -5980,7 +5994,7 @@ 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:120
+#: 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?"
@@ -5990,7 +6004,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6023,7 +6037,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6043,23 +6057,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s non seque alcuno."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "SMS"
 
@@ -6092,12 +6107,14 @@ msgstr "Nulle parametro de ID."
 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"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Photo"
 
@@ -6652,25 +6669,25 @@ msgid "Problem saving notice."
 msgstr "Problema salveguardar nota."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:914
+#: classes/Notice.php:923
 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:1013
+#: classes/Notice.php:1022
 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6773,25 +6790,46 @@ 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:516
+#: classes/User_group.php:520
 msgid "Could not create group."
 msgstr "Non poteva crear gruppo."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:526
+#: classes/User_group.php:530
 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:549
+#: classes/User_group.php:553
 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:564
+#: classes/User_group.php:568
 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
+#, fuzzy, php-format
+msgid "Cannot locate account %s."
+msgstr "Tu non pote deler tu conto."
+
+#. 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6928,7 +6966,8 @@ msgid "Create an account"
 msgstr "Crear un conto"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Crear conto"
@@ -6940,7 +6979,8 @@ msgid "Login to the site"
 msgstr "Authenticar te a iste sito"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Aperir session"
@@ -7176,6 +7216,23 @@ msgstr ""
 msgid "No content for notice %s."
 msgstr "Nulle contento pro nota %s."
 
+#: lib/activitymover.php:84
+#, fuzzy, php-format
+msgid "No such user %s."
+msgstr "Iste usator non existe."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7624,7 +7681,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Loco: %s"
@@ -7632,7 +7689,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Pagina personal: %s"
@@ -7904,24 +7961,24 @@ msgstr ""
 "tracking - non ancora implementate.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 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:158
+#: lib/common.php:164
 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "Ir al installator."
 
@@ -8009,6 +8066,12 @@ msgstr "Non poteva actualisar tu apparentia."
 msgid "Design defaults restored."
 msgstr "Apparentia predefinite restaurate."
 
+#. TRANS: Exception. %s is an ID.
+#: lib/discovery.php:153
+#, fuzzy, php-format
+msgid "Unable to find services for %s."
+msgstr "Impossibile revocar le accesso del application: %s."
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "Disfavorir iste nota"
@@ -8088,11 +8151,11 @@ msgid "Describe the group or topic"
 msgstr "Describe le gruppo o topico"
 
 #: lib/groupeditform.php:162
-#, fuzzy, php-format
+#, 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"
+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:174
 msgid ""
@@ -8208,35 +8271,41 @@ msgstr "Etiquettas in le notas del gruppo %s"
 msgid "This page is not available in a media type you accept"
 msgstr "Iste pagina non es disponibile in un formato que tu accepta"
 
-#: lib/imagefile.php:72
+#. 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:90
+#: 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."
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Incargamento partial."
 
-#: lib/imagefile.php:111
+#. 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."
 
-#: lib/imagefile.php:160
+#. 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."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8244,7 +8313,7 @@ msgstr[0] "%dMB"
 msgstr[1] "%dMB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8252,7 +8321,7 @@ msgstr[0] "%dKB"
 msgstr[1] "%dKB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8273,23 +8342,25 @@ msgstr "Fonte de cassa de entrata \"%s\" incognite"
 msgid "Leave"
 msgstr "Quitar"
 
-#: lib/logingroupnav.php:80
+#. 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"
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8320,14 +8391,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8342,7 +8413,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:263
+#: lib/mail.php:255
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8369,14 +8440,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nove adresse de e-mail pro publicar in %s"
@@ -8384,7 +8455,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:321
+#: lib/mail.php:313
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8407,34 +8478,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "Stato de %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, 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:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8463,7 +8534,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "Nove message private de %s"
@@ -8472,7 +8543,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8507,7 +8578,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:607
+#: lib/mail.php:599
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) ha addite tu nota como favorite"
@@ -8517,7 +8588,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8556,7 +8627,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8569,7 +8640,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:680
+#: lib/mail.php:672
 #, 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"
@@ -8580,7 +8651,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8912,36 +8983,46 @@ msgstr "Etiquettas in le notas de %s"
 msgid "Unknown"
 msgstr "Incognite"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Subscriptiones"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Tote le subscriptiones"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Subscriptores"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Tote le subscriptores"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "ID del usator"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Membro depost"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. 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"
 
-#: lib/profileaction.php:264
+#. 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"
 
@@ -9200,48 +9281,60 @@ 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."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "Modificar avatar"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "Actiones de usator"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr "Deletion del usator in curso…"
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "Modificar configuration de profilo"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "Modificar"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "Inviar un message directe a iste usator"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "Message"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr "Moderar"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "Rolo de usator"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrator"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
@@ -9331,12 +9424,12 @@ 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:64
+#: lib/xrd.php:63
 msgid "Invalid XML."
 msgstr "XML invalide."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr "XML invalide, radice XRD mancante."
 
@@ -9345,28 +9438,3 @@ msgstr "XML invalide, radice XRD mancante."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Obtene copia de reserva ex file '%s'."
-
-#~ msgid "No such group"
-#~ msgstr "Gruppo non existe"
-
-#~ msgid "HTTP method not supported"
-#~ msgstr "Methodo HTTP non supportate"
-
-#~ msgid "Reset"
-#~ msgstr "Reinitialisar"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr "1-64 minusculas o numeros, sin punctuation o spatios. Requirite."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6 o plus characteres. Requirite."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "Identic al contrasigno hic supra. Requirite."
-
-#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-#~ msgstr "1-64 minusculas o numeros, sin punctuation o spatios"
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "%s non es un color valide!"
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index 1b8b209700..615164e3ac 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Icelandic (Íslenska)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:57:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:48:18+0000\n"
 "Language-Team: Icelandic <http://translatewiki.net/wiki/Portal:is>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: is\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -96,7 +96,7 @@ msgstr "Stillingar fyrir mynd"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 #, fuzzy
@@ -136,6 +136,7 @@ msgstr "Ekkert þannig merki."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -339,14 +340,15 @@ msgstr "Gat ekki uppfært notanda."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Notandi hefur enga persónulega síðu."
 
@@ -687,18 +689,16 @@ msgstr "Ógilt merki: \"%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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, fuzzy, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -709,7 +709,7 @@ msgstr ""
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Fannst ekki."
@@ -908,11 +908,12 @@ msgstr "Aðgangur"
 #. 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Stuttnefni"
 
@@ -1222,28 +1223,27 @@ msgstr ""
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Finna innihald babls"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Enginn persónuleg síða með þessu einkenni."
@@ -1413,23 +1413,30 @@ msgstr "Þú ert ekki áskrifandi."
 msgid "Cannot delete someone else's subscription."
 msgstr "Gat ekki vistað áskrift."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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 "Óþekkt skráargerð"
 
+#. 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 "Ekki í áskrift!"
+
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
 #, fuzzy
@@ -1537,36 +1544,36 @@ msgid "No file uploaded."
 msgstr "Engin persónuleg síða tilgreind"
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: actions/avatarsettings.php:345
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 "Veldu ferningslaga svæði á upphaflegu myndinni sem einkennismyndina þína"
 
 #. 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr "Týndum skráargögnunum okkar"
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: actions/avatarsettings.php:384
 msgid "Avatar updated."
 msgstr "Mynd hefur verið uppfærð."
 
 #. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:389
+#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Mistókst að uppfæra mynd"
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:413
+#: actions/avatarsettings.php:412
 #, fuzzy
 msgid "Avatar deleted."
 msgstr "Mynd hefur verið uppfærð."
 
 #. 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr ""
 
@@ -1764,8 +1771,9 @@ msgid "Conversation"
 msgstr "Staðfestingarlykill"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Babl"
 
@@ -1790,7 +1798,7 @@ msgstr ""
 #. 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."
+msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1801,7 +1809,7 @@ msgstr "Mynd hefur verið uppfærð."
 
 #. 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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 #, fuzzy
 msgid "Delete account"
 msgstr "Búa til nýjan hóp"
@@ -2366,7 +2374,8 @@ msgstr "Notaðu þetta eyðublað til að breyta hópnum."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, fuzzy, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Ógilt merki: \"%s\""
@@ -2378,7 +2387,7 @@ msgstr "Gat ekki uppfært hóp."
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 #, fuzzy
 msgid "Could not create aliases."
 msgstr "Gat ekki búið til uppáhald."
@@ -2898,19 +2907,19 @@ msgid "Crop"
 msgstr "Skera af"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 #, fuzzy
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 "Veldu ferningslaga svæði á upphaflegu myndinni sem einkennismyndina þína"
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "Einkennismynd uppfærð."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "Tókst ekki að uppfæra einkennismynd"
 
@@ -2970,7 +2979,9 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Færslur frá %1$s á %2$s!"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Hópar"
@@ -3556,7 +3567,7 @@ msgstr "Rangt notendanafn eða lykilorð."
 msgid "Error setting user. You are probably not authorized."
 msgstr "Engin heimild."
 
-#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Innskráning"
 
@@ -3666,6 +3677,11 @@ msgstr "Þú ert ekki meðlimur í þessum hópi."
 msgid "Use this form to create a new group."
 msgstr "Notaðu þetta eyðublað til að búa til nýjan hóp."
 
+#. TRANS: Group create form validation error.
+#: actions/newgroup.php:199
+msgid "Alias cannot be the same as nickname."
+msgstr ""
+
 #: actions/newmessage.php:71 actions/newmessage.php:234
 msgid "New message"
 msgstr "Ný skilaboð"
@@ -4373,9 +4389,10 @@ msgstr "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil"
 
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "Fullt nafn"
 
@@ -4418,10 +4435,11 @@ msgstr "Lýsing"
 
 #. 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "Staðsetning"
 
@@ -4436,9 +4454,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "Merki"
 
@@ -4532,7 +4551,7 @@ msgstr "Stillingar vistaðar."
 
 #. 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Búa til nýjan hóp"
@@ -4838,7 +4857,7 @@ msgstr "Villa kom upp varðandi staðfestingarlykilinn."
 msgid "Registration successful"
 msgstr "Nýskráning tókst"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Nýskrá"
 
@@ -4997,8 +5016,9 @@ msgstr "Veffang persónulegrar síðu"
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "Veffang persónulegrar síðu á samvirkandi örbloggsþjónustu"
 
+#. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "Gerast áskrifandi"
 
@@ -5156,7 +5176,9 @@ msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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 "Kerfisvilla kom upp við upphal skráar."
 
@@ -5280,8 +5302,9 @@ msgid "Description"
 msgstr "Lýsing"
 
 #. TRANS: Header for group statistics on a group page (h2).
+#. TRANS: H2 text for user statistics.
 #: actions/showapplication.php:192 actions/showgroup.php:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Tölfræði"
 
@@ -5407,14 +5430,16 @@ msgid "Group profile"
 msgstr "Hópssíðan"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
+#. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: actions/userauthorization.php:175 lib/userprofile.php:186
 msgid "URL"
 msgstr "Vefslóð"
 
 #. TRANS: Label for group description or group note (dt). Text hidden by default.
+#. TRANS: DT for note in a profile.
 #: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Athugasemd"
 
@@ -5458,8 +5483,11 @@ msgid "Members"
 msgstr "Meðlimir"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Ekkert)"
@@ -6067,7 +6095,7 @@ msgid "These are the people who listen to %s's notices."
 msgstr "Þetta er fólkið sem hlustar á bablið í %s."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:116
+#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6075,7 +6103,7 @@ 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:120
+#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -6085,7 +6113,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6116,7 +6144,7 @@ msgstr "Þetta er fólkið sem %s hlustar á bablið í."
 #. 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6130,23 +6158,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, fuzzy, php-format
 msgid "%s is not listening to anyone."
 msgstr "%1$s er að hlusta á bablið þitt á %2$s."
 
-#: actions/subscriptions.php:178
+#. TRANS: Atom feed title. %s is a profile nickname.
+#: actions/subscriptions.php:176
 #, fuzzy, php-format
 msgid "Subscription feed for %s (Atom)"
 msgstr "Svör við %s"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber snarskilaboðaþjónusta"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "SMS"
 
@@ -6180,12 +6209,14 @@ msgstr "Ekkert einkenni gefið upp."
 msgid "Tag %s"
 msgstr "Merki %s"
 
+#. TRANS: H2 for user profile information.
 #: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Persónuleg síða notanda"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Ljósmynd"
 
@@ -6745,26 +6776,26 @@ msgid "Problem saving notice."
 msgstr "Vandamál komu upp við að vista babl."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:914
+#: classes/Notice.php:923
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1013
+#: classes/Notice.php:1022
 #, fuzzy
 msgid "Problem saving group inbox."
 msgstr "Vandamál komu upp við að vista babl."
 
 #. 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:1127
+#: classes/Notice.php:1136
 #, fuzzy, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr "Gat ekki vistað áskrift."
 
 #. 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6869,26 +6900,47 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 msgid "Could not create group."
 msgstr "Gat ekki búið til hóp."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:526
+#: classes/User_group.php:530
 msgid "Could not set group URI."
 msgstr "Gat ekki búið til hóp."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:549
+#: classes/User_group.php:553
 msgid "Could not set group membership."
 msgstr "Gat ekki skráð hópmeðlimi."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:564
+#: classes/User_group.php:568
 #, fuzzy
 msgid "Could not save local group info."
 msgstr "Gat ekki vistað áskrift."
 
+#. 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 "Gat ekki uppfært notanda."
+
+#. 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -7032,7 +7084,8 @@ msgid "Create an account"
 msgstr "Búa til nýjan hóp"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 #, fuzzy
 msgctxt "MENU"
 msgid "Register"
@@ -7046,7 +7099,8 @@ msgid "Login to the site"
 msgstr "Skrá þig inn á síðuna"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 #, fuzzy
 msgctxt "MENU"
 msgid "Login"
@@ -7286,6 +7340,23 @@ msgstr ""
 msgid "No content for notice %s."
 msgstr "Finna innihald babls"
 
+#: lib/activitymover.php:84
+#, fuzzy, php-format
+msgid "No such user %s."
+msgstr "Enginn svoleiðis notandi."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7750,7 +7821,7 @@ msgstr "Fullt nafn: %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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Staðsetning: %s"
@@ -7758,7 +7829,7 @@ msgstr "Staðsetning: %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:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Heimasíða: %s"
@@ -7999,26 +8070,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 #, fuzzy
 msgid "No configuration file found."
 msgstr "Enginn staðfestingarlykill."
 
 #. 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:158
+#: lib/common.php:164
 #, fuzzy
 msgid "I looked for configuration files in the following places:"
 msgstr "Boðskort sent á eftirfarandi aðila:"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Skrá þig inn á síðuna"
@@ -8112,6 +8183,12 @@ msgstr "Gat ekki uppfært hóp."
 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 "Notaðu þetta eyðublað til að breyta hópnum."
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "Taka þetta babl út sem uppáhald"
@@ -8313,35 +8390,41 @@ msgid "This page is not available in a media type you accept"
 msgstr ""
 "Þessi síða er ekki aðgengileg í margmiðlunargerðinni sem þú tekur á móti"
 
-#: lib/imagefile.php:72
+#. TRANS: Exception thrown when trying to upload an unsupported image file format.
+#: lib/imagefile.php:73
 msgid "Unsupported image file format."
 msgstr "Skráarsnið myndar ekki stutt."
 
 #. 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:90
+#: lib/imagefile.php:91
 #, fuzzy, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Upphal að hluta til."
 
-#: lib/imagefile.php:111
+#. 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 "Annaðhvort ekki mynd eða þá að skráin er gölluð."
 
-#: lib/imagefile.php:160
+#. 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 "Týndum skránni okkar"
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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 "Óþekkt skráargerð"
 
 #. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:283
+#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8349,7 +8432,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8357,7 +8440,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8378,23 +8461,25 @@ msgstr ""
 msgid "Leave"
 msgstr "Hætta sem meðlimur"
 
-#: lib/logingroupnav.php:80
+#. TRANS: Title for menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Skráðu þig inn með notendanafni og lykilorði"
 
-#: lib/logingroupnav.php:86
+#. TRANS: Title for menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:87
 msgid "Sign up for a new account"
 msgstr "Búðu til nýjan aðgang"
 
 #. TRANS: Subject for address confirmation email.
-#: lib/mail.php:174
+#: lib/mail.php:168
 msgid "Email address confirmation"
 msgstr "Staðfesting tölvupóstfangs"
 
 #. 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:179
+#: lib/mail.php:173
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8413,14 +8498,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:246
+#: lib/mail.php:238
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s er að hlusta á bablið þitt á %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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8432,7 +8517,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:263
+#: lib/mail.php:255
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8449,14 +8534,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, php-format
 msgid "Bio: %s"
 msgstr "Staðsetning: %s"
 
 #. TRANS: Subject of notification mail for new posting email address.
 #. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nýtt tölvupóstfang til að senda á %s"
@@ -8464,7 +8549,7 @@ msgstr "Nýtt tölvupóstfang til að senda á %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:321
+#: lib/mail.php:313
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8487,34 +8572,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "Staða %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 msgid "SMS confirmation"
 msgstr "SMS staðfesting"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message.
 #. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:472
+#: lib/mail.php:464
 #, fuzzy, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "Býð eftir staðfestingu varðandi þetta símanúmer."
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 msgstr "%s ýtti við þér"
 
 #. 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8532,7 +8617,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "Ný persónuleg skilaboð frá %s"
@@ -8541,7 +8626,7 @@ msgstr "Ný persónuleg skilaboð frá %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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8562,7 +8647,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:607
+#: lib/mail.php:599
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "Senda mér tölvupóst þegar einhver setur babl í mér í uppáhald hjá sér."
@@ -8572,7 +8657,7 @@ msgstr "Senda mér tölvupóst þegar einhver setur babl í mér í uppáhald hj
 #. 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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8594,7 +8679,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8604,7 +8689,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:680
+#: lib/mail.php:672
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
@@ -8615,7 +8700,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8928,37 +9013,47 @@ msgstr "Merki í babli %s"
 msgid "Unknown"
 msgstr "Óþekkt aðgerð"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Áskriftir"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Allar áskriftir"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Áskrifendur"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Allir áskrifendur"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 #, fuzzy
 msgid "User ID"
 msgstr "Notandi"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Meðlimur síðan"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. TRANS: Label for user statistics.
+#. TRANS: Average count of posts made per day since account registration.
+#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr ""
 
-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Allir hópar"
 
@@ -9222,51 +9317,63 @@ msgstr "Fara úr áskrift"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Notandi hefur enga persónulega síðu."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Mynd"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "Notandaaðgerðir"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr ""
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Stillingar persónulegrar síðu"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr ""
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "Senda bein skilaboð til þessa notanda"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "Skilaboð"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr ""
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 #, fuzzy
 msgid "User role"
 msgstr "Persónuleg síða notanda"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr ""
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr ""
@@ -9358,13 +9465,13 @@ msgstr[1] ""
 "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d"
 
 #. TRANS: Exception.
-#: lib/xrd.php:64
+#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Ótæk stærð."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
@@ -9373,31 +9480,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "No such group"
-#~ msgstr "Enginn þannig hópur."
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "Aðferð í forritsskilum fannst ekki!"
-
-#~ msgid "Reset"
-#~ msgstr "Endurstilla"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr ""
-#~ "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil. Nauðsynlegt."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6 eða fleiri tákn. Nauðsynlegt"
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt."
-
-#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-#~ msgstr "1-64 lágstafir eða tölustafir, engin greinarmerki eða bil"
-
-#, fuzzy
-#~ msgid "%s is not a valid color!"
-#~ msgstr "Heimasíða er ekki gild vefslóð."
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 510b1d11e7..d1d54dd6bf 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Italian (Italiano)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: HalphaZ
 # Author: Milocasagrande
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:57:13+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:48:22+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 (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: it\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -94,7 +94,7 @@ msgstr "Salva impostazioni di accesso"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -132,6 +132,7 @@ msgstr "Pagina inesistente."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -340,14 +341,15 @@ msgstr "Impossibile aggiornare l'utente."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "L'utente non ha un profilo."
 
@@ -681,18 +683,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "L'alias non può essere lo stesso del soprannome."
 
@@ -703,7 +703,7 @@ msgstr "L'alias non può essere lo stesso del soprannome."
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Gruppo non trovato."
@@ -905,11 +905,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Soprannome"
 
@@ -1219,28 +1220,27 @@ msgstr ""
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: 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.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Un messaggio con quel ID non esiste."
@@ -1409,23 +1409,30 @@ msgstr "Non hai una abbonamento a quel profilo."
 msgid "Cannot delete someone else's subscription."
 msgstr "Impossibile salvare l'abbonamento."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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."
@@ -1532,34 +1539,34 @@ msgid "No file uploaded."
 msgstr "Nessun file caricato."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: actions/avatarsettings.php:345
 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr "Perso il nostro file di dati."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: 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:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr ""
 
@@ -1755,8 +1762,9 @@ msgid "Conversation"
 msgstr "Conversazione"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Messaggi"
 
@@ -1781,7 +1789,7 @@ msgstr ""
 #. 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."
+msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1792,7 +1800,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 #, fuzzy
 msgid "Delete account"
 msgstr "Crea un account"
@@ -2343,7 +2351,8 @@ msgstr "Usa questo modulo per modificare il gruppo."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Alias non valido: \"%s\""
@@ -2355,7 +2364,7 @@ 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:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "Impossibile creare gli alias."
 
@@ -2865,17 +2874,17 @@ msgid "Crop"
 msgstr "Ritaglia"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "Logo aggiornato."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "Aggiornamento del logo non riuscito."
 
@@ -2935,7 +2944,9 @@ msgstr "Fa diventare questo utente un amministratore"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Messaggi dai membri di %1$s su %2$s!"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Gruppi"
@@ -3526,7 +3537,7 @@ msgstr "Nome utente o password non corretto."
 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 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Accedi"
 
@@ -3628,6 +3639,12 @@ msgstr "Non fai parte di questo gruppo."
 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:199
+#, 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
 msgid "New message"
 msgstr "Nuovo messaggio"
@@ -4330,9 +4347,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "Nome"
 
@@ -4372,10 +4390,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "Ubicazione"
 
@@ -4390,9 +4409,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "Etichette"
 
@@ -4485,7 +4505,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Crea un account"
@@ -4651,9 +4671,8 @@ msgstr ""
 "all'indirizzo email che hai inserito nel tuo account."
 
 #: actions/recoverpassword.php:167
-#, fuzzy
 msgid "You have been identified. Enter a new password below."
-msgstr "Identificazione avvenuta. Inserisci la nuova password. "
+msgstr "Identificazione avvenuta. Inserisci la nuova password."
 
 #. TRANS: Fieldset legend for password recovery page.
 #: actions/recoverpassword.php:198
@@ -4797,7 +4816,7 @@ msgstr "Codice di invito non valido."
 msgid "Registration successful"
 msgstr "Registrazione riuscita"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Registrati"
 
@@ -4960,8 +4979,9 @@ msgstr "URL del profilo"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "Abbonati"
 
@@ -5120,7 +5140,9 @@ 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.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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."
 
@@ -5236,8 +5258,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistiche"
 
@@ -5370,14 +5393,16 @@ 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:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Nota"
 
@@ -5421,8 +5446,11 @@ msgid "Members"
 msgstr "Membri"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(nessuno)"
@@ -6038,7 +6066,7 @@ 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:116
+#: actions/subscribers.php:114
 #, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
@@ -6049,7 +6077,7 @@ 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:120
+#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s non ha abbonati. Vuoi abbonarti tu?"
@@ -6059,7 +6087,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6092,7 +6120,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6111,23 +6139,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s non sta seguendo nessuno."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "SMS"
 
@@ -6160,12 +6189,14 @@ msgstr "Nessun argomento ID."
 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"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Fotografia"
 
@@ -6727,26 +6758,26 @@ 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:914
+#: classes/Notice.php:923
 #, 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:1013
+#: classes/Notice.php:1022
 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6850,25 +6881,46 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 msgid "Could not create group."
 msgstr "Impossibile creare il gruppo."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:526
+#: classes/User_group.php:530
 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:549
+#: classes/User_group.php:553
 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:564
+#: classes/User_group.php:568
 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -7005,7 +7057,8 @@ msgid "Create an account"
 msgstr "Crea un account"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrati"
@@ -7017,7 +7070,8 @@ msgid "Login to the site"
 msgstr "Accedi al sito"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Accedi"
@@ -7256,6 +7310,23 @@ msgstr ""
 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."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7706,7 +7777,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Posizione: %s"
@@ -7714,7 +7785,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Pagina web: %s"
@@ -7988,20 +8059,20 @@ msgstr ""
 "tracking - non ancora implementato\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 #, 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:158
+#: lib/common.php:164
 #, 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:161
+#: lib/common.php:167
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 "Potrebbe essere necessario lanciare il programma d'installazione per "
@@ -8009,7 +8080,7 @@ 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "Vai al programma d'installazione."
 
@@ -8102,6 +8173,12 @@ msgstr "Impossibile aggiornare l'aspetto."
 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."
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "Togli questo messaggio dai preferiti"
@@ -8302,35 +8379,41 @@ msgstr "Etichette nei messaggi del gruppo %s"
 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"
 
-#: lib/imagefile.php:72
+#. 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:90
+#: 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."
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Caricamento parziale."
 
-#: lib/imagefile.php:111
+#. 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."
 
-#: lib/imagefile.php:160
+#. 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."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8338,7 +8421,7 @@ msgstr[0] "MB"
 msgstr[1] "MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8346,7 +8429,7 @@ msgstr[0] "kB"
 msgstr[1] "kB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8367,23 +8450,25 @@ msgstr "Sorgente casella in arrivo %d sconosciuta."
 msgid "Leave"
 msgstr "Lascia"
 
-#: lib/logingroupnav.php:80
+#. 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"
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8415,14 +8500,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8437,7 +8522,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:263
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8464,14 +8549,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nuovo indirizzo email per inviare messaggi a %s"
@@ -8479,7 +8564,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:321
+#: lib/mail.php:313
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8502,19 +8587,19 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "stato di %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
@@ -8522,15 +8607,15 @@ msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8559,7 +8644,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "Nuovo messaggio privato da %s"
@@ -8568,7 +8653,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8603,7 +8688,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:607
+#: lib/mail.php:599
 #, 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"
@@ -8613,7 +8698,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8652,7 +8737,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8665,7 +8750,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:680
+#: lib/mail.php:672
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) ti ha inviato un messaggio"
@@ -8676,7 +8761,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9012,36 +9097,46 @@ msgstr "Etichette nei messaggi di %s"
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Abbonamenti"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Tutti gli abbonamenti"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Abbonati"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Tutti gli abbonati"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "ID utente"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Membro dal"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. 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"
 
-#: lib/profileaction.php:264
+#. 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"
 
@@ -9299,48 +9394,60 @@ msgstr "Disabbonati"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "L'utente non ha un profilo."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "Modifica immagine"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "Azioni utente"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr "Eliminazione utente..."
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "Modifica impostazioni del profilo"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "Modifica"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "Invia un messaggio diretto a questo utente"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "Messaggio"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr "Modera"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "Ruolo dell'utente"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "Amministratore"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderatore"
@@ -9430,13 +9537,13 @@ 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:64
+#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Dimensione non valida."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
@@ -9445,31 +9552,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "No such group"
-#~ msgstr "Nessun gruppo"
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "Metodo delle API non trovato."
-
-#~ msgid "Reset"
-#~ msgstr "Reimposta"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr ""
-#~ "1-64 lettere minuscole o numeri, niente punteggiatura o spazi; richiesto"
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6 o più caratteri; richiesta"
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "Stessa password di sopra; richiesta"
-
-#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-#~ msgstr ""
-#~ "1-64 lettere minuscole o numeri, senza spazi o simboli di punteggiatura"
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "%s non è un colore valido."
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 4e13fa0e9d..20a06f0892 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Japanese (日本語)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Brion
 # Author: Calamari
@@ -14,17 +14,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:57:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:48: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-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -96,7 +96,7 @@ msgstr "アクセス設定の保存"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -134,6 +134,7 @@ msgstr "そのようなページはありません。"
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -343,14 +344,15 @@ msgstr "ユーザを更新できませんでした。"
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "ユーザはプロフィールをもっていません。"
 
@@ -678,18 +680,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "別名はニックネームと同じではいけません。"
 
@@ -700,7 +700,7 @@ msgstr "別名はニックネームと同じではいけません。"
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "見つかりません。"
@@ -896,11 +896,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "ニックネーム"
 
@@ -1207,28 +1208,27 @@ msgstr ""
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "つぶやきの内容を探す"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "その ID によるつぶやきは存在していません"
@@ -1399,23 +1399,30 @@ msgstr "あなたはそのプロファイルにフォローされていません
 msgid "Cannot delete someone else's subscription."
 msgstr "フォローを保存できません。"
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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."
@@ -1522,34 +1529,34 @@ msgid "No file uploaded."
 msgstr "プロファイル記述がありません。"
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr "ファイルデータを紛失しました。"
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "アバターの更新に失敗しました。"
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr ""
 
@@ -1746,8 +1753,9 @@ msgid "Conversation"
 msgstr "会話"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "つぶやき"
 
@@ -1772,7 +1780,7 @@ msgstr ""
 #. 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."
+msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1783,7 +1791,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 #, fuzzy
 msgid "Delete account"
 msgstr "新しいグループを作成"
@@ -2337,7 +2345,8 @@ msgstr "このフォームを使ってグループを編集します。"
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "不正な別名: \"%s\""
@@ -2349,7 +2358,7 @@ msgstr "グループを更新できません。"
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "別名を作成できません。"
 
@@ -2866,17 +2875,17 @@ msgid "Crop"
 msgstr "切り取り"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "ロゴが更新されました。"
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "ロゴの更新に失敗しました。"
 
@@ -2936,7 +2945,9 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "%2$s 上の %1$s のメンバーから更新する"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "グループ"
@@ -3520,7 +3531,7 @@ msgstr "ユーザ名またはパスワードが間違っています。"
 msgid "Error setting user. You are probably not authorized."
 msgstr "ユーザ設定エラー。 あなたはたぶん承認されていません。"
 
-#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "ログイン"
 
@@ -3622,6 +3633,12 @@ msgstr "このグループのメンバーではありません。"
 msgid "Use this form to create a new group."
 msgstr "このフォームを使って新しいグループを作成します。"
 
+#. TRANS: Group create form validation error.
+#: actions/newgroup.php:199
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "別名はニックネームと同じではいけません。"
+
 #: actions/newmessage.php:71 actions/newmessage.php:234
 msgid "New message"
 msgstr "新しいメッセージ"
@@ -4323,9 +4340,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "フルネーム"
 
@@ -4364,10 +4382,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "場所"
 
@@ -4382,9 +4401,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "タグ"
 
@@ -4475,7 +4495,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "新しいグループを作成"
@@ -4646,9 +4666,8 @@ msgstr ""
 "アドレスに新しいものを送らせることができます。"
 
 #: actions/recoverpassword.php:167
-#, fuzzy
 msgid "You have been identified. Enter a new password below."
-msgstr "あなたは特定されました。 以下の新しいパスワードを入力してください。 "
+msgstr "あなたは特定されました。 以下の新しいパスワードを入力してください。"
 
 #. TRANS: Fieldset legend for password recovery page.
 #: actions/recoverpassword.php:198
@@ -4789,7 +4808,7 @@ msgstr "すみません、不正な招待コード。"
 msgid "Registration successful"
 msgstr "登録成功"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "登録"
 
@@ -4947,8 +4966,9 @@ msgstr "プロファイルURL"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "フォロー"
 
@@ -5110,7 +5130,9 @@ msgid "File upload stopped by extension."
 msgstr "エクステンションによってファイルアップロードを中止しました。"
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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 "ファイルのアップロードでシステムエラー"
 
@@ -5228,8 +5250,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "統計データ"
 
@@ -5364,14 +5387,16 @@ msgid "Group profile"
 msgstr "グループプロファイル"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
+#. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "ノート"
 
@@ -5415,8 +5440,11 @@ msgid "Members"
 msgstr "メンバー"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(なし)"
@@ -6045,7 +6073,7 @@ 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:116
+#: actions/subscribers.php:114
 #, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
@@ -6056,7 +6084,7 @@ 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:120
+#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s にはフォローしている人がいません。最初の人になりますか?"
@@ -6066,7 +6094,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6099,7 +6127,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6119,23 +6147,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s はだれも言うことを聞いていません。"
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "SMS"
 
@@ -6168,12 +6197,14 @@ msgstr "ID引数がありません。"
 msgid "Tag %s"
 msgstr "タグ %s"
 
+#. TRANS: H2 for user profile information.
 #: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "ユーザプロファイル"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "写真"
 
@@ -6718,25 +6749,25 @@ msgid "Problem saving notice."
 msgstr "つぶやきを保存する際に問題が発生しました。"
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:914
+#: classes/Notice.php:923
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1013
+#: classes/Notice.php:1022
 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -6838,26 +6869,47 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 msgid "Could not create group."
 msgstr "グループを作成できません。"
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:526
+#: classes/User_group.php:530
 msgid "Could not set group URI."
 msgstr "グループを作成できません。"
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:549
+#: classes/User_group.php:553
 msgid "Could not set group membership."
 msgstr "グループメンバーシップをセットできません。"
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:564
+#: classes/User_group.php:568
 #, 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6998,7 +7050,8 @@ msgid "Create an account"
 msgstr "新しいグループを作成"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 #, fuzzy
 msgctxt "MENU"
 msgid "Register"
@@ -7012,7 +7065,8 @@ msgid "Login to the site"
 msgstr "サイトへログイン"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 #, fuzzy
 msgctxt "MENU"
 msgid "Login"
@@ -7249,6 +7303,23 @@ msgstr ""
 msgid "No content for notice %s."
 msgstr "つぶやきの内容を探す"
 
+#: lib/activitymover.php:84
+#, fuzzy, php-format
+msgid "No such user %s."
+msgstr "そのようなユーザはいません。"
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7706,7 +7777,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "場所: %s"
@@ -7714,7 +7785,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "ホームページ: %s"
@@ -7943,20 +8014,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 #, 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:158
+#: lib/common.php:164
 #, 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:161
+#: lib/common.php:167
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 "あなたは、これを修理するためにインストーラを動かしたがっているかもしれませ"
@@ -7964,7 +8035,7 @@ 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "インストーラへ。"
 
@@ -8057,6 +8128,12 @@ msgstr "あなたのデザインを更新できません。"
 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 "アプリケーションのための取消しアクセスができません: "
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "このつぶやきのお気に入りをやめる"
@@ -8254,49 +8331,55 @@ msgstr "%s グループのつぶやきにあるタグ"
 msgid "This page is not available in a media type you accept"
 msgstr "このページはあなたが承認したメディアタイプでは利用できません。"
 
-#: lib/imagefile.php:72
+#. 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:90
+#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "ファイルが大きすぎます。最大ファイルサイズは %s 。"
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "不完全なアップロード。"
 
-#: lib/imagefile.php:111
+#. 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 "画像ではないかファイルが破損しています。"
 
-#: lib/imagefile.php:160
+#. 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 "ファイルを紛失。"
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: 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:287
+#: 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:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8316,23 +8399,25 @@ msgstr "不明な受信箱のソース %d。"
 msgid "Leave"
 msgstr "離れる"
 
-#: lib/logingroupnav.php:80
+#. TRANS: Title for menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "ユーザ名とパスワードでログイン"
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8363,14 +8448,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8382,7 +8467,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:263
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8409,14 +8494,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "%s へ投稿のための新しいメールアドレス"
@@ -8424,7 +8509,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:321
+#: lib/mail.php:313
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8447,34 +8532,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "%s の状態"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, 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:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, fuzzy, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8503,7 +8588,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "%s からの新しいプライベートメッセージ"
@@ -8512,7 +8597,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:555
+#: lib/mail.php:547
 #, fuzzy, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8547,7 +8632,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:607
+#: lib/mail.php:599
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) はお気に入りとしてあなたのつぶやきを加えました"
@@ -8557,7 +8642,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:614
+#: lib/mail.php:606
 #, fuzzy, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8596,7 +8681,7 @@ msgstr ""
 "%6%s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8606,7 +8691,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:680
+#: lib/mail.php:672
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) はあなた宛てにつぶやきを送りました"
@@ -8617,7 +8702,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8933,36 +9018,46 @@ msgstr "%s のつぶやきのタグ"
 msgid "Unknown"
 msgstr "不明"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "フォロー"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "すべてのフォロー"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "フォローされている"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "すべてのフォローされている"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "ユーザＩＤ"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "利用開始日"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. TRANS: Label for user statistics.
+#. TRANS: Average count of posts made per day since account registration.
+#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr ""
 
-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "全てのグループ"
 
@@ -9214,51 +9309,63 @@ msgstr "フォロー解除"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "ユーザはプロフィールをもっていません。"
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "アバターを編集する"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "利用者アクション"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr ""
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "プロファイル設定編集"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "編集"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "この利用者にダイレクトメッセージを送る"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "メッセージ"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 #, fuzzy
 msgid "Moderate"
 msgstr "管理"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 #, fuzzy
 msgid "User role"
 msgstr "ユーザプロファイル"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 #, fuzzy
 msgctxt "role"
 msgid "Administrator"
 msgstr "管理者"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 #, fuzzy
 msgctxt "role"
 msgid "Moderator"
@@ -9344,13 +9451,13 @@ 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:64
+#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "不正なサイズ。"
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
@@ -9359,31 +9466,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "No such group"
-#~ msgstr "そのようなグループはありません。"
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "API メソッドが見つかりません。"
-
-#~ msgid "Reset"
-#~ msgstr "リセット"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr ""
-#~ "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く。必須で"
-#~ "す。"
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6文字以上。必須です。"
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "上のパスワードと同じです。 必須。"
-
-#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-#~ msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く"
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "%sは有効な色ではありません!"
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
index efccf498bc..b880550e74 100644
--- a/locale/ka/LC_MESSAGES/statusnet.po
+++ b/locale/ka/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Georgian (ქართული)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Zaal
 # --
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:57:20+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:48:25+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 (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ka\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -90,7 +90,7 @@ msgstr "შეინახე შესვლის პარამეტრე
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -128,6 +128,7 @@ msgstr "ასეთი გვერდი არ არსებობს."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -336,14 +337,15 @@ msgstr "მომხმარებლის განახლება ვე
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "მომხმარებელს პროფილი არ გააჩნია."
 
@@ -669,18 +671,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -691,7 +691,7 @@ msgstr ""
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "ჯგუფი ვერ მოიძებნა."
@@ -885,11 +885,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "მეტსახელი"
 
@@ -1195,28 +1196,27 @@ msgstr ""
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "მოძებნე შეტყობინებებში"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "შეტყობინებები ამ ID-თ არ არსებობს."
@@ -1385,23 +1385,30 @@ msgstr "თქვენ არ გაქვთ გამოწერილი 
 msgid "Cannot delete someone else's subscription."
 msgstr "საკუთარი გამოწერის წაშლა ვერ ხერხდება."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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."
@@ -1508,34 +1515,34 @@ msgid "No file uploaded."
 msgstr "არცერთი ფაილი არ ატვირთულა"
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr ""
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "ავატარის განახლება ვერ მოხერხდა."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr ""
 
@@ -1728,8 +1735,9 @@ msgid "Conversation"
 msgstr "საუბარი"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "შეტყობინებები"
 
@@ -1754,7 +1762,7 @@ msgstr ""
 #. 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."
+msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1765,7 +1773,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 #, fuzzy
 msgid "Delete account"
 msgstr "გახსენი ანგარიში"
@@ -2315,7 +2323,8 @@ msgstr "ჯგუფის რედაქტირებისათვის 
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr ""
@@ -2327,7 +2336,7 @@ msgstr "ჯგუფის განახლება ვერ მოხერ
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr ""
 
@@ -2833,17 +2842,17 @@ msgid "Crop"
 msgstr "მოჭრა"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "ლოგო განახლდა."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "ლოგოს განახლება ვერ მოხერხდა."
 
@@ -2903,7 +2912,9 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "%1$s-ის წევრების განახლებები %2$s-ზე!"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "ჯგუფები"
@@ -3488,7 +3499,7 @@ msgstr "არასწორი მომხმარებლის სახ
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
-#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "შესვლა"
 
@@ -3590,6 +3601,11 @@ msgstr "თვენ არ ხართ ამ ჯგუფის წევრ
 msgid "Use this form to create a new group."
 msgstr "ახალი ჯგუფის შესაქმნელად გამოიყენეთ ეს ფორმა."
 
+#. TRANS: Group create form validation error.
+#: actions/newgroup.php:199
+msgid "Alias cannot be the same as nickname."
+msgstr ""
+
 #: actions/newmessage.php:71 actions/newmessage.php:234
 msgid "New message"
 msgstr "ახალი შეტყობინება"
@@ -4282,9 +4298,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "სრული სახელი"
 
@@ -4323,10 +4340,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "მდებარეობა"
 
@@ -4341,9 +4359,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "სანიშნეები"
 
@@ -4435,7 +4454,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "გახსენი ანგარიში"
@@ -4599,9 +4618,8 @@ msgstr ""
 "ანგარიშში მითითებულ ელ. ფოსტის მისამართზე."
 
 #: actions/recoverpassword.php:167
-#, fuzzy
 msgid "You have been identified. Enter a new password below."
-msgstr "თქვენ იდენტიფიცირებული ხართ, შეიყვანეთ ახალი პაროლი ქვევით. "
+msgstr "თქვენ იდენტიფიცირებული ხართ, შეიყვანეთ ახალი პაროლი ქვევით."
 
 #. TRANS: Fieldset legend for password recovery page.
 #: actions/recoverpassword.php:198
@@ -4744,7 +4762,7 @@ msgstr "ბოდიშს გიხდით, მოსაწვევი კ
 msgid "Registration successful"
 msgstr "რეგისტრაცია წარმატებით დასრულდა"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "რეგისტრაცია"
 
@@ -4906,8 +4924,9 @@ msgstr "პროფილის URL"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "გამოწერა"
 
@@ -5068,7 +5087,9 @@ msgid "File upload stopped by extension."
 msgstr "ფაილის არვირთვა გაჩერდა გაფართოების გამო."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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 "სისტემური შეცდომა ფაილის ატვირთვისას."
 
@@ -5183,8 +5204,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "სტატისტიკა"
 
@@ -5315,14 +5337,16 @@ msgid "Group profile"
 msgstr ""
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
+#. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "შენიშვნა"
 
@@ -5366,8 +5390,11 @@ msgid "Members"
 msgstr "წევრები"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(არცერთი)"
@@ -5964,7 +5991,7 @@ 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:116
+#: actions/subscribers.php:114
 #, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
@@ -5975,7 +6002,7 @@ 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:120
+#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s არ ჰყავს გამომწერები. გინდა გახდე პირველი?"
@@ -5985,7 +6012,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6018,7 +6045,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6038,23 +6065,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s არავის უსმენს."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "SMS"
 
@@ -6087,12 +6115,14 @@ msgstr ""
 msgid "Tag %s"
 msgstr "სანიშნე %s"
 
+#. TRANS: H2 for user profile information.
 #: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "მომხმარებლის პროფილი"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "ფოტო"
 
@@ -6648,26 +6678,26 @@ msgid "Problem saving notice."
 msgstr "პრობლემა შეტყობინების შენახვისას."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:914
+#: classes/Notice.php:923
 #, fuzzy
 msgid "Bad type provided to saveKnownGroups."
 msgstr "saveKnownGroups-სათვის არასწორი ტიპია მოწოდებული"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1013
+#: classes/Notice.php:1022
 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6771,25 +6801,46 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 msgid "Could not create group."
 msgstr "ჯგუფის შექმნა ვერ მოხერხდა."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:526
+#: classes/User_group.php:530
 msgid "Could not set group URI."
 msgstr "ჯგუფის URI-ს მინიჭება ვერ მოხერხდა."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:549
+#: classes/User_group.php:553
 msgid "Could not set group membership."
 msgstr "ჯგუფის წევრობის მინიჭება ვერ მოხერხდა."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:564
+#: classes/User_group.php:568
 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6926,7 +6977,8 @@ msgid "Create an account"
 msgstr "გახსენი ანგარიში"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "რეგისტრაცია"
@@ -6938,7 +6990,8 @@ msgid "Login to the site"
 msgstr "საიტზე შესვლა"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "შესვლა"
@@ -7173,6 +7226,23 @@ msgstr ""
 msgid "No content for notice %s."
 msgstr "მოძებნე შეტყობინებებში"
 
+#: lib/activitymover.php:84
+#, fuzzy, php-format
+msgid "No such user %s."
+msgstr "ასეთი მომხმარებელი არ არსებობს."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7622,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "მდებარეობა: %s"
@@ -7630,7 +7700,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "გვერდი: %s"
@@ -7861,26 +7931,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 #, 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:158
+#: lib/common.php:164
 #, 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "გადადი ამ ინსტალატორზე."
 
@@ -7973,6 +8043,12 @@ msgstr "დიზაინის განახლება ვერ მოხ
 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 აპლიკაციის მიერ ზვდომის გაუქმება ვერ ხერხდება."
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "ამოშალე რჩეულებიდან ეს შეტყობინება"
@@ -8172,49 +8248,55 @@ msgstr "%s ჯგუფის შეტყობინებებში გა
 msgid "This page is not available in a media type you accept"
 msgstr "ეს გვერდი მიუწვდომელია იმ მედია ფორმატში რომელსაც თქვენ იღებთ"
 
-#: lib/imagefile.php:72
+#. 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:90
+#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "ეს ფაილი ძალიან დიდია. ფაილის მაქს. ზომაა %s."
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "ნაწილობრივი ატვირთვა."
 
-#: lib/imagefile.php:111
+#. 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 "სურათი არ არის, ან ფაილი დაზიანებულია."
 
-#: lib/imagefile.php:160
+#. 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 "ფაილი დაიკარგა."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: 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:287
+#: 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:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8234,23 +8316,25 @@ msgstr ""
 msgid "Leave"
 msgstr "დატოვება"
 
-#: lib/logingroupnav.php:80
+#. TRANS: Title for menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "შედი მომხ. სახელით და პაროლით."
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8281,14 +8365,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8303,7 +8387,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:263
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8330,14 +8414,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "%s-ზე დასაპოსტი ახალი ელ. ფოსტის მისამართი"
@@ -8345,7 +8429,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:321
+#: lib/mail.php:313
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8368,19 +8452,19 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "%s სტატუსი"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
@@ -8388,15 +8472,15 @@ msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:493
-#, php-format
-msgid "You've been nudged by %s"
-msgstr ""
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
+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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8425,7 +8509,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "ახალი პირადი შეტყობინება %s-სგან"
@@ -8434,7 +8518,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8469,7 +8553,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:607
+#: lib/mail.php:599
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s-მა (@%s) დაამატა თქვენი შეტყობინება თავის რჩეულებში"
@@ -8479,7 +8563,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8518,7 +8602,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8531,7 +8615,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:680
+#: lib/mail.php:672
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s-მა (@%s) გამოაგზავნა შეტყობინება თქვენს საყურადღებოდ"
@@ -8542,7 +8626,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8851,36 +8935,46 @@ msgstr "%s-ს შეტყობინებებში გამოყენ
 msgid "Unknown"
 msgstr "უცნობი"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "გამოწერები"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "ყველა გამოწერა"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "გამომწერები"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "ყველა გამომწერი"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "მომხმარებლის იდ"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr ""
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. TRANS: Label for user statistics.
+#. TRANS: Average count of posts made per day since account registration.
+#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "დღიური საშუალო"
 
-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "ყველა ჯგუფი"
 
@@ -9135,48 +9229,60 @@ msgstr "გამოწერის გაუქმება"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "მომხმარებელს პროფილი არ გააჩნია."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "ავატარის რედაქტირება"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "მომხმარებლის მოქმედებები"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr "მომხმარებლის წაშლა პროგრესშია..."
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "პროფილის პარამეტრების რედაქტირება"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "რედაქტირება"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "გაუგზავნე პირდაპირი შეტყობინება ამ მომხმარებელს"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "შეტყობინება"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr "მოდერაცია"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "მომხმარებლის როლი"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "ადმინისტრატორი"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "მოდერატორი"
@@ -9264,13 +9370,13 @@ msgstr[0] ""
 "გააგზავნეთ %2$d."
 
 #. TRANS: Exception.
-#: lib/xrd.php:64
+#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "ზომა არასწორია."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
@@ -9279,33 +9385,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "No such group"
-#~ msgstr "ასეთი ჯგუფი ვერ მოიძებნა."
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "API მეთოდი ვერ მოიძებნა."
-
-#~ msgid "Reset"
-#~ msgstr "გადაყენება"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr ""
-#~ "1–64 პატარა ასოები ან ციფრები. პუნქტუაციები ან სივრცეები დაუშვებელია. "
-#~ "სავალდებულო."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6 ან მეტი სიმბოლო. სავალდებულო."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "იგივე, რაც პაროლი ზევით. სავალდებულო."
-
-#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-#~ msgstr ""
-#~ "1–64 პატარა ასოები ან ციფრები. პუნქტუაციები ან სივრცეები დაუშვებელია"
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "%s არ არის სწორი ფერი!"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index b34e7ec6a8..6ba4b49ac6 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Korean (한국어)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Brion
 # Author: Changwoo
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:57:23+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:48:27+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 (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ko\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -92,7 +92,7 @@ msgstr "접근 설정을 저장"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -130,6 +130,7 @@ msgstr "해당하는 페이지 없음"
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -332,14 +333,15 @@ msgstr "이용자를 업데이트 할 수 없습니다."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "이용자가 프로필을 가지고 있지 않습니다."
 
@@ -666,18 +668,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -688,7 +688,7 @@ msgstr ""
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "찾을 수가 없습니다."
@@ -889,11 +889,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "별명"
 
@@ -1199,28 +1200,27 @@ msgstr ""
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "통지들의 내용 찾기"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "해당 id의 프로필이 없습니다."
@@ -1389,23 +1389,30 @@ msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 msgid "Cannot delete someone else's subscription."
 msgstr "구독을 저장할 수 없습니다."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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."
@@ -1511,34 +1518,34 @@ msgid "No file uploaded."
 msgstr "파일을 업로드하지 않았습니다."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr "파일 데이터를 잃어버렸습니다."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "아바타 업데이트 실패"
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr ""
 
@@ -1734,8 +1741,9 @@ msgid "Conversation"
 msgstr "대화"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "통지"
 
@@ -1760,7 +1768,7 @@ msgstr ""
 #. 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."
+msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1771,7 +1779,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 #, fuzzy
 msgid "Delete account"
 msgstr "새 계정 만들기"
@@ -2318,7 +2326,8 @@ msgstr "다음 양식을 이용해 그룹을 편집하십시오."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "사용할 수 없는 별명 : \"%s\""
@@ -2330,7 +2339,7 @@ msgstr "그룹을 업데이트 할 수 없습니다."
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "관심소식을 생성할 수 없습니다."
 
@@ -2834,17 +2843,17 @@ msgid "Crop"
 msgstr "자르기"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "로고를 업데이트했습니다."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "로고 업데이트에 실패했습니다."
 
@@ -2904,7 +2913,9 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "%2$s에 있는 %1$s의 업데이트!"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "그룹"
@@ -3469,7 +3480,7 @@ msgstr "틀린 계정 또는 비밀 번호"
 msgid "Error setting user. You are probably not authorized."
 msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 
-#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "로그인"
 
@@ -3573,6 +3584,11 @@ msgstr "당신은 해당 그룹의 멤버가 아닙니다."
 msgid "Use this form to create a new group."
 msgstr "새 그룹을 만들기 위해 이 양식을 사용하세요."
 
+#. TRANS: Group create form validation error.
+#: actions/newgroup.php:199
+msgid "Alias cannot be the same as nickname."
+msgstr ""
+
 #: actions/newmessage.php:71 actions/newmessage.php:234
 msgid "New message"
 msgstr "새로운 메시지입니다."
@@ -4262,9 +4278,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "실명"
 
@@ -4303,10 +4320,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "위치"
 
@@ -4321,9 +4339,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "태그"
 
@@ -4412,7 +4431,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "새 계정 만들기"
@@ -4717,7 +4736,7 @@ msgstr "확인 코드 오류"
 msgid "Registration successful"
 msgstr "회원 가입이 성공적입니다."
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "등록"
 
@@ -4871,8 +4890,9 @@ msgstr "프로필 URL"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "구독"
 
@@ -5027,7 +5047,9 @@ msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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 "파일을 올리는데 시스템 오류 발생"
 
@@ -5143,8 +5165,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "통계"
 
@@ -5271,14 +5294,16 @@ msgid "Group profile"
 msgstr "그룹 프로필"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
+#. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "설명"
 
@@ -5322,8 +5347,11 @@ msgid "Members"
 msgstr "회원"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(없음)"
@@ -5928,7 +5956,7 @@ 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:116
+#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -5936,7 +5964,7 @@ 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:120
+#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -5946,7 +5974,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -5977,7 +6005,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -5991,23 +6019,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%1$s님이 귀하의 알림 메시지를 %2$s에서 듣고 있습니다."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "SMS"
 
@@ -6040,12 +6069,14 @@ msgstr "첨부문서 없음"
 msgid "Tag %s"
 msgstr "태그 %s"
 
+#. TRANS: H2 for user profile information.
 #: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "이용자 프로필"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "사진"
 
@@ -6599,26 +6630,26 @@ msgid "Problem saving notice."
 msgstr "통지를 저장하는데 문제가 발생했습니다."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:914
+#: classes/Notice.php:923
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1013
+#: classes/Notice.php:1022
 #, 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6721,25 +6752,46 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 msgid "Could not create group."
 msgstr "새 그룹을 만들 수 없습니다."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:526
+#: classes/User_group.php:530
 msgid "Could not set group URI."
 msgstr "새 그룹을 만들 수 없습니다."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:549
+#: classes/User_group.php:553
 msgid "Could not set group membership."
 msgstr "그룹 맴버십을 세팅할 수 없습니다."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:564
+#: classes/User_group.php:568
 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6878,7 +6930,8 @@ msgid "Create an account"
 msgstr "새 계정 만들기"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "등록"
@@ -6890,7 +6943,8 @@ msgid "Login to the site"
 msgstr "이 사이트에 로그인"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "로그인"
@@ -7125,6 +7179,23 @@ msgstr ""
 msgid "No content for notice %s."
 msgstr "통지들의 내용 찾기"
 
+#: lib/activitymover.php:84
+#, fuzzy, php-format
+msgid "No such user %s."
+msgstr "해당하는 이용자 없음"
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7576,7 +7647,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "위치: %s"
@@ -7584,7 +7655,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "홈페이지: %s"
@@ -7815,26 +7886,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 #, 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:158
+#: lib/common.php:164
 #, 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "이 사이트에 로그인"
 
@@ -7926,6 +7997,12 @@ msgstr "디자인을 수정할 수 없습니다."
 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 "다음 양식을 이용해 그룹을 편집하십시오."
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "이 게시글 좋아하기 취소"
@@ -8123,49 +8200,55 @@ msgstr "%s 그룹 게시글의 태그"
 msgid "This page is not available in a media type you accept"
 msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다."
 
-#: lib/imagefile.php:72
+#. 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:90
+#: lib/imagefile.php:91
 #, fuzzy, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "당신그룹의 로고 이미지를 업로드할 수 있습니다."
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "불완전한 업로드."
 
-#: lib/imagefile.php:111
+#. 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 "그림 파일이 아니거나 손상된 파일 입니다."
 
-#: lib/imagefile.php:160
+#. 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 "파일을 잃어버렸습니다."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: 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:287
+#: 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:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8185,23 +8268,25 @@ msgstr ""
 msgid "Leave"
 msgstr "떠나기"
 
-#: lib/logingroupnav.php:80
+#. TRANS: Title for menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "사용자 이름과 비밀번호로 로그인"
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8220,14 +8305,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8239,7 +8324,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:263
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8260,14 +8345,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "%s에 포스팅 할 새로운 메일 주소"
@@ -8275,7 +8360,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:321
+#: lib/mail.php:313
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8292,34 +8377,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "%s 상태"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, 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:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8337,7 +8422,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "%s로부터 새로운 비밀 메시지가 도착하였습니다."
@@ -8346,7 +8431,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8367,7 +8452,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:607
+#: lib/mail.php:599
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "누군가 내 글을 좋아하는 게시글로 추가했을 때, 메일을 보냅니다."
@@ -8377,7 +8462,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8399,7 +8484,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8409,7 +8494,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:680
+#: lib/mail.php:672
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "누군가 내 글을 좋아하는 게시글로 추가했을 때, 메일을 보냅니다."
@@ -8420,7 +8505,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8726,36 +8811,46 @@ msgstr "%s의 게시글의 태그"
 msgid "Unknown"
 msgstr "알려지지 않은 행동"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "구독"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "모든 예약 구독"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "구독자"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "모든 구독자"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "이용자 ID"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "가입한 때"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. TRANS: Label for user statistics.
+#. TRANS: Average count of posts made per day since account registration.
+#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "하루 평균"
 
-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "모든 그룹"
 
@@ -9013,49 +9108,61 @@ msgstr "구독 해제"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "이용자가 프로필을 가지고 있지 않습니다."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "아바타 편집"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "사용자 동작"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr ""
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "프로필 설정"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "편집"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "이 회원에게 직접 메시지를 보냅니다."
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "메시지"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr ""
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 #, fuzzy
 msgid "User role"
 msgstr "이용자 프로필"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "관리자"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr ""
@@ -9140,13 +9247,13 @@ msgid_plural "Message too long. Maximum is %1$d characters, you sent %2$d."
 msgstr[0] "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다."
 
 #. TRANS: Exception.
-#: lib/xrd.php:64
+#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "옳지 않은 크기"
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
@@ -9155,33 +9262,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "No such group"
-#~ msgstr "그러한 그룹이 없습니다."
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "API 메서드 발견 안 됨."
-
-#~ msgid "Reset"
-#~ msgstr "초기화"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr ""
-#~ "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다. 필"
-#~ "수 입력."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6글자 이상이 필요합니다."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "위와 같은 비밀 번호. 필수 사항."
-
-#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-#~ msgstr ""
-#~ "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다."
-
-#, fuzzy
-#~ msgid "%s is not a valid color!"
-#~ msgstr "홈페이지 주소형식이 올바르지 않습니다."
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 61c475668d..8998ab2ef5 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # Author: Brest
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:57:25+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:48: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 (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -93,7 +93,7 @@ msgstr "Зачувај нагодувања на пристап"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -131,6 +131,7 @@ msgstr "Нема таква страница."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -340,14 +341,15 @@ msgstr "Не можев да го подновам корисникот."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Корисникот нема профил."
 
@@ -679,18 +681,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Алијасот не може да биде ист како прекарот."
 
@@ -701,7 +701,7 @@ msgstr "Алијасот не може да биде ист како прека
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Групата не е пронајдена."
@@ -897,11 +897,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Прекар"
 
@@ -1208,28 +1209,27 @@ msgstr "Забелешката преку Atom мора да биде добро
 msgid "Atom post must be an Atom entry."
 msgstr "Забелешката преку Atom мора да биде Atom-ставка."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: actions/apitimelineuser.php:380
 #, php-format
 msgid "No content for notice %d."
 msgstr "Нема содржина за забелешката %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Веќе постои забелешка со URI „%s“."
@@ -1287,7 +1287,6 @@ 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 "Не можам да додадам туѓо членство."
 
@@ -1319,7 +1318,6 @@ 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 "Не можам да избришам туѓo бендисанo."
 
@@ -1357,13 +1355,11 @@ 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 "Не членувате"
+msgstr "Не членувате."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
-#, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Не можам да избришам туѓо членство."
 
@@ -1388,23 +1384,30 @@ msgstr "Профилот %1$d не е претплатен на профилот
 msgid "Cannot delete someone else's subscription."
 msgstr "Не можам да избришам туѓа претплата."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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
+#, 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."
@@ -1509,34 +1512,34 @@ msgid "No file uploaded."
 msgstr "Нема подигнато податотека."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr "Податоците за податотеката се изгубени."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Подновата на аватарот не успеа."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr "Резервна сметка"
 
@@ -1552,7 +1555,6 @@ msgstr "Не можете да направите резрвна верзија
 
 #. TRANS: Information displayed on the backup account page.
 #: actions/backupaccount.php:225
-#, 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 "
@@ -1560,10 +1562,10 @@ 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>. Ова е "
+"Можете да зачувате резервна верзија на Вашите податоци во сметката во "
+"форматот <a href=\"http://activitystrea.ms/\">Activity Streams</a>. Ова е "
 "експериментална функција која прави нецелосна резерва. Во резервата нема да "
-"се зачуваат лични податоци како е-пошта и адреса за НП. Покрај ова, во "
+"се зачуваат лични податоци како е-пошта и адреса за IM. Покрај ова, во "
 "резервата не се зачувуваат и подигнатите податотеки и непосредните пораки."
 
 #. TRANS: Submit button to backup an account on the backup account page.
@@ -1735,8 +1737,9 @@ msgid "Conversation"
 msgstr "Разговор"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Забелешки"
 
@@ -1758,8 +1761,8 @@ 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."
+#, fuzzy, php-format
+msgid "You must write \"%s\" exactly in the box."
 msgstr "Во кутијата морате точно да го впишете „%s“ како што е."
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1769,7 +1772,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 msgid "Delete account"
 msgstr "Избриши сметка"
 
@@ -1978,7 +1981,6 @@ msgstr "Може да бришете само локални корисници.
 
 #. TRANS: Title of delete user page.
 #: actions/deleteuser.php:110
-#, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Избриши корисник"
@@ -1999,7 +2001,6 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-#, fuzzy
 msgid "Do not delete this user"
 msgstr "Не ја бриши групава"
 
@@ -2126,9 +2127,8 @@ 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.
@@ -2166,7 +2166,6 @@ msgstr "Прилагодено CSS"
 
 #. TRANS: Button text for resetting theme settings.
 #: actions/designadminpanel.php:718
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Користи по основно"
@@ -2202,9 +2201,9 @@ 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.
@@ -2313,7 +2312,8 @@ msgstr "ОБразецов служи за уредување на групат
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Неважечки алијас: „%s“"
@@ -2325,7 +2325,7 @@ msgstr "Не можев да ја подновам групата."
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "Не можеше да се создадат алијаси."
 
@@ -2835,17 +2835,17 @@ msgid "Crop"
 msgstr "Отсечи"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "Логото е подновено."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "Подновата на логото не успеа."
 
@@ -2905,7 +2905,9 @@ msgstr "Назначи го корисников за администратор
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Подновувања од членови на %1$s на %2$s!"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Групи"
@@ -3342,7 +3344,7 @@ msgstr "Мора да сте најавени за да можете да се 
 
 #. TRANS: Title for join group page after joining.
 #: actions/joingroup.php:147
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s се зачлени во групата %2$s"
@@ -3360,7 +3362,7 @@ msgstr "Не членувате во таа група."
 
 #. TRANS: Title for leave group page after leaving.
 #: actions/leavegroup.php:142
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s ја напушти групата %2$s"
@@ -3494,7 +3496,7 @@ msgstr "Неточно корисничко име или лозинка"
 msgid "Error setting user. You are probably not authorized."
 msgstr "Грешка при поставувањето на корисникот. Веројатно не се заверени."
 
-#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Најава"
 
@@ -3594,6 +3596,12 @@ msgstr "Не Ви е дозволено да создавате групи на
 msgid "Use this form to create a new group."
 msgstr "Овој образец служи за создавање нова група."
 
+#. TRANS: Group create form validation error.
+#: actions/newgroup.php:199
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "Алијасот не може да биде ист како прекарот."
+
 #: actions/newmessage.php:71 actions/newmessage.php:234
 msgid "New message"
 msgstr "Нова порака"
@@ -4280,9 +4288,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "Цело име"
 
@@ -4322,10 +4331,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "Местоположба"
 
@@ -4341,9 +4351,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "Ознаки"
 
@@ -4434,7 +4445,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Врати сметка"
 
@@ -4603,9 +4614,8 @@ msgstr ""
 "испрати нова по е-поштата која сте ја назначиле за сметката."
 
 #: actions/recoverpassword.php:167
-#, fuzzy
 msgid "You have been identified. Enter a new password below."
-msgstr "Препознаени сте. Внесете нова лозинка подполу. "
+msgstr "Препознаени сте. Внесете нова лозинка подполу."
 
 #. TRANS: Fieldset legend for password recovery page.
 #: actions/recoverpassword.php:198
@@ -4631,7 +4641,6 @@ msgstr "Пронајди"
 
 #. TRANS: Button text on password recovery page.
 #: actions/recoverpassword.php:214
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Пронајди"
@@ -4659,15 +4668,13 @@ 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 или повеќе знаци и не заборавајте!"
+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 "Исто како лозинката погоре"
+msgstr "Исто како лозинката погоре."
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
@@ -4722,7 +4729,6 @@ msgstr "Двете лозинки не се совпаѓаат."
 
 #. TRANS: Reset password form validation error message.
 #: actions/recoverpassword.php:418
-#, fuzzy
 msgid "Cannot save new password."
 msgstr "Не можам да ја зачувам новата лозинка."
 
@@ -4748,7 +4754,7 @@ msgstr "Жалиме, неважечки код за поканата."
 msgid "Registration successful"
 msgstr "Регистрацијата е успешна"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Регистрирај се"
 
@@ -4777,9 +4783,8 @@ msgstr ""
 "објавувате забелешки и да се поврзувате со пријатели и колеги. "
 
 #: actions/register.php:437
-#, fuzzy
 msgid "6 or more characters."
-msgstr "6 или повеќе знаци"
+msgstr "6 или повеќе знаци."
 
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:445 actions/register.php:449
@@ -4910,8 +4915,9 @@ msgstr "URL на профилот"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "Претплати се"
 
@@ -5068,7 +5074,9 @@ msgid "File upload stopped by extension."
 msgstr "Подигањето на податотеката е запрено од додатокот."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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 "Системска грешка при подигањето на податотеката."
 
@@ -5187,8 +5195,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Статистики"
 
@@ -5324,14 +5333,16 @@ msgid "Group profile"
 msgstr "Профил на група"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
+#. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Забелешка"
 
@@ -5375,8 +5386,11 @@ msgid "Members"
 msgstr "Членови"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Нема)"
@@ -5994,7 +6008,7 @@ 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:116
+#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6004,7 +6018,7 @@ 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:120
+#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s нема претплатници. Сакате да бидете првиот?"
@@ -6014,7 +6028,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6047,7 +6061,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6066,23 +6080,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s не следи никого."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "СМС"
 
@@ -6115,12 +6130,14 @@ msgstr "Нема ID-аргумент."
 msgid "Tag %s"
 msgstr "Означи %s"
 
+#. TRANS: H2 for user profile information.
 #: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Кориснички профил"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Фото"
 
@@ -6680,25 +6697,25 @@ msgid "Problem saving notice."
 msgstr "Проблем во зачувувањето на белешката."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:914
+#: classes/Notice.php:923
 msgid "Bad type provided to saveKnownGroups."
 msgstr "На saveKnownGroups му е укажан погрешен тип."
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1013
+#: classes/Notice.php:1022
 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6803,25 +6820,46 @@ msgid "Single-user mode code called when not enabled."
 msgstr "Повикан е еднокориснички режим, но не е овозможен."
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 msgid "Could not create group."
 msgstr "Не можев да ја создадам групата."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:526
+#: classes/User_group.php:530
 msgid "Could not set group URI."
 msgstr "Не можев да поставам URI на групата."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:549
+#: classes/User_group.php:553
 msgid "Could not set group membership."
 msgstr "Не можев да назначам членство во групата."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:564
+#: classes/User_group.php:568
 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6958,7 +6996,8 @@ msgid "Create an account"
 msgstr "Создај сметка"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Регистрација"
@@ -6970,7 +7009,8 @@ msgid "Login to the site"
 msgstr "Најава"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Најава"
@@ -7205,6 +7245,23 @@ msgstr "Не презапишувам авторски податоци за н
 msgid "No content for notice %s."
 msgstr "Нема содржина за забелешката %s."
 
+#: lib/activitymover.php:84
+#, fuzzy, php-format
+msgid "No such user %s."
+msgstr "Нема таков корисник."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7649,7 +7706,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Местоположба: %s"
@@ -7657,7 +7714,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Домашна страница: %s"
@@ -7932,24 +7989,24 @@ msgstr ""
 "tracking - сè уште не е имплементирано.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 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:158
+#: lib/common.php:164
 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "Оди на инсталаторот."
 
@@ -8037,6 +8094,12 @@ msgstr "Не можев да го подновам Вашиот изглед."
 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."
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "Одбендисај ја забелешкава"
@@ -8116,7 +8179,7 @@ msgid "Describe the group or topic"
 msgstr "Опишете ја групата или темата"
 
 #: lib/groupeditform.php:162
-#, fuzzy, php-format
+#, 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 знак"
@@ -8237,35 +8300,41 @@ msgstr "Ознаки во забелешките на групата %s"
 msgid "This page is not available in a media type you accept"
 msgstr "Оваа страница не е достапна во форматот кој Вие го прифаќате."
 
-#: lib/imagefile.php:72
+#. 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:90
+#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Податотеката е преголема. Максималната дозволена големина изнесува %s."
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Делумно подигање."
 
-#: lib/imagefile.php:111
+#. 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 "Не е слика или податотеката е пореметена."
 
-#: lib/imagefile.php:160
+#. 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 "Податотеката е изгубена."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8273,7 +8342,7 @@ msgstr[0] "%d МБ"
 msgstr[1] "%d МБ"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8281,7 +8350,7 @@ msgstr[0] "%d кБ"
 msgstr[1] "%d кБ"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8302,23 +8371,25 @@ msgstr "Непознат извор на приемна пошта %d."
 msgid "Leave"
 msgstr "Напушти"
 
-#: lib/logingroupnav.php:80
+#. TRANS: Title for menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Најава со корисничко име и лозинка"
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8350,14 +8421,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8372,7 +8443,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:263
+#: lib/mail.php:255
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8400,14 +8471,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Нова е-поштенска адреса за објавување на %s"
@@ -8415,7 +8486,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:321
+#: lib/mail.php:313
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8438,34 +8509,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "Статус на %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, 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:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8494,7 +8565,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "Нова приватна порака од %s"
@@ -8503,7 +8574,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8538,7 +8609,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:607
+#: lib/mail.php:599
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) ја бендиса вашата забелешка"
@@ -8548,7 +8619,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8586,7 +8657,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8599,7 +8670,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:680
+#: lib/mail.php:672
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) Ви испрати забелешка што сака да ја прочитате"
@@ -8610,7 +8681,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8943,36 +9014,46 @@ msgstr "Ознаки во забелешките на %s"
 msgid "Unknown"
 msgstr "Непознато"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Претплати"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Сите претплати"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Претплатници"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Сите претплатници"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "Кориснички ID"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Член од"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. TRANS: Label for user statistics.
+#. TRANS: Average count of posts made per day since account registration.
+#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "Дневен просек"
 
-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Сите групи"
 
@@ -9226,48 +9307,60 @@ msgstr "Откажи ја претплатата"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Корисникот %1$s (%2$d) нема профилен запис."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "Уреди аватар"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "Кориснички дејства"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr "Бришењето на корисникот е во тек..."
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "Уреди нагодувања на профилот"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "Уреди"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "Испрати му директна порака на корисников"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "Порака"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr "Модерирај"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "Корисничка улога"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "Администратор"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "Модератор"
@@ -9360,12 +9453,12 @@ msgstr[1] ""
 "Пораката е предолга - дозволени се највеќе %1$d знаци, а вие испративте %2$d."
 
 #. TRANS: Exception.
-#: lib/xrd.php:64
+#: lib/xrd.php:63
 msgid "Invalid XML."
 msgstr "Неважечки XML."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr "Неважечки XML. Нема XRD-корен."
 
@@ -9374,30 +9467,3 @@ msgstr "Неважечки XML. Нема XRD-корен."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Земам резерва на податотеката „%s“."
-
-#~ msgid "No such group"
-#~ msgstr "Нема такваа група"
-
-#~ msgid "HTTP method not supported"
-#~ msgstr "HTML-методот не е поддржан"
-
-#~ msgid "Reset"
-#~ msgstr "Врати одново"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr ""
-#~ "1-64 мали букви или бројки, без интерпункциски знаци и празни места. "
-#~ "Задолжително поле."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "Барем 6 знаци. Задолжително поле."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "Исто што и лозинката погоре. Задолжително поле."
-
-#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-#~ msgstr "1-64 мали букви или бројки. Без интерпукциски знаци и празни места."
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "%s не е важечка боја!"
diff --git a/locale/ml/LC_MESSAGES/statusnet.po b/locale/ml/LC_MESSAGES/statusnet.po
index af2c804132..7faca5ff83 100644
--- a/locale/ml/LC_MESSAGES/statusnet.po
+++ b/locale/ml/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Malayalam (മലയാളം)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Praveenp
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:57:30+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:48: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-01-20 20:41:25+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ml\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -90,7 +90,7 @@ msgstr "അഭിഗമ്യതാ സജ്ജീകരണങ്ങൾ സേ
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -128,6 +128,7 @@ msgstr "അത്തരത്തിൽ ഒരു താളില്ല."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -328,14 +329,15 @@ msgstr "ഉപയോക്തൃ വിവരങ്ങൾ പുതുക്ക
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr ""
 
@@ -659,18 +661,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -681,7 +681,7 @@ msgstr ""
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "സംഘത്തെ കണ്ടെത്താനായില്ല."
@@ -871,11 +871,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "വിളിപ്പേര്"
 
@@ -1176,28 +1177,27 @@ msgstr ""
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: actions/apitimelineuser.php:380
 #, php-format
 msgid "No content for notice %d."
 msgstr "%d എന്ന അറിയിപ്പിനു ഉള്ളടക്കമില്ല"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "\"%s\" എന്ന യൂ.ആർ.ഐ.യിൽ അറിയിപ്പ് മുമ്പേ നിലവിലുണ്ട്."
@@ -1205,7 +1205,7 @@ msgstr "\"%s\" എന്ന യൂ.ആർ.ഐ.യിൽ അറിയിപ്പ
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
 msgid "API method under construction."
-msgstr ""
+msgstr "എ.പി.ഐ. മെഥേഡ് നിർമ്മാണത്തിലാണ്."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
 #: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
@@ -1257,7 +1257,6 @@ 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 "മറ്റൊരാളുടെ അംഗത്വം കൂട്ടിച്ചേർക്കാനാവില്ല."
 
@@ -1327,13 +1326,11 @@ 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:151
-#, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "മറ്റൊരാളുടെ അംഗത്വം മായ്ക്കാനാവില്ല."
 
@@ -1359,23 +1356,30 @@ msgstr ""
 msgid "Cannot delete someone else's subscription."
 msgstr "മറ്റൊരാളുടെ അംഗത്വം മായ്ക്കാനാവില്ല."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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."
@@ -1478,34 +1482,34 @@ msgid "No file uploaded."
 msgstr "പ്രമാണമൊന്നും അപ്‌ലോഡ് ചെയ്തിട്ടില്ല."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr ""
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "അവതാരം അപ്‌ലോഡ് ചെയ്യുന്നത് പരാജയപ്പെട്ടു."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr ""
 
@@ -1696,8 +1700,9 @@ msgid "Conversation"
 msgstr "സംഭാഷണം"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "അറിയിപ്പുകൾ"
 
@@ -1719,8 +1724,8 @@ 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."
+#, fuzzy, php-format
+msgid "You must write \"%s\" exactly in the box."
 msgstr "പെട്ടിയിൽ  \"%s\" എന്നു തന്നെ താങ്കൾ എഴുതി നൽകണം."
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1730,7 +1735,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 msgid "Delete account"
 msgstr "അംഗത്വം മായ്ക്കുക"
 
@@ -1931,7 +1936,6 @@ msgstr "താങ്കൾക്ക് പ്രാദേശിക ഉപയോ
 
 #. TRANS: Title of delete user page.
 #: actions/deleteuser.php:110
-#, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "ഉപയോക്താവിനെ നീക്കം ചെയ്യുക"
@@ -1952,9 +1956,8 @@ 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.
 #. TRANS: Description of form for deleting a user.
@@ -2029,6 +2032,8 @@ msgstr "ഐച്ഛിക ദൃശ്യരൂപം"
 #: actions/designadminpanel.php:499
 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.
@@ -2079,7 +2084,6 @@ msgstr "പശ്ചാത്തലചിത്രം ആവർത്തിച
 
 #. TRANS: Fieldset legend for theme colors.
 #: actions/designadminpanel.php:598
-#, fuzzy
 msgid "Change colors"
 msgstr "നിറങ്ങൾ മാറ്റുക"
 
@@ -2119,7 +2123,6 @@ msgstr "സ്വന്തം സി.എസ്.എസ്."
 
 #. TRANS: Button text for resetting theme settings.
 #: actions/designadminpanel.php:718
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "സ്വതേയുള്ളവ ഉപയോഗിക്കുക"
@@ -2155,9 +2158,9 @@ 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.
@@ -2266,7 +2269,8 @@ msgstr "സംഘത്തിൽ മാറ്റം വരുത്താൻ ഈ
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr ""
@@ -2278,7 +2282,7 @@ msgstr ""
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr ""
 
@@ -2581,17 +2585,17 @@ msgstr ""
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
-msgstr ""
+msgstr "പ്രമുഖ ഉപയോക്താക്കൾ"
 
 #: actions/featured.php:71
 #, php-format
 msgid "Featured users, page %d"
-msgstr ""
+msgstr "പ്രമുഖ ഉപയോക്താക്കൾ, താൾ %d"
 
 #: actions/featured.php:99
 #, php-format
 msgid "A selection of some great users on %s"
-msgstr ""
+msgstr "%s പദ്ധതിയിലെ ചില മഹദ് ഉപയോക്താക്കൾ"
 
 #: actions/file.php:34
 msgid "No notice ID."
@@ -2627,15 +2631,15 @@ msgstr "വരിക്കാരനാകുന്നതിൽ നിന്ന
 
 #: actions/finishremotesubscribe.php:110
 msgid "You are not authorized."
-msgstr ""
+msgstr "താങ്കൾക്ക് അംഗീകാരം ലഭിച്ചിട്ടില്ല."
 
 #: actions/finishremotesubscribe.php:113
 msgid "Could not convert request token to access token."
-msgstr ""
+msgstr "അഭ്യർത്ഥനാ ചീട്ടിനെ അഭിഗമ്യതാ ചീട്ടാക്കാൻ കഴിയില്ല."
 
 #: actions/finishremotesubscribe.php:118
 msgid "Remote service uses unknown version of OMB protocol."
-msgstr ""
+msgstr "വിദൂര സേവനം അപരിചിതമായ ഒ.എം.ബി. പ്രോട്ടോകോൾ ഉപയോഗിക്കുന്നു."
 
 #: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
 msgid "Error updating remote profile."
@@ -2684,7 +2688,7 @@ msgstr ""
 #: actions/groupblock.php:81 actions/groupunblock.php:82
 #: actions/makeadmin.php:81
 msgid "No group specified."
-msgstr ""
+msgstr "സംഘമൊന്നും വ്യക്തമാക്കിയിട്ടില്ല."
 
 #: actions/groupblock.php:91
 msgid "Only an admin can block group members."
@@ -2773,17 +2777,17 @@ msgid "Crop"
 msgstr "വെട്ടിച്ചെറുതാക്കുക"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "ലോഗോ പുതുക്കി."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "ലോഗോ പുതുക്കൽ പരാജയപ്പെട്ടു."
 
@@ -2843,7 +2847,9 @@ msgstr "ഈ ഉപയോക്താവിനെ കാര്യനിർവ്
 msgid "Updates from members of %1$s on %2$s!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "സംഘങ്ങൾ"
@@ -3248,7 +3254,7 @@ msgstr "ഒരു സംഘത്തിൽ ചേരാൻ താങ്കൾ 
 
 #. TRANS: Title for join group page after joining.
 #: actions/joingroup.php:147
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s %2$s എന്ന സംഘത്തിൽ ചേർന്നു"
@@ -3266,7 +3272,7 @@ msgstr "താങ്കൾ ആ സംഘത്തിൽ അംഗമല്ല."
 
 #. TRANS: Title for leave group page after leaving.
 #: actions/leavegroup.php:142
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s %2$s എന്ന സംഘത്തിൽ നിന്നും ഒഴിവായി"
@@ -3395,7 +3401,7 @@ msgstr "ഉപയോക്തൃനാമമോ രഹസ്യവാക്ക
 msgid "Error setting user. You are probably not authorized."
 msgstr "ഉപയോക്തൃ സജ്ജീകരണത്തിൽ പിഴവുണ്ടായി. താങ്കൾക്ക് മിക്കവാറും അനുമതിയുണ്ടാവില്ല."
 
-#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "പ്രവേശിക്കുക"
 
@@ -3493,6 +3499,11 @@ msgstr "ഈ സൈറ്റിൽ സംഘങ്ങൾ ഉണ്ടാക്ക
 msgid "Use this form to create a new group."
 msgstr "പുതിയൊരു സംഘം സൃഷ്ടിക്കാൻ ഈ ഫോം ഉപയോഗിക്കുക."
 
+#. TRANS: Group create form validation error.
+#: actions/newgroup.php:199
+msgid "Alias cannot be the same as nickname."
+msgstr ""
+
 #: actions/newmessage.php:71 actions/newmessage.php:234
 msgid "New message"
 msgstr "പുതിയ സന്ദേശം"
@@ -3801,7 +3812,7 @@ msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ"
 
 #: actions/passwordsettings.php:113
 msgid "Same as password above"
-msgstr "മുകളിലുള്ള രഹസ്യവാക്ക് തന്നെ"
+msgstr "മുകളിൽ നൽകിയ അതേ രഹസ്യവാക്ക്"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
@@ -4156,9 +4167,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "പൂർണ്ണനാമം"
 
@@ -4173,6 +4185,8 @@ msgstr "ഹോംപേജ്"
 #: 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
@@ -4197,10 +4211,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "സ്ഥലം"
 
@@ -4215,9 +4230,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "റ്റാഗുകൾ"
 
@@ -4306,7 +4322,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "അംഗത്വം പുനഃക്രമീകരിക്കുക"
 
@@ -4461,9 +4477,8 @@ msgstr ""
 "സൂക്ഷിച്ചിട്ടുള്ള ഇമെയിൽ വിലാസത്തിലേക്ക് പുതിയ ഒരെണ്ണം അയച്ചു വാങ്ങാനാകുന്നതാണ്."
 
 #: actions/recoverpassword.php:167
-#, fuzzy
 msgid "You have been identified. Enter a new password below."
-msgstr "താങ്കൾ തിരിച്ചറിയപ്പെട്ടിരിക്കുന്നു. താഴെ പുതിയ രഹസ്യവാക്ക് നൽകുക. "
+msgstr "താങ്കൾ തിരിച്ചറിയപ്പെട്ടിരിക്കുന്നു. താഴെ പുതിയ രഹസ്യവാക്ക് നൽകുക."
 
 #. TRANS: Fieldset legend for password recovery page.
 #: actions/recoverpassword.php:198
@@ -4488,7 +4503,6 @@ msgstr "വീണ്ടെടുക്കുക"
 
 #. TRANS: Button text on password recovery page.
 #: actions/recoverpassword.php:214
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "വീണ്ടെടുക്കുക"
@@ -4516,15 +4530,13 @@ 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: 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 "മുകളിലുള്ള രഹസ്യവാക്ക് തന്നെ"
+msgstr "മുകളിൽ നൽകിയ അതേ രഹസ്യവാക്ക്."
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
@@ -4579,9 +4591,8 @@ msgstr "രഹസ്യവാക്കും സ്ഥിരീകരണവു
 
 #. TRANS: Reset password form validation error message.
 #: actions/recoverpassword.php:418
-#, fuzzy
 msgid "Cannot save new password."
-msgstr "പുതിയ രഹസ്യവാക്ക് സേവ് ചെയ്യാനായില്ല."
+msgstr "പുതിയ രഹസ്യവാക്ക് സേവ് ചെയ്യാനാവില്ല."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
 #: actions/recoverpassword.php:426 actions/register.php:256
@@ -4605,7 +4616,7 @@ msgstr "ക്ഷമിക്കുക, ക്ഷണത്തിന്റെ ക
 msgid "Registration successful"
 msgstr "അംഗത്വമെടുക്കൽ വിജയകരം"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "അംഗത്വമെടുക്കുക"
 
@@ -4630,11 +4641,12 @@ 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:437
-#, fuzzy
 msgid "6 or more characters."
-msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ"
+msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ."
 
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:445 actions/register.php:449
@@ -4744,8 +4756,9 @@ msgstr ""
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "വരിക്കാരാകുക"
 
@@ -4768,7 +4781,7 @@ msgstr "അഭ്യർത്ഥനാ ചീട്ട് ലഭ്യമാക
 
 #: actions/repeat.php:56
 msgid "Only logged-in users can repeat notices."
-msgstr ""
+msgstr "ലോഗിൻ ചെയ്തിട്ടുള്ള ഉപയോക്താക്കൾക്കു മാത്രമേ അറിയിപ്പ് ആവർത്തിക്കാനാവൂ."
 
 #: actions/repeat.php:63 actions/repeat.php:70
 msgid "No notice specified."
@@ -4891,7 +4904,9 @@ msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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 "പ്രമാണം അപ്‌ലോഡ് ചെയ്തുകൊണ്ടിരിക്കെ സിസ്റ്റം പിഴവുണ്ടായി."
 
@@ -5005,8 +5020,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "സ്ഥിതിവിവരക്കണക്കുകൾ"
 
@@ -5043,15 +5059,15 @@ msgstr ""
 
 #: actions/showapplication.php:273
 msgid "Request token URL"
-msgstr ""
+msgstr "അഭ്യർത്ഥനാ ചീട്ടിന്റെ യൂ.ആർ.എൽ."
 
 #: actions/showapplication.php:278
 msgid "Access token URL"
-msgstr ""
+msgstr "അഭിഗമ്യതാ ചീട്ടിന്റെ യൂ.ആർ.എൽ."
 
 #: actions/showapplication.php:283
 msgid "Authorize URL"
-msgstr ""
+msgstr "അംഗീകരണത്തിനുള്ള യൂ.ആർ.എൽ."
 
 #: actions/showapplication.php:288
 msgid ""
@@ -5133,14 +5149,16 @@ msgid "Group profile"
 msgstr ""
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
+#. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "കുറിപ്പ്"
 
@@ -5152,7 +5170,7 @@ msgstr ""
 #. TRANS: Group actions header (h2). Text hidden by default.
 #: actions/showgroup.php:304
 msgid "Group actions"
-msgstr ""
+msgstr "സംഘത്തിന്റെ പ്രവൃത്തികൾ"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
 #: actions/showgroup.php:345
@@ -5184,8 +5202,11 @@ msgid "Members"
 msgstr "അംഗങ്ങൾ"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(ഒന്നുമില്ല)"
@@ -5246,7 +5267,7 @@ msgstr "അത്തരത്തിൽ ഒരു സന്ദേശമില്
 #. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
 #: actions/showmessage.php:97
 msgid "Only the sender and recipient may read this message."
-msgstr ""
+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.
@@ -5284,7 +5305,7 @@ msgstr ""
 #: actions/showstream.php:82
 #, php-format
 msgid "%1$s, page %2$d"
-msgstr ""
+msgstr "%1$s, താൾ %2$d"
 
 #. TRANS: Title for link to notice feed.
 #. TRANS: %1$s is a user nickname, %2$s is a hashtag.
@@ -5331,6 +5352,8 @@ msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 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.
@@ -5768,7 +5791,7 @@ 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:116
+#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -5776,7 +5799,7 @@ 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:120
+#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -5786,7 +5809,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -5817,7 +5840,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -5831,23 +5854,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s ആരേയും ശ്രദ്ധിക്കുന്നില്ല."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "ജാബ്ബർ"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "എസ്.എം.എസ്."
 
@@ -5880,12 +5904,14 @@ msgstr ""
 msgid "Tag %s"
 msgstr "റ്റാഗ് %s"
 
+#. TRANS: H2 for user profile information.
 #: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr ""
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "ഛായാചിത്രം"
 
@@ -6402,25 +6428,25 @@ msgid "Problem saving notice."
 msgstr ""
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:914
+#: classes/Notice.php:923
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1013
+#: classes/Notice.php:1022
 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -6521,25 +6547,46 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 msgid "Could not create group."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:526
+#: classes/User_group.php:530
 msgid "Could not set group URI."
 msgstr ""
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:549
+#: classes/User_group.php:553
 msgid "Could not set group membership."
 msgstr ""
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:564
+#: classes/User_group.php:568
 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6676,7 +6723,8 @@ msgid "Create an account"
 msgstr "ഒരംഗത്വമെടുക്കുക"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "രജിസ്റ്റർ"
@@ -6688,10 +6736,11 @@ msgid "Login to the site"
 msgstr "സൈറ്റിലേക്ക് പ്രവേശിക്കുക"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
-msgstr "ലോഗിൻ"
+msgstr "പ്രവേശിക്കുക"
 
 #. TRANS: Tooltip for main menu option "Help"
 #: lib/action.php:589
@@ -6816,7 +6865,7 @@ msgstr ""
 #. TRANS: DT element for StatusNet site content license.
 #: lib/action.php:954
 msgid "Site content license"
-msgstr ""
+msgstr "സൈറ്റിന്റെ ഉള്ളടക്കത്തിന്റെ ഉപയോഗാനുമതി"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
@@ -6915,6 +6964,23 @@ msgstr ""
 msgid "No content for notice %s."
 msgstr "ഉള്ളടക്കമൊന്നും %s എന്ന അറിയിപ്പിൽ നൽകിയിട്ടില്ല."
 
+#: lib/activitymover.php:84
+#, fuzzy, php-format
+msgid "No such user %s."
+msgstr "അങ്ങനെ ഒരു ഉപയോക്താവില്ല."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7350,7 +7416,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "സ്ഥാനം: %s"
@@ -7358,7 +7424,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "പ്രധാനതാൾ: %s"
@@ -7588,24 +7654,24 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 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:158
+#: lib/common.php:164
 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr ""
 
@@ -7691,6 +7757,12 @@ msgstr "താങ്കളുടെ രൂപകല്പന പുതുക്
 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 ""
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr ""
@@ -7770,16 +7842,18 @@ msgid "Describe the group or topic"
 msgstr "സംഘത്തെക്കുറിച്ചോ വിഷയത്തെക്കുറിച്ചോ വിവരിക്കുക"
 
 #: lib/groupeditform.php:162
-#, fuzzy, php-format
+#, 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] "സംഘത്തെക്കുറിച്ചോ വിഷയത്തെക്കുറിച്ചോ വിവരിക്കുക"
+msgstr[0] "സംഘത്തെക്കുറിച്ചോ വിഷയത്തെക്കുറിച്ചോ %d അക്ഷരത്തിൽ കൂടാതെ വിവരിക്കുക."
+msgstr[1] "സംഘത്തെക്കുറിച്ചോ വിഷയത്തെക്കുറിച്ചോ %d അക്ഷരങ്ങളിൽ കൂടാതെ വിവരിക്കുക."
 
 #: lib/groupeditform.php:174
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
+"സംഘത്തിന്റെ പ്രദേശം, അങ്ങനെയൊന്നുണ്ടെങ്കിൽ - ഉദാ: \"പട്ടണം, സംസ്ഥാനം (അഥവാ പ്രദേശം), "
+"രാജ്യം\"."
 
 #: lib/groupeditform.php:182
 #, php-format
@@ -7886,35 +7960,41 @@ msgstr ""
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
-#: lib/imagefile.php:72
+#. 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:90
+#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr ""
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "ഭാഗിക അപ്‌ലോഡ്."
 
-#: lib/imagefile.php:111
+#. 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 ""
 
-#: lib/imagefile.php:160
+#. 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 "ഞങ്ങളുടെ പ്രമാണം നഷ്ടപ്പെട്ടു."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -7922,7 +8002,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -7930,7 +8010,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -7951,23 +8031,25 @@ msgstr ""
 msgid "Leave"
 msgstr "ഒഴിവായി പോവുക"
 
-#: lib/logingroupnav.php:80
+#. TRANS: Title for menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "ഉപയോക്തൃനാമവും രഹസ്യവാക്കും ഉപയോഗിച്ച് ലോഗിൻ ചെയ്യുക"
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -7986,14 +8068,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8005,7 +8087,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:263
+#: lib/mail.php:255
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8022,14 +8104,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "%s സൈറ്റിൽ പ്രസിദ്ധീകരിക്കാനുള്ള പുതിയ ഇമെയിൽ വിലാസം"
@@ -8037,7 +8119,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:321
+#: lib/mail.php:313
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8052,34 +8134,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "%s സ്ഥിതി"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, 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:493
+#: lib/mail.php:485
 #, php-format
-msgid "You've been nudged by %s"
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8097,7 +8179,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "%s അയച്ച സ്വകാര്യ സന്ദേശങ്ങൾ"
@@ -8106,7 +8188,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8127,7 +8209,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:607
+#: lib/mail.php:599
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr ""
@@ -8137,7 +8219,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8159,7 +8241,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8172,7 +8254,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:680
+#: lib/mail.php:672
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) താങ്കളുടെ ശ്രദ്ധയ്ക്കായി ഒരു അറിയിപ്പ് അയച്ചിരിക്കുന്നു"
@@ -8183,7 +8265,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8487,36 +8569,46 @@ msgstr ""
 msgid "Unknown"
 msgstr "അജ്ഞാതം"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr ""
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr ""
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "വരിക്കാർ"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "എല്ലാ വരിക്കാരും"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "ഉപയോക്തൃ ഐ.ഡി"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "അംഗമായത്"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. TRANS: Label for user statistics.
+#. TRANS: Average count of posts made per day since account registration.
+#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "ദൈനിക ശരാശരി"
 
-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "എല്ലാ സംഘങ്ങളും"
 
@@ -8765,51 +8857,63 @@ msgstr ""
 msgid "User %1$s (%2$d) has no profile record."
 msgstr ""
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr ""
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "ഉപയോക്തൃ പ്രവൃത്തികൾ"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr ""
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr ""
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "തിരുത്തുക"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "ഈ ഉപയോക്താവിന് നേരിട്ട് സന്ദേശമയയ്ക്കുക"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "സന്ദേശം"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
-msgstr "മാധ്യസ്ഥം വഹിക്കുക"
+msgstr "മാദ്ധ്യസ്ഥം വഹിക്കുക"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr ""
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "കാര്യനിർവ്വാഹക(ൻ)"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
-msgstr ""
+msgstr "മദ്ധ്യസ്ഥ(ൻ)"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 #: lib/util.php:1306
@@ -8896,12 +9000,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Exception.
-#: lib/xrd.php:64
+#: lib/xrd.php:63
 msgid "Invalid XML."
 msgstr "അസാധുവായ എക്സ്.എം.എൽ.."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
@@ -8910,21 +9014,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "No such group"
-#~ msgstr "അത്തരത്തിൽ ഒരു സംഘം ഇല്ല"
-
-#~ msgid "HTTP method not supported"
-#~ msgstr "എച്ച്.റ്റി.റ്റി.പി. രീതി പിന്തുണയ്ക്കുന്നില്ല."
-
-#~ msgid "Reset"
-#~ msgstr "പുനഃക്രമീകരിക്കുക"
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ. ആവശ്യമാണ്."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "മുകളിൽ നിലകിയിരിക്കുന്ന രഹസ്യവാക്കിനു തുല്യമായത്. നിർബന്ധമാണ്."
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "%s ഒരു സാധുവായ നിറമല്ല!"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 76c7252f28..7e7708b6bc 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Jon Harald Søby
 # Author: Laaknor
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:57:39+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:48:53+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 (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -92,7 +92,7 @@ msgstr "Lagre tilgangsinnstillinger"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -130,6 +130,7 @@ msgstr "Ingen slik side."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -336,14 +337,15 @@ msgstr "Kunne ikke oppdatere bruker."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Brukeren har ingen profil."
 
@@ -673,18 +675,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Alias kan ikke være det samme som kallenavn."
 
@@ -695,7 +695,7 @@ msgstr "Alias kan ikke være det samme som kallenavn."
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Gruppe ikke funnet."
@@ -894,11 +894,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Nick"
 
@@ -1202,28 +1203,27 @@ msgstr "Atom-innlegget må være velformatert XML."
 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.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: 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.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Notis med URI «%s» finnes allerede."
@@ -1391,23 +1391,30 @@ msgstr "Ikke autorisert."
 msgid "Cannot delete someone else's subscription."
 msgstr "Kunne ikke slette favoritt."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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."
@@ -1510,34 +1517,34 @@ msgid "No file uploaded."
 msgstr "Ingen fil lastet opp."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: actions/avatarsettings.php:345
 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr "Mistet våre fildata."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Oppdatering av avatar mislyktes."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr ""
 
@@ -1731,8 +1738,9 @@ msgid "Conversation"
 msgstr "Samtale"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Notiser"
 
@@ -1757,7 +1765,7 @@ msgstr ""
 #. 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."
+msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1768,7 +1776,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 #, fuzzy
 msgid "Delete account"
 msgstr "Opprett en konto"
@@ -2311,7 +2319,8 @@ msgstr "Bruk dette skjemaet for å redigere gruppen."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Ugyldig alias: «%s»"
@@ -2323,7 +2332,7 @@ 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:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "Kunne ikke opprette alias."
 
@@ -2826,17 +2835,17 @@ msgid "Crop"
 msgstr "Beskjær"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "Logo oppdatert."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "Kunne ikke oppdatere logo."
 
@@ -2896,7 +2905,9 @@ msgstr "Gjør denne burkeren til administrator"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Oppdateringer fra medlemmer av %1$s på %2$s!"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Grupper"
@@ -3472,7 +3483,7 @@ msgstr "Feil brukernavn eller passord."
 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 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Logg inn"
 
@@ -3573,6 +3584,12 @@ msgstr "Du har ikke tillatelse til å slette denne gruppen."
 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:199
+#, 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
 msgid "New message"
 msgstr "Ny melding"
@@ -4254,9 +4271,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "Fullt navn"
 
@@ -4295,10 +4313,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "Plassering"
 
@@ -4313,9 +4332,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "Tagger"
 
@@ -4407,7 +4427,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Opprett en konto"
@@ -4576,9 +4596,8 @@ msgstr ""
 "postadressen du har lagret på kontoen din."
 
 #: actions/recoverpassword.php:167
-#, fuzzy
 msgid "You have been identified. Enter a new password below."
-msgstr "Du har blitt identifisert. Skriv inn et nytt passord nedenfor. "
+msgstr "Du har blitt identifisert. Skriv inn et nytt passord nedenfor."
 
 #. TRANS: Fieldset legend for password recovery page.
 #: actions/recoverpassword.php:198
@@ -4720,7 +4739,7 @@ msgstr "Beklager, ugyldig invitasjonskode."
 msgid "Registration successful"
 msgstr "Registrering vellykket"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Registrer"
 
@@ -4880,8 +4899,9 @@ 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "Abonner"
 
@@ -5038,7 +5058,9 @@ 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.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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."
 
@@ -5154,8 +5176,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistikk"
 
@@ -5291,14 +5314,16 @@ 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:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Merk"
 
@@ -5342,8 +5367,11 @@ msgid "Members"
 msgstr "Medlemmer"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Ingen)"
@@ -5959,7 +5987,7 @@ 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:116
+#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -5967,7 +5995,7 @@ 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:120
+#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -5977,7 +6005,7 @@ 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:129
+#: actions/subscribers.php:127
 #, fuzzy, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6010,7 +6038,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6024,23 +6052,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s lytter ikke til noen."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "SMS"
 
@@ -6074,12 +6103,14 @@ msgstr "Ingen vedlegg."
 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"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
 
@@ -6617,25 +6648,25 @@ 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:914
+#: classes/Notice.php:923
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1013
+#: classes/Notice.php:1022
 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6740,25 +6771,46 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 msgid "Could not create group."
 msgstr "Kunne ikke opprette gruppe."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:526
+#: classes/User_group.php:530
 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:549
+#: classes/User_group.php:553
 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:564
+#: classes/User_group.php:568
 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6896,7 +6948,8 @@ msgid "Create an account"
 msgstr "Opprett en konto"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrer"
@@ -6908,7 +6961,8 @@ msgid "Login to the site"
 msgstr "Log inn på nettstedet"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Logg inn"
@@ -7143,6 +7197,23 @@ msgstr ""
 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."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7600,7 +7671,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Posisjon: %s"
@@ -7608,7 +7679,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Hjemmeside: %s"
@@ -7844,26 +7915,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 #, 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:158
+#: lib/common.php:164
 #, 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Log inn på nettstedet"
@@ -7957,6 +8028,12 @@ msgstr "Kunne ikke oppdatere utseende."
 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."
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 #, fuzzy
 msgid "Disfavor this notice"
@@ -8160,35 +8237,41 @@ msgstr "Rediger %s gruppeegenskaper"
 msgid "This page is not available in a media type you accept"
 msgstr "Denne siden er ikke tilgjengelig i en mediatype du aksepterer"
 
-#: lib/imagefile.php:72
+#. 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:90
+#: 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."
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Delvis opplasting."
 
-#: lib/imagefile.php:111
+#. 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."
 
-#: lib/imagefile.php:160
+#. 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."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8196,7 +8279,7 @@ msgstr[0] "MB"
 msgstr[1] "MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8204,7 +8287,7 @@ msgstr[0] "kB"
 msgstr[1] "kB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8225,23 +8308,25 @@ msgstr "Ukjent innbokskilde %d."
 msgid "Leave"
 msgstr "Forlat"
 
-#: lib/logingroupnav.php:80
+#. 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"
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8272,14 +8357,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8291,7 +8376,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:263
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8318,14 +8403,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Ny e-postadresse for posting til %s"
@@ -8333,7 +8418,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:321
+#: lib/mail.php:313
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8356,34 +8441,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "%s status"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, 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:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8412,7 +8497,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "Ny privat melding fra %s"
@@ -8421,7 +8506,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8456,7 +8541,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:607
+#: lib/mail.php:599
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s /@%s) la din notis til som en favoritt"
@@ -8466,7 +8551,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8504,7 +8589,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8517,7 +8602,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:680
+#: lib/mail.php:672
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) sendte en notis for din oppmerksomhet"
@@ -8528,7 +8613,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8863,36 +8948,46 @@ msgstr "Bruker har ingen siste notis"
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Abonnement"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Alle abonnementer"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Abonnenter"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Alle abonnenter"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "Bruker-ID"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Medlem siden"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. 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"
 
-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Alle grupper"
 
@@ -9155,50 +9250,62 @@ msgstr "Abonner"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Brukeren har ingen profil."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Brukerbilde"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 #, fuzzy
 msgid "User actions"
 msgstr "Gruppehandlinger"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr ""
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "Endre profilinnstillinger"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "Rediger"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "Send en direktemelding til denne brukeren"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "Melding"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr "Moderer"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "Brukerrolle"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrator"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
@@ -9288,13 +9395,13 @@ 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:64
+#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Ugyldig størrelse"
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
@@ -9303,30 +9410,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "No such group"
-#~ msgstr "Ingen slik gruppe."
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "HTTP-metoden støttes ikke."
-
-#~ msgid "Reset"
-#~ msgstr "Nullstill"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr ""
-#~ "1-64 små bokstaver eller tall, ingen punktum eller mellomrom. Påkrevd."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6 eller flere tegn. Påkrevd."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "Samme som passord over. Kreves."
-
-#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-#~ msgstr "1-64 små bokstaver eller tall, ingen punktum eller mellomrom"
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "%s er ikke en gyldig farge."
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index b511008396..5b736f9a76 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Brion
 # Author: Itavero
@@ -12,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:57:32+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:48: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-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -93,7 +93,7 @@ msgstr "Toegangsinstellingen opslaan"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -131,6 +131,7 @@ msgstr "Deze pagina bestaat niet."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -342,14 +343,15 @@ msgstr "Het was niet mogelijk de gebruiker bij te werken."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Deze gebruiker heeft geen profiel."
 
@@ -683,18 +685,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Een alias kan niet hetzelfde zijn als de gebruikersnaam."
 
@@ -705,7 +705,7 @@ msgstr "Een alias kan niet hetzelfde zijn als de gebruikersnaam."
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "De groep is niet aangetroffen."
@@ -905,11 +905,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Gebruikersnaam"
 
@@ -1217,28 +1218,27 @@ msgstr "Het Atombericht moet correct opgemaakte XML zijn."
 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.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: 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.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "De mededeling met URI \"%s\" bestaat al."
@@ -1298,7 +1298,6 @@ msgstr "groepslidmaatschappen van %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 "Het is niet mogelijk om een lidmaatschap van een ander toe te voegen."
 
@@ -1332,7 +1331,6 @@ msgstr "De favoriet bestaat niet."
 
 #. 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 "Het is niet mogelijk om een favoriet van een ander te verwijderen."
 
@@ -1370,13 +1368,11 @@ msgstr "De opgegeven groep bestaat niet."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
 #: actions/atompubshowmembership.php:91
-#, fuzzy
 msgid "Not a member."
-msgstr "Geen lid"
+msgstr "Geen lid."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
-#, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Het is niet mogelijk om een lidmaatschap van een ander te verwijderen."
 
@@ -1402,25 +1398,32 @@ msgid "Cannot delete someone else's subscription."
 msgstr ""
 "Het is niet mogelijk het abonnement van een andere gebruiker op te zeggen."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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
+#, fuzzy, php-format
+msgid "Already subscribed to %s."
+msgstr "U bent al gebonneerd!"
+
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
 msgid "No such attachment."
@@ -1524,35 +1527,35 @@ msgid "No file uploaded."
 msgstr "Er is geen bestand geüpload."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr "Ons bestand is verloren gegaan."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: 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:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr "Reservekopie van gebruiker maken"
 
@@ -1568,7 +1571,6 @@ msgstr "U kunt geen back-up van uw gebruiker maken."
 
 #. TRANS: Information displayed on the backup account page.
 #: actions/backupaccount.php:225
-#, 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 "
@@ -1750,8 +1752,9 @@ msgid "Conversation"
 msgstr "Dialoog"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Mededelingen"
 
@@ -1773,8 +1776,8 @@ 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."
+#, fuzzy, 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.
@@ -1784,7 +1787,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 msgid "Delete account"
 msgstr "Gebruiker verwijderen"
 
@@ -1997,7 +2000,6 @@ msgstr "U kunt alleen lokale gebruikers verwijderen."
 
 #. TRANS: Title of delete user page.
 #: actions/deleteuser.php:110
-#, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Gebruiker verwijderen"
@@ -2019,9 +2021,8 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-#, fuzzy
 msgid "Do not delete this user"
-msgstr "Verwijder deze groep niet"
+msgstr "Deze gebruiker niet verwijderen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
 #. TRANS: Description of form for deleting a user.
@@ -2146,7 +2147,6 @@ msgstr "Achtergrondafbeelding naast elkaar"
 
 #. TRANS: Fieldset legend for theme colors.
 #: actions/designadminpanel.php:598
-#, fuzzy
 msgid "Change colors"
 msgstr "Kleuren wijzigen"
 
@@ -2186,7 +2186,6 @@ msgstr "Aangepaste CSS"
 
 #. TRANS: Button text for resetting theme settings.
 #: actions/designadminpanel.php:718
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Standaardinstellingen gebruiken"
@@ -2222,9 +2221,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\"."
-msgstr "Onbekend document \"%s\""
+msgstr "Onbekend document \"%s\"."
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
@@ -2333,7 +2332,8 @@ msgstr "Gebruik dit formulier om de groep te bewerken."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Ongeldige alias: \"%s\""
@@ -2345,7 +2345,7 @@ 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:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "Het was niet mogelijk de aliassen aan te maken."
 
@@ -2859,17 +2859,17 @@ msgid "Crop"
 msgstr "Uitsnijden"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "Logo geactualiseerd."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "Het bijwerken van het logo is mislukt."
 
@@ -2929,7 +2929,9 @@ msgstr "Deze gebruiker beheerder maken"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Updates voor leden van %1$s op %2$s."
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Groepen"
@@ -3368,7 +3370,7 @@ msgstr "U moet aangemeld zijn om lid te worden van een groep."
 
 #. TRANS: Title for join group page after joining.
 #: actions/joingroup.php:147
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s is lid geworden van de groep %2$s"
@@ -3386,7 +3388,7 @@ msgstr "U bent geen lid van deze groep"
 
 #. TRANS: Title for leave group page after leaving.
 #: actions/leavegroup.php:142
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s heeft de groep %2$s verlaten"
@@ -3518,7 +3520,7 @@ 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 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Aanmelden"
 
@@ -3618,6 +3620,12 @@ msgstr "U mag geen groepen aanmaken op deze site."
 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:199
+#, fuzzy
+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
 msgid "New message"
 msgstr "Nieuw bericht"
@@ -4306,9 +4314,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "Volledige naam"
 
@@ -4347,10 +4356,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "Locatie"
 
@@ -4365,9 +4375,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "Labels"
 
@@ -4460,7 +4471,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Gebruiker terugladen van back-up"
 
@@ -4632,9 +4643,8 @@ msgstr ""
 "gebruiker staat opgeslagen."
 
 #: actions/recoverpassword.php:167
-#, fuzzy
 msgid "You have been identified. Enter a new password below."
-msgstr "U bent geïdentificeerd. Voer hieronder een nieuw wachtwoord in. "
+msgstr "U bent geïdentificeerd. Voer hieronder een nieuw wachtwoord in."
 
 #. TRANS: Fieldset legend for password recovery page.
 #: actions/recoverpassword.php:198
@@ -4658,7 +4668,6 @@ msgstr "Herstellen"
 
 #. TRANS: Button text on password recovery page.
 #: actions/recoverpassword.php:214
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Herstellen"
@@ -4686,15 +4695,13 @@ msgstr "Onbekende handeling"
 
 #. 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 "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
-#, fuzzy
 msgid "Same as password above."
-msgstr "Gelijk aan het wachtwoord hierboven"
+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.
@@ -4751,7 +4758,6 @@ msgstr "Het wachtwoord en de bevestiging komen niet overeen."
 
 #. TRANS: Reset password form validation error message.
 #: actions/recoverpassword.php:418
-#, fuzzy
 msgid "Cannot save new password."
 msgstr "Het was niet mogelijk het nieuwe wachtwoord op te slaan."
 
@@ -4777,7 +4783,7 @@ msgstr "Sorry. De uitnodigingscode is ongeldig."
 msgid "Registration successful"
 msgstr "De registratie is voltooid"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Registreren"
 
@@ -4806,7 +4812,6 @@ msgstr ""
 "mededelingen uitsturen en contact maken met vrienden en collega's. "
 
 #: actions/register.php:437
-#, fuzzy
 msgid "6 or more characters."
 msgstr "Zes of meer tekens"
 
@@ -4938,8 +4943,9 @@ msgstr "Profiel-URL"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "Abonneren"
 
@@ -5097,7 +5103,9 @@ 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.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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."
 
@@ -5215,8 +5223,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistieken"
 
@@ -5353,14 +5362,16 @@ 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:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Opmerking"
 
@@ -5404,8 +5415,11 @@ msgid "Members"
 msgstr "Leden"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(geen)"
@@ -6028,7 +6042,7 @@ 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:116
+#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6038,7 +6052,7 @@ 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:120
+#: 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?"
@@ -6048,7 +6062,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6081,7 +6095,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6101,23 +6115,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s volgt niemand."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "SMS"
 
@@ -6150,12 +6165,14 @@ msgstr "Geen ID-argument."
 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"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
 
@@ -6721,12 +6738,12 @@ 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:914
+#: classes/Notice.php:923
 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:1013
+#: classes/Notice.php:1022
 msgid "Problem saving group inbox."
 msgstr ""
 "Er is een probleem opgetreden bij het opslaan van het Postvak IN van de "
@@ -6734,14 +6751,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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6848,25 +6865,46 @@ 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:516
+#: classes/User_group.php:520
 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:526
+#: classes/User_group.php:530
 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:549
+#: classes/User_group.php:553
 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:564
+#: classes/User_group.php:568
 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
+#, fuzzy, php-format
+msgid "Cannot locate account %s."
+msgstr "U kunt uw gebruiker niet verwijderen."
+
+#. 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -7003,7 +7041,8 @@ msgid "Create an account"
 msgstr "Gebruiker aanmaken"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registreren"
@@ -7015,7 +7054,8 @@ msgid "Login to the site"
 msgstr "Gebruiker aanmelden"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Aanmelden"
@@ -7256,6 +7296,23 @@ msgstr ""
 msgid "No content for notice %s."
 msgstr "Geen inhoud voor mededeling %s."
 
+#: lib/activitymover.php:84
+#, fuzzy, php-format
+msgid "No such user %s."
+msgstr "Onbekende gebruiker."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7703,7 +7760,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Locatie: %s"
@@ -7711,7 +7768,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Thuispagina: %s"
@@ -7994,25 +8051,25 @@ msgstr ""
 "tracking - nog niet beschikbaar\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 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:158
+#: lib/common.php:164
 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "Naar het installatieprogramma gaan."
 
@@ -8100,6 +8157,14 @@ msgstr "Het was niet mogelijk uw ontwerp bij te werken."
 msgid "Design defaults restored."
 msgstr "Het standaardontwerp is weer ingesteld."
 
+#. TRANS: Exception. %s is an ID.
+#: lib/discovery.php:153
+#, fuzzy, php-format
+msgid "Unable to find services for %s."
+msgstr ""
+"Het was niet mogelijk de toegang te ontzeggen voor de volgende applicatie: %"
+"s."
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "Uit de favorietenlijst verwijderen"
@@ -8179,11 +8244,11 @@ msgid "Describe the group or topic"
 msgstr "Beschrijf de groep of het onderwerp"
 
 #: lib/groupeditform.php:162
-#, fuzzy, php-format
+#, 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"
+msgstr[0] "Beschrijf de groep in %d teken of minder."
+msgstr[1] "Beschrijf de groep in %d tekens of minder."
 
 #: lib/groupeditform.php:174
 msgid ""
@@ -8298,35 +8363,41 @@ msgstr "Labels in de groepsmededelingen van %s"
 msgid "This page is not available in a media type you accept"
 msgstr "Deze pagina is niet beschikbaar in een mediatype dat u accepteert"
 
-#: lib/imagefile.php:72
+#. 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:90
+#: 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."
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Gedeeltelijke upload."
 
-#: lib/imagefile.php:111
+#. 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."
 
-#: lib/imagefile.php:160
+#. 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."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8334,7 +8405,7 @@ msgstr[0] "%d MB"
 msgstr[1] "%d MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8342,7 +8413,7 @@ msgstr[0] "%d kB"
 msgstr[1] "%d kB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8363,23 +8434,25 @@ msgstr "Onbekende bron Postvak IN %d."
 msgid "Leave"
 msgstr "Verlaten"
 
-#: lib/logingroupnav.php:80
+#. 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"
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8411,14 +8484,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8432,7 +8505,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:263
+#: lib/mail.php:255
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8459,14 +8532,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nieuw e-mailadres om e-mail te versturen aan %s"
@@ -8474,7 +8547,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:321
+#: lib/mail.php:313
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8497,34 +8570,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "%s status"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, 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:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8554,7 +8627,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "U hebt een nieuw privébericht van %s."
@@ -8563,7 +8636,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8599,7 +8672,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:607
+#: lib/mail.php:599
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) heeft uw mededeling als favoriet toegevoegd"
@@ -8609,7 +8682,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8648,7 +8721,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8661,7 +8734,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:680
+#: lib/mail.php:672
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) heeft u een mededeling gestuurd"
@@ -8672,7 +8745,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9006,36 +9079,46 @@ msgstr "Labels in de mededelingen van %s"
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Abonnementen"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Alle abonnementen"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Abonnees"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Alle abonnees"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "Gebruikers-ID"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Lid sinds"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. 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"
 
-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Alle groepen"
 
@@ -9296,48 +9379,60 @@ msgstr "Abonnement opheffen"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Gebruiker %1$s (%2$d) heeft geen profielrecord."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "Avatar bewerken"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "Gebruikershandelingen"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr "Bezig met het verwijderen van de gebruiker..."
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "Profielinstellingen bewerken"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "Bewerken"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "Deze gebruiker een direct bericht zenden"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "Bericht"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr "Modereren"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "Gebruikersrol"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "Beheerder"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
@@ -9432,12 +9527,12 @@ msgstr[1] ""
 "bericht was %2$d."
 
 #. TRANS: Exception.
-#: lib/xrd.php:64
+#: lib/xrd.php:63
 msgid "Invalid XML."
 msgstr "Ongeldige XML."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr "Ongeldige XML. De XRD-root mist."
 
@@ -9446,29 +9541,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 "No such group"
-#~ msgstr "Deze groep bestaat niet"
-
-#~ msgid "HTTP method not supported"
-#~ msgstr "HTTP-methode wordt niet ondersteund."
-
-#~ msgid "Reset"
-#~ msgstr "Herstellen"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr ""
-#~ "1-64 kleine letters of cijfers, geen leestekens of spaties. Verplicht."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "Zes of meer tekens. Verplicht"
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "Gelijk aan het wachtwoord hierboven. Verplicht"
-
-#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-#~ msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties"
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "%s is geen geldige kleur."
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 3179ecd008..d530402b53 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Norwegian Nynorsk (‪Norsk (nynorsk)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # Author: Ranveig
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:57:36+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:48:52+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 (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nn\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -98,7 +98,7 @@ msgstr "Avatar-innstillingar"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 #, fuzzy
@@ -138,6 +138,7 @@ msgstr "Dette emneord finst ikkje."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -339,14 +340,15 @@ msgstr "Kan ikkje oppdatera brukar."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Brukaren har inga profil."
 
@@ -682,18 +684,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -704,7 +704,7 @@ msgstr ""
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Finst ikkje."
@@ -903,11 +903,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Kallenamn"
 
@@ -1218,28 +1219,27 @@ msgstr ""
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: 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.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Fann ingen profil med den IDen."
@@ -1409,23 +1409,30 @@ msgstr "Du tingar ikkje oppdateringar til den profilen."
 msgid "Cannot delete someone else's subscription."
 msgstr "Kunne ikkje lagra abonnement."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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."
@@ -1532,35 +1539,35 @@ msgid "No file uploaded."
 msgstr "Ingen vald profil."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: actions/avatarsettings.php:345
 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr "Fant ikkje igjen fil data."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: 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:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr ""
 
@@ -1757,8 +1764,9 @@ msgid "Conversation"
 msgstr "Stadfestingskode"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Notisar"
 
@@ -1783,7 +1791,7 @@ msgstr ""
 #. 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."
+msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1794,7 +1802,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 #, fuzzy
 msgid "Delete account"
 msgstr "Opprett ei ny gruppe"
@@ -2357,7 +2365,8 @@ msgstr "Bruk dette skjemaet for å redigere gruppa"
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, fuzzy, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Ugyldig merkelapp: %s"
@@ -2369,7 +2378,7 @@ 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:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 #, fuzzy
 msgid "Could not create aliases."
 msgstr "Kunne ikkje lagre favoritt."
@@ -2885,18 +2894,18 @@ msgid "Crop"
 msgstr "Skaler"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 #, 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "Logo oppdatert."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "Feil ved oppdatering av logo."
 
@@ -2957,7 +2966,9 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Oppdateringar frå %1$s på %2$s!"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Grupper"
@@ -3532,7 +3543,7 @@ msgstr "Feil brukarnamn eller passord."
 msgid "Error setting user. You are probably not authorized."
 msgstr "Ikkje autorisert."
 
-#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Logg inn"
 
@@ -3640,6 +3651,11 @@ msgstr "Du er ikkje medlem av den gruppa."
 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:199
+msgid "Alias cannot be the same as nickname."
+msgstr ""
+
 #: actions/newmessage.php:71 actions/newmessage.php:234
 msgid "New message"
 msgstr "Ny melding"
@@ -4344,9 +4360,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "Fullt namn"
 
@@ -4387,10 +4404,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "Plassering"
 
@@ -4405,9 +4423,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "Merkelappar"
 
@@ -4500,7 +4519,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Opprett ei ny gruppe"
@@ -4808,7 +4827,7 @@ msgstr "Feil med stadfestingskode."
 msgid "Registration successful"
 msgstr "Registreringa gikk bra"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Registrér"
 
@@ -4966,8 +4985,9 @@ msgstr "Profil-adresse"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "Ting"
 
@@ -5123,7 +5143,9 @@ msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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."
 
@@ -5247,8 +5269,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistikk"
 
@@ -5374,14 +5397,16 @@ 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:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Merknad"
 
@@ -5425,8 +5450,11 @@ msgid "Members"
 msgstr "Medlemmar"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Ingen)"
@@ -6034,7 +6062,7 @@ 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:116
+#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6042,7 +6070,7 @@ 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:120
+#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -6052,7 +6080,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6083,7 +6111,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6097,23 +6125,24 @@ 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:143 actions/subscriptions.php:149
+#: 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."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "SMS"
 
@@ -6147,12 +6176,14 @@ msgstr "Manglar argumentet ID."
 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"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Bilete"
 
@@ -6709,26 +6740,26 @@ 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:914
+#: classes/Notice.php:923
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1013
+#: classes/Notice.php:1022
 #, 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6833,26 +6864,47 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 msgid "Could not create group."
 msgstr "Kunne ikkje laga gruppa."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:526
+#: classes/User_group.php:530
 msgid "Could not set group URI."
 msgstr "Kunne ikkje laga gruppa."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:549
+#: classes/User_group.php:553
 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:564
+#: classes/User_group.php:568
 #, 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6996,7 +7048,8 @@ msgid "Create an account"
 msgstr "Opprett ei ny gruppe"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 #, fuzzy
 msgctxt "MENU"
 msgid "Register"
@@ -7009,7 +7062,8 @@ msgid "Login to the site"
 msgstr "Logg inn "
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 #, fuzzy
 msgctxt "MENU"
 msgid "Login"
@@ -7248,6 +7302,23 @@ msgstr ""
 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."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7712,7 +7783,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Stad: %s"
@@ -7720,7 +7791,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Heimeside: %s"
@@ -7957,26 +8028,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 #, 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:158
+#: lib/common.php:164
 #, 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Logg inn or sida"
@@ -8068,6 +8139,12 @@ msgstr "Kan ikkje oppdatera brukar."
 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"
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "Fjern favoriseringsmerket"
@@ -8268,35 +8345,41 @@ msgstr "Merkelappar i %s gruppa sine notisar"
 msgid "This page is not available in a media type you accept"
 msgstr "Denne sida er ikkje tilgjengeleg i nokon mediatype du aksepterer."
 
-#: lib/imagefile.php:72
+#. 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:90
+#: 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."
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Hallvegs opplasta."
 
-#: lib/imagefile.php:111
+#. 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."
 
-#: lib/imagefile.php:160
+#. 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."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8304,7 +8387,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8312,7 +8395,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8333,23 +8416,25 @@ msgstr ""
 msgid "Leave"
 msgstr "Forlat"
 
-#: lib/logingroupnav.php:80
+#. 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."
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8368,14 +8453,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8387,7 +8472,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:263
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8410,14 +8495,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Ny epostadresse for å oppdatera %s"
@@ -8425,7 +8510,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:321
+#: lib/mail.php:313
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8447,34 +8532,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "%s status"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, 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:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8492,7 +8577,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "Ny privat melding fra %s"
@@ -8501,7 +8586,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8522,7 +8607,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:607
+#: lib/mail.php:599
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr ""
@@ -8533,7 +8618,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8555,7 +8640,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8565,7 +8650,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:680
+#: lib/mail.php:672
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
@@ -8576,7 +8661,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8888,37 +8973,47 @@ msgstr "Merkelappar i %s sine notisar"
 msgid "Unknown"
 msgstr "Uventa handling."
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Tingingar"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Alle tingingar"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Tingarar"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Tingarar"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 #, fuzzy
 msgid "User ID"
 msgstr "Brukar"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Medlem sidan"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. TRANS: Label for user statistics.
+#. TRANS: Average count of posts made per day since account registration.
+#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr ""
 
-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Alle gruppar"
 
@@ -9182,52 +9277,64 @@ msgstr "Fjern tinging"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Brukaren har inga profil."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Brukarbilete"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "Brukarverkty"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr ""
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Profilinnstillingar"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr ""
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "Send ei direktemelding til denne brukaren"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "Melding"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr ""
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 #, fuzzy
 msgid "User role"
 msgstr "Brukarprofil"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 #, fuzzy
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrator"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr ""
@@ -9317,13 +9424,13 @@ 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:64
+#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Ugyldig storleik."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
@@ -9332,33 +9439,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "No such group"
-#~ msgstr "Denne gruppa finst ikkje."
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "Fann ikkje API-metode."
-
-#~ msgid "Reset"
-#~ msgstr "Avbryt"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr ""
-#~ "1-64 små bokstavar eller tal, ingen punktum (og liknande) eller "
-#~ "mellomrom. Kravd."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6 eller fleire teikn. Kravd."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "Samme som passord over. Påkrevd."
-
-#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-#~ msgstr ""
-#~ "1-64 små bokstavar eller tal, ingen punktum (og liknande) eller mellomrom"
-
-#, fuzzy
-#~ msgid "%s is not a valid color!"
-#~ msgstr "Heimesida er ikkje ei gyldig internettadresse."
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index 75da79f151..557e44d412 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Polish (Polski)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # Author: Raven
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:57:43+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:48:55+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 (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-core\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -95,7 +95,7 @@ msgstr "Zapisz ustawienia dostępu"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -133,6 +133,7 @@ msgstr "Nie ma takiej strony."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -342,14 +343,15 @@ msgstr "Nie można zaktualizować użytkownika."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Użytkownik nie posiada profilu."
 
@@ -686,18 +688,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Alias nie może być taki sam jak pseudonim."
 
@@ -708,7 +708,7 @@ msgstr "Alias nie może być taki sam jak pseudonim."
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Nie odnaleziono grupy."
@@ -904,11 +904,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Pseudonim"
 
@@ -1216,28 +1217,27 @@ msgstr "Wpis Atom musi być poprawnie sformatowanym kodem XML."
 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.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: 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.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Wpis z adresem URI \"%s\" już istnieje."
@@ -1295,9 +1295,8 @@ msgstr "%s członków grupy"
 
 #. 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 "Nie można dodać członkostwa innej osoby"
+msgstr "Nie można dodać członkostwa innej osoby."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
@@ -1327,9 +1326,8 @@ msgstr "Nie ma takiego ulubionego wpisu."
 
 #. 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 "Nie można usunąć ulubionego wpisu innej osoby"
+msgstr "Nie można usunąć ulubionego wpisu innej osoby."
 
 #. 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.
@@ -1365,15 +1363,13 @@ msgstr "Nie ma takiej grupy."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
 #: actions/atompubshowmembership.php:91
-#, fuzzy
 msgid "Not a member."
-msgstr "Nie jest członkiem"
+msgstr "Nie jest członkiem."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
-#, fuzzy
 msgid "Cannot delete someone else's membership."
-msgstr "Nie można usunąć członkostwa innej osoby"
+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.
@@ -1396,23 +1392,30 @@ msgstr "Profil %1$d nie jest subskrybowany do profilu %2$d."
 msgid "Cannot delete someone else's subscription."
 msgstr "Nie można usunąć subskrypcji innej osoby."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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
+#, fuzzy, php-format
+msgid "Already subscribed to %s."
+msgstr "Już subskrybowane."
+
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
 msgid "No such attachment."
@@ -1515,34 +1518,34 @@ msgid "No file uploaded."
 msgstr "Nie wysłano pliku."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: actions/avatarsettings.php:345
 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr "Utracono dane pliku."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: 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:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr "Wykonaj kopię zapasową konta"
 
@@ -1559,7 +1562,6 @@ msgstr "Użytkownik nie może wykonać kopii zapasowej konta."
 
 #. TRANS: Information displayed on the backup account page.
 #: actions/backupaccount.php:225
-#, 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 "
@@ -1742,8 +1744,9 @@ msgid "Conversation"
 msgstr "Rozmowa"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Wpisy"
 
@@ -1765,8 +1768,8 @@ 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."
+#, fuzzy, 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.
@@ -1776,7 +1779,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 msgid "Delete account"
 msgstr "Usuń konto"
 
@@ -1984,7 +1987,6 @@ msgstr "Nie można usuwać lokalnych użytkowników."
 
 #. TRANS: Title of delete user page.
 #: actions/deleteuser.php:110
-#, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Usuń użytkownika"
@@ -2005,9 +2007,8 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-#, fuzzy
 msgid "Do not delete this user"
-msgstr "Nie usuwaj tej grupy"
+msgstr "Nie usuwaj tego użytkownika"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
 #. TRANS: Description of form for deleting a user.
@@ -2130,7 +2131,6 @@ msgstr "Kafelkowy obraz tła"
 
 #. TRANS: Fieldset legend for theme colors.
 #: actions/designadminpanel.php:598
-#, fuzzy
 msgid "Change colors"
 msgstr "Zmień kolory"
 
@@ -2170,10 +2170,9 @@ msgstr "Własny plik CSS"
 
 #. TRANS: Button text for resetting theme settings.
 #: actions/designadminpanel.php:718
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
-msgstr "Użycie domyślnych"
+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.
@@ -2206,9 +2205,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\"."
-msgstr "Nie ma takiego dokumentu \\\"%s\\\""
+msgstr "Nie ma takiego dokumentu \\\"%s\\\"."
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
@@ -2317,7 +2316,8 @@ msgstr "Użyj tego formularza, aby zmodyfikować grupę."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Nieprawidłowy alias: \"%s\""
@@ -2329,7 +2329,7 @@ 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:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "Nie można utworzyć aliasów."
 
@@ -2831,17 +2831,17 @@ msgid "Crop"
 msgstr "Przytnij"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "Zaktualizowano logo."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "Zaktualizowanie logo nie powiodło się."
 
@@ -2901,7 +2901,9 @@ msgstr "Nadaje temu użytkownikowi uprawnienia administratora"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Aktualizacje od członków %1$s na %2$s."
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Grupy"
@@ -3342,7 +3344,7 @@ msgstr "Musisz być zalogowany, aby dołączyć do grupy."
 
 #. TRANS: Title for join group page after joining.
 #: actions/joingroup.php:147
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "Użytkownik %1$s dołączył do grupy %2$s"
@@ -3360,7 +3362,7 @@ msgstr "Nie jesteś członkiem tej grupy."
 
 #. TRANS: Title for leave group page after leaving.
 #: actions/leavegroup.php:142
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "Użytkownik %1$s opuścił grupę %2$s"
@@ -3490,7 +3492,7 @@ msgstr "Niepoprawna nazwa użytkownika lub hasło."
 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 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Zaloguj się"
 
@@ -3592,6 +3594,12 @@ msgstr "Brak uprawnienia do tworzenia grup w tej witrynie."
 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:199
+#, fuzzy
+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
 msgid "New message"
 msgstr "Nowa wiadomość"
@@ -4275,9 +4283,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "Imię i nazwisko"
 
@@ -4317,10 +4326,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "Położenie"
 
@@ -4335,9 +4345,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "Znaczniki"
 
@@ -4428,7 +4439,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Przywróć konto"
 
@@ -4596,9 +4607,8 @@ msgstr ""
 "adres e-mail przechowywany w koncie."
 
 #: actions/recoverpassword.php:167
-#, fuzzy
 msgid "You have been identified. Enter a new password below."
-msgstr "Zostałeś zidentyfikowany. Podaj poniżej nowe hasło. "
+msgstr "Zostałeś zidentyfikowany. Podaj poniżej nowe hasło."
 
 #. TRANS: Fieldset legend for password recovery page.
 #: actions/recoverpassword.php:198
@@ -4622,7 +4632,6 @@ msgstr "Przywróć"
 
 #. TRANS: Button text on password recovery page.
 #: actions/recoverpassword.php:214
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Przywróć"
@@ -4650,15 +4659,13 @@ msgstr "Nieznane działanie"
 
 #. 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 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
-#, fuzzy
 msgid "Same as password above."
-msgstr "Takie samo jak powyższe hasło"
+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.
@@ -4713,7 +4720,6 @@ msgstr "Hasło i potwierdzenie nie pasują do siebie."
 
 #. TRANS: Reset password form validation error message.
 #: actions/recoverpassword.php:418
-#, fuzzy
 msgid "Cannot save new password."
 msgstr "Nie można zapisać nowego hasła."
 
@@ -4739,7 +4745,7 @@ msgstr "Nieprawidłowy kod zaproszenia."
 msgid "Registration successful"
 msgstr "Rejestracja powiodła się"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Zarejestruj się"
 
@@ -4769,9 +4775,8 @@ msgstr ""
 "wpisy i połączyć się z przyjaciółmi i kolegami. "
 
 #: actions/register.php:437
-#, fuzzy
 msgid "6 or more characters."
-msgstr "6 lub więcej znaków"
+msgstr "6 lub więcej znaków."
 
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:445 actions/register.php:449
@@ -4899,8 +4904,9 @@ msgstr "Adres URL profilu"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "Subskrybuj"
 
@@ -5054,7 +5060,9 @@ 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.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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."
 
@@ -5172,8 +5180,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statystyki"
 
@@ -5308,14 +5317,16 @@ 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:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Wpis"
 
@@ -5359,8 +5370,11 @@ msgid "Members"
 msgstr "Członkowie"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Brak)"
@@ -5976,7 +5990,7 @@ 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:116
+#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -5986,7 +6000,7 @@ 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:120
+#: 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?"
@@ -5996,7 +6010,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6029,7 +6043,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6049,23 +6063,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "Użytkownik %s nie obserwuje nikogo."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "SMS"
 
@@ -6098,12 +6113,14 @@ msgstr "Brak parametru identyfikatora."
 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"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Zdjęcie"
 
@@ -6671,25 +6688,25 @@ 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:914
+#: classes/Notice.php:923
 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:1013
+#: classes/Notice.php:1022
 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6792,25 +6809,46 @@ 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:516
+#: classes/User_group.php:520
 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:526
+#: classes/User_group.php:530
 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:549
+#: classes/User_group.php:553
 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:564
+#: classes/User_group.php:568
 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
+#, fuzzy, php-format
+msgid "Cannot locate account %s."
+msgstr "Użytkownik nie może usunąć konta."
+
+#. 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6947,7 +6985,8 @@ msgid "Create an account"
 msgstr "Utwórz konto"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Zarejestruj się"
@@ -6959,7 +6998,8 @@ msgid "Login to the site"
 msgstr "Zaloguj się na witrynie"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Zaloguj się"
@@ -7197,6 +7237,23 @@ msgstr ""
 msgid "No content for notice %s."
 msgstr "Brak zawartości dla wpisu %s."
 
+#: lib/activitymover.php:84
+#, fuzzy, php-format
+msgid "No such user %s."
+msgstr "Brak takiego użytkownika."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7639,7 +7696,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Położenie: %s"
@@ -7647,7 +7704,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Strona domowa: %s"
@@ -7925,24 +7982,24 @@ msgstr ""
 "tracking - jeszcze nie zaimplementowano\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 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:158
+#: lib/common.php:164
 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "Przejdź do instalatora."
 
@@ -8028,6 +8085,12 @@ msgstr "Nie można zaktualizować wyglądu."
 msgid "Design defaults restored."
 msgstr "Przywrócono domyślny wygląd."
 
+#. TRANS: Exception. %s is an ID.
+#: lib/discovery.php:153
+#, fuzzy, php-format
+msgid "Unable to find services for %s."
+msgstr "Nie można unieważnić dostępu dla aplikacji: %s."
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "Usuń ten wpis z ulubionych"
@@ -8107,12 +8170,12 @@ msgid "Describe the group or topic"
 msgstr "Opisz grupę lub temat"
 
 #: lib/groupeditform.php:162
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the group or topic in %d character or less."
 msgid_plural "Describe the group or topic in %d characters or less."
-msgstr[0] "Opisz grupę lub temat w %d znaku"
-msgstr[1] "Opisz grupę lub temat w %d znakach"
-msgstr[2] "Opisz grupę lub temat w %d znakach"
+msgstr[0] "Opisz grupę lub temat w %d znaku."
+msgstr[1] "Opisz grupę lub temat w %d znakach lub mniej."
+msgstr[2] "Opisz grupę lub temat w %d znakach lub mniej."
 
 #: lib/groupeditform.php:174
 msgid ""
@@ -8233,35 +8296,41 @@ msgstr "Znaczniki we wpisach grupy %s"
 msgid "This page is not available in a media type you accept"
 msgstr "Ta strona jest niedostępna dla akceptowanego typu medium"
 
-#: lib/imagefile.php:72
+#. 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:90
+#: 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."
 
-#: lib/imagefile.php:95
+#. 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."
 
-#: lib/imagefile.php:111
+#. 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."
 
-#: lib/imagefile.php:160
+#. 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."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8270,7 +8339,7 @@ msgstr[1] "%d MB"
 msgstr[2] "%d MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8279,7 +8348,7 @@ msgstr[1] "%d KB"
 msgstr[2] "%d KB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8301,23 +8370,25 @@ msgstr "Nieznane źródło skrzynki odbiorczej %d."
 msgid "Leave"
 msgstr "Opuść"
 
-#: lib/logingroupnav.php:80
+#. 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"
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8349,14 +8420,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8371,7 +8442,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:263
+#: lib/mail.php:255
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8398,14 +8469,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Nowy adres e-mail do wysyłania do %s"
@@ -8413,7 +8484,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:321
+#: lib/mail.php:313
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8436,34 +8507,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "Stan użytkownika %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, 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:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 msgstr "Zostałeś szturchnięty przez %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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8492,7 +8563,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "Nowa prywatna wiadomość od użytkownika %s"
@@ -8501,7 +8572,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8536,7 +8607,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:607
+#: lib/mail.php:599
 #, 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"
@@ -8546,7 +8617,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8585,7 +8656,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8598,7 +8669,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:680
+#: lib/mail.php:672
 #, 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"
@@ -8609,7 +8680,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8941,36 +9012,46 @@ msgstr "Znaczniki we wpisach użytkownika %s"
 msgid "Unknown"
 msgstr "Nieznane"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Subskrypcje"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Wszystkie subskrypcje"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Subskrybenci"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Wszyscy subskrybenci"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "Identyfikator użytkownika"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Członek od"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. 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"
 
-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Wszystkie grupy"
 
@@ -9231,48 +9312,60 @@ 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."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "Zmodyfikuj awatar"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "Czynności użytkownika"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr "Trwa usuwanie użytkownika..."
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "Zmodyfikuj ustawienia profilu"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "Edycja"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "Wyślij bezpośrednią wiadomość do tego użytkownika"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "Wiadomość"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr "Moderuj"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "Rola użytkownika"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrator"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
@@ -9370,12 +9463,12 @@ 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:64
+#: lib/xrd.php:63
 msgid "Invalid XML."
 msgstr "Nieprawidłowy kod XML."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr "Nieprawidłowy kod XML, brak głównego XRD."
 
@@ -9384,29 +9477,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\"."
-
-#~ msgid "No such group"
-#~ msgstr "Nie ma takiej grupy."
-
-#~ msgid "HTTP method not supported"
-#~ msgstr "Metoda HTTP nie jest obsługiwana"
-
-#~ msgid "Reset"
-#~ msgstr "Przywróć"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr ""
-#~ "1-64 małe litery lub liczby, bez spacji i znaków przestankowych. Wymagane."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6 lub więcej znaków. Wymagane."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "Takie samo jak powyższe hasło. Wymagane."
-
-#~ 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"
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "%s nie jest prawidłowym kolorem."
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 41b430c4c2..07b073ea94 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Aracnus
 # Author: Brion
@@ -15,17 +15,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:57:46+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:48: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-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -96,7 +96,7 @@ msgstr "Gravar configurações de acesso"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -134,6 +134,7 @@ msgstr "Página não foi encontrada."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -342,14 +343,15 @@ msgstr "Não foi possível actualizar o utilizador."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Utilizador não tem perfil."
 
@@ -684,18 +686,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Um nome alternativo não pode ser igual ao nome do utilizador."
 
@@ -706,7 +706,7 @@ msgstr "Um nome alternativo não pode ser igual ao nome do utilizador."
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Grupo não foi encontrado."
@@ -907,11 +907,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Utilizador"
 
@@ -1219,28 +1220,27 @@ msgstr ""
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: 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.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Não existe nenhuma nota com essa identificação."
@@ -1410,23 +1410,30 @@ msgstr "Não subscreveu esse perfil."
 msgid "Cannot delete someone else's subscription."
 msgstr "Não foi possível apagar a auto-subscrição."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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."
@@ -1532,34 +1539,34 @@ msgid "No file uploaded."
 msgstr "Não foi carregado nenhum ficheiro."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: actions/avatarsettings.php:345
 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr "Perdi os dados do nosso ficheiro."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Falha ao actualizar avatar."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr ""
 
@@ -1755,8 +1762,9 @@ msgid "Conversation"
 msgstr "Conversação"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Notas"
 
@@ -1781,7 +1789,7 @@ msgstr ""
 #. 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."
+msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1792,7 +1800,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 #, fuzzy
 msgid "Delete account"
 msgstr "Criar uma conta"
@@ -2346,7 +2354,8 @@ msgstr "Use este formulário para editar o grupo."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Nome alternativo inválido: \"%s\""
@@ -2358,7 +2367,7 @@ 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:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "Não foi possível criar os nomes alternativos."
 
@@ -2868,17 +2877,17 @@ msgid "Crop"
 msgstr "Cortar"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "Logotipo actualizado."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "Não foi possível actualizar o logotipo."
 
@@ -2938,7 +2947,9 @@ msgstr "Tornar este utilizador um gestor"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Actualizações dos membros de %1$s em %2$s!"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Grupos"
@@ -3526,7 +3537,7 @@ msgstr "Nome de utilizador ou senha incorrectos."
 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 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Entrar"
 
@@ -3628,6 +3639,12 @@ msgstr "Não é membro deste grupo."
 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:199
+#, 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
 msgid "New message"
 msgstr "Mensagem nova"
@@ -4327,9 +4344,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "Nome completo"
 
@@ -4369,10 +4387,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "Localidade"
 
@@ -4387,9 +4406,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "Categorias"
 
@@ -4481,7 +4501,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Criar uma conta"
@@ -4652,9 +4672,8 @@ msgstr ""
 "correio electrónico registado na sua conta."
 
 #: actions/recoverpassword.php:167
-#, fuzzy
 msgid "You have been identified. Enter a new password below."
-msgstr "Identificação positiva. Introduza abaixo uma senha nova. "
+msgstr "Identificação positiva. Introduza abaixo uma senha nova."
 
 #. TRANS: Fieldset legend for password recovery page.
 #: actions/recoverpassword.php:198
@@ -4799,7 +4818,7 @@ msgstr "Desculpe, código de convite inválido."
 msgid "Registration successful"
 msgstr "Registo efectuado"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Registar"
 
@@ -4963,8 +4982,9 @@ msgstr "URL do perfil"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "Subscrever"
 
@@ -5124,7 +5144,9 @@ 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.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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."
 
@@ -5240,8 +5262,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Estatísticas"
 
@@ -5377,14 +5400,16 @@ 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:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Anotação"
 
@@ -5428,8 +5453,11 @@ msgid "Members"
 msgstr "Membros"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Nenhum)"
@@ -6046,7 +6074,7 @@ 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:116
+#: actions/subscribers.php:114
 #, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
@@ -6057,7 +6085,7 @@ 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:120
+#: 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?"
@@ -6067,7 +6095,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6100,7 +6128,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6120,23 +6148,24 @@ 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:143 actions/subscriptions.php:149
+#: 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."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "SMS"
 
@@ -6169,12 +6198,14 @@ msgstr "Argumento de identificação (ID) em falta."
 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"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
 
@@ -6733,26 +6764,26 @@ 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:914
+#: classes/Notice.php:923
 #, 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:1013
+#: classes/Notice.php:1022
 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6856,25 +6887,46 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 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:526
+#: classes/User_group.php:530
 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:549
+#: classes/User_group.php:553
 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:564
+#: classes/User_group.php:568
 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -7011,7 +7063,8 @@ msgid "Create an account"
 msgstr "Criar uma conta"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registar"
@@ -7023,7 +7076,8 @@ msgid "Login to the site"
 msgstr "Iniciar uma sessão"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Entrar"
@@ -7265,6 +7319,23 @@ msgstr ""
 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."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7711,7 +7782,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Localidade: %s"
@@ -7719,7 +7790,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Página pessoal: %s"
@@ -7989,26 +8060,26 @@ msgstr ""
 "tracking - ainda não implementado.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 #, 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:158
+#: lib/common.php:164
 #, 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "Ir para o instalador."
 
@@ -8101,6 +8172,12 @@ msgstr "Não foi possível actualizar o estilo."
 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"
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "Retirar esta nota das favoritas"
@@ -8301,35 +8378,41 @@ msgstr "Categorias nas notas do grupo %s"
 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"
 
-#: lib/imagefile.php:72
+#. 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:90
+#: 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."
 
-#: lib/imagefile.php:95
+#. 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."
 
-#: lib/imagefile.php:111
+#. 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."
 
-#: lib/imagefile.php:160
+#. 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."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8337,7 +8420,7 @@ msgstr[0] "MB"
 msgstr[1] "MB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8345,7 +8428,7 @@ msgstr[0] "kB"
 msgstr[1] "kB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8366,23 +8449,25 @@ msgstr "Origem da caixa de entrada desconhecida \"%s\"."
 msgid "Leave"
 msgstr "Afastar-me"
 
-#: lib/logingroupnav.php:80
+#. 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"
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8413,14 +8498,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8435,7 +8520,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:263
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8463,14 +8548,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Novo endereço electrónico para publicar no site %s"
@@ -8478,7 +8563,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:321
+#: lib/mail.php:313
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8501,34 +8586,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "Estado de %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, 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:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8557,7 +8642,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "Nova mensagem privada de %s"
@@ -8566,7 +8651,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8601,7 +8686,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:607
+#: lib/mail.php:599
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) adicionou a sua nota às favoritas."
@@ -8611,7 +8696,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8649,7 +8734,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8662,7 +8747,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:680
+#: lib/mail.php:672
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) enviou uma nota à sua atenção"
@@ -8673,7 +8758,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -9008,36 +9093,46 @@ msgstr "Categorias nas notas de %s"
 msgid "Unknown"
 msgstr "Desconhecida"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Subscrições"
 
-#: lib/profileaction.php:126
+#. 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"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Subscritores"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Todos os subscritores"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "Número de identificação"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Membro desde"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. 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"
 
-#: lib/profileaction.php:264
+#. 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"
 
@@ -9296,48 +9391,60 @@ msgstr "Abandonar"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Utilizador não tem perfil."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "Editar Avatar"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "Acções do utilizador"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr "A apagar o utilizador..."
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "Editar configurações do perfil"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "Editar"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "Enviar mensagem directa a este utilizador"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "Mensagem"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr "Moderar"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "Função"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "Gestor"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderador"
@@ -9427,13 +9534,13 @@ 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:64
+#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Tamanho inválido."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
@@ -9442,30 +9549,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "No such group"
-#~ msgstr "Grupo não existe"
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "Método da API não encontrado."
-
-#~ msgid "Reset"
-#~ msgstr "Reiniciar"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr ""
-#~ "1-64 letras minúsculas ou números, sem pontuação ou espaços. Obrigatório."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6 ou mais caracteres. Obrigatório."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "Repita a senha acima. Obrigatório."
-
-#~ 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"
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "%s não é uma cor válida!"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 84d6080221..c269531444 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Brazilian Portuguese (Português do Brasil)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Aracnus
 # Author: Brion
@@ -15,18 +15,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:57:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:48:58+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 (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -97,7 +97,7 @@ msgstr "Salvar as configurações de acesso"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -135,6 +135,7 @@ msgstr "Esta página não existe."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -345,14 +346,15 @@ msgstr "Não foi possível atualizar o usuário."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "O usuário não tem perfil."
 
@@ -687,18 +689,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "O apelido não pode ser igual à identificação."
 
@@ -709,7 +709,7 @@ msgstr "O apelido não pode ser igual à identificação."
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "O grupo não foi encontrado."
@@ -907,11 +907,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Usuário"
 
@@ -1215,28 +1216,27 @@ msgstr "A publicação Atom deve ser um XML formatado corretamente."
 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.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: 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.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Já existe uma mensagem com a URI \"%s\"."
@@ -1399,23 +1399,30 @@ msgstr "O perfil %1$d não assina o perfil %2$d"
 msgid "Cannot delete someone else's subscription."
 msgstr "Não é possível excluir a assinatura de outra pessoa"
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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."
@@ -1519,34 +1526,34 @@ msgid "No file uploaded."
 msgstr "Não foi enviado nenhum arquivo."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: actions/avatarsettings.php:345
 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 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:385
+#: 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:389
+#: 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:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr "Fazer backup da conta"
 
@@ -1746,8 +1753,9 @@ msgid "Conversation"
 msgstr "Conversa"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Mensagens"
 
@@ -1772,7 +1780,7 @@ msgstr ""
 #. 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."
+msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1783,7 +1791,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 #, fuzzy
 msgid "Delete account"
 msgstr "Criar uma conta"
@@ -2328,7 +2336,8 @@ msgstr "Use esse formulário para editar o grupo."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Apelido inválido: \"%s\""
@@ -2340,7 +2349,7 @@ 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:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "Não foi possível criar os apelidos."
 
@@ -2852,17 +2861,17 @@ msgid "Crop"
 msgstr "Cortar"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "A logo foi atualizada."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "Não foi possível atualizar a logo."
 
@@ -2922,7 +2931,9 @@ msgstr "Torna este usuário um administrador"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Atualizações dos membros de %1$s no %2$s!"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Grupos"
@@ -3514,7 +3525,7 @@ 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 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Entrar"
 
@@ -3618,6 +3629,12 @@ msgstr "Você não tem permissão para excluir este grupo."
 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:199
+#, 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
 msgid "New message"
 msgstr "Nova mensagem"
@@ -4303,9 +4320,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "Nome completo"
 
@@ -4344,10 +4362,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "Localização"
 
@@ -4362,9 +4381,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "Etiquetas"
 
@@ -4456,7 +4476,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Criar uma conta"
@@ -4626,9 +4646,8 @@ msgstr ""
 "endereço de e-mail que cadastrou na sua conta."
 
 #: actions/recoverpassword.php:167
-#, fuzzy
 msgid "You have been identified. Enter a new password below."
-msgstr "Você foi identificado. Digite uma nova senha abaixo. "
+msgstr "Você foi identificado. Digite uma nova senha abaixo."
 
 #. TRANS: Fieldset legend for password recovery page.
 #: actions/recoverpassword.php:198
@@ -4774,7 +4793,7 @@ msgstr "Desculpe, mas o código do convite é inválido."
 msgid "Registration successful"
 msgstr "Registro realizado com sucesso"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Registrar-se"
 
@@ -4936,8 +4955,9 @@ msgstr "URL do perfil"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "Assinar"
 
@@ -5099,7 +5119,9 @@ 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.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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."
 
@@ -5215,8 +5237,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Estatísticas"
 
@@ -5350,14 +5373,16 @@ 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:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Mensagem"
 
@@ -5401,8 +5426,11 @@ msgid "Members"
 msgstr "Membros"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Nenhum)"
@@ -6016,7 +6044,7 @@ 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:116
+#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6026,7 +6054,7 @@ 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:120
+#: 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)?"
@@ -6036,7 +6064,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6069,7 +6097,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6089,23 +6117,24 @@ 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:143 actions/subscriptions.php:149
+#: 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."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "SMS"
 
@@ -6138,12 +6167,14 @@ msgstr "Nenhum argumento de ID."
 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"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Imagem"
 
@@ -6700,26 +6731,26 @@ 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:914
+#: classes/Notice.php:923
 #, 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:1013
+#: classes/Notice.php:1022
 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6822,25 +6853,46 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 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:526
+#: classes/User_group.php:530
 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:549
+#: classes/User_group.php:553
 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:564
+#: classes/User_group.php:568
 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6977,7 +7029,8 @@ msgid "Create an account"
 msgstr "Criar uma conta"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrar-se"
@@ -6989,7 +7042,8 @@ msgid "Login to the site"
 msgstr "Autentique-se no site"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Entrar"
@@ -7227,6 +7281,23 @@ msgstr ""
 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."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7679,7 +7750,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Localização: %s"
@@ -7687,7 +7758,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Site: %s"
@@ -7964,26 +8035,26 @@ msgstr ""
 "tracking -  não implementado ainda\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 #, 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:158
+#: lib/common.php:164
 #, 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "Ir para o instalador."
 
@@ -8075,6 +8146,12 @@ msgstr "Não foi possível atualizar a aparência."
 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."
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "Excluir das favoritas"
@@ -8277,35 +8354,41 @@ msgstr "Etiquetas nas mensagens do grupo %s"
 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"
 
-#: lib/imagefile.php:72
+#. 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:90
+#: 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."
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Envio parcial."
 
-#: lib/imagefile.php:111
+#. 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."
 
-#: lib/imagefile.php:160
+#. 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."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, fuzzy, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8313,7 +8396,7 @@ msgstr[0] "Mb"
 msgstr[1] "Mb"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, fuzzy, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8321,7 +8404,7 @@ msgstr[0] "Kb"
 msgstr[1] "Kb"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8342,23 +8425,25 @@ msgstr "Fonte da caixa de entrada desconhecida %d."
 msgid "Leave"
 msgstr "Sair"
 
-#: lib/logingroupnav.php:80
+#. 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"
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8389,14 +8474,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8411,7 +8496,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:263
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8438,14 +8523,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Novo endereço de e-mail para publicar no %s"
@@ -8453,7 +8538,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:321
+#: lib/mail.php:313
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8476,19 +8561,19 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "Mensagem de %s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
@@ -8497,15 +8582,15 @@ msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8534,7 +8619,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "Nova mensagem particular de %s"
@@ -8543,7 +8628,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8578,7 +8663,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:607
+#: lib/mail.php:599
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) marcou sua mensagem como favorita"
@@ -8588,7 +8673,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8626,7 +8711,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8639,7 +8724,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:680
+#: lib/mail.php:672
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%s (@%s) enviou uma mensagem citando você"
@@ -8650,7 +8735,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8987,36 +9072,46 @@ msgstr "Etiquetas nas mensagens de %s"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Assinaturas"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Todas as assinaturas"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Assinantes"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Todos os assinantes"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "ID do usuário"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Membro desde"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. 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"
 
-#: lib/profileaction.php:264
+#. 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"
 
@@ -9273,48 +9368,60 @@ msgstr "Cancelar"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "O usuário não tem perfil."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "Editar o avatar"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "Ações do usuário"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr "Exclusão do usuário em andamento..."
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "Editar as configurações do perfil"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "Editar"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "Enviar uma mensagem para este usuário."
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "Mensagem"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr "Moderar"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "Papel do usuário"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administrador"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderador"
@@ -9406,13 +9513,13 @@ msgstr[1] ""
 "A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d."
 
 #. TRANS: Exception.
-#: lib/xrd.php:64
+#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Tamanho inválido."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
@@ -9421,30 +9528,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "No such group"
-#~ msgstr "Esse grupo não existe."
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "O método HTTP não é suportado."
-
-#~ msgid "Reset"
-#~ msgstr "Restaurar"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr ""
-#~ "1-64 letras minúsculas ou números, sem pontuação ou espaços. Obrigatório."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "No mínimo 6 caracteres. Obrigatório."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "Igual à senha acima. Obrigatório."
-
-#~ 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"
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "%s não é uma cor válida!"
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 6a1e10d2c7..f0c789e37a 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -1,10 +1,11 @@
 # Translation of StatusNet - Core to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Brion
 # Author: Eleferen
 # Author: Haffman
 # Author: Kirill
+# Author: Lionbeat
 # Author: Lockal
 # Author: Putnik
 # Author: Rubin
@@ -16,18 +17,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:57:54+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:48: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-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -99,7 +100,7 @@ msgstr "Сохранить настройки доступа"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -137,6 +138,7 @@ msgstr "Нет такой страницы."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -345,14 +347,15 @@ msgstr "Не удаётся обновить пользователя."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "У пользователя нет профиля."
 
@@ -412,7 +415,6 @@ msgstr "Не удаётся обновить ваше оформление."
 
 #. TRANS: Title for Atom feed.
 #: actions/apiatomservice.php:85
-#, fuzzy
 msgctxt "ATOM"
 msgid "Main"
 msgstr "Главная"
@@ -443,13 +445,13 @@ msgstr "Подписки %s"
 #. 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"
 
@@ -691,18 +693,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Алиас не может совпадать с именем."
 
@@ -713,7 +713,7 @@ msgstr "Алиас не может совпадать с именем."
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Группа не найдена."
@@ -910,11 +910,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Имя"
 
@@ -1065,7 +1066,6 @@ 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
-#, fuzzy
 msgid "Cannot delete this notice."
 msgstr "Не удаётся удалить эту запись."
 
@@ -1200,21 +1200,18 @@ msgstr "Только пользователь может добавлять в 
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #: actions/apitimelineuser.php:304
-#, fuzzy
 msgid "Only accept AtomPub for Atom feeds."
-msgstr "Принимать только AtomPub для atom-каналов."
+msgstr "Принимать только AtomPub для каналов Atom."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
 #: actions/apitimelineuser.php:311
-#, fuzzy
 msgid "Atom post must not be empty."
-msgstr "POST-запрос Atom должен быть объектом Atom."
+msgstr "POST-запрос Atom не может быть пустым."
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
 #: actions/apitimelineuser.php:317
-#, fuzzy
 msgid "Atom post must be well-formed XML."
-msgstr "POST-запрос Atom должен быть объектом Atom."
+msgstr "POST-запрос Atom должен быть корректным документом XML."
 
 #. TRANS: Client error displayed when not using an Atom entry.
 #: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
@@ -1223,29 +1220,27 @@ msgstr "POST-запрос Atom должен быть объектом Atom."
 msgid "Atom post must be an Atom entry."
 msgstr "POST-запрос Atom должен быть объектом Atom."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
-#, fuzzy
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
-#, fuzzy, php-format
+#: actions/apitimelineuser.php:346
+#, php-format
 msgid "Cannot handle activity object type \"%s\"."
-msgstr "Невозможно обработать действия объекта типа «%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:381
-#, fuzzy, php-format
+#: actions/apitimelineuser.php:380
+#, php-format
 msgid "No content for notice %d."
-msgstr "Найти запись по содержимому"
+msgstr "Нет содержания для записи %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Запись с URI «%s» уже существует."
@@ -1271,46 +1266,40 @@ msgstr "Нет такого профиля."
 #. 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 "Не удаётся вставить новую подписку."
+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 "Возможна обработка только POST-запросов."
+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 "Возможна обработка только POST-запросов."
+msgstr "Возможно только добавление записей в число любимых."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
 #: actions/atompubfavoritefeed.php:259
-#, fuzzy
 msgid "Unknown note."
-msgstr "Неизвестно"
+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
+#, php-format
 msgid "%s group memberships"
 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 "Не удаётся вставить новую подписку."
+msgstr "Не удаётся добавить пользователя в группу."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
@@ -1414,24 +1403,31 @@ msgstr "Вы не подписаны на этот профиль."
 msgid "Cannot delete someone else's subscription."
 msgstr "Невозможно удалить подписку на самого себя."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
-msgstr ""
+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."
@@ -1535,36 +1531,36 @@ msgid "No file uploaded."
 msgstr "Файл не загружен."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr "Потеряна информация о файле."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Неудача при обновлении аватары."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
-msgstr ""
+msgstr "Резервное копирование учетной записи"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
 #: actions/backupaccount.php:79
@@ -1597,7 +1593,7 @@ msgstr "Фон"
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
 msgid "Backup your account"
-msgstr ""
+msgstr "Резервное копирование учетной записи"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 #: actions/block.php:68
@@ -1756,8 +1752,9 @@ msgid "Conversation"
 msgstr "Дискуссия"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Записи"
 
@@ -1776,13 +1773,13 @@ 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."
+msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1793,7 +1790,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 #, fuzzy
 msgid "Delete account"
 msgstr "Создать новый аккаунт"
@@ -2336,7 +2333,8 @@ msgstr "Заполните информацию о группе в следую
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Неверный алиас: «%s»"
@@ -2348,7 +2346,7 @@ msgstr "Не удаётся обновить информацию о групп
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "Не удаётся создать алиасы."
 
@@ -2864,17 +2862,17 @@ msgid "Crop"
 msgstr "Обрезать"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "Логотип обновлён."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "Неудача при обновлении логотипа."
 
@@ -2934,7 +2932,9 @@ msgstr "Сделать этого пользователя администра
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Обновления участников %1$s на %2$s!"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Группы"
@@ -3527,7 +3527,7 @@ msgstr "Некорректное имя или пароль."
 msgid "Error setting user. You are probably not authorized."
 msgstr "Ошибка установки пользователя. Вы, вероятно, не авторизованы."
 
-#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Вход"
 
@@ -3629,6 +3629,12 @@ msgstr "Вы не можете удалить эту группу."
 msgid "Use this form to create a new group."
 msgstr "Используйте эту форму для создания новой группы."
 
+#. TRANS: Group create form validation error.
+#: actions/newgroup.php:199
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "Алиас не может совпадать с именем."
+
 #: actions/newmessage.php:71 actions/newmessage.php:234
 msgid "New message"
 msgstr "Новое сообщение"
@@ -4310,9 +4316,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "Полное имя"
 
@@ -4352,10 +4359,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "Месторасположение"
 
@@ -4370,9 +4378,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "Теги"
 
@@ -4464,7 +4473,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Создать новый аккаунт"
@@ -4632,9 +4641,8 @@ msgstr ""
 "email-адрес вашей учётной записи."
 
 #: actions/recoverpassword.php:167
-#, fuzzy
 msgid "You have been identified. Enter a new password below."
-msgstr "Вы опознаны системой. Введите новый пароль ниже. "
+msgstr "Вы опознаны системой. Введите новый пароль ниже."
 
 #. TRANS: Fieldset legend for password recovery page.
 #: actions/recoverpassword.php:198
@@ -4775,7 +4783,7 @@ msgstr "Извините, неверный пригласительный код
 msgid "Registration successful"
 msgstr "Регистрация успешна!"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Регистрация"
 
@@ -4938,8 +4946,9 @@ msgstr "URL профиля"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "Подписаться"
 
@@ -5097,7 +5106,9 @@ msgid "File upload stopped by extension."
 msgstr "Загрузка файла остановлена по расширению."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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 "Системная ошибка при загрузке файла."
 
@@ -5214,8 +5225,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Статистика"
 
@@ -5350,14 +5362,16 @@ msgid "Group profile"
 msgstr "Профиль группы"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
+#. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Запись"
 
@@ -5401,8 +5415,11 @@ msgid "Members"
 msgstr "Участники"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(пока ничего нет)"
@@ -6020,7 +6037,7 @@ 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:116
+#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6030,7 +6047,7 @@ 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:120
+#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "У %s нет подписчиков. Хотите быть первым?"
@@ -6040,7 +6057,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6073,7 +6090,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6093,23 +6110,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s не просматривает ничьи записи."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "СМС"
 
@@ -6142,12 +6160,14 @@ msgstr "Нет аргумента ID."
 msgid "Tag %s"
 msgstr "Теги %s"
 
+#. TRANS: H2 for user profile information.
 #: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Профиль пользователя"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Фото"
 
@@ -6707,25 +6727,25 @@ msgid "Problem saving notice."
 msgstr "Проблемы с сохранением записи."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:914
+#: classes/Notice.php:923
 msgid "Bad type provided to saveKnownGroups."
 msgstr "Для saveKnownGroups указан неверный тип."
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1013
+#: classes/Notice.php:1022
 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6829,25 +6849,46 @@ msgid "Single-user mode code called when not enabled."
 msgstr "Вызов отключённого кода однопользовательского режима."
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 msgid "Could not create group."
 msgstr "Не удаётся создать группу."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:526
+#: classes/User_group.php:530
 msgid "Could not set group URI."
 msgstr "Не удаётся назначить URI группы."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:549
+#: classes/User_group.php:553
 msgid "Could not set group membership."
 msgstr "Не удаётся назначить членство в группе."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:564
+#: classes/User_group.php:568
 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6984,7 +7025,8 @@ msgid "Create an account"
 msgstr "Создать новый аккаунт"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Регистрация"
@@ -6996,7 +7038,8 @@ msgid "Login to the site"
 msgstr "Войти"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Вход"
@@ -7234,6 +7277,23 @@ msgstr ""
 msgid "No content for notice %s."
 msgstr "Найти запись по содержимому"
 
+#: lib/activitymover.php:84
+#, fuzzy, php-format
+msgid "No such user %s."
+msgstr "Нет такого пользователя."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7679,7 +7739,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Месторасположение: %s"
@@ -7687,7 +7747,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Домашняя страница: %s"
@@ -7969,24 +8029,24 @@ msgstr ""
 "tracking — пока не реализовано.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 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:158
+#: lib/common.php:164
 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "Перейти к установщику"
 
@@ -8074,6 +8134,12 @@ msgstr "Не удаётся обновить ваше оформление."
 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."
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "Мне не нравится эта запись"
@@ -8280,35 +8346,41 @@ msgstr "Теги записей группы %s"
 msgid "This page is not available in a media type you accept"
 msgstr "Страница недоступна для того типа, который Вы задействовали."
 
-#: lib/imagefile.php:72
+#. 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:90
+#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Этот файл слишком большой. Максимальный размер файла составляет %s."
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Частичная загрузка."
 
-#: lib/imagefile.php:111
+#. 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 "Не является изображением или повреждённый файл."
 
-#: lib/imagefile.php:160
+#. 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 "Потерян файл."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8317,7 +8389,7 @@ msgstr[1] "%dМБ"
 msgstr[2] "%dМБ"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8326,7 +8398,7 @@ msgstr[1] "%dКБ"
 msgstr[2] "%dКБ"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8348,23 +8420,25 @@ msgstr "Неизвестный источник входящих сообщен
 msgid "Leave"
 msgstr "Покинуть"
 
-#: lib/logingroupnav.php:80
+#. TRANS: Title for menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Войти с вашим ником и паролем."
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8396,14 +8470,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8418,7 +8492,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:263
+#: lib/mail.php:255
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8445,14 +8519,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Новый электронный адрес для постинга %s"
@@ -8460,7 +8534,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:321
+#: lib/mail.php:313
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8483,34 +8557,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "%s статус"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, 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:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8539,7 +8613,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "Новое приватное сообщение от %s"
@@ -8548,7 +8622,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8583,7 +8657,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:607
+#: lib/mail.php:599
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) добавил вашу запись в число своих любимых"
@@ -8593,7 +8667,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8631,7 +8705,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8644,7 +8718,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:680
+#: lib/mail.php:672
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) отправил запись для вашего внимания"
@@ -8655,7 +8729,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8989,36 +9063,46 @@ msgstr "Теги записей пользователя %s"
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Подписки"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Все подписки."
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Подписчики"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Все подписчики"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "ID пользователя"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Регистрация"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. TRANS: Label for user statistics.
+#. TRANS: Average count of posts made per day since account registration.
+#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "Среднесуточная"
 
-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Все группы"
 
@@ -9276,48 +9360,60 @@ msgstr "Отписаться"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "У пользователя %1$s (%2$d) нет записи профиля."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "Изменить аватару"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "Действия пользователя"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr "Идёт удаление пользователя…"
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "Изменение настроек профиля"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "Редактировать"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "Послать приватное сообщение этому пользователю."
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "Сообщение"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr "Модерировать"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "Роль пользователя"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "Администратор"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "Модератор"
@@ -9419,12 +9515,12 @@ msgstr[2] ""
 "Сообщение слишком длинное — не больше %1$d символов, вы отправили %2$d."
 
 #. TRANS: Exception.
-#: lib/xrd.php:64
+#: lib/xrd.php:63
 msgid "Invalid XML."
 msgstr "Неверный XML."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr "Неверный XML, отсутствует корень XRD."
 
@@ -9433,30 +9529,3 @@ msgstr "Неверный XML, отсутствует корень XRD."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Получение резервной копии из файла «%s»."
-
-#~ msgid "No such group"
-#~ msgstr "Нет такой группы."
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "HTTP-метод не поддерживается."
-
-#~ msgid "Reset"
-#~ msgstr "Сбросить"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr ""
-#~ "1-64 латинских строчных букв или цифр, без пробелов. Обязательное поле."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6 или более символов. Обязательное поле."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "Тот же пароль что и сверху. Обязательное поле."
-
-#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-#~ msgstr "1-64 латинских строчных буквы или цифры, без пробелов"
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "%s не допустимым подходящим цветом!"
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 920ce732cc..9c5e44cf46 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-01-22 14:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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"
@@ -86,7 +86,7 @@ msgstr ""
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -124,6 +124,7 @@ msgstr ""
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -324,14 +325,15 @@ msgstr ""
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr ""
 
@@ -655,18 +657,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -677,7 +677,7 @@ msgstr ""
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr ""
@@ -867,11 +867,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr ""
 
@@ -1170,28 +1171,27 @@ msgstr ""
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: actions/apitimelineuser.php:380
 #, php-format
 msgid "No content for notice %d."
 msgstr ""
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
@@ -1346,23 +1346,30 @@ msgstr ""
 msgid "Cannot delete someone else's subscription."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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 ""
+
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
 msgid "No such attachment."
@@ -1465,34 +1472,34 @@ msgid "No file uploaded."
 msgstr ""
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr ""
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr ""
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr ""
 
@@ -1681,8 +1688,9 @@ msgid "Conversation"
 msgstr ""
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr ""
 
@@ -1705,7 +1713,7 @@ msgstr ""
 #. 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."
+msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1715,7 +1723,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 msgid "Delete account"
 msgstr ""
 
@@ -2240,7 +2248,8 @@ msgstr ""
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr ""
@@ -2252,7 +2261,7 @@ msgstr ""
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr ""
 
@@ -2737,17 +2746,17 @@ msgid "Crop"
 msgstr ""
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr ""
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr ""
 
@@ -2807,7 +2816,9 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr ""
@@ -3334,7 +3345,7 @@ msgstr ""
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
-#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr ""
 
@@ -3430,6 +3441,11 @@ msgstr ""
 msgid "Use this form to create a new group."
 msgstr ""
 
+#. TRANS: Group create form validation error.
+#: actions/newgroup.php:199
+msgid "Alias cannot be the same as nickname."
+msgstr ""
+
 #: actions/newmessage.php:71 actions/newmessage.php:234
 msgid "New message"
 msgstr ""
@@ -4093,9 +4109,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr ""
 
@@ -4134,10 +4151,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr ""
 
@@ -4152,9 +4170,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr ""
 
@@ -4241,7 +4260,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr ""
 
@@ -4530,7 +4549,7 @@ msgstr ""
 msgid "Registration successful"
 msgstr ""
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr ""
 
@@ -4664,8 +4683,9 @@ msgstr ""
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr ""
 
@@ -4810,7 +4830,9 @@ msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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 ""
 
@@ -4924,8 +4946,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr ""
 
@@ -5050,14 +5073,16 @@ msgid "Group profile"
 msgstr ""
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
+#. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr ""
 
@@ -5101,8 +5126,11 @@ msgid "Members"
 msgstr ""
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr ""
@@ -5681,7 +5709,7 @@ 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:116
+#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -5689,7 +5717,7 @@ 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:120
+#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -5699,7 +5727,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -5730,7 +5758,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -5744,23 +5772,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr ""
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr ""
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr ""
 
@@ -5793,12 +5822,14 @@ msgstr ""
 msgid "Tag %s"
 msgstr ""
 
+#. TRANS: H2 for user profile information.
 #: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr ""
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr ""
 
@@ -6315,25 +6346,25 @@ msgid "Problem saving notice."
 msgstr ""
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:914
+#: classes/Notice.php:923
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1013
+#: classes/Notice.php:1022
 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -6434,25 +6465,46 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 msgid "Could not create group."
 msgstr ""
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:526
+#: classes/User_group.php:530
 msgid "Could not set group URI."
 msgstr ""
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:549
+#: classes/User_group.php:553
 msgid "Could not set group membership."
 msgstr ""
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:564
+#: classes/User_group.php:568
 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6589,7 +6641,8 @@ msgid "Create an account"
 msgstr ""
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr ""
@@ -6601,7 +6654,8 @@ msgid "Login to the site"
 msgstr ""
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr ""
@@ -6827,6 +6881,23 @@ msgstr ""
 msgid "No content for notice %s."
 msgstr ""
 
+#: lib/activitymover.php:84
+#, php-format
+msgid "No such user %s."
+msgstr ""
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7262,7 +7333,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr ""
@@ -7270,7 +7341,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
@@ -7500,24 +7571,24 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 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:158
+#: lib/common.php:164
 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr ""
 
@@ -7603,6 +7674,12 @@ msgstr ""
 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 ""
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr ""
@@ -7798,35 +7875,41 @@ msgstr ""
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
-#: lib/imagefile.php:72
+#. 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:90
+#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr ""
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr ""
 
-#: lib/imagefile.php:111
+#. 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 ""
 
-#: lib/imagefile.php:160
+#. 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 ""
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -7834,7 +7917,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -7842,7 +7925,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -7863,23 +7946,25 @@ msgstr ""
 msgid "Leave"
 msgstr ""
 
-#: lib/logingroupnav.php:80
+#. TRANS: Title for menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr ""
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -7898,14 +7983,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -7917,7 +8002,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:263
+#: lib/mail.php:255
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -7934,14 +8019,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr ""
@@ -7949,7 +8034,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:321
+#: lib/mail.php:313
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -7964,34 +8049,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr ""
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, 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:493
+#: lib/mail.php:485
 #, php-format
-msgid "You've been nudged by %s"
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8009,7 +8094,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr ""
@@ -8018,7 +8103,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8039,7 +8124,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:607
+#: lib/mail.php:599
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr ""
@@ -8049,7 +8134,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8071,7 +8156,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8081,7 +8166,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:680
+#: lib/mail.php:672
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
@@ -8092,7 +8177,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8393,36 +8478,46 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr ""
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr ""
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr ""
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr ""
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr ""
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr ""
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. TRANS: Label for user statistics.
+#. TRANS: Average count of posts made per day since account registration.
+#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr ""
 
-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305
 msgid "All groups"
 msgstr ""
 
@@ -8671,48 +8766,60 @@ msgstr ""
 msgid "User %1$s (%2$d) has no profile record."
 msgstr ""
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr ""
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr ""
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr ""
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr ""
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr ""
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr ""
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr ""
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr ""
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr ""
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr ""
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr ""
@@ -8802,12 +8909,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Exception.
-#: lib/xrd.php:64
+#: lib/xrd.php:63
 msgid "Invalid XML."
 msgstr ""
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index dd2445baee..2d00860b61 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Swedish (Svenska)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Jamminjohn
 # Author: Kjell
@@ -12,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:57:58+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:01+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 (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -94,7 +94,7 @@ msgstr "Spara inställningar för åtkomst"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -132,6 +132,7 @@ msgstr "Ingen sådan sida"
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -338,14 +339,15 @@ msgstr "Kunde inte uppdatera användare."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Användaren har ingen profil."
 
@@ -676,18 +678,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Alias kan inte vara samma som smeknamn."
 
@@ -698,7 +698,7 @@ msgstr "Alias kan inte vara samma som smeknamn."
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Grupp hittades inte."
@@ -896,11 +896,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Smeknamn"
 
@@ -1206,28 +1207,27 @@ msgstr ""
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: 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.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Notis med den ID:n finns inte."
@@ -1396,23 +1396,30 @@ msgstr "Du är inte prenumerat hos den profilen."
 msgid "Cannot delete someone else's subscription."
 msgstr "Kunde inte spara prenumeration."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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."
@@ -1516,34 +1523,34 @@ msgid "No file uploaded."
 msgstr "Ingen fil laddades upp."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: actions/avatarsettings.php:345
 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr "Förlorade vår fildata."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Misslyckades uppdatera avatar."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr ""
 
@@ -1738,8 +1745,9 @@ msgid "Conversation"
 msgstr "Konversationer"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Notiser"
 
@@ -1764,7 +1772,7 @@ msgstr ""
 #. 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."
+msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1775,7 +1783,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 #, fuzzy
 msgid "Delete account"
 msgstr "Skapa ett konto"
@@ -2318,7 +2326,8 @@ msgstr "Använd detta formulär för att redigera gruppen."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Ogiltigt alias: \"%s\""
@@ -2330,7 +2339,7 @@ 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:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "Kunde inte skapa alias."
 
@@ -2836,17 +2845,17 @@ msgid "Crop"
 msgstr "Beskär"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "Logtyp uppdaterad."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "Misslyckades uppdatera logtyp."
 
@@ -2906,7 +2915,9 @@ msgstr "Gör denna användare till administratör"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Uppdateringar från medlemmar i %1$s på %2$s!"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Grupper"
@@ -3494,7 +3505,7 @@ msgstr "Felaktigt användarnamn eller lösenord."
 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 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Logga in"
 
@@ -3595,6 +3606,12 @@ msgstr "Du får inte ta bort denna grupp."
 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:199
+#, 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
 msgid "New message"
 msgstr "Nytt meddelande"
@@ -4286,9 +4303,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "Fullständigt namn"
 
@@ -4328,10 +4346,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "Plats"
 
@@ -4346,9 +4365,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "Taggar"
 
@@ -4442,7 +4462,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Skapa ett konto"
@@ -4611,9 +4631,8 @@ msgstr ""
 "den e-postadress du har sparat i ditt konto."
 
 #: actions/recoverpassword.php:167
-#, fuzzy
 msgid "You have been identified. Enter a new password below."
-msgstr "Du har blivit identifierad. Ange ett nytt lösenord nedan. "
+msgstr "Du har blivit identifierad. Ange ett nytt lösenord nedan."
 
 #. TRANS: Fieldset legend for password recovery page.
 #: actions/recoverpassword.php:198
@@ -4756,7 +4775,7 @@ msgstr "Tyvärr, ogiltig inbjudningskod."
 msgid "Registration successful"
 msgstr "Registreringen genomförd"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Registrera"
 
@@ -4918,8 +4937,9 @@ msgstr "Profil-URL"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "Prenumerera"
 
@@ -5079,7 +5099,9 @@ 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.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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."
 
@@ -5195,8 +5217,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistik"
 
@@ -5331,14 +5354,16 @@ 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:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Notis"
 
@@ -5382,8 +5407,11 @@ msgid "Members"
 msgstr "Medlemmar"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Ingen)"
@@ -5994,7 +6022,7 @@ 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:116
+#: actions/subscribers.php:114
 #, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
@@ -6005,7 +6033,7 @@ 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:120
+#: 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?"
@@ -6015,7 +6043,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6048,7 +6076,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6068,23 +6096,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s lyssnar inte på någon."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "SMS"
 
@@ -6117,12 +6146,14 @@ msgstr "Inget ID-argument."
 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"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
 
@@ -6683,26 +6714,26 @@ 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:914
+#: classes/Notice.php:923
 #, 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:1013
+#: classes/Notice.php:1022
 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6803,25 +6834,46 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 msgid "Could not create group."
 msgstr "Kunde inte skapa grupp."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:526
+#: classes/User_group.php:530
 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:549
+#: classes/User_group.php:553
 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:564
+#: classes/User_group.php:568
 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6958,7 +7010,8 @@ msgid "Create an account"
 msgstr "Skapa ett konto"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrera"
@@ -6970,7 +7023,8 @@ msgid "Login to the site"
 msgstr "Logga in på webbplatsen"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Logga in"
@@ -7205,6 +7259,23 @@ msgstr ""
 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."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7650,7 +7721,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Plats: %s"
@@ -7658,7 +7729,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Hemsida: %s"
@@ -7929,26 +8000,26 @@ msgstr ""
 "tracking - inte implementerat än.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 #, 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:158
+#: lib/common.php:164
 #, 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "Gå till installeraren."
 
@@ -8036,6 +8107,12 @@ msgstr "Kunde inte uppdatera dina utseendeinställningar."
 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."
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "Avmarkera denna notis som favorit"
@@ -8236,35 +8313,41 @@ msgstr "Taggar i %s grupps notiser"
 msgid "This page is not available in a media type you accept"
 msgstr "Denna sida är inte tillgänglig i den mediatyp du accepterat"
 
-#: lib/imagefile.php:72
+#. 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:90
+#: 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."
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Bitvis uppladdad."
 
-#: lib/imagefile.php:111
+#. 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."
 
-#: lib/imagefile.php:160
+#. 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."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8272,7 +8355,7 @@ msgstr[0] "%dMB"
 msgstr[1] "%dMB"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8280,7 +8363,7 @@ msgstr[0] "%dkB"
 msgstr[1] "%dkB"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8301,23 +8384,25 @@ msgstr "Okänd källa för inkorg %d."
 msgid "Leave"
 msgstr "Lämna"
 
-#: lib/logingroupnav.php:80
+#. 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"
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8348,14 +8433,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8370,7 +8455,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:263
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8397,14 +8482,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Ny e-postadress för att skicka till %s"
@@ -8412,7 +8497,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:321
+#: lib/mail.php:313
 #, fuzzy, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8435,34 +8520,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "%s status"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, 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:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8491,7 +8576,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "Nytt privat meddelande från %s"
@@ -8500,7 +8585,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8535,7 +8620,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:607
+#: lib/mail.php:599
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%s (@%s) lade till din notis som en favorit"
@@ -8545,7 +8630,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8583,7 +8668,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8596,7 +8681,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:680
+#: lib/mail.php:672
 #, 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"
@@ -8607,7 +8692,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8941,36 +9026,46 @@ msgstr "Taggar i %ss notiser"
 msgid "Unknown"
 msgstr "Okänd"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Prenumerationer"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Alla prenumerationer"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Prenumeranter"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Alla prenumeranter"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "Användar-ID"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Medlem sedan"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. 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"
 
-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Alla grupper"
 
@@ -9225,48 +9320,60 @@ msgstr "Avsluta pren."
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Användaren har ingen profil."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "Redigera avatar"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "Åtgärder för användare"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr "Borttagning av användare pågår..."
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "Redigera profilinställningar"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "Redigera"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "Skicka ett direktmeddelande till denna användare"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "Meddelande"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr "Moderera"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "Användarroll"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "Administratör"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
@@ -9356,13 +9463,13 @@ 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:64
+#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Ogiltig storlek."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
@@ -9371,31 +9478,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "No such group"
-#~ msgstr "Ingen sådan grupp"
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "API-metod hittades inte."
-
-#~ msgid "Reset"
-#~ msgstr "Återställ"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr ""
-#~ "1-64 små bokstäver eller nummer, inga punkter eller mellanslag. Måste "
-#~ "fyllas i."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "Minst 6 tecken. Måste fyllas i."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "Samma som lösenordet ovan. Måste fyllas i."
-
-#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-#~ msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "%s är inte en giltig färg!"
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 3cdea242a4..b57903e480 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Telugu (తెలుగు)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Brion
 # Author: Veeven
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:58:01+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:05+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 (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -91,7 +91,7 @@ msgstr "అందుబాటు అమరికలను భద్రపరచ
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -129,6 +129,7 @@ msgstr "అటువంటి పేజీ లేదు."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -322,7 +323,6 @@ msgstr ""
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
-#, fuzzy
 msgid "Could not update user."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
@@ -332,14 +332,15 @@ msgstr "వాడుకరిని తాజాకరించలేకున
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "వాడుకరికి ప్రొఫైలు లేదు."
 
@@ -425,15 +426,15 @@ msgstr "%s చందాలు"
 #. 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
@@ -670,18 +671,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "మారుపేరు పేరుతో సమానంగా ఉండకూడదు."
 
@@ -692,7 +691,7 @@ msgstr "మారుపేరు పేరుతో సమానంగా ఉం
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "గుంపు దొరకలేదు."
@@ -886,11 +885,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "పేరు"
 
@@ -1040,7 +1040,6 @@ 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 "ఈ నోటీసుని తొలగించలేము."
 
@@ -1137,9 +1136,8 @@ msgstr "అందరి నుండి %s తాజాకరణలు!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
 #: actions/apitimelineretweetedbyme.php:71
-#, fuzzy
 msgid "Unimplemented."
-msgstr "క్షమించండి, ఈ ఆదేశం ఇంకా అమలుపరచబడలేదు."
+msgstr "అమలుపరచబడలేదు."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
 #: actions/apitimelineretweetedtome.php:108
@@ -1196,28 +1194,27 @@ msgstr ""
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: actions/apitimelineuser.php:380
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "మీ నోటీసుని మీరే పునరావృతించలేరు."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "ఆ ఈమెయిలు చిరునామా లేదా వాడుకరిపేరుతో వాడుకరులెవరూ లేరు."
@@ -1356,9 +1353,8 @@ 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 "అందరు సభ్యులూ"
+msgstr "సభ్యులు కాదు."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
@@ -1388,23 +1384,30 @@ msgstr "మీరు ఎవరికీ చందాచేరలేదు."
 msgid "Cannot delete someone else's subscription."
 msgstr "కొత్త చందాని చేర్చలేకపోయాం."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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."
@@ -1508,34 +1511,34 @@ msgid "No file uploaded."
 msgstr "ఏ దస్త్రమూ ఎక్కింపబడలేదు."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr ""
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "అవతారపు తాజాకరణ విఫలమైంది."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr ""
 
@@ -1730,8 +1733,9 @@ msgid "Conversation"
 msgstr "సంభాషణ"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "సందేశాలు"
 
@@ -1756,7 +1760,7 @@ msgstr ""
 #. 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."
+msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1767,7 +1771,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 #, fuzzy
 msgid "Delete account"
 msgstr "ఖాతాని సృష్టించుకోండి"
@@ -2314,7 +2318,8 @@ msgstr "గుంపుని మార్చడానికి ఈ ఫారా
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "తప్పుడు మారుపేరు: \"%s\""
@@ -2326,7 +2331,7 @@ msgstr "గుంపుని తాజాకరించలేకున్న
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "మారుపేర్లని సృష్టించలేకపోయాం."
 
@@ -2834,17 +2839,17 @@ msgid "Crop"
 msgstr "కత్తిరించు"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "చిహ్నాన్ని తాజాకరించాం."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "చిహ్నపు తాజాకరణ విఫలమైంది."
 
@@ -2904,7 +2909,9 @@ msgstr ""
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "%2$sలో %1$s మరియు స్నేహితుల నుండి తాజాకరణలు!"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "గుంపులు"
@@ -3473,7 +3480,7 @@ msgstr "వాడుకరిపేరు లేదా సంకేతపదం
 msgid "Error setting user. You are probably not authorized."
 msgstr "వాడుకరిని అమర్చడంలో పొరపాటు. బహుశా మీకు అధీకరణ లేకపోవచ్చు."
 
-#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "ప్రవేశించండి"
 
@@ -3572,6 +3579,12 @@ msgstr "ఈ గుంపును తొలగించడానికి మీ
 msgid "Use this form to create a new group."
 msgstr "కొత్త గుంపుని సృష్టిండానికి ఈ ఫారాన్ని ఉపయోగించండి."
 
+#. TRANS: Group create form validation error.
+#: actions/newgroup.php:199
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "మారుపేరు పేరుతో సమానంగా ఉండకూడదు."
+
 #: actions/newmessage.php:71 actions/newmessage.php:234
 msgid "New message"
 msgstr "కొత్త సందేశం"
@@ -4268,9 +4281,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "పూర్తి పేరు"
 
@@ -4310,10 +4324,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "ప్రాంతం"
 
@@ -4328,9 +4343,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "ట్యాగులు"
 
@@ -4420,7 +4436,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "ఖాతాని సృష్టించుకోండి"
@@ -4586,9 +4602,8 @@ msgstr ""
 "మీరు మీ సంకేతపదాన్ని మర్చిపోతే, మీ ఖాతాలో నమోదైన ఈమెయిలు చిరునామాకి కొత్త సంకేతపదం వచ్చేలా చేసుకోవచ్చు."
 
 #: actions/recoverpassword.php:167
-#, fuzzy
 msgid "You have been identified. Enter a new password below."
-msgstr "మిమ్మల్ని గుర్తించాం. మీ కొత్త సంకేతపదాన్ని క్రింత ఇవ్వండి. "
+msgstr "మిమ్మల్ని గుర్తించాం. మీ కొత్త సంకేతపదాన్ని క్రింత ఇవ్వండి."
 
 #. TRANS: Fieldset legend for password recovery page.
 #: actions/recoverpassword.php:198
@@ -4733,7 +4748,7 @@ msgstr "క్షమించండి, తప్పు ఆహ్వాన స
 msgid "Registration successful"
 msgstr "నమోదు విజయవంతం"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "నమోదు"
 
@@ -4887,8 +4902,9 @@ msgstr "ప్రొఫైలు URL"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "చందాచేరు"
 
@@ -5043,7 +5059,9 @@ msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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 ""
 
@@ -5162,8 +5180,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "గణాంకాలు"
 
@@ -5293,14 +5312,16 @@ msgid "Group profile"
 msgstr "గుంపు ప్రొఫైలు"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
+#. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "గమనిక"
 
@@ -5344,8 +5365,11 @@ msgid "Members"
 msgstr "సభ్యులు"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(ఏమీలేదు)"
@@ -5964,7 +5988,7 @@ 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:116
+#: actions/subscribers.php:114
 #, fuzzy
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
@@ -5974,7 +5998,7 @@ 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:120
+#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%sకి చందాదార్లు ఎవరూ లేరు. మీరే మొదటివారు కావాలనుకుంటున్నారా?"
@@ -5984,7 +6008,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6017,7 +6041,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6031,23 +6055,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s ప్రస్తుతం ఎవరినీ వినడంలేదు."
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "జాబర్"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr ""
 
@@ -6080,12 +6105,14 @@ msgstr "జోడింపులు లేవు."
 msgid "Tag %s"
 msgstr "ట్యాగులు"
 
+#. TRANS: H2 for user profile information.
 #: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "వాడుకరి ప్రొఫైలు"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "ఫొటో"
 
@@ -6613,26 +6640,26 @@ msgid "Problem saving notice."
 msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:914
+#: classes/Notice.php:923
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1013
+#: classes/Notice.php:1022
 #, 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6735,25 +6762,46 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 msgid "Could not create group."
 msgstr "గుంపుని సృష్టించలేకపోయాం."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:526
+#: classes/User_group.php:530
 msgid "Could not set group URI."
 msgstr "గుంపుని సృష్టించలేకపోయాం."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:549
+#: classes/User_group.php:553
 msgid "Could not set group membership."
 msgstr "గుంపు సభ్యత్వాన్ని అమర్చలేకపోయాం."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:564
+#: classes/User_group.php:568
 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 #, fuzzy
@@ -6892,7 +6940,8 @@ msgid "Create an account"
 msgstr "ఖాతాని సృష్టించుకోండి"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "నమోదు"
@@ -6904,7 +6953,8 @@ msgid "Login to the site"
 msgstr "సైటు లోనికి ప్రవేశించండి"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "ప్రవేశించు"
@@ -7138,6 +7188,23 @@ msgstr ""
 msgid "No content for notice %s."
 msgstr "మీ నోటీసుని మీరే పునరావృతించలేరు."
 
+#: lib/activitymover.php:84
+#, fuzzy, php-format
+msgid "No such user %s."
+msgstr "అటువంటి వాడుకరి లేరు."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7593,7 +7660,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "ప్రాంతం: %s"
@@ -7601,7 +7668,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "హోంపేజీ: %s"
@@ -7836,26 +7903,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 #, 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:158
+#: lib/common.php:164
 #, 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 #, fuzzy
 msgid "Go to the installer."
 msgstr "సైటు లోనికి ప్రవేశించండి"
@@ -7944,6 +8011,12 @@ msgstr "మీ రూపురేఖలని తాజాకరించలే
 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 "మీ ఉపకరణాన్ని మార్చడానికి ఈ ఫారాన్ని ఉపయోగించండి."
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 #, fuzzy
 msgid "Disfavor this notice"
@@ -8144,35 +8217,41 @@ msgstr "%s గుంపు లక్షణాలను మార్చు"
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
-#: lib/imagefile.php:72
+#. 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:90
-#, fuzzy, php-format
+#: lib/imagefile.php:91
+#, php-format
 msgid "That file is too big. The maximum file size is %s."
-msgstr "ఇది చాలా పొడవుంది. గరిష్ఠ సందేశ పరిమాణం 140 అక్షరాలు."
+msgstr "ఆ దస్త్రం చాలా పెద్దగా ఉంది. గరిష్ఠ దస్త్రపు పరిమాణం %s అక్షరాలు."
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "పాక్షిక ఎగుమతి."
 
-#: lib/imagefile.php:111
+#. 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 "బొమ్మ కాదు లేదా పాడైపోయిన ఫైలు."
 
-#: lib/imagefile.php:160
+#. 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 "అటువంటి ఫైలు లేదు."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8180,7 +8259,7 @@ msgstr[0] "%dమెబై"
 msgstr[1] "%dమెబై"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8188,7 +8267,7 @@ msgstr[0] "%dకిబై"
 msgstr[1] "%dకిబై"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8209,23 +8288,25 @@ msgstr "గుర్తు తెలియని భాష \"%s\"."
 msgid "Leave"
 msgstr "వైదొలగు"
 
-#: lib/logingroupnav.php:80
+#. TRANS: Title for menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "వాడుకరిపేరు మరియు సంకేతపదాలతో ప్రవేశించండి"
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, fuzzy, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8256,14 +8337,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8275,7 +8356,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:263
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8302,14 +8383,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "%sకి నోటీసులు పంపించడానికి కొత్త ఈమెయిలు చిరునామా"
@@ -8317,7 +8398,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:321
+#: lib/mail.php:313
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8332,34 +8413,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "%s స్థితి"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, 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:493
-#, php-format
-msgid "You've been nudged by %s"
-msgstr ""
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
+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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8388,7 +8469,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "%s నుండి కొత్త అంతరంగిక సందేశం"
@@ -8397,7 +8478,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8432,7 +8513,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:607
+#: lib/mail.php:599
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) మీ నోటీసుని ఇష్టపడ్డారు"
@@ -8442,7 +8523,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8480,7 +8561,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8493,7 +8574,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:680
+#: lib/mail.php:672
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) మీ దృష్టికి ఒక నోటిసుని పంపించారు"
@@ -8504,7 +8585,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8839,36 +8920,46 @@ msgstr ""
 msgid "Unknown"
 msgstr "తెలియని చర్య"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "చందాలు"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "అన్ని చందాలు"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "చందాదార్లు"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "అందరు చందాదార్లు"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "వాడుకరి ID"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "సభ్యులైన తేదీ"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. TRANS: Label for user statistics.
+#. TRANS: Average count of posts made per day since account registration.
+#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "రోజువారీ సగటు"
 
-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "అన్ని గుంపులు"
 
@@ -9121,49 +9212,61 @@ msgstr "చందామాను"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "వాడుకరికి ప్రొఫైలు లేదు."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "అవతారాన్ని మార్చు"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "వాడుకరి చర్యలు"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr "వాడుకరి తొలగింపు కొనసాగుతూంది..."
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "ఫ్రొఫైలు అమరికలని మార్చు"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "మార్చు"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "ఈ వాడుకరికి ఒక నేరు సందేశాన్ని పంపించండి"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "సందేశం"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 #, fuzzy
 msgid "Moderate"
 msgstr "సమన్వయకర్త"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "వాడుకరి పాత్ర"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "నిర్వాహకులు"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "సమన్వయకర్త"
@@ -9253,13 +9356,13 @@ msgstr[0] "నోటిసు చాలా పొడవుగా ఉంది -
 msgstr[1] "నోటిసు చాలా పొడవుగా ఉంది - %1$d అక్షరాలు గరిష్ఠం, మీరు %2$d పంపించారు."
 
 #. TRANS: Exception.
-#: lib/xrd.php:64
+#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "తప్పుడు పరిమాణం."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
@@ -9268,29 +9371,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "No such group"
-#~ msgstr "అటువంటి గుంపు లేదు"
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
-
-#~ msgid "Reset"
-#~ msgstr "రీసెట్"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామ చిహ్నాలు లేదా ఖాళీలు లేకుండా. తప్పనిసరి."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు. తప్పనిసరి."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "పై సంకేతపదం మరోసారి. తప్పనిసరి."
-
-#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-#~ msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామచిహ్నాలు మరియు ఖాళీలు తప్ప"
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "%s అనేది సరైన రంగు కాదు!"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 640b8a412e..94c17886f6 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - Core to Turkish (Türkçe)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
+# Author: Emperyan
 # Author: Joseph
 # Author: Maidis
 # Author: McDutchie
@@ -11,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:58:09+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:07+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 (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -93,7 +94,7 @@ msgstr "Erişim ayarlarını kaydet"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -131,6 +132,7 @@ msgstr "Böyle bir sayfa yok."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -342,14 +344,15 @@ msgstr "Kullanıcı güncellenemedi."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Kullanıcının profili yok."
 
@@ -403,7 +406,6 @@ msgstr "Tasarımınız güncellenemedi."
 
 #. TRANS: Title for Atom feed.
 #: actions/apiatomservice.php:85
-#, fuzzy
 msgctxt "ATOM"
 msgid "Main"
 msgstr "Ana"
@@ -674,18 +676,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Diğerisim, kullanıcı adı ile aynı olamaz."
 
@@ -696,7 +696,7 @@ msgstr "Diğerisim, kullanıcı adı ile aynı olamaz."
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Onay kodu bulunamadı."
@@ -894,11 +894,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Takma ad"
 
@@ -1202,28 +1203,27 @@ msgstr ""
 msgid "Atom post must be an Atom entry."
 msgstr ""
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: 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.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr ""
@@ -1394,23 +1394,30 @@ msgstr "Bize o profili yollamadınız"
 msgid "Cannot delete someone else's subscription."
 msgstr "Yeni abonelik eklenemedi."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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."
@@ -1516,34 +1523,34 @@ msgid "No file uploaded."
 msgstr "Hiçbir dosya yüklenmedi."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: actions/avatarsettings.php:345
 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr ""
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Avatar güncellemede hata."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr ""
 
@@ -1739,8 +1746,9 @@ msgid "Conversation"
 msgstr "Konuşma"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Durum mesajları"
 
@@ -1764,7 +1772,7 @@ msgstr ""
 #. 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."
+msgid "You must write \"%s\" exactly in the box."
 msgstr ""
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1775,7 +1783,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 #, fuzzy
 msgid "Delete account"
 msgstr "Bir hesap oluştur"
@@ -2327,7 +2335,8 @@ msgstr "Grubu düzenlemek için bu biçimi kullan."
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, fuzzy, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "%s Geçersiz başlangıç sayfası"
@@ -2339,7 +2348,7 @@ 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:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "Kullanıcı güncellenemedi."
 
@@ -2850,18 +2859,18 @@ msgid "Crop"
 msgstr "Kırp"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 #, fuzzy
 msgid "Logo updated."
 msgstr "Avatar güncellendi."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 #, fuzzy
 msgid "Failed updating logo."
 msgstr "Avatar güncellemede hata."
@@ -2922,7 +2931,9 @@ msgstr "Bu kullanıcıyı yönetici yap"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "%s adli kullanicinin durum mesajlari"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Gruplar"
@@ -3468,7 +3479,7 @@ msgstr "Yanlış kullanıcı adı veya parola."
 msgid "Error setting user. You are probably not authorized."
 msgstr "Yetkilendirilmemiş."
 
-#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Giriş"
 
@@ -3573,6 +3584,12 @@ msgstr "Bu grubun bir üyesi değilsiniz."
 msgid "Use this form to create a new group."
 msgstr ""
 
+#. TRANS: Group create form validation error.
+#: actions/newgroup.php:199
+#, 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
 msgid "New message"
 msgstr "Yeni mesaj"
@@ -4268,9 +4285,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "Tam İsim"
 
@@ -4311,10 +4329,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "Yer"
 
@@ -4329,9 +4348,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "Etiketler"
 
@@ -4422,7 +4442,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 #, fuzzy
 msgid "Restore account"
 msgstr "Bir hesap oluştur"
@@ -4733,7 +4753,7 @@ msgstr "Onay kodu hatası."
 msgid "Registration successful"
 msgstr "Kayıt başarılı"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Kayıt"
 
@@ -4873,8 +4893,9 @@ msgstr "Profil Adresi"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "Abone ol"
 
@@ -5027,7 +5048,9 @@ msgid "File upload stopped by extension."
 msgstr ""
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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ı."
 
@@ -5149,8 +5172,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "İstatistikler"
 
@@ -5276,14 +5300,16 @@ 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:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Not"
 
@@ -5327,8 +5353,11 @@ msgid "Members"
 msgstr "Üyeler"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Yok)"
@@ -5939,7 +5968,7 @@ 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:116
+#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -5947,7 +5976,7 @@ 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:120
+#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
@@ -5957,7 +5986,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -5988,7 +6017,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6002,23 +6031,24 @@ 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:143 actions/subscriptions.php:149
+#: 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"
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr ""
 
@@ -6052,13 +6082,15 @@ msgstr "Böyle bir belge yok."
 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."
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Fotoğraf"
 
@@ -6594,26 +6626,26 @@ 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:914
+#: classes/Notice.php:923
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1013
+#: classes/Notice.php:1022
 #, 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -6716,25 +6748,46 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 msgid "Could not create group."
 msgstr "Kullanıcı güncellenemedi."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:526
+#: classes/User_group.php:530
 msgid "Could not set group URI."
 msgstr "Profil kaydedilemedi."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:549
+#: classes/User_group.php:553
 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:564
+#: classes/User_group.php:568
 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6874,7 +6927,8 @@ msgid "Create an account"
 msgstr "Bir hesap oluştur"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Kayıt"
@@ -6886,7 +6940,8 @@ msgid "Login to the site"
 msgstr "Siteye giriş"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Giriş"
@@ -7123,6 +7178,23 @@ msgstr ""
 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."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7573,7 +7645,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Yer: %s"
@@ -7581,7 +7653,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, fuzzy, php-format
 msgid "Homepage: %s"
 msgstr "Başlangıç Sayfası"
@@ -7814,25 +7886,25 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 #, 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:158
+#: lib/common.php:164
 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr ""
 
@@ -7925,6 +7997,12 @@ msgstr "Kullanıcı güncellenemedi."
 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."
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr ""
@@ -8124,51 +8202,57 @@ msgstr ""
 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"
 
-#: lib/imagefile.php:72
+#. 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:90
+#: 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?"
 
-#: lib/imagefile.php:95
+#. 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."
 
-#: lib/imagefile.php:111
+#. 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"
 
-#: lib/imagefile.php:160
+#. 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."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: 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:287
+#: 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:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8189,25 +8273,27 @@ msgstr ""
 msgid "Leave"
 msgstr "Kaydet"
 
-#: lib/logingroupnav.php:80
+#. 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."
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8226,14 +8312,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8245,7 +8331,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:263
+#: lib/mail.php:255
 #, fuzzy, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8268,14 +8354,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, fuzzy, php-format
 msgid "New email address for posting to %s"
 msgstr "Kullanıcı için kaydedilmiş eposta adresi yok."
@@ -8283,7 +8369,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:321
+#: lib/mail.php:313
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8298,35 +8384,35 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "%s durum"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 #, 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:472
+#: lib/mail.php:464
 #, 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:493
+#: lib/mail.php:485
 #, php-format
-msgid "You've been nudged by %s"
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8344,7 +8430,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr ""
@@ -8353,7 +8439,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8374,7 +8460,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:607
+#: lib/mail.php:599
 #, fuzzy, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s %2$s'da durumunuzu takip ediyor"
@@ -8384,7 +8470,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8406,7 +8492,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8416,7 +8502,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:680
+#: lib/mail.php:672
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr ""
@@ -8427,7 +8513,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8738,37 +8824,47 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Abonelikler"
 
-#: lib/profileaction.php:126
+#. 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"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Abone olanlar"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 #, fuzzy
 msgid "All subscribers"
 msgstr "Abone olanlar"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr ""
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Üyelik başlangıcı"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. TRANS: Label for user statistics.
+#. TRANS: Average count of posts made per day since account registration.
+#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr ""
 
-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305
 msgid "All groups"
 msgstr ""
 
@@ -9034,51 +9130,63 @@ msgstr "Aboneliği sonlandır"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Kullanıcının profili yok."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 #, fuzzy
 msgid "Edit Avatar"
 msgstr "Avatar"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr ""
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr ""
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 #, fuzzy
 msgid "Edit profile settings"
 msgstr "Profil ayarları"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr ""
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr ""
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr ""
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr ""
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 #, fuzzy
 msgid "User role"
 msgstr "Kullanıcının profili yok."
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr ""
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr ""
@@ -9163,13 +9271,13 @@ 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:64
+#: lib/xrd.php:63
 #, fuzzy
 msgid "Invalid XML."
 msgstr "Geçersiz büyüklük."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr ""
 
@@ -9178,37 +9286,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "No such group"
-#~ msgstr "Böyle bir kullanıcı yok."
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "HTTP yöntemi desteklenmiyor."
-
-#~ msgid "Reset"
-#~ msgstr "Sıfırla"
-
-#, fuzzy
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr ""
-#~ "1-64 küçük harf veya rakam, noktalama işaretlerine ve boşluklara izin "
-#~ "verilmez"
-
-#, fuzzy
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6 veya daha fazla karakter"
-
-#, fuzzy
-#~ msgid "Same as password above. Required."
-#~ msgstr "yukarıdaki parolanın aynısı"
-
-#~ 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"
-
-#, fuzzy
-#~ msgid "%s is not a valid color!"
-#~ msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index a856164ca4..2a85789ebb 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Core to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AS
 # Author: Boogie
@@ -12,18 +12,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:58:13+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -96,7 +96,7 @@ msgstr "Зберегти параметри доступу"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -134,6 +134,7 @@ msgstr "Немає такої сторінки."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -341,14 +342,15 @@ msgstr "Не вдалося оновити користувача."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "Користувач не має профілю."
 
@@ -408,7 +410,6 @@ msgstr "Не вдалося оновити ваш дизайн."
 
 #. TRANS: Title for Atom feed.
 #: actions/apiatomservice.php:85
-#, fuzzy
 msgctxt "ATOM"
 msgid "Main"
 msgstr "Головна"
@@ -688,18 +689,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "Додаткове ім’я не може бути таким самим що й основне."
 
@@ -710,7 +709,7 @@ msgstr "Додаткове ім’я не може бути таким сами
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "Спільноту не знайдено."
@@ -908,11 +907,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Ім’я користувача"
 
@@ -1063,9 +1063,8 @@ 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
-#, 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
@@ -1224,28 +1223,27 @@ msgstr "Запис Atom має бути у правильно сформован
 msgid "Atom post must be an Atom entry."
 msgstr "POST-запит Atom має бути записом формату Atom."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: 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:347
+#: 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:381
+#: actions/apitimelineuser.php:380
 #, php-format
 msgid "No content for notice %d."
 msgstr "Допис %d не має змісту."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "Повідомлення з URI \"%s\" вже існує."
@@ -1271,13 +1269,11 @@ msgstr "Немає такого профілю."
 #. 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 "Не вдається додати чиюсь підписку"
+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 "Можливою є обробка лише стрічки обраних дописів."
 
@@ -1305,16 +1301,14 @@ 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 "Не вдається надати комусь членство"
+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 "Можливою є обробка активності лише щодо приєднання нових членів."
+msgstr "Можливою є лише обробка POST-запитів."
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
 #: actions/atompubmembershipfeed.php:259
@@ -1338,9 +1332,8 @@ 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 "Не вдається видалити допис з чийогось списку обраних."
+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.
@@ -1376,54 +1369,58 @@ 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 "Не є учасником"
+msgstr "Не є учасником."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
-#, 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.
 #: actions/atompubshowsubscription.php:72
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
-#, fuzzy, php-format
+#, php-format
 msgid "No such profile id: %d."
-msgstr "Немає такого ідентифікатора профілю: %d"
+msgstr "Немає такого ідентифікатора профілю: %d."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
 #. TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.
 #: actions/atompubshowsubscription.php:94
-#, fuzzy, php-format
+#, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
-msgstr "Профіль %1$d не є підписаним до профілю %2$d"
+msgstr "Профіль %1$d не є підписаним до профілю %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 "Не вдається видалити чиюсь підписку"
+msgstr "Не вдається видалити чужу підписку."
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. 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:257
+#: 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
+#, php-format
 msgid "Unknown profile %s."
-msgstr "Невідомий профіль %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
+#, fuzzy, php-format
+msgid "Already subscribed to %s."
+msgstr "Вже підписаний!"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
@@ -1527,34 +1524,34 @@ msgid "No file uploaded."
 msgstr "Жодного файлу не завантажено."
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr "Дані вашого файлу загублено."
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "Оновлення аватари невдале."
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 msgid "Backup account"
 msgstr "Резерв. копія"
 
@@ -1572,7 +1569,6 @@ msgstr "Ви не можете створити резервну копію св
 
 #. TRANS: Information displayed on the backup account page.
 #: actions/backupaccount.php:225
-#, 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 "
@@ -1581,7 +1577,7 @@ msgid ""
 "are not backed up."
 msgstr ""
 "Ви маєте можливість створити резервну копію даних вашого акаунту у форматі "
-"<a href=\"http://activitystrea.ms/\">Activity Streams</a>. Дана можливість є "
+"<a href=\"http://activitystrea.ms/\">Activity Streams</a>. Ця можливість є "
 "експериментальною і результат копіювання не буде повним; особисті дані, як "
 "то електронна адреса або ІМ-адреса не будуть долучені до резервного файлу. "
 "До того ж, прикріплені до ваших повідомлень файли і прямі повідомлення також "
@@ -1755,8 +1751,9 @@ msgid "Conversation"
 msgstr "Розмова"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Дописи"
 
@@ -1779,8 +1776,8 @@ 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."
+#, fuzzy, php-format
+msgid "You must write \"%s\" exactly in the box."
 msgstr "Ви мусите написати «%s» у даному віконці."
 
 #. TRANS: Confirmation that a user account has been deleted.
@@ -1790,7 +1787,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:472
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 msgid "Delete account"
 msgstr "Видалити акаунт"
 
@@ -1998,7 +1995,6 @@ msgstr "Ви можете видаляти лише локальних кори
 
 #. TRANS: Title of delete user page.
 #: actions/deleteuser.php:110
-#, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Видалити користувача"
@@ -2019,9 +2015,8 @@ 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.
 #. TRANS: Description of form for deleting a user.
@@ -2146,7 +2141,6 @@ msgstr "Замостити фон"
 
 #. TRANS: Fieldset legend for theme colors.
 #: actions/designadminpanel.php:598
-#, fuzzy
 msgid "Change colors"
 msgstr "Змінити кольори"
 
@@ -2186,7 +2180,6 @@ msgstr "Свій CSS"
 
 #. TRANS: Button text for resetting theme settings.
 #: actions/designadminpanel.php:718
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "За замовч."
@@ -2222,9 +2215,9 @@ 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.
@@ -2335,7 +2328,8 @@ msgstr "Скористайтесь цією формою, щоб відреда
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "Помилкове додаткове ім’я: «%s»"
@@ -2347,7 +2341,7 @@ msgstr "Не вдалося оновити спільноту."
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "Неможна призначити додаткові імена."
 
@@ -2527,7 +2521,6 @@ msgstr "Ця електронна адреса належить іншому к
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
 #: actions/emailsettings.php:426 actions/imsettings.php:343
 #: actions/smssettings.php:365
-#, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Не вдалося додати код підтвердження."
 
@@ -2557,9 +2550,8 @@ 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:468 actions/smssettings.php:413
-#, fuzzy
 msgid "Could not delete email confirmation."
-msgstr "Не вдалося видалити підтвердження поштової адреси."
+msgstr "Не вдається видалити підтвердження електронної адреси."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 #: actions/emailsettings.php:473
@@ -2585,7 +2577,6 @@ msgstr "Немає адреси для вхідної пошти."
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
 #: actions/emailsettings.php:540 actions/emailsettings.php:565
 #: actions/smssettings.php:564 actions/smssettings.php:587
-#, fuzzy
 msgid "Could not update user record."
 msgstr "Не вдалося оновити запис користувача."
 
@@ -2854,17 +2845,17 @@ msgid "Crop"
 msgstr "Втяти"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "Логотип оновлено."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "Оновлення логотипу завершилось невдачею."
 
@@ -2924,7 +2915,9 @@ msgstr "Надати цьому користувачеві права адмін
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Оновлення членів %1$s на %2$s!"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "Спільноти"
@@ -3139,9 +3132,8 @@ msgstr "Це помилкова адреса IM."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
 #: actions/imsettings.php:391
-#, fuzzy
 msgid "Could not delete IM confirmation."
-msgstr "Не вдалося видалити підтвердження ІМ."
+msgstr "Не вдалося видалити підтвердження ІМ-адреси."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
 #: actions/imsettings.php:396
@@ -3369,7 +3361,7 @@ msgstr "Ви повинні спочатку увійти на сайт, аби
 
 #. TRANS: Title for join group page after joining.
 #: actions/joingroup.php:147
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s приєднався до спільноти %2$s"
@@ -3387,7 +3379,7 @@ msgstr "Ви не є учасником цієї спільноти."
 
 #. TRANS: Title for leave group page after leaving.
 #: actions/leavegroup.php:142
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s залишив спільноту %2$s"
@@ -3517,7 +3509,7 @@ msgstr "Неточне ім’я або пароль."
 msgid "Error setting user. You are probably not authorized."
 msgstr "Помилка. Можливо, ви не авторизовані."
 
-#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "Увійти"
 
@@ -3622,6 +3614,12 @@ msgstr "Вам не дозволено створювати нові спіль
 msgid "Use this form to create a new group."
 msgstr "Скористайтесь цією формою для створення нової спільноти."
 
+#. TRANS: Group create form validation error.
+#: actions/newgroup.php:199
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "Додаткове ім’я не може бути таким самим що й основне."
+
 #: actions/newmessage.php:71 actions/newmessage.php:234
 msgid "New message"
 msgstr "Нове повідомлення"
@@ -4304,9 +4302,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "Повне ім’я"
 
@@ -4346,10 +4345,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "Розташування"
 
@@ -4364,9 +4364,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "Теґи"
 
@@ -4436,15 +4437,13 @@ 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
-#, 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
-#, fuzzy
 msgid "Could not save location prefs."
-msgstr "Не вдалося зберегти налаштування розташування."
+msgstr "Не вдалося зберегти преференції розташування."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
 #: actions/profilesettings.php:427 actions/tagother.php:200
@@ -4459,7 +4458,7 @@ 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:480 actions/restoreaccount.php:60
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 msgid "Restore account"
 msgstr "Відновити акаунт"
 
@@ -4627,9 +4626,8 @@ msgstr ""
 "допомогою електронної адреси, яку ви зазначили у власному профілі."
 
 #: actions/recoverpassword.php:167
-#, fuzzy
 msgid "You have been identified. Enter a new password below."
-msgstr "Ідентифікація успішна. Введіть новий пароль. "
+msgstr "Ідентифікація успішна. Введіть новий пароль."
 
 #. TRANS: Fieldset legend for password recovery page.
 #: actions/recoverpassword.php:198
@@ -4654,7 +4652,6 @@ msgstr "Відновити"
 
 #. TRANS: Button text on password recovery page.
 #: actions/recoverpassword.php:214
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Відновити"
@@ -4682,15 +4679,13 @@ 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: 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 "Такий само, як і пароль вище"
+msgstr "Такий само, як і пароль вище."
 
 #. TRANS: Button text for password reset form.
 #. TRANS: Button text on profile design page to reset all colour settings to default without saving.
@@ -4745,9 +4740,8 @@ msgstr "Пароль та підтвердження не співпадають
 
 #. TRANS: Reset password form validation error message.
 #: actions/recoverpassword.php:418
-#, fuzzy
 msgid "Cannot save new password."
-msgstr "Неможна зберегти новий пароль."
+msgstr "Не вдається зберегти новий пароль."
 
 #. TRANS: Server error displayed when something does wrong with the user object during password reset.
 #: actions/recoverpassword.php:426 actions/register.php:256
@@ -4772,7 +4766,7 @@ msgstr "Даруйте, помилка у коді запрошення."
 msgid "Registration successful"
 msgstr "Реєстрація успішна"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "Реєстрація"
 
@@ -4801,9 +4795,8 @@ msgstr ""
 "будете в курсі справ ваших друзів та колег. "
 
 #: actions/register.php:437
-#, fuzzy
 msgid "6 or more characters."
-msgstr "6 або більше знаків"
+msgstr "6 або більше знаків."
 
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:445 actions/register.php:449
@@ -4930,8 +4923,9 @@ msgstr "URL-адреса профілю"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "Підписатись"
 
@@ -4945,12 +4939,10 @@ msgstr ""
 "Неправильна URL-адреса профілю (немає документа YADIS, або помилковий XRDS)."
 
 #: actions/remotesubscribe.php:175
-#, fuzzy
 msgid "That is a local profile! Login to subscribe."
-msgstr "Це локальний профіль! Увійдіть аби підписатись."
+msgstr "Це локальний профіль! Увійдіть, щоб підписатись."
 
 #: actions/remotesubscribe.php:182
-#, fuzzy
 msgid "Could not get a request token."
 msgstr "Не вдалося отримати токен запиту."
 
@@ -4963,7 +4955,6 @@ msgid "No notice specified."
 msgstr "Зазначеного допису немає."
 
 #: actions/repeat.php:75
-#, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "Ви не можете повторювати власні дописи."
 
@@ -5089,7 +5080,9 @@ msgid "File upload stopped by extension."
 msgstr "Завантаження файлу зупинено розширенням."
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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 "Система відповіла помилкою при завантаженні цього файла."
 
@@ -5208,8 +5201,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Статистика"
 
@@ -5344,14 +5338,16 @@ msgid "Group profile"
 msgstr "Профіль спільноти"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
+#. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Зауваження"
 
@@ -5395,8 +5391,11 @@ msgid "Members"
 msgstr "Учасники"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "(Пусто)"
@@ -6011,7 +6010,7 @@ 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:116
+#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -6021,7 +6020,7 @@ 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:120
+#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s ще не має читачів. Будете першим?"
@@ -6031,7 +6030,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -6064,7 +6063,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -6084,23 +6083,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s не відслідковує нічого"
 
-#: actions/subscriptions.php:178
+#. 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:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "СМС"
 
@@ -6133,12 +6133,14 @@ msgstr "Немає ID аргументу."
 msgid "Tag %s"
 msgstr "Позначити %s"
 
+#. TRANS: H2 for user profile information.
 #: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "Профіль користувача."
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Фото"
 
@@ -6698,25 +6700,25 @@ msgid "Problem saving notice."
 msgstr "Проблема при збереженні допису."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:914
+#: classes/Notice.php:923
 msgid "Bad type provided to saveKnownGroups."
 msgstr "Вказано невірний тип для saveKnownGroups."
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1013
+#: classes/Notice.php:1022
 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6818,25 +6820,46 @@ msgid "Single-user mode code called when not enabled."
 msgstr "Код для однокористувацького режиму називається, коли не ввімкнуто."
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 msgid "Could not create group."
 msgstr "Не вдалося створити нову спільноту."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:526
+#: classes/User_group.php:530
 msgid "Could not set group URI."
 msgstr "Не вдалося встановити URI спільноти."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:549
+#: classes/User_group.php:553
 msgid "Could not set group membership."
 msgstr "Не вдалося встановити членство."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:564
+#: classes/User_group.php:568
 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6973,7 +6996,8 @@ msgid "Create an account"
 msgstr "Створити новий акаунт"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Реєстрація"
@@ -6985,7 +7009,8 @@ msgid "Login to the site"
 msgstr "Увійти на сайт"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Увійти"
@@ -7219,6 +7244,23 @@ msgstr ""
 msgid "No content for notice %s."
 msgstr "Допис %s не має змісту."
 
+#: lib/activitymover.php:84
+#, fuzzy, php-format
+msgid "No such user %s."
+msgstr "Такого користувача немає."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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."
@@ -7377,7 +7419,6 @@ msgid "Database error inserting OAuth application user."
 msgstr "Помилка бази даних при додаванні користувача OAuth-додатку."
 
 #: lib/apioauthstore.php:345
-#, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr "Помилка бази даних при додаванні користувача OAuth-додатку."
 
@@ -7662,7 +7703,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "Розташування: %s"
@@ -7670,7 +7711,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "Веб-сторінка: %s"
@@ -7952,24 +7993,24 @@ msgstr ""
 "tracking — наразі не виконується\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 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:158
+#: lib/common.php:164
 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "Іти до файлу інсталяції."
 
@@ -8057,6 +8098,12 @@ msgstr "Не вдалося оновити дизайн."
 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."
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "Видалити з обраних"
@@ -8136,7 +8183,7 @@ msgid "Describe the group or topic"
 msgstr "Опишіть спільноту або тему"
 
 #: lib/groupeditform.php:162
-#, fuzzy, php-format
+#, 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 знак"
@@ -8261,35 +8308,41 @@ msgstr "Теґи у дописах спільноти %s"
 msgid "This page is not available in a media type you accept"
 msgstr "Ця сторінка не доступна для того типу медіа, з яким ви погодились"
 
-#: lib/imagefile.php:72
+#. 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:90
+#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "Цей файл завеликий. Максимальний розмір %s."
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "Часткове завантаження."
 
-#: lib/imagefile.php:111
+#. 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 "Це не зображення, або файл зіпсовано."
 
-#: lib/imagefile.php:160
+#. 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 "Файл втрачено."
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: lib/imagefile.php:303
 #, php-format
 msgid "%dMB"
 msgid_plural "%dMB"
@@ -8298,7 +8351,7 @@ msgstr[1] "%d Мб"
 msgstr[2] "%d Мб"
 
 #. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
 #, php-format
 msgid "%dkB"
 msgid_plural "%dkB"
@@ -8307,7 +8360,7 @@ msgstr[1] "%d кб"
 msgstr[2] "%d кб"
 
 #. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8329,23 +8382,25 @@ msgstr "Невідоме джерело вхідного повідомленн
 msgid "Leave"
 msgstr "Залишити"
 
-#: lib/logingroupnav.php:80
+#. TRANS: Title for menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "Увійти використовуючи ім’я та пароль"
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8376,14 +8431,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8398,7 +8453,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:263
+#: lib/mail.php:255
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8425,14 +8480,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "Нова електронна адреса для надсилання повідомлень на %s"
@@ -8440,7 +8495,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:321
+#: lib/mail.php:313
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8463,19 +8518,19 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "%s статус"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr ""
@@ -8484,15 +8539,15 @@ msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
-#: lib/mail.php:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8521,7 +8576,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "Нове приватне повідомлення від %s"
@@ -8530,7 +8585,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8565,7 +8620,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:607
+#: lib/mail.php:599
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) додав(ла) ваш допис обраних"
@@ -8575,7 +8630,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8613,7 +8668,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8626,7 +8681,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:680
+#: lib/mail.php:672
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) пропонує до вашої уваги наступний допис"
@@ -8637,7 +8692,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8972,36 +9027,46 @@ msgstr "Теґи у дописах %s"
 msgid "Unknown"
 msgstr "Невідомо"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Підписки"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "Всі підписки"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "Підписані"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "Всі підписані"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "Ід. номер"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "Реєстрація"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. TRANS: Label for user statistics.
+#. TRANS: Average count of posts made per day since account registration.
+#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "Щоденно"
 
-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "Всі спільноти"
 
@@ -9261,48 +9326,60 @@ msgstr "Відписатись"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "Користувач %1$s (%2$d) не має профілю."
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "Аватара"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "Діяльність користувача"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr "Видалення користувача у процесі..."
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "Налаштування профілю"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "Правка"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "Надіслати пряме повідомлення цьому користувачеві"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "Повідомлення"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr "Модерувати"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "Роль користувача"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "Адміністратор"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "Модератор"
@@ -9404,12 +9481,12 @@ msgstr[2] ""
 "надсилаєте %2$d."
 
 #. TRANS: Exception.
-#: lib/xrd.php:64
+#: lib/xrd.php:63
 msgid "Invalid XML."
 msgstr "Непрацездатний XML."
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
 msgstr "Неправильний XML, корінь XRD відсутній."
 
@@ -9418,32 +9495,3 @@ msgstr "Неправильний XML, корінь XRD відсутній."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Отримання резервної копії файлу «%s»."
-
-#~ msgid "No such group"
-#~ msgstr "Такої спільноти не існує."
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "HTTP спосіб не підтримується."
-
-#~ msgid "Reset"
-#~ msgstr "Скинути"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr ""
-#~ "1-64 літери нижнього регістра і цифри, ніякої пунктуації або інтервалів. "
-#~ "Неодмінно."
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "6 або більше знаків. Неодмінно."
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "Такий само, як і пароль вище. Неодмінно."
-
-#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-#~ msgstr ""
-#~ "1-64 літери нижнього регістру і цифри, ніякої пунктуації або інтервалів"
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "%s є неприпустимим кольором!"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index c071fa458a..fb494e11c4 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -1,8 +1,9 @@
 # Translation of StatusNet - Core to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Brion
 # Author: Chenxiaoqino
+# Author: Hydra
 # Author: Shizhao
 # Author: Sweeite012f
 # Author: Tommyang
@@ -14,18 +15,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 14:58:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:11+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 (r80746); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-20 20:41:25+0000\n"
+"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -96,7 +97,7 @@ msgstr "保存访问设置"
 #: actions/emailsettings.php:254 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
-#: actions/smssettings.php:205 actions/subscriptions.php:262
+#: actions/smssettings.php:205 actions/subscriptions.php:259
 #: actions/useradminpanel.php:298 lib/applicationeditform.php:355
 #: lib/designsettings.php:270 lib/groupeditform.php:198
 msgctxt "BUTTON"
@@ -134,6 +135,7 @@ msgstr "没有这个页面。"
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. 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
@@ -339,14 +341,15 @@ msgstr "无法更新用户。"
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar 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:130
+#: actions/apiaccountupdateprofileimage.php:131
 #: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
 #: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
 msgid "User has no profile."
 msgstr "用户没有个人信息。"
 
@@ -398,10 +401,9 @@ msgstr "无法更新你的外观。"
 
 #. TRANS: Title for Atom feed.
 #: actions/apiatomservice.php:85
-#, fuzzy
 msgctxt "ATOM"
 msgid "Main"
-msgstr "首页"
+msgstr "主要"
 
 #. TRANS: Title for Atom feed. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
@@ -435,9 +437,9 @@ 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
@@ -667,18 +669,16 @@ 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: Group edit form validation error.
-#. TRANS: Group create form validation error.
+#. TRANS: Group create form validation error. %s is the already used alias.
 #: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:191
+#: actions/newgroup.php:192
 #, 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.
-#. TRANS: Group create form validation error.
 #: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:198
 msgid "Alias can't be the same as nickname."
 msgstr "别名不能和昵称相同。"
 
@@ -689,7 +689,7 @@ msgstr "别名不能和昵称相同。"
 #. 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:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
 #: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
 msgid "Group not found."
 msgstr "小组未找到。"
@@ -883,11 +883,12 @@ 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:240 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:144
-#: lib/userprofile.php:134
+#: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "昵称"
 
@@ -1034,9 +1035,8 @@ 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
-#, 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
@@ -1165,49 +1165,47 @@ msgstr "只有该用户才能添加到他们的时间线。"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #: actions/apitimelineuser.php:304
-#, fuzzy
 msgid "Only accept AtomPub for Atom feeds."
-msgstr "Atom feeds 只接受 AtomPub。"
+msgstr "只接受 AtomPub 原子饲料。"
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
 #: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
-msgstr ""
+msgstr "原子开机自检不能为空。"
 
 #. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
 #: actions/apitimelineuser.php:317
 msgid "Atom post must be well-formed XML."
-msgstr ""
+msgstr "原子后必须是格式良好 XML。"
 
 #. TRANS: Client error displayed when not using an Atom entry.
 #: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
-msgstr ""
+msgstr "原子后必须是一个原子的条目。"
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/apitimelineuser.php:336
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: actions/apitimelineuser.php:335
 msgid "Can only handle POST activities."
-msgstr ""
+msgstr "只能处理开机自检活动。"
 
 #. TRANS: Client error displayed when using an unsupported activity object type.
 #. TRANS: %s is the unsupported activity object type.
-#: actions/apitimelineuser.php:347
+#: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
-msgstr ""
+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:381
-#, fuzzy, php-format
+#: actions/apitimelineuser.php:380
+#, php-format
 msgid "No content for notice %d."
-msgstr "搜索消息内容"
+msgstr "没有通知 %d 的内容。"
 
 #. TRANS: Client error displayed when using another format than AtomPub.
-#: actions/apitimelineuser.php:409
+#: actions/apitimelineuser.php:408
 #, php-format
 msgid "Notice with URI \"%s\" already exists."
 msgstr "已存在使用 URI \"%s\" 的消息了。"
@@ -1233,82 +1231,71 @@ msgstr "没有这个文件。"
 #. 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 "无法添加新的关注。"
+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 "搜索消息内容"
+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 "搜索消息内容"
+msgstr "可以只为心目中的绝对通知书。"
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
 #: actions/atompubfavoritefeed.php:259
-#, fuzzy
 msgid "Unknown note."
-msgstr "未知的"
+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
+#, php-format
 msgid "%s group memberships"
-msgstr "%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 "无法添加新的关注。"
+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 "搜索消息内容"
+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 "所有成员"
+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 ""
+msgstr "阻止的管理员。"
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
 #: actions/atompubshowfavorite.php:90
-#, fuzzy
 msgid "No such favorite."
-msgstr "没有这个文件。"
+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 "无法删除收藏。"
+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.
@@ -1344,54 +1331,58 @@ 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 "所有成员"
+msgstr "不是会员。"
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
-#, 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.
 #: actions/atompubshowsubscription.php:72
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
-#, fuzzy, php-format
+#, php-format
 msgid "No such profile id: %d."
-msgstr "没有这个文件。"
+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
-#, 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.
 #: actions/atompubshowsubscription.php:157
-#, fuzzy
 msgid "Cannot delete someone else's subscription."
-msgstr "无法删除自我关注。"
+msgstr "不能删除别人的订阅。"
 
-#. TRANS: Client error displayed when not using the POST verb.
-#. TRANS: Do not translate POST.
-#: actions/atompubsubscriptionfeed.php:249
+#. TRANS: Client error displayed when not using the follow verb.
+#: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
-msgstr ""
+msgstr "只能处理后续活动。"
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
-#: actions/atompubsubscriptionfeed.php:257
+#: actions/atompubsubscriptionfeed.php:256
 msgid "Can only follow people."
-msgstr ""
+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
+#, 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.
+#: 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
@@ -1495,47 +1486,46 @@ msgid "No file uploaded."
 msgstr "没有文件被上传。"
 
 #. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: 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:361 actions/grouplogo.php:393
+#: actions/avatarsettings.php:360 actions/grouplogo.php:394
 msgid "Lost our file data."
 msgstr "文件数据丢失"
 
 #. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: 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:389
+#: actions/avatarsettings.php:388
 msgid "Failed updating avatar."
 msgstr "更新头像失败。"
 
 #. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:413
+#: 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:464
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
 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 "只有登录的用户才能重复发消息。"
+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:225
@@ -1546,18 +1536,20 @@ msgid ""
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
+"您可以备份您的帐户数据 <a href=\"http://activitystrea.ms/\">活动流</a> 格式。"
+"这是一项试验功能，并提供了不完整的备份 ；私人帐户信息如电子邮件和即时消息地址"
+"不备份。此外上，传的文件和直接的消息不备份。"
 
 #. TRANS: Submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:248
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
-msgstr "背景"
+msgstr "备份"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
 msgid "Backup your account"
-msgstr ""
+msgstr "备份您的帐户"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 #: actions/block.php:68
@@ -1715,54 +1707,51 @@ msgid "Conversation"
 msgstr "对话"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
 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 "只有登录的用户才能重复发消息。"
+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 "你不能删除用户。"
+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 ""
+#, fuzzy, 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 "头像已删除。"
+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:472
-#, fuzzy
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
 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.
@@ -1771,7 +1760,7 @@ msgstr ""
 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.
@@ -1783,15 +1772,14 @@ 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
@@ -1956,7 +1944,6 @@ msgstr "你只能删除本地用户。"
 
 #. TRANS: Title of delete user page.
 #: actions/deleteuser.php:110
-#, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "删除用户"
@@ -1976,9 +1963,8 @@ 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.
 #. TRANS: Description of form for deleting a user.
@@ -2101,9 +2087,8 @@ 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.
@@ -2141,7 +2126,6 @@ msgstr "自定义CSS"
 
 #. TRANS: Button text for resetting theme settings.
 #: actions/designadminpanel.php:718
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "使用默认值"
@@ -2177,9 +2161,9 @@ 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.
@@ -2288,7 +2272,8 @@ msgstr "通过这个表单来编辑小组"
 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:186
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:239 actions/newgroup.php:187
 #, php-format
 msgid "Invalid alias: \"%s\""
 msgstr "无效的别名：“%s”。"
@@ -2300,7 +2285,7 @@ msgstr "无法更新小组"
 
 #. TRANS: Server error displayed when group aliases could not be added.
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:534
+#: actions/editgroup.php:279 classes/User_group.php:538
 msgid "Could not create aliases."
 msgstr "无法创建别名。"
 
@@ -2399,6 +2384,7 @@ 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.
@@ -2478,7 +2464,6 @@ msgstr "此电子邮件属于其他用户。"
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
 #: actions/emailsettings.php:426 actions/imsettings.php:343
 #: actions/smssettings.php:365
-#, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "无法插入确认码。"
 
@@ -2507,7 +2492,6 @@ 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:468 actions/smssettings.php:413
-#, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "无法删除电子邮件确认。"
 
@@ -2535,7 +2519,6 @@ msgstr "没有发布用的电子邮件地址。"
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
 #: actions/emailsettings.php:540 actions/emailsettings.php:565
 #: actions/smssettings.php:564 actions/smssettings.php:587
-#, fuzzy
 msgid "Could not update user record."
 msgstr "无法更新用户记录。"
 
@@ -2794,17 +2777,17 @@ msgid "Crop"
 msgstr "剪裁"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:378
+#: actions/grouplogo.php:379
 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:413
+#: actions/grouplogo.php:414
 msgid "Logo updated."
 msgstr "logo已更新。"
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:416
+#: actions/grouplogo.php:417
 msgid "Failed updating logo."
 msgstr "更新 logo 失败。"
 
@@ -2864,7 +2847,9 @@ msgstr "将这个用户设为管理员"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "在%2$s上%1$s小组组员的更新！"
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "小组"
@@ -3069,7 +3054,6 @@ msgstr "IM 地址错误。"
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
 #: actions/imsettings.php:391
-#, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "无法删除 IM 确认。"
 
@@ -3279,10 +3263,10 @@ msgstr "你必须登录才能加入小组。"
 
 #. TRANS: Title for join group page after joining.
 #: actions/joingroup.php:147
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
-msgstr "%1$s加入了%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
@@ -3297,10 +3281,10 @@ msgstr "你不是该群小组成员。"
 
 #. TRANS: Title for leave group page after leaving.
 #: actions/leavegroup.php:142
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
-msgstr "%1$s离开了%2$s小组。"
+msgstr "离开 %2$s 组的 %1$s"
 
 #. TRANS: User admin panel title
 #: actions/licenseadminpanel.php:55
@@ -3425,7 +3409,7 @@ msgstr "用户名或密码不正确。"
 msgid "Error setting user. You are probably not authorized."
 msgstr "设置用户时出错。你可能没有被认证。"
 
-#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
 msgid "Login"
 msgstr "登录"
 
@@ -3513,15 +3497,20 @@ 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 "你不能删除这个小组。"
+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:199
+#, fuzzy
+msgid "Alias cannot be the same as nickname."
+msgstr "别名不能和昵称相同。"
+
 #: actions/newmessage.php:71 actions/newmessage.php:234
 msgid "New message"
 msgstr "新消息"
@@ -4194,9 +4183,10 @@ 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:152
+#: lib/groupeditform.php:149 lib/userprofile.php:156
 msgid "Full name"
 msgstr "全名"
 
@@ -4234,10 +4224,11 @@ 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:262 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:172
-#: lib/userprofile.php:167
+#: lib/userprofile.php:172
 msgid "Location"
 msgstr "位置"
 
@@ -4252,9 +4243,10 @@ 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:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
 msgid "Tags"
 msgstr "标签"
 
@@ -4319,15 +4311,13 @@ 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
-#, 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
-#, fuzzy
 msgid "Could not save location prefs."
-msgstr "无法保存标签。"
+msgstr "无法保存位置设置。"
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
 #: actions/profilesettings.php:427 actions/tagother.php:200
@@ -4342,10 +4332,9 @@ 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:480 actions/restoreaccount.php:60
-#, fuzzy
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
 msgid "Restore account"
-msgstr "创建一个账户"
+msgstr "还原账户"
 
 #: actions/public.php:83
 #, php-format
@@ -4502,9 +4491,8 @@ msgid ""
 msgstr "如果你忘记或丢失了密码，你可以发送一个新的密码到你之前设置的邮箱中。"
 
 #: actions/recoverpassword.php:167
-#, fuzzy
 msgid "You have been identified. Enter a new password below."
-msgstr "你的身份已被验证，请在下面输入新的密码。 "
+msgstr "你的身份已被验证，请在下面输入新的密码。"
 
 #. TRANS: Fieldset legend for password recovery page.
 #: actions/recoverpassword.php:198
@@ -4528,7 +4516,6 @@ msgstr "恢复"
 
 #. TRANS: Button text on password recovery page.
 #: actions/recoverpassword.php:214
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "恢复"
@@ -4556,13 +4543,11 @@ 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: 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 "与上面相同的密码"
 
@@ -4617,7 +4602,6 @@ msgstr "密码和确认密码不匹配。"
 
 #. TRANS: Reset password form validation error message.
 #: actions/recoverpassword.php:418
-#, fuzzy
 msgid "Cannot save new password."
 msgstr "无法保存新密码。"
 
@@ -4643,7 +4627,7 @@ msgstr "对不起，无效的邀请码。"
 msgid "Registration successful"
 msgstr "注册成功"
 
-#: actions/register.php:121 actions/register.php:511 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
 msgid "Register"
 msgstr "注册"
 
@@ -4672,7 +4656,6 @@ msgstr ""
 "系。 "
 
 #: actions/register.php:437
-#, fuzzy
 msgid "6 or more characters."
 msgstr "6 个或更多字符"
 
@@ -4796,8 +4779,9 @@ msgstr "资料页 URL"
 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:411
+#: lib/userprofile.php:431
 msgid "Subscribe"
 msgstr "关注"
 
@@ -4810,12 +4794,10 @@ 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 "这是一个本地用户！登录才能关注。"
+msgstr "这是一个本地用户！请登录以关注。"
 
 #: actions/remotesubscribe.php:182
-#, fuzzy
 msgid "Could not get a request token."
 msgstr "无法获得一个 request token。"
 
@@ -4828,7 +4810,6 @@ msgid "No notice specified."
 msgstr "没有指定的消息。"
 
 #: actions/repeat.php:75
-#, fuzzy
 msgid "You cannot repeat your own notice."
 msgstr "你不能重复自己的消息。"
 
@@ -4901,22 +4882,19 @@ 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 "只有登录的用户才能重复发消息。"
+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 "你还没登记任何程序。"
+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 "上传文件"
+msgstr "没有上传文件。"
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
 #: actions/restoreaccount.php:129 lib/mediafile.php:194
@@ -4951,27 +4929,28 @@ msgid "File upload stopped by extension."
 msgstr "文件上传被扩展停止了。"
 
 #. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: actions/restoreaccount.php:164 lib/imagefile.php:103 lib/mediafile.php:228
+#. 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 "所有成员"
+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 ""
+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 ""
+msgstr "将还原订阅源。请等待几分钟。"
 
 #. TRANS: Form instructions for feed restore.
 #: actions/restoreaccount.php:342
@@ -4979,10 +4958,11 @@ msgid ""
 "You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
+"你可以以<a href=\"http://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
-#, fuzzy
 msgid "Upload the file"
 msgstr "上传文件"
 
@@ -5067,8 +5047,9 @@ 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:448
-#: lib/profileaction.php:187
+#: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "统计"
 
@@ -5197,14 +5178,16 @@ msgid "Group profile"
 msgstr "小组资料"
 
 #. TRANS: Label for group URL (dt). Text hidden by default.
+#. TRANS: DT for URL in a profile.
 #: actions/showgroup.php:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#: 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:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "注释"
 
@@ -5248,8 +5231,11 @@ msgid "Members"
 msgstr "小组成员"
 
 #. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. 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:408 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "（无）"
@@ -5849,7 +5835,7 @@ 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:116
+#: actions/subscribers.php:114
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
@@ -5857,7 +5843,7 @@ 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:120
+#: actions/subscribers.php:118
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "还没有人关注%s，成为第一个关注者？"
@@ -5867,7 +5853,7 @@ 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:129
+#: actions/subscribers.php:127
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
@@ -5900,7 +5886,7 @@ 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:135
+#: actions/subscriptions.php:133
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
@@ -5918,23 +5904,24 @@ 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:143 actions/subscriptions.php:149
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s没有关注任何人。"
 
-#: actions/subscriptions.php:178
-#, fuzzy, php-format
+#. TRANS: Atom feed title. %s is a profile nickname.
+#: actions/subscriptions.php:176
+#, php-format
 msgid "Subscription feed for %s (Atom)"
-msgstr "%s的消息聚合 (Atom)"
+msgstr "%s的订阅源 (Atom)"
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:242
+#: actions/subscriptions.php:239
 msgid "Jabber"
 msgstr "Jabber"
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:257
+#: actions/subscriptions.php:254
 msgid "SMS"
 msgstr "SMS"
 
@@ -5967,12 +5954,14 @@ msgstr "没有 ID 冲突。"
 msgid "Tag %s"
 msgstr "将%s加为标签"
 
+#. TRANS: H2 for user profile information.
 #: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "用户页面"
 
+#. TRANS: DT element in area for user avatar.
 #: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
 msgid "Photo"
 msgstr "相片"
 
@@ -6496,25 +6485,25 @@ msgid "Problem saving notice."
 msgstr "保存消息时出错。"
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:914
+#: classes/Notice.php:923
 msgid "Bad type provided to saveKnownGroups."
 msgstr "对 saveKnownGroups 提供的类型无效。"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1013
+#: classes/Notice.php:1022
 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:1127
+#: classes/Notice.php:1136
 #, 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:1646
+#: classes/Notice.php:1655
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6615,25 +6604,46 @@ msgid "Single-user mode code called when not enabled."
 msgstr "没启用单用户模式的代码。"
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:516
+#: classes/User_group.php:520
 msgid "Could not create group."
 msgstr "无法创建小组。"
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:526
+#: classes/User_group.php:530
 msgid "Could not set group URI."
 msgstr "无法设置小组 URI。"
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:549
+#: classes/User_group.php:553
 msgid "Could not set group membership."
 msgstr "无法设置小组成员。"
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:564
+#: classes/User_group.php:568
 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: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
@@ -6770,7 +6780,8 @@ msgid "Create an account"
 msgstr "创建一个账户"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "注册"
@@ -6782,7 +6793,8 @@ msgid "Login to the site"
 msgstr "登录这个网站"
 
 #. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "登录"
@@ -6966,54 +6978,68 @@ msgstr "只期待一个 root feed 元素但收到了整个的 XML 文档。"
 
 #. 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 "未知的语言“%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 ""
+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 "指定要关注的用户名。"
+msgstr "不能强制远程用户订阅。"
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
 #: lib/activityimporter.php:132
-#, fuzzy
 msgid "Unknown profile."
-msgstr "未知文件类型"
+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 ""
+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 ""
+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 "你已经是该小组成员。"
+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 ""
+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 "搜索消息内容"
+msgstr "通知 %s 没有内容。"
+
+#: lib/activitymover.php:84
+#, fuzzy, php-format
+msgid "No such user %s."
+msgstr "没有这个用户。"
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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
@@ -7171,7 +7197,6 @@ msgid "Database error inserting OAuth application user."
 msgstr "插入 OAuth 应用用户时数据库出错。"
 
 #: lib/apioauthstore.php:345
-#, fuzzy
 msgid "Database error updating OAuth application user."
 msgstr "插入 OAuth 应用用户时数据库出错。"
 
@@ -7297,15 +7322,13 @@ msgid "Revoke"
 msgstr "取消"
 
 #: lib/atom10feed.php:113
-#, fuzzy
 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 "不要删除这个小组"
+msgstr "不要使用此方法 ！"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:294
@@ -7455,7 +7478,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:278
+#: lib/command.php:434 lib/mail.php:270
 #, php-format
 msgid "Location: %s"
 msgstr "位置：%s"
@@ -7463,7 +7486,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:438 lib/mail.php:282
+#: lib/command.php:438 lib/mail.php:274
 #, php-format
 msgid "Homepage: %s"
 msgstr "主页：%s"
@@ -7726,24 +7749,24 @@ msgstr ""
 "tracking - 尚未实现。\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:155
+#: lib/common.php:161
 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:158
+#: lib/common.php:164
 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:161
+#: lib/common.php:167
 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:165
+#: lib/common.php:171
 msgid "Go to the installer."
 msgstr "去安装程序。"
 
@@ -7829,6 +7852,12 @@ msgstr "无法更新你的外观。"
 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应用的访问。"
+
 #: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "取消收藏这个消息"
@@ -7854,17 +7883,16 @@ msgid "FOAF"
 msgstr "FOAF"
 
 #: lib/feedimporter.php:75
-#, fuzzy
 msgid "Not an atom feed."
-msgstr "所有成员"
+msgstr "不是一个Atom源"
 
 #: lib/feedimporter.php:82
 msgid "No author in the feed."
-msgstr ""
+msgstr "没有在源中的作者。"
 
 #: lib/feedimporter.php:89
 msgid "Can't import without a user."
-msgstr ""
+msgstr "没有用户无法导入。"
 
 #. TRANS: Header for feed links (h2).
 #: lib/feedlist.php:66
@@ -7909,10 +7937,10 @@ msgid "Describe the group or topic"
 msgstr "小组或主题的描述"
 
 #: lib/groupeditform.php:162
-#, fuzzy, php-format
+#, 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[0] ""
 
 #: lib/groupeditform.php:174
 msgid ""
@@ -8023,49 +8051,55 @@ msgstr "这个组所发布的消息的标签"
 msgid "This page is not available in a media type you accept"
 msgstr "这个页面不提供你想要的媒体类型"
 
-#: lib/imagefile.php:72
+#. 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:90
+#: lib/imagefile.php:91
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "文件太大。文件大小限制在%s以下。"
 
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
 msgid "Partial upload."
 msgstr "部分上传。"
 
-#: lib/imagefile.php:111
+#. 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 "不是图片文件或文件已损坏。"
 
-#: lib/imagefile.php:160
+#. 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 "文件数据丢失"
 
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. 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:283
+#: 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:287
+#: 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:290
+#: lib/imagefile.php:310
 #, php-format
 msgid "%dB"
 msgid_plural "%dB"
@@ -8085,23 +8119,25 @@ msgstr "未知的收件箱来源%d。"
 msgid "Leave"
 msgstr "离开"
 
-#: lib/logingroupnav.php:80
+#. TRANS: Title for menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:79
 msgid "Login with a username and password"
 msgstr "用用户名和密码登录。"
 
-#: lib/logingroupnav.php:86
+#. 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:174
+#: lib/mail.php:168
 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:179
+#: lib/mail.php:173
 #, php-format
 msgid ""
 "Hey, %1$s.\n"
@@ -8132,14 +8168,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:246
+#: lib/mail.php:238
 #, 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:253
+#: lib/mail.php:245
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
@@ -8153,7 +8189,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:263
+#: lib/mail.php:255
 #, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
@@ -8180,14 +8216,14 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail.
 #. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
 #, 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:315
+#: lib/mail.php:307
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "新的电子邮件地址，用于发布 %s 信息"
@@ -8195,7 +8231,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:321
+#: lib/mail.php:313
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -8219,34 +8255,34 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages.
 #. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
 #, php-format
 msgid "%s status"
 msgstr "%s 状态"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
 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:472
+#: lib/mail.php:464
 #, 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:493
-#, php-format
-msgid "You've been nudged by %s"
+#: lib/mail.php:485
+#, fuzzy, php-format
+msgid "You have been nudged by %s"
 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:500
+#: lib/mail.php:492
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -8274,7 +8310,7 @@ msgstr ""
 
 #. TRANS: Subject for direct-message notification email.
 #. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
 #, php-format
 msgid "New private message from %s"
 msgstr "来自%s的私信"
@@ -8283,7 +8319,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:555
+#: lib/mail.php:547
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
@@ -8318,7 +8354,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:607
+#: lib/mail.php:599
 #, php-format
 msgid "%1$s (@%2$s) added your notice as a favorite"
 msgstr "%1$s (@%2$s) 收藏了你的消息"
@@ -8328,7 +8364,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:614
+#: lib/mail.php:606
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -8366,7 +8402,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
@@ -8379,7 +8415,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:680
+#: lib/mail.php:672
 #, php-format
 msgid "%1$s (@%2$s) sent a notice to your attention"
 msgstr "%1$s (@%2$s) 给你发送了一条消息"
@@ -8390,7 +8426,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:688
+#: lib/mail.php:680
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -8714,36 +8750,46 @@ msgstr "%s的消息中的标签"
 msgid "Unknown"
 msgstr "未知的"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "关注的"
 
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
 msgid "All subscriptions"
 msgstr "所有关注的"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "关注者"
 
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
 msgid "All subscribers"
 msgstr "所有关注者"
 
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
 msgid "User ID"
 msgstr "用户 ID"
 
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
 msgid "Member since"
 msgstr "注册时间"
 
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. TRANS: Label for user statistics.
+#. TRANS: Average count of posts made per day since account registration.
+#: lib/profileaction.php:253
 msgid "Daily average"
 msgstr "日均"
 
-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305
 msgid "All groups"
 msgstr "所有小组"
 
@@ -8992,48 +9038,60 @@ msgstr "取消关注"
 msgid "User %1$s (%2$d) has no profile record."
 msgstr "用户 %1$s (%2$d) 没有个人信息记录。"
 
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
 msgid "Edit Avatar"
 msgstr "编辑头像"
 
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
 msgid "User actions"
 msgstr "用户动作"
 
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
 msgid "User deletion in progress..."
 msgstr "用户删除处理中……"
 
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
 msgid "Edit profile settings"
 msgstr "编辑个人信息设置"
 
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
 msgid "Edit"
 msgstr "编辑"
 
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
 msgid "Send a direct message to this user"
 msgstr "给该用户发送私信"
 
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
 msgid "Message"
 msgstr "私信"
 
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
 msgid "Moderate"
 msgstr "审核"
 
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
 msgid "User role"
 msgstr "用户权限"
 
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
 msgctxt "role"
 msgid "Administrator"
 msgstr "管理员"
 
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
 msgctxt "role"
 msgid "Moderator"
 msgstr "审核员"
@@ -9118,43 +9176,17 @@ 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:64
+#: lib/xrd.php:63
 msgid "Invalid XML."
 msgstr "无效的 XML。"
 
 #. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
 msgid "Invalid XML, missing XRD root."
-msgstr ""
+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 "No such group"
-#~ msgstr "没有这个组。"
-
-#, fuzzy
-#~ msgid "HTTP method not supported"
-#~ msgstr "HTTP 方法不支持。"
-
-#~ msgid "Reset"
-#~ msgstr "重置"
-
-#~ msgid ""
-#~ "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-#~ msgstr "1 到 64 位的小写字母或数字，不能使用标点和空格。此项必填。"
-
-#~ msgid "6 or more characters. Required."
-#~ msgstr "至少 6 位字符。此项必填。"
-
-#~ msgid "Same as password above. Required."
-#~ msgstr "与上面输入相同的密码。此项必填。"
-
-#~ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-#~ msgstr "1 到 64 个小写字母或数字，不包含标点或空格"
-
-#~ msgid "%s is not a valid color!"
-#~ msgstr "%s不是有效的颜色！"
diff --git a/plugins/APC/locale/APC.pot b/plugins/APC/locale/APC.pot
index 5a02165ae5..9069b7d867 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/APC/locale/be-tarask/LC_MESSAGES/APC.po b/plugins/APC/locale/be-tarask/LC_MESSAGES/APC.po
index 6c0f3ee90c..efc6b353c7 100644
--- a/plugins/APC/locale/be-tarask/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/be-tarask/LC_MESSAGES/APC.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - APC to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: EugeneZelenko
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:43+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:16+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-10 18:25:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
diff --git a/plugins/APC/locale/br/LC_MESSAGES/APC.po b/plugins/APC/locale/br/LC_MESSAGES/APC.po
index 2183ce6590..5323bcd24f 100644
--- a/plugins/APC/locale/br/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/br/LC_MESSAGES/APC.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - APC to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Fulup
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:29+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
diff --git a/plugins/APC/locale/es/LC_MESSAGES/APC.po b/plugins/APC/locale/es/LC_MESSAGES/APC.po
index c3f550489d..8542aa3825 100644
--- a/plugins/APC/locale/es/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/es/LC_MESSAGES/APC.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - APC to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:29+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
diff --git a/plugins/APC/locale/fr/LC_MESSAGES/APC.po b/plugins/APC/locale/fr/LC_MESSAGES/APC.po
index 727ff53925..8e7e7b1654 100644
--- a/plugins/APC/locale/fr/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/fr/LC_MESSAGES/APC.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - APC to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Verdy p
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:29+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
diff --git a/plugins/APC/locale/gl/LC_MESSAGES/APC.po b/plugins/APC/locale/gl/LC_MESSAGES/APC.po
index 346f56c223..d23ee59795 100644
--- a/plugins/APC/locale/gl/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/gl/LC_MESSAGES/APC.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - APC to Galician (Galego)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Toliño
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:29+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
diff --git a/plugins/APC/locale/he/LC_MESSAGES/APC.po b/plugins/APC/locale/he/LC_MESSAGES/APC.po
index 1dcb5622ac..ced1738a2e 100644
--- a/plugins/APC/locale/he/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/he/LC_MESSAGES/APC.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - APC to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:29+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
diff --git a/plugins/APC/locale/ia/LC_MESSAGES/APC.po b/plugins/APC/locale/ia/LC_MESSAGES/APC.po
index 044126ae65..cbdb37f563 100644
--- a/plugins/APC/locale/ia/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/ia/LC_MESSAGES/APC.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - APC to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:29+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
diff --git a/plugins/APC/locale/id/LC_MESSAGES/APC.po b/plugins/APC/locale/id/LC_MESSAGES/APC.po
index 377e44831b..7adc407f07 100644
--- a/plugins/APC/locale/id/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/id/LC_MESSAGES/APC.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - APC to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:29+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
diff --git a/plugins/APC/locale/mk/LC_MESSAGES/APC.po b/plugins/APC/locale/mk/LC_MESSAGES/APC.po
index db9d292608..88636ac364 100644
--- a/plugins/APC/locale/mk/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/mk/LC_MESSAGES/APC.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - APC to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:29+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
diff --git a/plugins/APC/locale/nb/LC_MESSAGES/APC.po b/plugins/APC/locale/nb/LC_MESSAGES/APC.po
index 80afde4aeb..728079ab8b 100644
--- a/plugins/APC/locale/nb/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/nb/LC_MESSAGES/APC.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - APC to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:29+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
diff --git a/plugins/APC/locale/nl/LC_MESSAGES/APC.po b/plugins/APC/locale/nl/LC_MESSAGES/APC.po
index 827e5b07af..6fd9d5097e 100644
--- a/plugins/APC/locale/nl/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/nl/LC_MESSAGES/APC.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - APC to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:29+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
diff --git a/plugins/APC/locale/pl/LC_MESSAGES/APC.po b/plugins/APC/locale/pl/LC_MESSAGES/APC.po
index 12d77edb4c..ce4e3d775f 100644
--- a/plugins/APC/locale/pl/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/pl/LC_MESSAGES/APC.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - APC to Polish (Polski)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Sp5uhe
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:29+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:16+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: 2010-11-29 19:38:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
diff --git a/plugins/APC/locale/pt/LC_MESSAGES/APC.po b/plugins/APC/locale/pt/LC_MESSAGES/APC.po
index 51f5644beb..272a40f285 100644
--- a/plugins/APC/locale/pt/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/pt/LC_MESSAGES/APC.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - APC to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Waldir
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:29+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
diff --git a/plugins/APC/locale/pt_BR/LC_MESSAGES/APC.po b/plugins/APC/locale/pt_BR/LC_MESSAGES/APC.po
index ed7583e5c8..820cc399e3 100644
--- a/plugins/APC/locale/pt_BR/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/pt_BR/LC_MESSAGES/APC.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - APC to Brazilian Portuguese (Português do Brasil)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Giro720
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:29+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
diff --git a/plugins/APC/locale/ru/LC_MESSAGES/APC.po b/plugins/APC/locale/ru/LC_MESSAGES/APC.po
index 617b924567..22e138b3ab 100644
--- a/plugins/APC/locale/ru/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/ru/LC_MESSAGES/APC.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - APC to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Александр Сигачёв
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:29+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
diff --git a/plugins/APC/locale/tl/LC_MESSAGES/APC.po b/plugins/APC/locale/tl/LC_MESSAGES/APC.po
index b9b45b8a0c..d4fd9a85f0 100644
--- a/plugins/APC/locale/tl/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/tl/LC_MESSAGES/APC.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - APC to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:29+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
diff --git a/plugins/APC/locale/uk/LC_MESSAGES/APC.po b/plugins/APC/locale/uk/LC_MESSAGES/APC.po
index 2b381d3313..e120089a3c 100644
--- a/plugins/APC/locale/uk/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/uk/LC_MESSAGES/APC.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - APC to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:29+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
diff --git a/plugins/APC/locale/zh_CN/LC_MESSAGES/APC.po b/plugins/APC/locale/zh_CN/LC_MESSAGES/APC.po
index 39666116b4..de1063286a 100644
--- a/plugins/APC/locale/zh_CN/LC_MESSAGES/APC.po
+++ b/plugins/APC/locale/zh_CN/LC_MESSAGES/APC.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - APC to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Chenxiaoqino
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - APC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:29+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:16+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: 2010-11-29 19:38:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-apc\n"
diff --git a/plugins/Adsense/locale/Adsense.pot b/plugins/Adsense/locale/Adsense.pot
index 3adac7ea93..9f4cb0ccd1 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/Adsense/locale/be-tarask/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/be-tarask/LC_MESSAGES/Adsense.po
index 5214fbf141..0e3bd0e0f7 100644
--- a/plugins/Adsense/locale/be-tarask/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/be-tarask/LC_MESSAGES/Adsense.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Adsense to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: EugeneZelenko
 # Author: Jim-by
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:40+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:13+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-10 18:25:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
diff --git a/plugins/Adsense/locale/br/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/br/LC_MESSAGES/Adsense.po
index 8cb8ca2c9e..d828b6fc13 100644
--- a/plugins/Adsense/locale/br/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/br/LC_MESSAGES/Adsense.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Adsense to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Y-M D
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:25+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 20:40:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
diff --git a/plugins/Adsense/locale/de/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/de/LC_MESSAGES/Adsense.po
index bfd9c91557..632adfa07d 100644
--- a/plugins/Adsense/locale/de/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/de/LC_MESSAGES/Adsense.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - Adsense to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
+# Author: Michael
 # Author: The Evil IP address
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:26+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 20:40:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
@@ -70,7 +71,7 @@ msgstr ""
 
 #: adsenseadminpanel.php:182
 msgid "Rectangle"
-msgstr ""
+msgstr "Rechteck"
 
 #: adsenseadminpanel.php:183
 msgid "Rectangle slot code"
diff --git a/plugins/Adsense/locale/es/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/es/LC_MESSAGES/Adsense.po
index 600e93b3a0..090083bcef 100644
--- a/plugins/Adsense/locale/es/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/es/LC_MESSAGES/Adsense.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Adsense to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:26+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 20:40:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
diff --git a/plugins/Adsense/locale/fr/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/fr/LC_MESSAGES/Adsense.po
index 64dd5a19fb..a27df2f7ba 100644
--- a/plugins/Adsense/locale/fr/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/fr/LC_MESSAGES/Adsense.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Adsense to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # Author: Verdy p
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:26+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 20:40:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
diff --git a/plugins/Adsense/locale/gl/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/gl/LC_MESSAGES/Adsense.po
index f3288ab509..89922e3e58 100644
--- a/plugins/Adsense/locale/gl/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/gl/LC_MESSAGES/Adsense.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Adsense to Galician (Galego)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Toliño
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:40+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:13+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-10 18:25:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
diff --git a/plugins/Adsense/locale/ia/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/ia/LC_MESSAGES/Adsense.po
index 398f41cb92..b6e28cbecb 100644
--- a/plugins/Adsense/locale/ia/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/ia/LC_MESSAGES/Adsense.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Adsense to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:26+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 20:40:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
diff --git a/plugins/Adsense/locale/it/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/it/LC_MESSAGES/Adsense.po
index b741344093..4e24b45d5d 100644
--- a/plugins/Adsense/locale/it/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/it/LC_MESSAGES/Adsense.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Adsense to Italian (Italiano)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Milocasagrande
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:26+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-POT-Import-Date: 2010-11-30 20:40:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: it\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
diff --git a/plugins/Adsense/locale/ka/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/ka/LC_MESSAGES/Adsense.po
index 7ff0daff8b..af27e31ea1 100644
--- a/plugins/Adsense/locale/ka/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/ka/LC_MESSAGES/Adsense.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Adsense to Georgian (ქართული)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Zaal
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:26+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:13+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: 2010-11-30 20:40:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ka\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
diff --git a/plugins/Adsense/locale/mk/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/mk/LC_MESSAGES/Adsense.po
index d09bd254a8..3e27633f30 100644
--- a/plugins/Adsense/locale/mk/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/mk/LC_MESSAGES/Adsense.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Adsense to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:26+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 20:40:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
diff --git a/plugins/Adsense/locale/nl/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/nl/LC_MESSAGES/Adsense.po
index 2ee52177c3..0a5a62f4cf 100644
--- a/plugins/Adsense/locale/nl/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/nl/LC_MESSAGES/Adsense.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Adsense to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:26+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 20:40:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
diff --git a/plugins/Adsense/locale/pt/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/pt/LC_MESSAGES/Adsense.po
index bc0707079b..9c882f885e 100644
--- a/plugins/Adsense/locale/pt/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/pt/LC_MESSAGES/Adsense.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Adsense to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Waldir
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:26+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:13+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: 2010-11-30 20:40:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
diff --git a/plugins/Adsense/locale/pt_BR/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/pt_BR/LC_MESSAGES/Adsense.po
index 7fa9b02822..b631e40d8b 100644
--- a/plugins/Adsense/locale/pt_BR/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/pt_BR/LC_MESSAGES/Adsense.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Adsense to Brazilian Portuguese (Português do Brasil)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Giro720
 # Author: Luckas Blade
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:26+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:13+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: 2010-11-30 20:40:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
diff --git a/plugins/Adsense/locale/ru/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/ru/LC_MESSAGES/Adsense.po
index 684769b7c8..cd13346eed 100644
--- a/plugins/Adsense/locale/ru/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/ru/LC_MESSAGES/Adsense.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Adsense to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Lockal
 # Author: Сrower
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:27+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 20:40:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
diff --git a/plugins/Adsense/locale/sv/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/sv/LC_MESSAGES/Adsense.po
index 0c2efda116..3f801f9389 100644
--- a/plugins/Adsense/locale/sv/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/sv/LC_MESSAGES/Adsense.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Adsense to Swedish (Svenska)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Jamminjohn
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:27+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:14+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: 2010-11-30 20:40:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
diff --git a/plugins/Adsense/locale/tl/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/tl/LC_MESSAGES/Adsense.po
index 0f474a73e9..796418a82d 100644
--- a/plugins/Adsense/locale/tl/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/tl/LC_MESSAGES/Adsense.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Adsense to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:27+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 20:40:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
diff --git a/plugins/Adsense/locale/uk/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/uk/LC_MESSAGES/Adsense.po
index 591ce56c46..6c027b4ba7 100644
--- a/plugins/Adsense/locale/uk/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/uk/LC_MESSAGES/Adsense.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Adsense to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:27+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 20:40:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
diff --git a/plugins/Adsense/locale/zh_CN/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/zh_CN/LC_MESSAGES/Adsense.po
index dde80f4e9e..820a9a8821 100644
--- a/plugins/Adsense/locale/zh_CN/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/zh_CN/LC_MESSAGES/Adsense.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Adsense to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Chenxiaoqino
 # Author: ZhengYiFeng
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Adsense\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:27+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 20:40:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
diff --git a/plugins/AnonymousFave/locale/AnonymousFave.pot b/plugins/AnonymousFave/locale/AnonymousFave.pot
index 46e5e79565..27f66777b3 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/AnonymousFave/locale/be-tarask/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/be-tarask/LC_MESSAGES/AnonymousFave.po
index 2bbc454eee..8f992cc067 100644
--- a/plugins/AnonymousFave/locale/be-tarask/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/be-tarask/LC_MESSAGES/AnonymousFave.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - AnonymousFave to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: EugeneZelenko
 # Author: Jim-by
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:42+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:15+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-10 18:25:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
diff --git a/plugins/AnonymousFave/locale/br/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/br/LC_MESSAGES/AnonymousFave.po
index 63d668602b..c0540eb433 100644
--- a/plugins/AnonymousFave/locale/br/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/br/LC_MESSAGES/AnonymousFave.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - AnonymousFave to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Y-M D
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:28+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
diff --git a/plugins/AnonymousFave/locale/de/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/de/LC_MESSAGES/AnonymousFave.po
index ed7eee5050..f105adc3c8 100644
--- a/plugins/AnonymousFave/locale/de/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/de/LC_MESSAGES/AnonymousFave.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - AnonymousFave to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:28+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
diff --git a/plugins/AnonymousFave/locale/es/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/es/LC_MESSAGES/AnonymousFave.po
index f8ca6f6962..9dfe3737f5 100644
--- a/plugins/AnonymousFave/locale/es/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/es/LC_MESSAGES/AnonymousFave.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - AnonymousFave to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Locos epraix
 # Author: Translationista
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:28+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
diff --git a/plugins/AnonymousFave/locale/fr/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/fr/LC_MESSAGES/AnonymousFave.po
index 7057d23a5c..576e6a6e93 100644
--- a/plugins/AnonymousFave/locale/fr/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/fr/LC_MESSAGES/AnonymousFave.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - AnonymousFave to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:28+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
diff --git a/plugins/AnonymousFave/locale/gl/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/gl/LC_MESSAGES/AnonymousFave.po
index 4219415255..3c15e819cf 100644
--- a/plugins/AnonymousFave/locale/gl/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/gl/LC_MESSAGES/AnonymousFave.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - AnonymousFave to Galician (Galego)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Toliño
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:28+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
diff --git a/plugins/AnonymousFave/locale/ia/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/ia/LC_MESSAGES/AnonymousFave.po
index 6f3039db2d..1fb662431c 100644
--- a/plugins/AnonymousFave/locale/ia/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/ia/LC_MESSAGES/AnonymousFave.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - AnonymousFave to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:28+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
diff --git a/plugins/AnonymousFave/locale/mk/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/mk/LC_MESSAGES/AnonymousFave.po
index ff338c7a83..851bbcf3a0 100644
--- a/plugins/AnonymousFave/locale/mk/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/mk/LC_MESSAGES/AnonymousFave.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - AnonymousFave to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:28+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
diff --git a/plugins/AnonymousFave/locale/nl/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/nl/LC_MESSAGES/AnonymousFave.po
index 2910085a28..e98a66c527 100644
--- a/plugins/AnonymousFave/locale/nl/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/nl/LC_MESSAGES/AnonymousFave.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - AnonymousFave to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: SPQRobin
 # Author: Siebrand
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:28+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
diff --git a/plugins/AnonymousFave/locale/pt/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/pt/LC_MESSAGES/AnonymousFave.po
index eaea31ce33..83febad297 100644
--- a/plugins/AnonymousFave/locale/pt/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/pt/LC_MESSAGES/AnonymousFave.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - AnonymousFave to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Waldir
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:28+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
diff --git a/plugins/AnonymousFave/locale/ru/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/ru/LC_MESSAGES/AnonymousFave.po
index a0f4c8c8da..315f19a735 100644
--- a/plugins/AnonymousFave/locale/ru/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/ru/LC_MESSAGES/AnonymousFave.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - AnonymousFave to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Lockal
 # Author: MaxSem
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:28+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
diff --git a/plugins/AnonymousFave/locale/tl/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/tl/LC_MESSAGES/AnonymousFave.po
index 23e5fe8df3..7ef2920cb0 100644
--- a/plugins/AnonymousFave/locale/tl/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/tl/LC_MESSAGES/AnonymousFave.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - AnonymousFave to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:28+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
diff --git a/plugins/AnonymousFave/locale/uk/LC_MESSAGES/AnonymousFave.po b/plugins/AnonymousFave/locale/uk/LC_MESSAGES/AnonymousFave.po
index 622f9c0d89..db3953db33 100644
--- a/plugins/AnonymousFave/locale/uk/LC_MESSAGES/AnonymousFave.po
+++ b/plugins/AnonymousFave/locale/uk/LC_MESSAGES/AnonymousFave.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - AnonymousFave to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AnonymousFave\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:28+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-anonymousfave\n"
diff --git a/plugins/AutoSandbox/locale/AutoSandbox.pot b/plugins/AutoSandbox/locale/AutoSandbox.pot
index 30f2de67e1..14e29e0cc0 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/be-tarask/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/be-tarask/LC_MESSAGES/AutoSandbox.po
index 8404811696..46c72f13ce 100644
--- a/plugins/AutoSandbox/locale/be-tarask/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/be-tarask/LC_MESSAGES/AutoSandbox.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - AutoSandbox to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: EugeneZelenko
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:44+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:18+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-10 18:25:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
diff --git a/plugins/AutoSandbox/locale/br/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/br/LC_MESSAGES/AutoSandbox.po
index 3d52b43a20..60b0b3be2d 100644
--- a/plugins/AutoSandbox/locale/br/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/br/LC_MESSAGES/AutoSandbox.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - AutoSandbox to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Fulup
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:30+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
diff --git a/plugins/AutoSandbox/locale/de/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/de/LC_MESSAGES/AutoSandbox.po
index 88b78d4263..31f32e7c47 100644
--- a/plugins/AutoSandbox/locale/de/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/de/LC_MESSAGES/AutoSandbox.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - AutoSandbox to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:30+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
diff --git a/plugins/AutoSandbox/locale/es/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/es/LC_MESSAGES/AutoSandbox.po
index cf74ada916..9031a1be5e 100644
--- a/plugins/AutoSandbox/locale/es/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/es/LC_MESSAGES/AutoSandbox.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - AutoSandbox to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:30+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
diff --git a/plugins/AutoSandbox/locale/fr/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/fr/LC_MESSAGES/AutoSandbox.po
index 9044ffeb88..89846c4c2a 100644
--- a/plugins/AutoSandbox/locale/fr/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/fr/LC_MESSAGES/AutoSandbox.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - AutoSandbox to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:31+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
diff --git a/plugins/AutoSandbox/locale/ia/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/ia/LC_MESSAGES/AutoSandbox.po
index 85e0c2a55c..3f508a43d1 100644
--- a/plugins/AutoSandbox/locale/ia/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/ia/LC_MESSAGES/AutoSandbox.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - AutoSandbox to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:31+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
diff --git a/plugins/AutoSandbox/locale/mk/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/mk/LC_MESSAGES/AutoSandbox.po
index cde826c135..7702a00175 100644
--- a/plugins/AutoSandbox/locale/mk/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/mk/LC_MESSAGES/AutoSandbox.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - AutoSandbox to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:31+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
diff --git a/plugins/AutoSandbox/locale/nl/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/nl/LC_MESSAGES/AutoSandbox.po
index cbc6e5be62..786ab20f37 100644
--- a/plugins/AutoSandbox/locale/nl/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/nl/LC_MESSAGES/AutoSandbox.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - AutoSandbox to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:31+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
diff --git a/plugins/AutoSandbox/locale/ru/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/ru/LC_MESSAGES/AutoSandbox.po
index 2d433bac80..4dcf7ea907 100644
--- a/plugins/AutoSandbox/locale/ru/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/ru/LC_MESSAGES/AutoSandbox.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - AutoSandbox to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: MaxSem
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:31+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
diff --git a/plugins/AutoSandbox/locale/tl/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/tl/LC_MESSAGES/AutoSandbox.po
index 8bf9f4788d..36b523373b 100644
--- a/plugins/AutoSandbox/locale/tl/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/tl/LC_MESSAGES/AutoSandbox.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - AutoSandbox to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:31+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
diff --git a/plugins/AutoSandbox/locale/uk/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/uk/LC_MESSAGES/AutoSandbox.po
index d73c3250cb..c3ed36cabc 100644
--- a/plugins/AutoSandbox/locale/uk/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/uk/LC_MESSAGES/AutoSandbox.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - AutoSandbox to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:31+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
diff --git a/plugins/AutoSandbox/locale/zh_CN/LC_MESSAGES/AutoSandbox.po b/plugins/AutoSandbox/locale/zh_CN/LC_MESSAGES/AutoSandbox.po
index 943cff9abf..0f81892f0c 100644
--- a/plugins/AutoSandbox/locale/zh_CN/LC_MESSAGES/AutoSandbox.po
+++ b/plugins/AutoSandbox/locale/zh_CN/LC_MESSAGES/AutoSandbox.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - AutoSandbox to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - AutoSandbox\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:31+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:18+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: 2010-11-29 19:38:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-autosandbox\n"
diff --git a/plugins/Autocomplete/locale/Autocomplete.pot b/plugins/Autocomplete/locale/Autocomplete.pot
index 931338817f..04c0ccfc03 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/be-tarask/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/be-tarask/LC_MESSAGES/Autocomplete.po
index dd840b9804..33d297d9b4 100644
--- a/plugins/Autocomplete/locale/be-tarask/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/be-tarask/LC_MESSAGES/Autocomplete.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Autocomplete to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: EugeneZelenko
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:43+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:17+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-10 18:25:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
diff --git a/plugins/Autocomplete/locale/br/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/br/LC_MESSAGES/Autocomplete.po
index 56d5ae1956..2cfd56e69e 100644
--- a/plugins/Autocomplete/locale/br/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/br/LC_MESSAGES/Autocomplete.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Autocomplete to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Fulup
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:30+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
diff --git a/plugins/Autocomplete/locale/de/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/de/LC_MESSAGES/Autocomplete.po
index df2da160e2..86215a55fc 100644
--- a/plugins/Autocomplete/locale/de/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/de/LC_MESSAGES/Autocomplete.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Autocomplete to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:30+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
diff --git a/plugins/Autocomplete/locale/es/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/es/LC_MESSAGES/Autocomplete.po
index e37271564f..88007fc08c 100644
--- a/plugins/Autocomplete/locale/es/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/es/LC_MESSAGES/Autocomplete.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Autocomplete to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:30+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
diff --git a/plugins/Autocomplete/locale/fr/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/fr/LC_MESSAGES/Autocomplete.po
index e974dfa43c..578e0d4648 100644
--- a/plugins/Autocomplete/locale/fr/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/fr/LC_MESSAGES/Autocomplete.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Autocomplete to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:30+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
diff --git a/plugins/Autocomplete/locale/he/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/he/LC_MESSAGES/Autocomplete.po
index b3b28438fb..77988b0ad9 100644
--- a/plugins/Autocomplete/locale/he/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/he/LC_MESSAGES/Autocomplete.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Autocomplete to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:30+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
diff --git a/plugins/Autocomplete/locale/ia/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/ia/LC_MESSAGES/Autocomplete.po
index fc41bf9604..45bbd8e3d3 100644
--- a/plugins/Autocomplete/locale/ia/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/ia/LC_MESSAGES/Autocomplete.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Autocomplete to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:30+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
diff --git a/plugins/Autocomplete/locale/id/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/id/LC_MESSAGES/Autocomplete.po
index 1965eeb705..9405e42543 100644
--- a/plugins/Autocomplete/locale/id/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/id/LC_MESSAGES/Autocomplete.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Autocomplete to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:30+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
diff --git a/plugins/Autocomplete/locale/ja/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/ja/LC_MESSAGES/Autocomplete.po
index 33db41cebe..fc277e2ff6 100644
--- a/plugins/Autocomplete/locale/ja/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/ja/LC_MESSAGES/Autocomplete.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Autocomplete to Japanese (日本語)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: 青子守歌
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:30+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:17+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: 2010-11-29 19:38:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
diff --git a/plugins/Autocomplete/locale/mk/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/mk/LC_MESSAGES/Autocomplete.po
index 31e10f95eb..f601901584 100644
--- a/plugins/Autocomplete/locale/mk/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/mk/LC_MESSAGES/Autocomplete.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Autocomplete to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:30+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
diff --git a/plugins/Autocomplete/locale/nl/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/nl/LC_MESSAGES/Autocomplete.po
index f8d42a7c44..9f99c5ec8d 100644
--- a/plugins/Autocomplete/locale/nl/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/nl/LC_MESSAGES/Autocomplete.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Autocomplete to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:30+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
diff --git a/plugins/Autocomplete/locale/pt/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/pt/LC_MESSAGES/Autocomplete.po
index ec05e4afe6..bdf3a471a5 100644
--- a/plugins/Autocomplete/locale/pt/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/pt/LC_MESSAGES/Autocomplete.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Autocomplete to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Hamilton Abreu
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:30+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
diff --git a/plugins/Autocomplete/locale/pt_BR/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/pt_BR/LC_MESSAGES/Autocomplete.po
index 7315553e88..111b30afbb 100644
--- a/plugins/Autocomplete/locale/pt_BR/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/pt_BR/LC_MESSAGES/Autocomplete.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Autocomplete to Brazilian Portuguese (Português do Brasil)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Giro720
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:30+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
diff --git a/plugins/Autocomplete/locale/ru/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/ru/LC_MESSAGES/Autocomplete.po
index 46b5cbd16e..0607f82323 100644
--- a/plugins/Autocomplete/locale/ru/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/ru/LC_MESSAGES/Autocomplete.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Autocomplete to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Александр Сигачёв
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:30+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
diff --git a/plugins/Autocomplete/locale/tl/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/tl/LC_MESSAGES/Autocomplete.po
index 5f0342864e..3e063c4959 100644
--- a/plugins/Autocomplete/locale/tl/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/tl/LC_MESSAGES/Autocomplete.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Autocomplete to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:30+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
diff --git a/plugins/Autocomplete/locale/uk/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/uk/LC_MESSAGES/Autocomplete.po
index 0d0bdb2e2a..f08fe54789 100644
--- a/plugins/Autocomplete/locale/uk/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/uk/LC_MESSAGES/Autocomplete.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Autocomplete to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:30+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
diff --git a/plugins/Autocomplete/locale/zh_CN/LC_MESSAGES/Autocomplete.po b/plugins/Autocomplete/locale/zh_CN/LC_MESSAGES/Autocomplete.po
index e13ff9cd25..9580312bb8 100644
--- a/plugins/Autocomplete/locale/zh_CN/LC_MESSAGES/Autocomplete.po
+++ b/plugins/Autocomplete/locale/zh_CN/LC_MESSAGES/Autocomplete.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Autocomplete to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Chenxiaoqino
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Autocomplete\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:30+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:38:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-autocomplete\n"
diff --git a/plugins/Awesomeness/locale/Awesomeness.pot b/plugins/Awesomeness/locale/Awesomeness.pot
index d86062c0c8..df2faaa0fd 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-14 23:32+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/be-tarask/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/be-tarask/LC_MESSAGES/Awesomeness.po
index ea7166d3d2..7e475fe449 100644
--- a/plugins/Awesomeness/locale/be-tarask/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/be-tarask/LC_MESSAGES/Awesomeness.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Awesomeness to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: EugeneZelenko
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:35+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:18+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 (r80343); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
diff --git a/plugins/Awesomeness/locale/fr/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/fr/LC_MESSAGES/Awesomeness.po
index 8b4fc2b09a..9b713aecce 100644
--- a/plugins/Awesomeness/locale/fr/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/fr/LC_MESSAGES/Awesomeness.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Awesomeness to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Sherbrooke
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:35+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-14 13:18:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
diff --git a/plugins/Awesomeness/locale/ia/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/ia/LC_MESSAGES/Awesomeness.po
index 7cdbe4226b..1e907af3cf 100644
--- a/plugins/Awesomeness/locale/ia/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/ia/LC_MESSAGES/Awesomeness.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Awesomeness to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:35+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-14 13:18:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
diff --git a/plugins/Awesomeness/locale/mk/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/mk/LC_MESSAGES/Awesomeness.po
index 3a17783e0c..934dd70ff1 100644
--- a/plugins/Awesomeness/locale/mk/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/mk/LC_MESSAGES/Awesomeness.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Awesomeness to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:35+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-14 13:18:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
diff --git a/plugins/Awesomeness/locale/nl/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/nl/LC_MESSAGES/Awesomeness.po
index 439a0b5db3..0f06e24a90 100644
--- a/plugins/Awesomeness/locale/nl/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/nl/LC_MESSAGES/Awesomeness.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Awesomeness to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:35+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-14 13:18:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
diff --git a/plugins/Awesomeness/locale/ru/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/ru/LC_MESSAGES/Awesomeness.po
index 035f8a445e..3de520e8b0 100644
--- a/plugins/Awesomeness/locale/ru/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/ru/LC_MESSAGES/Awesomeness.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Awesomeness to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Александр Сигачёв
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:35+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-14 13:18:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
diff --git a/plugins/Awesomeness/locale/uk/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/uk/LC_MESSAGES/Awesomeness.po
index 865442ddc2..94cca550dc 100644
--- a/plugins/Awesomeness/locale/uk/LC_MESSAGES/Awesomeness.po
+++ b/plugins/Awesomeness/locale/uk/LC_MESSAGES/Awesomeness.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Awesomeness to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Awesomeness\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:35+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-14 13:18:30+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-awesomeness\n"
diff --git a/plugins/BitlyUrl/locale/BitlyUrl.pot b/plugins/BitlyUrl/locale/BitlyUrl.pot
index c75936ef14..fde23a22af 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/BitlyUrl/locale/be-tarask/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/be-tarask/LC_MESSAGES/BitlyUrl.po
index 57288dad56..8cece258e4 100644
--- a/plugins/BitlyUrl/locale/be-tarask/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/be-tarask/LC_MESSAGES/BitlyUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BitlyUrl to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: EugeneZelenko
 # Author: Jim-by
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:46+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:20+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-10 18:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
diff --git a/plugins/BitlyUrl/locale/de/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/de/LC_MESSAGES/BitlyUrl.po
index 69cc987426..0d48c0699c 100644
--- a/plugins/BitlyUrl/locale/de/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/de/LC_MESSAGES/BitlyUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BitlyUrl to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Michael
 # Author: The Evil IP address
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:32+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 20:40:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
diff --git a/plugins/BitlyUrl/locale/fr/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/fr/LC_MESSAGES/BitlyUrl.po
index 619c0ac4b3..bf46115af5 100644
--- a/plugins/BitlyUrl/locale/fr/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/fr/LC_MESSAGES/BitlyUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BitlyUrl to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:32+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 20:40:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
diff --git a/plugins/BitlyUrl/locale/gl/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/gl/LC_MESSAGES/BitlyUrl.po
index 7579d59f1b..c66df9d09d 100644
--- a/plugins/BitlyUrl/locale/gl/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/gl/LC_MESSAGES/BitlyUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BitlyUrl to Galician (Galego)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Toliño
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:46+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
diff --git a/plugins/BitlyUrl/locale/ia/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/ia/LC_MESSAGES/BitlyUrl.po
index 14fe26a8d5..e76e01c997 100644
--- a/plugins/BitlyUrl/locale/ia/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/ia/LC_MESSAGES/BitlyUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BitlyUrl to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:32+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 20:40:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
diff --git a/plugins/BitlyUrl/locale/mk/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/mk/LC_MESSAGES/BitlyUrl.po
index ad6c5ccd02..8f883adb5d 100644
--- a/plugins/BitlyUrl/locale/mk/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/mk/LC_MESSAGES/BitlyUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BitlyUrl to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:32+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 20:40:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
diff --git a/plugins/BitlyUrl/locale/nb/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/nb/LC_MESSAGES/BitlyUrl.po
index d2067438d6..99b85e7f9a 100644
--- a/plugins/BitlyUrl/locale/nb/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/nb/LC_MESSAGES/BitlyUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BitlyUrl to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:32+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 20:40:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
diff --git a/plugins/BitlyUrl/locale/nl/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/nl/LC_MESSAGES/BitlyUrl.po
index a5a502c6ca..85757890b2 100644
--- a/plugins/BitlyUrl/locale/nl/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/nl/LC_MESSAGES/BitlyUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BitlyUrl to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:32+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 20:40:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
diff --git a/plugins/BitlyUrl/locale/ru/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/ru/LC_MESSAGES/BitlyUrl.po
index 1c32944812..193e793952 100644
--- a/plugins/BitlyUrl/locale/ru/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/ru/LC_MESSAGES/BitlyUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BitlyUrl to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Eleferen
 # Author: Lockal
@@ -11,13 +11,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:46+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
diff --git a/plugins/BitlyUrl/locale/uk/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/uk/LC_MESSAGES/BitlyUrl.po
index eb45c857ed..1f8701ec8f 100644
--- a/plugins/BitlyUrl/locale/uk/LC_MESSAGES/BitlyUrl.po
+++ b/plugins/BitlyUrl/locale/uk/LC_MESSAGES/BitlyUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BitlyUrl to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BitlyUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:46+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-bitlyurl\n"
diff --git a/plugins/Blacklist/locale/Blacklist.pot b/plugins/Blacklist/locale/Blacklist.pot
index f3ff133468..63c2aeb6f3 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/Blacklist/locale/be-tarask/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/be-tarask/LC_MESSAGES/Blacklist.po
index 19d02bdd9a..f3973e3e20 100644
--- a/plugins/Blacklist/locale/be-tarask/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/be-tarask/LC_MESSAGES/Blacklist.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Blacklist to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: EugeneZelenko
 # Author: Jim-by
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:48+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:22+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-10 18:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
diff --git a/plugins/Blacklist/locale/br/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/br/LC_MESSAGES/Blacklist.po
index 6320720dd1..a2db3978ef 100644
--- a/plugins/Blacklist/locale/br/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/br/LC_MESSAGES/Blacklist.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Blacklist to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Y-M D
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:48+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-01-10 18:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
diff --git a/plugins/Blacklist/locale/de/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/de/LC_MESSAGES/Blacklist.po
index 1e6fd3c79b..198ac0fec8 100644
--- a/plugins/Blacklist/locale/de/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/de/LC_MESSAGES/Blacklist.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Blacklist to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:34+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:22+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: 2010-11-30 17:54:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
diff --git a/plugins/Blacklist/locale/es/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/es/LC_MESSAGES/Blacklist.po
index a78addf867..33a8ddbe2f 100644
--- a/plugins/Blacklist/locale/es/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/es/LC_MESSAGES/Blacklist.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Blacklist to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # Author: Translationista
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:34+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:22+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: 2010-11-30 17:54:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
diff --git a/plugins/Blacklist/locale/fr/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/fr/LC_MESSAGES/Blacklist.po
index 3b0d54ef18..e133fc0320 100644
--- a/plugins/Blacklist/locale/fr/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/fr/LC_MESSAGES/Blacklist.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Blacklist to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # Author: Verdy p
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:34+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:22+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 17:54:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
diff --git a/plugins/Blacklist/locale/ia/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/ia/LC_MESSAGES/Blacklist.po
index 973b832c79..d25f6ab3d3 100644
--- a/plugins/Blacklist/locale/ia/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/ia/LC_MESSAGES/Blacklist.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Blacklist to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:34+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 17:54:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
diff --git a/plugins/Blacklist/locale/mk/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/mk/LC_MESSAGES/Blacklist.po
index 285f480025..1d09847942 100644
--- a/plugins/Blacklist/locale/mk/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/mk/LC_MESSAGES/Blacklist.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Blacklist to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:34+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 17:54:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
diff --git a/plugins/Blacklist/locale/nl/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/nl/LC_MESSAGES/Blacklist.po
index ef8e1fa9d1..af65981334 100644
--- a/plugins/Blacklist/locale/nl/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/nl/LC_MESSAGES/Blacklist.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Blacklist to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:34+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 17:54:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
diff --git a/plugins/Blacklist/locale/ru/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/ru/LC_MESSAGES/Blacklist.po
index 29eb8cc02c..16acf45dd6 100644
--- a/plugins/Blacklist/locale/ru/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/ru/LC_MESSAGES/Blacklist.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Blacklist to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Eleferen
 # Author: Lockal
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:34+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 17:54:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
diff --git a/plugins/Blacklist/locale/uk/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/uk/LC_MESSAGES/Blacklist.po
index 92a6a161fa..0e44648587 100644
--- a/plugins/Blacklist/locale/uk/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/uk/LC_MESSAGES/Blacklist.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Blacklist to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:34+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 17:54:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
diff --git a/plugins/Blacklist/locale/zh_CN/LC_MESSAGES/Blacklist.po b/plugins/Blacklist/locale/zh_CN/LC_MESSAGES/Blacklist.po
index 1c0c66b9f8..dd07dc7d2a 100644
--- a/plugins/Blacklist/locale/zh_CN/LC_MESSAGES/Blacklist.po
+++ b/plugins/Blacklist/locale/zh_CN/LC_MESSAGES/Blacklist.po
@@ -1,7 +1,8 @@
 # Translation of StatusNet - Blacklist to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Chenxiaoqino
+# Author: Hydra
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -9,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Blacklist\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:34+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 17:54:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-blacklist\n"
@@ -24,27 +25,27 @@ msgstr ""
 
 #. TRANS: Validation failure for URL. %s is the URL.
 #: BlacklistPlugin.php:149
-#, fuzzy, php-format
+#, php-format
 msgid "You may not register with homepage \"%s\"."
-msgstr "你不能使用主页 '%s' 注册。"
+msgstr "您不可以注册与主页\"%s\"。"
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
 #: BlacklistPlugin.php:160
-#, fuzzy, php-format
+#, php-format
 msgid "You may not register with nickname \"%s\"."
-msgstr "你不能使用昵称 '%s' 注册。"
+msgstr "您不可以注册绰号\"%s\"。"
 
 #. TRANS: Validation failure for URL. %s is the URL.
 #: BlacklistPlugin.php:185
-#, fuzzy, php-format
+#, php-format
 msgid "You may not use homepage \"%s\"."
-msgstr "你不能使用主页 '%s'。"
+msgstr "您不可以使用 \"%s\" 当主页。"
 
 #. TRANS: Validation failure for nickname. %s is the nickname.
 #: BlacklistPlugin.php:196
-#, fuzzy, php-format
+#, php-format
 msgid "You may not use nickname \"%s\"."
-msgstr "你不能使用昵称 '%s'。"
+msgstr "您不可以使用 \"%s\" 的昵称。"
 
 #. TRANS: Validation failure for URL. %s is the URL.
 #: BlacklistPlugin.php:239
@@ -58,14 +59,12 @@ msgstr "为被禁止的昵称和URL模板创建黑名单。"
 
 #. TRANS: Menu item in admin panel.
 #: BlacklistPlugin.php:381
-#, fuzzy
 msgctxt "MENU"
 msgid "Blacklist"
 msgstr "黑名单"
 
 #. TRANS: Tooltip for menu item in admin panel.
 #: BlacklistPlugin.php:383
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Blacklist configuration"
 msgstr "黑名单配置"
@@ -95,9 +94,9 @@ 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
+#, php-format
 msgid "Can't subscribe to nickname \"%s\"."
-msgstr "你不能使用昵称 '%s'。"
+msgstr "昵称\"%s\"无法订阅。"
 
 #: blacklistadminpanel.php:52
 msgid "Blacklist"
diff --git a/plugins/BlankAd/locale/BlankAd.pot b/plugins/BlankAd/locale/BlankAd.pot
index 757df7daa6..646c31b781 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/be-tarask/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/be-tarask/LC_MESSAGES/BlankAd.po
index 10f142c88c..be70530da1 100644
--- a/plugins/BlankAd/locale/be-tarask/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/be-tarask/LC_MESSAGES/BlankAd.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlankAd to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: EugeneZelenko
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:23+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-10 18:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlankAd/locale/br/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/br/LC_MESSAGES/BlankAd.po
index 7d4547a0e2..c09dd53471 100644
--- a/plugins/BlankAd/locale/br/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/br/LC_MESSAGES/BlankAd.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlankAd to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Fulup
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlankAd/locale/de/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/de/LC_MESSAGES/BlankAd.po
index 2cdc4a9df7..6300b1fa2a 100644
--- a/plugins/BlankAd/locale/de/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/de/LC_MESSAGES/BlankAd.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlankAd to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlankAd/locale/es/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/es/LC_MESSAGES/BlankAd.po
index 6e64f7fb2e..ad69d2ba82 100644
--- a/plugins/BlankAd/locale/es/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/es/LC_MESSAGES/BlankAd.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlankAd to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlankAd/locale/fr/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/fr/LC_MESSAGES/BlankAd.po
index 7c9892c152..48cacac4d5 100644
--- a/plugins/BlankAd/locale/fr/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/fr/LC_MESSAGES/BlankAd.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlankAd to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlankAd/locale/he/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/he/LC_MESSAGES/BlankAd.po
index 0444e0b9d8..e69d753211 100644
--- a/plugins/BlankAd/locale/he/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/he/LC_MESSAGES/BlankAd.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlankAd to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:23+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:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlankAd/locale/ia/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/ia/LC_MESSAGES/BlankAd.po
index 80d2103e80..ea42bb1501 100644
--- a/plugins/BlankAd/locale/ia/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/ia/LC_MESSAGES/BlankAd.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlankAd to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlankAd/locale/mk/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/mk/LC_MESSAGES/BlankAd.po
index 91c08e9ec4..2eb63b3ae6 100644
--- a/plugins/BlankAd/locale/mk/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/mk/LC_MESSAGES/BlankAd.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlankAd to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlankAd/locale/nb/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/nb/LC_MESSAGES/BlankAd.po
index be02bf3d01..ff51d3f516 100644
--- a/plugins/BlankAd/locale/nb/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/nb/LC_MESSAGES/BlankAd.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlankAd to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlankAd/locale/nl/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/nl/LC_MESSAGES/BlankAd.po
index bbd3658c1a..886327a333 100644
--- a/plugins/BlankAd/locale/nl/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/nl/LC_MESSAGES/BlankAd.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlankAd to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlankAd/locale/pt/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/pt/LC_MESSAGES/BlankAd.po
index 522f170aa9..438aacbad8 100644
--- a/plugins/BlankAd/locale/pt/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/pt/LC_MESSAGES/BlankAd.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlankAd to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: GTNS
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-01-10 18:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlankAd/locale/ru/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/ru/LC_MESSAGES/BlankAd.po
index a54a59d6f6..384acb20d3 100644
--- a/plugins/BlankAd/locale/ru/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/ru/LC_MESSAGES/BlankAd.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlankAd to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Eleferen
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlankAd/locale/tl/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/tl/LC_MESSAGES/BlankAd.po
index 105d345f26..990004a659 100644
--- a/plugins/BlankAd/locale/tl/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/tl/LC_MESSAGES/BlankAd.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlankAd to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlankAd/locale/uk/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/uk/LC_MESSAGES/BlankAd.po
index 59cb404b7c..1c657fc02c 100644
--- a/plugins/BlankAd/locale/uk/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/uk/LC_MESSAGES/BlankAd.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlankAd to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlankAd/locale/zh_CN/LC_MESSAGES/BlankAd.po b/plugins/BlankAd/locale/zh_CN/LC_MESSAGES/BlankAd.po
index cbb95f58ff..b07ce716e8 100644
--- a/plugins/BlankAd/locale/zh_CN/LC_MESSAGES/BlankAd.po
+++ b/plugins/BlankAd/locale/zh_CN/LC_MESSAGES/BlankAd.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlankAd to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlankAd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-01-10 18:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-blankad\n"
diff --git a/plugins/BlogspamNet/locale/BlogspamNet.pot b/plugins/BlogspamNet/locale/BlogspamNet.pot
index a08f039f1d..2dfbea8343 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/be-tarask/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/be-tarask/LC_MESSAGES/BlogspamNet.po
index ef9ac94515..2b90a5e4cc 100644
--- a/plugins/BlogspamNet/locale/be-tarask/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/be-tarask/LC_MESSAGES/BlogspamNet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlogspamNet to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: EugeneZelenko
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:24+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-10 18:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/BlogspamNet/locale/br/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/br/LC_MESSAGES/BlogspamNet.po
index 5963bc442b..fb7215c83f 100644
--- a/plugins/BlogspamNet/locale/br/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/br/LC_MESSAGES/BlogspamNet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlogspamNet to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Fulup
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:24+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:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/BlogspamNet/locale/de/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/de/LC_MESSAGES/BlogspamNet.po
index 0935a0e406..c618d06ab9 100644
--- a/plugins/BlogspamNet/locale/de/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/de/LC_MESSAGES/BlogspamNet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlogspamNet to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/BlogspamNet/locale/es/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/es/LC_MESSAGES/BlogspamNet.po
index 99ad3a5fe4..1c7cf8c9f6 100644
--- a/plugins/BlogspamNet/locale/es/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/es/LC_MESSAGES/BlogspamNet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlogspamNet to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:24+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:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/BlogspamNet/locale/fr/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/fr/LC_MESSAGES/BlogspamNet.po
index 9ba1425208..39e554dd2f 100644
--- a/plugins/BlogspamNet/locale/fr/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/fr/LC_MESSAGES/BlogspamNet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlogspamNet to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/BlogspamNet/locale/he/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/he/LC_MESSAGES/BlogspamNet.po
index 5fada49f8d..8901d07eec 100644
--- a/plugins/BlogspamNet/locale/he/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/he/LC_MESSAGES/BlogspamNet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlogspamNet to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/BlogspamNet/locale/ia/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/ia/LC_MESSAGES/BlogspamNet.po
index d5fe8f9515..306bbff149 100644
--- a/plugins/BlogspamNet/locale/ia/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/ia/LC_MESSAGES/BlogspamNet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlogspamNet to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/BlogspamNet/locale/mk/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/mk/LC_MESSAGES/BlogspamNet.po
index a691006ba3..628ee0b50a 100644
--- a/plugins/BlogspamNet/locale/mk/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/mk/LC_MESSAGES/BlogspamNet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlogspamNet to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/BlogspamNet/locale/nb/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/nb/LC_MESSAGES/BlogspamNet.po
index 8abc4a6e2a..4dac1e37fa 100644
--- a/plugins/BlogspamNet/locale/nb/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/nb/LC_MESSAGES/BlogspamNet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlogspamNet to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/BlogspamNet/locale/nl/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/nl/LC_MESSAGES/BlogspamNet.po
index 8357ac1cf7..a57715a5ef 100644
--- a/plugins/BlogspamNet/locale/nl/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/nl/LC_MESSAGES/BlogspamNet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlogspamNet to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/BlogspamNet/locale/pt/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/pt/LC_MESSAGES/BlogspamNet.po
index 00c9160a53..ae1c3c7ac8 100644
--- a/plugins/BlogspamNet/locale/pt/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/pt/LC_MESSAGES/BlogspamNet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlogspamNet to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: GTNS
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-POT-Import-Date: 2011-01-10 18:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/BlogspamNet/locale/ru/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/ru/LC_MESSAGES/BlogspamNet.po
index ccc8fb0ee3..6566d8268e 100644
--- a/plugins/BlogspamNet/locale/ru/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/ru/LC_MESSAGES/BlogspamNet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlogspamNet to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Александр Сигачёв
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/BlogspamNet/locale/tl/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/tl/LC_MESSAGES/BlogspamNet.po
index 372b200fa6..01f136e850 100644
--- a/plugins/BlogspamNet/locale/tl/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/tl/LC_MESSAGES/BlogspamNet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlogspamNet to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/BlogspamNet/locale/uk/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/uk/LC_MESSAGES/BlogspamNet.po
index 639fefa3fc..50114fe1ae 100644
--- a/plugins/BlogspamNet/locale/uk/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/uk/LC_MESSAGES/BlogspamNet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlogspamNet to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/BlogspamNet/locale/zh_CN/LC_MESSAGES/BlogspamNet.po b/plugins/BlogspamNet/locale/zh_CN/LC_MESSAGES/BlogspamNet.po
index f1fd6f092c..45690371cc 100644
--- a/plugins/BlogspamNet/locale/zh_CN/LC_MESSAGES/BlogspamNet.po
+++ b/plugins/BlogspamNet/locale/zh_CN/LC_MESSAGES/BlogspamNet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - BlogspamNet to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - BlogspamNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:50+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-blogspamnet\n"
diff --git a/plugins/Bookmark/locale/Bookmark.pot b/plugins/Bookmark/locale/Bookmark.pot
index fa76e9d0b6..53929ae867 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-14 10:29+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/ia/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/ia/LC_MESSAGES/Bookmark.po
index 38e99a2d2b..d652ab68c3 100644
--- a/plugins/Bookmark/locale/ia/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/ia/LC_MESSAGES/Bookmark.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Bookmark to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:06:24+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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 23:54:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
diff --git a/plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po
index 551e450b5b..207b348b6d 100644
--- a/plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Bookmark to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:06:24+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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 23:54:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
diff --git a/plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po
index 91bc2a567a..534a2f890a 100644
--- a/plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Bookmark to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:41+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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 14:17:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
diff --git a/plugins/Bookmark/locale/ru/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/ru/LC_MESSAGES/Bookmark.po
new file mode 100644
index 0000000000..9ae8031ea2
--- /dev/null
+++ b/plugins/Bookmark/locale/ru/LC_MESSAGES/Bookmark.po
@@ -0,0 +1,37 @@
+# Translation of StatusNet - Bookmark to Russian (Русский)
+# Exported from translatewiki.net
+#
+# Author: Lionbeat
+# --
+# 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-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-20 20:16:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ru\n"
+"X-Message-Group: #out-statusnet-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 "Сохранить"
+
+#: importdelicious.php:340
+msgctxt "BUTTON"
+msgid "Upload"
+msgstr "Загрузить"
+
+#: BookmarkPlugin.php:458
+msgid "Simple extension for supporting bookmarks."
+msgstr ""
diff --git a/plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po
index f1a2a793c8..c59a2560a3 100644
--- a/plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Bookmark to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:02+0000\n"
-"PO-Revision-Date: 2011-01-20 19:06:24+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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 23:54:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
diff --git a/plugins/Bookmark/locale/zh_CN/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/zh_CN/LC_MESSAGES/Bookmark.po
new file mode 100644
index 0000000000..53e13c1d17
--- /dev/null
+++ b/plugins/Bookmark/locale/zh_CN/LC_MESSAGES/Bookmark.po
@@ -0,0 +1,37 @@
+# Translation of StatusNet - Bookmark to Simplified Chinese (‪中文(简体)‬)
+# Exported from translatewiki.net
+#
+# Author: Hydra
+# --
+# 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-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-01-20 20:16:15+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: zh-hans\n"
+"X-Message-Group: #out-statusnet-plugin-bookmark\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: bookmarkform.php:162
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "保存"
+
+#: importdelicious.php:340
+msgctxt "BUTTON"
+msgid "Upload"
+msgstr "上载"
+
+#: BookmarkPlugin.php:458
+msgid "Simple extension for supporting bookmarks."
+msgstr "支持书签的简单扩展。"
diff --git a/plugins/CacheLog/locale/CacheLog.pot b/plugins/CacheLog/locale/CacheLog.pot
index e96667173c..4480b05702 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/be-tarask/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/be-tarask/LC_MESSAGES/CacheLog.po
index 8b9a451044..cb4e53755d 100644
--- a/plugins/CacheLog/locale/be-tarask/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/be-tarask/LC_MESSAGES/CacheLog.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - CacheLog to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Jim-by
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:50+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:25+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-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
diff --git a/plugins/CacheLog/locale/br/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/br/LC_MESSAGES/CacheLog.po
index 1b2962f6a0..cacfe9182d 100644
--- a/plugins/CacheLog/locale/br/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/br/LC_MESSAGES/CacheLog.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - CacheLog to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Fulup
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:50+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21: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-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
diff --git a/plugins/CacheLog/locale/es/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/es/LC_MESSAGES/CacheLog.po
index f859729f13..9262533ed7 100644
--- a/plugins/CacheLog/locale/es/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/es/LC_MESSAGES/CacheLog.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - CacheLog to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:50+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
diff --git a/plugins/CacheLog/locale/fr/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/fr/LC_MESSAGES/CacheLog.po
index 454cc16f40..a74360b5d5 100644
--- a/plugins/CacheLog/locale/fr/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/fr/LC_MESSAGES/CacheLog.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - CacheLog to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Verdy p
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:50+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:25+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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
diff --git a/plugins/CacheLog/locale/he/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/he/LC_MESSAGES/CacheLog.po
index f9bed9f77d..cfc34ed9c1 100644
--- a/plugins/CacheLog/locale/he/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/he/LC_MESSAGES/CacheLog.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - CacheLog to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:50+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:25+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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
diff --git a/plugins/CacheLog/locale/ia/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/ia/LC_MESSAGES/CacheLog.po
index 7bb1aafc25..d828e214b8 100644
--- a/plugins/CacheLog/locale/ia/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/ia/LC_MESSAGES/CacheLog.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - CacheLog to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:50+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
diff --git a/plugins/CacheLog/locale/mk/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/mk/LC_MESSAGES/CacheLog.po
index 6c900bd45b..56e454eee0 100644
--- a/plugins/CacheLog/locale/mk/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/mk/LC_MESSAGES/CacheLog.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - CacheLog to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:50+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
diff --git a/plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
index b3c4807562..f690d3d669 100644
--- a/plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - CacheLog to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:50+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
diff --git a/plugins/CacheLog/locale/nl/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/nl/LC_MESSAGES/CacheLog.po
index cda36b00ad..fc26a34891 100644
--- a/plugins/CacheLog/locale/nl/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/nl/LC_MESSAGES/CacheLog.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - CacheLog to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:50+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
diff --git a/plugins/CacheLog/locale/pt/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/pt/LC_MESSAGES/CacheLog.po
index c8323f9f15..23e754b5fc 100644
--- a/plugins/CacheLog/locale/pt/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/pt/LC_MESSAGES/CacheLog.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - CacheLog to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Waldir
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:50+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-01-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
diff --git a/plugins/CacheLog/locale/ru/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/ru/LC_MESSAGES/CacheLog.po
index e33d04e3fd..47af9cead6 100644
--- a/plugins/CacheLog/locale/ru/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/ru/LC_MESSAGES/CacheLog.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - CacheLog to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Александр Сигачёв
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:50+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
diff --git a/plugins/CacheLog/locale/tl/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/tl/LC_MESSAGES/CacheLog.po
index ccd5ee04c0..d77257ee38 100644
--- a/plugins/CacheLog/locale/tl/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/tl/LC_MESSAGES/CacheLog.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - CacheLog to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:50+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
diff --git a/plugins/CacheLog/locale/uk/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/uk/LC_MESSAGES/CacheLog.po
index bcff53b47a..47a8ae5a5b 100644
--- a/plugins/CacheLog/locale/uk/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/uk/LC_MESSAGES/CacheLog.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - CacheLog to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:50+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
diff --git a/plugins/CacheLog/locale/zh_CN/LC_MESSAGES/CacheLog.po b/plugins/CacheLog/locale/zh_CN/LC_MESSAGES/CacheLog.po
index a46b7a0ac9..55a132ebb4 100644
--- a/plugins/CacheLog/locale/zh_CN/LC_MESSAGES/CacheLog.po
+++ b/plugins/CacheLog/locale/zh_CN/LC_MESSAGES/CacheLog.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - CacheLog to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CacheLog\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:50+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-cachelog\n"
diff --git a/plugins/CasAuthentication/locale/CasAuthentication.pot b/plugins/CasAuthentication/locale/CasAuthentication.pot
index bcce549aef..601cd7af8b 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/be-tarask/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/be-tarask/LC_MESSAGES/CasAuthentication.po
index ef1fdc1ee8..9bd9997513 100644
--- a/plugins/CasAuthentication/locale/be-tarask/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/be-tarask/LC_MESSAGES/CasAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - CasAuthentication to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: EugeneZelenko
 # Author: Jim-by
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:27+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-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
diff --git a/plugins/CasAuthentication/locale/br/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/br/LC_MESSAGES/CasAuthentication.po
index 031c1686ba..4b42f75b37 100644
--- a/plugins/CasAuthentication/locale/br/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/br/LC_MESSAGES/CasAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - CasAuthentication to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Y-M D
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:27+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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
diff --git a/plugins/CasAuthentication/locale/es/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/es/LC_MESSAGES/CasAuthentication.po
index 7dcf5fbd38..2f3630b6b7 100644
--- a/plugins/CasAuthentication/locale/es/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/es/LC_MESSAGES/CasAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - CasAuthentication to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Locos epraix
 # Author: Translationista
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
diff --git a/plugins/CasAuthentication/locale/fr/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/fr/LC_MESSAGES/CasAuthentication.po
index ebfc089f55..0f82c59828 100644
--- a/plugins/CasAuthentication/locale/fr/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/fr/LC_MESSAGES/CasAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - CasAuthentication to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Verdy p
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
diff --git a/plugins/CasAuthentication/locale/ia/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/ia/LC_MESSAGES/CasAuthentication.po
index 48f7f9a3df..62d5980664 100644
--- a/plugins/CasAuthentication/locale/ia/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/ia/LC_MESSAGES/CasAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - CasAuthentication to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
diff --git a/plugins/CasAuthentication/locale/mk/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/mk/LC_MESSAGES/CasAuthentication.po
index a2ef264728..ceb0cca7d6 100644
--- a/plugins/CasAuthentication/locale/mk/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/mk/LC_MESSAGES/CasAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - CasAuthentication to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
diff --git a/plugins/CasAuthentication/locale/nl/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/nl/LC_MESSAGES/CasAuthentication.po
index 6b6b776904..1f6e0b5786 100644
--- a/plugins/CasAuthentication/locale/nl/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/nl/LC_MESSAGES/CasAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - CasAuthentication to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
diff --git a/plugins/CasAuthentication/locale/pt_BR/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/pt_BR/LC_MESSAGES/CasAuthentication.po
index 88015cfc7a..3f7a0e611b 100644
--- a/plugins/CasAuthentication/locale/pt_BR/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/pt_BR/LC_MESSAGES/CasAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - CasAuthentication to Brazilian Portuguese (Português do Brasil)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Luckas Blade
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
diff --git a/plugins/CasAuthentication/locale/ru/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/ru/LC_MESSAGES/CasAuthentication.po
index 12748e09f4..699837455a 100644
--- a/plugins/CasAuthentication/locale/ru/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/ru/LC_MESSAGES/CasAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - CasAuthentication to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Lockal
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
diff --git a/plugins/CasAuthentication/locale/uk/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/uk/LC_MESSAGES/CasAuthentication.po
index be02142d78..899315d798 100644
--- a/plugins/CasAuthentication/locale/uk/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/uk/LC_MESSAGES/CasAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - CasAuthentication to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
diff --git a/plugins/CasAuthentication/locale/zh_CN/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/zh_CN/LC_MESSAGES/CasAuthentication.po
index d43a5d0524..2f8d8bff5b 100644
--- a/plugins/CasAuthentication/locale/zh_CN/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/zh_CN/LC_MESSAGES/CasAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - CasAuthentication to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Chenxiaoqino
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:52+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
diff --git a/plugins/ClientSideShorten/locale/ClientSideShorten.pot b/plugins/ClientSideShorten/locale/ClientSideShorten.pot
index 626873f306..9669dc2928 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/be-tarask/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/be-tarask/LC_MESSAGES/ClientSideShorten.po
index 793983b2f9..ae68a1bf41 100644
--- a/plugins/ClientSideShorten/locale/be-tarask/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/be-tarask/LC_MESSAGES/ClientSideShorten.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ClientSideShorten to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: EugeneZelenko
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:52+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:27+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-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/ClientSideShorten/locale/br/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/br/LC_MESSAGES/ClientSideShorten.po
index 4719e52334..51bad30b87 100644
--- a/plugins/ClientSideShorten/locale/br/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/br/LC_MESSAGES/ClientSideShorten.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ClientSideShorten to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Y-M D
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:52+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:28+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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/ClientSideShorten/locale/de/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/de/LC_MESSAGES/ClientSideShorten.po
index ad97d60445..4df0e50666 100644
--- a/plugins/ClientSideShorten/locale/de/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/de/LC_MESSAGES/ClientSideShorten.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ClientSideShorten to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:52+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21: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-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/ClientSideShorten/locale/es/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/es/LC_MESSAGES/ClientSideShorten.po
index c9892f4054..40692e7273 100644
--- a/plugins/ClientSideShorten/locale/es/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/es/LC_MESSAGES/ClientSideShorten.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ClientSideShorten to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:52+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/ClientSideShorten/locale/fr/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/fr/LC_MESSAGES/ClientSideShorten.po
index 1ece5618ac..688a2546c8 100644
--- a/plugins/ClientSideShorten/locale/fr/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/fr/LC_MESSAGES/ClientSideShorten.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ClientSideShorten to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # Author: Verdy p
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:52+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/ClientSideShorten/locale/he/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/he/LC_MESSAGES/ClientSideShorten.po
index 69f289f221..af5c32767d 100644
--- a/plugins/ClientSideShorten/locale/he/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/he/LC_MESSAGES/ClientSideShorten.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ClientSideShorten to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:52+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/ClientSideShorten/locale/ia/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/ia/LC_MESSAGES/ClientSideShorten.po
index 8b9e799531..7b28c36b77 100644
--- a/plugins/ClientSideShorten/locale/ia/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/ia/LC_MESSAGES/ClientSideShorten.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ClientSideShorten to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:52+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/ClientSideShorten/locale/id/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/id/LC_MESSAGES/ClientSideShorten.po
index f4fbbf0670..1eec2eac18 100644
--- a/plugins/ClientSideShorten/locale/id/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/id/LC_MESSAGES/ClientSideShorten.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ClientSideShorten to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:52+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/ClientSideShorten/locale/mk/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/mk/LC_MESSAGES/ClientSideShorten.po
index fc5b3bd57f..a702242a08 100644
--- a/plugins/ClientSideShorten/locale/mk/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/mk/LC_MESSAGES/ClientSideShorten.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ClientSideShorten to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:52+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/ClientSideShorten/locale/nb/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/nb/LC_MESSAGES/ClientSideShorten.po
index ea5e5bce95..00038dc070 100644
--- a/plugins/ClientSideShorten/locale/nb/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/nb/LC_MESSAGES/ClientSideShorten.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ClientSideShorten to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:52+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/ClientSideShorten/locale/nl/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/nl/LC_MESSAGES/ClientSideShorten.po
index 88f3c78556..4b976374fa 100644
--- a/plugins/ClientSideShorten/locale/nl/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/nl/LC_MESSAGES/ClientSideShorten.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ClientSideShorten to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:52+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/ClientSideShorten/locale/ru/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/ru/LC_MESSAGES/ClientSideShorten.po
index a24961ef59..887f658eeb 100644
--- a/plugins/ClientSideShorten/locale/ru/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/ru/LC_MESSAGES/ClientSideShorten.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ClientSideShorten to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Lockal
 # Author: Александр Сигачёв
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:52+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/ClientSideShorten/locale/tl/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/tl/LC_MESSAGES/ClientSideShorten.po
index 154844479b..c2c7d5a1a7 100644
--- a/plugins/ClientSideShorten/locale/tl/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/tl/LC_MESSAGES/ClientSideShorten.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ClientSideShorten to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:52+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/ClientSideShorten/locale/uk/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/uk/LC_MESSAGES/ClientSideShorten.po
index 6196cd7cf8..570c942c97 100644
--- a/plugins/ClientSideShorten/locale/uk/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/uk/LC_MESSAGES/ClientSideShorten.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ClientSideShorten to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # Author: Lockal
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:52+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/ClientSideShorten/locale/zh_CN/LC_MESSAGES/ClientSideShorten.po b/plugins/ClientSideShorten/locale/zh_CN/LC_MESSAGES/ClientSideShorten.po
index d56da6db75..f73bab2d0a 100644
--- a/plugins/ClientSideShorten/locale/zh_CN/LC_MESSAGES/ClientSideShorten.po
+++ b/plugins/ClientSideShorten/locale/zh_CN/LC_MESSAGES/ClientSideShorten.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ClientSideShorten to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Chenxiaoqino
 # Author: ZhengYiFeng
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ClientSideShorten\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:52+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-clientsideshorten\n"
diff --git a/plugins/Comet/locale/Comet.pot b/plugins/Comet/locale/Comet.pot
index 8cbf1613a0..01eb382550 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/Comet/locale/be-tarask/LC_MESSAGES/Comet.po b/plugins/Comet/locale/be-tarask/LC_MESSAGES/Comet.po
index a25c690a1a..cccc6e4faa 100644
--- a/plugins/Comet/locale/be-tarask/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/be-tarask/LC_MESSAGES/Comet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Comet to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: EugeneZelenko
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:28+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-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/br/LC_MESSAGES/Comet.po b/plugins/Comet/locale/br/LC_MESSAGES/Comet.po
index 2633b94790..f242ae5210 100644
--- a/plugins/Comet/locale/br/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/br/LC_MESSAGES/Comet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Comet to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Y-M D
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/de/LC_MESSAGES/Comet.po b/plugins/Comet/locale/de/LC_MESSAGES/Comet.po
index ab9105f7fd..98c0a9db77 100644
--- a/plugins/Comet/locale/de/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/de/LC_MESSAGES/Comet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Comet to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/es/LC_MESSAGES/Comet.po b/plugins/Comet/locale/es/LC_MESSAGES/Comet.po
index 97faf52617..929f5b03f9 100644
--- a/plugins/Comet/locale/es/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/es/LC_MESSAGES/Comet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Comet to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/fr/LC_MESSAGES/Comet.po b/plugins/Comet/locale/fr/LC_MESSAGES/Comet.po
index bc953d9d1a..2908ad46b0 100644
--- a/plugins/Comet/locale/fr/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/fr/LC_MESSAGES/Comet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Comet to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/he/LC_MESSAGES/Comet.po b/plugins/Comet/locale/he/LC_MESSAGES/Comet.po
index f2c34798fc..0dd57f3968 100644
--- a/plugins/Comet/locale/he/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/he/LC_MESSAGES/Comet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Comet to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/ia/LC_MESSAGES/Comet.po b/plugins/Comet/locale/ia/LC_MESSAGES/Comet.po
index e238bcd16f..459ac31af1 100644
--- a/plugins/Comet/locale/ia/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/ia/LC_MESSAGES/Comet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Comet to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/id/LC_MESSAGES/Comet.po b/plugins/Comet/locale/id/LC_MESSAGES/Comet.po
index 1957988add..8a4b05b516 100644
--- a/plugins/Comet/locale/id/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/id/LC_MESSAGES/Comet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Comet to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/mk/LC_MESSAGES/Comet.po b/plugins/Comet/locale/mk/LC_MESSAGES/Comet.po
index c96635c325..a9f0c65c44 100644
--- a/plugins/Comet/locale/mk/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/mk/LC_MESSAGES/Comet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Comet to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/nb/LC_MESSAGES/Comet.po b/plugins/Comet/locale/nb/LC_MESSAGES/Comet.po
index c29732ddc3..bedc3aa0a2 100644
--- a/plugins/Comet/locale/nb/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/nb/LC_MESSAGES/Comet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Comet to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/nl/LC_MESSAGES/Comet.po b/plugins/Comet/locale/nl/LC_MESSAGES/Comet.po
index 84706cb3a3..a12251fc8e 100644
--- a/plugins/Comet/locale/nl/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/nl/LC_MESSAGES/Comet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Comet to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/pt/LC_MESSAGES/Comet.po b/plugins/Comet/locale/pt/LC_MESSAGES/Comet.po
index 20409ec118..820e3b6bb0 100644
--- a/plugins/Comet/locale/pt/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/pt/LC_MESSAGES/Comet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Comet to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: GTNS
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/pt_BR/LC_MESSAGES/Comet.po b/plugins/Comet/locale/pt_BR/LC_MESSAGES/Comet.po
index 7883afb513..89273f4ffd 100644
--- a/plugins/Comet/locale/pt_BR/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/pt_BR/LC_MESSAGES/Comet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Comet to Brazilian Portuguese (Português do Brasil)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Giro720
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-POT-Import-Date: 2011-01-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/ru/LC_MESSAGES/Comet.po b/plugins/Comet/locale/ru/LC_MESSAGES/Comet.po
index 674f73b2f0..b2b5891534 100644
--- a/plugins/Comet/locale/ru/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/ru/LC_MESSAGES/Comet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Comet to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Александр Сигачёв
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/tl/LC_MESSAGES/Comet.po b/plugins/Comet/locale/tl/LC_MESSAGES/Comet.po
index c59c589946..6bff8be738 100644
--- a/plugins/Comet/locale/tl/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/tl/LC_MESSAGES/Comet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Comet to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/uk/LC_MESSAGES/Comet.po b/plugins/Comet/locale/uk/LC_MESSAGES/Comet.po
index 3dd139e6e8..2a113239ea 100644
--- a/plugins/Comet/locale/uk/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/uk/LC_MESSAGES/Comet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Comet to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/Comet/locale/zh_CN/LC_MESSAGES/Comet.po b/plugins/Comet/locale/zh_CN/LC_MESSAGES/Comet.po
index b7538f4f48..71ccffe3c1 100644
--- a/plugins/Comet/locale/zh_CN/LC_MESSAGES/Comet.po
+++ b/plugins/Comet/locale/zh_CN/LC_MESSAGES/Comet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Comet to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Comet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-comet\n"
diff --git a/plugins/DirectionDetector/locale/DirectionDetector.pot b/plugins/DirectionDetector/locale/DirectionDetector.pot
index ef0297315f..3d43b31b0b 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/be-tarask/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/be-tarask/LC_MESSAGES/DirectionDetector.po
index c84164c668..074a8e1a34 100644
--- a/plugins/DirectionDetector/locale/be-tarask/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/be-tarask/LC_MESSAGES/DirectionDetector.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DirectionDetector to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: EugeneZelenko
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:29+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-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/br/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/br/LC_MESSAGES/DirectionDetector.po
index 095bea95ab..3cfe745057 100644
--- a/plugins/DirectionDetector/locale/br/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/br/LC_MESSAGES/DirectionDetector.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DirectionDetector to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Fulup
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/de/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/de/LC_MESSAGES/DirectionDetector.po
index df2b65788e..640d3c591a 100644
--- a/plugins/DirectionDetector/locale/de/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/de/LC_MESSAGES/DirectionDetector.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DirectionDetector to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/es/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/es/LC_MESSAGES/DirectionDetector.po
index 6699930de3..23437008e6 100644
--- a/plugins/DirectionDetector/locale/es/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/es/LC_MESSAGES/DirectionDetector.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DirectionDetector to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/fr/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/fr/LC_MESSAGES/DirectionDetector.po
index b6843cdcb1..1fa1db84b8 100644
--- a/plugins/DirectionDetector/locale/fr/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/fr/LC_MESSAGES/DirectionDetector.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DirectionDetector to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/he/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/he/LC_MESSAGES/DirectionDetector.po
index fa4e11dc33..6ef2038112 100644
--- a/plugins/DirectionDetector/locale/he/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/he/LC_MESSAGES/DirectionDetector.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DirectionDetector to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/ia/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/ia/LC_MESSAGES/DirectionDetector.po
index 4ac8df046f..1017780903 100644
--- a/plugins/DirectionDetector/locale/ia/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/ia/LC_MESSAGES/DirectionDetector.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DirectionDetector to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/id/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/id/LC_MESSAGES/DirectionDetector.po
index 3a3bcbd9f8..1c98dd2305 100644
--- a/plugins/DirectionDetector/locale/id/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/id/LC_MESSAGES/DirectionDetector.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DirectionDetector to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:54+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/ja/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/ja/LC_MESSAGES/DirectionDetector.po
index 61eb22c413..691f93974e 100644
--- a/plugins/DirectionDetector/locale/ja/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/ja/LC_MESSAGES/DirectionDetector.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DirectionDetector to Japanese (日本語)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: 青子守歌
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:54+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:30+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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/lb/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/lb/LC_MESSAGES/DirectionDetector.po
index 39a483ebcc..4e6143e015 100644
--- a/plugins/DirectionDetector/locale/lb/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/lb/LC_MESSAGES/DirectionDetector.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DirectionDetector to Luxembourgish (Lëtzebuergesch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Robby
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:54+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:30+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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: lb\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/mk/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/mk/LC_MESSAGES/DirectionDetector.po
index 07825d7540..54157492e8 100644
--- a/plugins/DirectionDetector/locale/mk/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/mk/LC_MESSAGES/DirectionDetector.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DirectionDetector to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:54+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/nb/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/nb/LC_MESSAGES/DirectionDetector.po
index ac2dd32ade..4303c8622e 100644
--- a/plugins/DirectionDetector/locale/nb/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/nb/LC_MESSAGES/DirectionDetector.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DirectionDetector to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:54+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/nl/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/nl/LC_MESSAGES/DirectionDetector.po
index f8629da75f..77cfa1573b 100644
--- a/plugins/DirectionDetector/locale/nl/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/nl/LC_MESSAGES/DirectionDetector.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DirectionDetector to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,16 +9,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:54+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:30+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-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/pt/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/pt/LC_MESSAGES/DirectionDetector.po
index 2e50da9e60..276f5d6a79 100644
--- a/plugins/DirectionDetector/locale/pt/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/pt/LC_MESSAGES/DirectionDetector.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DirectionDetector to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: GTNS
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:54+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/ru/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/ru/LC_MESSAGES/DirectionDetector.po
index f585770521..a7a0d8a470 100644
--- a/plugins/DirectionDetector/locale/ru/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/ru/LC_MESSAGES/DirectionDetector.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DirectionDetector to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Александр Сигачёв
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:54+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/tl/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/tl/LC_MESSAGES/DirectionDetector.po
index f7e360bb52..e2de349799 100644
--- a/plugins/DirectionDetector/locale/tl/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/tl/LC_MESSAGES/DirectionDetector.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DirectionDetector to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:54+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/uk/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/uk/LC_MESSAGES/DirectionDetector.po
index ad9a16434d..7ad952e2e4 100644
--- a/plugins/DirectionDetector/locale/uk/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/uk/LC_MESSAGES/DirectionDetector.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DirectionDetector to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:54+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DirectionDetector/locale/zh_CN/LC_MESSAGES/DirectionDetector.po b/plugins/DirectionDetector/locale/zh_CN/LC_MESSAGES/DirectionDetector.po
index 134ed66754..be7a64fa09 100644
--- a/plugins/DirectionDetector/locale/zh_CN/LC_MESSAGES/DirectionDetector.po
+++ b/plugins/DirectionDetector/locale/zh_CN/LC_MESSAGES/DirectionDetector.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DirectionDetector to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Chenxiaoqino
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DirectionDetector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:54+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:31+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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-directiondetector\n"
diff --git a/plugins/DiskCache/locale/DiskCache.pot b/plugins/DiskCache/locale/DiskCache.pot
index 34f0631efc..9b51cd1d4a 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/be-tarask/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/be-tarask/LC_MESSAGES/DiskCache.po
index cb3dec3643..50857ab9be 100644
--- a/plugins/DiskCache/locale/be-tarask/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/be-tarask/LC_MESSAGES/DiskCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DiskCache to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: EugeneZelenko
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:54+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:32+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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/br/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/br/LC_MESSAGES/DiskCache.po
index 624c2b373b..197a7c5052 100644
--- a/plugins/DiskCache/locale/br/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/br/LC_MESSAGES/DiskCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DiskCache to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Fulup
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:54+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/de/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/de/LC_MESSAGES/DiskCache.po
index 9733b36fa6..d0803feb71 100644
--- a/plugins/DiskCache/locale/de/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/de/LC_MESSAGES/DiskCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DiskCache to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Apmon
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:54+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/es/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/es/LC_MESSAGES/DiskCache.po
index 94eff5d400..ba565453ea 100644
--- a/plugins/DiskCache/locale/es/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/es/LC_MESSAGES/DiskCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DiskCache to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:54+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21: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-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/fr/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/fr/LC_MESSAGES/DiskCache.po
index 63f588394e..34662b74a3 100644
--- a/plugins/DiskCache/locale/fr/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/fr/LC_MESSAGES/DiskCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DiskCache to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:54+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/he/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/he/LC_MESSAGES/DiskCache.po
index 67a86f2c1c..649f8754bd 100644
--- a/plugins/DiskCache/locale/he/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/he/LC_MESSAGES/DiskCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DiskCache to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:54+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/ia/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/ia/LC_MESSAGES/DiskCache.po
index db94009f0b..c3106db284 100644
--- a/plugins/DiskCache/locale/ia/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/ia/LC_MESSAGES/DiskCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DiskCache to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:54+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/id/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/id/LC_MESSAGES/DiskCache.po
index c90eda6774..e5353d57d1 100644
--- a/plugins/DiskCache/locale/id/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/id/LC_MESSAGES/DiskCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DiskCache to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:54+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/mk/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/mk/LC_MESSAGES/DiskCache.po
index 013b44d3e2..84b1c65254 100644
--- a/plugins/DiskCache/locale/mk/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/mk/LC_MESSAGES/DiskCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DiskCache to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:54+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/nb/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/nb/LC_MESSAGES/DiskCache.po
index 520822915e..5cbd3fbf55 100644
--- a/plugins/DiskCache/locale/nb/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/nb/LC_MESSAGES/DiskCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DiskCache to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:54+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/nl/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/nl/LC_MESSAGES/DiskCache.po
index e4ce9f7024..9dca1a007c 100644
--- a/plugins/DiskCache/locale/nl/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/nl/LC_MESSAGES/DiskCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DiskCache to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:54+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/pt/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/pt/LC_MESSAGES/DiskCache.po
index 28f657d7b2..1d0c605928 100644
--- a/plugins/DiskCache/locale/pt/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/pt/LC_MESSAGES/DiskCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DiskCache to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Hamilton Abreu
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:54+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/pt_BR/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/pt_BR/LC_MESSAGES/DiskCache.po
index ba76762365..80068f4e5f 100644
--- a/plugins/DiskCache/locale/pt_BR/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/pt_BR/LC_MESSAGES/DiskCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DiskCache to Brazilian Portuguese (Português do Brasil)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Giro720
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:54+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/ru/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/ru/LC_MESSAGES/DiskCache.po
index 568a0852de..b4600862e3 100644
--- a/plugins/DiskCache/locale/ru/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/ru/LC_MESSAGES/DiskCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DiskCache to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Александр Сигачёв
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:54+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/tl/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/tl/LC_MESSAGES/DiskCache.po
index 55413484cd..3ac7a4d86f 100644
--- a/plugins/DiskCache/locale/tl/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/tl/LC_MESSAGES/DiskCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DiskCache to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:55+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/uk/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/uk/LC_MESSAGES/DiskCache.po
index 4414b51a2b..501818483f 100644
--- a/plugins/DiskCache/locale/uk/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/uk/LC_MESSAGES/DiskCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DiskCache to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:55+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/DiskCache/locale/zh_CN/LC_MESSAGES/DiskCache.po b/plugins/DiskCache/locale/zh_CN/LC_MESSAGES/DiskCache.po
index 44f974327b..d17eccfaf1 100644
--- a/plugins/DiskCache/locale/zh_CN/LC_MESSAGES/DiskCache.po
+++ b/plugins/DiskCache/locale/zh_CN/LC_MESSAGES/DiskCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - DiskCache to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - DiskCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:55+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-diskcache\n"
diff --git a/plugins/Disqus/locale/Disqus.pot b/plugins/Disqus/locale/Disqus.pot
index 602fc24119..25c533c11a 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-14 23:32+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/be-tarask/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/be-tarask/LC_MESSAGES/Disqus.po
index 95ded0c7ce..6531d47d49 100644
--- a/plugins/Disqus/locale/be-tarask/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/be-tarask/LC_MESSAGES/Disqus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Disqus to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: EugeneZelenko
 # Author: Jim-by
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:32+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:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
diff --git a/plugins/Disqus/locale/br/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/br/LC_MESSAGES/Disqus.po
index 5b2f49638e..cd0e5b75e0 100644
--- a/plugins/Disqus/locale/br/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/br/LC_MESSAGES/Disqus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Disqus to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Y-M D
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:33+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:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
diff --git a/plugins/Disqus/locale/de/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/de/LC_MESSAGES/Disqus.po
index 6427b5d86a..158ece0cc8 100644
--- a/plugins/Disqus/locale/de/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/de/LC_MESSAGES/Disqus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Disqus to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Michael
 # Author: The Evil IP address
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-14 13:21:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
diff --git a/plugins/Disqus/locale/es/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/es/LC_MESSAGES/Disqus.po
index fe3190a704..2c22d93052 100644
--- a/plugins/Disqus/locale/es/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/es/LC_MESSAGES/Disqus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Disqus to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-14 13:21:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
diff --git a/plugins/Disqus/locale/fr/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/fr/LC_MESSAGES/Disqus.po
index 8bc2ac31fc..29680fcf30 100644
--- a/plugins/Disqus/locale/fr/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/fr/LC_MESSAGES/Disqus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Disqus to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # Author: Verdy p
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-14 13:21:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
diff --git a/plugins/Disqus/locale/ia/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/ia/LC_MESSAGES/Disqus.po
index 9f7f9ef831..78077586fa 100644
--- a/plugins/Disqus/locale/ia/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/ia/LC_MESSAGES/Disqus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Disqus to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-14 13:21:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
diff --git a/plugins/Disqus/locale/mk/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/mk/LC_MESSAGES/Disqus.po
index b6c79488c8..d69f7ff15b 100644
--- a/plugins/Disqus/locale/mk/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/mk/LC_MESSAGES/Disqus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Disqus to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-14 13:21:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
diff --git a/plugins/Disqus/locale/nb/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/nb/LC_MESSAGES/Disqus.po
index 338a777dae..99031aef35 100644
--- a/plugins/Disqus/locale/nb/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/nb/LC_MESSAGES/Disqus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Disqus to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:48+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-14 13:21:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
diff --git a/plugins/Disqus/locale/nl/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/nl/LC_MESSAGES/Disqus.po
index 8b89d830be..c11bf2abc2 100644
--- a/plugins/Disqus/locale/nl/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/nl/LC_MESSAGES/Disqus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Disqus to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-14 13:21:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
diff --git a/plugins/Disqus/locale/ru/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/ru/LC_MESSAGES/Disqus.po
index fe94a9f2d9..b57a60cbc3 100644
--- a/plugins/Disqus/locale/ru/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/ru/LC_MESSAGES/Disqus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Disqus to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: MaxSem
 # Author: Александр Сигачёв
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:48+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-14 13:21:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
diff --git a/plugins/Disqus/locale/tl/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/tl/LC_MESSAGES/Disqus.po
index cfb75a6806..1ab9dd957f 100644
--- a/plugins/Disqus/locale/tl/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/tl/LC_MESSAGES/Disqus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Disqus to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:48+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-14 13:21:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
diff --git a/plugins/Disqus/locale/uk/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/uk/LC_MESSAGES/Disqus.po
index 22b213ccdc..09da349d51 100644
--- a/plugins/Disqus/locale/uk/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/uk/LC_MESSAGES/Disqus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Disqus to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:48+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-14 13:21:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
diff --git a/plugins/Disqus/locale/zh_CN/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/zh_CN/LC_MESSAGES/Disqus.po
index e667285b6a..62cca07b04 100644
--- a/plugins/Disqus/locale/zh_CN/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/zh_CN/LC_MESSAGES/Disqus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Disqus to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Disqus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:35:48+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-14 13:21:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
diff --git a/plugins/Echo/locale/Echo.pot b/plugins/Echo/locale/Echo.pot
index c7567389d7..e2dfa190c4 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/be-tarask/LC_MESSAGES/Echo.po b/plugins/Echo/locale/be-tarask/LC_MESSAGES/Echo.po
index 924fc70899..9b0286c72f 100644
--- a/plugins/Echo/locale/be-tarask/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/be-tarask/LC_MESSAGES/Echo.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Echo to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Jim-by
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:34+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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/br/LC_MESSAGES/Echo.po b/plugins/Echo/locale/br/LC_MESSAGES/Echo.po
index 23d131fb10..35874a59bb 100644
--- a/plugins/Echo/locale/br/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/br/LC_MESSAGES/Echo.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Echo to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Y-M D
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/de/LC_MESSAGES/Echo.po b/plugins/Echo/locale/de/LC_MESSAGES/Echo.po
index 1740654151..b7c73a089a 100644
--- a/plugins/Echo/locale/de/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/de/LC_MESSAGES/Echo.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Echo to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/es/LC_MESSAGES/Echo.po b/plugins/Echo/locale/es/LC_MESSAGES/Echo.po
index 11329a5b3d..3e5fe6897d 100644
--- a/plugins/Echo/locale/es/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/es/LC_MESSAGES/Echo.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Echo to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:34+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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/fi/LC_MESSAGES/Echo.po b/plugins/Echo/locale/fi/LC_MESSAGES/Echo.po
index cea7ef8437..4ae306c8fc 100644
--- a/plugins/Echo/locale/fi/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/fi/LC_MESSAGES/Echo.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Echo to Finnish (Suomi)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nike
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21: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-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/fr/LC_MESSAGES/Echo.po b/plugins/Echo/locale/fr/LC_MESSAGES/Echo.po
index 93481eeca8..1c0f65fd1e 100644
--- a/plugins/Echo/locale/fr/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/fr/LC_MESSAGES/Echo.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Echo to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Verdy p
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/he/LC_MESSAGES/Echo.po b/plugins/Echo/locale/he/LC_MESSAGES/Echo.po
index cc4738da17..3d88eac780 100644
--- a/plugins/Echo/locale/he/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/he/LC_MESSAGES/Echo.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Echo to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:34+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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/ia/LC_MESSAGES/Echo.po b/plugins/Echo/locale/ia/LC_MESSAGES/Echo.po
index 29f6cdd8a9..1afbf311ab 100644
--- a/plugins/Echo/locale/ia/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/ia/LC_MESSAGES/Echo.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Echo to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/id/LC_MESSAGES/Echo.po b/plugins/Echo/locale/id/LC_MESSAGES/Echo.po
index d20cd14bca..7c274cf71d 100644
--- a/plugins/Echo/locale/id/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/id/LC_MESSAGES/Echo.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Echo to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/lb/LC_MESSAGES/Echo.po b/plugins/Echo/locale/lb/LC_MESSAGES/Echo.po
index 3639c55577..7979b20751 100644
--- a/plugins/Echo/locale/lb/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/lb/LC_MESSAGES/Echo.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Echo to Luxembourgish (Lëtzebuergesch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Robby
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:34+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:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: lb\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/mk/LC_MESSAGES/Echo.po b/plugins/Echo/locale/mk/LC_MESSAGES/Echo.po
index c23d2f7f47..af94f9e79d 100644
--- a/plugins/Echo/locale/mk/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/mk/LC_MESSAGES/Echo.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Echo to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/nb/LC_MESSAGES/Echo.po b/plugins/Echo/locale/nb/LC_MESSAGES/Echo.po
index 132c85e330..037605a911 100644
--- a/plugins/Echo/locale/nb/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/nb/LC_MESSAGES/Echo.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Echo to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/nl/LC_MESSAGES/Echo.po b/plugins/Echo/locale/nl/LC_MESSAGES/Echo.po
index 86f29ad64d..013bff2211 100644
--- a/plugins/Echo/locale/nl/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/nl/LC_MESSAGES/Echo.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Echo to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/pt/LC_MESSAGES/Echo.po b/plugins/Echo/locale/pt/LC_MESSAGES/Echo.po
index 94de378ee7..662655c2bc 100644
--- a/plugins/Echo/locale/pt/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/pt/LC_MESSAGES/Echo.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Echo to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Hamilton Abreu
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:34+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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/pt_BR/LC_MESSAGES/Echo.po b/plugins/Echo/locale/pt_BR/LC_MESSAGES/Echo.po
index 8871b987cc..e23e90436e 100644
--- a/plugins/Echo/locale/pt_BR/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/pt_BR/LC_MESSAGES/Echo.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Echo to Brazilian Portuguese (Português do Brasil)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Giro720
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:34+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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/ru/LC_MESSAGES/Echo.po b/plugins/Echo/locale/ru/LC_MESSAGES/Echo.po
index d55f7ad3ac..d1e87f6fbd 100644
--- a/plugins/Echo/locale/ru/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/ru/LC_MESSAGES/Echo.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Echo to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Александр Сигачёв
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:34+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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/tl/LC_MESSAGES/Echo.po b/plugins/Echo/locale/tl/LC_MESSAGES/Echo.po
index 193497bc8f..3622ff12e3 100644
--- a/plugins/Echo/locale/tl/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/tl/LC_MESSAGES/Echo.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Echo to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/uk/LC_MESSAGES/Echo.po b/plugins/Echo/locale/uk/LC_MESSAGES/Echo.po
index 00ed7b10c4..f1d32b4f07 100644
--- a/plugins/Echo/locale/uk/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/uk/LC_MESSAGES/Echo.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Echo to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/Echo/locale/zh_CN/LC_MESSAGES/Echo.po b/plugins/Echo/locale/zh_CN/LC_MESSAGES/Echo.po
index 2d8b88f4b8..744aa1bf19 100644
--- a/plugins/Echo/locale/zh_CN/LC_MESSAGES/Echo.po
+++ b/plugins/Echo/locale/zh_CN/LC_MESSAGES/Echo.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Echo to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Echo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-echo\n"
diff --git a/plugins/EmailAuthentication/locale/EmailAuthentication.pot b/plugins/EmailAuthentication/locale/EmailAuthentication.pot
index fb9f56efee..94247349cb 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/be-tarask/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/be-tarask/LC_MESSAGES/EmailAuthentication.po
index 934c42123e..0256140870 100644
--- a/plugins/EmailAuthentication/locale/be-tarask/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/be-tarask/LC_MESSAGES/EmailAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailAuthentication to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: EugeneZelenko
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:34+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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/br/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/br/LC_MESSAGES/EmailAuthentication.po
index c80247ec47..3d526443d3 100644
--- a/plugins/EmailAuthentication/locale/br/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/br/LC_MESSAGES/EmailAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailAuthentication to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Fulup
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/de/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/de/LC_MESSAGES/EmailAuthentication.po
index 5850458083..dd62e124ea 100644
--- a/plugins/EmailAuthentication/locale/de/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/de/LC_MESSAGES/EmailAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailAuthentication to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/es/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/es/LC_MESSAGES/EmailAuthentication.po
index 43882f42aa..425b804a68 100644
--- a/plugins/EmailAuthentication/locale/es/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/es/LC_MESSAGES/EmailAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailAuthentication to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:34+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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/fr/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/fr/LC_MESSAGES/EmailAuthentication.po
index d8bdd04460..3d6c4290f3 100644
--- a/plugins/EmailAuthentication/locale/fr/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/fr/LC_MESSAGES/EmailAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailAuthentication to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21: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-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/he/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/he/LC_MESSAGES/EmailAuthentication.po
index 21146aa71d..feed7f788e 100644
--- a/plugins/EmailAuthentication/locale/he/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/he/LC_MESSAGES/EmailAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailAuthentication to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:35+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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/ia/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/ia/LC_MESSAGES/EmailAuthentication.po
index a06d8bf308..cadab1a5b7 100644
--- a/plugins/EmailAuthentication/locale/ia/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/ia/LC_MESSAGES/EmailAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailAuthentication to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/id/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/id/LC_MESSAGES/EmailAuthentication.po
index 85b62ad482..9786664fbc 100644
--- a/plugins/EmailAuthentication/locale/id/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/id/LC_MESSAGES/EmailAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailAuthentication to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:35+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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/ja/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/ja/LC_MESSAGES/EmailAuthentication.po
index f08ac5ab89..36a72a33c5 100644
--- a/plugins/EmailAuthentication/locale/ja/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/ja/LC_MESSAGES/EmailAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailAuthentication to Japanese (日本語)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: 青子守歌
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:35+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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/mk/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/mk/LC_MESSAGES/EmailAuthentication.po
index 65745cbaba..3f5e4e2e65 100644
--- a/plugins/EmailAuthentication/locale/mk/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/mk/LC_MESSAGES/EmailAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailAuthentication to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/nb/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/nb/LC_MESSAGES/EmailAuthentication.po
index 3a58753f82..f4f8bcea1b 100644
--- a/plugins/EmailAuthentication/locale/nb/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/nb/LC_MESSAGES/EmailAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailAuthentication to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/nl/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/nl/LC_MESSAGES/EmailAuthentication.po
index 54edceb57a..fe7d1e8436 100644
--- a/plugins/EmailAuthentication/locale/nl/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/nl/LC_MESSAGES/EmailAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailAuthentication to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/pt/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/pt/LC_MESSAGES/EmailAuthentication.po
index 1788be6fd6..3023024ab3 100644
--- a/plugins/EmailAuthentication/locale/pt/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/pt/LC_MESSAGES/EmailAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailAuthentication to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Waldir
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/pt_BR/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/pt_BR/LC_MESSAGES/EmailAuthentication.po
index 688169b073..dbb6c824f1 100644
--- a/plugins/EmailAuthentication/locale/pt_BR/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/pt_BR/LC_MESSAGES/EmailAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailAuthentication to Brazilian Portuguese (Português do Brasil)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Giro720
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:35+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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/ru/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/ru/LC_MESSAGES/EmailAuthentication.po
index 4824b20899..ad3e61a759 100644
--- a/plugins/EmailAuthentication/locale/ru/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/ru/LC_MESSAGES/EmailAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailAuthentication to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Александр Сигачёв
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/tl/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/tl/LC_MESSAGES/EmailAuthentication.po
index 0eec3f312b..7b8fe15a74 100644
--- a/plugins/EmailAuthentication/locale/tl/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/tl/LC_MESSAGES/EmailAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailAuthentication to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/uk/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/uk/LC_MESSAGES/EmailAuthentication.po
index 77140faa67..d1bd14edeb 100644
--- a/plugins/EmailAuthentication/locale/uk/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/uk/LC_MESSAGES/EmailAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailAuthentication to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailAuthentication/locale/zh_CN/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/zh_CN/LC_MESSAGES/EmailAuthentication.po
index d7834d6cca..2396c38fdb 100644
--- a/plugins/EmailAuthentication/locale/zh_CN/LC_MESSAGES/EmailAuthentication.po
+++ b/plugins/EmailAuthentication/locale/zh_CN/LC_MESSAGES/EmailAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailAuthentication to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-emailauthentication\n"
diff --git a/plugins/EmailSummary/locale/EmailSummary.pot b/plugins/EmailSummary/locale/EmailSummary.pot
index 8e3d2b611d..ee2ff66aa9 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/be-tarask/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/be-tarask/LC_MESSAGES/EmailSummary.po
index 8b223cfa2b..a6a3baca7e 100644
--- a/plugins/EmailSummary/locale/be-tarask/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/be-tarask/LC_MESSAGES/EmailSummary.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailSummary to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Jim-by
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:35+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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
diff --git a/plugins/EmailSummary/locale/br/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/br/LC_MESSAGES/EmailSummary.po
index afe8f2380b..5f87f6812e 100644
--- a/plugins/EmailSummary/locale/br/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/br/LC_MESSAGES/EmailSummary.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailSummary to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Fulup
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:35+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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
diff --git a/plugins/EmailSummary/locale/fr/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/fr/LC_MESSAGES/EmailSummary.po
index c9d1b0b6a1..84ec9fa9d7 100644
--- a/plugins/EmailSummary/locale/fr/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/fr/LC_MESSAGES/EmailSummary.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailSummary to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:58+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21: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-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
diff --git a/plugins/EmailSummary/locale/he/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/he/LC_MESSAGES/EmailSummary.po
index 9dbeea02bd..fb3452678a 100644
--- a/plugins/EmailSummary/locale/he/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/he/LC_MESSAGES/EmailSummary.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailSummary to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:58+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:35+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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
diff --git a/plugins/EmailSummary/locale/ia/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/ia/LC_MESSAGES/EmailSummary.po
index 8a4e935858..ff043a5dc3 100644
--- a/plugins/EmailSummary/locale/ia/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/ia/LC_MESSAGES/EmailSummary.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailSummary to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:58+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
diff --git a/plugins/EmailSummary/locale/id/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/id/LC_MESSAGES/EmailSummary.po
index 48fcb86262..d823958eb3 100644
--- a/plugins/EmailSummary/locale/id/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/id/LC_MESSAGES/EmailSummary.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailSummary to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:58+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:35+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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
diff --git a/plugins/EmailSummary/locale/mk/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/mk/LC_MESSAGES/EmailSummary.po
index e510ca80b2..6860b9db53 100644
--- a/plugins/EmailSummary/locale/mk/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/mk/LC_MESSAGES/EmailSummary.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailSummary to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:58+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
diff --git a/plugins/EmailSummary/locale/nl/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/nl/LC_MESSAGES/EmailSummary.po
index f8f9c6ec80..b41fa5062a 100644
--- a/plugins/EmailSummary/locale/nl/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/nl/LC_MESSAGES/EmailSummary.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailSummary to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:58+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
diff --git a/plugins/EmailSummary/locale/ru/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/ru/LC_MESSAGES/EmailSummary.po
index b3a6488050..672065b8d4 100644
--- a/plugins/EmailSummary/locale/ru/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/ru/LC_MESSAGES/EmailSummary.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailSummary to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Lockal
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:59+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:36+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:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
diff --git a/plugins/EmailSummary/locale/uk/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/uk/LC_MESSAGES/EmailSummary.po
index 071c64201a..c5db8cac34 100644
--- a/plugins/EmailSummary/locale/uk/LC_MESSAGES/EmailSummary.po
+++ b/plugins/EmailSummary/locale/uk/LC_MESSAGES/EmailSummary.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - EmailSummary to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - EmailSummary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:59+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-01-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-emailsummary\n"
diff --git a/plugins/EmailSummary/locale/zh_CN/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/zh_CN/LC_MESSAGES/EmailSummary.po
new file mode 100644
index 0000000000..f63a1ff010
--- /dev/null
+++ b/plugins/EmailSummary/locale/zh_CN/LC_MESSAGES/EmailSummary.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - EmailSummary to Simplified Chinese (‪中文(简体)‬)
+# Exported from translatewiki.net
+#
+# Author: Hydra
+# --
+# 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-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:36+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-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/Facebook/locale/Facebook.pot b/plugins/Facebook/locale/Facebook.pot
index b7c6dead94..b70a0f8ec8 100644
--- a/plugins/Facebook/locale/Facebook.pot
+++ b/plugins/Facebook/locale/Facebook.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/Facebook/locale/be-tarask/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/be-tarask/LC_MESSAGES/Facebook.po
index cae852296f..cef809c7c6 100644
--- a/plugins/Facebook/locale/be-tarask/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/be-tarask/LC_MESSAGES/Facebook.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Facebook to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: EugeneZelenko
 # Author: Jim-by
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 14:59:35+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:42+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:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-22 19:30:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: be-tarask\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
diff --git a/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po
index c2edf3bf20..282f8fbea6 100644
--- a/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Facebook to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Fulup
 # Author: Y-M D
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 14:59:35+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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"
-"X-POT-Import-Date: 2011-01-14 23:54:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-22 19:30:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
diff --git a/plugins/Facebook/locale/ca/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/ca/LC_MESSAGES/Facebook.po
new file mode 100644
index 0000000000..8d244a71e6
--- /dev/null
+++ b/plugins/Facebook/locale/ca/LC_MESSAGES/Facebook.po
@@ -0,0 +1,546 @@
+# Translation of StatusNet - Facebook to Catalan (Català)
+# Exported from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Facebook\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:42+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-22 19:30:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: ca\n"
+"X-Message-Group: #out-statusnet-plugin-facebook\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: facebookutil.php:429
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %2$s, and have disabled the Facebook application for "
+"your account. This may be because you have removed the Facebook "
+"application's authorization, or have deleted your Facebook account.  You can "
+"re-enable the Facebook application and automatic status updating by re-"
+"installing the %2$s Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%2$s"
+msgstr ""
+
+#: FBConnectAuth.php:55
+msgid "You must be logged into Facebook to use Facebook Connect."
+msgstr ""
+
+#: FBConnectAuth.php:79
+msgid "There is already a local user linked with this Facebook account."
+msgstr ""
+
+#: FBConnectAuth.php:91 FBConnectSettings.php:166
+msgid "There was a problem with your session token. Try again, please."
+msgstr ""
+
+#: FBConnectAuth.php:96
+msgid "You can't register if you don't agree to the license."
+msgstr ""
+
+#: FBConnectAuth.php:106
+msgid "An unknown error has occured."
+msgstr "S'ha produït un error desconegut."
+
+#. TRANS: %s is the site name.
+#: FBConnectAuth.php:121
+#, php-format
+msgid ""
+"This is the first time you've logged into %s so we must connect your "
+"Facebook to a local account. You can either create a new account, or connect "
+"with your existing account, if you have one."
+msgstr ""
+
+#. TRANS: Page title.
+#: FBConnectAuth.php:128
+msgid "Facebook Account Setup"
+msgstr "Configuració del compte del Facebook"
+
+#. TRANS: Legend.
+#: FBConnectAuth.php:162
+msgid "Connection options"
+msgstr "Opcions de connexió"
+
+#. TRANS: %s is the name of the license used by the user for their status updates.
+#: FBConnectAuth.php:172
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+
+#. TRANS: Legend.
+#: FBConnectAuth.php:189
+msgid "Create new account"
+msgstr "Crea un compte nou"
+
+#: FBConnectAuth.php:191
+msgid "Create a new user with this nickname."
+msgstr "Crea un compte nou amb aquest sobrenom."
+
+#. TRANS: Field label.
+#: FBConnectAuth.php:195
+msgid "New nickname"
+msgstr "Nou sobrenom"
+
+#: FBConnectAuth.php:197
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr ""
+
+#. TRANS: Submit button.
+#: FBConnectAuth.php:201
+msgctxt "BUTTON"
+msgid "Create"
+msgstr "Crea"
+
+#: FBConnectAuth.php:207
+msgid "Connect existing account"
+msgstr "Connecta un compte existent"
+
+#: FBConnectAuth.php:209
+msgid ""
+"If you already have an account, login with your username and password to "
+"connect it to your Facebook."
+msgstr ""
+"Si ja teniu un compte, inicieu una sessió amb el nom d'usuari i contrasenya "
+"per connectar-lo al vostre Facebook."
+
+#. TRANS: Field label.
+#: FBConnectAuth.php:213
+msgid "Existing nickname"
+msgstr "Sobrenom ja existent"
+
+#: FBConnectAuth.php:216 facebookaction.php:277
+msgid "Password"
+msgstr "Contrasenya"
+
+#. TRANS: Submit button.
+#: FBConnectAuth.php:220
+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'.
+#: FBConnectAuth.php:241 FBConnectAuth.php:251
+msgid "Registration not allowed."
+msgstr "No es permet el registre"
+
+#. TRANS: Client error trying to register with an invalid invitation code.
+#: FBConnectAuth.php:259
+msgid "Not a valid invitation code."
+msgstr "No és un codi d'invitació vàlid."
+
+#: FBConnectAuth.php:271
+msgid "Nickname not allowed."
+msgstr "No es permet el sobrenom."
+
+#: FBConnectAuth.php:276
+msgid "Nickname already in use. Try another one."
+msgstr "El sobrenom ja és en ús. Proveu-ne un altre."
+
+#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
+msgid "Error connecting user to Facebook."
+msgstr "S'ha produït un error en connectar l'usuari al Facebook."
+
+#: FBConnectAuth.php:316
+msgid "Invalid username or password."
+msgstr "Nom d'usuari o contrasenya no vàlids."
+
+#. TRANS: Page title.
+#: facebooklogin.php:90 facebookaction.php:255
+msgid "Login"
+msgstr "Inici de sessió"
+
+#. TRANS: Legend.
+#: facebooknoticeform.php:144
+msgid "Send a notice"
+msgstr "Envia un avís"
+
+#. TRANS: Field label.
+#: facebooknoticeform.php:157
+#, php-format
+msgid "What's up, %s?"
+msgstr "Com va, %s?"
+
+#: facebooknoticeform.php:169
+msgid "Available characters"
+msgstr "Caràcters disponibles"
+
+#. TRANS: Button text.
+#: facebooknoticeform.php:196
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Envia"
+
+#: facebookhome.php:103
+msgid "Server error: Couldn't get user!"
+msgstr "Error del servidor: no es pot obtenir l'usuari!"
+
+#: facebookhome.php:122
+msgid "Incorrect username or password."
+msgstr "Usuari o contrasenya incorrectes."
+
+#. TRANS: Page title.
+#. TRANS: %1$s is a user nickname, %2$s is a page number.
+#: facebookhome.php:153
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%1$s i amics, pàgina %2$d"
+
+#. TRANS: Page title.
+#. TRANS: %s is a user nickname
+#: facebookhome.php:157
+#, php-format
+msgid "%s and friends"
+msgstr "%s i amics"
+
+#. TRANS: Instructions. %s is the application name.
+#: facebookhome.php:185
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: facebookhome.php:210
+msgid "Okay, do it!"
+msgstr ""
+
+#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
+#: facebookhome.php:217
+msgctxt "BUTTON"
+msgid "Skip"
+msgstr "Omet"
+
+#: facebookhome.php:244 facebookaction.php:336
+msgid "Pagination"
+msgstr "Paginació"
+
+#. TRANS: Pagination link.
+#: facebookhome.php:254 facebookaction.php:345
+msgid "After"
+msgstr "Després"
+
+#. TRANS: Pagination link.
+#: facebookhome.php:263 facebookaction.php:353
+msgid "Before"
+msgstr "Abans"
+
+#. TRANS: %s is the name of the site.
+#: facebookinvite.php:69
+#, php-format
+msgid "Thanks for inviting your friends to use %s."
+msgstr "Gràcies per convidar els vostres amics perquè facin servir el %s."
+
+#. TRANS: Followed by an unordered list with invited friends.
+#: facebookinvite.php:72
+msgid "Invitations have been sent to the following users:"
+msgstr ""
+
+#: facebookinvite.php:91
+#, php-format
+msgid "You have been invited to %s"
+msgstr ""
+
+#. TRANS: %s is the name of the site.
+#: facebookinvite.php:101
+#, php-format
+msgid "Invite your friends to use %s"
+msgstr ""
+
+#. TRANS: %s is the name of the site.
+#: facebookinvite.php:124
+#, php-format
+msgid "Friends already using %s:"
+msgstr ""
+
+#. TRANS: Page title.
+#: facebookinvite.php:143
+msgid "Send invitations"
+msgstr "Envia invitacions"
+
+#. TRANS: Menu item.
+#. TRANS: Menu item tab.
+#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
+msgctxt "MENU"
+msgid "Facebook"
+msgstr "Facebook"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#: FacebookPlugin.php:190
+msgid "Facebook integration configuration"
+msgstr "Configuració d'integració del Facebook"
+
+#: FacebookPlugin.php:431
+msgid "Facebook Connect User"
+msgstr "Usuari de connexió del Facebook"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#: FacebookPlugin.php:463
+msgid "Login or register using Facebook"
+msgstr "Inicieu una sessió o registreu-vos fent servir el Facebook"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#. TRANS: Page title.
+#: FacebookPlugin.php:487 FBConnectSettings.php:55
+msgid "Facebook Connect Settings"
+msgstr ""
+
+#: FacebookPlugin.php:591
+msgid ""
+"The Facebook plugin allows integrating StatusNet instances with <a href="
+"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
+msgstr ""
+
+#: FBConnectLogin.php:33
+msgid "Already logged in."
+msgstr ""
+
+#. TRANS: Instructions.
+#: FBConnectLogin.php:42
+msgid "Login with your Facebook Account"
+msgstr ""
+
+#. TRANS: Page title.
+#: FBConnectLogin.php:57
+msgid "Facebook Login"
+msgstr "Inici de sessió del Facebook"
+
+#: facebookremove.php:53
+msgid "Couldn't remove Facebook user: already deleted."
+msgstr ""
+
+#: facebookremove.php:63
+msgid "Couldn't remove Facebook user."
+msgstr ""
+
+#. TRANS: Link description for 'Home' link that leads to a start page.
+#: facebookaction.php:169
+msgctxt "MENU"
+msgid "Home"
+msgstr "Inici"
+
+#. TRANS: Tooltip for 'Home' link that leads to a start page.
+#: facebookaction.php:171
+msgid "Home"
+msgstr "Inici"
+
+#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
+#: facebookaction.php:180
+msgctxt "MENU"
+msgid "Invite"
+msgstr "Convida"
+
+#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
+#: facebookaction.php:182
+msgid "Invite"
+msgstr "Convida"
+
+#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
+#: facebookaction.php:192
+msgctxt "MENU"
+msgid "Settings"
+msgstr "Paràmetres"
+
+#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
+#: facebookaction.php:194
+msgid "Settings"
+msgstr "Paràmetres"
+
+#: facebookaction.php:233
+#, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet?"
+msgstr ""
+
+#: facebookaction.php:235
+msgid " a new account."
+msgstr ""
+
+#: facebookaction.php:242
+msgid "Register"
+msgstr "Registre"
+
+#: facebookaction.php:274
+msgid "Nickname"
+msgstr "Sobrenom"
+
+#. TRANS: Login button.
+#: facebookaction.php:282
+msgctxt "BUTTON"
+msgid "Login"
+msgstr "Inici de sessió"
+
+#: facebookaction.php:288
+msgid "Lost or forgotten password?"
+msgstr "Heu perdut o oblidat la contrasenya?"
+
+#: facebookaction.php:370
+msgid "No notice content!"
+msgstr "No hi ha contingut a l'avís!"
+
+#: facebookaction.php:377
+#, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "És massa llarg. La mida màxima d'un avís són %d caràcters."
+
+#: facebookaction.php:431
+msgid "Notices"
+msgstr "Avisos"
+
+#: facebookadminpanel.php:52
+msgid "Facebook"
+msgstr "Facebook"
+
+#: facebookadminpanel.php:62
+msgid "Facebook integration settings"
+msgstr "Paràmetres d'integració del Facebook"
+
+#: facebookadminpanel.php:123
+msgid "Invalid Facebook API key. Max length is 255 characters."
+msgstr "Clau API del Facebook no vàlida. La longitud màxima són 255 caràcters."
+
+#: facebookadminpanel.php:129
+msgid "Invalid Facebook API secret. Max length is 255 characters."
+msgstr ""
+
+#: facebookadminpanel.php:178
+msgid "Facebook application settings"
+msgstr "Paràmetres d'aplicació del Facebook"
+
+#: facebookadminpanel.php:184
+msgid "API key"
+msgstr "Clau API"
+
+#: facebookadminpanel.php:185
+msgid "API key provided by Facebook"
+msgstr "Clau API proporcionada pel Facebook"
+
+#: facebookadminpanel.php:193
+msgid "Secret"
+msgstr "Clau secreta"
+
+#: facebookadminpanel.php:194
+msgid "API secret provided by Facebook"
+msgstr ""
+
+#: facebookadminpanel.php:210
+msgid "Save"
+msgstr "Desa"
+
+#: facebookadminpanel.php:210
+msgid "Save Facebook settings"
+msgstr "Desa els paràmetres del Facebook"
+
+#. TRANS: Instructions.
+#: FBConnectSettings.php:66
+msgid "Manage how your account connects to Facebook"
+msgstr "Gestiona com el vostre compte es connecta al Facebook"
+
+#: FBConnectSettings.php:90
+msgid "There is no Facebook user connected to this account."
+msgstr "No hi ha cap usuari del Facebook connectat a aquest compte."
+
+#: FBConnectSettings.php:98
+msgid "Connected Facebook user"
+msgstr "Usuari del Facebook connectat"
+
+#. TRANS: Legend.
+#: FBConnectSettings.php:118
+msgid "Disconnect my account from Facebook"
+msgstr "Desconnecta el meu compte del Facebook"
+
+#. TRANS: Followed by a link containing text "set a password".
+#: FBConnectSettings.php:125
+msgid ""
+"Disconnecting your Faceboook would make it impossible to log in! Please "
+msgstr ""
+"Si desconnecteu el vostre Facebook, serà impossible iniciar una sessió!"
+
+#. TRANS: Preceded by "Please " and followed by " first."
+#: FBConnectSettings.php:130
+msgid "set a password"
+msgstr "definiu una contrasenya"
+
+#. TRANS: Preceded by "Please set a password".
+#: FBConnectSettings.php:132
+msgid " first."
+msgstr " abans de res."
+
+#. TRANS: Submit button.
+#: FBConnectSettings.php:145
+msgctxt "BUTTON"
+msgid "Disconnect"
+msgstr "Desconnecta"
+
+#: FBConnectSettings.php:180
+msgid "Couldn't delete link to Facebook."
+msgstr ""
+
+#: FBConnectSettings.php:196
+msgid "You have disconnected from Facebook."
+msgstr "Us heu desconnectat del Facebook."
+
+#: FBConnectSettings.php:199
+msgid "Not sure what you're trying to do."
+msgstr "No estic segur del que proveu de fer."
+
+#: facebooksettings.php:61
+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.
+#: facebooksettings.php:64
+msgid "Sync preferences saved."
+msgstr "S'han desat les preferències de sincronització."
+
+#: facebooksettings.php:87
+msgid "Automatically update my Facebook status with my notices."
+msgstr ""
+"Actualitza automàticament el meu estat del Facebook amb els meus avisos."
+
+#: facebooksettings.php:94
+msgid "Send \"@\" replies to Facebook."
+msgstr "Envia respostes «@» al Facebook."
+
+#. TRANS: Submit button to save synchronisation settings.
+#: facebooksettings.php:102
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Desa"
+
+#. TRANS: %s is the application name.
+#: facebooksettings.php:111
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+"Si voleu que %s actualitzi automàticament el vostre estat del Facebook amb "
+"el darrer avís, cal que li doneu permís."
+
+#: facebooksettings.php:124
+#, php-format
+msgid "Allow %s to update my Facebook status"
+msgstr "Permet que %s actualitzi el meu estat del Facebook"
+
+#. TRANS: Page title for synchronisation settings.
+#: facebooksettings.php:134
+msgid "Sync preferences"
+msgstr "Preferències de sincronització"
diff --git a/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po
index 3781695ab3..f28334bffc 100644
--- a/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Facebook to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Michael
 # Author: The Evil IP address
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 14:59:35+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:43+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 23:54:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-22 19:30:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
diff --git a/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po
index f72df84434..39381fe624 100644
--- a/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Facebook to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Locos epraix
 # Author: Peter17
@@ -11,13 +11,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 14:59:36+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:43+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:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-22 19:30:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
diff --git a/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po
index 02242d2348..eb9f440878 100644
--- a/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Facebook to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # Author: Verdy p
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 14:59:36+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:43+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:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-22 19:30:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
diff --git a/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po
index 4fbedad9d1..8392821035 100644
--- a/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Facebook to Galician (Galego)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Toliño
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 14:59:36+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:43+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 23:54:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-22 19:30:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
diff --git a/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po
index 8aae8310f0..59e4457f7b 100644
--- a/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Facebook to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 14:59:36+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-01-14 23:54:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-22 19:30:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
diff --git a/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po
index 93d93a6362..09dedf13ae 100644
--- a/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Facebook to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 14:59:36+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-01-14 23:54:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-22 19:30:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
diff --git a/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po
index 4c05ffa666..5a22e47527 100644
--- a/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Facebook to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 14:59:37+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:44+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:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-22 19:30:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
diff --git a/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
index 74a7171f55..fda8b1054d 100644
--- a/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Facebook to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 14:59:36+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-01-14 23:54:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-22 19:30:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
diff --git a/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po
index b13d1750f2..6a6dcff9c0 100644
--- a/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Facebook to Brazilian Portuguese (Português do Brasil)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Giro720
 # Author: Luckas Blade
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 14:59:37+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:44+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 23:54:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-22 19:30:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
diff --git a/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po
index 0eaedbb800..aa791f367f 100644
--- a/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Facebook to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 14:59:37+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:44+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:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-22 19:30:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
diff --git a/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po
index 88aef430fd..2bbe18f092 100644
--- a/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Facebook to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 14:59:37+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:44+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:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-22 19:30:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
diff --git a/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po
index f81d46986d..7bb44631be 100644
--- a/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po
@@ -1,7 +1,8 @@
 # Translation of StatusNet - Facebook to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Chenxiaoqino
+# Author: Hydra
 # Author: ZhengYiFeng
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -10,14 +11,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 14:59:38+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:44+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:26+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-22 19:30:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -210,9 +211,9 @@ msgstr "用户名或密码不正确。"
 #. TRANS: Page title.
 #. TRANS: %1$s is a user nickname, %2$s is a page number.
 #: facebookhome.php:153
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s and friends, page %2$d"
-msgstr "%s 和好友们"
+msgstr "%1$s 和页 %2$d 的朋友"
 
 #. TRANS: Page title.
 #. TRANS: %s is a user nickname
@@ -346,34 +347,34 @@ msgstr ""
 #: facebookaction.php:169
 msgctxt "MENU"
 msgid "Home"
-msgstr ""
+msgstr "首页"
 
 #. TRANS: Tooltip for 'Home' link that leads to a start page.
 #: facebookaction.php:171
 msgid "Home"
-msgstr ""
+msgstr "首页"
 
 #. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
 #: facebookaction.php:180
 msgctxt "MENU"
 msgid "Invite"
-msgstr ""
+msgstr "邀请"
 
 #. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
 #: facebookaction.php:182
 msgid "Invite"
-msgstr ""
+msgstr "邀请"
 
 #. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
 #: facebookaction.php:192
 msgctxt "MENU"
 msgid "Settings"
-msgstr ""
+msgstr "设置"
 
 #. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
 #: facebookaction.php:194
 msgid "Settings"
-msgstr ""
+msgstr "设置"
 
 #: facebookaction.php:233
 #, php-format
diff --git a/plugins/FacebookBridge/locale/FacebookBridge.pot b/plugins/FacebookBridge/locale/FacebookBridge.pot
index 2eba65cc68..e093f145f7 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-01-14 10:29+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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"
@@ -110,69 +110,69 @@ msgid "Create a new user with this nickname."
 msgstr ""
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:262
+#: actions/facebookfinishlogin.php:266
 msgid "New nickname"
 msgstr ""
 
-#: actions/facebookfinishlogin.php:264
+#: actions/facebookfinishlogin.php:268
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 
 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:268
+#: actions/facebookfinishlogin.php:276
 msgctxt "BUTTON"
 msgid "Create"
 msgstr ""
 
-#: actions/facebookfinishlogin.php:274
+#: actions/facebookfinishlogin.php:282
 msgid "Connect existing account"
 msgstr ""
 
-#: actions/facebookfinishlogin.php:276
+#: 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:280
+#: actions/facebookfinishlogin.php:288
 msgid "Existing nickname"
 msgstr ""
 
-#: actions/facebookfinishlogin.php:283
+#: actions/facebookfinishlogin.php:291
 msgid "Password"
 msgstr ""
 
 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:287
+#: 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:308 actions/facebookfinishlogin.php:318
+#: 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:326
+#: actions/facebookfinishlogin.php:334
 msgid "Not a valid invitation code."
 msgstr ""
 
-#: actions/facebookfinishlogin.php:339
+#: actions/facebookfinishlogin.php:347
 msgid "Nickname not allowed."
 msgstr ""
 
-#: actions/facebookfinishlogin.php:344
+#: actions/facebookfinishlogin.php:352
 msgid "Nickname already in use. Try another one."
 msgstr ""
 
-#: actions/facebookfinishlogin.php:372 actions/facebookfinishlogin.php:511
+#: actions/facebookfinishlogin.php:380 actions/facebookfinishlogin.php:519
 msgid "Error connecting user to Facebook."
 msgstr ""
 
-#: actions/facebookfinishlogin.php:474
+#: actions/facebookfinishlogin.php:482
 msgid "Invalid username or password."
 msgstr ""
 
diff --git a/plugins/FacebookBridge/locale/br/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/br/LC_MESSAGES/FacebookBridge.po
index 3231cc8935..a0d6d25c3e 100644
--- a/plugins/FacebookBridge/locale/br/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/br/LC_MESSAGES/FacebookBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FacebookBridge to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Y-M D
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:21:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -117,69 +117,69 @@ msgid "Create a new user with this nickname."
 msgstr "Krouiñ un implijer nevez gant al lesanv-se."
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:262
+#: actions/facebookfinishlogin.php:266
 msgid "New nickname"
 msgstr "Lesanv nevez"
 
-#: actions/facebookfinishlogin.php:264
+#: 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:268
+#: actions/facebookfinishlogin.php:276
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Krouiñ"
 
-#: actions/facebookfinishlogin.php:274
+#: actions/facebookfinishlogin.php:282
 msgid "Connect existing account"
 msgstr "Kevreañ d'ur gont a zo dioutañ"
 
-#: actions/facebookfinishlogin.php:276
+#: 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:280
+#: actions/facebookfinishlogin.php:288
 msgid "Existing nickname"
 msgstr "Lesanv a zo dioutañ"
 
-#: actions/facebookfinishlogin.php:283
+#: actions/facebookfinishlogin.php:291
 msgid "Password"
 msgstr "Ger-tremen"
 
 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:287
+#: 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:308 actions/facebookfinishlogin.php:318
+#: 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:326
+#: actions/facebookfinishlogin.php:334
 msgid "Not a valid invitation code."
 msgstr "N'eo ket reizh ar c'hod pedadenn."
 
-#: actions/facebookfinishlogin.php:339
+#: actions/facebookfinishlogin.php:347
 msgid "Nickname not allowed."
 msgstr "Lesanv nann-aotreet."
 
-#: actions/facebookfinishlogin.php:344
+#: 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:372 actions/facebookfinishlogin.php:511
+#: actions/facebookfinishlogin.php:380 actions/facebookfinishlogin.php:519
 msgid "Error connecting user to Facebook."
 msgstr ""
 
-#: actions/facebookfinishlogin.php:474
+#: actions/facebookfinishlogin.php:482
 msgid "Invalid username or password."
 msgstr "Anv implijer pe ger-tremen direizh."
 
diff --git a/plugins/FacebookBridge/locale/ca/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/ca/LC_MESSAGES/FacebookBridge.po
index ecb15c6a60..1c93e7168c 100644
--- a/plugins/FacebookBridge/locale/ca/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/ca/LC_MESSAGES/FacebookBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FacebookBridge to Catalan (Català)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Toniher
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:48+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 (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:21:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -123,25 +123,25 @@ msgid "Create a new user with this nickname."
 msgstr "Crea un usuari nou amb aquest sobrenom"
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:262
+#: actions/facebookfinishlogin.php:266
 msgid "New nickname"
 msgstr "Nou sobrenom"
 
-#: actions/facebookfinishlogin.php:264
+#: 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:268
+#: actions/facebookfinishlogin.php:276
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Crea"
 
-#: actions/facebookfinishlogin.php:274
+#: actions/facebookfinishlogin.php:282
 msgid "Connect existing account"
 msgstr "Connecta el compte ja existent"
 
-#: actions/facebookfinishlogin.php:276
+#: actions/facebookfinishlogin.php:284
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Facebook."
@@ -150,44 +150,44 @@ msgstr ""
 "contrasenya per connectar-lo al Facebook."
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:280
+#: actions/facebookfinishlogin.php:288
 msgid "Existing nickname"
 msgstr "ja existeix el sobrenom"
 
-#: actions/facebookfinishlogin.php:283
+#: actions/facebookfinishlogin.php:291
 msgid "Password"
 msgstr "Contrasenya"
 
 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:287
+#: 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:308 actions/facebookfinishlogin.php:318
+#: 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:326
+#: actions/facebookfinishlogin.php:334
 msgid "Not a valid invitation code."
 msgstr "No és un codi d'invitació vàlid"
 
-#: actions/facebookfinishlogin.php:339
+#: actions/facebookfinishlogin.php:347
 msgid "Nickname not allowed."
 msgstr "No es permet el sobrenom."
 
-#: actions/facebookfinishlogin.php:344
+#: 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:372 actions/facebookfinishlogin.php:511
+#: 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:474
+#: actions/facebookfinishlogin.php:482
 msgid "Invalid username or password."
 msgstr "Nom d'usuari o contrasenya no vàlids"
 
diff --git a/plugins/FacebookBridge/locale/ia/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/ia/LC_MESSAGES/FacebookBridge.po
index 82a485b620..9dfd77afcf 100644
--- a/plugins/FacebookBridge/locale/ia/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/ia/LC_MESSAGES/FacebookBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FacebookBridge to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:21:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -123,25 +123,25 @@ msgid "Create a new user with this nickname."
 msgstr "Crear un nove usator con iste pseudonymo."
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:262
+#: actions/facebookfinishlogin.php:266
 msgid "New nickname"
 msgstr "Nove pseudonymo"
 
-#: actions/facebookfinishlogin.php:264
+#: 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:268
+#: actions/facebookfinishlogin.php:276
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Crear"
 
-#: actions/facebookfinishlogin.php:274
+#: actions/facebookfinishlogin.php:282
 msgid "Connect existing account"
 msgstr "Connecter conto existente"
 
-#: actions/facebookfinishlogin.php:276
+#: actions/facebookfinishlogin.php:284
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Facebook."
@@ -150,44 +150,44 @@ msgstr ""
 "pro connecter lo a tu Facebook."
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:280
+#: actions/facebookfinishlogin.php:288
 msgid "Existing nickname"
 msgstr "Pseudonymo existente"
 
-#: actions/facebookfinishlogin.php:283
+#: actions/facebookfinishlogin.php:291
 msgid "Password"
 msgstr "Contrasigno"
 
 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:287
+#: 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:308 actions/facebookfinishlogin.php:318
+#: 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:326
+#: actions/facebookfinishlogin.php:334
 msgid "Not a valid invitation code."
 msgstr "Le codice de invitation es invalide."
 
-#: actions/facebookfinishlogin.php:339
+#: actions/facebookfinishlogin.php:347
 msgid "Nickname not allowed."
 msgstr "Pseudonymo non permittite."
 
-#: actions/facebookfinishlogin.php:344
+#: actions/facebookfinishlogin.php:352
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonymo ja in uso. Proba un altere."
 
-#: actions/facebookfinishlogin.php:372 actions/facebookfinishlogin.php:511
+#: 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:474
+#: actions/facebookfinishlogin.php:482
 msgid "Invalid username or password."
 msgstr "Nomine de usator o contrasigno invalide."
 
diff --git a/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po
index 27f617a48d..89dc2dc0be 100644
--- a/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/mk/LC_MESSAGES/FacebookBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FacebookBridge to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:11+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:21:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -122,25 +122,25 @@ msgid "Create a new user with this nickname."
 msgstr "Создај нов корисник со овој прекар."
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:262
+#: actions/facebookfinishlogin.php:266
 msgid "New nickname"
 msgstr "Нов прекар"
 
-#: actions/facebookfinishlogin.php:264
+#: actions/facebookfinishlogin.php:268
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 мали букви и бројки, без интерпункциски знаци и празни места"
 
 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:268
+#: actions/facebookfinishlogin.php:276
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Создај"
 
-#: actions/facebookfinishlogin.php:274
+#: actions/facebookfinishlogin.php:282
 msgid "Connect existing account"
 msgstr "Поврзи постоечка сметка"
 
-#: actions/facebookfinishlogin.php:276
+#: actions/facebookfinishlogin.php:284
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Facebook."
@@ -149,44 +149,44 @@ msgstr ""
 "поврзете со профилот на Facebook."
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:280
+#: actions/facebookfinishlogin.php:288
 msgid "Existing nickname"
 msgstr "Постоечки прекар"
 
-#: actions/facebookfinishlogin.php:283
+#: actions/facebookfinishlogin.php:291
 msgid "Password"
 msgstr "Лозинка"
 
 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:287
+#: 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:308 actions/facebookfinishlogin.php:318
+#: 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:326
+#: actions/facebookfinishlogin.php:334
 msgid "Not a valid invitation code."
 msgstr "Ова не е важечки код за покана."
 
-#: actions/facebookfinishlogin.php:339
+#: actions/facebookfinishlogin.php:347
 msgid "Nickname not allowed."
 msgstr "Прекарот не е дозволен."
 
-#: actions/facebookfinishlogin.php:344
+#: actions/facebookfinishlogin.php:352
 msgid "Nickname already in use. Try another one."
 msgstr "Тој прекар е во употреба. Одберете друг."
 
-#: actions/facebookfinishlogin.php:372 actions/facebookfinishlogin.php:511
+#: actions/facebookfinishlogin.php:380 actions/facebookfinishlogin.php:519
 msgid "Error connecting user to Facebook."
 msgstr "Грешка при поврзувањето на корисникот со Facebook."
 
-#: actions/facebookfinishlogin.php:474
+#: actions/facebookfinishlogin.php:482
 msgid "Invalid username or password."
 msgstr "Погрешно име или лозинка."
 
diff --git a/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po
index e49b594965..07d0b07a7a 100644
--- a/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/nl/LC_MESSAGES/FacebookBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FacebookBridge to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:11+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:21:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -126,25 +126,25 @@ msgid "Create a new user with this nickname."
 msgstr "Nieuwe gebruiker aanmaken met deze gebruikersnaam."
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:262
+#: actions/facebookfinishlogin.php:266
 msgid "New nickname"
 msgstr "Nieuwe gebruikersnaam"
 
-#: actions/facebookfinishlogin.php:264
+#: 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:268
+#: actions/facebookfinishlogin.php:276
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Aanmaken"
 
-#: actions/facebookfinishlogin.php:274
+#: actions/facebookfinishlogin.php:282
 msgid "Connect existing account"
 msgstr "Verbinden met een bestaande gebruiker"
 
-#: actions/facebookfinishlogin.php:276
+#: actions/facebookfinishlogin.php:284
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Facebook."
@@ -153,45 +153,45 @@ msgstr ""
 "wachtwoord om deze daarna te koppelen met uw Facebookgebruiker."
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:280
+#: actions/facebookfinishlogin.php:288
 msgid "Existing nickname"
 msgstr "Bestaande gebruikersnaam"
 
-#: actions/facebookfinishlogin.php:283
+#: actions/facebookfinishlogin.php:291
 msgid "Password"
 msgstr "Wachtwoord"
 
 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:287
+#: 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:308 actions/facebookfinishlogin.php:318
+#: 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:326
+#: actions/facebookfinishlogin.php:334
 msgid "Not a valid invitation code."
 msgstr "De uitnodigingscode is ongeldig."
 
-#: actions/facebookfinishlogin.php:339
+#: actions/facebookfinishlogin.php:347
 msgid "Nickname not allowed."
 msgstr "Gebruikersnaam niet toegestaan."
 
-#: actions/facebookfinishlogin.php:344
+#: 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:372 actions/facebookfinishlogin.php:511
+#: 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:474
+#: actions/facebookfinishlogin.php:482
 msgid "Invalid username or password."
 msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
diff --git a/plugins/FacebookBridge/locale/uk/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/uk/LC_MESSAGES/FacebookBridge.po
index cfa45d8d51..6954d44c81 100644
--- a/plugins/FacebookBridge/locale/uk/LC_MESSAGES/FacebookBridge.po
+++ b/plugins/FacebookBridge/locale/uk/LC_MESSAGES/FacebookBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FacebookBridge to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FacebookBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:11+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:21:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-facebookbridge\n"
@@ -123,26 +123,26 @@ msgid "Create a new user with this nickname."
 msgstr "Створити нового користувача з цим нікнеймом."
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:262
+#: actions/facebookfinishlogin.php:266
 msgid "New nickname"
 msgstr "Новий псевдонім"
 
-#: actions/facebookfinishlogin.php:264
+#: actions/facebookfinishlogin.php:268
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 "1-64 літери нижнього регістру і цифри, ніякої пунктуації або інтервалів"
 
 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:268
+#: actions/facebookfinishlogin.php:276
 msgctxt "BUTTON"
 msgid "Create"
 msgstr "Створити"
 
-#: actions/facebookfinishlogin.php:274
+#: actions/facebookfinishlogin.php:282
 msgid "Connect existing account"
 msgstr "Приєднати акаунт, який вже існує"
 
-#: actions/facebookfinishlogin.php:276
+#: actions/facebookfinishlogin.php:284
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Facebook."
@@ -151,44 +151,44 @@ msgstr ""
 "приєднати їх до Facebook."
 
 #. TRANS: Field label.
-#: actions/facebookfinishlogin.php:280
+#: actions/facebookfinishlogin.php:288
 msgid "Existing nickname"
 msgstr "Нікнейм, який вже існує"
 
-#: actions/facebookfinishlogin.php:283
+#: actions/facebookfinishlogin.php:291
 msgid "Password"
 msgstr "Пароль"
 
 #. TRANS: Submit button.
-#: actions/facebookfinishlogin.php:287
+#: 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:308 actions/facebookfinishlogin.php:318
+#: 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:326
+#: actions/facebookfinishlogin.php:334
 msgid "Not a valid invitation code."
 msgstr "Це не дійсний код запрошення."
 
-#: actions/facebookfinishlogin.php:339
+#: actions/facebookfinishlogin.php:347
 msgid "Nickname not allowed."
 msgstr "Нікнейм не допускається."
 
-#: actions/facebookfinishlogin.php:344
+#: actions/facebookfinishlogin.php:352
 msgid "Nickname already in use. Try another one."
 msgstr "Це ім’я вже використовується. Спробуйте інше."
 
-#: actions/facebookfinishlogin.php:372 actions/facebookfinishlogin.php:511
+#: actions/facebookfinishlogin.php:380 actions/facebookfinishlogin.php:519
 msgid "Error connecting user to Facebook."
 msgstr "Помилка при підключенні до Facebook."
 
-#: actions/facebookfinishlogin.php:474
+#: actions/facebookfinishlogin.php:482
 msgid "Invalid username or password."
 msgstr "Недійсне ім’я або пароль."
 
diff --git a/plugins/FirePHP/locale/FirePHP.pot b/plugins/FirePHP/locale/FirePHP.pot
index a082cee146..8dd98099f7 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/de/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/de/LC_MESSAGES/FirePHP.po
index 38ccaafdd3..86af0d93bd 100644
--- a/plugins/FirePHP/locale/de/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/de/LC_MESSAGES/FirePHP.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FirePHP to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
diff --git a/plugins/FirePHP/locale/es/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/es/LC_MESSAGES/FirePHP.po
index 5acad1e1b2..a8b51b5527 100644
--- a/plugins/FirePHP/locale/es/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/es/LC_MESSAGES/FirePHP.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FirePHP to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:49+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: 2010-11-29 19:41:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
diff --git a/plugins/FirePHP/locale/fi/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/fi/LC_MESSAGES/FirePHP.po
index 59578200c8..000eda4a1a 100644
--- a/plugins/FirePHP/locale/fi/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/fi/LC_MESSAGES/FirePHP.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FirePHP to Finnish (Suomi)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nike
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:49+0000\n"
 "Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-29 19:41:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
diff --git a/plugins/FirePHP/locale/fr/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/fr/LC_MESSAGES/FirePHP.po
index e43e359b3f..a25009fc54 100644
--- a/plugins/FirePHP/locale/fr/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/fr/LC_MESSAGES/FirePHP.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FirePHP to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
diff --git a/plugins/FirePHP/locale/he/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/he/LC_MESSAGES/FirePHP.po
index 5d673e2ada..f1effb7d93 100644
--- a/plugins/FirePHP/locale/he/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/he/LC_MESSAGES/FirePHP.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FirePHP to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
diff --git a/plugins/FirePHP/locale/ia/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/ia/LC_MESSAGES/FirePHP.po
index 619467c6fc..40d10846b1 100644
--- a/plugins/FirePHP/locale/ia/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/ia/LC_MESSAGES/FirePHP.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FirePHP to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
diff --git a/plugins/FirePHP/locale/id/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/id/LC_MESSAGES/FirePHP.po
index 3e0768eb84..dd7cadc0ba 100644
--- a/plugins/FirePHP/locale/id/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/id/LC_MESSAGES/FirePHP.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FirePHP to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
diff --git a/plugins/FirePHP/locale/ja/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/ja/LC_MESSAGES/FirePHP.po
index dbc951b7c2..edb046fa38 100644
--- a/plugins/FirePHP/locale/ja/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/ja/LC_MESSAGES/FirePHP.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FirePHP to Japanese (日本語)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: 青子守歌
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
diff --git a/plugins/FirePHP/locale/mk/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/mk/LC_MESSAGES/FirePHP.po
index d2a221118c..7f4bca2f51 100644
--- a/plugins/FirePHP/locale/mk/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/mk/LC_MESSAGES/FirePHP.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FirePHP to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
diff --git a/plugins/FirePHP/locale/nb/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/nb/LC_MESSAGES/FirePHP.po
index d9ff90a0e4..786b5da759 100644
--- a/plugins/FirePHP/locale/nb/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/nb/LC_MESSAGES/FirePHP.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FirePHP to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:49+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: 2010-11-29 19:41:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
diff --git a/plugins/FirePHP/locale/nl/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/nl/LC_MESSAGES/FirePHP.po
index 4ab0473f30..45187bb6d2 100644
--- a/plugins/FirePHP/locale/nl/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/nl/LC_MESSAGES/FirePHP.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FirePHP to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21: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-POT-Import-Date: 2010-11-29 19:41:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
diff --git a/plugins/FirePHP/locale/pt/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/pt/LC_MESSAGES/FirePHP.po
index 441192c03a..c5310d86cc 100644
--- a/plugins/FirePHP/locale/pt/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/pt/LC_MESSAGES/FirePHP.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FirePHP to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Waldir
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
diff --git a/plugins/FirePHP/locale/ru/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/ru/LC_MESSAGES/FirePHP.po
index ee61325709..452e73c027 100644
--- a/plugins/FirePHP/locale/ru/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/ru/LC_MESSAGES/FirePHP.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FirePHP to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Александр Сигачёв
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
diff --git a/plugins/FirePHP/locale/tl/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/tl/LC_MESSAGES/FirePHP.po
index 19275f79f8..e3b7e3f539 100644
--- a/plugins/FirePHP/locale/tl/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/tl/LC_MESSAGES/FirePHP.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FirePHP to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
diff --git a/plugins/FirePHP/locale/uk/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/uk/LC_MESSAGES/FirePHP.po
index 03ddabc046..c72512c3bf 100644
--- a/plugins/FirePHP/locale/uk/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/uk/LC_MESSAGES/FirePHP.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FirePHP to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
diff --git a/plugins/FirePHP/locale/zh_CN/LC_MESSAGES/FirePHP.po b/plugins/FirePHP/locale/zh_CN/LC_MESSAGES/FirePHP.po
index a3da6642f9..efe795f5e9 100644
--- a/plugins/FirePHP/locale/zh_CN/LC_MESSAGES/FirePHP.po
+++ b/plugins/FirePHP/locale/zh_CN/LC_MESSAGES/FirePHP.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FirePHP to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FirePHP\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-firephp\n"
diff --git a/plugins/FollowEveryone/locale/FollowEveryone.pot b/plugins/FollowEveryone/locale/FollowEveryone.pot
index 30aee978e9..069ef623e2 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/de/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/de/LC_MESSAGES/FollowEveryone.po
index 0d34cf8b55..748218dc88 100644
--- a/plugins/FollowEveryone/locale/de/LC_MESSAGES/FollowEveryone.po
+++ b/plugins/FollowEveryone/locale/de/LC_MESSAGES/FollowEveryone.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FollowEveryone to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FollowEveryone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-followeveryone\n"
diff --git a/plugins/FollowEveryone/locale/fr/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/fr/LC_MESSAGES/FollowEveryone.po
index f4621a0e53..be1ed94220 100644
--- a/plugins/FollowEveryone/locale/fr/LC_MESSAGES/FollowEveryone.po
+++ b/plugins/FollowEveryone/locale/fr/LC_MESSAGES/FollowEveryone.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FollowEveryone to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FollowEveryone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-followeveryone\n"
diff --git a/plugins/FollowEveryone/locale/he/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/he/LC_MESSAGES/FollowEveryone.po
index ace473a107..341e89921c 100644
--- a/plugins/FollowEveryone/locale/he/LC_MESSAGES/FollowEveryone.po
+++ b/plugins/FollowEveryone/locale/he/LC_MESSAGES/FollowEveryone.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FollowEveryone to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FollowEveryone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:50+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: 2010-11-29 19:41:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-followeveryone\n"
diff --git a/plugins/FollowEveryone/locale/ia/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/ia/LC_MESSAGES/FollowEveryone.po
index 0a8266799f..5125aecfb3 100644
--- a/plugins/FollowEveryone/locale/ia/LC_MESSAGES/FollowEveryone.po
+++ b/plugins/FollowEveryone/locale/ia/LC_MESSAGES/FollowEveryone.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FollowEveryone to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FollowEveryone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-followeveryone\n"
diff --git a/plugins/FollowEveryone/locale/mk/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/mk/LC_MESSAGES/FollowEveryone.po
index 632876f685..fc145c607b 100644
--- a/plugins/FollowEveryone/locale/mk/LC_MESSAGES/FollowEveryone.po
+++ b/plugins/FollowEveryone/locale/mk/LC_MESSAGES/FollowEveryone.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FollowEveryone to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FollowEveryone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-followeveryone\n"
diff --git a/plugins/FollowEveryone/locale/nl/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/nl/LC_MESSAGES/FollowEveryone.po
index 470bbc5d9d..07c1750dfb 100644
--- a/plugins/FollowEveryone/locale/nl/LC_MESSAGES/FollowEveryone.po
+++ b/plugins/FollowEveryone/locale/nl/LC_MESSAGES/FollowEveryone.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FollowEveryone to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FollowEveryone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-followeveryone\n"
diff --git a/plugins/FollowEveryone/locale/ru/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/ru/LC_MESSAGES/FollowEveryone.po
index 35fd550815..d41661c045 100644
--- a/plugins/FollowEveryone/locale/ru/LC_MESSAGES/FollowEveryone.po
+++ b/plugins/FollowEveryone/locale/ru/LC_MESSAGES/FollowEveryone.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FollowEveryone to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Lockal
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FollowEveryone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-followeveryone\n"
diff --git a/plugins/FollowEveryone/locale/uk/LC_MESSAGES/FollowEveryone.po b/plugins/FollowEveryone/locale/uk/LC_MESSAGES/FollowEveryone.po
index 4ef5e5a8bf..251eac4393 100644
--- a/plugins/FollowEveryone/locale/uk/LC_MESSAGES/FollowEveryone.po
+++ b/plugins/FollowEveryone/locale/uk/LC_MESSAGES/FollowEveryone.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - FollowEveryone to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - FollowEveryone\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-followeveryone\n"
diff --git a/plugins/ForceGroup/locale/ForceGroup.pot b/plugins/ForceGroup/locale/ForceGroup.pot
index 10251d15e9..3d39dceb71 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/br/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/br/LC_MESSAGES/ForceGroup.po
index ea92b7dab1..acc281006e 100644
--- a/plugins/ForceGroup/locale/br/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/br/LC_MESSAGES/ForceGroup.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ForceGroup to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Y-M D
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:12+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-01-10 18:26:01+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
diff --git a/plugins/ForceGroup/locale/de/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/de/LC_MESSAGES/ForceGroup.po
index fa94f54b44..19a322d2e1 100644
--- a/plugins/ForceGroup/locale/de/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/de/LC_MESSAGES/ForceGroup.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ForceGroup to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
diff --git a/plugins/ForceGroup/locale/es/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/es/LC_MESSAGES/ForceGroup.po
index ade5062772..650934976f 100644
--- a/plugins/ForceGroup/locale/es/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/es/LC_MESSAGES/ForceGroup.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ForceGroup to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
diff --git a/plugins/ForceGroup/locale/fr/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/fr/LC_MESSAGES/ForceGroup.po
index 893b364cc5..cf71723e1d 100644
--- a/plugins/ForceGroup/locale/fr/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/fr/LC_MESSAGES/ForceGroup.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ForceGroup to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-29 19:41:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
diff --git a/plugins/ForceGroup/locale/he/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/he/LC_MESSAGES/ForceGroup.po
index aefdc96c25..3e89e54a97 100644
--- a/plugins/ForceGroup/locale/he/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/he/LC_MESSAGES/ForceGroup.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ForceGroup to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
diff --git a/plugins/ForceGroup/locale/ia/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/ia/LC_MESSAGES/ForceGroup.po
index 29e220bbac..ea61589d89 100644
--- a/plugins/ForceGroup/locale/ia/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/ia/LC_MESSAGES/ForceGroup.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ForceGroup to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-29 19:41:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
diff --git a/plugins/ForceGroup/locale/id/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/id/LC_MESSAGES/ForceGroup.po
index a255128f23..569c21ca45 100644
--- a/plugins/ForceGroup/locale/id/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/id/LC_MESSAGES/ForceGroup.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ForceGroup to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
diff --git a/plugins/ForceGroup/locale/mk/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/mk/LC_MESSAGES/ForceGroup.po
index 830ef2588c..4225079250 100644
--- a/plugins/ForceGroup/locale/mk/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/mk/LC_MESSAGES/ForceGroup.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ForceGroup to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-29 19:41:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
diff --git a/plugins/ForceGroup/locale/nl/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/nl/LC_MESSAGES/ForceGroup.po
index 9e00a82174..9de4a3844f 100644
--- a/plugins/ForceGroup/locale/nl/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/nl/LC_MESSAGES/ForceGroup.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ForceGroup to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-29 19:41:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
diff --git a/plugins/ForceGroup/locale/te/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/te/LC_MESSAGES/ForceGroup.po
index 64c98fc1ab..4f1281b350 100644
--- a/plugins/ForceGroup/locale/te/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/te/LC_MESSAGES/ForceGroup.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ForceGroup to Telugu (తెలుగు)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Veeven
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:51+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-29 19:41:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
diff --git a/plugins/ForceGroup/locale/tl/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/tl/LC_MESSAGES/ForceGroup.po
index e5a6e9d10e..16baff766c 100644
--- a/plugins/ForceGroup/locale/tl/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/tl/LC_MESSAGES/ForceGroup.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ForceGroup to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
diff --git a/plugins/ForceGroup/locale/uk/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/uk/LC_MESSAGES/ForceGroup.po
index 63536d92f7..dfe52d296e 100644
--- a/plugins/ForceGroup/locale/uk/LC_MESSAGES/ForceGroup.po
+++ b/plugins/ForceGroup/locale/uk/LC_MESSAGES/ForceGroup.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ForceGroup to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ForceGroup\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-29 19:41:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-forcegroup\n"
diff --git a/plugins/GeoURL/locale/GeoURL.pot b/plugins/GeoURL/locale/GeoURL.pot
index 83e95ad843..bb33c1d508 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/ca/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/ca/LC_MESSAGES/GeoURL.po
index e5672a6354..16b412d58e 100644
--- a/plugins/GeoURL/locale/ca/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/ca/LC_MESSAGES/GeoURL.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GeoURL to Catalan (Català)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Toniher
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:03+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
diff --git a/plugins/GeoURL/locale/de/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/de/LC_MESSAGES/GeoURL.po
index 92f5f5ea14..5847def632 100644
--- a/plugins/GeoURL/locale/de/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/de/LC_MESSAGES/GeoURL.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GeoURL to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Apmon
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:03+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
diff --git a/plugins/GeoURL/locale/eo/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/eo/LC_MESSAGES/GeoURL.po
index b86f3bb26a..6fb0e6eb60 100644
--- a/plugins/GeoURL/locale/eo/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/eo/LC_MESSAGES/GeoURL.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GeoURL to Esperanto (Esperanto)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: LyzTyphone
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:03+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:52+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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: eo\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
diff --git a/plugins/GeoURL/locale/es/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/es/LC_MESSAGES/GeoURL.po
index d4b5bb9336..a6f630d339 100644
--- a/plugins/GeoURL/locale/es/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/es/LC_MESSAGES/GeoURL.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GeoURL to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:03+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:52+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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
diff --git a/plugins/GeoURL/locale/fr/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/fr/LC_MESSAGES/GeoURL.po
index ecb4b84991..eaa0abc460 100644
--- a/plugins/GeoURL/locale/fr/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/fr/LC_MESSAGES/GeoURL.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GeoURL to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Verdy p
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:03+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
diff --git a/plugins/GeoURL/locale/he/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/he/LC_MESSAGES/GeoURL.po
index 058f5cf93b..b0bb3acfa4 100644
--- a/plugins/GeoURL/locale/he/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/he/LC_MESSAGES/GeoURL.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GeoURL to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:03+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:52+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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
diff --git a/plugins/GeoURL/locale/ia/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/ia/LC_MESSAGES/GeoURL.po
index 8cf47a9537..57a904ab2b 100644
--- a/plugins/GeoURL/locale/ia/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/ia/LC_MESSAGES/GeoURL.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GeoURL to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:04+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
diff --git a/plugins/GeoURL/locale/id/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/id/LC_MESSAGES/GeoURL.po
index fcf00d6d5e..69df8b8087 100644
--- a/plugins/GeoURL/locale/id/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/id/LC_MESSAGES/GeoURL.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GeoURL to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:04+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:52+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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
diff --git a/plugins/GeoURL/locale/mk/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/mk/LC_MESSAGES/GeoURL.po
index e7807c5295..006471bac1 100644
--- a/plugins/GeoURL/locale/mk/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/mk/LC_MESSAGES/GeoURL.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GeoURL to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:04+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
diff --git a/plugins/GeoURL/locale/nb/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/nb/LC_MESSAGES/GeoURL.po
index 672283c1f8..1a1f474390 100644
--- a/plugins/GeoURL/locale/nb/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/nb/LC_MESSAGES/GeoURL.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GeoURL to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:04+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
diff --git a/plugins/GeoURL/locale/nl/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/nl/LC_MESSAGES/GeoURL.po
index 31eeb9027b..02f4779761 100644
--- a/plugins/GeoURL/locale/nl/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/nl/LC_MESSAGES/GeoURL.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GeoURL to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:04+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
diff --git a/plugins/GeoURL/locale/pl/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/pl/LC_MESSAGES/GeoURL.po
index 035a339a73..e05a9961be 100644
--- a/plugins/GeoURL/locale/pl/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/pl/LC_MESSAGES/GeoURL.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GeoURL to Polish (Polski)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Raven
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:04+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:52+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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
diff --git a/plugins/GeoURL/locale/pt/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/pt/LC_MESSAGES/GeoURL.po
index 189ca26cae..f5bef19e91 100644
--- a/plugins/GeoURL/locale/pt/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/pt/LC_MESSAGES/GeoURL.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GeoURL to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: GTNS
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:04+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
diff --git a/plugins/GeoURL/locale/ru/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/ru/LC_MESSAGES/GeoURL.po
index 960ecc47c7..00a9859aa2 100644
--- a/plugins/GeoURL/locale/ru/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/ru/LC_MESSAGES/GeoURL.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GeoURL to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Александр Сигачёв
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:04+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
diff --git a/plugins/GeoURL/locale/tl/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/tl/LC_MESSAGES/GeoURL.po
index d130e9f074..7b6f0c59c6 100644
--- a/plugins/GeoURL/locale/tl/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/tl/LC_MESSAGES/GeoURL.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GeoURL to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:04+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
diff --git a/plugins/GeoURL/locale/uk/LC_MESSAGES/GeoURL.po b/plugins/GeoURL/locale/uk/LC_MESSAGES/GeoURL.po
index fea20fd4c4..03637387ba 100644
--- a/plugins/GeoURL/locale/uk/LC_MESSAGES/GeoURL.po
+++ b/plugins/GeoURL/locale/uk/LC_MESSAGES/GeoURL.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GeoURL to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GeoURL\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:04+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-geourl\n"
diff --git a/plugins/Geonames/locale/Geonames.pot b/plugins/Geonames/locale/Geonames.pot
index 4aff1dc5aa..7fdcd654ce 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/br/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/br/LC_MESSAGES/Geonames.po
index 2d6ba948cd..a583480dd0 100644
--- a/plugins/Geonames/locale/br/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/br/LC_MESSAGES/Geonames.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Geonames to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Fulup
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:58+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
diff --git a/plugins/Geonames/locale/ca/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/ca/LC_MESSAGES/Geonames.po
index 6dd4acc0ea..bc3a892dfc 100644
--- a/plugins/Geonames/locale/ca/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/ca/LC_MESSAGES/Geonames.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Geonames to Catalan (Català)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Toniher
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:58+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:51+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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
diff --git a/plugins/Geonames/locale/de/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/de/LC_MESSAGES/Geonames.po
index 347a80da78..9e9ef9d7bb 100644
--- a/plugins/Geonames/locale/de/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/de/LC_MESSAGES/Geonames.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Geonames to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Apmon
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:58+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
diff --git a/plugins/Geonames/locale/eo/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/eo/LC_MESSAGES/Geonames.po
index ff51b5f8a8..fadf641665 100644
--- a/plugins/Geonames/locale/eo/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/eo/LC_MESSAGES/Geonames.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Geonames to Esperanto (Esperanto)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: LyzTyphone
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:58+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:51+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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: eo\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
diff --git a/plugins/Geonames/locale/es/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/es/LC_MESSAGES/Geonames.po
index 5181f6e2b3..e02aa7107e 100644
--- a/plugins/Geonames/locale/es/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/es/LC_MESSAGES/Geonames.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Geonames to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:58+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:51+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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
diff --git a/plugins/Geonames/locale/fr/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/fr/LC_MESSAGES/Geonames.po
index d428c55669..4a0a9d13d6 100644
--- a/plugins/Geonames/locale/fr/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/fr/LC_MESSAGES/Geonames.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Geonames to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Verdy p
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:58+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
diff --git a/plugins/Geonames/locale/he/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/he/LC_MESSAGES/Geonames.po
index 34019a8e7a..2969a6e0a3 100644
--- a/plugins/Geonames/locale/he/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/he/LC_MESSAGES/Geonames.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Geonames to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:58+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
diff --git a/plugins/Geonames/locale/ia/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/ia/LC_MESSAGES/Geonames.po
index 6826bc2453..b9c44c41ad 100644
--- a/plugins/Geonames/locale/ia/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/ia/LC_MESSAGES/Geonames.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Geonames to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:58+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
diff --git a/plugins/Geonames/locale/id/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/id/LC_MESSAGES/Geonames.po
index cefe37f359..bda147a85d 100644
--- a/plugins/Geonames/locale/id/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/id/LC_MESSAGES/Geonames.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Geonames to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:58+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
diff --git a/plugins/Geonames/locale/mk/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/mk/LC_MESSAGES/Geonames.po
index 40894e88d3..420637de02 100644
--- a/plugins/Geonames/locale/mk/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/mk/LC_MESSAGES/Geonames.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Geonames to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:58+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
diff --git a/plugins/Geonames/locale/nb/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/nb/LC_MESSAGES/Geonames.po
index e975f42197..145e502912 100644
--- a/plugins/Geonames/locale/nb/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/nb/LC_MESSAGES/Geonames.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Geonames to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:58+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21: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-POT-Import-Date: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
diff --git a/plugins/Geonames/locale/nl/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/nl/LC_MESSAGES/Geonames.po
index 848ea14bff..bbfe0835f4 100644
--- a/plugins/Geonames/locale/nl/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/nl/LC_MESSAGES/Geonames.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Geonames to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:11:58+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:51+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
diff --git a/plugins/Geonames/locale/pt/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/pt/LC_MESSAGES/Geonames.po
index cc0556d248..68b0d3f1e5 100644
--- a/plugins/Geonames/locale/pt/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/pt/LC_MESSAGES/Geonames.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Geonames to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Hamilton Abreu
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:01+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:51+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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
diff --git a/plugins/Geonames/locale/pt_BR/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/pt_BR/LC_MESSAGES/Geonames.po
index 0b860d143a..e15ce94497 100644
--- a/plugins/Geonames/locale/pt_BR/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/pt_BR/LC_MESSAGES/Geonames.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Geonames to Brazilian Portuguese (Português do Brasil)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Giro720
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:02+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:51+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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
diff --git a/plugins/Geonames/locale/ru/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/ru/LC_MESSAGES/Geonames.po
index 8a20396632..12c97ed9ff 100644
--- a/plugins/Geonames/locale/ru/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/ru/LC_MESSAGES/Geonames.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Geonames to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Сrower
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:03+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
diff --git a/plugins/Geonames/locale/tl/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/tl/LC_MESSAGES/Geonames.po
index af334548ca..f8ecace8fb 100644
--- a/plugins/Geonames/locale/tl/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/tl/LC_MESSAGES/Geonames.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Geonames to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:03+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
diff --git a/plugins/Geonames/locale/uk/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/uk/LC_MESSAGES/Geonames.po
index 3cf99b078c..33b50a8ce4 100644
--- a/plugins/Geonames/locale/uk/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/uk/LC_MESSAGES/Geonames.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Geonames to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:03+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
diff --git a/plugins/Geonames/locale/zh_CN/LC_MESSAGES/Geonames.po b/plugins/Geonames/locale/zh_CN/LC_MESSAGES/Geonames.po
index 05e2e6cbb2..90d26c8d2b 100644
--- a/plugins/Geonames/locale/zh_CN/LC_MESSAGES/Geonames.po
+++ b/plugins/Geonames/locale/zh_CN/LC_MESSAGES/Geonames.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Geonames to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Geonames\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:03+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:52+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: 2010-10-29 16:12:46+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-geonames\n"
diff --git a/plugins/GoogleAnalytics/locale/GoogleAnalytics.pot b/plugins/GoogleAnalytics/locale/GoogleAnalytics.pot
index 537634f3ef..cd7a894ec2 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/br/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/br/LC_MESSAGES/GoogleAnalytics.po
index 86dc3eb9ac..1ac45542fc 100644
--- a/plugins/GoogleAnalytics/locale/br/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/br/LC_MESSAGES/GoogleAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GoogleAnalytics to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Fulup
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:04+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:52+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: 2010-11-29 19:41:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
diff --git a/plugins/GoogleAnalytics/locale/de/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/de/LC_MESSAGES/GoogleAnalytics.po
index 3b7494d43e..a32b72345b 100644
--- a/plugins/GoogleAnalytics/locale/de/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/de/LC_MESSAGES/GoogleAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GoogleAnalytics to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:04+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
diff --git a/plugins/GoogleAnalytics/locale/es/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/es/LC_MESSAGES/GoogleAnalytics.po
index deeaf3c7c4..297a6b4e8e 100644
--- a/plugins/GoogleAnalytics/locale/es/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/es/LC_MESSAGES/GoogleAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GoogleAnalytics to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:04+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:53+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: 2010-11-29 19:41:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
diff --git a/plugins/GoogleAnalytics/locale/fr/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/fr/LC_MESSAGES/GoogleAnalytics.po
index 7daa3557f0..79a14ff2f8 100644
--- a/plugins/GoogleAnalytics/locale/fr/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/fr/LC_MESSAGES/GoogleAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GoogleAnalytics to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Verdy p
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:04+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
diff --git a/plugins/GoogleAnalytics/locale/he/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/he/LC_MESSAGES/GoogleAnalytics.po
index 0a7d741f1f..e5d0886d5c 100644
--- a/plugins/GoogleAnalytics/locale/he/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/he/LC_MESSAGES/GoogleAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GoogleAnalytics to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:04+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:53+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: 2010-11-29 19:41:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
diff --git a/plugins/GoogleAnalytics/locale/ia/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/ia/LC_MESSAGES/GoogleAnalytics.po
index 2837e8a82c..ec46bf631b 100644
--- a/plugins/GoogleAnalytics/locale/ia/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/ia/LC_MESSAGES/GoogleAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GoogleAnalytics to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:05+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
diff --git a/plugins/GoogleAnalytics/locale/id/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/id/LC_MESSAGES/GoogleAnalytics.po
index 7038c1b072..250f6d5a9a 100644
--- a/plugins/GoogleAnalytics/locale/id/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/id/LC_MESSAGES/GoogleAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GoogleAnalytics to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:05+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:53+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: 2010-11-29 19:41:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
diff --git a/plugins/GoogleAnalytics/locale/mk/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/mk/LC_MESSAGES/GoogleAnalytics.po
index e97cab8520..5407a79833 100644
--- a/plugins/GoogleAnalytics/locale/mk/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/mk/LC_MESSAGES/GoogleAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GoogleAnalytics to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:05+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
diff --git a/plugins/GoogleAnalytics/locale/nb/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/nb/LC_MESSAGES/GoogleAnalytics.po
index 4e51f52670..c1444769a3 100644
--- a/plugins/GoogleAnalytics/locale/nb/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/nb/LC_MESSAGES/GoogleAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GoogleAnalytics to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:05+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:53+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: 2010-11-29 19:41:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
diff --git a/plugins/GoogleAnalytics/locale/nl/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/nl/LC_MESSAGES/GoogleAnalytics.po
index a9d4f0f8f4..aa1606f4ab 100644
--- a/plugins/GoogleAnalytics/locale/nl/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/nl/LC_MESSAGES/GoogleAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GoogleAnalytics to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:05+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
diff --git a/plugins/GoogleAnalytics/locale/pt/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/pt/LC_MESSAGES/GoogleAnalytics.po
index 859f0da659..769f8c76bb 100644
--- a/plugins/GoogleAnalytics/locale/pt/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/pt/LC_MESSAGES/GoogleAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GoogleAnalytics to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: GTNS
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:05+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21: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-POT-Import-Date: 2010-11-29 19:41:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
diff --git a/plugins/GoogleAnalytics/locale/pt_BR/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/pt_BR/LC_MESSAGES/GoogleAnalytics.po
index 80becd08d0..0b695033bf 100644
--- a/plugins/GoogleAnalytics/locale/pt_BR/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/pt_BR/LC_MESSAGES/GoogleAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GoogleAnalytics to Brazilian Portuguese (Português do Brasil)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Giro720
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:05+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:53+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: 2010-11-29 19:41:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
diff --git a/plugins/GoogleAnalytics/locale/ru/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/ru/LC_MESSAGES/GoogleAnalytics.po
index 4e709258db..c7917b462a 100644
--- a/plugins/GoogleAnalytics/locale/ru/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/ru/LC_MESSAGES/GoogleAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GoogleAnalytics to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Сrower
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:05+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
diff --git a/plugins/GoogleAnalytics/locale/tl/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/tl/LC_MESSAGES/GoogleAnalytics.po
index 593cd1abc4..57c71164d6 100644
--- a/plugins/GoogleAnalytics/locale/tl/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/tl/LC_MESSAGES/GoogleAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GoogleAnalytics to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:05+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
diff --git a/plugins/GoogleAnalytics/locale/uk/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/uk/LC_MESSAGES/GoogleAnalytics.po
index 1b0237ff3c..00044f23f6 100644
--- a/plugins/GoogleAnalytics/locale/uk/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/uk/LC_MESSAGES/GoogleAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GoogleAnalytics to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:05+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
diff --git a/plugins/GoogleAnalytics/locale/zh_CN/LC_MESSAGES/GoogleAnalytics.po b/plugins/GoogleAnalytics/locale/zh_CN/LC_MESSAGES/GoogleAnalytics.po
index 0aba344a07..0b35abde72 100644
--- a/plugins/GoogleAnalytics/locale/zh_CN/LC_MESSAGES/GoogleAnalytics.po
+++ b/plugins/GoogleAnalytics/locale/zh_CN/LC_MESSAGES/GoogleAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GoogleAnalytics to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GoogleAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:05+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-googleanalytics\n"
diff --git a/plugins/Gravatar/locale/Gravatar.pot b/plugins/Gravatar/locale/Gravatar.pot
index c08a1d15cd..589415bb25 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/de/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/de/LC_MESSAGES/Gravatar.po
index d172d1c0e1..8de6cd1264 100644
--- a/plugins/Gravatar/locale/de/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/de/LC_MESSAGES/Gravatar.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Gravatar to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Apmon
 # Author: The Evil IP address
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
diff --git a/plugins/Gravatar/locale/es/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/es/LC_MESSAGES/Gravatar.po
index c5e044fa4e..ff320eef77 100644
--- a/plugins/Gravatar/locale/es/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/es/LC_MESSAGES/Gravatar.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Gravatar to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # Author: Translationista
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
diff --git a/plugins/Gravatar/locale/fr/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/fr/LC_MESSAGES/Gravatar.po
index 6effb857d6..a21c7c145d 100644
--- a/plugins/Gravatar/locale/fr/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/fr/LC_MESSAGES/Gravatar.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Gravatar to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Verdy p
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
diff --git a/plugins/Gravatar/locale/ia/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/ia/LC_MESSAGES/Gravatar.po
index 4c1fd062ae..f5cd7726f0 100644
--- a/plugins/Gravatar/locale/ia/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/ia/LC_MESSAGES/Gravatar.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Gravatar to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
diff --git a/plugins/Gravatar/locale/mk/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/mk/LC_MESSAGES/Gravatar.po
index 1dfff8d459..82c588136a 100644
--- a/plugins/Gravatar/locale/mk/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/mk/LC_MESSAGES/Gravatar.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Gravatar to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
diff --git a/plugins/Gravatar/locale/nl/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/nl/LC_MESSAGES/Gravatar.po
index d730956aa4..2e64085d94 100644
--- a/plugins/Gravatar/locale/nl/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/nl/LC_MESSAGES/Gravatar.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Gravatar to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
diff --git a/plugins/Gravatar/locale/pl/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/pl/LC_MESSAGES/Gravatar.po
index 98c45b758d..5f2f976d7f 100644
--- a/plugins/Gravatar/locale/pl/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/pl/LC_MESSAGES/Gravatar.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Gravatar to Polish (Polski)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Raven
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:54+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: 2010-11-29 19:41:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
diff --git a/plugins/Gravatar/locale/pt/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/pt/LC_MESSAGES/Gravatar.po
index 5835dd2afa..26580c4a94 100644
--- a/plugins/Gravatar/locale/pt/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/pt/LC_MESSAGES/Gravatar.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Gravatar to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: GTNS
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:54+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: 2010-11-29 19:41:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
diff --git a/plugins/Gravatar/locale/tl/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/tl/LC_MESSAGES/Gravatar.po
index 41820e5f7c..6a612d743e 100644
--- a/plugins/Gravatar/locale/tl/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/tl/LC_MESSAGES/Gravatar.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Gravatar to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
diff --git a/plugins/Gravatar/locale/uk/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/uk/LC_MESSAGES/Gravatar.po
index 173cf9b579..9a624852ee 100644
--- a/plugins/Gravatar/locale/uk/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/uk/LC_MESSAGES/Gravatar.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Gravatar to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
diff --git a/plugins/Gravatar/locale/zh_CN/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/zh_CN/LC_MESSAGES/Gravatar.po
index 9a4fada7db..5c5c13bd7f 100644
--- a/plugins/Gravatar/locale/zh_CN/LC_MESSAGES/Gravatar.po
+++ b/plugins/Gravatar/locale/zh_CN/LC_MESSAGES/Gravatar.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Gravatar to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Gravatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:41:57+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-gravatar\n"
diff --git a/plugins/GroupFavorited/locale/GroupFavorited.pot b/plugins/GroupFavorited/locale/GroupFavorited.pot
index d8d5f3d484..e1fa43b7b2 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/br/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/br/LC_MESSAGES/GroupFavorited.po
index 84c0fb8566..a3eb44910f 100644
--- a/plugins/GroupFavorited/locale/br/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/br/LC_MESSAGES/GroupFavorited.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GroupFavorited to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Y-M D
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 20:40:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
diff --git a/plugins/GroupFavorited/locale/de/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/de/LC_MESSAGES/GroupFavorited.po
index 3c82751d14..d8ed19a16d 100644
--- a/plugins/GroupFavorited/locale/de/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/de/LC_MESSAGES/GroupFavorited.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GroupFavorited to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Michael
 # Author: The Evil IP address
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 20:40:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
diff --git a/plugins/GroupFavorited/locale/es/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/es/LC_MESSAGES/GroupFavorited.po
index 85478bb6e4..7d9e61f8bd 100644
--- a/plugins/GroupFavorited/locale/es/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/es/LC_MESSAGES/GroupFavorited.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GroupFavorited to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 20:40:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
diff --git a/plugins/GroupFavorited/locale/fr/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/fr/LC_MESSAGES/GroupFavorited.po
index 754465ff9a..bc01545a00 100644
--- a/plugins/GroupFavorited/locale/fr/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/fr/LC_MESSAGES/GroupFavorited.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GroupFavorited to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 20:40:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
diff --git a/plugins/GroupFavorited/locale/ia/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/ia/LC_MESSAGES/GroupFavorited.po
index e830923b87..b3f54d4695 100644
--- a/plugins/GroupFavorited/locale/ia/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/ia/LC_MESSAGES/GroupFavorited.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GroupFavorited to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 20:40:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
diff --git a/plugins/GroupFavorited/locale/mk/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/mk/LC_MESSAGES/GroupFavorited.po
index d53c6acb27..f735946532 100644
--- a/plugins/GroupFavorited/locale/mk/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/mk/LC_MESSAGES/GroupFavorited.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GroupFavorited to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 20:40:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
diff --git a/plugins/GroupFavorited/locale/nl/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/nl/LC_MESSAGES/GroupFavorited.po
index f9c5c285a1..bf61a342a4 100644
--- a/plugins/GroupFavorited/locale/nl/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/nl/LC_MESSAGES/GroupFavorited.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GroupFavorited to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: SPQRobin
 # Author: Siebrand
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 20:40:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
diff --git a/plugins/GroupFavorited/locale/ru/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/ru/LC_MESSAGES/GroupFavorited.po
index a018a255fd..819431844e 100644
--- a/plugins/GroupFavorited/locale/ru/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/ru/LC_MESSAGES/GroupFavorited.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GroupFavorited to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Eleferen
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21: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-POT-Import-Date: 2010-11-30 20:40:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
diff --git a/plugins/GroupFavorited/locale/te/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/te/LC_MESSAGES/GroupFavorited.po
index 181e5fa518..e79be0edfd 100644
--- a/plugins/GroupFavorited/locale/te/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/te/LC_MESSAGES/GroupFavorited.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GroupFavorited to Telugu (తెలుగు)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Veeven
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:55+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:40:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
diff --git a/plugins/GroupFavorited/locale/tl/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/tl/LC_MESSAGES/GroupFavorited.po
index 8ba22c6ab1..c549b51b3f 100644
--- a/plugins/GroupFavorited/locale/tl/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/tl/LC_MESSAGES/GroupFavorited.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GroupFavorited to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 20:40:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
diff --git a/plugins/GroupFavorited/locale/uk/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/uk/LC_MESSAGES/GroupFavorited.po
index 1be19f154b..f58e8ce248 100644
--- a/plugins/GroupFavorited/locale/uk/LC_MESSAGES/GroupFavorited.po
+++ b/plugins/GroupFavorited/locale/uk/LC_MESSAGES/GroupFavorited.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - GroupFavorited to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - GroupFavorited\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-30 20:40:36+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-groupfavorited\n"
diff --git a/plugins/Imap/locale/Imap.pot b/plugins/Imap/locale/Imap.pot
index 84e3d7b9c3..3828d0e7bc 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/br/LC_MESSAGES/Imap.po b/plugins/Imap/locale/br/LC_MESSAGES/Imap.po
index 463ec484a5..41639dc314 100644
--- a/plugins/Imap/locale/br/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/br/LC_MESSAGES/Imap.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Imap to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Y-M D
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:42:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
diff --git a/plugins/Imap/locale/fr/LC_MESSAGES/Imap.po b/plugins/Imap/locale/fr/LC_MESSAGES/Imap.po
index 7cc589e378..e93d934ede 100644
--- a/plugins/Imap/locale/fr/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/fr/LC_MESSAGES/Imap.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Imap to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # Author: Verdy p
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:42:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
diff --git a/plugins/Imap/locale/ia/LC_MESSAGES/Imap.po b/plugins/Imap/locale/ia/LC_MESSAGES/Imap.po
index 0ea7b821b4..d6640d0979 100644
--- a/plugins/Imap/locale/ia/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/ia/LC_MESSAGES/Imap.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Imap to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:42:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
diff --git a/plugins/Imap/locale/mk/LC_MESSAGES/Imap.po b/plugins/Imap/locale/mk/LC_MESSAGES/Imap.po
index 615aba212e..894efff3d9 100644
--- a/plugins/Imap/locale/mk/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/mk/LC_MESSAGES/Imap.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Imap to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:42:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
diff --git a/plugins/Imap/locale/nb/LC_MESSAGES/Imap.po b/plugins/Imap/locale/nb/LC_MESSAGES/Imap.po
index 869eb8544b..4db7dd99a6 100644
--- a/plugins/Imap/locale/nb/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/nb/LC_MESSAGES/Imap.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Imap to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:42:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
diff --git a/plugins/Imap/locale/nl/LC_MESSAGES/Imap.po b/plugins/Imap/locale/nl/LC_MESSAGES/Imap.po
index e77ca9530a..0c1cb56d4d 100644
--- a/plugins/Imap/locale/nl/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/nl/LC_MESSAGES/Imap.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Imap to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:42:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
diff --git a/plugins/Imap/locale/ru/LC_MESSAGES/Imap.po b/plugins/Imap/locale/ru/LC_MESSAGES/Imap.po
index 6f19105fc5..1d75e1321d 100644
--- a/plugins/Imap/locale/ru/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/ru/LC_MESSAGES/Imap.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Imap to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Eleferen
 # Author: Сrower
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:42:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
diff --git a/plugins/Imap/locale/tl/LC_MESSAGES/Imap.po b/plugins/Imap/locale/tl/LC_MESSAGES/Imap.po
index 3a309495c3..9135e02965 100644
--- a/plugins/Imap/locale/tl/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/tl/LC_MESSAGES/Imap.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Imap to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:42:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
diff --git a/plugins/Imap/locale/uk/LC_MESSAGES/Imap.po b/plugins/Imap/locale/uk/LC_MESSAGES/Imap.po
index a12b8790e5..f27adcbd6b 100644
--- a/plugins/Imap/locale/uk/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/uk/LC_MESSAGES/Imap.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Imap to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:42:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
diff --git a/plugins/Imap/locale/zh_CN/LC_MESSAGES/Imap.po b/plugins/Imap/locale/zh_CN/LC_MESSAGES/Imap.po
index f4843c0ac6..78dee0eed8 100644
--- a/plugins/Imap/locale/zh_CN/LC_MESSAGES/Imap.po
+++ b/plugins/Imap/locale/zh_CN/LC_MESSAGES/Imap.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Imap to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Imap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:42:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-imap\n"
diff --git a/plugins/InProcessCache/locale/InProcessCache.pot b/plugins/InProcessCache/locale/InProcessCache.pot
index fc5a65e2c7..96225bf988 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/fr/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/fr/LC_MESSAGES/InProcessCache.po
index 7ecedf459a..eea101dea9 100644
--- a/plugins/InProcessCache/locale/fr/LC_MESSAGES/InProcessCache.po
+++ b/plugins/InProcessCache/locale/fr/LC_MESSAGES/InProcessCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - InProcessCache to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Sherbrooke
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InProcessCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
diff --git a/plugins/InProcessCache/locale/ia/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/ia/LC_MESSAGES/InProcessCache.po
index c75561c5d9..aa79a12be4 100644
--- a/plugins/InProcessCache/locale/ia/LC_MESSAGES/InProcessCache.po
+++ b/plugins/InProcessCache/locale/ia/LC_MESSAGES/InProcessCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - InProcessCache to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InProcessCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
diff --git a/plugins/InProcessCache/locale/mk/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/mk/LC_MESSAGES/InProcessCache.po
index 09f44c2ad8..778969e4ee 100644
--- a/plugins/InProcessCache/locale/mk/LC_MESSAGES/InProcessCache.po
+++ b/plugins/InProcessCache/locale/mk/LC_MESSAGES/InProcessCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - InProcessCache to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InProcessCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
diff --git a/plugins/InProcessCache/locale/nl/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/nl/LC_MESSAGES/InProcessCache.po
index 889d41a9c0..e4088174b5 100644
--- a/plugins/InProcessCache/locale/nl/LC_MESSAGES/InProcessCache.po
+++ b/plugins/InProcessCache/locale/nl/LC_MESSAGES/InProcessCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - InProcessCache to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InProcessCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
diff --git a/plugins/InProcessCache/locale/ru/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/ru/LC_MESSAGES/InProcessCache.po
index 090b6c790c..0273a7bbc1 100644
--- a/plugins/InProcessCache/locale/ru/LC_MESSAGES/InProcessCache.po
+++ b/plugins/InProcessCache/locale/ru/LC_MESSAGES/InProcessCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - InProcessCache to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Александр Сигачёв
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InProcessCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
diff --git a/plugins/InProcessCache/locale/uk/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/uk/LC_MESSAGES/InProcessCache.po
index e2be01ffbd..2b473301e7 100644
--- a/plugins/InProcessCache/locale/uk/LC_MESSAGES/InProcessCache.po
+++ b/plugins/InProcessCache/locale/uk/LC_MESSAGES/InProcessCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - InProcessCache to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InProcessCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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-10 18:26:02+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-inprocesscache\n"
diff --git a/plugins/InfiniteScroll/locale/InfiniteScroll.pot b/plugins/InfiniteScroll/locale/InfiniteScroll.pot
index 2aa10d3db4..fa156216ac 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/de/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/de/LC_MESSAGES/InfiniteScroll.po
index e6e4501744..9438631b21 100644
--- a/plugins/InfiniteScroll/locale/de/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/de/LC_MESSAGES/InfiniteScroll.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - InfiniteScroll to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:09+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
diff --git a/plugins/InfiniteScroll/locale/es/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/es/LC_MESSAGES/InfiniteScroll.po
index 07b8b4d743..2a1148bb20 100644
--- a/plugins/InfiniteScroll/locale/es/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/es/LC_MESSAGES/InfiniteScroll.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - InfiniteScroll to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:09+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
diff --git a/plugins/InfiniteScroll/locale/fr/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/fr/LC_MESSAGES/InfiniteScroll.po
index 754c2afbad..9fabade039 100644
--- a/plugins/InfiniteScroll/locale/fr/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/fr/LC_MESSAGES/InfiniteScroll.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - InfiniteScroll to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:09+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
diff --git a/plugins/InfiniteScroll/locale/he/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/he/LC_MESSAGES/InfiniteScroll.po
index 630990fa66..4231fc6b20 100644
--- a/plugins/InfiniteScroll/locale/he/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/he/LC_MESSAGES/InfiniteScroll.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - InfiniteScroll to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:09+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
diff --git a/plugins/InfiniteScroll/locale/ia/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/ia/LC_MESSAGES/InfiniteScroll.po
index 326208c373..43a5a3bf45 100644
--- a/plugins/InfiniteScroll/locale/ia/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/ia/LC_MESSAGES/InfiniteScroll.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - InfiniteScroll to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:09+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:57+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-29 16:12:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
diff --git a/plugins/InfiniteScroll/locale/id/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/id/LC_MESSAGES/InfiniteScroll.po
index 9672c14504..efd538f2ef 100644
--- a/plugins/InfiniteScroll/locale/id/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/id/LC_MESSAGES/InfiniteScroll.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - InfiniteScroll to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:09+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:57+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: 2010-10-29 16:12:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
diff --git a/plugins/InfiniteScroll/locale/ja/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/ja/LC_MESSAGES/InfiniteScroll.po
index 655cfd3fea..9a3215fcdd 100644
--- a/plugins/InfiniteScroll/locale/ja/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/ja/LC_MESSAGES/InfiniteScroll.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - InfiniteScroll to Japanese (日本語)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: 青子守歌
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:09+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:57+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: 2010-10-29 16:12:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
diff --git a/plugins/InfiniteScroll/locale/mk/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/mk/LC_MESSAGES/InfiniteScroll.po
index 3898938a94..9cad8c5dbb 100644
--- a/plugins/InfiniteScroll/locale/mk/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/mk/LC_MESSAGES/InfiniteScroll.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - InfiniteScroll to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:09+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:57+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-29 16:12:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
diff --git a/plugins/InfiniteScroll/locale/nb/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/nb/LC_MESSAGES/InfiniteScroll.po
index 00b7c243e8..fb0f6d7aa8 100644
--- a/plugins/InfiniteScroll/locale/nb/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/nb/LC_MESSAGES/InfiniteScroll.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - InfiniteScroll to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:09+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
diff --git a/plugins/InfiniteScroll/locale/nl/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/nl/LC_MESSAGES/InfiniteScroll.po
index 3a8e75ec88..574b53306b 100644
--- a/plugins/InfiniteScroll/locale/nl/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/nl/LC_MESSAGES/InfiniteScroll.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - InfiniteScroll to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:09+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:57+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-10-29 16:12:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
diff --git a/plugins/InfiniteScroll/locale/pt_BR/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/pt_BR/LC_MESSAGES/InfiniteScroll.po
index f5ec1a62de..a356585d19 100644
--- a/plugins/InfiniteScroll/locale/pt_BR/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/pt_BR/LC_MESSAGES/InfiniteScroll.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - InfiniteScroll to Brazilian Portuguese (Português do Brasil)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Giro720
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:09+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:57+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: 2010-10-29 16:12:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
diff --git a/plugins/InfiniteScroll/locale/ru/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/ru/LC_MESSAGES/InfiniteScroll.po
index 7e01e959c7..af62c79a04 100644
--- a/plugins/InfiniteScroll/locale/ru/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/ru/LC_MESSAGES/InfiniteScroll.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - InfiniteScroll to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Сrower
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:09+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
diff --git a/plugins/InfiniteScroll/locale/tl/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/tl/LC_MESSAGES/InfiniteScroll.po
index 2ef6f2d978..9952f5b715 100644
--- a/plugins/InfiniteScroll/locale/tl/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/tl/LC_MESSAGES/InfiniteScroll.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - InfiniteScroll to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:09+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
diff --git a/plugins/InfiniteScroll/locale/uk/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/uk/LC_MESSAGES/InfiniteScroll.po
index 7d150d4941..1be2a37307 100644
--- a/plugins/InfiniteScroll/locale/uk/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/uk/LC_MESSAGES/InfiniteScroll.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - InfiniteScroll to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:09+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
diff --git a/plugins/InfiniteScroll/locale/zh_CN/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/zh_CN/LC_MESSAGES/InfiniteScroll.po
index d2a8f948c2..ac1812e0dd 100644
--- a/plugins/InfiniteScroll/locale/zh_CN/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/zh_CN/LC_MESSAGES/InfiniteScroll.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - InfiniteScroll to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - InfiniteScroll\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:09+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:49+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-infinitescroll\n"
diff --git a/plugins/LdapAuthentication/locale/LdapAuthentication.pot b/plugins/LdapAuthentication/locale/LdapAuthentication.pot
index 850b1e2c45..fbadd7a3ff 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/LdapAuthentication/locale/es/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/es/LC_MESSAGES/LdapAuthentication.po
index 46ac5424cc..0ea9f21654 100644
--- a/plugins/LdapAuthentication/locale/es/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/es/LC_MESSAGES/LdapAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LdapAuthentication to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:09+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
diff --git a/plugins/LdapAuthentication/locale/fr/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/fr/LC_MESSAGES/LdapAuthentication.po
index e6e7609d7f..feea1c39b0 100644
--- a/plugins/LdapAuthentication/locale/fr/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/fr/LC_MESSAGES/LdapAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LdapAuthentication to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:09+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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"
-"X-POT-Import-Date: 2010-10-29 16:12:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
diff --git a/plugins/LdapAuthentication/locale/he/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/he/LC_MESSAGES/LdapAuthentication.po
index ef33c05991..a61403c422 100644
--- a/plugins/LdapAuthentication/locale/he/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/he/LC_MESSAGES/LdapAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LdapAuthentication to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:58+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: 2010-10-29 16:12:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
diff --git a/plugins/LdapAuthentication/locale/ia/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/ia/LC_MESSAGES/LdapAuthentication.po
index 6ca331021a..15dbc13a61 100644
--- a/plugins/LdapAuthentication/locale/ia/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/ia/LC_MESSAGES/LdapAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LdapAuthentication to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
diff --git a/plugins/LdapAuthentication/locale/id/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/id/LC_MESSAGES/LdapAuthentication.po
index e47193a630..e979d49782 100644
--- a/plugins/LdapAuthentication/locale/id/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/id/LC_MESSAGES/LdapAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LdapAuthentication to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:58+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: 2010-10-29 16:12:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
diff --git a/plugins/LdapAuthentication/locale/ja/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/ja/LC_MESSAGES/LdapAuthentication.po
index 863f6d0823..cffbe28884 100644
--- a/plugins/LdapAuthentication/locale/ja/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/ja/LC_MESSAGES/LdapAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LdapAuthentication to Japanese (日本語)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: 青子守歌
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:58+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: 2010-10-29 16:12:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
diff --git a/plugins/LdapAuthentication/locale/mk/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/mk/LC_MESSAGES/LdapAuthentication.po
index 1cbff8ef89..16da13a065 100644
--- a/plugins/LdapAuthentication/locale/mk/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/mk/LC_MESSAGES/LdapAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LdapAuthentication to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
diff --git a/plugins/LdapAuthentication/locale/nb/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/nb/LC_MESSAGES/LdapAuthentication.po
index e5ff996541..8789c39162 100644
--- a/plugins/LdapAuthentication/locale/nb/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/nb/LC_MESSAGES/LdapAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LdapAuthentication to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:58+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: 2010-10-29 16:12:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
diff --git a/plugins/LdapAuthentication/locale/nl/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/nl/LC_MESSAGES/LdapAuthentication.po
index b72f51d011..25aeabd676 100644
--- a/plugins/LdapAuthentication/locale/nl/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/nl/LC_MESSAGES/LdapAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LdapAuthentication to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
diff --git a/plugins/LdapAuthentication/locale/pt_BR/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/pt_BR/LC_MESSAGES/LdapAuthentication.po
index a0f35cfcec..babd630fb6 100644
--- a/plugins/LdapAuthentication/locale/pt_BR/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/pt_BR/LC_MESSAGES/LdapAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LdapAuthentication to Brazilian Portuguese (Português do Brasil)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Giro720
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:58+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: 2010-10-29 16:12:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
diff --git a/plugins/LdapAuthentication/locale/ru/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/ru/LC_MESSAGES/LdapAuthentication.po
index 9060aabf7c..bf7f6b7fcb 100644
--- a/plugins/LdapAuthentication/locale/ru/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/ru/LC_MESSAGES/LdapAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LdapAuthentication to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Eleferen
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:58+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: 2010-10-29 16:12:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
diff --git a/plugins/LdapAuthentication/locale/tl/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/tl/LC_MESSAGES/LdapAuthentication.po
index 08164c4b5c..ae98fe2d10 100644
--- a/plugins/LdapAuthentication/locale/tl/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/tl/LC_MESSAGES/LdapAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LdapAuthentication to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:58+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: 2010-10-29 16:12:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
diff --git a/plugins/LdapAuthentication/locale/uk/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/uk/LC_MESSAGES/LdapAuthentication.po
index 9a17300f91..0734ddca1f 100644
--- a/plugins/LdapAuthentication/locale/uk/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/uk/LC_MESSAGES/LdapAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LdapAuthentication to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
diff --git a/plugins/LdapAuthentication/locale/zh_CN/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/zh_CN/LC_MESSAGES/LdapAuthentication.po
index feb8a31baf..59d83e862e 100644
--- a/plugins/LdapAuthentication/locale/zh_CN/LC_MESSAGES/LdapAuthentication.po
+++ b/plugins/LdapAuthentication/locale/zh_CN/LC_MESSAGES/LdapAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LdapAuthentication to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:12:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthentication\n"
diff --git a/plugins/LdapAuthorization/locale/LdapAuthorization.pot b/plugins/LdapAuthorization/locale/LdapAuthorization.pot
index ea248aa171..49d3503d8d 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/es/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/es/LC_MESSAGES/LdapAuthorization.po
index fcef50189e..89291d4850 100644
--- a/plugins/LdapAuthorization/locale/es/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/es/LC_MESSAGES/LdapAuthorization.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LdapAuthorization to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:13:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
diff --git a/plugins/LdapAuthorization/locale/fr/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/fr/LC_MESSAGES/LdapAuthorization.po
index 6d795562fe..5978539751 100644
--- a/plugins/LdapAuthorization/locale/fr/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/fr/LC_MESSAGES/LdapAuthorization.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LdapAuthorization to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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"
-"X-POT-Import-Date: 2010-10-29 16:13:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
diff --git a/plugins/LdapAuthorization/locale/he/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/he/LC_MESSAGES/LdapAuthorization.po
index 0bfd2d76a0..b38082789b 100644
--- a/plugins/LdapAuthorization/locale/he/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/he/LC_MESSAGES/LdapAuthorization.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LdapAuthorization to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:59+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: 2010-10-29 16:13:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
diff --git a/plugins/LdapAuthorization/locale/ia/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/ia/LC_MESSAGES/LdapAuthorization.po
index 07d8c26ad9..a92f3d8c9e 100644
--- a/plugins/LdapAuthorization/locale/ia/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/ia/LC_MESSAGES/LdapAuthorization.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LdapAuthorization to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:13:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
diff --git a/plugins/LdapAuthorization/locale/id/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/id/LC_MESSAGES/LdapAuthorization.po
index 46136b8651..bab93bd87a 100644
--- a/plugins/LdapAuthorization/locale/id/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/id/LC_MESSAGES/LdapAuthorization.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LdapAuthorization to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:59+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: 2010-10-29 16:13:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
diff --git a/plugins/LdapAuthorization/locale/mk/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/mk/LC_MESSAGES/LdapAuthorization.po
index 3e8e23a8de..61e5707a61 100644
--- a/plugins/LdapAuthorization/locale/mk/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/mk/LC_MESSAGES/LdapAuthorization.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LdapAuthorization to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:13:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
diff --git a/plugins/LdapAuthorization/locale/nb/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/nb/LC_MESSAGES/LdapAuthorization.po
index bed810de76..3abbe4368f 100644
--- a/plugins/LdapAuthorization/locale/nb/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/nb/LC_MESSAGES/LdapAuthorization.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LdapAuthorization to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:59+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: 2010-10-29 16:13:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
diff --git a/plugins/LdapAuthorization/locale/nl/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/nl/LC_MESSAGES/LdapAuthorization.po
index eda2edbb4b..36e916e961 100644
--- a/plugins/LdapAuthorization/locale/nl/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/nl/LC_MESSAGES/LdapAuthorization.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LdapAuthorization to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:13:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
diff --git a/plugins/LdapAuthorization/locale/pt_BR/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/pt_BR/LC_MESSAGES/LdapAuthorization.po
index a9959242f5..20d4cf7792 100644
--- a/plugins/LdapAuthorization/locale/pt_BR/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/pt_BR/LC_MESSAGES/LdapAuthorization.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LdapAuthorization to Brazilian Portuguese (Português do Brasil)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Giro720
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:13:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
diff --git a/plugins/LdapAuthorization/locale/ru/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/ru/LC_MESSAGES/LdapAuthorization.po
index 9577864f81..a6b363b492 100644
--- a/plugins/LdapAuthorization/locale/ru/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/ru/LC_MESSAGES/LdapAuthorization.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LdapAuthorization to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Eleferen
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:13:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
diff --git a/plugins/LdapAuthorization/locale/tl/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/tl/LC_MESSAGES/LdapAuthorization.po
index ca598f5658..40aa5be011 100644
--- a/plugins/LdapAuthorization/locale/tl/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/tl/LC_MESSAGES/LdapAuthorization.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LdapAuthorization to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:59+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: 2010-10-29 16:13:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
diff --git a/plugins/LdapAuthorization/locale/uk/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/uk/LC_MESSAGES/LdapAuthorization.po
index bc354ab71a..de11c073e3 100644
--- a/plugins/LdapAuthorization/locale/uk/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/uk/LC_MESSAGES/LdapAuthorization.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LdapAuthorization to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:13:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
diff --git a/plugins/LdapAuthorization/locale/zh_CN/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/zh_CN/LC_MESSAGES/LdapAuthorization.po
index e1bb991988..0b3b266453 100644
--- a/plugins/LdapAuthorization/locale/zh_CN/LC_MESSAGES/LdapAuthorization.po
+++ b/plugins/LdapAuthorization/locale/zh_CN/LC_MESSAGES/LdapAuthorization.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LdapAuthorization to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LdapAuthorization\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:10+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-10-29 16:13:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-ldapauthorization\n"
diff --git a/plugins/LilUrl/locale/LilUrl.pot b/plugins/LilUrl/locale/LilUrl.pot
index a5dbcb653a..6dd9580443 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/de/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/de/LC_MESSAGES/LilUrl.po
index 4fa94be401..93c8ffc151 100644
--- a/plugins/LilUrl/locale/de/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/de/LC_MESSAGES/LilUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LilUrl to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:11+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:46:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
diff --git a/plugins/LilUrl/locale/fr/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/fr/LC_MESSAGES/LilUrl.po
index 3d006f88df..f01bee046a 100644
--- a/plugins/LilUrl/locale/fr/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/fr/LC_MESSAGES/LilUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LilUrl to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # Author: Verdy p
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:11+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49: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: 2010-11-29 19:46:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
diff --git a/plugins/LilUrl/locale/he/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/he/LC_MESSAGES/LilUrl.po
index 04bf124ebd..643ad0263b 100644
--- a/plugins/LilUrl/locale/he/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/he/LC_MESSAGES/LilUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LilUrl to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:11+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:49:59+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: 2010-11-29 19:46:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
diff --git a/plugins/LilUrl/locale/ia/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/ia/LC_MESSAGES/LilUrl.po
index 5133030758..d34afcd07d 100644
--- a/plugins/LilUrl/locale/ia/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/ia/LC_MESSAGES/LilUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LilUrl to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:11+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:46:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
diff --git a/plugins/LilUrl/locale/id/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/id/LC_MESSAGES/LilUrl.po
index 0fee92499a..b984bcf479 100644
--- a/plugins/LilUrl/locale/id/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/id/LC_MESSAGES/LilUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LilUrl to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:11+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:46:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
diff --git a/plugins/LilUrl/locale/ja/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/ja/LC_MESSAGES/LilUrl.po
index 8d70190b66..d5d62b3a5d 100644
--- a/plugins/LilUrl/locale/ja/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/ja/LC_MESSAGES/LilUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LilUrl to Japanese (日本語)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: 青子守歌
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:11+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50:00+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: 2010-11-29 19:46:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
diff --git a/plugins/LilUrl/locale/mk/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/mk/LC_MESSAGES/LilUrl.po
index 1661cca61d..9d0a31df1f 100644
--- a/plugins/LilUrl/locale/mk/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/mk/LC_MESSAGES/LilUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LilUrl to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:11+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:46:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
diff --git a/plugins/LilUrl/locale/nb/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/nb/LC_MESSAGES/LilUrl.po
index 0a9678950d..c9fccd864d 100644
--- a/plugins/LilUrl/locale/nb/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/nb/LC_MESSAGES/LilUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LilUrl to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:11+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:46:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
diff --git a/plugins/LilUrl/locale/nl/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/nl/LC_MESSAGES/LilUrl.po
index 02ee24f93d..b5de95da75 100644
--- a/plugins/LilUrl/locale/nl/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/nl/LC_MESSAGES/LilUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LilUrl to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:11+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:46:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
diff --git a/plugins/LilUrl/locale/ru/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/ru/LC_MESSAGES/LilUrl.po
index afac9282bb..592d1f62f8 100644
--- a/plugins/LilUrl/locale/ru/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/ru/LC_MESSAGES/LilUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LilUrl to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Eleferen
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:11+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:46:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
diff --git a/plugins/LilUrl/locale/tl/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/tl/LC_MESSAGES/LilUrl.po
index 3adb1c1db1..222d447fc4 100644
--- a/plugins/LilUrl/locale/tl/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/tl/LC_MESSAGES/LilUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LilUrl to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:11+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:46:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
diff --git a/plugins/LilUrl/locale/uk/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/uk/LC_MESSAGES/LilUrl.po
index de56f16370..c26e86cc90 100644
--- a/plugins/LilUrl/locale/uk/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/uk/LC_MESSAGES/LilUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LilUrl to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:11+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21: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-POT-Import-Date: 2010-11-29 19:46:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
diff --git a/plugins/LilUrl/locale/zh_CN/LC_MESSAGES/LilUrl.po b/plugins/LilUrl/locale/zh_CN/LC_MESSAGES/LilUrl.po
index 85a1aa8963..4f210c0798 100644
--- a/plugins/LilUrl/locale/zh_CN/LC_MESSAGES/LilUrl.po
+++ b/plugins/LilUrl/locale/zh_CN/LC_MESSAGES/LilUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LilUrl to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LilUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:11+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:46:15+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-lilurl\n"
diff --git a/plugins/LinkPreview/locale/LinkPreview.pot b/plugins/LinkPreview/locale/LinkPreview.pot
index 860ed45d6f..a48337ff90 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/LinkPreview/locale/fr/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/fr/LC_MESSAGES/LinkPreview.po
index d6745ff164..e154ffd633 100644
--- a/plugins/LinkPreview/locale/fr/LC_MESSAGES/LinkPreview.po
+++ b/plugins/LinkPreview/locale/fr/LC_MESSAGES/LinkPreview.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LinkPreview to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LinkPreview\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:12+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 17:54:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-linkpreview\n"
diff --git a/plugins/LinkPreview/locale/he/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/he/LC_MESSAGES/LinkPreview.po
index b66ad5dcbc..91fbff7c76 100644
--- a/plugins/LinkPreview/locale/he/LC_MESSAGES/LinkPreview.po
+++ b/plugins/LinkPreview/locale/he/LC_MESSAGES/LinkPreview.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LinkPreview to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LinkPreview\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:12+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 17:54:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-linkpreview\n"
diff --git a/plugins/LinkPreview/locale/ia/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/ia/LC_MESSAGES/LinkPreview.po
index f16bdf5531..81552639b4 100644
--- a/plugins/LinkPreview/locale/ia/LC_MESSAGES/LinkPreview.po
+++ b/plugins/LinkPreview/locale/ia/LC_MESSAGES/LinkPreview.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LinkPreview to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LinkPreview\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:12+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 17:54:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-linkpreview\n"
diff --git a/plugins/LinkPreview/locale/mk/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/mk/LC_MESSAGES/LinkPreview.po
index 0c286067a0..3cb7426afe 100644
--- a/plugins/LinkPreview/locale/mk/LC_MESSAGES/LinkPreview.po
+++ b/plugins/LinkPreview/locale/mk/LC_MESSAGES/LinkPreview.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LinkPreview to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LinkPreview\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:12+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 17:54:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-linkpreview\n"
diff --git a/plugins/LinkPreview/locale/nl/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/nl/LC_MESSAGES/LinkPreview.po
index 5c427a578f..ca4f66cc4b 100644
--- a/plugins/LinkPreview/locale/nl/LC_MESSAGES/LinkPreview.po
+++ b/plugins/LinkPreview/locale/nl/LC_MESSAGES/LinkPreview.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LinkPreview to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LinkPreview\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:12+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 17:54:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-linkpreview\n"
diff --git a/plugins/LinkPreview/locale/pt/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/pt/LC_MESSAGES/LinkPreview.po
index 7e0af65453..643cae9dad 100644
--- a/plugins/LinkPreview/locale/pt/LC_MESSAGES/LinkPreview.po
+++ b/plugins/LinkPreview/locale/pt/LC_MESSAGES/LinkPreview.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LinkPreview to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Hamilton Abreu
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LinkPreview\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:12+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 17:54:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-linkpreview\n"
diff --git a/plugins/LinkPreview/locale/ru/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/ru/LC_MESSAGES/LinkPreview.po
index 1ed5565681..1f6d551537 100644
--- a/plugins/LinkPreview/locale/ru/LC_MESSAGES/LinkPreview.po
+++ b/plugins/LinkPreview/locale/ru/LC_MESSAGES/LinkPreview.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LinkPreview to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Lockal
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LinkPreview\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:12+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 17:54:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-linkpreview\n"
diff --git a/plugins/LinkPreview/locale/uk/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/uk/LC_MESSAGES/LinkPreview.po
index e8f412487d..f92809dbd5 100644
--- a/plugins/LinkPreview/locale/uk/LC_MESSAGES/LinkPreview.po
+++ b/plugins/LinkPreview/locale/uk/LC_MESSAGES/LinkPreview.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LinkPreview to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LinkPreview\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:12+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 17:54:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-linkpreview\n"
diff --git a/plugins/Linkback/locale/Linkback.pot b/plugins/Linkback/locale/Linkback.pot
index 7324dc87b3..c06b9b5b00 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/de/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/de/LC_MESSAGES/Linkback.po
index 1f5f55971c..f188797c87 100644
--- a/plugins/Linkback/locale/de/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/de/LC_MESSAGES/Linkback.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Linkback to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:11+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-10-29 16:12:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
diff --git a/plugins/Linkback/locale/es/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/es/LC_MESSAGES/Linkback.po
index 718e6d6555..028b7bc802 100644
--- a/plugins/Linkback/locale/es/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/es/LC_MESSAGES/Linkback.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Linkback to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:11+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-10-29 16:12:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
diff --git a/plugins/Linkback/locale/fr/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/fr/LC_MESSAGES/Linkback.po
index f722555a01..6c230d60cc 100644
--- a/plugins/Linkback/locale/fr/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/fr/LC_MESSAGES/Linkback.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Linkback to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Verdy p
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:12+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-10-29 16:12:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
diff --git a/plugins/Linkback/locale/he/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/he/LC_MESSAGES/Linkback.po
index ce5ecf33d2..122a955bb5 100644
--- a/plugins/Linkback/locale/he/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/he/LC_MESSAGES/Linkback.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Linkback to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:12+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-10-29 16:12:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
diff --git a/plugins/Linkback/locale/ia/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/ia/LC_MESSAGES/Linkback.po
index 5e09629feb..735c35afde 100644
--- a/plugins/Linkback/locale/ia/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/ia/LC_MESSAGES/Linkback.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Linkback to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:12+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-10-29 16:12:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
diff --git a/plugins/Linkback/locale/id/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/id/LC_MESSAGES/Linkback.po
index 946f2391cf..9f8811f554 100644
--- a/plugins/Linkback/locale/id/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/id/LC_MESSAGES/Linkback.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Linkback to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:12+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-10-29 16:12:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
diff --git a/plugins/Linkback/locale/mk/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/mk/LC_MESSAGES/Linkback.po
index b87e129e4a..95910f308d 100644
--- a/plugins/Linkback/locale/mk/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/mk/LC_MESSAGES/Linkback.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Linkback to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:12+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-10-29 16:12:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
diff --git a/plugins/Linkback/locale/nb/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/nb/LC_MESSAGES/Linkback.po
index 1477015596..2fff69b6c6 100644
--- a/plugins/Linkback/locale/nb/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/nb/LC_MESSAGES/Linkback.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Linkback to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:12+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-10-29 16:12:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
diff --git a/plugins/Linkback/locale/nl/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/nl/LC_MESSAGES/Linkback.po
index 322fc63e4b..474970e261 100644
--- a/plugins/Linkback/locale/nl/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/nl/LC_MESSAGES/Linkback.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Linkback to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:12+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-10-29 16:12:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
diff --git a/plugins/Linkback/locale/ru/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/ru/LC_MESSAGES/Linkback.po
index 46a3225068..81a6bbb2fc 100644
--- a/plugins/Linkback/locale/ru/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/ru/LC_MESSAGES/Linkback.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Linkback to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Александр Сигачёв
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:12+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-10-29 16:12:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
diff --git a/plugins/Linkback/locale/tl/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/tl/LC_MESSAGES/Linkback.po
index c4d809bc79..4cac67a456 100644
--- a/plugins/Linkback/locale/tl/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/tl/LC_MESSAGES/Linkback.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Linkback to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:12+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-10-29 16:12:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
diff --git a/plugins/Linkback/locale/uk/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/uk/LC_MESSAGES/Linkback.po
index 34114d837e..8ef42ae880 100644
--- a/plugins/Linkback/locale/uk/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/uk/LC_MESSAGES/Linkback.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Linkback to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:12+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21: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-POT-Import-Date: 2010-10-29 16:12:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
diff --git a/plugins/Linkback/locale/zh_CN/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/zh_CN/LC_MESSAGES/Linkback.po
index 76a44f0668..64b067e680 100644
--- a/plugins/Linkback/locale/zh_CN/LC_MESSAGES/Linkback.po
+++ b/plugins/Linkback/locale/zh_CN/LC_MESSAGES/Linkback.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Linkback to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Linkback\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:12+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-10-29 16:12:52+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-linkback\n"
diff --git a/plugins/LogFilter/locale/LogFilter.pot b/plugins/LogFilter/locale/LogFilter.pot
index 40689c1537..962734f01c 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/fr/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/fr/LC_MESSAGES/LogFilter.po
index aa5e61beb1..64c566e2b2 100644
--- a/plugins/LogFilter/locale/fr/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/fr/LC_MESSAGES/LogFilter.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LogFilter to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:13+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 17:54:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
diff --git a/plugins/LogFilter/locale/he/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/he/LC_MESSAGES/LogFilter.po
index c18fccd9f2..03dc0c0309 100644
--- a/plugins/LogFilter/locale/he/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/he/LC_MESSAGES/LogFilter.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LogFilter to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:13+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50:10+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: 2010-11-30 17:54:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
diff --git a/plugins/LogFilter/locale/ia/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/ia/LC_MESSAGES/LogFilter.po
index d6187ae7ce..75ed2aae37 100644
--- a/plugins/LogFilter/locale/ia/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/ia/LC_MESSAGES/LogFilter.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LogFilter to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:13+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 17:54:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
diff --git a/plugins/LogFilter/locale/mk/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/mk/LC_MESSAGES/LogFilter.po
index 6d1375b314..0c35346e9b 100644
--- a/plugins/LogFilter/locale/mk/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/mk/LC_MESSAGES/LogFilter.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LogFilter to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:13+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 17:54:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
diff --git a/plugins/LogFilter/locale/nl/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/nl/LC_MESSAGES/LogFilter.po
index e97f621736..a178425004 100644
--- a/plugins/LogFilter/locale/nl/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/nl/LC_MESSAGES/LogFilter.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LogFilter to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:13+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 17:54:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
diff --git a/plugins/LogFilter/locale/pt/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/pt/LC_MESSAGES/LogFilter.po
index bc090d5580..1141c85add 100644
--- a/plugins/LogFilter/locale/pt/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/pt/LC_MESSAGES/LogFilter.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LogFilter to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Hamilton Abreu
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:13+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 17:54:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
diff --git a/plugins/LogFilter/locale/ru/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/ru/LC_MESSAGES/LogFilter.po
index 439cc66c94..f0e7b9a458 100644
--- a/plugins/LogFilter/locale/ru/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/ru/LC_MESSAGES/LogFilter.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LogFilter to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Lockal
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:13+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 17:54:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
diff --git a/plugins/LogFilter/locale/uk/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/uk/LC_MESSAGES/LogFilter.po
index 88ae2633b5..4613976358 100644
--- a/plugins/LogFilter/locale/uk/LC_MESSAGES/LogFilter.po
+++ b/plugins/LogFilter/locale/uk/LC_MESSAGES/LogFilter.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - LogFilter to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - LogFilter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:13+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 17:54:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-logfilter\n"
diff --git a/plugins/Mapstraction/locale/Mapstraction.pot b/plugins/Mapstraction/locale/Mapstraction.pot
index 89f59e044b..e3fc59fce4 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/br/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/br/LC_MESSAGES/Mapstraction.po
index 7eb61b0493..99b0f7a9d2 100644
--- a/plugins/Mapstraction/locale/br/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/br/LC_MESSAGES/Mapstraction.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Mapstraction to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Y-M D
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:23+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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:04+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
diff --git a/plugins/Mapstraction/locale/de/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/de/LC_MESSAGES/Mapstraction.po
index cd63dc1442..a14b6a9826 100644
--- a/plugins/Mapstraction/locale/de/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/de/LC_MESSAGES/Mapstraction.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Mapstraction to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Apmon
 # Author: The Evil IP address
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:13+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:40:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
diff --git a/plugins/Mapstraction/locale/fi/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/fi/LC_MESSAGES/Mapstraction.po
index 751544b68b..348e53b80d 100644
--- a/plugins/Mapstraction/locale/fi/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/fi/LC_MESSAGES/Mapstraction.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Mapstraction to Finnish (Suomi)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nike
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:14+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50:19+0000\n"
 "Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:40:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
diff --git a/plugins/Mapstraction/locale/fr/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/fr/LC_MESSAGES/Mapstraction.po
index 015e4f92bf..3376665f7f 100644
--- a/plugins/Mapstraction/locale/fr/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/fr/LC_MESSAGES/Mapstraction.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Mapstraction to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # Author: Verdy p
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:14+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:40:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
diff --git a/plugins/Mapstraction/locale/gl/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/gl/LC_MESSAGES/Mapstraction.po
index 7e9b8d6188..5bae4dff6a 100644
--- a/plugins/Mapstraction/locale/gl/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/gl/LC_MESSAGES/Mapstraction.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Mapstraction to Galician (Galego)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Toliño
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:14+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:40:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
diff --git a/plugins/Mapstraction/locale/ia/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/ia/LC_MESSAGES/Mapstraction.po
index 1f37fa736c..28d978163f 100644
--- a/plugins/Mapstraction/locale/ia/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/ia/LC_MESSAGES/Mapstraction.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Mapstraction to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:14+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:40:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
diff --git a/plugins/Mapstraction/locale/mk/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/mk/LC_MESSAGES/Mapstraction.po
index 3626b07eb5..afa0cf8cac 100644
--- a/plugins/Mapstraction/locale/mk/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/mk/LC_MESSAGES/Mapstraction.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Mapstraction to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:14+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:40:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
diff --git a/plugins/Mapstraction/locale/nb/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/nb/LC_MESSAGES/Mapstraction.po
index 16982697e3..8aa1b702ac 100644
--- a/plugins/Mapstraction/locale/nb/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/nb/LC_MESSAGES/Mapstraction.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Mapstraction to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:14+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:40:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
diff --git a/plugins/Mapstraction/locale/nl/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/nl/LC_MESSAGES/Mapstraction.po
index 5848ca4453..531ce086d7 100644
--- a/plugins/Mapstraction/locale/nl/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/nl/LC_MESSAGES/Mapstraction.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Mapstraction to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # Author: Siebrand
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:14+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:40:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
diff --git a/plugins/Mapstraction/locale/ru/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/ru/LC_MESSAGES/Mapstraction.po
index a27df4d254..237778dd43 100644
--- a/plugins/Mapstraction/locale/ru/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/ru/LC_MESSAGES/Mapstraction.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Mapstraction to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Eleferen
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:14+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:40:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
diff --git a/plugins/Mapstraction/locale/ta/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/ta/LC_MESSAGES/Mapstraction.po
index ba99ac8547..8845678733 100644
--- a/plugins/Mapstraction/locale/ta/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/ta/LC_MESSAGES/Mapstraction.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Mapstraction to Tamil (தமிழ்)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: TRYPPN
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:14+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50:20+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: 2010-11-30 20:40:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ta\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
diff --git a/plugins/Mapstraction/locale/tl/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/tl/LC_MESSAGES/Mapstraction.po
index d191492d94..bfa5204349 100644
--- a/plugins/Mapstraction/locale/tl/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/tl/LC_MESSAGES/Mapstraction.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Mapstraction to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:14+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:40:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
diff --git a/plugins/Mapstraction/locale/uk/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/uk/LC_MESSAGES/Mapstraction.po
index ebdda7d2d7..d22236a9dc 100644
--- a/plugins/Mapstraction/locale/uk/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/uk/LC_MESSAGES/Mapstraction.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Mapstraction to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:14+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:40:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
diff --git a/plugins/Mapstraction/locale/zh_CN/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/zh_CN/LC_MESSAGES/Mapstraction.po
index 51deb5f380..074fa10366 100644
--- a/plugins/Mapstraction/locale/zh_CN/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/zh_CN/LC_MESSAGES/Mapstraction.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Mapstraction to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:14+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:40:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
diff --git a/plugins/Memcache/locale/Memcache.pot b/plugins/Memcache/locale/Memcache.pot
index 4b923128ce..5dd9c27317 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/de/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/de/LC_MESSAGES/Memcache.po
index 9621a87fbf..acec4b3d4b 100644
--- a/plugins/Memcache/locale/de/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/de/LC_MESSAGES/Memcache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcache to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Apmon
 # Author: The Evil IP address
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:15+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
diff --git a/plugins/Memcache/locale/es/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/es/LC_MESSAGES/Memcache.po
index 68bef8d0e6..cc3ab1f5b6 100644
--- a/plugins/Memcache/locale/es/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/es/LC_MESSAGES/Memcache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcache to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:15+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
diff --git a/plugins/Memcache/locale/fr/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/fr/LC_MESSAGES/Memcache.po
index 04d9f803bd..67ce5b77dd 100644
--- a/plugins/Memcache/locale/fr/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/fr/LC_MESSAGES/Memcache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcache to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Verdy p
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:15+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
diff --git a/plugins/Memcache/locale/he/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/he/LC_MESSAGES/Memcache.po
index 6cc70c044d..579f2ba469 100644
--- a/plugins/Memcache/locale/he/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/he/LC_MESSAGES/Memcache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcache to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:15+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
diff --git a/plugins/Memcache/locale/ia/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/ia/LC_MESSAGES/Memcache.po
index d2dfe536e2..035ae7e454 100644
--- a/plugins/Memcache/locale/ia/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/ia/LC_MESSAGES/Memcache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcache to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:15+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
diff --git a/plugins/Memcache/locale/mk/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/mk/LC_MESSAGES/Memcache.po
index c2d18ae0c3..b41851eddb 100644
--- a/plugins/Memcache/locale/mk/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/mk/LC_MESSAGES/Memcache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcache to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:15+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
diff --git a/plugins/Memcache/locale/nb/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/nb/LC_MESSAGES/Memcache.po
index 853ec92642..21e815b2dd 100644
--- a/plugins/Memcache/locale/nb/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/nb/LC_MESSAGES/Memcache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcache to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:15+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
diff --git a/plugins/Memcache/locale/nl/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/nl/LC_MESSAGES/Memcache.po
index dd37edcf92..b5868c7007 100644
--- a/plugins/Memcache/locale/nl/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/nl/LC_MESSAGES/Memcache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcache to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:15+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
diff --git a/plugins/Memcache/locale/pt/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/pt/LC_MESSAGES/Memcache.po
index 6e55ee64ce..fb378637b8 100644
--- a/plugins/Memcache/locale/pt/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/pt/LC_MESSAGES/Memcache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcache to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: GTNS
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:15+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
diff --git a/plugins/Memcache/locale/pt_BR/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/pt_BR/LC_MESSAGES/Memcache.po
index 9e82c01397..8a74bc3c21 100644
--- a/plugins/Memcache/locale/pt_BR/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/pt_BR/LC_MESSAGES/Memcache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcache to Brazilian Portuguese (Português do Brasil)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Giro720
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:15+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
diff --git a/plugins/Memcache/locale/ru/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/ru/LC_MESSAGES/Memcache.po
index 2a63d8d4f1..e53619bd59 100644
--- a/plugins/Memcache/locale/ru/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/ru/LC_MESSAGES/Memcache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcache to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Lockal
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:15+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
diff --git a/plugins/Memcache/locale/tl/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/tl/LC_MESSAGES/Memcache.po
index 772e301abe..5b06c9cd9c 100644
--- a/plugins/Memcache/locale/tl/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/tl/LC_MESSAGES/Memcache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcache to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:15+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
diff --git a/plugins/Memcache/locale/uk/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/uk/LC_MESSAGES/Memcache.po
index ae657ea05e..23b98248ad 100644
--- a/plugins/Memcache/locale/uk/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/uk/LC_MESSAGES/Memcache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcache to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:15+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
diff --git a/plugins/Memcache/locale/zh_CN/LC_MESSAGES/Memcache.po b/plugins/Memcache/locale/zh_CN/LC_MESSAGES/Memcache.po
index 149d891662..cedcc60b3a 100644
--- a/plugins/Memcache/locale/zh_CN/LC_MESSAGES/Memcache.po
+++ b/plugins/Memcache/locale/zh_CN/LC_MESSAGES/Memcache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcache to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:15+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-memcache\n"
diff --git a/plugins/Memcached/locale/Memcached.pot b/plugins/Memcached/locale/Memcached.pot
index b3e2a79568..6ec5fac4c3 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/de/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/de/LC_MESSAGES/Memcached.po
index fd306f6251..ad70afdc07 100644
--- a/plugins/Memcached/locale/de/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/de/LC_MESSAGES/Memcached.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcached to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:15+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50:22+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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
diff --git a/plugins/Memcached/locale/es/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/es/LC_MESSAGES/Memcached.po
index 8120ccb2dd..8f0e5d816a 100644
--- a/plugins/Memcached/locale/es/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/es/LC_MESSAGES/Memcached.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcached to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:15+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50:22+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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
diff --git a/plugins/Memcached/locale/fr/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/fr/LC_MESSAGES/Memcached.po
index e871bb1087..c1814b2b96 100644
--- a/plugins/Memcached/locale/fr/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/fr/LC_MESSAGES/Memcached.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcached to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Verdy p
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:15+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50:22+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
diff --git a/plugins/Memcached/locale/he/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/he/LC_MESSAGES/Memcached.po
index 632bab32af..c40ec233e0 100644
--- a/plugins/Memcached/locale/he/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/he/LC_MESSAGES/Memcached.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcached to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:15+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50:22+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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
diff --git a/plugins/Memcached/locale/ia/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/ia/LC_MESSAGES/Memcached.po
index 4a599829f1..c8fff4d8cb 100644
--- a/plugins/Memcached/locale/ia/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/ia/LC_MESSAGES/Memcached.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcached to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:15+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
diff --git a/plugins/Memcached/locale/id/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/id/LC_MESSAGES/Memcached.po
index 90a851d15b..bd2627a6ba 100644
--- a/plugins/Memcached/locale/id/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/id/LC_MESSAGES/Memcached.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcached to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50:22+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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
diff --git a/plugins/Memcached/locale/ja/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/ja/LC_MESSAGES/Memcached.po
index 7dcd2110aa..f6f8182f89 100644
--- a/plugins/Memcached/locale/ja/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/ja/LC_MESSAGES/Memcached.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcached to Japanese (日本語)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Iwai.masaharu
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50:22+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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
diff --git a/plugins/Memcached/locale/mk/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/mk/LC_MESSAGES/Memcached.po
index 3ed7c8eba3..b4d4227ebc 100644
--- a/plugins/Memcached/locale/mk/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/mk/LC_MESSAGES/Memcached.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcached to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
diff --git a/plugins/Memcached/locale/nb/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/nb/LC_MESSAGES/Memcached.po
index d68153006e..e900bc4d3a 100644
--- a/plugins/Memcached/locale/nb/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/nb/LC_MESSAGES/Memcached.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcached to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
diff --git a/plugins/Memcached/locale/nl/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/nl/LC_MESSAGES/Memcached.po
index 7c777ce502..e8074ad3df 100644
--- a/plugins/Memcached/locale/nl/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/nl/LC_MESSAGES/Memcached.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcached to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
diff --git a/plugins/Memcached/locale/pt/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/pt/LC_MESSAGES/Memcached.po
index dbde512042..f84ad7012d 100644
--- a/plugins/Memcached/locale/pt/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/pt/LC_MESSAGES/Memcached.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcached to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: GTNS
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
diff --git a/plugins/Memcached/locale/ru/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/ru/LC_MESSAGES/Memcached.po
index e6c49f162e..96b856badf 100644
--- a/plugins/Memcached/locale/ru/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/ru/LC_MESSAGES/Memcached.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcached to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Lockal
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
diff --git a/plugins/Memcached/locale/tl/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/tl/LC_MESSAGES/Memcached.po
index 3b0eb0d115..7593badbf7 100644
--- a/plugins/Memcached/locale/tl/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/tl/LC_MESSAGES/Memcached.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcached to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
diff --git a/plugins/Memcached/locale/uk/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/uk/LC_MESSAGES/Memcached.po
index 72aa6eb3d1..0602f55dda 100644
--- a/plugins/Memcached/locale/uk/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/uk/LC_MESSAGES/Memcached.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcached to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
diff --git a/plugins/Memcached/locale/zh_CN/LC_MESSAGES/Memcached.po b/plugins/Memcached/locale/zh_CN/LC_MESSAGES/Memcached.po
index d8a872e637..2abc094200 100644
--- a/plugins/Memcached/locale/zh_CN/LC_MESSAGES/Memcached.po
+++ b/plugins/Memcached/locale/zh_CN/LC_MESSAGES/Memcached.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Memcached to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Memcached\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-memcached\n"
diff --git a/plugins/Meteor/locale/Meteor.pot b/plugins/Meteor/locale/Meteor.pot
index d251f41234..9df9b6bdc6 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/de/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/de/LC_MESSAGES/Meteor.po
index 1387f9f0cd..d82006d399 100644
--- a/plugins/Meteor/locale/de/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/de/LC_MESSAGES/Meteor.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Meteor to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:40:38+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
diff --git a/plugins/Meteor/locale/fr/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/fr/LC_MESSAGES/Meteor.po
index 749111d7fb..c5e2754c65 100644
--- a/plugins/Meteor/locale/fr/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/fr/LC_MESSAGES/Meteor.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Meteor to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:40:38+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
diff --git a/plugins/Meteor/locale/ia/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/ia/LC_MESSAGES/Meteor.po
index add0016dcc..80423e2f5f 100644
--- a/plugins/Meteor/locale/ia/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/ia/LC_MESSAGES/Meteor.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Meteor to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:40:38+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
diff --git a/plugins/Meteor/locale/id/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/id/LC_MESSAGES/Meteor.po
index 11a15a05e4..ce6b355405 100644
--- a/plugins/Meteor/locale/id/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/id/LC_MESSAGES/Meteor.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Meteor to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50:23+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: 2010-11-30 20:40:38+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
diff --git a/plugins/Meteor/locale/mk/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/mk/LC_MESSAGES/Meteor.po
index aaac6b2a7e..95975f55da 100644
--- a/plugins/Meteor/locale/mk/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/mk/LC_MESSAGES/Meteor.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Meteor to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:40:38+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
diff --git a/plugins/Meteor/locale/nb/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/nb/LC_MESSAGES/Meteor.po
index 506c57eda1..16a0d02755 100644
--- a/plugins/Meteor/locale/nb/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/nb/LC_MESSAGES/Meteor.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Meteor to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:40:38+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
diff --git a/plugins/Meteor/locale/nl/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/nl/LC_MESSAGES/Meteor.po
index fbc52c7440..c9edc086a5 100644
--- a/plugins/Meteor/locale/nl/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/nl/LC_MESSAGES/Meteor.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Meteor to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:40:38+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
diff --git a/plugins/Meteor/locale/tl/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/tl/LC_MESSAGES/Meteor.po
index 45784258f1..db23c208ef 100644
--- a/plugins/Meteor/locale/tl/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/tl/LC_MESSAGES/Meteor.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Meteor to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:40:38+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
diff --git a/plugins/Meteor/locale/uk/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/uk/LC_MESSAGES/Meteor.po
index 6a7fe8a05b..56fc32503c 100644
--- a/plugins/Meteor/locale/uk/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/uk/LC_MESSAGES/Meteor.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Meteor to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:40:38+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
diff --git a/plugins/Meteor/locale/zh_CN/LC_MESSAGES/Meteor.po b/plugins/Meteor/locale/zh_CN/LC_MESSAGES/Meteor.po
index 73cc2c2800..0636a3e8f7 100644
--- a/plugins/Meteor/locale/zh_CN/LC_MESSAGES/Meteor.po
+++ b/plugins/Meteor/locale/zh_CN/LC_MESSAGES/Meteor.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Meteor to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Meteor\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:40:38+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-meteor\n"
diff --git a/plugins/Minify/locale/Minify.pot b/plugins/Minify/locale/Minify.pot
index 6392faabfe..3305e32bfe 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/de/LC_MESSAGES/Minify.po b/plugins/Minify/locale/de/LC_MESSAGES/Minify.po
index 258a5a539f..aa604b1662 100644
--- a/plugins/Minify/locale/de/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/de/LC_MESSAGES/Minify.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Minify to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-10-29 16:12:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
diff --git a/plugins/Minify/locale/fr/LC_MESSAGES/Minify.po b/plugins/Minify/locale/fr/LC_MESSAGES/Minify.po
index 98e45442c2..c3b03baa66 100644
--- a/plugins/Minify/locale/fr/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/fr/LC_MESSAGES/Minify.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Minify to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Verdy p
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-10-29 16:12:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
diff --git a/plugins/Minify/locale/ia/LC_MESSAGES/Minify.po b/plugins/Minify/locale/ia/LC_MESSAGES/Minify.po
index 91a08cc116..02338bc0a1 100644
--- a/plugins/Minify/locale/ia/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/ia/LC_MESSAGES/Minify.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Minify to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-10-29 16:12:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
diff --git a/plugins/Minify/locale/mk/LC_MESSAGES/Minify.po b/plugins/Minify/locale/mk/LC_MESSAGES/Minify.po
index a68fb38f98..1bd0de380b 100644
--- a/plugins/Minify/locale/mk/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/mk/LC_MESSAGES/Minify.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Minify to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-10-29 16:12:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
diff --git a/plugins/Minify/locale/nb/LC_MESSAGES/Minify.po b/plugins/Minify/locale/nb/LC_MESSAGES/Minify.po
index 23ef02c134..437dba6420 100644
--- a/plugins/Minify/locale/nb/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/nb/LC_MESSAGES/Minify.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Minify to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-10-29 16:12:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
diff --git a/plugins/Minify/locale/nl/LC_MESSAGES/Minify.po b/plugins/Minify/locale/nl/LC_MESSAGES/Minify.po
index 7f8fafe6b3..5ab3dfd3d1 100644
--- a/plugins/Minify/locale/nl/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/nl/LC_MESSAGES/Minify.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Minify to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-10-29 16:12:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
diff --git a/plugins/Minify/locale/ru/LC_MESSAGES/Minify.po b/plugins/Minify/locale/ru/LC_MESSAGES/Minify.po
index 0e593bcc79..3808e78c2f 100644
--- a/plugins/Minify/locale/ru/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/ru/LC_MESSAGES/Minify.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Minify to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Eleferen
 # Author: MaxSem
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-10-29 16:12:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
diff --git a/plugins/Minify/locale/tl/LC_MESSAGES/Minify.po b/plugins/Minify/locale/tl/LC_MESSAGES/Minify.po
index 085c21ffde..1d18e7c642 100644
--- a/plugins/Minify/locale/tl/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/tl/LC_MESSAGES/Minify.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Minify to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-10-29 16:12:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
diff --git a/plugins/Minify/locale/uk/LC_MESSAGES/Minify.po b/plugins/Minify/locale/uk/LC_MESSAGES/Minify.po
index 34a3bfe1fc..33b4bd8c0a 100644
--- a/plugins/Minify/locale/uk/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/uk/LC_MESSAGES/Minify.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Minify to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-10-29 16:12:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
diff --git a/plugins/Minify/locale/zh_CN/LC_MESSAGES/Minify.po b/plugins/Minify/locale/zh_CN/LC_MESSAGES/Minify.po
index 280550a11e..5c3cecb22c 100644
--- a/plugins/Minify/locale/zh_CN/LC_MESSAGES/Minify.po
+++ b/plugins/Minify/locale/zh_CN/LC_MESSAGES/Minify.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Minify to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Minify\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-10-29 16:12:55+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-minify\n"
diff --git a/plugins/MobileProfile/locale/MobileProfile.pot b/plugins/MobileProfile/locale/MobileProfile.pot
index 10d68aa02c..3a8917f406 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/bg/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/bg/LC_MESSAGES/MobileProfile.po
index 93e39f57b1..a31c39b9d2 100644
--- a/plugins/MobileProfile/locale/bg/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/bg/LC_MESSAGES/MobileProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - MobileProfile to Bulgarian (Български)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: DCLXVI
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:27+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50:26+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-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-20 20:16:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: bg\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
diff --git a/plugins/MobileProfile/locale/br/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/br/LC_MESSAGES/MobileProfile.po
index 2afbfe8c95..de2cb46fee 100644
--- a/plugins/MobileProfile/locale/br/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/br/LC_MESSAGES/MobileProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - MobileProfile to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Gwendal
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:18+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:43:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-20 20:16:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
diff --git a/plugins/MobileProfile/locale/ce/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ce/LC_MESSAGES/MobileProfile.po
index 92666bcec1..5edafeeb64 100644
--- a/plugins/MobileProfile/locale/ce/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/ce/LC_MESSAGES/MobileProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - MobileProfile to Chechen (Нохчийн)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Sasan700
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:03+0000\n"
-"PO-Revision-Date: 2011-01-20 19:07:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50:26+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-14 13:21:16+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-20 20:16:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ce\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
diff --git a/plugins/MobileProfile/locale/fr/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/fr/LC_MESSAGES/MobileProfile.po
index 30e59f303e..dd5e522a4b 100644
--- a/plugins/MobileProfile/locale/fr/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/fr/LC_MESSAGES/MobileProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - MobileProfile to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # Author: Verdy p
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:18+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:43:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-20 20:16:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
diff --git a/plugins/MobileProfile/locale/gl/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/gl/LC_MESSAGES/MobileProfile.po
index ff8684706a..254e2bf0a4 100644
--- a/plugins/MobileProfile/locale/gl/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/gl/LC_MESSAGES/MobileProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - MobileProfile to Galician (Galego)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Toliño
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:18+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50:26+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: 2010-11-30 20:43:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-20 20:16:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
diff --git a/plugins/MobileProfile/locale/ia/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ia/LC_MESSAGES/MobileProfile.po
index a0f192406b..dfe4fd352a 100644
--- a/plugins/MobileProfile/locale/ia/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/ia/LC_MESSAGES/MobileProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - MobileProfile to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:18+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:43:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-20 20:16:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
diff --git a/plugins/MobileProfile/locale/mk/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/mk/LC_MESSAGES/MobileProfile.po
index ba6329588c..f395533e79 100644
--- a/plugins/MobileProfile/locale/mk/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/mk/LC_MESSAGES/MobileProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - MobileProfile to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:18+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:43:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-20 20:16:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
diff --git a/plugins/MobileProfile/locale/nb/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/nb/LC_MESSAGES/MobileProfile.po
index 033d7c67ac..715b62221c 100644
--- a/plugins/MobileProfile/locale/nb/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/nb/LC_MESSAGES/MobileProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - MobileProfile to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:43:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-20 20:16:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
diff --git a/plugins/MobileProfile/locale/nl/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/nl/LC_MESSAGES/MobileProfile.po
index 33be7a68d6..2928fa4ed4 100644
--- a/plugins/MobileProfile/locale/nl/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/nl/LC_MESSAGES/MobileProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - MobileProfile to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # Author: Siebrand
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:43:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-20 20:16:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
diff --git a/plugins/MobileProfile/locale/ru/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ru/LC_MESSAGES/MobileProfile.po
index 7cc7368601..4a8f5696a0 100644
--- a/plugins/MobileProfile/locale/ru/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/ru/LC_MESSAGES/MobileProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - MobileProfile to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Eleferen
 # Author: Александр Сигачёв
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:43:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-20 20:16:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
diff --git a/plugins/MobileProfile/locale/ta/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ta/LC_MESSAGES/MobileProfile.po
index ad9b73e7d2..7855a3b056 100644
--- a/plugins/MobileProfile/locale/ta/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/ta/LC_MESSAGES/MobileProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - MobileProfile to Tamil (தமிழ்)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: TRYPPN
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50:26+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: 2010-11-30 20:43:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-20 20:16:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ta\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
diff --git a/plugins/MobileProfile/locale/te/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/te/LC_MESSAGES/MobileProfile.po
index fbf99b663b..87a93b2dff 100644
--- a/plugins/MobileProfile/locale/te/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/te/LC_MESSAGES/MobileProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - MobileProfile to Telugu (తెలుగు)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Veeven
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50:26+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:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-20 20:16:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
diff --git a/plugins/MobileProfile/locale/tl/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/tl/LC_MESSAGES/MobileProfile.po
index effd59f372..378142cb2d 100644
--- a/plugins/MobileProfile/locale/tl/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/tl/LC_MESSAGES/MobileProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - MobileProfile to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:43:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-20 20:16:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
diff --git a/plugins/MobileProfile/locale/uk/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/uk/LC_MESSAGES/MobileProfile.po
index 4a5086991f..11b7c5a33c 100644
--- a/plugins/MobileProfile/locale/uk/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/uk/LC_MESSAGES/MobileProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - MobileProfile to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:43:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-20 20:16:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
diff --git a/plugins/MobileProfile/locale/zh_CN/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/zh_CN/LC_MESSAGES/MobileProfile.po
index 424ccd54f9..4c093bccbe 100644
--- a/plugins/MobileProfile/locale/zh_CN/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/zh_CN/LC_MESSAGES/MobileProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - MobileProfile to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 20:43:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-20 20:16:14+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
diff --git a/plugins/ModHelper/locale/ModHelper.pot b/plugins/ModHelper/locale/ModHelper.pot
index 3d5268dbf4..28cbd45307 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/es/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/es/LC_MESSAGES/ModHelper.po
index 387671a0a7..20b3f5c1cc 100644
--- a/plugins/ModHelper/locale/es/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/es/LC_MESSAGES/ModHelper.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ModHelper to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Locos epraix
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
diff --git a/plugins/ModHelper/locale/fr/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/fr/LC_MESSAGES/ModHelper.po
index e8caf09050..0d4db36a47 100644
--- a/plugins/ModHelper/locale/fr/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/fr/LC_MESSAGES/ModHelper.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ModHelper to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
diff --git a/plugins/ModHelper/locale/he/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/he/LC_MESSAGES/ModHelper.po
index 0aaf0f7e75..ae8b96a96b 100644
--- a/plugins/ModHelper/locale/he/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/he/LC_MESSAGES/ModHelper.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ModHelper to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
diff --git a/plugins/ModHelper/locale/ia/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/ia/LC_MESSAGES/ModHelper.po
index 4b787f6775..a442e68488 100644
--- a/plugins/ModHelper/locale/ia/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/ia/LC_MESSAGES/ModHelper.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ModHelper to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21: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: 2010-11-29 19:44:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
diff --git a/plugins/ModHelper/locale/mk/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/mk/LC_MESSAGES/ModHelper.po
index 9379b268f6..44ffdcc600 100644
--- a/plugins/ModHelper/locale/mk/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/mk/LC_MESSAGES/ModHelper.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ModHelper to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21: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: 2010-11-29 19:44:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
diff --git a/plugins/ModHelper/locale/nl/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/nl/LC_MESSAGES/ModHelper.po
index d71b409f1e..2292dc30c0 100644
--- a/plugins/ModHelper/locale/nl/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/nl/LC_MESSAGES/ModHelper.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ModHelper to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21: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: 2010-11-29 19:44:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
diff --git a/plugins/ModHelper/locale/ru/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/ru/LC_MESSAGES/ModHelper.po
index 199380aef7..fcc68f1a50 100644
--- a/plugins/ModHelper/locale/ru/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/ru/LC_MESSAGES/ModHelper.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ModHelper to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Lockal
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
diff --git a/plugins/ModHelper/locale/uk/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/uk/LC_MESSAGES/ModHelper.po
index 77b34b46fe..194954dde7 100644
--- a/plugins/ModHelper/locale/uk/LC_MESSAGES/ModHelper.po
+++ b/plugins/ModHelper/locale/uk/LC_MESSAGES/ModHelper.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ModHelper to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModHelper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21: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: 2010-11-29 19:44:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-modhelper\n"
diff --git a/plugins/ModPlus/locale/ModPlus.pot b/plugins/ModPlus/locale/ModPlus.pot
index 29674a77ff..ace9377032 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/fr/LC_MESSAGES/ModPlus.po b/plugins/ModPlus/locale/fr/LC_MESSAGES/ModPlus.po
index 8c63154343..7233dd4635 100644
--- a/plugins/ModPlus/locale/fr/LC_MESSAGES/ModPlus.po
+++ b/plugins/ModPlus/locale/fr/LC_MESSAGES/ModPlus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ModPlus to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # Author: Peter17
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModPlus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:20+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 17:54:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-modplus\n"
diff --git a/plugins/ModPlus/locale/ia/LC_MESSAGES/ModPlus.po b/plugins/ModPlus/locale/ia/LC_MESSAGES/ModPlus.po
index 24cfb7d048..a3a0b59a4b 100644
--- a/plugins/ModPlus/locale/ia/LC_MESSAGES/ModPlus.po
+++ b/plugins/ModPlus/locale/ia/LC_MESSAGES/ModPlus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ModPlus to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModPlus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:20+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 17:54:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-modplus\n"
diff --git a/plugins/ModPlus/locale/mk/LC_MESSAGES/ModPlus.po b/plugins/ModPlus/locale/mk/LC_MESSAGES/ModPlus.po
index 8eeb2091f2..4fe47e2b38 100644
--- a/plugins/ModPlus/locale/mk/LC_MESSAGES/ModPlus.po
+++ b/plugins/ModPlus/locale/mk/LC_MESSAGES/ModPlus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ModPlus to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModPlus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:20+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 17:54:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-modplus\n"
diff --git a/plugins/ModPlus/locale/nl/LC_MESSAGES/ModPlus.po b/plugins/ModPlus/locale/nl/LC_MESSAGES/ModPlus.po
index 3518bda815..a977f185f4 100644
--- a/plugins/ModPlus/locale/nl/LC_MESSAGES/ModPlus.po
+++ b/plugins/ModPlus/locale/nl/LC_MESSAGES/ModPlus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ModPlus to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # Author: Siebrand
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModPlus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:20+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 17:54:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-modplus\n"
diff --git a/plugins/ModPlus/locale/uk/LC_MESSAGES/ModPlus.po b/plugins/ModPlus/locale/uk/LC_MESSAGES/ModPlus.po
index 1e5b3953c3..bb52aa38fc 100644
--- a/plugins/ModPlus/locale/uk/LC_MESSAGES/ModPlus.po
+++ b/plugins/ModPlus/locale/uk/LC_MESSAGES/ModPlus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ModPlus to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ModPlus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:20+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-30 17:54:28+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-modplus\n"
diff --git a/plugins/NewMenu/locale/NewMenu.pot b/plugins/NewMenu/locale/NewMenu.pot
index 191a3a8bcc..c12ab20ec0 100644
--- a/plugins/NewMenu/locale/NewMenu.pot
+++ b/plugins/NewMenu/locale/NewMenu.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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,78 +16,78 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: NewMenuPlugin.php:99
+#: NewMenuPlugin.php:74
 msgid "Home"
 msgstr ""
 
-#: NewMenuPlugin.php:100
+#: NewMenuPlugin.php:75
 msgid "Friends timeline"
 msgstr ""
 
-#: NewMenuPlugin.php:105
+#: NewMenuPlugin.php:80
 msgid "Profile"
 msgstr ""
 
-#: NewMenuPlugin.php:106
+#: NewMenuPlugin.php:81
 msgid "Your profile"
 msgstr ""
 
-#: NewMenuPlugin.php:110 NewMenuPlugin.php:133
+#: NewMenuPlugin.php:85 NewMenuPlugin.php:108
 msgid "Public"
 msgstr ""
 
-#: NewMenuPlugin.php:111 NewMenuPlugin.php:134
+#: NewMenuPlugin.php:86 NewMenuPlugin.php:109
 msgid "Everyone on this site"
 msgstr ""
 
-#: NewMenuPlugin.php:115
+#: NewMenuPlugin.php:90
 msgid "Settings"
 msgstr ""
 
-#: NewMenuPlugin.php:116
+#: NewMenuPlugin.php:91
 msgid "Change your personal settings"
 msgstr ""
 
-#: NewMenuPlugin.php:121
+#: NewMenuPlugin.php:96
 msgid "Admin"
 msgstr ""
 
-#: NewMenuPlugin.php:122
+#: NewMenuPlugin.php:97
 msgid "Site configuration"
 msgstr ""
 
-#: NewMenuPlugin.php:127
+#: NewMenuPlugin.php:102
 msgid "Logout"
 msgstr ""
 
-#: NewMenuPlugin.php:128
+#: NewMenuPlugin.php:103
 msgid "Logout from the site"
 msgstr ""
 
-#: NewMenuPlugin.php:138
+#: NewMenuPlugin.php:113
 msgid "Login"
 msgstr ""
 
-#: NewMenuPlugin.php:139
+#: NewMenuPlugin.php:114
 msgid "Login to the site"
 msgstr ""
 
-#: NewMenuPlugin.php:146
+#: NewMenuPlugin.php:121
 msgid "Search"
 msgstr ""
 
-#: NewMenuPlugin.php:147
+#: NewMenuPlugin.php:122
 msgid "Search the site"
 msgstr ""
 
-#: NewMenuPlugin.php:332
+#: NewMenuPlugin.php:307
 msgid "IM"
 msgstr ""
 
-#: NewMenuPlugin.php:339
+#: NewMenuPlugin.php:314
 msgid "SMS"
 msgstr ""
 
-#: NewMenuPlugin.php:431
+#: NewMenuPlugin.php:406
 msgid "A preview of the new menu layout in StatusNet 1.0."
 msgstr ""
diff --git a/plugins/NewMenu/locale/ia/LC_MESSAGES/NewMenu.po b/plugins/NewMenu/locale/ia/LC_MESSAGES/NewMenu.po
index fcd2c3a77d..1c8a5ffee1 100644
--- a/plugins/NewMenu/locale/ia/LC_MESSAGES/NewMenu.po
+++ b/plugins/NewMenu/locale/ia/LC_MESSAGES/NewMenu.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - NewMenu to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,90 +9,90 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NewMenu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:03+0000\n"
-"PO-Revision-Date: 2011-01-20 19:07:22+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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-14 23:54:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\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-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:99
+#: NewMenuPlugin.php:74
 msgid "Home"
 msgstr "Initio"
 
-#: NewMenuPlugin.php:100
+#: NewMenuPlugin.php:75
 msgid "Friends timeline"
 msgstr "Chronologia de amicos"
 
-#: NewMenuPlugin.php:105
+#: NewMenuPlugin.php:80
 msgid "Profile"
 msgstr "Profilo"
 
-#: NewMenuPlugin.php:106
+#: NewMenuPlugin.php:81
 msgid "Your profile"
 msgstr "Tu profilo"
 
-#: NewMenuPlugin.php:110 NewMenuPlugin.php:133
+#: NewMenuPlugin.php:85 NewMenuPlugin.php:108
 msgid "Public"
 msgstr "Public"
 
-#: NewMenuPlugin.php:111 NewMenuPlugin.php:134
+#: NewMenuPlugin.php:86 NewMenuPlugin.php:109
 msgid "Everyone on this site"
 msgstr "Omnes in iste sito"
 
-#: NewMenuPlugin.php:115
+#: NewMenuPlugin.php:90
 msgid "Settings"
 msgstr "Configurationes"
 
-#: NewMenuPlugin.php:116
+#: NewMenuPlugin.php:91
 msgid "Change your personal settings"
 msgstr "Cambiar tu optiones personal"
 
-#: NewMenuPlugin.php:121
+#: NewMenuPlugin.php:96
 msgid "Admin"
 msgstr "Admin"
 
-#: NewMenuPlugin.php:122
+#: NewMenuPlugin.php:97
 msgid "Site configuration"
 msgstr "Configuration del sito"
 
-#: NewMenuPlugin.php:127
+#: NewMenuPlugin.php:102
 msgid "Logout"
 msgstr "Clauder session"
 
-#: NewMenuPlugin.php:128
+#: NewMenuPlugin.php:103
 msgid "Logout from the site"
 msgstr "Terminar le session del sito"
 
-#: NewMenuPlugin.php:138
+#: NewMenuPlugin.php:113
 msgid "Login"
 msgstr "Aperir session"
 
-#: NewMenuPlugin.php:139
+#: NewMenuPlugin.php:114
 msgid "Login to the site"
 msgstr "Authenticar te a iste sito"
 
-#: NewMenuPlugin.php:146
+#: NewMenuPlugin.php:121
 msgid "Search"
 msgstr "Recerca"
 
-#: NewMenuPlugin.php:147
+#: NewMenuPlugin.php:122
 msgid "Search the site"
 msgstr "Cercar in le sito"
 
-#: NewMenuPlugin.php:332
+#: NewMenuPlugin.php:307
 msgid "IM"
 msgstr "MI"
 
-#: NewMenuPlugin.php:339
+#: NewMenuPlugin.php:314
 msgid "SMS"
 msgstr "SMS"
 
-#: NewMenuPlugin.php:431
+#: 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 45f33f0c9f..6c409201d0 100644
--- a/plugins/NewMenu/locale/mk/LC_MESSAGES/NewMenu.po
+++ b/plugins/NewMenu/locale/mk/LC_MESSAGES/NewMenu.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - NewMenu to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,90 +9,90 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NewMenu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:03+0000\n"
-"PO-Revision-Date: 2011-01-20 19:07:22+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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-14 23:54:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\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-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:99
+#: NewMenuPlugin.php:74
 msgid "Home"
 msgstr "Почетна"
 
-#: NewMenuPlugin.php:100
+#: NewMenuPlugin.php:75
 msgid "Friends timeline"
 msgstr "Хронологија на пријатели"
 
-#: NewMenuPlugin.php:105
+#: NewMenuPlugin.php:80
 msgid "Profile"
 msgstr "Профил"
 
-#: NewMenuPlugin.php:106
+#: NewMenuPlugin.php:81
 msgid "Your profile"
 msgstr "Вашиот профил"
 
-#: NewMenuPlugin.php:110 NewMenuPlugin.php:133
+#: NewMenuPlugin.php:85 NewMenuPlugin.php:108
 msgid "Public"
 msgstr "Јавно"
 
-#: NewMenuPlugin.php:111 NewMenuPlugin.php:134
+#: NewMenuPlugin.php:86 NewMenuPlugin.php:109
 msgid "Everyone on this site"
 msgstr "Секој на мрежново место"
 
-#: NewMenuPlugin.php:115
+#: NewMenuPlugin.php:90
 msgid "Settings"
 msgstr "Нагодувања"
 
-#: NewMenuPlugin.php:116
+#: NewMenuPlugin.php:91
 msgid "Change your personal settings"
 msgstr "Промена на личните нагодувања"
 
-#: NewMenuPlugin.php:121
+#: NewMenuPlugin.php:96
 msgid "Admin"
 msgstr "Админ"
 
-#: NewMenuPlugin.php:122
+#: NewMenuPlugin.php:97
 msgid "Site configuration"
 msgstr "Поставки за мрежното место"
 
-#: NewMenuPlugin.php:127
+#: NewMenuPlugin.php:102
 msgid "Logout"
 msgstr "Одјава"
 
-#: NewMenuPlugin.php:128
+#: NewMenuPlugin.php:103
 msgid "Logout from the site"
 msgstr "Одјава од мрежното место"
 
-#: NewMenuPlugin.php:138
+#: NewMenuPlugin.php:113
 msgid "Login"
 msgstr "Најава"
 
-#: NewMenuPlugin.php:139
+#: NewMenuPlugin.php:114
 msgid "Login to the site"
 msgstr "Најава на мрежното место"
 
-#: NewMenuPlugin.php:146
+#: NewMenuPlugin.php:121
 msgid "Search"
 msgstr "Пребарај"
 
-#: NewMenuPlugin.php:147
+#: NewMenuPlugin.php:122
 msgid "Search the site"
 msgstr "Пребарување на мрежното место"
 
-#: NewMenuPlugin.php:332
+#: NewMenuPlugin.php:307
 msgid "IM"
 msgstr "НП"
 
-#: NewMenuPlugin.php:339
+#: NewMenuPlugin.php:314
 msgid "SMS"
 msgstr "СМС"
 
-#: NewMenuPlugin.php:431
+#: 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 4bbaa0867e..0670ab301e 100644
--- a/plugins/NewMenu/locale/nl/LC_MESSAGES/NewMenu.po
+++ b/plugins/NewMenu/locale/nl/LC_MESSAGES/NewMenu.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - NewMenu to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,90 +9,90 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NewMenu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:36:33+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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-14 14:18:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\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-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:99
+#: NewMenuPlugin.php:74
 msgid "Home"
 msgstr "Hoofdmenu"
 
-#: NewMenuPlugin.php:100
+#: NewMenuPlugin.php:75
 msgid "Friends timeline"
 msgstr "Tijdlijn van vrienden"
 
-#: NewMenuPlugin.php:105
+#: NewMenuPlugin.php:80
 msgid "Profile"
 msgstr "Profiel"
 
-#: NewMenuPlugin.php:106
+#: NewMenuPlugin.php:81
 msgid "Your profile"
 msgstr "Uw profiel"
 
-#: NewMenuPlugin.php:110 NewMenuPlugin.php:133
+#: NewMenuPlugin.php:85 NewMenuPlugin.php:108
 msgid "Public"
 msgstr "Publiek"
 
-#: NewMenuPlugin.php:111 NewMenuPlugin.php:134
+#: NewMenuPlugin.php:86 NewMenuPlugin.php:109
 msgid "Everyone on this site"
 msgstr "Iedereen binnen deze site"
 
-#: NewMenuPlugin.php:115
+#: NewMenuPlugin.php:90
 msgid "Settings"
 msgstr "Instellingen"
 
-#: NewMenuPlugin.php:116
+#: NewMenuPlugin.php:91
 msgid "Change your personal settings"
 msgstr "Uw persoonlijke instellingen wijzigen"
 
-#: NewMenuPlugin.php:121
+#: NewMenuPlugin.php:96
 msgid "Admin"
 msgstr "Beheer"
 
-#: NewMenuPlugin.php:122
+#: NewMenuPlugin.php:97
 msgid "Site configuration"
 msgstr "Siteinstellingen"
 
-#: NewMenuPlugin.php:127
+#: NewMenuPlugin.php:102
 msgid "Logout"
 msgstr "Afmelden"
 
-#: NewMenuPlugin.php:128
+#: NewMenuPlugin.php:103
 msgid "Logout from the site"
 msgstr "Afmelden van de site"
 
-#: NewMenuPlugin.php:138
+#: NewMenuPlugin.php:113
 msgid "Login"
 msgstr "Aanmelden"
 
-#: NewMenuPlugin.php:139
+#: NewMenuPlugin.php:114
 msgid "Login to the site"
 msgstr "Aanmelden bij deze site"
 
-#: NewMenuPlugin.php:146
+#: NewMenuPlugin.php:121
 msgid "Search"
 msgstr "Zoeken"
 
-#: NewMenuPlugin.php:147
+#: NewMenuPlugin.php:122
 msgid "Search the site"
 msgstr "De site doorzoeken"
 
-#: NewMenuPlugin.php:332
+#: NewMenuPlugin.php:307
 msgid "IM"
 msgstr "IM"
 
-#: NewMenuPlugin.php:339
+#: NewMenuPlugin.php:314
 msgid "SMS"
 msgstr "SMS"
 
-#: NewMenuPlugin.php:431
+#: 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/uk/LC_MESSAGES/NewMenu.po b/plugins/NewMenu/locale/uk/LC_MESSAGES/NewMenu.po
index 71d17f40a3..297e9820f9 100644
--- a/plugins/NewMenu/locale/uk/LC_MESSAGES/NewMenu.po
+++ b/plugins/NewMenu/locale/uk/LC_MESSAGES/NewMenu.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - NewMenu to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,91 +9,91 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NewMenu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:03+0000\n"
-"PO-Revision-Date: 2011-01-20 19:07:22+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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-14 23:54:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\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-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:99
+#: NewMenuPlugin.php:74
 msgid "Home"
 msgstr "Дім"
 
-#: NewMenuPlugin.php:100
+#: NewMenuPlugin.php:75
 msgid "Friends timeline"
 msgstr "Стрічка друзів"
 
-#: NewMenuPlugin.php:105
+#: NewMenuPlugin.php:80
 msgid "Profile"
 msgstr "Профіль"
 
-#: NewMenuPlugin.php:106
+#: NewMenuPlugin.php:81
 msgid "Your profile"
 msgstr "Ваш профіль"
 
-#: NewMenuPlugin.php:110 NewMenuPlugin.php:133
+#: NewMenuPlugin.php:85 NewMenuPlugin.php:108
 msgid "Public"
 msgstr "Загал"
 
-#: NewMenuPlugin.php:111 NewMenuPlugin.php:134
+#: NewMenuPlugin.php:86 NewMenuPlugin.php:109
 msgid "Everyone on this site"
 msgstr "Всі на цьому сайті"
 
-#: NewMenuPlugin.php:115
+#: NewMenuPlugin.php:90
 msgid "Settings"
 msgstr "Параметри"
 
-#: NewMenuPlugin.php:116
+#: NewMenuPlugin.php:91
 msgid "Change your personal settings"
 msgstr "Змінити налаштування профілю"
 
-#: NewMenuPlugin.php:121
+#: NewMenuPlugin.php:96
 msgid "Admin"
 msgstr "Адмін"
 
-#: NewMenuPlugin.php:122
+#: NewMenuPlugin.php:97
 msgid "Site configuration"
 msgstr "Конфігурація сайту"
 
-#: NewMenuPlugin.php:127
+#: NewMenuPlugin.php:102
 msgid "Logout"
 msgstr "Вийти"
 
-#: NewMenuPlugin.php:128
+#: NewMenuPlugin.php:103
 msgid "Logout from the site"
 msgstr "Вийти з сайту"
 
-#: NewMenuPlugin.php:138
+#: NewMenuPlugin.php:113
 msgid "Login"
 msgstr "Увійти"
 
-#: NewMenuPlugin.php:139
+#: NewMenuPlugin.php:114
 msgid "Login to the site"
 msgstr "Увійти на сайт"
 
-#: NewMenuPlugin.php:146
+#: NewMenuPlugin.php:121
 msgid "Search"
 msgstr "Пошук"
 
-#: NewMenuPlugin.php:147
+#: NewMenuPlugin.php:122
 msgid "Search the site"
 msgstr "Пошук на сайті"
 
-#: NewMenuPlugin.php:332
+#: NewMenuPlugin.php:307
 msgid "IM"
 msgstr "ІМ"
 
-#: NewMenuPlugin.php:339
+#: NewMenuPlugin.php:314
 msgid "SMS"
 msgstr "СМС"
 
-#: NewMenuPlugin.php:431
+#: NewMenuPlugin.php:406
 msgid "A preview of the new menu layout in StatusNet 1.0."
 msgstr "Попередній перегляд нового макета меню в StatusNet 1.0"
diff --git a/plugins/NoticeTitle/locale/NoticeTitle.pot b/plugins/NoticeTitle/locale/NoticeTitle.pot
index 8c6f2e0adc..c87d25c00f 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/NoticeTitle/locale/ar/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/ar/LC_MESSAGES/NoticeTitle.po
index d00487d582..574eaa808b 100644
--- a/plugins/NoticeTitle/locale/ar/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/ar/LC_MESSAGES/NoticeTitle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - NoticeTitle to Arabic (العربية)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: OsamaK
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:20+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50:31+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: 2010-11-29 19:44:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
diff --git a/plugins/NoticeTitle/locale/br/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/br/LC_MESSAGES/NoticeTitle.po
index 2a55a27cb2..7ae383144d 100644
--- a/plugins/NoticeTitle/locale/br/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/br/LC_MESSAGES/NoticeTitle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - NoticeTitle to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Fulup
 # Author: Y-M D
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
diff --git a/plugins/NoticeTitle/locale/de/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/de/LC_MESSAGES/NoticeTitle.po
index 1a95da619c..8b2f97a0a2 100644
--- a/plugins/NoticeTitle/locale/de/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/de/LC_MESSAGES/NoticeTitle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - NoticeTitle to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
diff --git a/plugins/NoticeTitle/locale/fr/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/fr/LC_MESSAGES/NoticeTitle.po
index 1660fe2654..6b725e4b3a 100644
--- a/plugins/NoticeTitle/locale/fr/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/fr/LC_MESSAGES/NoticeTitle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - NoticeTitle to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Verdy p
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
diff --git a/plugins/NoticeTitle/locale/he/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/he/LC_MESSAGES/NoticeTitle.po
index 453921c8a2..c1244362c1 100644
--- a/plugins/NoticeTitle/locale/he/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/he/LC_MESSAGES/NoticeTitle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - NoticeTitle to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50:31+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: 2010-11-29 19:44:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
diff --git a/plugins/NoticeTitle/locale/ia/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/ia/LC_MESSAGES/NoticeTitle.po
index d3875185d9..1d573eaa7b 100644
--- a/plugins/NoticeTitle/locale/ia/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/ia/LC_MESSAGES/NoticeTitle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - NoticeTitle to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
diff --git a/plugins/NoticeTitle/locale/mk/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/mk/LC_MESSAGES/NoticeTitle.po
index a947c22df2..1ef0b05bff 100644
--- a/plugins/NoticeTitle/locale/mk/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/mk/LC_MESSAGES/NoticeTitle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - NoticeTitle to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
diff --git a/plugins/NoticeTitle/locale/nb/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/nb/LC_MESSAGES/NoticeTitle.po
index a632996a97..b3a2e5360c 100644
--- a/plugins/NoticeTitle/locale/nb/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/nb/LC_MESSAGES/NoticeTitle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - NoticeTitle to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
diff --git a/plugins/NoticeTitle/locale/ne/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/ne/LC_MESSAGES/NoticeTitle.po
index 837806327a..eb4c85bdaf 100644
--- a/plugins/NoticeTitle/locale/ne/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/ne/LC_MESSAGES/NoticeTitle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - NoticeTitle to Nepali (नेपाली)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bhawani Gautam Rhk
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50:31+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: 2010-11-29 19:44:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ne\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
diff --git a/plugins/NoticeTitle/locale/nl/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/nl/LC_MESSAGES/NoticeTitle.po
index 4c40b30a57..86d0ae00bb 100644
--- a/plugins/NoticeTitle/locale/nl/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/nl/LC_MESSAGES/NoticeTitle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - NoticeTitle to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
diff --git a/plugins/NoticeTitle/locale/pl/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/pl/LC_MESSAGES/NoticeTitle.po
index c0667efc93..6645d10dd8 100644
--- a/plugins/NoticeTitle/locale/pl/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/pl/LC_MESSAGES/NoticeTitle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - NoticeTitle to Polish (Polski)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Raven
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50:31+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: 2010-11-29 19:44:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
diff --git a/plugins/NoticeTitle/locale/ru/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/ru/LC_MESSAGES/NoticeTitle.po
index 9e6f2c3d13..20dde0703d 100644
--- a/plugins/NoticeTitle/locale/ru/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/ru/LC_MESSAGES/NoticeTitle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - NoticeTitle to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Александр Сигачёв
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
diff --git a/plugins/NoticeTitle/locale/te/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/te/LC_MESSAGES/NoticeTitle.po
index 0a6a613173..3140493f65 100644
--- a/plugins/NoticeTitle/locale/te/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/te/LC_MESSAGES/NoticeTitle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - NoticeTitle to Telugu (తెలుగు)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Veeven
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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-POT-Import-Date: 2010-11-29 19:44:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
diff --git a/plugins/NoticeTitle/locale/tl/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/tl/LC_MESSAGES/NoticeTitle.po
index 430dcb9e28..91c19e793d 100644
--- a/plugins/NoticeTitle/locale/tl/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/tl/LC_MESSAGES/NoticeTitle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - NoticeTitle to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
diff --git a/plugins/NoticeTitle/locale/uk/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/uk/LC_MESSAGES/NoticeTitle.po
index efd18baf81..d8d7dc497e 100644
--- a/plugins/NoticeTitle/locale/uk/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/uk/LC_MESSAGES/NoticeTitle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - NoticeTitle to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
diff --git a/plugins/NoticeTitle/locale/zh_CN/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/zh_CN/LC_MESSAGES/NoticeTitle.po
index 9400ad3893..0a5f69783c 100644
--- a/plugins/NoticeTitle/locale/zh_CN/LC_MESSAGES/NoticeTitle.po
+++ b/plugins/NoticeTitle/locale/zh_CN/LC_MESSAGES/NoticeTitle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - NoticeTitle to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - NoticeTitle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-noticetitle\n"
diff --git a/plugins/OStatus/locale/OStatus.pot b/plugins/OStatus/locale/OStatus.pot
index d14c29322c..7c64aba30c 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-01-14 10:29+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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"
@@ -139,119 +139,119 @@ msgid "Invalid actor passed to %1$s: %2$s."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:378
+#: classes/Ostatus_profile.php:379
 msgid ""
 "Invalid type passed to Ostatus_profile::notify. It must be XML string or "
 "Activity entry."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:409
+#: classes/Ostatus_profile.php:410
 msgid "Unknown feed format."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:433
+#: classes/Ostatus_profile.php:434
 msgid "RSS feed without a channel."
 msgstr ""
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:479
+#: classes/Ostatus_profile.php:480
 msgid "Can't handle that kind of post."
 msgstr ""
 
 #. TRANS: Client exception. %s is a source URI.
-#: classes/Ostatus_profile.php:537
+#: classes/Ostatus_profile.php:538
 #, 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:572
+#: classes/Ostatus_profile.php:573
 msgid "Show more"
 msgstr ""
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:765
+#: classes/Ostatus_profile.php:766
 #, php-format
 msgid "Could not reach profile page %s."
 msgstr ""
 
 #. TRANS: Exception. %s is a URL.
-#: classes/Ostatus_profile.php:823
+#: classes/Ostatus_profile.php:824
 #, php-format
 msgid "Could not find a feed URL for profile page %s."
 msgstr ""
 
 #. TRANS: Feed sub exception.
-#: classes/Ostatus_profile.php:922
+#: classes/Ostatus_profile.php:923
 msgid "Can't find enough profile information to make a feed."
 msgstr ""
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:986
+#: classes/Ostatus_profile.php:987
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr ""
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:997
+#: classes/Ostatus_profile.php:998
 #, php-format
 msgid "Tried to update avatar for unsaved remote profile %s."
 msgstr ""
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:1007
+#: classes/Ostatus_profile.php:1008
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1233
+#: classes/Ostatus_profile.php:1234
 msgid "Local user can't be referenced as remote."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1238
+#: classes/Ostatus_profile.php:1239
 msgid "Local group can't be referenced as remote."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1290 classes/Ostatus_profile.php:1301
+#: classes/Ostatus_profile.php:1291 classes/Ostatus_profile.php:1302
 msgid "Can't save local profile."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1309
+#: classes/Ostatus_profile.php:1310
 msgid "Can't save OStatus profile."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1573 classes/Ostatus_profile.php:1601
+#: classes/Ostatus_profile.php:1574 classes/Ostatus_profile.php:1602
 msgid "Not a valid webfinger address."
 msgstr ""
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1683
+#: classes/Ostatus_profile.php:1684
 #, php-format
 msgid "Couldn't save profile for \"%s\"."
 msgstr ""
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1702
+#: classes/Ostatus_profile.php:1703
 #, php-format
 msgid "Couldn't save ostatus_profile for \"%s\"."
 msgstr ""
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1710
+#: classes/Ostatus_profile.php:1711
 #, php-format
 msgid "Couldn't find a valid profile for \"%s\"."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1753
+#: classes/Ostatus_profile.php:1754
 msgid "Could not store HTML content of long post as file."
 msgstr ""
 
@@ -337,19 +337,13 @@ msgstr ""
 msgid "Received a salmon slap from unidentified actor."
 msgstr ""
 
-#. TRANS: Exception.
-#: lib/discovery.php:110
-#, php-format
-msgid "Unable to find services for %s."
-msgstr ""
-
 #. TRANS: Exception.
 #: lib/magicenvelope.php:80
 msgid "Unable to locate signer public key."
 msgstr ""
 
 #. TRANS: Exception.
-#: lib/salmon.php:93
+#: lib/salmon.php:126
 msgid "Salmon invalid actor for signing."
 msgstr ""
 
diff --git a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
index 067c78e1c1..8753af641f 100644
--- a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OStatus to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # Author: Verdy p
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:50+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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"
-"X-POT-Import-Date: 2011-01-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -155,7 +155,7 @@ 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:378
+#: classes/Ostatus_profile.php:379
 msgid ""
 "Invalid type passed to Ostatus_profile::notify. It must be XML string or "
 "Activity entry."
@@ -164,40 +164,40 @@ msgstr ""
 "une chaîne XML ou une entrée « Activity »."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:409
+#: classes/Ostatus_profile.php:410
 msgid "Unknown feed format."
 msgstr "Format de flux d’information inconnu."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:433
+#: classes/Ostatus_profile.php:434
 msgid "RSS feed without a channel."
 msgstr "Flux RSS sans canal."
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:479
+#: classes/Ostatus_profile.php:480
 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:537
+#: classes/Ostatus_profile.php:538
 #, 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:572
+#: classes/Ostatus_profile.php:573
 msgid "Show more"
 msgstr "Voir davantage"
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:765
+#: classes/Ostatus_profile.php:766
 #, 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:823
+#: classes/Ostatus_profile.php:824
 #, php-format
 msgid "Could not find a feed URL for profile page %s."
 msgstr ""
@@ -205,20 +205,20 @@ msgstr ""
 "profil « %s »."
 
 #. TRANS: Feed sub exception.
-#: classes/Ostatus_profile.php:922
+#: classes/Ostatus_profile.php:923
 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:986
+#: classes/Ostatus_profile.php:987
 #, 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:997
+#: classes/Ostatus_profile.php:998
 #, php-format
 msgid "Tried to update avatar for unsaved remote profile %s."
 msgstr ""
@@ -226,56 +226,56 @@ msgstr ""
 "»."
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:1007
+#: classes/Ostatus_profile.php:1008
 #, 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:1233
+#: classes/Ostatus_profile.php:1234
 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:1238
+#: classes/Ostatus_profile.php:1239
 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:1290 classes/Ostatus_profile.php:1301
+#: classes/Ostatus_profile.php:1291 classes/Ostatus_profile.php:1302
 msgid "Can't save local profile."
 msgstr "Impossible de sauvegarder le profil local."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1309
+#: classes/Ostatus_profile.php:1310
 msgid "Can't save OStatus profile."
 msgstr "Impossible de sauvegarder le profil OStatus."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1573 classes/Ostatus_profile.php:1601
+#: classes/Ostatus_profile.php:1574 classes/Ostatus_profile.php:1602
 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:1683
+#: classes/Ostatus_profile.php:1684
 #, 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:1702
+#: classes/Ostatus_profile.php:1703
 #, 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:1710
+#: classes/Ostatus_profile.php:1711
 #, 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:1753
+#: classes/Ostatus_profile.php:1754
 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."
@@ -364,19 +364,13 @@ msgstr "Cette cible ne reconnaît pas les indications de retrait d’évènement
 msgid "Received a salmon slap from unidentified actor."
 msgstr "Réception d’une giffle Salmon d’un acteur non identifié."
 
-#. TRANS: Exception.
-#: lib/discovery.php:110
-#, php-format
-msgid "Unable to find services for %s."
-msgstr "Impossible de trouver des services pour « %s »."
-
 #. 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:93
+#: lib/salmon.php:126
 msgid "Salmon invalid actor for signing."
 msgstr "Acteur Salmon invalide pour la signature."
 
@@ -807,3 +801,6 @@ 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 "Unable to find services for %s."
+#~ msgstr "Impossible de trouver des services pour « %s »."
diff --git a/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po
index 8e522802af..a4e6a059f8 100644
--- a/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OStatus to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -148,7 +148,7 @@ 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:378
+#: classes/Ostatus_profile.php:379
 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:409
+#: classes/Ostatus_profile.php:410
 msgid "Unknown feed format."
 msgstr "Formato de syndication incognite."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:433
+#: classes/Ostatus_profile.php:434
 msgid "RSS feed without a channel."
 msgstr "Syndication RSS sin canal."
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:479
+#: classes/Ostatus_profile.php:480
 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:537
+#: classes/Ostatus_profile.php:538
 #, 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:572
+#: classes/Ostatus_profile.php:573
 msgid "Show more"
 msgstr "Monstrar plus"
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:765
+#: classes/Ostatus_profile.php:766
 #, 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:823
+#: classes/Ostatus_profile.php:824
 #, 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:922
+#: classes/Ostatus_profile.php:923
 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:986
+#: classes/Ostatus_profile.php:987
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "URL de avatar %s invalide."
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:997
+#: classes/Ostatus_profile.php:998
 #, 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:1007
+#: classes/Ostatus_profile.php:1008
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Incapace de obtener avatar ab %s."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1233
+#: classes/Ostatus_profile.php:1234
 msgid "Local user can't be referenced as remote."
 msgstr "Usator local non pote esser referentiate como remote."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1238
+#: classes/Ostatus_profile.php:1239
 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:1290 classes/Ostatus_profile.php:1301
+#: classes/Ostatus_profile.php:1291 classes/Ostatus_profile.php:1302
 msgid "Can't save local profile."
 msgstr "Non pote salveguardar profilo local."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1309
+#: classes/Ostatus_profile.php:1310
 msgid "Can't save OStatus profile."
 msgstr "Non pote salveguardar profilo OStatus."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1573 classes/Ostatus_profile.php:1601
+#: classes/Ostatus_profile.php:1574 classes/Ostatus_profile.php:1602
 msgid "Not a valid webfinger address."
 msgstr "Adresse webfinger invalide."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1683
+#: classes/Ostatus_profile.php:1684
 #, 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:1702
+#: classes/Ostatus_profile.php:1703
 #, 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:1710
+#: classes/Ostatus_profile.php:1711
 #, 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:1753
+#: classes/Ostatus_profile.php:1754
 msgid "Could not store HTML content of long post as file."
 msgstr "Non poteva immagazinar contento HTML de longe message como file."
 
@@ -349,19 +349,13 @@ msgstr "Iste destination non comprende eventos de partita."
 msgid "Received a salmon slap from unidentified actor."
 msgstr "Recipeva un claffo de salmon de un actor non identificate."
 
-#. TRANS: Exception.
-#: lib/discovery.php:110
-#, php-format
-msgid "Unable to find services for %s."
-msgstr "Incapace de trovar servicios pro %s."
-
 #. 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:93
+#: lib/salmon.php:126
 msgid "Salmon invalid actor for signing."
 msgstr "Salmon: actor invalide pro signar."
 
@@ -778,3 +772,6 @@ 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 "Unable to find services for %s."
+#~ msgstr "Incapace de trovar servicios pro %s."
diff --git a/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po
index 0ffbaaa756..cc94ca5622 100644
--- a/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OStatus to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -151,7 +151,7 @@ msgid "Invalid actor passed to %1$s: %2$s."
 msgstr "На %1$s е пренесен неважечки учесник: %2$s."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:378
+#: classes/Ostatus_profile.php:379
 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:409
+#: classes/Ostatus_profile.php:410
 msgid "Unknown feed format."
 msgstr "Непознат формат на каналско емитување."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:433
+#: classes/Ostatus_profile.php:434
 msgid "RSS feed without a channel."
 msgstr "RSS-емитување без канал."
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:479
+#: classes/Ostatus_profile.php:480
 msgid "Can't handle that kind of post."
 msgstr "Не можам да работам со таква објава."
 
 #. TRANS: Client exception. %s is a source URI.
-#: classes/Ostatus_profile.php:537
+#: classes/Ostatus_profile.php:538
 #, 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:572
+#: classes/Ostatus_profile.php:573
 msgid "Show more"
 msgstr "Повеќе"
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:765
+#: classes/Ostatus_profile.php:766
 #, php-format
 msgid "Could not reach profile page %s."
 msgstr "Не можев да ја добијам профилната страница %s."
 
 #. TRANS: Exception. %s is a URL.
-#: classes/Ostatus_profile.php:823
+#: classes/Ostatus_profile.php:824
 #, php-format
 msgid "Could not find a feed URL for profile page %s."
 msgstr "Не можев да пронајдам каналска URL-адреса за профилната страница %s."
 
 #. TRANS: Feed sub exception.
-#: classes/Ostatus_profile.php:922
+#: classes/Ostatus_profile.php:923
 msgid "Can't find enough profile information to make a feed."
 msgstr "Не можев да најдам доволно профилни податоци за да направам канал."
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:986
+#: classes/Ostatus_profile.php:987
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Неважечка URL-адреса за аватарот: %s."
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:997
+#: classes/Ostatus_profile.php:998
 #, 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:1007
+#: classes/Ostatus_profile.php:1008
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Не можам да го добијам аватарот од %s."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1233
+#: classes/Ostatus_profile.php:1234
 msgid "Local user can't be referenced as remote."
 msgstr "Локалниот корисник не може да се наведе како далечински."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1238
+#: classes/Ostatus_profile.php:1239
 msgid "Local group can't be referenced as remote."
 msgstr "Локалната група не може да се наведе како далечинска."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1290 classes/Ostatus_profile.php:1301
+#: classes/Ostatus_profile.php:1291 classes/Ostatus_profile.php:1302
 msgid "Can't save local profile."
 msgstr "Не можам да го зачувам локалниот профил."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1309
+#: classes/Ostatus_profile.php:1310
 msgid "Can't save OStatus profile."
 msgstr "Не можам да го зачувам профилот од OStatus."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1573 classes/Ostatus_profile.php:1601
+#: classes/Ostatus_profile.php:1574 classes/Ostatus_profile.php:1602
 msgid "Not a valid webfinger address."
 msgstr "Ова не е важечка Webfinger-адреса"
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1683
+#: classes/Ostatus_profile.php:1684
 #, php-format
 msgid "Couldn't save profile for \"%s\"."
 msgstr "Не можам да го зачувам профилот за „%s“."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1702
+#: classes/Ostatus_profile.php:1703
 #, 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:1710
+#: classes/Ostatus_profile.php:1711
 #, php-format
 msgid "Couldn't find a valid profile for \"%s\"."
 msgstr "Не можев да пронајдам важечки профил за „%s“."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1753
+#: classes/Ostatus_profile.php:1754
 msgid "Could not store HTML content of long post as file."
 msgstr ""
 "Не можам да ја складирам HTML-содржината на долгата објава како податотека."
@@ -353,19 +353,13 @@ msgstr "Оваа цел не разбира напуштање на настан
 msgid "Received a salmon slap from unidentified actor."
 msgstr "Примив Salmon-шамар од непознат учесник."
 
-#. TRANS: Exception.
-#: lib/discovery.php:110
-#, php-format
-msgid "Unable to find services for %s."
-msgstr "Не можев да најдам служби за %s."
-
 #. TRANS: Exception.
 #: lib/magicenvelope.php:80
 msgid "Unable to locate signer public key."
 msgstr "Не можам да го пронајдам јавниот клуч на потписникот."
 
 #. TRANS: Exception.
-#: lib/salmon.php:93
+#: lib/salmon.php:126
 msgid "Salmon invalid actor for signing."
 msgstr "Ова е неважечки учесник во потпишувањето според Salmon."
 
@@ -781,3 +775,6 @@ msgstr "Неочекувано барање за претплата за %s."
 #, php-format
 msgid "Unexpected unsubscribe request for %s."
 msgstr "Неочекувано барање за отпишување од претплата за %s."
+
+#~ msgid "Unable to find services for %s."
+#~ msgstr "Не можев да најдам служби за %s."
diff --git a/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po
index 20331f169a..a5a9debeb1 100644
--- a/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OStatus to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # Author: Siebrand
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -157,7 +157,7 @@ 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:378
+#: classes/Ostatus_profile.php:379
 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:409
+#: classes/Ostatus_profile.php:410
 msgid "Unknown feed format."
 msgstr "Onbekend feedformaat"
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:433
+#: classes/Ostatus_profile.php:434
 msgid "RSS feed without a channel."
 msgstr "RSS-feed zonder kanaal."
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:479
+#: classes/Ostatus_profile.php:480
 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:537
+#: classes/Ostatus_profile.php:538
 #, 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:572
+#: classes/Ostatus_profile.php:573
 msgid "Show more"
 msgstr "Meer weergeven"
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:765
+#: classes/Ostatus_profile.php:766
 #, 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:823
+#: classes/Ostatus_profile.php:824
 #, 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:922
+#: classes/Ostatus_profile.php:923
 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:986
+#: classes/Ostatus_profile.php:987
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Ongeldige avatar-URL %s."
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:997
+#: classes/Ostatus_profile.php:998
 #, 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:1007
+#: classes/Ostatus_profile.php:1008
 #, 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:1233
+#: classes/Ostatus_profile.php:1234
 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:1238
+#: classes/Ostatus_profile.php:1239
 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:1290 classes/Ostatus_profile.php:1301
+#: classes/Ostatus_profile.php:1291 classes/Ostatus_profile.php:1302
 msgid "Can't save local profile."
 msgstr "Het was niet mogelijk het lokale profiel op te slaan."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1309
+#: classes/Ostatus_profile.php:1310
 msgid "Can't save OStatus profile."
 msgstr "Het was niet mogelijk het Ostatusprofiel op te slaan."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1573 classes/Ostatus_profile.php:1601
+#: classes/Ostatus_profile.php:1574 classes/Ostatus_profile.php:1602
 msgid "Not a valid webfinger address."
 msgstr "Geen geldig webfingeradres."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1683
+#: classes/Ostatus_profile.php:1684
 #, 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:1702
+#: classes/Ostatus_profile.php:1703
 #, 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:1710
+#: classes/Ostatus_profile.php:1711
 #, 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:1753
+#: classes/Ostatus_profile.php:1754
 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 "
@@ -366,12 +366,6 @@ msgstr "Deze bestemming begrijpt uitschrijven van gebeurtenissen niet."
 msgid "Received a salmon slap from unidentified actor."
 msgstr "Er is een Salmonslap ontvangen van een niet-geïdentificeerde actor."
 
-#. TRANS: Exception.
-#: lib/discovery.php:110
-#, php-format
-msgid "Unable to find services for %s."
-msgstr "Het was niet mogelijk diensten te vinden voor %s."
-
 #. TRANS: Exception.
 #: lib/magicenvelope.php:80
 msgid "Unable to locate signer public key."
@@ -379,7 +373,7 @@ msgstr ""
 "Het was niet mogelijk de publieke sleutel van de ondertekenaar te vinden."
 
 #. TRANS: Exception.
-#: lib/salmon.php:93
+#: lib/salmon.php:126
 msgid "Salmon invalid actor for signing."
 msgstr "Ongeldige actor voor het ondertekenen van Salmon."
 
@@ -810,3 +804,6 @@ msgstr "Onverwacht abonneringsverzoek voor %s."
 #, php-format
 msgid "Unexpected unsubscribe request for %s."
 msgstr "Onverwacht verzoek om abonnement op te hebben voor %s."
+
+#~ msgid "Unable to find services for %s."
+#~ msgstr "Het was niet mogelijk diensten te vinden voor %s."
diff --git a/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po
index d9e9a4d27a..56d3542bab 100644
--- a/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OStatus to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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-10 18:26:06+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:38+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -154,7 +154,7 @@ msgid "Invalid actor passed to %1$s: %2$s."
 msgstr "До %1$s передано невірний об’єкт: %2$s."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:378
+#: classes/Ostatus_profile.php:379
 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:409
+#: classes/Ostatus_profile.php:410
 msgid "Unknown feed format."
 msgstr "Невідомий формат веб-стрічки."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:433
+#: classes/Ostatus_profile.php:434
 msgid "RSS feed without a channel."
 msgstr "RSS-стрічка не має каналу."
 
 #. TRANS: Client exception.
-#: classes/Ostatus_profile.php:479
+#: classes/Ostatus_profile.php:480
 msgid "Can't handle that kind of post."
 msgstr "Не вдається обробити такий тип допису."
 
 #. TRANS: Client exception. %s is a source URI.
-#: classes/Ostatus_profile.php:537
+#: classes/Ostatus_profile.php:538
 #, 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:572
+#: classes/Ostatus_profile.php:573
 msgid "Show more"
 msgstr "Розгорнути"
 
 #. TRANS: Exception. %s is a profile URL.
-#: classes/Ostatus_profile.php:765
+#: classes/Ostatus_profile.php:766
 #, php-format
 msgid "Could not reach profile page %s."
 msgstr "Не вдалося досягти сторінки профілю %s."
 
 #. TRANS: Exception. %s is a URL.
-#: classes/Ostatus_profile.php:823
+#: classes/Ostatus_profile.php:824
 #, php-format
 msgid "Could not find a feed URL for profile page %s."
 msgstr "Не вдалося знайти URL веб-стрічки для сторінки профілю %s."
 
 #. TRANS: Feed sub exception.
-#: classes/Ostatus_profile.php:922
+#: classes/Ostatus_profile.php:923
 msgid "Can't find enough profile information to make a feed."
 msgstr ""
 "Не можу знайти достатньо інформації про профіль, аби сформувати веб-стрічку."
 
 #. TRANS: Server exception. %s is a URL.
-#: classes/Ostatus_profile.php:986
+#: classes/Ostatus_profile.php:987
 #, php-format
 msgid "Invalid avatar URL %s."
 msgstr "Невірна URL-адреса аватари %s."
 
 #. TRANS: Server exception. %s is a URI.
-#: classes/Ostatus_profile.php:997
+#: classes/Ostatus_profile.php:998
 #, 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:1007
+#: classes/Ostatus_profile.php:1008
 #, php-format
 msgid "Unable to fetch avatar from %s."
 msgstr "Неможливо завантажити аватару з %s."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1233
+#: classes/Ostatus_profile.php:1234
 msgid "Local user can't be referenced as remote."
 msgstr "Місцевий користувач не може бути зазначеним у якості віддаленого."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1238
+#: classes/Ostatus_profile.php:1239
 msgid "Local group can't be referenced as remote."
 msgstr "Локальну спільноту не можна зазначити у якості віддаленої."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1290 classes/Ostatus_profile.php:1301
+#: classes/Ostatus_profile.php:1291 classes/Ostatus_profile.php:1302
 msgid "Can't save local profile."
 msgstr "Не вдається зберегти місцевий профіль."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1309
+#: classes/Ostatus_profile.php:1310
 msgid "Can't save OStatus profile."
 msgstr "Не вдається зберегти профіль OStatus."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1573 classes/Ostatus_profile.php:1601
+#: classes/Ostatus_profile.php:1574 classes/Ostatus_profile.php:1602
 msgid "Not a valid webfinger address."
 msgstr "Це недійсна адреса для протоколу WebFinger."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1683
+#: classes/Ostatus_profile.php:1684
 #, php-format
 msgid "Couldn't save profile for \"%s\"."
 msgstr "Не можу зберегти профіль для «%s»."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1702
+#: classes/Ostatus_profile.php:1703
 #, php-format
 msgid "Couldn't save ostatus_profile for \"%s\"."
 msgstr "Не можу зберегти профіль OStatus для «%s»."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1710
+#: classes/Ostatus_profile.php:1711
 #, php-format
 msgid "Couldn't find a valid profile for \"%s\"."
 msgstr "не можу знайти відповідний й профіль для «%s»."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1753
+#: classes/Ostatus_profile.php:1754
 msgid "Could not store HTML content of long post as file."
 msgstr "Не можу зберегти HTML місткого допису у якості файлу."
 
@@ -355,19 +355,13 @@ msgstr "Ціль не розуміє, що таке «залишати поді
 msgid "Received a salmon slap from unidentified actor."
 msgstr "Отримано ляпаса від невизначеного учасника за протоколом Salmon."
 
-#. TRANS: Exception.
-#: lib/discovery.php:110
-#, php-format
-msgid "Unable to find services for %s."
-msgstr "Не вдається знайти сервіси для %s."
-
 #. TRANS: Exception.
 #: lib/magicenvelope.php:80
 msgid "Unable to locate signer public key."
 msgstr "Не вдалося знайти публічного ключа підписанта."
 
 #. TRANS: Exception.
-#: lib/salmon.php:93
+#: lib/salmon.php:126
 msgid "Salmon invalid actor for signing."
 msgstr "Недійсний учасник подій за протоколом Salmon для підписання."
 
@@ -792,3 +786,6 @@ msgstr "Несподіваний запит підписки для %s."
 #, php-format
 msgid "Unexpected unsubscribe request for %s."
 msgstr "Несподіваний запит щодо скасування підписки для %s."
+
+#~ msgid "Unable to find services for %s."
+#~ msgstr "Не вдається знайти сервіси для %s."
diff --git a/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot b/plugins/OpenExternalLinkTarget/locale/OpenExternalLinkTarget.pot
index af5df45d1e..8704e52ba9 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/OpenExternalLinkTarget/locale/de/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/de/LC_MESSAGES/OpenExternalLinkTarget.po
index 3552d3649a..55db030eaa 100644
--- a/plugins/OpenExternalLinkTarget/locale/de/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/de/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OpenExternalLinkTarget to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
diff --git a/plugins/OpenExternalLinkTarget/locale/es/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/es/LC_MESSAGES/OpenExternalLinkTarget.po
index 103f2ffabb..a11b3668e7 100644
--- a/plugins/OpenExternalLinkTarget/locale/es/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/es/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OpenExternalLinkTarget to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Locos epraix
 # Author: Translationista
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
diff --git a/plugins/OpenExternalLinkTarget/locale/fr/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/fr/LC_MESSAGES/OpenExternalLinkTarget.po
index 0e6e55df42..c3c83c50fb 100644
--- a/plugins/OpenExternalLinkTarget/locale/fr/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/fr/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OpenExternalLinkTarget to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # Author: Verdy p
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
diff --git a/plugins/OpenExternalLinkTarget/locale/he/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/he/LC_MESSAGES/OpenExternalLinkTarget.po
index d08b7630e9..158d5d62eb 100644
--- a/plugins/OpenExternalLinkTarget/locale/he/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/he/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OpenExternalLinkTarget to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
diff --git a/plugins/OpenExternalLinkTarget/locale/ia/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/ia/LC_MESSAGES/OpenExternalLinkTarget.po
index 54c40345fa..b5d1e4849d 100644
--- a/plugins/OpenExternalLinkTarget/locale/ia/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/ia/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OpenExternalLinkTarget to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
diff --git a/plugins/OpenExternalLinkTarget/locale/mk/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/mk/LC_MESSAGES/OpenExternalLinkTarget.po
index f6e390b3cf..d39422388b 100644
--- a/plugins/OpenExternalLinkTarget/locale/mk/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/mk/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OpenExternalLinkTarget to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
diff --git a/plugins/OpenExternalLinkTarget/locale/nb/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/nb/LC_MESSAGES/OpenExternalLinkTarget.po
index 1147980f26..2c149e295e 100644
--- a/plugins/OpenExternalLinkTarget/locale/nb/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/nb/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OpenExternalLinkTarget to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
diff --git a/plugins/OpenExternalLinkTarget/locale/nl/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/nl/LC_MESSAGES/OpenExternalLinkTarget.po
index 975ee3593a..fea899a168 100644
--- a/plugins/OpenExternalLinkTarget/locale/nl/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/nl/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OpenExternalLinkTarget to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
diff --git a/plugins/OpenExternalLinkTarget/locale/ru/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/ru/LC_MESSAGES/OpenExternalLinkTarget.po
index cef89ed7a3..607f3a0d37 100644
--- a/plugins/OpenExternalLinkTarget/locale/ru/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/ru/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OpenExternalLinkTarget to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Eleferen
 # Author: Александр Сигачёв
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
diff --git a/plugins/OpenExternalLinkTarget/locale/uk/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/uk/LC_MESSAGES/OpenExternalLinkTarget.po
index 3f51284e53..c183a46511 100644
--- a/plugins/OpenExternalLinkTarget/locale/uk/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/uk/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OpenExternalLinkTarget to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-openexternallinktarget\n"
diff --git a/plugins/OpenExternalLinkTarget/locale/zh_CN/LC_MESSAGES/OpenExternalLinkTarget.po b/plugins/OpenExternalLinkTarget/locale/zh_CN/LC_MESSAGES/OpenExternalLinkTarget.po
index 70074ee5db..2e1c33eb33 100644
--- a/plugins/OpenExternalLinkTarget/locale/zh_CN/LC_MESSAGES/OpenExternalLinkTarget.po
+++ b/plugins/OpenExternalLinkTarget/locale/zh_CN/LC_MESSAGES/OpenExternalLinkTarget.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - OpenExternalLinkTarget to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
+# Author: Hydra
 # Author: ZhengYiFeng
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,20 +10,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenExternalLinkTarget\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-18 18:35+0000\n"
-"PO-Revision-Date: 2010-10-18 18:43:22+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-10-09 14:36:34+0000\n"
-"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\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-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
-#, fuzzy
 msgid "Opens external links (i.e. with rel=external) on a new window or tab."
-msgstr "在新窗口或标签打开外部链接（如使用 rel=external）。"
+msgstr "打开外部链接 （即与 rel = 外部） 在一个新窗口或选项卡。"
diff --git a/plugins/OpenID/locale/OpenID.pot b/plugins/OpenID/locale/OpenID.pot
index 9bbf73f793..6027d7d53a 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-22 14:50+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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"
@@ -385,105 +385,105 @@ msgstr ""
 msgid "Create a new user with this nickname."
 msgstr ""
 
-#: finishopenidlogin.php:122
+#: finishopenidlogin.php:126
 msgid "New nickname"
 msgstr ""
 
-#: finishopenidlogin.php:124
+#: 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:149
+#: 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:163
+#: 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:166
+#: 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:170
+#: 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:174
+#: 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:178
+#: 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:191 finishaddopenid.php:90
+#: 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:195 finishaddopenid.php:95
+#: finishopenidlogin.php:241 finishaddopenid.php:95
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr ""
 
-#: finishopenidlogin.php:215 finishaddopenid.php:111
+#: 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:271 finishopenidlogin.php:281
+#: 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:289
+#: finishopenidlogin.php:335
 msgid "Not a valid invitation code."
 msgstr ""
 
 #. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:303
+#: finishopenidlogin.php:349
 msgid "Nickname not allowed."
 msgstr ""
 
 #. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:309
+#: 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:317 finishopenidlogin.php:407
+#: finishopenidlogin.php:363 finishopenidlogin.php:449
 msgid "Stored OpenID not found."
 msgstr ""
 
 #. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:327
+#: finishopenidlogin.php:373
 msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 
 #. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:395
+#: 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:415
+#: finishopenidlogin.php:457
 msgid "Error connecting user to OpenID."
 msgstr ""
 
diff --git a/plugins/OpenID/locale/br/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/br/LC_MESSAGES/OpenID.po
index 5cb552eb7a..f53dd5fc41 100644
--- a/plugins/OpenID/locale/br/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/br/LC_MESSAGES/OpenID.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OpenID to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Y-M D
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:00:48+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50:40+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 (r80746); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -392,105 +392,105 @@ msgstr "Krouiñ ur gont nevez"
 msgid "Create a new user with this nickname."
 msgstr "Krouiñ un implijer nevez gant al lesanv-se."
 
-#: finishopenidlogin.php:122
+#: finishopenidlogin.php:126
 msgid "New nickname"
 msgstr "Lesanv nevez"
 
-#: finishopenidlogin.php:124
+#: 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:149
+#: 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:163
+#: 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:166
+#: 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:170
+#: 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:174
+#: 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:178
+#: 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:191 finishaddopenid.php:90
+#: 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:195 finishaddopenid.php:95
+#: finishopenidlogin.php:241 finishaddopenid.php:95
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr ""
 
-#: finishopenidlogin.php:215 finishaddopenid.php:111
+#: 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:271 finishopenidlogin.php:281
+#: 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:289
+#: 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:303
+#: 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:309
+#: 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:317 finishopenidlogin.php:407
+#: finishopenidlogin.php:363 finishopenidlogin.php:449
 msgid "Stored OpenID not found."
 msgstr ""
 
 #. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:327
+#: finishopenidlogin.php:373
 msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 
 #. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:395
+#: 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:415
+#: finishopenidlogin.php:457
 msgid "Error connecting user to OpenID."
 msgstr ""
 
diff --git a/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po
index 0f608c299b..1ea7edd37b 100644
--- a/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OpenID to Catalan (Català)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Toniher
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:00:48+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -403,106 +403,106 @@ msgstr "Crea un compte nou"
 msgid "Create a new user with this nickname."
 msgstr "Crea un usuari nou amb aquest sobrenom."
 
-#: finishopenidlogin.php:122
+#: finishopenidlogin.php:126
 msgid "New nickname"
 msgstr "Nou sobrenom"
 
-#: finishopenidlogin.php:124
+#: 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:149
+#: 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:163
+#: 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:166
+#: 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:170
+#: 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:174
+#: 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:178
+#: 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:191 finishaddopenid.php:90
+#: 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:195 finishaddopenid.php:95
+#: finishopenidlogin.php:241 finishaddopenid.php:95
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr ""
 
-#: finishopenidlogin.php:215 finishaddopenid.php:111
+#: 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:271 finishopenidlogin.php:281
+#: 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:289
+#: 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:303
+#: 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:309
+#: 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:317 finishopenidlogin.php:407
+#: 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:327
+#: 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:395
+#: 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:415
+#: finishopenidlogin.php:457
 msgid "Error connecting user to OpenID."
 msgstr "S'ha produït un error en connectar l'usuari amb la connexió OpenID."
 
diff --git a/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
index c2a9aa6a83..3dbceea822 100644
--- a/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OpenID to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Apmon
 # Author: The Evil IP address
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:00:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -423,27 +423,27 @@ msgstr "Neues Benutzerkonto erstellen"
 msgid "Create a new user with this nickname."
 msgstr "Neues Benutzerkonto mit diesem Benutzernamen erstellen."
 
-#: finishopenidlogin.php:122
+#: finishopenidlogin.php:126
 msgid "New nickname"
 msgstr "Neuer Benutzername"
 
-#: finishopenidlogin.php:124
+#: 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:149
+#: 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:163
+#: 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:166
+#: finishopenidlogin.php:179
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -452,35 +452,35 @@ 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:170
+#: 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:174
+#: 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:178
+#: 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:191 finishaddopenid.php:90
+#: 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:195 finishaddopenid.php:95
+#: finishopenidlogin.php:241 finishaddopenid.php:95
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "OpenID-Authentifizierung gescheitert: %s"
 
-#: finishopenidlogin.php:215 finishaddopenid.php:111
+#: finishopenidlogin.php:261 finishaddopenid.php:111
 msgid ""
 "OpenID authentication aborted: you are not allowed to login to this site."
 msgstr ""
@@ -489,43 +489,43 @@ 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:271 finishopenidlogin.php:281
+#: 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:289
+#: 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:303
+#: 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:309
+#: 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:317 finishopenidlogin.php:407
+#: finishopenidlogin.php:363 finishopenidlogin.php:449
 msgid "Stored OpenID not found."
 msgstr ""
 
 #. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:327
+#: finishopenidlogin.php:373
 msgid "Creating new account for OpenID that already has a user."
 msgstr ""
 
 #. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:395
+#: 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:415
+#: finishopenidlogin.php:457
 msgid "Error connecting user to OpenID."
 msgstr ""
 
diff --git a/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po
index c3cf1af981..3a101ed86f 100644
--- a/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OpenID to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # Author: Verdy p
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:00:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -433,27 +433,27 @@ msgstr "Créer un nouveau compte"
 msgid "Create a new user with this nickname."
 msgstr "Créer un nouvel utilisateur avec ce pseudonyme."
 
-#: finishopenidlogin.php:122
+#: finishopenidlogin.php:126
 msgid "New nickname"
 msgstr "Nouveau pseudonyme"
 
-#: finishopenidlogin.php:124
+#: 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:149
+#: 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:163
+#: 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:166
+#: finishopenidlogin.php:179
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -462,35 +462,35 @@ 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:170
+#: 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:174
+#: 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:178
+#: 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:191 finishaddopenid.php:90
+#: 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:195 finishaddopenid.php:95
+#: finishopenidlogin.php:241 finishaddopenid.php:95
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "L’authentification OpenID a échoué : %s"
 
-#: finishopenidlogin.php:215 finishaddopenid.php:111
+#: finishopenidlogin.php:261 finishaddopenid.php:111
 msgid ""
 "OpenID authentication aborted: you are not allowed to login to this site."
 msgstr ""
@@ -499,43 +499,43 @@ 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:271 finishopenidlogin.php:281
+#: 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:289
+#: 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:303
+#: 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:309
+#: 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:317 finishopenidlogin.php:407
+#: finishopenidlogin.php:363 finishopenidlogin.php:449
 msgid "Stored OpenID not found."
 msgstr "OpenID stocké non trouvé."
 
 #. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:327
+#: 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:395
+#: 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:415
+#: finishopenidlogin.php:457
 msgid "Error connecting user to OpenID."
 msgstr "Erreur de connexion de l’utilisateur à OpenID."
 
diff --git a/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po
index a9c6ab0e9b..5d7bf04eed 100644
--- a/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OpenID to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:00:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -423,27 +423,27 @@ msgstr "Crear nove conto"
 msgid "Create a new user with this nickname."
 msgstr "Crear un nove usator con iste pseudonymo."
 
-#: finishopenidlogin.php:122
+#: finishopenidlogin.php:126
 msgid "New nickname"
 msgstr "Nove pseudonymo"
 
-#: finishopenidlogin.php:124
+#: 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:149
+#: 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:163
+#: 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:166
+#: finishopenidlogin.php:179
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -452,35 +452,35 @@ 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:170
+#: 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:174
+#: 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:178
+#: 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:191 finishaddopenid.php:90
+#: 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:195 finishaddopenid.php:95
+#: finishopenidlogin.php:241 finishaddopenid.php:95
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Le authentication OpenID ha fallite: %s"
 
-#: finishopenidlogin.php:215 finishaddopenid.php:111
+#: finishopenidlogin.php:261 finishaddopenid.php:111
 msgid ""
 "OpenID authentication aborted: you are not allowed to login to this site."
 msgstr ""
@@ -489,43 +489,43 @@ 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:271 finishopenidlogin.php:281
+#: 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:289
+#: 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:303
+#: 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:309
+#: 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:317 finishopenidlogin.php:407
+#: 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:327
+#: 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:395
+#: 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:415
+#: finishopenidlogin.php:457
 msgid "Error connecting user to OpenID."
 msgstr "Error durante le connexion del usator a OpenID."
 
diff --git a/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po
index 1146039913..da1c1a7851 100644
--- a/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OpenID to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:00:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -419,27 +419,27 @@ msgstr "Создај нова сметка"
 msgid "Create a new user with this nickname."
 msgstr "Создај нов корисник со овој прекар."
 
-#: finishopenidlogin.php:122
+#: finishopenidlogin.php:126
 msgid "New nickname"
 msgstr "Нов прекар"
 
-#: finishopenidlogin.php:124
+#: 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:149
+#: 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:163
+#: 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:166
+#: finishopenidlogin.php:179
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -448,35 +448,35 @@ msgstr ""
 "поврзете со Вашиот OpenID."
 
 #. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:170
+#: 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:174
+#: 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:178
+#: 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:191 finishaddopenid.php:90
+#: 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:195 finishaddopenid.php:95
+#: finishopenidlogin.php:241 finishaddopenid.php:95
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Потврдувањето на OpenID не успеа: %s"
 
-#: finishopenidlogin.php:215 finishaddopenid.php:111
+#: finishopenidlogin.php:261 finishaddopenid.php:111
 msgid ""
 "OpenID authentication aborted: you are not allowed to login to this site."
 msgstr ""
@@ -485,43 +485,43 @@ 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:271 finishopenidlogin.php:281
+#: 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:289
+#: finishopenidlogin.php:335
 msgid "Not a valid invitation code."
 msgstr "Ова не е важечки код за покана."
 
 #. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:303
+#: finishopenidlogin.php:349
 msgid "Nickname not allowed."
 msgstr "Прекарот не е дозволен."
 
 #. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:309
+#: 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:317 finishopenidlogin.php:407
+#: finishopenidlogin.php:363 finishopenidlogin.php:449
 msgid "Stored OpenID not found."
 msgstr "Складираниот OpenID не е пронајден."
 
 #. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:327
+#: finishopenidlogin.php:373
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Создавање на сметка за OpenID што веќе има корисник."
 
 #. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:395
+#: 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:415
+#: finishopenidlogin.php:457
 msgid "Error connecting user to OpenID."
 msgstr "Грешка при поврзувањето на корисникот со OpenID."
 
diff --git a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
index 0c5ca2d9d9..92d9fb63c1 100644
--- a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OpenID to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # Author: Siebrand
@@ -10,16 +10,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:00:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50:41+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-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -426,27 +426,27 @@ msgstr "Nieuwe gebruiker aanmaken"
 msgid "Create a new user with this nickname."
 msgstr "Nieuwe gebruiker met deze naam aanmaken."
 
-#: finishopenidlogin.php:122
+#: finishopenidlogin.php:126
 msgid "New nickname"
 msgstr "Nieuwe gebruiker"
 
-#: finishopenidlogin.php:124
+#: 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:149
+#: 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:163
+#: 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:166
+#: finishopenidlogin.php:179
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -455,35 +455,35 @@ 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:170
+#: 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:174
+#: 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:178
+#: 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:191 finishaddopenid.php:90
+#: 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:195 finishaddopenid.php:95
+#: finishopenidlogin.php:241 finishaddopenid.php:95
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "De authenticatie via OpenID is mislukt: %s"
 
-#: finishopenidlogin.php:215 finishaddopenid.php:111
+#: finishopenidlogin.php:261 finishaddopenid.php:111
 msgid ""
 "OpenID authentication aborted: you are not allowed to login to this site."
 msgstr ""
@@ -491,43 +491,43 @@ 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:271 finishopenidlogin.php:281
+#: 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:289
+#: 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:303
+#: 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:309
+#: 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:317 finishopenidlogin.php:407
+#: 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:327
+#: 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:395
+#: 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:415
+#: finishopenidlogin.php:457
 msgid "Error connecting user to OpenID."
 msgstr "Fout bij het koppelen met OpenID."
 
diff --git a/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po
index bf92b41710..5b1f94e25c 100644
--- a/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/tl/LC_MESSAGES/OpenID.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OpenID to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:00:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -435,28 +435,28 @@ msgstr "Likhain ang bagong akawnt"
 msgid "Create a new user with this nickname."
 msgstr "Lumikha ng isang bagong tagagamit na may ganitong palayaw."
 
-#: finishopenidlogin.php:122
+#: finishopenidlogin.php:126
 msgid "New nickname"
 msgstr "Bagong palayaw"
 
-#: finishopenidlogin.php:124
+#: 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:149
+#: 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:163
+#: 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:166
+#: finishopenidlogin.php:179
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -465,35 +465,35 @@ 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:170
+#: 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:174
+#: 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:178
+#: 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:191 finishaddopenid.php:90
+#: 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:195 finishaddopenid.php:95
+#: finishopenidlogin.php:241 finishaddopenid.php:95
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Nabigo ang pagpapatunay ng OpenID: %s"
 
-#: finishopenidlogin.php:215 finishaddopenid.php:111
+#: finishopenidlogin.php:261 finishaddopenid.php:111
 msgid ""
 "OpenID authentication aborted: you are not allowed to login to this site."
 msgstr ""
@@ -502,44 +502,44 @@ 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:271 finishopenidlogin.php:281
+#: 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:289
+#: 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:303
+#: 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:309
+#: 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:317 finishopenidlogin.php:407
+#: 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:327
+#: 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:395
+#: 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:415
+#: finishopenidlogin.php:457
 msgid "Error connecting user to OpenID."
 msgstr "May kamalian sa pag-ugnay ng tagagamit sa OpenID."
 
diff --git a/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po
index f7646149de..23b1c44e9f 100644
--- a/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OpenID to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # Author: Тест
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:00:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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-01-10 18:26:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -427,28 +427,28 @@ msgstr "Створити новий акаунт"
 msgid "Create a new user with this nickname."
 msgstr "Створити нового користувача з цим нікнеймом."
 
-#: finishopenidlogin.php:122
+#: finishopenidlogin.php:126
 msgid "New nickname"
 msgstr "Новий нікнейм"
 
-#: finishopenidlogin.php:124
+#: 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:149
+#: 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:163
+#: 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:166
+#: finishopenidlogin.php:179
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
@@ -457,78 +457,78 @@ msgstr ""
 "приєднати їх до вашого OpenID."
 
 #. TRANS: Field label in form in which to connect an OpenID to an existing user on the site.
-#: finishopenidlogin.php:170
+#: 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:174
+#: 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:178
+#: 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:191 finishaddopenid.php:90
+#: 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:195 finishaddopenid.php:95
+#: finishopenidlogin.php:241 finishaddopenid.php:95
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "Автентифікуватись за OpenID не вдалося: %s"
 
-#: finishopenidlogin.php:215 finishaddopenid.php:111
+#: 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:271 finishopenidlogin.php:281
+#: 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:289
+#: finishopenidlogin.php:335
 msgid "Not a valid invitation code."
 msgstr "Це не дійсний код запрошення."
 
 #. TRANS: OpenID plugin message. The entered new user name is blacklisted.
-#: finishopenidlogin.php:303
+#: finishopenidlogin.php:349
 msgid "Nickname not allowed."
 msgstr "Нікнейм не допускається."
 
 #. TRANS: OpenID plugin message. The entered new user name is already used.
-#: finishopenidlogin.php:309
+#: 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:317 finishopenidlogin.php:407
+#: finishopenidlogin.php:363 finishopenidlogin.php:449
 msgid "Stored OpenID not found."
 msgstr "Збережений OpenID не знайдено."
 
 #. TRANS: OpenID plugin server error.
-#: finishopenidlogin.php:327
+#: finishopenidlogin.php:373
 msgid "Creating new account for OpenID that already has a user."
 msgstr "Створення нового акаунту для OpenID користувачем, який вже існує."
 
 #. TRANS: OpenID plugin message.
-#: finishopenidlogin.php:395
+#: 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:415
+#: finishopenidlogin.php:457
 msgid "Error connecting user to OpenID."
 msgstr "Помилка при підключенні користувача до OpenID."
 
diff --git a/plugins/OpenX/locale/OpenX.pot b/plugins/OpenX/locale/OpenX.pot
index f009b94b63..563968ff02 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/OpenX/locale/br/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/br/LC_MESSAGES/OpenX.po
index 79c92a0429..3d7bb6c1c3 100644
--- a/plugins/OpenX/locale/br/LC_MESSAGES/OpenX.po
+++ b/plugins/OpenX/locale/br/LC_MESSAGES/OpenX.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OpenX to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Y-M D
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:32+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-openx\n"
diff --git a/plugins/OpenX/locale/de/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/de/LC_MESSAGES/OpenX.po
index d4db619c8c..ad61f93e9e 100644
--- a/plugins/OpenX/locale/de/LC_MESSAGES/OpenX.po
+++ b/plugins/OpenX/locale/de/LC_MESSAGES/OpenX.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OpenX to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:32+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-openx\n"
diff --git a/plugins/OpenX/locale/fr/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/fr/LC_MESSAGES/OpenX.po
index 5331127566..b8291f01aa 100644
--- a/plugins/OpenX/locale/fr/LC_MESSAGES/OpenX.po
+++ b/plugins/OpenX/locale/fr/LC_MESSAGES/OpenX.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OpenX to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Verdy p
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:32+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-openx\n"
diff --git a/plugins/OpenX/locale/ia/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/ia/LC_MESSAGES/OpenX.po
index 628e882ecb..9de743ab54 100644
--- a/plugins/OpenX/locale/ia/LC_MESSAGES/OpenX.po
+++ b/plugins/OpenX/locale/ia/LC_MESSAGES/OpenX.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OpenX to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:32+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-openx\n"
diff --git a/plugins/OpenX/locale/mk/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/mk/LC_MESSAGES/OpenX.po
index a3e4575398..53ff73403d 100644
--- a/plugins/OpenX/locale/mk/LC_MESSAGES/OpenX.po
+++ b/plugins/OpenX/locale/mk/LC_MESSAGES/OpenX.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OpenX to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:32+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-openx\n"
diff --git a/plugins/OpenX/locale/nl/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/nl/LC_MESSAGES/OpenX.po
index 1db37009d3..61ada44462 100644
--- a/plugins/OpenX/locale/nl/LC_MESSAGES/OpenX.po
+++ b/plugins/OpenX/locale/nl/LC_MESSAGES/OpenX.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OpenX to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:32+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-openx\n"
diff --git a/plugins/OpenX/locale/uk/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/uk/LC_MESSAGES/OpenX.po
index 3cf99f5e61..3b2a1fee72 100644
--- a/plugins/OpenX/locale/uk/LC_MESSAGES/OpenX.po
+++ b/plugins/OpenX/locale/uk/LC_MESSAGES/OpenX.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - OpenX to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OpenX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:32+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-openx\n"
diff --git a/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot b/plugins/PiwikAnalytics/locale/PiwikAnalytics.pot
index a3e5f54cbe..558ca758ac 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/de/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/de/LC_MESSAGES/PiwikAnalytics.po
index c73407ae89..ffadde96d2 100644
--- a/plugins/PiwikAnalytics/locale/de/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/de/LC_MESSAGES/PiwikAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PiwikAnalytics to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:45+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
diff --git a/plugins/PiwikAnalytics/locale/es/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/es/LC_MESSAGES/PiwikAnalytics.po
index 8969a3ca49..7454146330 100644
--- a/plugins/PiwikAnalytics/locale/es/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/es/LC_MESSAGES/PiwikAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PiwikAnalytics to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:45+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
diff --git a/plugins/PiwikAnalytics/locale/fr/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/fr/LC_MESSAGES/PiwikAnalytics.po
index 1d0eac8831..6ce1287253 100644
--- a/plugins/PiwikAnalytics/locale/fr/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/fr/LC_MESSAGES/PiwikAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PiwikAnalytics to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Verdy p
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:45+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:50: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: 2010-11-29 19:44:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
diff --git a/plugins/PiwikAnalytics/locale/he/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/he/LC_MESSAGES/PiwikAnalytics.po
index 91b1c100ad..52000944a6 100644
--- a/plugins/PiwikAnalytics/locale/he/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/he/LC_MESSAGES/PiwikAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PiwikAnalytics to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:45+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
diff --git a/plugins/PiwikAnalytics/locale/ia/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/ia/LC_MESSAGES/PiwikAnalytics.po
index 421a47fcdd..ba001e9e32 100644
--- a/plugins/PiwikAnalytics/locale/ia/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/ia/LC_MESSAGES/PiwikAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PiwikAnalytics to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:45+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
diff --git a/plugins/PiwikAnalytics/locale/id/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/id/LC_MESSAGES/PiwikAnalytics.po
index d0f05868d6..bda548a8f8 100644
--- a/plugins/PiwikAnalytics/locale/id/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/id/LC_MESSAGES/PiwikAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PiwikAnalytics to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:45+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
diff --git a/plugins/PiwikAnalytics/locale/mk/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/mk/LC_MESSAGES/PiwikAnalytics.po
index 4eda923b9e..fc3f991883 100644
--- a/plugins/PiwikAnalytics/locale/mk/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/mk/LC_MESSAGES/PiwikAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PiwikAnalytics to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:46+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
diff --git a/plugins/PiwikAnalytics/locale/nb/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/nb/LC_MESSAGES/PiwikAnalytics.po
index f5573748dd..04ea51b77f 100644
--- a/plugins/PiwikAnalytics/locale/nb/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/nb/LC_MESSAGES/PiwikAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PiwikAnalytics to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:46+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
diff --git a/plugins/PiwikAnalytics/locale/nl/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/nl/LC_MESSAGES/PiwikAnalytics.po
index fc932b2a1e..41d784ee4f 100644
--- a/plugins/PiwikAnalytics/locale/nl/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/nl/LC_MESSAGES/PiwikAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PiwikAnalytics to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:46+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
diff --git a/plugins/PiwikAnalytics/locale/pt_BR/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/pt_BR/LC_MESSAGES/PiwikAnalytics.po
index 27ca358c33..f2c84a4252 100644
--- a/plugins/PiwikAnalytics/locale/pt_BR/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/pt_BR/LC_MESSAGES/PiwikAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PiwikAnalytics to Brazilian Portuguese (Português do Brasil)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Giro720
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:46+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
diff --git a/plugins/PiwikAnalytics/locale/ru/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/ru/LC_MESSAGES/PiwikAnalytics.po
index 2de2d9079c..0a50fb26c7 100644
--- a/plugins/PiwikAnalytics/locale/ru/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/ru/LC_MESSAGES/PiwikAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PiwikAnalytics to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Eleferen
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:46+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
diff --git a/plugins/PiwikAnalytics/locale/tl/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/tl/LC_MESSAGES/PiwikAnalytics.po
index 72ba73df8f..4bdbf978a4 100644
--- a/plugins/PiwikAnalytics/locale/tl/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/tl/LC_MESSAGES/PiwikAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PiwikAnalytics to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:46+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
diff --git a/plugins/PiwikAnalytics/locale/uk/LC_MESSAGES/PiwikAnalytics.po b/plugins/PiwikAnalytics/locale/uk/LC_MESSAGES/PiwikAnalytics.po
index b42bdefc73..48d3deaac3 100644
--- a/plugins/PiwikAnalytics/locale/uk/LC_MESSAGES/PiwikAnalytics.po
+++ b/plugins/PiwikAnalytics/locale/uk/LC_MESSAGES/PiwikAnalytics.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PiwikAnalytics to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PiwikAnalytics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:46+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:27+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-piwikanalytics\n"
diff --git a/plugins/PostDebug/locale/PostDebug.pot b/plugins/PostDebug/locale/PostDebug.pot
index 0605ce1e22..6af8be92f7 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/de/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/de/LC_MESSAGES/PostDebug.po
index eb06ad8820..87f0664bac 100644
--- a/plugins/PostDebug/locale/de/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/de/LC_MESSAGES/PostDebug.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PostDebug to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:46+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
diff --git a/plugins/PostDebug/locale/es/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/es/LC_MESSAGES/PostDebug.po
index 574366a891..d9de419fca 100644
--- a/plugins/PostDebug/locale/es/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/es/LC_MESSAGES/PostDebug.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PostDebug to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:46+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
diff --git a/plugins/PostDebug/locale/fi/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/fi/LC_MESSAGES/PostDebug.po
index ab1fceb744..9c62b0e6c5 100644
--- a/plugins/PostDebug/locale/fi/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/fi/LC_MESSAGES/PostDebug.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PostDebug to Finnish (Suomi)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nike
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:46+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
diff --git a/plugins/PostDebug/locale/fr/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/fr/LC_MESSAGES/PostDebug.po
index a76e57a216..3bdfc01a8b 100644
--- a/plugins/PostDebug/locale/fr/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/fr/LC_MESSAGES/PostDebug.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PostDebug to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:46+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
diff --git a/plugins/PostDebug/locale/he/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/he/LC_MESSAGES/PostDebug.po
index c849269dda..6c7fbb7fa7 100644
--- a/plugins/PostDebug/locale/he/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/he/LC_MESSAGES/PostDebug.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PostDebug to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:46+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
diff --git a/plugins/PostDebug/locale/ia/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/ia/LC_MESSAGES/PostDebug.po
index d257149b60..bcae7eb3ff 100644
--- a/plugins/PostDebug/locale/ia/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/ia/LC_MESSAGES/PostDebug.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PostDebug to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:46+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
diff --git a/plugins/PostDebug/locale/id/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/id/LC_MESSAGES/PostDebug.po
index d96a36835f..231e6fb5eb 100644
--- a/plugins/PostDebug/locale/id/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/id/LC_MESSAGES/PostDebug.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PostDebug to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:46+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
diff --git a/plugins/PostDebug/locale/ja/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/ja/LC_MESSAGES/PostDebug.po
index bc99bba497..4829274e99 100644
--- a/plugins/PostDebug/locale/ja/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/ja/LC_MESSAGES/PostDebug.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PostDebug to Japanese (日本語)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: 青子守歌
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:46+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
diff --git a/plugins/PostDebug/locale/mk/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/mk/LC_MESSAGES/PostDebug.po
index 4fac0f3df4..7649ed9bf5 100644
--- a/plugins/PostDebug/locale/mk/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/mk/LC_MESSAGES/PostDebug.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PostDebug to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:46+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
diff --git a/plugins/PostDebug/locale/nb/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/nb/LC_MESSAGES/PostDebug.po
index 0429c6f179..15b53ba4b5 100644
--- a/plugins/PostDebug/locale/nb/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/nb/LC_MESSAGES/PostDebug.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PostDebug to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:46+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:09+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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
diff --git a/plugins/PostDebug/locale/nl/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/nl/LC_MESSAGES/PostDebug.po
index 151c432919..a46ab0b6f5 100644
--- a/plugins/PostDebug/locale/nl/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/nl/LC_MESSAGES/PostDebug.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PostDebug to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:46+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
diff --git a/plugins/PostDebug/locale/pt_BR/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/pt_BR/LC_MESSAGES/PostDebug.po
index 1a653d793e..a41a1dcec3 100644
--- a/plugins/PostDebug/locale/pt_BR/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/pt_BR/LC_MESSAGES/PostDebug.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PostDebug to Brazilian Portuguese (Português do Brasil)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Giro720
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:46+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:09+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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
diff --git a/plugins/PostDebug/locale/ru/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/ru/LC_MESSAGES/PostDebug.po
index 0def7ae175..22eae3d23b 100644
--- a/plugins/PostDebug/locale/ru/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/ru/LC_MESSAGES/PostDebug.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PostDebug to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Lockal
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:46+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:09+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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
diff --git a/plugins/PostDebug/locale/tl/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/tl/LC_MESSAGES/PostDebug.po
index ee127f500a..858ee6d876 100644
--- a/plugins/PostDebug/locale/tl/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/tl/LC_MESSAGES/PostDebug.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PostDebug to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:46+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
diff --git a/plugins/PostDebug/locale/uk/LC_MESSAGES/PostDebug.po b/plugins/PostDebug/locale/uk/LC_MESSAGES/PostDebug.po
index e26741ecd6..6e658b8e28 100644
--- a/plugins/PostDebug/locale/uk/LC_MESSAGES/PostDebug.po
+++ b/plugins/PostDebug/locale/uk/LC_MESSAGES/PostDebug.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PostDebug to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PostDebug\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:46+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-postdebug\n"
diff --git a/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot b/plugins/PoweredByStatusNet/locale/PoweredByStatusNet.pot
index b63fae65e6..76a68fa0b8 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/br/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/br/LC_MESSAGES/PoweredByStatusNet.po
index 484232e105..e7ebb9f0b5 100644
--- a/plugins/PoweredByStatusNet/locale/br/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/br/LC_MESSAGES/PoweredByStatusNet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PoweredByStatusNet to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Y-M D
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:10+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: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
diff --git a/plugins/PoweredByStatusNet/locale/ca/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/ca/LC_MESSAGES/PoweredByStatusNet.po
index 8ae39b7109..98899a6dbd 100644
--- a/plugins/PoweredByStatusNet/locale/ca/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/ca/LC_MESSAGES/PoweredByStatusNet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PoweredByStatusNet to Catalan (Català)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Toniher
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-POT-Import-Date: 2011-01-10 18:26:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
diff --git a/plugins/PoweredByStatusNet/locale/de/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/de/LC_MESSAGES/PoweredByStatusNet.po
index 2061d4dcd6..a2ed49e81e 100644
--- a/plugins/PoweredByStatusNet/locale/de/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/de/LC_MESSAGES/PoweredByStatusNet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PoweredByStatusNet to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:10+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
diff --git a/plugins/PoweredByStatusNet/locale/fr/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/fr/LC_MESSAGES/PoweredByStatusNet.po
index f77732355d..9c1c8b8ce3 100644
--- a/plugins/PoweredByStatusNet/locale/fr/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/fr/LC_MESSAGES/PoweredByStatusNet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PoweredByStatusNet to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # Author: Verdy p
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
diff --git a/plugins/PoweredByStatusNet/locale/gl/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/gl/LC_MESSAGES/PoweredByStatusNet.po
index 52355f6d16..08eb06f795 100644
--- a/plugins/PoweredByStatusNet/locale/gl/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/gl/LC_MESSAGES/PoweredByStatusNet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PoweredByStatusNet to Galician (Galego)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Toliño
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:10+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: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
diff --git a/plugins/PoweredByStatusNet/locale/ia/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/ia/LC_MESSAGES/PoweredByStatusNet.po
index 82bf7f843a..494094a222 100644
--- a/plugins/PoweredByStatusNet/locale/ia/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/ia/LC_MESSAGES/PoweredByStatusNet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PoweredByStatusNet to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
diff --git a/plugins/PoweredByStatusNet/locale/mk/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/mk/LC_MESSAGES/PoweredByStatusNet.po
index a3e112ae7e..4b27988224 100644
--- a/plugins/PoweredByStatusNet/locale/mk/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/mk/LC_MESSAGES/PoweredByStatusNet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PoweredByStatusNet to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
diff --git a/plugins/PoweredByStatusNet/locale/nl/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/nl/LC_MESSAGES/PoweredByStatusNet.po
index b792395c0e..1bc1bfc395 100644
--- a/plugins/PoweredByStatusNet/locale/nl/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/nl/LC_MESSAGES/PoweredByStatusNet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PoweredByStatusNet to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
diff --git a/plugins/PoweredByStatusNet/locale/pt/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/pt/LC_MESSAGES/PoweredByStatusNet.po
index 6d54c5a0b8..ec8fe51bf4 100644
--- a/plugins/PoweredByStatusNet/locale/pt/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/pt/LC_MESSAGES/PoweredByStatusNet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PoweredByStatusNet to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Waldir
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:10+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: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
diff --git a/plugins/PoweredByStatusNet/locale/ru/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/ru/LC_MESSAGES/PoweredByStatusNet.po
index 3f4f317892..ae8ad077cc 100644
--- a/plugins/PoweredByStatusNet/locale/ru/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/ru/LC_MESSAGES/PoweredByStatusNet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PoweredByStatusNet to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: MaxSem
 # Author: Александр Сигачёв
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:26:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
diff --git a/plugins/PoweredByStatusNet/locale/tl/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/tl/LC_MESSAGES/PoweredByStatusNet.po
index de02d367b8..f7462a8f94 100644
--- a/plugins/PoweredByStatusNet/locale/tl/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/tl/LC_MESSAGES/PoweredByStatusNet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PoweredByStatusNet to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
diff --git a/plugins/PoweredByStatusNet/locale/uk/LC_MESSAGES/PoweredByStatusNet.po b/plugins/PoweredByStatusNet/locale/uk/LC_MESSAGES/PoweredByStatusNet.po
index 60bdaa7b3b..0702a2f656 100644
--- a/plugins/PoweredByStatusNet/locale/uk/LC_MESSAGES/PoweredByStatusNet.po
+++ b/plugins/PoweredByStatusNet/locale/uk/LC_MESSAGES/PoweredByStatusNet.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PoweredByStatusNet to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PoweredByStatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-poweredbystatusnet\n"
diff --git a/plugins/PtitUrl/locale/PtitUrl.pot b/plugins/PtitUrl/locale/PtitUrl.pot
index 879c9013b8..9ae2aacbbd 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/br/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/br/LC_MESSAGES/PtitUrl.po
index ac61652791..415c46dd73 100644
--- a/plugins/PtitUrl/locale/br/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/br/LC_MESSAGES/PtitUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PtitUrl to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Fulup
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
diff --git a/plugins/PtitUrl/locale/de/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/de/LC_MESSAGES/PtitUrl.po
index c75ec0f47c..4f20edd7df 100644
--- a/plugins/PtitUrl/locale/de/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/de/LC_MESSAGES/PtitUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PtitUrl to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
diff --git a/plugins/PtitUrl/locale/es/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/es/LC_MESSAGES/PtitUrl.po
index ffa13df1fa..62bce6570c 100644
--- a/plugins/PtitUrl/locale/es/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/es/LC_MESSAGES/PtitUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PtitUrl to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
diff --git a/plugins/PtitUrl/locale/fr/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/fr/LC_MESSAGES/PtitUrl.po
index 74c20085dd..12be41ec1d 100644
--- a/plugins/PtitUrl/locale/fr/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/fr/LC_MESSAGES/PtitUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PtitUrl to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
diff --git a/plugins/PtitUrl/locale/gl/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/gl/LC_MESSAGES/PtitUrl.po
index dca828d6cd..54e492c54a 100644
--- a/plugins/PtitUrl/locale/gl/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/gl/LC_MESSAGES/PtitUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PtitUrl to Galician (Galego)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Toliño
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:26:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
diff --git a/plugins/PtitUrl/locale/he/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/he/LC_MESSAGES/PtitUrl.po
index 1e1ff41c17..75e502c1c0 100644
--- a/plugins/PtitUrl/locale/he/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/he/LC_MESSAGES/PtitUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PtitUrl to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
diff --git a/plugins/PtitUrl/locale/ia/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/ia/LC_MESSAGES/PtitUrl.po
index 31ff74fbb4..b34aacf2ba 100644
--- a/plugins/PtitUrl/locale/ia/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/ia/LC_MESSAGES/PtitUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PtitUrl to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
diff --git a/plugins/PtitUrl/locale/ja/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/ja/LC_MESSAGES/PtitUrl.po
index 9a75756410..c0c6b50b97 100644
--- a/plugins/PtitUrl/locale/ja/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/ja/LC_MESSAGES/PtitUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PtitUrl to Japanese (日本語)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: 青子守歌
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:11+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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
diff --git a/plugins/PtitUrl/locale/mk/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/mk/LC_MESSAGES/PtitUrl.po
index d4fbd22a8b..9c6ed47b0e 100644
--- a/plugins/PtitUrl/locale/mk/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/mk/LC_MESSAGES/PtitUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PtitUrl to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
diff --git a/plugins/PtitUrl/locale/nb/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/nb/LC_MESSAGES/PtitUrl.po
index d28ce29a74..aed44c9db9 100644
--- a/plugins/PtitUrl/locale/nb/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/nb/LC_MESSAGES/PtitUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PtitUrl to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:11+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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
diff --git a/plugins/PtitUrl/locale/nl/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/nl/LC_MESSAGES/PtitUrl.po
index e59887b2dd..6e85bb42a8 100644
--- a/plugins/PtitUrl/locale/nl/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/nl/LC_MESSAGES/PtitUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PtitUrl to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
diff --git a/plugins/PtitUrl/locale/pt/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/pt/LC_MESSAGES/PtitUrl.po
index e3a1753c93..2bebc30d98 100644
--- a/plugins/PtitUrl/locale/pt/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/pt/LC_MESSAGES/PtitUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PtitUrl to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: GTNS
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:11+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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
diff --git a/plugins/PtitUrl/locale/pt_BR/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/pt_BR/LC_MESSAGES/PtitUrl.po
index afeab5f1ce..c30dcd7a5a 100644
--- a/plugins/PtitUrl/locale/pt_BR/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/pt_BR/LC_MESSAGES/PtitUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PtitUrl to Brazilian Portuguese (Português do Brasil)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Giro720
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:48+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:11+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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
diff --git a/plugins/PtitUrl/locale/ru/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/ru/LC_MESSAGES/PtitUrl.po
index 0398301001..27f0d87f13 100644
--- a/plugins/PtitUrl/locale/ru/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/ru/LC_MESSAGES/PtitUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PtitUrl to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Eleferen
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:48+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:11+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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
diff --git a/plugins/PtitUrl/locale/tl/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/tl/LC_MESSAGES/PtitUrl.po
index f3977faeb4..963fa6037d 100644
--- a/plugins/PtitUrl/locale/tl/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/tl/LC_MESSAGES/PtitUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PtitUrl to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:48+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
diff --git a/plugins/PtitUrl/locale/uk/LC_MESSAGES/PtitUrl.po b/plugins/PtitUrl/locale/uk/LC_MESSAGES/PtitUrl.po
index 81251a8442..81f8d26224 100644
--- a/plugins/PtitUrl/locale/uk/LC_MESSAGES/PtitUrl.po
+++ b/plugins/PtitUrl/locale/uk/LC_MESSAGES/PtitUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - PtitUrl to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - PtitUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:48+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-ptiturl\n"
diff --git a/plugins/RSSCloud/locale/RSSCloud.pot b/plugins/RSSCloud/locale/RSSCloud.pot
index 637f35bf16..e97026e1ea 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/RSSCloud/locale/fr/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/fr/LC_MESSAGES/RSSCloud.po
index 621efb7a4c..58520bb59f 100644
--- a/plugins/RSSCloud/locale/fr/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/fr/LC_MESSAGES/RSSCloud.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - RSSCloud to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Verdy p
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:52+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
diff --git a/plugins/RSSCloud/locale/ia/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/ia/LC_MESSAGES/RSSCloud.po
index 8c389e03fc..d23c7b2028 100644
--- a/plugins/RSSCloud/locale/ia/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/ia/LC_MESSAGES/RSSCloud.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - RSSCloud to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:52+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
diff --git a/plugins/RSSCloud/locale/mk/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/mk/LC_MESSAGES/RSSCloud.po
index 25355f70ad..6d02d5933e 100644
--- a/plugins/RSSCloud/locale/mk/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/mk/LC_MESSAGES/RSSCloud.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - RSSCloud to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:52+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
diff --git a/plugins/RSSCloud/locale/nl/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/nl/LC_MESSAGES/RSSCloud.po
index e98c3e0acf..b8a8e300f2 100644
--- a/plugins/RSSCloud/locale/nl/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/nl/LC_MESSAGES/RSSCloud.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - RSSCloud to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:52+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
diff --git a/plugins/RSSCloud/locale/tl/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/tl/LC_MESSAGES/RSSCloud.po
index e6536a5d64..4a8d9d844d 100644
--- a/plugins/RSSCloud/locale/tl/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/tl/LC_MESSAGES/RSSCloud.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - RSSCloud to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:52+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
diff --git a/plugins/RSSCloud/locale/uk/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/uk/LC_MESSAGES/RSSCloud.po
index 898f6d3f77..97a2548769 100644
--- a/plugins/RSSCloud/locale/uk/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/uk/LC_MESSAGES/RSSCloud.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - RSSCloud to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:52+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
diff --git a/plugins/Realtime/locale/Realtime.pot b/plugins/Realtime/locale/Realtime.pot
index 755f2f3556..8142b2f7b0 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/Realtime/locale/af/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/af/LC_MESSAGES/Realtime.po
index ecec7872da..17160d942b 100644
--- a/plugins/Realtime/locale/af/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/af/LC_MESSAGES/Realtime.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Realtime to Afrikaans (Afrikaans)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Naudefj
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:48+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:12+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: 2010-11-29 19:44:32+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: af\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
diff --git a/plugins/Realtime/locale/br/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/br/LC_MESSAGES/Realtime.po
index 61ccd8f1a8..a00de6fb23 100644
--- a/plugins/Realtime/locale/br/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/br/LC_MESSAGES/Realtime.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Realtime to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Y-M D
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:48+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:32+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
diff --git a/plugins/Realtime/locale/ca/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/ca/LC_MESSAGES/Realtime.po
index 85581557d5..59193cf28e 100644
--- a/plugins/Realtime/locale/ca/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/ca/LC_MESSAGES/Realtime.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Realtime to Catalan (Català)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Toniher
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:54+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-01-10 18:26:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
diff --git a/plugins/Realtime/locale/fr/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/fr/LC_MESSAGES/Realtime.po
index 8af47e749a..5657a32516 100644
--- a/plugins/Realtime/locale/fr/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/fr/LC_MESSAGES/Realtime.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Realtime to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:48+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-POT-Import-Date: 2010-11-29 19:44:32+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
diff --git a/plugins/Realtime/locale/ia/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/ia/LC_MESSAGES/Realtime.po
index 977e63e1b8..1089753097 100644
--- a/plugins/Realtime/locale/ia/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/ia/LC_MESSAGES/Realtime.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Realtime to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:48+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:32+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
diff --git a/plugins/Realtime/locale/mk/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/mk/LC_MESSAGES/Realtime.po
index 72d9ee54e2..e01767e97b 100644
--- a/plugins/Realtime/locale/mk/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/mk/LC_MESSAGES/Realtime.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Realtime to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:48+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:32+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
diff --git a/plugins/Realtime/locale/ne/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/ne/LC_MESSAGES/Realtime.po
index e9ceda9ce9..4b37193306 100644
--- a/plugins/Realtime/locale/ne/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/ne/LC_MESSAGES/Realtime.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Realtime to Nepali (नेपाली)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bhawani Gautam Rhk
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:12+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: 2010-11-29 19:44:32+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ne\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
diff --git a/plugins/Realtime/locale/nl/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/nl/LC_MESSAGES/Realtime.po
index 4f07eeffe2..0e8cf32832 100644
--- a/plugins/Realtime/locale/nl/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/nl/LC_MESSAGES/Realtime.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Realtime to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:32+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
diff --git a/plugins/Realtime/locale/tr/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/tr/LC_MESSAGES/Realtime.po
index acfe42813a..1331993240 100644
--- a/plugins/Realtime/locale/tr/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/tr/LC_MESSAGES/Realtime.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Realtime to Turkish (Türkçe)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Maidis
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:12+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: 2010-11-29 19:44:32+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
diff --git a/plugins/Realtime/locale/uk/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/uk/LC_MESSAGES/Realtime.po
index 92b6342d16..ac14280b9e 100644
--- a/plugins/Realtime/locale/uk/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/uk/LC_MESSAGES/Realtime.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Realtime to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:32+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-15 11:02:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
diff --git a/plugins/Recaptcha/locale/Recaptcha.pot b/plugins/Recaptcha/locale/Recaptcha.pot
index 9494f54996..586d674b8b 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/de/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/de/LC_MESSAGES/Recaptcha.po
index e176dcb6c2..9b6617e00a 100644
--- a/plugins/Recaptcha/locale/de/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/de/LC_MESSAGES/Recaptcha.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Recaptcha to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Apmon
 # Author: The Evil IP address
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
diff --git a/plugins/Recaptcha/locale/fr/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/fr/LC_MESSAGES/Recaptcha.po
index 2e3aacc7dd..ef6f6d698b 100644
--- a/plugins/Recaptcha/locale/fr/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/fr/LC_MESSAGES/Recaptcha.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Recaptcha to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # Author: Verdy p
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
diff --git a/plugins/Recaptcha/locale/ia/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/ia/LC_MESSAGES/Recaptcha.po
index 2a3c95dde3..ebc7f9a8d8 100644
--- a/plugins/Recaptcha/locale/ia/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/ia/LC_MESSAGES/Recaptcha.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Recaptcha to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
diff --git a/plugins/Recaptcha/locale/mk/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/mk/LC_MESSAGES/Recaptcha.po
index d5f4601bc9..87edf870bf 100644
--- a/plugins/Recaptcha/locale/mk/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/mk/LC_MESSAGES/Recaptcha.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Recaptcha to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
diff --git a/plugins/Recaptcha/locale/nb/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/nb/LC_MESSAGES/Recaptcha.po
index 942a57d6ea..a4b71eefba 100644
--- a/plugins/Recaptcha/locale/nb/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/nb/LC_MESSAGES/Recaptcha.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Recaptcha to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
diff --git a/plugins/Recaptcha/locale/nl/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/nl/LC_MESSAGES/Recaptcha.po
index 60548b537a..435261b706 100644
--- a/plugins/Recaptcha/locale/nl/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/nl/LC_MESSAGES/Recaptcha.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Recaptcha to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
diff --git a/plugins/Recaptcha/locale/pt/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/pt/LC_MESSAGES/Recaptcha.po
index 1f259b1cab..14a18d2bf5 100644
--- a/plugins/Recaptcha/locale/pt/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/pt/LC_MESSAGES/Recaptcha.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Recaptcha to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: GTNS
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
diff --git a/plugins/Recaptcha/locale/ru/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/ru/LC_MESSAGES/Recaptcha.po
index 8fcd9bac00..f8b78b2d53 100644
--- a/plugins/Recaptcha/locale/ru/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/ru/LC_MESSAGES/Recaptcha.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Recaptcha to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Eleferen
 # Author: MaxSem
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:49+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
diff --git a/plugins/Recaptcha/locale/tl/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/tl/LC_MESSAGES/Recaptcha.po
index d8490c1331..906688e5ab 100644
--- a/plugins/Recaptcha/locale/tl/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/tl/LC_MESSAGES/Recaptcha.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Recaptcha to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:50+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
diff --git a/plugins/Recaptcha/locale/uk/LC_MESSAGES/Recaptcha.po b/plugins/Recaptcha/locale/uk/LC_MESSAGES/Recaptcha.po
index 4c7cfda688..ed848d5076 100644
--- a/plugins/Recaptcha/locale/uk/LC_MESSAGES/Recaptcha.po
+++ b/plugins/Recaptcha/locale/uk/LC_MESSAGES/Recaptcha.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Recaptcha to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Recaptcha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:50+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:51+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-recaptcha\n"
diff --git a/plugins/RegisterThrottle/locale/RegisterThrottle.pot b/plugins/RegisterThrottle/locale/RegisterThrottle.pot
index f5bfd954fa..d8a5fdce31 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-22 14:50+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/RegisterThrottle/locale/de/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/de/LC_MESSAGES/RegisterThrottle.po
index 8dc9ff8b30..543dc825e5 100644
--- a/plugins/RegisterThrottle/locale/de/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/de/LC_MESSAGES/RegisterThrottle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - RegisterThrottle to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:01:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
@@ -37,6 +37,3 @@ 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."
-
-#~ msgid "Cannot find user after successful registration."
-#~ msgstr "Kann Benutzer nach erfolgreicher Registrierung nicht finden."
diff --git a/plugins/RegisterThrottle/locale/fr/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/fr/LC_MESSAGES/RegisterThrottle.po
index 6f5774f079..a4883015ed 100644
--- a/plugins/RegisterThrottle/locale/fr/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/fr/LC_MESSAGES/RegisterThrottle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - RegisterThrottle to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # Author: Verdy p
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:01:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
@@ -39,6 +39,3 @@ 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."
-
-#~ msgid "Cannot find user after successful registration."
-#~ msgstr "Impossible de trouver l’utilisateur après un enregistrement réussi."
diff --git a/plugins/RegisterThrottle/locale/ia/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/ia/LC_MESSAGES/RegisterThrottle.po
index 0720574e22..679ddfc7af 100644
--- a/plugins/RegisterThrottle/locale/ia/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/ia/LC_MESSAGES/RegisterThrottle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - RegisterThrottle to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:01:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
@@ -36,6 +36,3 @@ 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."
-
-#~ msgid "Cannot find user after successful registration."
-#~ msgstr "Non pote trovar usator post registration succedite."
diff --git a/plugins/RegisterThrottle/locale/mk/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/mk/LC_MESSAGES/RegisterThrottle.po
index 7011380d38..f16f19eb57 100644
--- a/plugins/RegisterThrottle/locale/mk/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/mk/LC_MESSAGES/RegisterThrottle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - RegisterThrottle to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:01:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
@@ -36,6 +36,3 @@ msgstr "Од оваа адреса се регистрирал забранет
 #: RegisterThrottlePlugin.php:220
 msgid "Throttles excessive registration from a single IP address."
 msgstr "Истиснува прекумерни регистрации од една IP-адреса."
-
-#~ msgid "Cannot find user after successful registration."
-#~ msgstr "Не можам да го пронајдам корисникот по успешната регистрација."
diff --git a/plugins/RegisterThrottle/locale/nl/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/nl/LC_MESSAGES/RegisterThrottle.po
index 0f90a2420b..6511fa207b 100644
--- a/plugins/RegisterThrottle/locale/nl/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/nl/LC_MESSAGES/RegisterThrottle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - RegisterThrottle to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # Author: Siebrand
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:01:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
@@ -37,6 +37,3 @@ 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."
-
-#~ msgid "Cannot find user after successful registration."
-#~ msgstr "Het was niet mogelijk de gebruiker te vinden na registratie."
diff --git a/plugins/RegisterThrottle/locale/tl/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/tl/LC_MESSAGES/RegisterThrottle.po
index ae7c980e36..cc6f8f7f26 100644
--- a/plugins/RegisterThrottle/locale/tl/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/tl/LC_MESSAGES/RegisterThrottle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - RegisterThrottle to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:01:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
@@ -38,7 +38,3 @@ msgid "Throttles excessive registration from a single IP address."
 msgstr ""
 "Naglilipat-lipat ng labis na pagpapatala mula sa isang nag-iisang tirahan ng "
 "IP."
-
-#~ msgid "Cannot find user after successful registration."
-#~ msgstr ""
-#~ "Hindi matagpuan ang tagagamit pagkatapos ng matagumpay na pagpapatala."
diff --git a/plugins/RegisterThrottle/locale/uk/LC_MESSAGES/RegisterThrottle.po b/plugins/RegisterThrottle/locale/uk/LC_MESSAGES/RegisterThrottle.po
index 7d2920b0ea..0fcaa61ca2 100644
--- a/plugins/RegisterThrottle/locale/uk/LC_MESSAGES/RegisterThrottle.po
+++ b/plugins/RegisterThrottle/locale/uk/LC_MESSAGES/RegisterThrottle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - RegisterThrottle to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # Author: Тест
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RegisterThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:01:21+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-registerthrottle\n"
@@ -38,6 +38,3 @@ msgstr "Заблокований користувач був зареєстро
 #: RegisterThrottlePlugin.php:220
 msgid "Throttles excessive registration from a single IP address."
 msgstr "Цей додаток обмежує кількість реєстрацій з певної IP-адреси."
-
-#~ msgid "Cannot find user after successful registration."
-#~ msgstr "Не вдається знайти користувача після успішної реєстрації."
diff --git a/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot b/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot
index 54f14322b2..ad649a48f5 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/de/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/de/LC_MESSAGES/RequireValidatedEmail.po
index 8c7717224f..9a8592833a 100644
--- a/plugins/RequireValidatedEmail/locale/de/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/de/LC_MESSAGES/RequireValidatedEmail.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - RequireValidatedEmail to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
diff --git a/plugins/RequireValidatedEmail/locale/fr/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/fr/LC_MESSAGES/RequireValidatedEmail.po
index 5ae5ddba34..52fdd017f6 100644
--- a/plugins/RequireValidatedEmail/locale/fr/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/fr/LC_MESSAGES/RequireValidatedEmail.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - RequireValidatedEmail to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
diff --git a/plugins/RequireValidatedEmail/locale/ia/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/ia/LC_MESSAGES/RequireValidatedEmail.po
index 5a9b6e2370..ed108a1af2 100644
--- a/plugins/RequireValidatedEmail/locale/ia/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/ia/LC_MESSAGES/RequireValidatedEmail.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - RequireValidatedEmail to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
diff --git a/plugins/RequireValidatedEmail/locale/mk/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/mk/LC_MESSAGES/RequireValidatedEmail.po
index 23a621e504..2d0d29947e 100644
--- a/plugins/RequireValidatedEmail/locale/mk/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/mk/LC_MESSAGES/RequireValidatedEmail.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - RequireValidatedEmail to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
diff --git a/plugins/RequireValidatedEmail/locale/nl/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/nl/LC_MESSAGES/RequireValidatedEmail.po
index 3d2a0a8a1c..759cf1a9aa 100644
--- a/plugins/RequireValidatedEmail/locale/nl/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/nl/LC_MESSAGES/RequireValidatedEmail.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - RequireValidatedEmail to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
diff --git a/plugins/RequireValidatedEmail/locale/tl/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/tl/LC_MESSAGES/RequireValidatedEmail.po
index 307ab477df..c227afae63 100644
--- a/plugins/RequireValidatedEmail/locale/tl/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/tl/LC_MESSAGES/RequireValidatedEmail.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - RequireValidatedEmail to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
diff --git a/plugins/RequireValidatedEmail/locale/uk/LC_MESSAGES/RequireValidatedEmail.po b/plugins/RequireValidatedEmail/locale/uk/LC_MESSAGES/RequireValidatedEmail.po
index e169b5c3ef..d7f09a1a9e 100644
--- a/plugins/RequireValidatedEmail/locale/uk/LC_MESSAGES/RequireValidatedEmail.po
+++ b/plugins/RequireValidatedEmail/locale/uk/LC_MESSAGES/RequireValidatedEmail.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - RequireValidatedEmail to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RequireValidatedEmail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:44:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-requirevalidatedemail\n"
diff --git a/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot b/plugins/ReverseUsernameAuthentication/locale/ReverseUsernameAuthentication.pot
index e7910f367c..9569292f2e 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/fr/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/fr/LC_MESSAGES/ReverseUsernameAuthentication.po
index 6fa649a7cb..c8bae42542 100644
--- a/plugins/ReverseUsernameAuthentication/locale/fr/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/fr/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ReverseUsernameAuthentication to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-10-29 16:14:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 ffd96f3b76..49d7869a1b 100644
--- a/plugins/ReverseUsernameAuthentication/locale/he/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/he/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ReverseUsernameAuthentication to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-10-29 16:14:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 632e54e456..42e44d79a4 100644
--- a/plugins/ReverseUsernameAuthentication/locale/ia/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/ia/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ReverseUsernameAuthentication to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-10-29 16:14:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 30f06eec86..c3774052df 100644
--- a/plugins/ReverseUsernameAuthentication/locale/id/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/id/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ReverseUsernameAuthentication to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-10-29 16:14:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 68eab95e90..110ebe128a 100644
--- a/plugins/ReverseUsernameAuthentication/locale/ja/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/ja/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ReverseUsernameAuthentication to Japanese (日本語)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: 青子守歌
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:17+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: 2010-10-29 16:14:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 f792c87bf0..8cb5a2d759 100644
--- a/plugins/ReverseUsernameAuthentication/locale/mk/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/mk/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ReverseUsernameAuthentication to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-10-29 16:14:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 b469abf7f7..627fbe3c9a 100644
--- a/plugins/ReverseUsernameAuthentication/locale/nb/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/nb/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ReverseUsernameAuthentication to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-10-29 16:14:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 db5dbed349..2ede8a8a57 100644
--- a/plugins/ReverseUsernameAuthentication/locale/nl/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/nl/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ReverseUsernameAuthentication to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-10-29 16:14:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 ce95f05f9e..acde74d108 100644
--- a/plugins/ReverseUsernameAuthentication/locale/ru/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/ru/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ReverseUsernameAuthentication to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Александр Сигачёв
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-10-29 16:14:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 c0413eb770..ec2644fa3c 100644
--- a/plugins/ReverseUsernameAuthentication/locale/tl/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/tl/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ReverseUsernameAuthentication to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-10-29 16:14:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 7eb5d47b41..db9a4ac680 100644
--- a/plugins/ReverseUsernameAuthentication/locale/uk/LC_MESSAGES/ReverseUsernameAuthentication.po
+++ b/plugins/ReverseUsernameAuthentication/locale/uk/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ReverseUsernameAuthentication to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ReverseUsernameAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:51+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-10-29 16:14:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 c4f85c6fa1..371977335b 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-14 23:32+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/ia/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/ia/LC_MESSAGES/SQLProfile.po
index d07d0aa7bb..98018ec23d 100644
--- a/plugins/SQLProfile/locale/ia/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/ia/LC_MESSAGES/SQLProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SQLProfile to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:03+0000\n"
-"PO-Revision-Date: 2011-01-20 19:08:00+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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 23:56:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\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-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 55f4b91403..055548a804 100644
--- a/plugins/SQLProfile/locale/mk/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/mk/LC_MESSAGES/SQLProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SQLProfile to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:03+0000\n"
-"PO-Revision-Date: 2011-01-20 19:08:00+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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 23:56:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\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-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 01e689d3f6..bd447788f8 100644
--- a/plugins/SQLProfile/locale/nl/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/nl/LC_MESSAGES/SQLProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SQLProfile to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:03+0000\n"
-"PO-Revision-Date: 2011-01-20 19:08:00+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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 23:56:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\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-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/ru/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/ru/LC_MESSAGES/SQLProfile.po
index 47bfc8ae30..7bc8b6ce0d 100644
--- a/plugins/SQLProfile/locale/ru/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/ru/LC_MESSAGES/SQLProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SQLProfile to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Александр Сигачёв
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:01:33+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-20 20:16:03+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\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-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 5912676be1..8af513f1e6 100644
--- a/plugins/SQLProfile/locale/uk/LC_MESSAGES/SQLProfile.po
+++ b/plugins/SQLProfile/locale/uk/LC_MESSAGES/SQLProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SQLProfile to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SQLProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-20 19:03+0000\n"
-"PO-Revision-Date: 2011-01-20 19:08:00+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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 23:56:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80631); Translate extension (2010-09-17)\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-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 752c6be903..b62608bf6d 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/Sample/locale/br/LC_MESSAGES/Sample.po b/plugins/Sample/locale/br/LC_MESSAGES/Sample.po
index c151776a2f..7a698b3da7 100644
--- a/plugins/Sample/locale/br/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/br/LC_MESSAGES/Sample.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Sample to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Y-M D
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 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-01-10 18:27:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
diff --git a/plugins/Sample/locale/de/LC_MESSAGES/Sample.po b/plugins/Sample/locale/de/LC_MESSAGES/Sample.po
index 23d0dd2a4a..9c9cb9aa5a 100644
--- a/plugins/Sample/locale/de/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/de/LC_MESSAGES/Sample.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Sample to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 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-01-10 18:27:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
diff --git a/plugins/Sample/locale/fr/LC_MESSAGES/Sample.po b/plugins/Sample/locale/fr/LC_MESSAGES/Sample.po
index db71535751..19d96b389d 100644
--- a/plugins/Sample/locale/fr/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/fr/LC_MESSAGES/Sample.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Sample to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Verdy p
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 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-01-10 18:27:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
diff --git a/plugins/Sample/locale/ia/LC_MESSAGES/Sample.po b/plugins/Sample/locale/ia/LC_MESSAGES/Sample.po
index d5610e981b..2572ae96d4 100644
--- a/plugins/Sample/locale/ia/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/ia/LC_MESSAGES/Sample.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Sample to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 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-01-10 18:27:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
diff --git a/plugins/Sample/locale/lb/LC_MESSAGES/Sample.po b/plugins/Sample/locale/lb/LC_MESSAGES/Sample.po
index 5729117fbb..5467937337 100644
--- a/plugins/Sample/locale/lb/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/lb/LC_MESSAGES/Sample.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Sample to Luxembourgish (Lëtzebuergesch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Robby
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:20+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: 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-01-10 18:27:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: lb\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
diff --git a/plugins/Sample/locale/mk/LC_MESSAGES/Sample.po b/plugins/Sample/locale/mk/LC_MESSAGES/Sample.po
index d7f0b0c946..0c6cc43831 100644
--- a/plugins/Sample/locale/mk/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/mk/LC_MESSAGES/Sample.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Sample to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 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-01-10 18:27:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
diff --git a/plugins/Sample/locale/nl/LC_MESSAGES/Sample.po b/plugins/Sample/locale/nl/LC_MESSAGES/Sample.po
index 5aa4ae182b..58d4fc3b0b 100644
--- a/plugins/Sample/locale/nl/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/nl/LC_MESSAGES/Sample.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Sample to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 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-01-10 18:27:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
diff --git a/plugins/Sample/locale/ru/LC_MESSAGES/Sample.po b/plugins/Sample/locale/ru/LC_MESSAGES/Sample.po
index 5becd1eee7..93ed517321 100644
--- a/plugins/Sample/locale/ru/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/ru/LC_MESSAGES/Sample.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Sample to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Eleferen
 # Author: MaxSem
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 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-01-10 18:27:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
diff --git a/plugins/Sample/locale/tl/LC_MESSAGES/Sample.po b/plugins/Sample/locale/tl/LC_MESSAGES/Sample.po
index 83184c3289..9da38e48f3 100644
--- a/plugins/Sample/locale/tl/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/tl/LC_MESSAGES/Sample.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Sample to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 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-01-10 18:27:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
diff --git a/plugins/Sample/locale/uk/LC_MESSAGES/Sample.po b/plugins/Sample/locale/uk/LC_MESSAGES/Sample.po
index ba0e49251b..29b133c7ac 100644
--- a/plugins/Sample/locale/uk/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/uk/LC_MESSAGES/Sample.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Sample to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 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-01-10 18:27:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
diff --git a/plugins/Sample/locale/zh_CN/LC_MESSAGES/Sample.po b/plugins/Sample/locale/zh_CN/LC_MESSAGES/Sample.po
index 36a32f080f..0255e7f6d7 100644
--- a/plugins/Sample/locale/zh_CN/LC_MESSAGES/Sample.po
+++ b/plugins/Sample/locale/zh_CN/LC_MESSAGES/Sample.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Sample to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: ZhengYiFeng
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sample\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:53+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 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-01-10 18:27:21+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-sample\n"
diff --git a/plugins/ShareNotice/locale/ShareNotice.pot b/plugins/ShareNotice/locale/ShareNotice.pot
index 81a93100a9..8b70031faa 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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 d93572bae7..6a03590ef0 100644
--- a/plugins/ShareNotice/locale/br/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/br/LC_MESSAGES/ShareNotice.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ShareNotice to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Y-M D
 # --
@@ -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-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 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-01-14 13:21:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
diff --git a/plugins/ShareNotice/locale/ca/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/ca/LC_MESSAGES/ShareNotice.po
index 1f4701818c..d50ff1b56c 100644
--- a/plugins/ShareNotice/locale/ca/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/ca/LC_MESSAGES/ShareNotice.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ShareNotice to Catalan (Català)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Toniher
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - ShareNotice\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:00+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 a1ba2a5901..3775f4536b 100644
--- a/plugins/ShareNotice/locale/de/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/de/LC_MESSAGES/ShareNotice.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ShareNotice to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -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-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 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-01-14 13:21:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
diff --git a/plugins/ShareNotice/locale/fr/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/fr/LC_MESSAGES/ShareNotice.po
index c0c5cf6010..23aff854c8 100644
--- a/plugins/ShareNotice/locale/fr/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/fr/LC_MESSAGES/ShareNotice.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ShareNotice to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -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-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 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-01-14 13:21:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
diff --git a/plugins/ShareNotice/locale/ia/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/ia/LC_MESSAGES/ShareNotice.po
index 80d08dcd4e..a393f975fe 100644
--- a/plugins/ShareNotice/locale/ia/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/ia/LC_MESSAGES/ShareNotice.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ShareNotice to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -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-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 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-01-14 13:21:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
diff --git a/plugins/ShareNotice/locale/mk/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/mk/LC_MESSAGES/ShareNotice.po
index 71aa5bd83b..a6d1a8d74b 100644
--- a/plugins/ShareNotice/locale/mk/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/mk/LC_MESSAGES/ShareNotice.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ShareNotice to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -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-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 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-01-14 13:21:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
diff --git a/plugins/ShareNotice/locale/nl/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/nl/LC_MESSAGES/ShareNotice.po
index 4926ee81f4..ac88030296 100644
--- a/plugins/ShareNotice/locale/nl/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/nl/LC_MESSAGES/ShareNotice.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ShareNotice to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: SPQRobin
 # Author: Siebrand
@@ -10,13 +10,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-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 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-01-14 13:21:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
diff --git a/plugins/ShareNotice/locale/tl/LC_MESSAGES/ShareNotice.po b/plugins/ShareNotice/locale/tl/LC_MESSAGES/ShareNotice.po
index 8d723e36f9..7086b5fe58 100644
--- a/plugins/ShareNotice/locale/tl/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/tl/LC_MESSAGES/ShareNotice.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ShareNotice to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -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-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 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-01-14 13:21:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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 35b43b6a54..1b89f9d369 100644
--- a/plugins/ShareNotice/locale/uk/LC_MESSAGES/ShareNotice.po
+++ b/plugins/ShareNotice/locale/uk/LC_MESSAGES/ShareNotice.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - ShareNotice to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -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-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 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-01-14 13:21:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-sharenotice\n"
diff --git a/plugins/SimpleUrl/locale/SimpleUrl.pot b/plugins/SimpleUrl/locale/SimpleUrl.pot
index fdd4fb1c80..619ccab506 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/SimpleUrl/locale/br/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/br/LC_MESSAGES/SimpleUrl.po
index d8d2819c5d..377f6ad1dd 100644
--- a/plugins/SimpleUrl/locale/br/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/br/LC_MESSAGES/SimpleUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SimpleUrl to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Fulup
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:55+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:46:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
diff --git a/plugins/SimpleUrl/locale/de/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/de/LC_MESSAGES/SimpleUrl.po
index e5e6135a67..611a0033ce 100644
--- a/plugins/SimpleUrl/locale/de/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/de/LC_MESSAGES/SimpleUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SimpleUrl to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:55+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:22+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: 2010-11-29 19:46:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
diff --git a/plugins/SimpleUrl/locale/es/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/es/LC_MESSAGES/SimpleUrl.po
index 30473ed3d8..b598251c20 100644
--- a/plugins/SimpleUrl/locale/es/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/es/LC_MESSAGES/SimpleUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SimpleUrl to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:55+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:22+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: 2010-11-29 19:46:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
diff --git a/plugins/SimpleUrl/locale/fr/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/fr/LC_MESSAGES/SimpleUrl.po
index 1be855769b..f2f4557ac7 100644
--- a/plugins/SimpleUrl/locale/fr/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/fr/LC_MESSAGES/SimpleUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SimpleUrl to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:55+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:22+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-29 19:46:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
diff --git a/plugins/SimpleUrl/locale/gl/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/gl/LC_MESSAGES/SimpleUrl.po
index c83591c838..ba322a1059 100644
--- a/plugins/SimpleUrl/locale/gl/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/gl/LC_MESSAGES/SimpleUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SimpleUrl to Galician (Galego)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Toliño
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:01+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:22+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-10 18:27:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
diff --git a/plugins/SimpleUrl/locale/he/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/he/LC_MESSAGES/SimpleUrl.po
index ce42da3f35..20e7593339 100644
--- a/plugins/SimpleUrl/locale/he/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/he/LC_MESSAGES/SimpleUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SimpleUrl to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:55+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:22+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: 2010-11-29 19:46:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
diff --git a/plugins/SimpleUrl/locale/ia/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/ia/LC_MESSAGES/SimpleUrl.po
index 262d91fc26..9240485369 100644
--- a/plugins/SimpleUrl/locale/ia/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/ia/LC_MESSAGES/SimpleUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SimpleUrl to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:55+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:46:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
diff --git a/plugins/SimpleUrl/locale/id/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/id/LC_MESSAGES/SimpleUrl.po
index 1bce757856..6d041d853e 100644
--- a/plugins/SimpleUrl/locale/id/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/id/LC_MESSAGES/SimpleUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SimpleUrl to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:55+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:22+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: 2010-11-29 19:46:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
diff --git a/plugins/SimpleUrl/locale/ja/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/ja/LC_MESSAGES/SimpleUrl.po
index 2bf68a2fd3..9a0493dc2e 100644
--- a/plugins/SimpleUrl/locale/ja/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/ja/LC_MESSAGES/SimpleUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SimpleUrl to Japanese (日本語)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: 青子守歌
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:55+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:22+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: 2010-11-29 19:46:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
diff --git a/plugins/SimpleUrl/locale/mk/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/mk/LC_MESSAGES/SimpleUrl.po
index c37e49bf4c..e59c7e0e8d 100644
--- a/plugins/SimpleUrl/locale/mk/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/mk/LC_MESSAGES/SimpleUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SimpleUrl to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:55+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:46:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
diff --git a/plugins/SimpleUrl/locale/nb/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/nb/LC_MESSAGES/SimpleUrl.po
index bd6f379142..54ff57741d 100644
--- a/plugins/SimpleUrl/locale/nb/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/nb/LC_MESSAGES/SimpleUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SimpleUrl to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:55+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:22+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: 2010-11-29 19:46:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
diff --git a/plugins/SimpleUrl/locale/nl/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/nl/LC_MESSAGES/SimpleUrl.po
index c8999b3903..23a6e9e5eb 100644
--- a/plugins/SimpleUrl/locale/nl/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/nl/LC_MESSAGES/SimpleUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SimpleUrl to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:55+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:46:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
diff --git a/plugins/SimpleUrl/locale/pt/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/pt/LC_MESSAGES/SimpleUrl.po
index 2e89715823..35c390fad4 100644
--- a/plugins/SimpleUrl/locale/pt/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/pt/LC_MESSAGES/SimpleUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SimpleUrl to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Hamilton Abreu
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:55+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:46:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
diff --git a/plugins/SimpleUrl/locale/ru/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/ru/LC_MESSAGES/SimpleUrl.po
index 23fbf23744..1cc402f2c0 100644
--- a/plugins/SimpleUrl/locale/ru/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/ru/LC_MESSAGES/SimpleUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SimpleUrl to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Eleferen
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:55+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:46:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
diff --git a/plugins/SimpleUrl/locale/tl/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/tl/LC_MESSAGES/SimpleUrl.po
index 83ee3e13eb..cc8d9b6969 100644
--- a/plugins/SimpleUrl/locale/tl/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/tl/LC_MESSAGES/SimpleUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SimpleUrl to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:55+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:46:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
diff --git a/plugins/SimpleUrl/locale/uk/LC_MESSAGES/SimpleUrl.po b/plugins/SimpleUrl/locale/uk/LC_MESSAGES/SimpleUrl.po
index 51dbeecbe9..7eb81e90cc 100644
--- a/plugins/SimpleUrl/locale/uk/LC_MESSAGES/SimpleUrl.po
+++ b/plugins/SimpleUrl/locale/uk/LC_MESSAGES/SimpleUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SimpleUrl to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SimpleUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:55+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-29 19:46:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-simpleurl\n"
diff --git a/plugins/Sitemap/locale/Sitemap.pot b/plugins/Sitemap/locale/Sitemap.pot
index 7cbb8a938d..dd93aec724 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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 89b154d086..12a732a15b 100644
--- a/plugins/Sitemap/locale/br/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/br/LC_MESSAGES/Sitemap.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Sitemap to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Fulup
 # Author: Y-M D
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-07 21:21:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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/fr/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/fr/LC_MESSAGES/Sitemap.po
index 8c871c531d..19d1de0e91 100644
--- a/plugins/Sitemap/locale/fr/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/fr/LC_MESSAGES/Sitemap.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Sitemap to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-07 21:21:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 0ed373cc5f..c1973385c7 100644
--- a/plugins/Sitemap/locale/ia/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/ia/LC_MESSAGES/Sitemap.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Sitemap to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 23:32+0000\n"
-"PO-Revision-Date: 2011-01-14 23:37:09+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:22+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80343); Translate extension (2010-09-17)\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-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 6823695840..ac4d5021a9 100644
--- a/plugins/Sitemap/locale/mk/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/mk/LC_MESSAGES/Sitemap.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Sitemap to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-07 21:21:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 7970f9baa2..b671507e8c 100644
--- a/plugins/Sitemap/locale/nl/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/nl/LC_MESSAGES/Sitemap.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Sitemap to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-07 21:21:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 4b409e3f30..102e7a03ae 100644
--- a/plugins/Sitemap/locale/ru/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/ru/LC_MESSAGES/Sitemap.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Sitemap to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: MaxSem
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-07 21:21:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 6d4e2788a3..9fc3515525 100644
--- a/plugins/Sitemap/locale/tl/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/tl/LC_MESSAGES/Sitemap.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Sitemap to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-07 21:21:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 5ec8df8431..f3a66ab27f 100644
--- a/plugins/Sitemap/locale/uk/LC_MESSAGES/Sitemap.po
+++ b/plugins/Sitemap/locale/uk/LC_MESSAGES/Sitemap.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Sitemap to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Sitemap\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:56+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-07 21:21:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 e10bd78e13..7a4653f187 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/fr/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/fr/LC_MESSAGES/SlicedFavorites.po
index b08df82462..d0e4570908 100644
--- a/plugins/SlicedFavorites/locale/fr/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/fr/LC_MESSAGES/SlicedFavorites.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SlicedFavorites to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-10-29 16:14:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 c46e46b88b..a6e8b9b99c 100644
--- a/plugins/SlicedFavorites/locale/he/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/he/LC_MESSAGES/SlicedFavorites.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SlicedFavorites to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-10-29 16:14:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 839b9f74c1..b6ae67bc72 100644
--- a/plugins/SlicedFavorites/locale/ia/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/ia/LC_MESSAGES/SlicedFavorites.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SlicedFavorites to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-10-29 16:14:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 e905d925a6..60260aa298 100644
--- a/plugins/SlicedFavorites/locale/id/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/id/LC_MESSAGES/SlicedFavorites.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SlicedFavorites to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-10-29 16:14:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 b3ac6f9e73..91082170b7 100644
--- a/plugins/SlicedFavorites/locale/mk/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/mk/LC_MESSAGES/SlicedFavorites.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SlicedFavorites to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-10-29 16:14:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 d990e0790a..a0953c6b52 100644
--- a/plugins/SlicedFavorites/locale/nl/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/nl/LC_MESSAGES/SlicedFavorites.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SlicedFavorites to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-10-29 16:14:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 648b53ab7f..d9b1f50aab 100644
--- a/plugins/SlicedFavorites/locale/ru/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/ru/LC_MESSAGES/SlicedFavorites.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SlicedFavorites to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Александр Сигачёв
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-10-29 16:14:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 dee536d91c..c2f9c395a1 100644
--- a/plugins/SlicedFavorites/locale/tl/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/tl/LC_MESSAGES/SlicedFavorites.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SlicedFavorites to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-10-29 16:14:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 fcdd21897c..874656dd0e 100644
--- a/plugins/SlicedFavorites/locale/uk/LC_MESSAGES/SlicedFavorites.po
+++ b/plugins/SlicedFavorites/locale/uk/LC_MESSAGES/SlicedFavorites.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SlicedFavorites to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SlicedFavorites\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-10-29 16:14:05+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 2d603cb40f..2e7cd22704 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/fr/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/fr/LC_MESSAGES/SphinxSearch.po
index fea79e3bc4..164095c42a 100644
--- a/plugins/SphinxSearch/locale/fr/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/fr/LC_MESSAGES/SphinxSearch.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SphinxSearch to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:25+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2010-11-30 20:43:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 99d14e52d4..417a9a5dcc 100644
--- a/plugins/SphinxSearch/locale/ia/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/ia/LC_MESSAGES/SphinxSearch.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SphinxSearch to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 17efaab96f..375efdbf63 100644
--- a/plugins/SphinxSearch/locale/mk/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/mk/LC_MESSAGES/SphinxSearch.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SphinxSearch to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 9ddb37b19c..fa92094718 100644
--- a/plugins/SphinxSearch/locale/nl/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/nl/LC_MESSAGES/SphinxSearch.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SphinxSearch to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 67af7f623c..e8d8199a0a 100644
--- a/plugins/SphinxSearch/locale/ru/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/ru/LC_MESSAGES/SphinxSearch.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SphinxSearch to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: MaxSem
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 589aec9c82..3ad2f5b44c 100644
--- a/plugins/SphinxSearch/locale/tl/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/tl/LC_MESSAGES/SphinxSearch.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SphinxSearch to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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 3ba96c98df..772b593170 100644
--- a/plugins/SphinxSearch/locale/uk/LC_MESSAGES/SphinxSearch.po
+++ b/plugins/SphinxSearch/locale/uk/LC_MESSAGES/SphinxSearch.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SphinxSearch to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SphinxSearch\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:57+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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: 2010-11-30 20:43:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-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/SubMirror/locale/SubMirror.pot b/plugins/SubMirror/locale/SubMirror.pot
index 7635095721..6d67b02526 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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,16 +21,20 @@ msgid "Pull feeds into your timeline!"
 msgstr ""
 
 #. TRANS: SubMirror plugin menu item on user settings page.
-#: SubMirrorPlugin.php:109
+#: SubMirrorPlugin.php:110
 msgctxt "MENU"
 msgid "Mirroring"
 msgstr ""
 
 #. TRANS: SubMirror plugin tooltip for user settings menu item.
-#: SubMirrorPlugin.php:111
+#: 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:"
diff --git a/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po
index 34ecd07d99..cf43e65b0c 100644
--- a/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SubMirror to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Verdy p
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:05+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
@@ -26,16 +26,20 @@ 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:109
+#: SubMirrorPlugin.php:110
 msgctxt "MENU"
 msgid "Mirroring"
 msgstr "Mise en miroir"
 
 #. TRANS: SubMirror plugin tooltip for user settings menu item.
-#: SubMirrorPlugin.php:111
+#: 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 ""
+
 #: lib/editmirrorform.php:83
 msgctxt "LABEL"
 msgid "Remote feed:"
diff --git a/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po
index 82a256b4a3..97c0414183 100644
--- a/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SubMirror to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:05+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
@@ -26,16 +26,20 @@ msgid "Pull feeds into your timeline!"
 msgstr "Importar syndicationes in tu chronologia!"
 
 #. TRANS: SubMirror plugin menu item on user settings page.
-#: SubMirrorPlugin.php:109
+#: SubMirrorPlugin.php:110
 msgctxt "MENU"
 msgid "Mirroring"
 msgstr "Republication"
 
 #. TRANS: SubMirror plugin tooltip for user settings menu item.
-#: SubMirrorPlugin.php:111
+#: 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 ""
+
 #: lib/editmirrorform.php:83
 msgctxt "LABEL"
 msgid "Remote feed:"
diff --git a/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po
index c96e79d2ab..238dc1cfd6 100644
--- a/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SubMirror to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:05+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
@@ -26,16 +26,20 @@ msgid "Pull feeds into your timeline!"
 msgstr "Повлекувајте каналски емитувања во Вашата хронологија!"
 
 #. TRANS: SubMirror plugin menu item on user settings page.
-#: SubMirrorPlugin.php:109
+#: SubMirrorPlugin.php:110
 msgctxt "MENU"
 msgid "Mirroring"
 msgstr "Отсликување"
 
 #. TRANS: SubMirror plugin tooltip for user settings menu item.
-#: SubMirrorPlugin.php:111
+#: 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:"
diff --git a/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po
index 3cb01f9091..8ddfb28809 100644
--- a/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SubMirror to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:05+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
@@ -26,16 +26,20 @@ msgid "Pull feeds into your timeline!"
 msgstr "Neem feeds op in uw tijdlijn!"
 
 #. TRANS: SubMirror plugin menu item on user settings page.
-#: SubMirrorPlugin.php:109
+#: SubMirrorPlugin.php:110
 msgctxt "MENU"
 msgid "Mirroring"
 msgstr "Spiegelen"
 
 #. TRANS: SubMirror plugin tooltip for user settings menu item.
-#: SubMirrorPlugin.php:111
+#: 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 ""
+
 #: lib/editmirrorform.php:83
 msgctxt "LABEL"
 msgid "Remote feed:"
diff --git a/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po
index 80acc98723..8d0e19d59f 100644
--- a/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/tl/LC_MESSAGES/SubMirror.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SubMirror to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:05+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
@@ -26,16 +26,20 @@ 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:109
+#: SubMirrorPlugin.php:110
 msgctxt "MENU"
 msgid "Mirroring"
 msgstr "Sinasalamin"
 
 #. TRANS: SubMirror plugin tooltip for user settings menu item.
-#: SubMirrorPlugin.php:111
+#: 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:"
diff --git a/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po
index dbed72b95e..8cf9ed5795 100644
--- a/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SubMirror to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubMirror\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:05+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
@@ -27,16 +27,20 @@ msgid "Pull feeds into your timeline!"
 msgstr "Стягування веб-каналів до вашої стрічки повідомлень!"
 
 #. TRANS: SubMirror plugin menu item on user settings page.
-#: SubMirrorPlugin.php:109
+#: SubMirrorPlugin.php:110
 msgctxt "MENU"
 msgid "Mirroring"
 msgstr "Дзеркала"
 
 #. TRANS: SubMirror plugin tooltip for user settings menu item.
-#: SubMirrorPlugin.php:111
+#: 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:"
diff --git a/plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot b/plugins/SubscriptionThrottle/locale/SubscriptionThrottle.pot
index 4ab4414ad2..2f0d899fa7 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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 00ce5fc9a2..046355ce8d 100644
--- a/plugins/SubscriptionThrottle/locale/de/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/de/LC_MESSAGES/SubscriptionThrottle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SubscriptionThrottle to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:05+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 b5711bbfbe..e8b625d22e 100644
--- a/plugins/SubscriptionThrottle/locale/es/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/es/LC_MESSAGES/SubscriptionThrottle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SubscriptionThrottle to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 017c0f27d8..ac4dfc454b 100644
--- a/plugins/SubscriptionThrottle/locale/fr/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/fr/LC_MESSAGES/SubscriptionThrottle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SubscriptionThrottle to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Verdy p
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 b1a41a490d..c79910a646 100644
--- a/plugins/SubscriptionThrottle/locale/he/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/he/LC_MESSAGES/SubscriptionThrottle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SubscriptionThrottle to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 015f7a7fb0..75f9e172f1 100644
--- a/plugins/SubscriptionThrottle/locale/ia/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/ia/LC_MESSAGES/SubscriptionThrottle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SubscriptionThrottle to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 04640a625d..620aa93f61 100644
--- a/plugins/SubscriptionThrottle/locale/id/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/id/LC_MESSAGES/SubscriptionThrottle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SubscriptionThrottle to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 f572f8cae2..29d19a92dc 100644
--- a/plugins/SubscriptionThrottle/locale/mk/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/mk/LC_MESSAGES/SubscriptionThrottle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SubscriptionThrottle to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 75d4b93880..e2cf246393 100644
--- a/plugins/SubscriptionThrottle/locale/nb/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/nb/LC_MESSAGES/SubscriptionThrottle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SubscriptionThrottle to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 af8504c0b4..df43aacfbc 100644
--- a/plugins/SubscriptionThrottle/locale/nl/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/nl/LC_MESSAGES/SubscriptionThrottle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SubscriptionThrottle to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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/ru/LC_MESSAGES/SubscriptionThrottle.po b/plugins/SubscriptionThrottle/locale/ru/LC_MESSAGES/SubscriptionThrottle.po
index fd41c30ec2..fbf2f26088 100644
--- a/plugins/SubscriptionThrottle/locale/ru/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/ru/LC_MESSAGES/SubscriptionThrottle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SubscriptionThrottle to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Александр Сигачёв
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 9d3740b53c..df797f6d2a 100644
--- a/plugins/SubscriptionThrottle/locale/tl/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/tl/LC_MESSAGES/SubscriptionThrottle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SubscriptionThrottle to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 0d1d449bdb..0f94615875 100644
--- a/plugins/SubscriptionThrottle/locale/uk/LC_MESSAGES/SubscriptionThrottle.po
+++ b/plugins/SubscriptionThrottle/locale/uk/LC_MESSAGES/SubscriptionThrottle.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - SubscriptionThrottle to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - SubscriptionThrottle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 019adbc866..e71c4ac453 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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 71bb14bda6..4f40983024 100644
--- a/plugins/TabFocus/locale/br/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/br/LC_MESSAGES/TabFocus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TabFocus to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Y-M D
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:28+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:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 2b010fdbae..d19e40a685 100644
--- a/plugins/TabFocus/locale/es/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/es/LC_MESSAGES/TabFocus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TabFocus to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 26cde0c772..1bf8203c17 100644
--- a/plugins/TabFocus/locale/fr/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/fr/LC_MESSAGES/TabFocus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TabFocus to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Verdy p
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 c18bc34a0b..eeb5aa2a1f 100644
--- a/plugins/TabFocus/locale/gl/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/gl/LC_MESSAGES/TabFocus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TabFocus to Galician (Galego)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Toliño
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:28+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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 c771c70912..8febc9a078 100644
--- a/plugins/TabFocus/locale/he/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/he/LC_MESSAGES/TabFocus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TabFocus to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 de3b285adc..5bdc5cd0c1 100644
--- a/plugins/TabFocus/locale/ia/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/ia/LC_MESSAGES/TabFocus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TabFocus to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 108fa22d3e..2fb812e955 100644
--- a/plugins/TabFocus/locale/id/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/id/LC_MESSAGES/TabFocus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TabFocus to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 1774841cdf..07b09e6e08 100644
--- a/plugins/TabFocus/locale/mk/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/mk/LC_MESSAGES/TabFocus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TabFocus to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:49+0000\n"
-"PO-Revision-Date: 2011-01-22 15:01:38+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-14 13:22:18+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\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-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 cfee70343d..34d316b627 100644
--- a/plugins/TabFocus/locale/nb/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/nb/LC_MESSAGES/TabFocus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TabFocus to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 29f8b3aaf5..7036a81310 100644
--- a/plugins/TabFocus/locale/nl/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/nl/LC_MESSAGES/TabFocus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TabFocus to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # Author: Siebrand
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 9354eb21bf..75bf0b0db5 100644
--- a/plugins/TabFocus/locale/ru/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/ru/LC_MESSAGES/TabFocus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TabFocus to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Александр Сигачёв
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 8fe63b3cc0..9936069b63 100644
--- a/plugins/TabFocus/locale/tl/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/tl/LC_MESSAGES/TabFocus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TabFocus to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 8532106136..1b266717a5 100644
--- a/plugins/TabFocus/locale/uk/LC_MESSAGES/TabFocus.po
+++ b/plugins/TabFocus/locale/uk/LC_MESSAGES/TabFocus.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TabFocus to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TabFocus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:06+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 83e156af5b..98ca5fff4a 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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/TightUrl/locale/de/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/de/LC_MESSAGES/TightUrl.po
index f66930df46..02a4250edc 100644
--- a/plugins/TightUrl/locale/de/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/de/LC_MESSAGES/TightUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TightUrl to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TightUrl/locale/es/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/es/LC_MESSAGES/TightUrl.po
index f5ee7593ab..624c5d1a68 100644
--- a/plugins/TightUrl/locale/es/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/es/LC_MESSAGES/TightUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TightUrl to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TightUrl/locale/fr/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/fr/LC_MESSAGES/TightUrl.po
index e6e5e76349..d218d6da15 100644
--- a/plugins/TightUrl/locale/fr/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/fr/LC_MESSAGES/TightUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TightUrl to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TightUrl/locale/gl/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/gl/LC_MESSAGES/TightUrl.po
index 8d124cafaf..f896314996 100644
--- a/plugins/TightUrl/locale/gl/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/gl/LC_MESSAGES/TightUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TightUrl to Galician (Galego)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Toliño
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TightUrl/locale/he/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/he/LC_MESSAGES/TightUrl.po
index c630f07bdd..6288f004b5 100644
--- a/plugins/TightUrl/locale/he/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/he/LC_MESSAGES/TightUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TightUrl to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TightUrl/locale/ia/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/ia/LC_MESSAGES/TightUrl.po
index b98cdd10ed..f3c55bcf13 100644
--- a/plugins/TightUrl/locale/ia/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/ia/LC_MESSAGES/TightUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TightUrl to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TightUrl/locale/id/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/id/LC_MESSAGES/TightUrl.po
index 298e006f2b..7f3dd02230 100644
--- a/plugins/TightUrl/locale/id/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/id/LC_MESSAGES/TightUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TightUrl to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: id\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TightUrl/locale/ja/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/ja/LC_MESSAGES/TightUrl.po
index 7cca39df77..5c32337df2 100644
--- a/plugins/TightUrl/locale/ja/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/ja/LC_MESSAGES/TightUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TightUrl to Japanese (日本語)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: 青子守歌
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:29+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:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TightUrl/locale/mk/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/mk/LC_MESSAGES/TightUrl.po
index 7d383bca3c..b93768ae42 100644
--- a/plugins/TightUrl/locale/mk/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/mk/LC_MESSAGES/TightUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TightUrl to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TightUrl/locale/nb/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/nb/LC_MESSAGES/TightUrl.po
index fd0fbbfe8c..d1d48d6c76 100644
--- a/plugins/TightUrl/locale/nb/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/nb/LC_MESSAGES/TightUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TightUrl to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TightUrl/locale/nl/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/nl/LC_MESSAGES/TightUrl.po
index ee0f4c92a6..59924afad3 100644
--- a/plugins/TightUrl/locale/nl/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/nl/LC_MESSAGES/TightUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TightUrl to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TightUrl/locale/pt_BR/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/pt_BR/LC_MESSAGES/TightUrl.po
index 5292d16708..6445814d79 100644
--- a/plugins/TightUrl/locale/pt_BR/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/pt_BR/LC_MESSAGES/TightUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TightUrl to Brazilian Portuguese (Português do Brasil)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Giro720
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TightUrl/locale/ru/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/ru/LC_MESSAGES/TightUrl.po
index fb5a3a67b6..f304eeb7a7 100644
--- a/plugins/TightUrl/locale/ru/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/ru/LC_MESSAGES/TightUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TightUrl to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Александр Сигачёв
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TightUrl/locale/tl/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/tl/LC_MESSAGES/TightUrl.po
index f255eecc61..831413b2cd 100644
--- a/plugins/TightUrl/locale/tl/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/tl/LC_MESSAGES/TightUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TightUrl to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TightUrl/locale/uk/LC_MESSAGES/TightUrl.po b/plugins/TightUrl/locale/uk/LC_MESSAGES/TightUrl.po
index abf41e2df0..e94d099839 100644
--- a/plugins/TightUrl/locale/uk/LC_MESSAGES/TightUrl.po
+++ b/plugins/TightUrl/locale/uk/LC_MESSAGES/TightUrl.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TightUrl to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TightUrl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-tighturl\n"
diff --git a/plugins/TinyMCE/locale/TinyMCE.pot b/plugins/TinyMCE/locale/TinyMCE.pot
index 725dc0675a..76fa38cbf9 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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 2595824774..7da0ee58cb 100644
--- a/plugins/TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TinyMCE to Catalan (Català)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Toniher
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:29+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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:22:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po
index 3b35e68a19..47204bda03 100644
--- a/plugins/TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TinyMCE to Esperanto (Esperanto)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Eliovir
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:29+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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:22:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: eo\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po
index aa2175bf44..f49b5ddc6f 100644
--- a/plugins/TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TinyMCE to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:07+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:22:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po
index 5e7006f8b2..8a6ed2106f 100644
--- a/plugins/TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TinyMCE to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Verdy p
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:22:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po
index 9e90c8feb1..63b00f3e74 100644
--- a/plugins/TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TinyMCE to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:22:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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 19325a6e2c..48eead30f0 100644
--- a/plugins/TinyMCE/locale/ia/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/ia/LC_MESSAGES/TinyMCE.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TinyMCE to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:22:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po
index e0ef734cb8..e410f6ff10 100644
--- a/plugins/TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TinyMCE to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:22:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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 458058447a..eca025cd62 100644
--- a/plugins/TinyMCE/locale/mk/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/mk/LC_MESSAGES/TinyMCE.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TinyMCE to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:22:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po
index e5fd81129b..43ff3a9046 100644
--- a/plugins/TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TinyMCE to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:22:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po
index 0a528af6a9..62d3f521c5 100644
--- a/plugins/TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TinyMCE to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:22:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/pt_BR/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/pt_BR/LC_MESSAGES/TinyMCE.po
index edf1d8461f..7622a699ee 100644
--- a/plugins/TinyMCE/locale/pt_BR/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/pt_BR/LC_MESSAGES/TinyMCE.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TinyMCE to Brazilian Portuguese (Português do Brasil)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Giro720
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:22:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po
index e87596078d..341e79e8bd 100644
--- a/plugins/TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TinyMCE to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Александр Сигачёв
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:22:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po
index ed5a35b025..15abe9636b 100644
--- a/plugins/TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TinyMCE to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:22:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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 92f2c3011d..eb5729a26e 100644
--- a/plugins/TinyMCE/locale/uk/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/uk/LC_MESSAGES/TinyMCE.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TinyMCE to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-14 13:22:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-tinymce\n"
diff --git a/plugins/TwitterBridge/locale/TwitterBridge.pot b/plugins/TwitterBridge/locale/TwitterBridge.pot
index dc02c0154e..5f7fa1ab42 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-01-22 14:50+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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"
@@ -208,66 +208,66 @@ msgstr ""
 msgid "Create a new user with this nickname."
 msgstr ""
 
-#: twitterauthorization.php:386
+#: twitterauthorization.php:390
 msgid "New nickname"
 msgstr ""
 
-#: twitterauthorization.php:388
+#: twitterauthorization.php:392
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 
-#: twitterauthorization.php:391
+#: twitterauthorization.php:404
 msgid "Create"
 msgstr ""
 
-#: twitterauthorization.php:396
+#: twitterauthorization.php:409
 msgid "Connect existing account"
 msgstr ""
 
-#: twitterauthorization.php:398
+#: 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:401
+#: twitterauthorization.php:414
 msgid "Existing nickname"
 msgstr ""
 
-#: twitterauthorization.php:404
+#: twitterauthorization.php:417
 msgid "Password"
 msgstr ""
 
-#: twitterauthorization.php:407
+#: twitterauthorization.php:420
 msgid "Connect"
 msgstr ""
 
-#: twitterauthorization.php:427 twitterauthorization.php:436
+#: twitterauthorization.php:466 twitterauthorization.php:475
 msgid "Registration not allowed."
 msgstr ""
 
-#: twitterauthorization.php:443
+#: twitterauthorization.php:482
 msgid "Not a valid invitation code."
 msgstr ""
 
-#: twitterauthorization.php:456
+#: twitterauthorization.php:495
 msgid "Nickname not allowed."
 msgstr ""
 
-#: twitterauthorization.php:461
+#: twitterauthorization.php:500
 msgid "Nickname already in use. Try another one."
 msgstr ""
 
-#: twitterauthorization.php:476
+#: twitterauthorization.php:520
 msgid "Error registering user."
 msgstr ""
 
-#: twitterauthorization.php:487 twitterauthorization.php:527
-#: twitterauthorization.php:547
+#: twitterauthorization.php:531 twitterauthorization.php:571
+#: twitterauthorization.php:591
 msgid "Error connecting user to Twitter."
 msgstr ""
 
-#: twitterauthorization.php:509
+#: twitterauthorization.php:553
 msgid "Invalid username or password."
 msgstr ""
 
diff --git a/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po
index 49116b6544..2b9d999505 100644
--- a/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TwitterBridge to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Y-M D
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:01:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-15 11:02:42+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-22 19:30:56+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -213,66 +213,66 @@ msgstr "Krouiñ ur gont nevez"
 msgid "Create a new user with this nickname."
 msgstr "Krouiñ un implijer nevez gant al lesanv-se."
 
-#: twitterauthorization.php:386
+#: twitterauthorization.php:390
 msgid "New nickname"
 msgstr "Lesanv nevez"
 
-#: twitterauthorization.php:388
+#: twitterauthorization.php:392
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 
-#: twitterauthorization.php:391
+#: twitterauthorization.php:404
 msgid "Create"
 msgstr "Krouiñ"
 
-#: twitterauthorization.php:396
+#: twitterauthorization.php:409
 msgid "Connect existing account"
 msgstr "Kevreañ d'ur gont a zo dioutañ"
 
-#: twitterauthorization.php:398
+#: 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:401
+#: twitterauthorization.php:414
 msgid "Existing nickname"
 msgstr "Lesanv a zo dioutañ"
 
-#: twitterauthorization.php:404
+#: twitterauthorization.php:417
 msgid "Password"
 msgstr "Ger-tremen"
 
-#: twitterauthorization.php:407
+#: twitterauthorization.php:420
 msgid "Connect"
 msgstr "Kevreañ"
 
-#: twitterauthorization.php:427 twitterauthorization.php:436
+#: twitterauthorization.php:466 twitterauthorization.php:475
 msgid "Registration not allowed."
 msgstr "N'eo ket aotreet krouiñ kontoù."
 
-#: twitterauthorization.php:443
+#: twitterauthorization.php:482
 msgid "Not a valid invitation code."
 msgstr ""
 
-#: twitterauthorization.php:456
+#: twitterauthorization.php:495
 msgid "Nickname not allowed."
 msgstr "Lesanv nann-aotreet."
 
-#: twitterauthorization.php:461
+#: twitterauthorization.php:500
 msgid "Nickname already in use. Try another one."
 msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
 
-#: twitterauthorization.php:476
+#: twitterauthorization.php:520
 msgid "Error registering user."
 msgstr ""
 
-#: twitterauthorization.php:487 twitterauthorization.php:527
-#: twitterauthorization.php:547
+#: twitterauthorization.php:531 twitterauthorization.php:571
+#: twitterauthorization.php:591
 msgid "Error connecting user to Twitter."
 msgstr ""
 
-#: twitterauthorization.php:509
+#: twitterauthorization.php:553
 msgid "Invalid username or password."
 msgstr "Anv implijer pe ger-tremen direizh."
 
diff --git a/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po
index cb23b7a420..979270f17d 100644
--- a/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TwitterBridge to Catalan (Català)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Toniher
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:01:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:36+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-15 11:02:42+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-22 19:30:56+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -239,23 +239,23 @@ msgstr "Crea un compte nou"
 msgid "Create a new user with this nickname."
 msgstr "Crea un usuari nom amb aquest sobrenom."
 
-#: twitterauthorization.php:386
+#: twitterauthorization.php:390
 msgid "New nickname"
 msgstr "Nou sobrenom"
 
-#: twitterauthorization.php:388
+#: 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:391
+#: twitterauthorization.php:404
 msgid "Create"
 msgstr "Crea"
 
-#: twitterauthorization.php:396
+#: twitterauthorization.php:409
 msgid "Connect existing account"
 msgstr "Connecta un compte ja existent"
 
-#: twitterauthorization.php:398
+#: twitterauthorization.php:411
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Twitter account."
@@ -263,44 +263,44 @@ 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:401
+#: twitterauthorization.php:414
 msgid "Existing nickname"
 msgstr "Sobrenom ja existent"
 
-#: twitterauthorization.php:404
+#: twitterauthorization.php:417
 msgid "Password"
 msgstr "Contrasenya"
 
-#: twitterauthorization.php:407
+#: twitterauthorization.php:420
 msgid "Connect"
 msgstr "Connecta"
 
-#: twitterauthorization.php:427 twitterauthorization.php:436
+#: twitterauthorization.php:466 twitterauthorization.php:475
 msgid "Registration not allowed."
 msgstr "No es permet el registre."
 
-#: twitterauthorization.php:443
+#: twitterauthorization.php:482
 msgid "Not a valid invitation code."
 msgstr "No és un codi d'invitació vàlid."
 
-#: twitterauthorization.php:456
+#: twitterauthorization.php:495
 msgid "Nickname not allowed."
 msgstr "El sobrenom no és permès."
 
-#: twitterauthorization.php:461
+#: twitterauthorization.php:500
 msgid "Nickname already in use. Try another one."
 msgstr "El sobrenom ja és en ús. Proveu-ne un altre."
 
-#: twitterauthorization.php:476
+#: twitterauthorization.php:520
 msgid "Error registering user."
 msgstr "Error en registrar l'usuari."
 
-#: twitterauthorization.php:487 twitterauthorization.php:527
-#: twitterauthorization.php:547
+#: 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:509
+#: twitterauthorization.php:553
 msgid "Invalid username or password."
 msgstr "Nom d'usuari o contrasenya no vàlida."
 
diff --git a/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po
index 2b07bbce82..c1b24026fc 100644
--- a/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TwitterBridge to Persian (فارسی)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Mjbmr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:01:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:36+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-15 11:02:42+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-22 19:30:56+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fa\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -213,66 +213,66 @@ msgstr "ایجاد حساب کاربری جدید"
 msgid "Create a new user with this nickname."
 msgstr "ایجاد یک کاربر جدید با این نام مستعار."
 
-#: twitterauthorization.php:386
+#: twitterauthorization.php:390
 msgid "New nickname"
 msgstr "نام مستعار جدید"
 
-#: twitterauthorization.php:388
+#: twitterauthorization.php:392
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 
-#: twitterauthorization.php:391
+#: twitterauthorization.php:404
 msgid "Create"
 msgstr "ایجاد"
 
-#: twitterauthorization.php:396
+#: twitterauthorization.php:409
 msgid "Connect existing account"
 msgstr "اتصال به حساب کاربری موجود"
 
-#: twitterauthorization.php:398
+#: 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:401
+#: twitterauthorization.php:414
 msgid "Existing nickname"
 msgstr "نام مستعار موجود"
 
-#: twitterauthorization.php:404
+#: twitterauthorization.php:417
 msgid "Password"
 msgstr "رمز عبور"
 
-#: twitterauthorization.php:407
+#: twitterauthorization.php:420
 msgid "Connect"
 msgstr "اتصال"
 
-#: twitterauthorization.php:427 twitterauthorization.php:436
+#: twitterauthorization.php:466 twitterauthorization.php:475
 msgid "Registration not allowed."
 msgstr "اجازهٔ ثبت‌نام داده نشده است."
 
-#: twitterauthorization.php:443
+#: twitterauthorization.php:482
 msgid "Not a valid invitation code."
 msgstr "کد دعوت نامعتبر است."
 
-#: twitterauthorization.php:456
+#: twitterauthorization.php:495
 msgid "Nickname not allowed."
 msgstr "نام مستعار مجاز نیست."
 
-#: twitterauthorization.php:461
+#: twitterauthorization.php:500
 msgid "Nickname already in use. Try another one."
 msgstr "این نام مستعار در حال حاضر مورد استفاده است. یکی دیگر را بیازمایید."
 
-#: twitterauthorization.php:476
+#: twitterauthorization.php:520
 msgid "Error registering user."
 msgstr "خطا در ثبت نام کاربر."
 
-#: twitterauthorization.php:487 twitterauthorization.php:527
-#: twitterauthorization.php:547
+#: twitterauthorization.php:531 twitterauthorization.php:571
+#: twitterauthorization.php:591
 msgid "Error connecting user to Twitter."
 msgstr "خطا در اتصال کاربر به توییتر."
 
-#: twitterauthorization.php:509
+#: twitterauthorization.php:553
 msgid "Invalid username or password."
 msgstr "نام کاربری یا رمز عبور اشتباه است."
 
diff --git a/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po
index 53dbbcba3b..67ace72cf6 100644
--- a/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TwitterBridge to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # Author: Verdy p
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:01:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-15 11:02:42+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-22 19:30:56+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -243,23 +243,23 @@ msgstr "Créer un nouveau compte"
 msgid "Create a new user with this nickname."
 msgstr "Créer un nouvel utilisateur avec ce pseudonyme."
 
-#: twitterauthorization.php:386
+#: twitterauthorization.php:390
 msgid "New nickname"
 msgstr "Nouveau pseudonyme"
 
-#: twitterauthorization.php:388
+#: 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:391
+#: twitterauthorization.php:404
 msgid "Create"
 msgstr "Créer"
 
-#: twitterauthorization.php:396
+#: twitterauthorization.php:409
 msgid "Connect existing account"
 msgstr "Se connecter à un compte existant"
 
-#: twitterauthorization.php:398
+#: twitterauthorization.php:411
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Twitter account."
@@ -267,44 +267,44 @@ 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:401
+#: twitterauthorization.php:414
 msgid "Existing nickname"
 msgstr "Pseudonyme existant"
 
-#: twitterauthorization.php:404
+#: twitterauthorization.php:417
 msgid "Password"
 msgstr "Mot de passe"
 
-#: twitterauthorization.php:407
+#: twitterauthorization.php:420
 msgid "Connect"
 msgstr "Connexion"
 
-#: twitterauthorization.php:427 twitterauthorization.php:436
+#: twitterauthorization.php:466 twitterauthorization.php:475
 msgid "Registration not allowed."
 msgstr "Inscription non autorisée."
 
-#: twitterauthorization.php:443
+#: twitterauthorization.php:482
 msgid "Not a valid invitation code."
 msgstr "Le code d’invitation n’est pas valide."
 
-#: twitterauthorization.php:456
+#: twitterauthorization.php:495
 msgid "Nickname not allowed."
 msgstr "Pseudonyme non autorisé."
 
-#: twitterauthorization.php:461
+#: twitterauthorization.php:500
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonyme déjà utilisé. Essayez-en un autre."
 
-#: twitterauthorization.php:476
+#: twitterauthorization.php:520
 msgid "Error registering user."
 msgstr "Erreur lors de l’inscription de l’utilisateur."
 
-#: twitterauthorization.php:487 twitterauthorization.php:527
-#: twitterauthorization.php:547
+#: 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:509
+#: twitterauthorization.php:553
 msgid "Invalid username or password."
 msgstr "Nom d’utilisateur ou mot de passe incorrect."
 
diff --git a/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po
index c4f8cd4511..09f0842500 100644
--- a/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TwitterBridge to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:01:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-15 11:02:42+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-22 19:30:56+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -234,23 +234,23 @@ msgstr "Crear nove conto"
 msgid "Create a new user with this nickname."
 msgstr "Crear un nove usator con iste pseudonymo."
 
-#: twitterauthorization.php:386
+#: twitterauthorization.php:390
 msgid "New nickname"
 msgstr "Nove pseudonymo"
 
-#: twitterauthorization.php:388
+#: 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:391
+#: twitterauthorization.php:404
 msgid "Create"
 msgstr "Crear"
 
-#: twitterauthorization.php:396
+#: twitterauthorization.php:409
 msgid "Connect existing account"
 msgstr "Connecter conto existente"
 
-#: twitterauthorization.php:398
+#: twitterauthorization.php:411
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Twitter account."
@@ -258,44 +258,44 @@ 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:401
+#: twitterauthorization.php:414
 msgid "Existing nickname"
 msgstr "Pseudonymo existente"
 
-#: twitterauthorization.php:404
+#: twitterauthorization.php:417
 msgid "Password"
 msgstr "Contrasigno"
 
-#: twitterauthorization.php:407
+#: twitterauthorization.php:420
 msgid "Connect"
 msgstr "Connecter"
 
-#: twitterauthorization.php:427 twitterauthorization.php:436
+#: twitterauthorization.php:466 twitterauthorization.php:475
 msgid "Registration not allowed."
 msgstr "Creation de conto non permittite."
 
-#: twitterauthorization.php:443
+#: twitterauthorization.php:482
 msgid "Not a valid invitation code."
 msgstr "Le codice de invitation es invalide."
 
-#: twitterauthorization.php:456
+#: twitterauthorization.php:495
 msgid "Nickname not allowed."
 msgstr "Pseudonymo non permittite."
 
-#: twitterauthorization.php:461
+#: twitterauthorization.php:500
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonymo ja in uso. Proba un altere."
 
-#: twitterauthorization.php:476
+#: twitterauthorization.php:520
 msgid "Error registering user."
 msgstr "Error durante le registration del usator."
 
-#: twitterauthorization.php:487 twitterauthorization.php:527
-#: twitterauthorization.php:547
+#: 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:509
+#: twitterauthorization.php:553
 msgid "Invalid username or password."
 msgstr "Nomine de usator o contrasigno invalide."
 
diff --git a/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po
index eac1eba11e..bd7cf0c237 100644
--- a/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TwitterBridge to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:01:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-15 11:02:42+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-22 19:30:56+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -236,23 +236,23 @@ msgstr "Создај нова сметка"
 msgid "Create a new user with this nickname."
 msgstr "Создај нов корисник со овој прекар."
 
-#: twitterauthorization.php:386
+#: twitterauthorization.php:390
 msgid "New nickname"
 msgstr "Нов прекар"
 
-#: twitterauthorization.php:388
+#: twitterauthorization.php:392
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 мали букви или бројки, без интерпункциски знаци и празни места"
 
-#: twitterauthorization.php:391
+#: twitterauthorization.php:404
 msgid "Create"
 msgstr "Создај"
 
-#: twitterauthorization.php:396
+#: twitterauthorization.php:409
 msgid "Connect existing account"
 msgstr "Поврзи постоечка сметка"
 
-#: twitterauthorization.php:398
+#: twitterauthorization.php:411
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Twitter account."
@@ -260,44 +260,44 @@ msgstr ""
 "Ако веќе имате сметка, најавете се со корисничкото име и лозинката за да ја "
 "поврзете со профилот на Twitter."
 
-#: twitterauthorization.php:401
+#: twitterauthorization.php:414
 msgid "Existing nickname"
 msgstr "Постоечки прекар"
 
-#: twitterauthorization.php:404
+#: twitterauthorization.php:417
 msgid "Password"
 msgstr "Лозинка"
 
-#: twitterauthorization.php:407
+#: twitterauthorization.php:420
 msgid "Connect"
 msgstr "Поврзи се"
 
-#: twitterauthorization.php:427 twitterauthorization.php:436
+#: twitterauthorization.php:466 twitterauthorization.php:475
 msgid "Registration not allowed."
 msgstr "Регистрацијата не е дозволена."
 
-#: twitterauthorization.php:443
+#: twitterauthorization.php:482
 msgid "Not a valid invitation code."
 msgstr "Ова не е важечки код за покана."
 
-#: twitterauthorization.php:456
+#: twitterauthorization.php:495
 msgid "Nickname not allowed."
 msgstr "Прекарот не е дозволен."
 
-#: twitterauthorization.php:461
+#: twitterauthorization.php:500
 msgid "Nickname already in use. Try another one."
 msgstr "Прекарот е зафатен. Одберете друг."
 
-#: twitterauthorization.php:476
+#: twitterauthorization.php:520
 msgid "Error registering user."
 msgstr "Грешка при регистрирање на корисникот."
 
-#: twitterauthorization.php:487 twitterauthorization.php:527
-#: twitterauthorization.php:547
+#: twitterauthorization.php:531 twitterauthorization.php:571
+#: twitterauthorization.php:591
 msgid "Error connecting user to Twitter."
 msgstr "Грешка при поврзувањето на корисникот со Twitter."
 
-#: twitterauthorization.php:509
+#: twitterauthorization.php:553
 msgid "Invalid username or password."
 msgstr "Неважечко корисничко име или лозинка."
 
diff --git a/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po
index ab4b92a4b6..59a496cccb 100644
--- a/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TwitterBridge to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:01:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-15 11:02:42+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-22 19:30:56+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -241,23 +241,23 @@ msgstr "Nieuwe gebruiker aanmaken"
 msgid "Create a new user with this nickname."
 msgstr "Nieuwe gebruiker aanmaken met deze gebruikersnaam."
 
-#: twitterauthorization.php:386
+#: twitterauthorization.php:390
 msgid "New nickname"
 msgstr "Nieuwe gebruikersnaam"
 
-#: twitterauthorization.php:388
+#: 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:391
+#: twitterauthorization.php:404
 msgid "Create"
 msgstr "Aanmaken"
 
-#: twitterauthorization.php:396
+#: twitterauthorization.php:409
 msgid "Connect existing account"
 msgstr "Verbinden met een bestaande gebruiker"
 
-#: twitterauthorization.php:398
+#: twitterauthorization.php:411
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Twitter account."
@@ -265,45 +265,45 @@ 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:401
+#: twitterauthorization.php:414
 msgid "Existing nickname"
 msgstr "Bestaande gebruikersnaam"
 
-#: twitterauthorization.php:404
+#: twitterauthorization.php:417
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: twitterauthorization.php:407
+#: twitterauthorization.php:420
 msgid "Connect"
 msgstr "Koppelen"
 
-#: twitterauthorization.php:427 twitterauthorization.php:436
+#: twitterauthorization.php:466 twitterauthorization.php:475
 msgid "Registration not allowed."
 msgstr "Registratie is niet toegestaan."
 
-#: twitterauthorization.php:443
+#: twitterauthorization.php:482
 msgid "Not a valid invitation code."
 msgstr "De uitnodigingscode is ongeldig."
 
-#: twitterauthorization.php:456
+#: twitterauthorization.php:495
 msgid "Nickname not allowed."
 msgstr "Gebruikersnaam niet toegestaan."
 
-#: twitterauthorization.php:461
+#: 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:476
+#: twitterauthorization.php:520
 msgid "Error registering user."
 msgstr "Fout bij het registreren van de gebruiker."
 
-#: twitterauthorization.php:487 twitterauthorization.php:527
-#: twitterauthorization.php:547
+#: 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:509
+#: twitterauthorization.php:553
 msgid "Invalid username or password."
 msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
diff --git a/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po
index 28f190b3c3..4a702f844a 100644
--- a/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TwitterBridge to Turkish (Türkçe)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Maidis
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:01:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-15 11:02:42+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-22 19:30:56+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -218,25 +218,25 @@ 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."
 
-#: twitterauthorization.php:386
+#: twitterauthorization.php:390
 msgid "New nickname"
 msgstr "Yeni kullanıcı adı"
 
-#: twitterauthorization.php:388
+#: 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:391
+#: twitterauthorization.php:404
 msgid "Create"
 msgstr "Oluştur"
 
-#: twitterauthorization.php:396
+#: twitterauthorization.php:409
 msgid "Connect existing account"
 msgstr "Varolan hesaba bağlan"
 
-#: twitterauthorization.php:398
+#: twitterauthorization.php:411
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Twitter account."
@@ -244,44 +244,44 @@ 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:401
+#: twitterauthorization.php:414
 msgid "Existing nickname"
 msgstr "Varolan kullanıcı adı"
 
-#: twitterauthorization.php:404
+#: twitterauthorization.php:417
 msgid "Password"
 msgstr "Parola"
 
-#: twitterauthorization.php:407
+#: twitterauthorization.php:420
 msgid "Connect"
 msgstr "Bağlan"
 
-#: twitterauthorization.php:427 twitterauthorization.php:436
+#: twitterauthorization.php:466 twitterauthorization.php:475
 msgid "Registration not allowed."
 msgstr "Kayıt yapılmasına izin verilmiyor."
 
-#: twitterauthorization.php:443
+#: twitterauthorization.php:482
 msgid "Not a valid invitation code."
 msgstr "Geçerli bir davet kodu değil."
 
-#: twitterauthorization.php:456
+#: twitterauthorization.php:495
 msgid "Nickname not allowed."
 msgstr "Bu kullanıcı adına izin verilmiyor."
 
-#: twitterauthorization.php:461
+#: 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:476
+#: twitterauthorization.php:520
 msgid "Error registering user."
 msgstr "Kullanıcı kayıt hatası."
 
-#: twitterauthorization.php:487 twitterauthorization.php:527
-#: twitterauthorization.php:547
+#: 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:509
+#: twitterauthorization.php:553
 msgid "Invalid username or password."
 msgstr "Geçersiz kullanıcı adı veya parola."
 
diff --git a/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po
index 536ecb8429..5f81c11849 100644
--- a/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TwitterBridge to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:01:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-15 11:02:42+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-22 19:30:56+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -237,24 +237,24 @@ msgstr "Створити новий акаунт"
 msgid "Create a new user with this nickname."
 msgstr "Створити нового користувача з цим нікнеймом."
 
-#: twitterauthorization.php:386
+#: twitterauthorization.php:390
 msgid "New nickname"
 msgstr "Новий нікнейм"
 
-#: twitterauthorization.php:388
+#: twitterauthorization.php:392
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
 "1-64 літери нижнього регістру і цифри, ніякої пунктуації або інтервалів"
 
-#: twitterauthorization.php:391
+#: twitterauthorization.php:404
 msgid "Create"
 msgstr "Створити"
 
-#: twitterauthorization.php:396
+#: twitterauthorization.php:409
 msgid "Connect existing account"
 msgstr "Приєднати акаунт, який вже існує"
 
-#: twitterauthorization.php:398
+#: twitterauthorization.php:411
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your Twitter account."
@@ -262,44 +262,44 @@ msgstr ""
 "Якщо ви вже маєте акаунт, увійдіть з вашим ім’ям користувача та паролем, аби "
 "приєднати їх до Twitter."
 
-#: twitterauthorization.php:401
+#: twitterauthorization.php:414
 msgid "Existing nickname"
 msgstr "Нікнейм, який вже існує"
 
-#: twitterauthorization.php:404
+#: twitterauthorization.php:417
 msgid "Password"
 msgstr "Пароль"
 
-#: twitterauthorization.php:407
+#: twitterauthorization.php:420
 msgid "Connect"
 msgstr "Під’єднати"
 
-#: twitterauthorization.php:427 twitterauthorization.php:436
+#: twitterauthorization.php:466 twitterauthorization.php:475
 msgid "Registration not allowed."
 msgstr "Реєстрацію не дозволено."
 
-#: twitterauthorization.php:443
+#: twitterauthorization.php:482
 msgid "Not a valid invitation code."
 msgstr "Це не дійсний код запрошення."
 
-#: twitterauthorization.php:456
+#: twitterauthorization.php:495
 msgid "Nickname not allowed."
 msgstr "Нікнейм не допускається."
 
-#: twitterauthorization.php:461
+#: twitterauthorization.php:500
 msgid "Nickname already in use. Try another one."
 msgstr "Цей нікнейм вже використовується. Спробуйте інший."
 
-#: twitterauthorization.php:476
+#: twitterauthorization.php:520
 msgid "Error registering user."
 msgstr "Помилка при реєстрації користувача."
 
-#: twitterauthorization.php:487 twitterauthorization.php:527
-#: twitterauthorization.php:547
+#: twitterauthorization.php:531 twitterauthorization.php:571
+#: twitterauthorization.php:591
 msgid "Error connecting user to Twitter."
 msgstr "Помилка при підключенні користувача до Twitter."
 
-#: twitterauthorization.php:509
+#: twitterauthorization.php:553
 msgid "Invalid username or password."
 msgstr "Недійсне ім’я або пароль."
 
diff --git a/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po
index 7b694b2eb6..84feaae135 100644
--- a/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po
+++ b/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - TwitterBridge to Simplified Chinese (‪中文(简体)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: PhiLiP
 # Author: ZhengYiFeng
@@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TwitterBridge\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-22 14:50+0000\n"
-"PO-Revision-Date: 2011-01-22 15:01:47+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-01-15 11:02:42+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80746); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-22 19:30:56+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -230,66 +230,66 @@ msgstr "创建新帐户"
 msgid "Create a new user with this nickname."
 msgstr "以此昵称创建新帐户"
 
-#: twitterauthorization.php:386
+#: twitterauthorization.php:390
 msgid "New nickname"
 msgstr "新昵称"
 
-#: twitterauthorization.php:388
+#: twitterauthorization.php:392
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1 到 64 个小写字母或数字，不包含标点或空格"
 
-#: twitterauthorization.php:391
+#: twitterauthorization.php:404
 msgid "Create"
 msgstr "创建"
 
-#: twitterauthorization.php:396
+#: twitterauthorization.php:409
 msgid "Connect existing account"
 msgstr "关联现有账号"
 
-#: twitterauthorization.php:398
+#: 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:401
+#: twitterauthorization.php:414
 msgid "Existing nickname"
 msgstr "已存在的昵称"
 
-#: twitterauthorization.php:404
+#: twitterauthorization.php:417
 msgid "Password"
 msgstr "密码"
 
-#: twitterauthorization.php:407
+#: twitterauthorization.php:420
 msgid "Connect"
 msgstr "关联"
 
-#: twitterauthorization.php:427 twitterauthorization.php:436
+#: twitterauthorization.php:466 twitterauthorization.php:475
 msgid "Registration not allowed."
 msgstr "不允许注册。"
 
-#: twitterauthorization.php:443
+#: twitterauthorization.php:482
 msgid "Not a valid invitation code."
 msgstr "无效的邀请码。"
 
-#: twitterauthorization.php:456
+#: twitterauthorization.php:495
 msgid "Nickname not allowed."
 msgstr "昵称不被允许。"
 
-#: twitterauthorization.php:461
+#: twitterauthorization.php:500
 msgid "Nickname already in use. Try another one."
 msgstr "昵称已被使用，换一个吧。"
 
-#: twitterauthorization.php:476
+#: twitterauthorization.php:520
 msgid "Error registering user."
 msgstr "注册用户出错。"
 
-#: twitterauthorization.php:487 twitterauthorization.php:527
-#: twitterauthorization.php:547
+#: twitterauthorization.php:531 twitterauthorization.php:571
+#: twitterauthorization.php:591
 msgid "Error connecting user to Twitter."
 msgstr "关联用户到 Twitter 出错。"
 
-#: twitterauthorization.php:509
+#: twitterauthorization.php:553
 msgid "Invalid username or password."
 msgstr "用户名或密码不正确。"
 
diff --git a/plugins/UserFlag/locale/UserFlag.pot b/plugins/UserFlag/locale/UserFlag.pot
index 7251033c4b..5cd5ca7062 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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 c781665f88..e05b5a2375 100644
--- a/plugins/UserFlag/locale/ca/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/ca/LC_MESSAGES/UserFlag.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserFlag to Catalan (Català)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Toniher
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:38+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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 598792700b..ea9fce2479 100644
--- a/plugins/UserFlag/locale/fr/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/fr/LC_MESSAGES/UserFlag.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserFlag to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 1febf97e41..a25e411ab4 100644
--- a/plugins/UserFlag/locale/ia/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/ia/LC_MESSAGES/UserFlag.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserFlag to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 70145e6e38..8cc38e1e52 100644
--- a/plugins/UserFlag/locale/mk/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/mk/LC_MESSAGES/UserFlag.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserFlag to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 fe48fb507f..66595bfb94 100644
--- a/plugins/UserFlag/locale/nl/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/nl/LC_MESSAGES/UserFlag.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserFlag to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 0c3baec421..4749da312a 100644
--- a/plugins/UserFlag/locale/pt/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/pt/LC_MESSAGES/UserFlag.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserFlag to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: GTNS
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:38+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 6e20a1a182..2380541770 100644
--- a/plugins/UserFlag/locale/ru/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/ru/LC_MESSAGES/UserFlag.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserFlag to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Byulent
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 bec8593ea6..e72a05fd1a 100644
--- a/plugins/UserFlag/locale/uk/LC_MESSAGES/UserFlag.po
+++ b/plugins/UserFlag/locale/uk/LC_MESSAGES/UserFlag.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserFlag to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserFlag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:16+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:23+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 f4c14ae02d..92b4da5180 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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 3ffaf4e099..741323eab8 100644
--- a/plugins/UserLimit/locale/br/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/br/LC_MESSAGES/UserLimit.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserLimit to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Fulup
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-01-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 69dbc67a02..efa2dbec83 100644
--- a/plugins/UserLimit/locale/de/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/de/LC_MESSAGES/UserLimit.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserLimit to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:39+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:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 b429dd082c..23143bdc1d 100644
--- a/plugins/UserLimit/locale/es/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/es/LC_MESSAGES/UserLimit.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserLimit to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Translationista
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:39+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:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 fef8244207..9da37f1188 100644
--- a/plugins/UserLimit/locale/fi/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/fi/LC_MESSAGES/UserLimit.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserLimit to Finnish (Suomi)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Centerlink
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:39+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:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 0fe147a7b2..569a836ef0 100644
--- a/plugins/UserLimit/locale/fr/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/fr/LC_MESSAGES/UserLimit.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserLimit to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Verdy p
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 5d62775fa4..af6f4c2cd4 100644
--- a/plugins/UserLimit/locale/gl/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/gl/LC_MESSAGES/UserLimit.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserLimit to Galician (Galego)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Toliño
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:39+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-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 816c717483..856f57bf68 100644
--- a/plugins/UserLimit/locale/he/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/he/LC_MESSAGES/UserLimit.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserLimit to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:39+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:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 c0da2c4f05..443d2e8f28 100644
--- a/plugins/UserLimit/locale/ia/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/ia/LC_MESSAGES/UserLimit.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserLimit to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 a03021177c..c0474d0a39 100644
--- a/plugins/UserLimit/locale/id/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/id/LC_MESSAGES/UserLimit.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserLimit to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:39+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:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 9ceaacec84..c6aae240e1 100644
--- a/plugins/UserLimit/locale/lb/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/lb/LC_MESSAGES/UserLimit.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserLimit to Luxembourgish (Lëtzebuergesch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Robby
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:39+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:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 72acf5f873..07122bb094 100644
--- a/plugins/UserLimit/locale/lv/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/lv/LC_MESSAGES/UserLimit.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserLimit to Latvian (Latviešu)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Geimeris
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:39+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-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 fda78a738c..7842868251 100644
--- a/plugins/UserLimit/locale/mk/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/mk/LC_MESSAGES/UserLimit.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserLimit to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 17d04c7e17..bb2755f2f3 100644
--- a/plugins/UserLimit/locale/nb/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/nb/LC_MESSAGES/UserLimit.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserLimit to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:39+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:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 0719b90e83..eae61cb887 100644
--- a/plugins/UserLimit/locale/nl/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/nl/LC_MESSAGES/UserLimit.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserLimit to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 8a57376d96..934798b525 100644
--- a/plugins/UserLimit/locale/pt/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/pt/LC_MESSAGES/UserLimit.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserLimit to Portuguese (Português)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Hamilton Abreu
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-01-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 409a1e7c57..619d54b6ab 100644
--- a/plugins/UserLimit/locale/pt_BR/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/pt_BR/LC_MESSAGES/UserLimit.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserLimit to Brazilian Portuguese (Português do Brasil)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Giro720
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:39+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:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 a721828955..709d009bbe 100644
--- a/plugins/UserLimit/locale/ru/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/ru/LC_MESSAGES/UserLimit.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserLimit to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Александр Сигачёв
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:39+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:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 499e9fde47..3ad7a632dd 100644
--- a/plugins/UserLimit/locale/tl/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/tl/LC_MESSAGES/UserLimit.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserLimit to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:39+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:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 70cd0e65af..ef3884d814 100644
--- a/plugins/UserLimit/locale/tr/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/tr/LC_MESSAGES/UserLimit.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserLimit to Turkish (Türkçe)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Maidis
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:39+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-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 10a78ccfc4..63cbaaba04 100644
--- a/plugins/UserLimit/locale/uk/LC_MESSAGES/UserLimit.po
+++ b/plugins/UserLimit/locale/uk/LC_MESSAGES/UserLimit.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - UserLimit to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - UserLimit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 755db28a01..6c1c306e90 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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 dc5092befc..bce3a314d4 100644
--- a/plugins/WikiHashtags/locale/br/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/br/LC_MESSAGES/WikiHashtags.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - WikiHashtags to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Fulup
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-01-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 efe0061028..fdf3033b9a 100644
--- a/plugins/WikiHashtags/locale/de/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/de/LC_MESSAGES/WikiHashtags.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - WikiHashtags to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: The Evil IP address
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 a48be4da4d..0bae818b94 100644
--- a/plugins/WikiHashtags/locale/fr/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/fr/LC_MESSAGES/WikiHashtags.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - WikiHashtags to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Verdy p
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 5411a8bd5b..0f41e8f9a1 100644
--- a/plugins/WikiHashtags/locale/he/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/he/LC_MESSAGES/WikiHashtags.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - WikiHashtags to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:40+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:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 a7baaf2e36..0fb8e99c3a 100644
--- a/plugins/WikiHashtags/locale/ia/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/ia/LC_MESSAGES/WikiHashtags.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - WikiHashtags to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21: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-01-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 11e47470ea..0a06ac1264 100644
--- a/plugins/WikiHashtags/locale/id/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/id/LC_MESSAGES/WikiHashtags.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - WikiHashtags to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:40+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:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 0e909d421f..a96546cec6 100644
--- a/plugins/WikiHashtags/locale/mk/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/mk/LC_MESSAGES/WikiHashtags.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - WikiHashtags to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 660becfc65..3d6fe43627 100644
--- a/plugins/WikiHashtags/locale/nb/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/nb/LC_MESSAGES/WikiHashtags.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - WikiHashtags to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:18+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:40+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:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 e896646fdc..5c483bff9f 100644
--- a/plugins/WikiHashtags/locale/nl/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/nl/LC_MESSAGES/WikiHashtags.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - WikiHashtags to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:17+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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_BR/LC_MESSAGES/WikiHashtags.po b/plugins/WikiHashtags/locale/pt_BR/LC_MESSAGES/WikiHashtags.po
index 2e9c551864..a85e46c2d1 100644
--- a/plugins/WikiHashtags/locale/pt_BR/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/pt_BR/LC_MESSAGES/WikiHashtags.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - WikiHashtags to Brazilian Portuguese (Português do Brasil)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Giro720
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:18+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:40+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:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 9cb50b0031..193ac98cea 100644
--- a/plugins/WikiHashtags/locale/ru/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/ru/LC_MESSAGES/WikiHashtags.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - WikiHashtags to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Александр Сигачёв
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:18+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:40+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:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 5231c438d3..06655e158d 100644
--- a/plugins/WikiHashtags/locale/tl/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/tl/LC_MESSAGES/WikiHashtags.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - WikiHashtags to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:18+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:40+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:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 d386b58f50..a4298ae20f 100644
--- a/plugins/WikiHashtags/locale/tr/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/tr/LC_MESSAGES/WikiHashtags.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - WikiHashtags to Turkish (Türkçe)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Maidis
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:18+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 7f8ecf1de5..813f049182 100644
--- a/plugins/WikiHashtags/locale/uk/LC_MESSAGES/WikiHashtags.po
+++ b/plugins/WikiHashtags/locale/uk/LC_MESSAGES/WikiHashtags.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - WikiHashtags to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHashtags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:18+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:40+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:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 132c458180..b87ba1dffb 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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 8dffddab20..dd0a317fe6 100644
--- a/plugins/WikiHowProfile/locale/fr/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/fr/LC_MESSAGES/WikiHowProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - WikiHowProfile to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Verdy p
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:18+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 66fe6bdd41..821bd2e344 100644
--- a/plugins/WikiHowProfile/locale/ia/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/ia/LC_MESSAGES/WikiHowProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - WikiHowProfile to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:18+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21: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-01-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 341075f009..8c5785daf1 100644
--- a/plugins/WikiHowProfile/locale/mk/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/mk/LC_MESSAGES/WikiHowProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - WikiHowProfile to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:18+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 6ca83137d7..3b9115ba4d 100644
--- a/plugins/WikiHowProfile/locale/nl/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/nl/LC_MESSAGES/WikiHowProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - WikiHowProfile to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:18+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 39dfa24296..18beb14674 100644
--- a/plugins/WikiHowProfile/locale/ru/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/ru/LC_MESSAGES/WikiHowProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - WikiHowProfile to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Lockal
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:18+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:40+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:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 81ac70270c..123e56189e 100644
--- a/plugins/WikiHowProfile/locale/tl/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/tl/LC_MESSAGES/WikiHowProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - WikiHowProfile to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:18+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:40+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:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 fd96d79ba2..1ab5b9eabb 100644
--- a/plugins/WikiHowProfile/locale/tr/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/tr/LC_MESSAGES/WikiHowProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - WikiHowProfile to Turkish (Türkçe)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Maidis
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:18+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 0ab8f978c3..d72534bf81 100644
--- a/plugins/WikiHowProfile/locale/uk/LC_MESSAGES/WikiHowProfile.po
+++ b/plugins/WikiHowProfile/locale/uk/LC_MESSAGES/WikiHowProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - WikiHowProfile to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - WikiHowProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:18+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:40+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:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 074606f00e..80d4ac349d 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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 f6192612dc..017b4fe824 100644
--- a/plugins/XCache/locale/br/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/br/LC_MESSAGES/XCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - XCache to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Fulup
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 e18f9a3676..7a8f90bade 100644
--- a/plugins/XCache/locale/es/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/es/LC_MESSAGES/XCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - XCache to Spanish (Español)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Locos epraix
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:41+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:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 d58fb236cd..9f9b590272 100644
--- a/plugins/XCache/locale/fi/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/fi/LC_MESSAGES/XCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - XCache to Finnish (Suomi)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Centerlink
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:41+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:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 acee70ce27..f18e17db2a 100644
--- a/plugins/XCache/locale/fr/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/fr/LC_MESSAGES/XCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - XCache to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Verdy p
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 98c58a77aa..8524088c9f 100644
--- a/plugins/XCache/locale/gl/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/gl/LC_MESSAGES/XCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - XCache to Galician (Galego)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Toliño
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:41+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-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 d51ca1839e..ba98aa9e08 100644
--- a/plugins/XCache/locale/he/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/he/LC_MESSAGES/XCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - XCache to Hebrew (עברית)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: YaronSh
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 a06a12f1dd..21212ea994 100644
--- a/plugins/XCache/locale/ia/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/ia/LC_MESSAGES/XCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - XCache to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 d4209e4bfd..b66357000f 100644
--- a/plugins/XCache/locale/id/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/id/LC_MESSAGES/XCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - XCache to Indonesian (Bahasa Indonesia)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Farras
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:41+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:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 1da41535fc..f986da04ff 100644
--- a/plugins/XCache/locale/mk/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/mk/LC_MESSAGES/XCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - XCache to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21: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-01-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 7287a3b3e7..f408cef8b8 100644
--- a/plugins/XCache/locale/nb/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/nb/LC_MESSAGES/XCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - XCache to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Nghtwlkr
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 26664fc3dc..7619c0ffa5 100644
--- a/plugins/XCache/locale/nl/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/nl/LC_MESSAGES/XCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - XCache to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Siebrand
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21: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-01-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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_BR/LC_MESSAGES/XCache.po b/plugins/XCache/locale/pt_BR/LC_MESSAGES/XCache.po
index 0818a1b090..cbd685909d 100644
--- a/plugins/XCache/locale/pt_BR/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/pt_BR/LC_MESSAGES/XCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - XCache to Brazilian Portuguese (Português do Brasil)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Giro720
 # --
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:41+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 63367f59db..c078f1b86c 100644
--- a/plugins/XCache/locale/ru/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/ru/LC_MESSAGES/XCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - XCache to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Александр Сигачёв
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 4ae9977888..ac14a8e62d 100644
--- a/plugins/XCache/locale/tl/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/tl/LC_MESSAGES/XCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - XCache to Tagalog (Tagalog)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: AnakngAraw
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:41+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:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 59410a1e17..70a82818c4 100644
--- a/plugins/XCache/locale/tr/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/tr/LC_MESSAGES/XCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - XCache to Turkish (Türkçe)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Maidis
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:41+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-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 7798e1dae3..59cb35f648 100644
--- a/plugins/XCache/locale/uk/LC_MESSAGES/XCache.po
+++ b/plugins/XCache/locale/uk/LC_MESSAGES/XCache.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - XCache to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - XCache\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:19+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21: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-01-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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/YammerImport/locale/YammerImport.pot b/plugins/YammerImport/locale/YammerImport.pot
index 7e84b7614a..db6936cac8 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: 2010-12-16 15:08+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+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 50973ddd2a..9aa6392721 100644
--- a/plugins/YammerImport/locale/br/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/br/LC_MESSAGES/YammerImport.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - YammerImport to Breton (Brezhoneg)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Fulup
 # Author: Y-M D
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:22+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:46+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:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 bfd5a9fe3e..3b306cc3e1 100644
--- a/plugins/YammerImport/locale/fr/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/fr/LC_MESSAGES/YammerImport.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - YammerImport to French (Français)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Peter17
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:22+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 c8e2f40a36..83c1a6156f 100644
--- a/plugins/YammerImport/locale/gl/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/gl/LC_MESSAGES/YammerImport.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - YammerImport to Galician (Galego)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Toliño
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:22+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 a3c50004de..6968cc8f22 100644
--- a/plugins/YammerImport/locale/ia/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/ia/LC_MESSAGES/YammerImport.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - YammerImport to Interlingua (Interlingua)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: McDutchie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:22+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 e0b5b010a5..6d5a5987d5 100644
--- a/plugins/YammerImport/locale/mk/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/mk/LC_MESSAGES/YammerImport.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - YammerImport to Macedonian (Македонски)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Bjankuloski06
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:22+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 92459c1570..af7cdba7a2 100644
--- a/plugins/YammerImport/locale/nl/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/nl/LC_MESSAGES/YammerImport.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - YammerImport to Dutch (Nederlands)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: SPQRobin
 # Author: Siebrand
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:22+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 6096d2ec9c..20f8fd61a8 100644
--- a/plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - YammerImport to Russian (Русский)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Eleferen
 # Author: MaxSem
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:22+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 9457a8dde7..9b1d552288 100644
--- a/plugins/YammerImport/locale/tr/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/tr/LC_MESSAGES/YammerImport.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - YammerImport to Turkish (Türkçe)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Maidis
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:23+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51:47+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-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-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 e545a9e543..2b09e40fe6 100644
--- a/plugins/YammerImport/locale/uk/LC_MESSAGES/YammerImport.po
+++ b/plugins/YammerImport/locale/uk/LC_MESSAGES/YammerImport.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - YammerImport to Ukrainian (Українська)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Boogie
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - YammerImport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:34:23+0000\n"
+"POT-Creation-Date: 2011-01-29 21:45+0000\n"
+"PO-Revision-Date: 2011-01-29 21:51: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-10 18:27:24+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-yammerimport\n"

From c29a93889505eda5182915044614de6e33d94ddf Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sun, 30 Jan 2011 18:48:09 +0100
Subject: [PATCH 142/314] * update punctuation for translator documentation. *
 remove superfluous whitespace.

---
 lib/action.php | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 0e5d7ae361..8bef5ca230 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -300,11 +300,11 @@ class Action extends HTMLOutputter // lawsuit
      * events and appending to the array. Try to avoid adding strings that won't be used, as
      * they'll be added to HTML output.
      */
-    
+
     function showScriptMessages()
     {
         $messages = array();
-	
+
         if (Event::handle('StartScriptMessages', array($this, &$messages))) {
             // Common messages needed for timeline views etc...
 
@@ -312,14 +312,14 @@ class Action extends HTMLOutputter // lawsuit
             $messages['showmore_tooltip'] = _m('TOOLTIP', 'Show more');
 
             $messages = array_merge($messages, $this->getScriptMessages());
-	    
+
 	    Event::handle('EndScriptMessages', array($this, &$messages));
         }
-	
+
         if (!empty($messages)) {
             $this->inlineScript('SN.messages=' . json_encode($messages));
         }
-	
+
         return $messages;
     }
 
@@ -533,33 +533,33 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementStart('ul', array('class' => 'nav'));
         if (Event::handle('StartPrimaryNav', array($this))) {
             if ($user) {
-                // TRANS: Tooltip for main menu option "Personal"
+                // 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
+                                // 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"
+                // TRANS: Tooltip for main menu option "Account".
                 $tooltip = _m('TOOLTIP', 'Change your email, avatar, password, profile');
                 $this->menuItem(common_local_url('profilesettings'),
-                                // TRANS: Main menu option when logged in for access to user settings
+                                // TRANS: Main menu option when logged in for access to user settings.
                                 _('Account'), $tooltip, false, 'nav_account');
-                // TRANS: Tooltip for main menu option "Services"
+                // 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
+                                // 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');
                 if ($user->hasRight(Right::CONFIGURESITE)) {
-                    // TRANS: Tooltip for menu option "Admin"
+                    // 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
+                                    // TRANS: Main menu option when logged in and site admin for access to site configuration.
                                     _m('MENU', 'Admin'), $tooltip, false, 'nav_admin');
                 }
                 if (common_config('invite', 'enabled')) {
-                    // TRANS: Tooltip for main menu option "Invite"
+                    // 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
+                                    // TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
                                     _m('MENU', 'Invite'),
                                     sprintf($tooltip,
                                             common_config('site', 'name')),
@@ -568,33 +568,33 @@ class Action extends HTMLOutputter // lawsuit
                 // 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
+                                // 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"
+                    // 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
+                                    // 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"
+                // TRANS: Tooltip for main menu option "Login".
                 $tooltip = _m('TOOLTIP', 'Login to the site');
                 $this->menuItem(common_local_url('login'),
-                                // TRANS: Main menu option when not logged in to log in
+                                // TRANS: Main menu option when not logged in to log in.
                                 _m('MENU', 'Login'), $tooltip, false, 'nav_login');
             }
-            // TRANS: Tooltip for main menu option "Help"
+            // 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
+                            // 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"
+                // 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
+                                // TRANS: Main menu option when logged in or when the StatusNet instance is not private.
                                 _m('MENU', 'Search'), $tooltip, false, 'nav_search');
             }
             Event::handle('EndPrimaryNav', array($this));

From 691f374a52f68db6895c15cce79e92d4d6420592 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sun, 30 Jan 2011 19:01:55 +0100
Subject: [PATCH 143/314] * Add/update translator documentation. * Update
 punctuation in form validation message for consistency. * Remove superfluous
 whitespace.

---
 actions/disfavor.php        |  1 -
 actions/editapplication.php |  2 ++
 actions/emailsettings.php   | 43 ++++++++++++++-----------------------
 actions/favor.php           |  6 ++++--
 actions/favorited.php       | 16 +++++++-------
 actions/favoritesrss.php    |  8 ++++---
 actions/featured.php        |  7 ++++--
 actions/file.php            | 10 ++++++---
 actions/newapplication.php  | 22 +++++++++++++------
 actions/showfavorites.php   | 24 ++++++++++++++-------
 actions/smssettings.php     |  3 ++-
 11 files changed, 81 insertions(+), 61 deletions(-)

diff --git a/actions/disfavor.php b/actions/disfavor.php
index 57f6f7ca18..39598d60bf 100644
--- a/actions/disfavor.php
+++ b/actions/disfavor.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Disfavor action.
  *
diff --git a/actions/editapplication.php b/actions/editapplication.php
index 760b1d284e..4e67d9e57b 100644
--- a/actions/editapplication.php
+++ b/actions/editapplication.php
@@ -198,6 +198,7 @@ class EditApplicationAction extends OwnerDesignAction
         } elseif (Oauth_application::descriptionTooLong($description)) {
             $this->showForm(sprintf(
                 // TRANS: Validation error shown when providing too long a description in the "Edit application" form.
+                // TRANS: %d is the maximum number of allowed characters.
                 _m('Description is too long (maximum %d character).',
                   'Description is too long (maximum %d characters).',
                   Oauth_application::maxDesc()),
@@ -223,6 +224,7 @@ class EditApplicationAction extends OwnerDesignAction
             $this->showForm(_('Organization is too long (maximum 255 characters).'));
             return;
         } elseif (empty($homepage)) {
+            // TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
             $this->showForm(_('Organization homepage is required.'));
             return;
         } elseif ((mb_strlen($homepage) > 0)
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index cc513c2b40..3e977074fc 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -46,7 +46,6 @@ require_once INSTALLDIR.'/lib/accountsettingsaction.php';
  *
  * @see      Widget
  */
-
 class EmailsettingsAction extends AccountSettingsAction
 {
     /**
@@ -54,7 +53,6 @@ class EmailsettingsAction extends AccountSettingsAction
      *
      * @return string Title of the page
      */
-
     function title()
     {
         // TRANS: Title for e-mail settings.
@@ -66,7 +64,6 @@ class EmailsettingsAction extends AccountSettingsAction
      *
      * @return instructions for use
      */
-
     function getInstructions()
     {
         // XXX: For consistency of parameters in messages, this should be a
@@ -91,7 +88,6 @@ class EmailsettingsAction extends AccountSettingsAction
      *
      * @return void
      */
-
     function showContent()
     {
         $user = common_current_user();
@@ -118,8 +114,8 @@ class EmailsettingsAction extends AccountSettingsAction
             $confirm = $this->getConfirmation();
             if ($confirm) {
                 $this->element('p', array('id' => 'form_unconfirmed'), $confirm->address);
-                // TRANS: Form note in e-mail settings form.
                 $this->element('p', array('class' => 'form_note'),
+                                        // TRANS: Form note in e-mail settings form.
                                         _('Awaiting confirmation on this address. '.
                                         'Check your inbox (and spam box!) for a message '.
                                         'with further instructions.'));
@@ -173,7 +169,7 @@ class EmailsettingsAction extends AccountSettingsAction
             if ($user->incomingemail) {
                 $this->elementStart('p');
                 $this->element('span', 'address', $user->incomingemail);
-                // XXX: Looks a little awkward in the UI.
+                // @todo XXX: Looks a little awkward in the UI.
                 //      Something like "xxxx@identi.ca  Send email ..". Needs improvement.
                 $this->element('span', 'input_instructions',
                                // TRANS: Form instructions for incoming e-mail form in e-mail settings.
@@ -208,7 +204,7 @@ class EmailsettingsAction extends AccountSettingsAction
         $this->element('legend', null, _('Email preferences'));
 
         $this->elementStart('ul', 'form_data');
-	
+
         if (Event::handle('StartEmailFormData', array($this))) {
 	    $this->elementStart('li');
 	    $this->checkbox('emailnotifysub',
@@ -262,7 +258,6 @@ class EmailsettingsAction extends AccountSettingsAction
      *
      * @return Confirm_address Email address confirmation for user, or null
      */
-
     function getConfirmation()
     {
         $user = common_current_user();
@@ -288,7 +283,6 @@ class EmailsettingsAction extends AccountSettingsAction
      *
      * @return void
      */
-
     function handlePost()
     {
         // CSRF protection
@@ -322,13 +316,12 @@ class EmailsettingsAction extends AccountSettingsAction
      *
      * @return void
      */
-
     function savePreferences()
     {
 	$user = common_current_user();
-	
+
 	if (Event::handle('StartEmailSaveForm', array($this, &$user))) {
-	    
+
 	    $emailnotifysub   = $this->boolean('emailnotifysub');
 	    $emailnotifyfav   = $this->boolean('emailnotifyfav');
 	    $emailnotifymsg   = $this->boolean('emailnotifymsg');
@@ -336,13 +329,13 @@ class EmailsettingsAction extends AccountSettingsAction
 	    $emailnotifyattn  = $this->boolean('emailnotifyattn');
 	    $emailmicroid     = $this->boolean('emailmicroid');
 	    $emailpost        = $this->boolean('emailpost');
-	    
+
 	    assert(!is_null($user)); // should already be checked
-	    
+
 	    $user->query('BEGIN');
-	    
+
 	    $original = clone($user);
-	    
+
 	    $user->emailnotifysub   = $emailnotifysub;
 	    $user->emailnotifyfav   = $emailnotifyfav;
 	    $user->emailnotifymsg   = $emailnotifymsg;
@@ -350,20 +343,20 @@ class EmailsettingsAction extends AccountSettingsAction
 	    $user->emailnotifyattn  = $emailnotifyattn;
 	    $user->emailmicroid     = $emailmicroid;
 	    $user->emailpost        = $emailpost;
-	    
+
 	    $result = $user->update($original);
-	    
+
 	    if ($result === false) {
 		common_log_db_error($user, 'UPDATE', __FILE__);
 		// TRANS: Server error thrown on database error updating e-mail preferences.
 		$this->serverError(_('Could not update user.'));
 		return;
 	    }
-	    
+
 	    $user->query('COMMIT');
-	    
+
 	    Event::handle('EndEmailSaveForm', array($this));
-	    
+
 	    // TRANS: Confirmation message for successful e-mail preferences save.
 	    $this->showForm(_('Email preferences saved.'), true);
 	}
@@ -374,7 +367,6 @@ class EmailsettingsAction extends AccountSettingsAction
      *
      * @return void
      */
-
     function addAddress()
     {
         $user = common_current_user();
@@ -393,7 +385,7 @@ class EmailsettingsAction extends AccountSettingsAction
 
         if (!$email) {
             // TRANS: Message given saving e-mail address that cannot be normalised.
-            $this->showForm(_('Cannot normalize that email address'));
+            $this->showForm(_('Cannot normalize that email address.'));
             return;
         }
         if (!Validate::email($email, common_config('email', 'check_domain'))) {
@@ -442,7 +434,6 @@ class EmailsettingsAction extends AccountSettingsAction
      *
      * @return void
      */
-
     function cancelConfirmation()
     {
         $email = $this->arg('email');
@@ -478,7 +469,6 @@ class EmailsettingsAction extends AccountSettingsAction
      *
      * @return void
      */
-
     function removeAddress()
     {
         $user = common_current_user();
@@ -519,12 +509,12 @@ class EmailsettingsAction extends AccountSettingsAction
      *
      * @return void
      */
-
     function removeIncoming()
     {
         $user = common_current_user();
 
         if (!$user->incomingemail) {
+            // TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
             $this->showForm(_('No incoming email address.'));
             return;
         }
@@ -549,7 +539,6 @@ class EmailsettingsAction extends AccountSettingsAction
      *
      * @return void
      */
-
     function newIncoming()
     {
         $user = common_current_user();
diff --git a/actions/favor.php b/actions/favor.php
index 01976a38f5..bcefcd26e7 100644
--- a/actions/favor.php
+++ b/actions/favor.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Favor action.
  *
@@ -59,6 +58,7 @@ class FavorAction extends Action
     {
         parent::handle($args);
         if (!common_logged_in()) {
+            // TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
             $this->clientError(_('Not logged in.'));
             return;
         }
@@ -76,11 +76,13 @@ class FavorAction extends Action
             return;
         }
         if ($user->hasFave($notice)) {
+            // TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
             $this->clientError(_('This notice is already a favorite!'));
             return;
         }
         $fave = Fave::addNew($user->getProfile(), $notice);
         if (!$fave) {
+            // TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
             $this->serverError(_('Could not create favorite.'));
             return;
         }
@@ -89,6 +91,7 @@ class FavorAction extends Action
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
+            // TRANS: Page title for page on which favorite notices can be unfavourited.
             $this->element('title', null, _('Disfavor favorite'));
             $this->elementEnd('head');
             $this->elementStart('body');
@@ -123,4 +126,3 @@ class FavorAction extends Action
         }
     }
 }
-
diff --git a/actions/favorited.php b/actions/favorited.php
index 19d49feecf..c137cf424f 100644
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -48,7 +48,6 @@ require_once INSTALLDIR.'/lib/noticelist.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 FavoritedAction extends Action
 {
     var $page = null;
@@ -62,8 +61,11 @@ class FavoritedAction extends Action
     function title()
     {
         if ($this->page == 1) {
+            // TRANS: Page title for first page of favorited notices.
             return _('Popular notices');
         } else {
+            // TRANS: Page title for all but first page of favorited notices.
+            // TRANS: %d is the page number being displayed.
             return sprintf(_('Popular notices, page %d'), $this->page);
         }
     }
@@ -73,9 +75,9 @@ class FavoritedAction extends Action
      *
      * @return instructions for use
      */
-
     function getInstructions()
     {
+        // TRANS: Description on page displaying favorited notices.
         return _('The most popular notices on the site right now.');
     }
 
@@ -84,7 +86,6 @@ class FavoritedAction extends Action
      *
      * @return boolean true
      */
-
     function isReadOnly($args)
     {
         return true;
@@ -99,7 +100,6 @@ class FavoritedAction extends Action
      *
      * @todo move queries from showContent() to here
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -119,7 +119,6 @@ class FavoritedAction extends Action
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
@@ -134,7 +133,6 @@ class FavoritedAction extends Action
      *
      * @return void
      */
-
     function showPageNotice()
     {
         $instr  = $this->getInstructions();
@@ -147,12 +145,16 @@ class FavoritedAction extends Action
 
     function showEmptyList()
     {
+        // TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
         $message = _('Favorite notices appear on this page but no one has favorited one yet.') . ' ';
 
         if (common_logged_in()) {
+            // TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
             $message .= _('Be the first to add a notice to your favorites by clicking the fave button next to any notice you like.');
         }
         else {
+            // 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.
             $message .= _('Why not [register an account](%%action.register%%) and be the first to add a notice to your favorites!');
         }
 
@@ -168,7 +170,6 @@ class FavoritedAction extends Action
      *
      * @return void
      */
-
     function showLocalNav()
     {
         $nav = new PublicGroupNav($this);
@@ -182,7 +183,6 @@ class FavoritedAction extends Action
      *
      * @return void
      */
-
     function showContent()
     {
         $pop = new Popularity();
diff --git a/actions/favoritesrss.php b/actions/favoritesrss.php
index 51c92af933..494327674d 100644
--- a/actions/favoritesrss.php
+++ b/actions/favoritesrss.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * RSS feed for user favorites action class.
  *
@@ -50,7 +49,6 @@ require_once INSTALLDIR.'/lib/rssaction.php';
  */
 class FavoritesrssAction extends Rss10Action
 {
-
     /** The user whose favorites to display */
 
     var $user = null;
@@ -62,7 +60,6 @@ class FavoritesrssAction extends Rss10Action
      *
      * @return boolean success
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -71,6 +68,7 @@ class FavoritesrssAction extends Rss10Action
         $this->user = User::staticGet('nickname', $nickname);
 
         if (!$this->user) {
+            // TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
             $this->clientError(_('No such user.'));
             return false;
         } else {
@@ -108,10 +106,14 @@ class FavoritesrssAction extends Rss10Action
         $c    = array('url' => common_local_url('favoritesrss',
                                         array('nickname' =>
                                         $user->nickname)),
+                   // TRANS: Title of RSS feed with favourite notices of a user.
+                   // TRANS: %s is a user's nickname.
                    'title' => sprintf(_("%s's favorite notices"), $user->nickname),
                    'link' => common_local_url('showfavorites',
                                         array('nickname' =>
                                         $user->nickname)),
+                   // 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.
                    'description' => sprintf(_('Updates favored by %1$s on %2$s!'),
                                         $user->nickname, common_config('site', 'name')));
         return $c;
diff --git a/actions/featured.php b/actions/featured.php
index dd1056dd58..9a7f128b57 100644
--- a/actions/featured.php
+++ b/actions/featured.php
@@ -45,7 +45,6 @@ require_once INSTALLDIR.'/lib/publicgroupnav.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 FeaturedAction extends Action
 {
     var $page = null;
@@ -66,8 +65,11 @@ class FeaturedAction extends Action
     function title()
     {
         if ($this->page == 1) {
+            // TRANS: Page title for first page of featured users.
             return _('Featured users');
         } else {
+            // TRANS: Page title for all but first page of featured users.
+            // TRANS: %d is the page number being displayed.
             return sprintf(_('Featured users, page %d'), $this->page);
         }
     }
@@ -96,7 +98,8 @@ class FeaturedAction extends Action
 
     function getInstructions()
     {
-        return sprintf(_('A selection of some great users on %s'),
+        // TRANS: Description on page displaying featured users.
+        return sprintf(_('A selection of some great users on %s.'),
                        common_config('site', 'name'));
     }
 
diff --git a/actions/file.php b/actions/file.php
index c6f7b998a2..49ed8af1d6 100644
--- a/actions/file.php
+++ b/actions/file.php
@@ -21,6 +21,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/actions/shownotice.php');
 
+// @todo FIXME: Add documentation.
 class FileAction extends Action
 {
     var $id = null;
@@ -31,14 +32,17 @@ class FileAction extends Action
         parent::prepare($args);
         $this->id = $this->trimmed('notice');
         if (empty($this->id)) {
+            // TRANS: Client error displayed when no notice ID was given trying do display a file.
             $this->clientError(_('No notice ID.'));
         }
         $notice = Notice::staticGet('id', $this->id);
         if (empty($notice)) {
+            // TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
             $this->clientError(_('No notice.'));
         }
         $atts = $notice->attachments();
         if (empty($atts)) {
+            // TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
             $this->clientError(_('No attachments.'));
         }
         foreach ($atts as $att) {
@@ -48,6 +52,9 @@ class FileAction extends Action
             }
         }
         if (empty($this->filerec)) {
+            // XXX: Is this translation hint correct? If yes, please remove comment, if no, please correct and remove comment.
+            // TRANS: Client error displayed when trying do display a file for a notice with file attachements
+            // TRANS: that could not be found.
             $this->clientError(_('No uploaded attachments.'));
         }
         return true;
@@ -62,11 +69,8 @@ class FileAction extends Action
      *
      * @return boolean true
      */
-
     function isReadOnly($args)
     {
         return true;
     }
-
 }
-
diff --git a/actions/newapplication.php b/actions/newapplication.php
index ae17545589..eb13593536 100644
--- a/actions/newapplication.php
+++ b/actions/newapplication.php
@@ -55,7 +55,6 @@ class NewApplicationAction extends OwnerDesignAction
     /**
      * Prepare to run
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -78,7 +77,6 @@ class NewApplicationAction extends OwnerDesignAction
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
@@ -122,6 +120,7 @@ class NewApplicationAction extends OwnerDesignAction
         } elseif ($this->arg('save')) {
             $this->trySave();
         } else {
+            // TRANS: Client error displayed when encountering an unexpected action on form submission.
             $this->clientError(_('Unexpected form submission.'));
         }
     }
@@ -144,6 +143,7 @@ class NewApplicationAction extends OwnerDesignAction
             $this->element('p', 'error', $this->msg);
         } else {
             $this->element('p', 'instructions',
+                           // TRANS: Form instructions for registering a new application.
                            _('Use this form to register a new application.'));
         }
     }
@@ -160,15 +160,19 @@ class NewApplicationAction extends OwnerDesignAction
         $access_type  = $this->arg('default_access_type');
 
         if (empty($name)) {
+            // TRANS: Validation error shown when not providing a name in the "New application" form.
              $this->showForm(_('Name is required.'));
              return;
         } else if ($this->nameExists($name)) {
+            // TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
             $this->showForm(_('Name already in use. Try another one.'));
             return;
         } elseif (mb_strlen($name) > 255) {
+            // TRANS: Validation error shown when providing too long a name in the "New application" form.
             $this->showForm(_('Name is too long (maximum 255 characters).'));
             return;
         } elseif (empty($description)) {
+            // TRANS: Validation error shown when not providing a description in the "New application" form.
             $this->showForm(_('Description is required.'));
             return;
         } elseif (Oauth_application::descriptionTooLong($description)) {
@@ -181,6 +185,7 @@ class NewApplicationAction extends OwnerDesignAction
                 Oauth_application::maxDesc()));
             return;
         } elseif (empty($source_url)) {
+            // TRANS: Validation error shown when not providing a source URL in the "New application" form.
             $this->showForm(_('Source URL is required.'));
             return;
         } elseif ((strlen($source_url) > 0)
@@ -190,15 +195,19 @@ class NewApplicationAction extends OwnerDesignAction
                 )
             )
         {
+            // TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
             $this->showForm(_('Source URL is not valid.'));
             return;
         } elseif (empty($organization)) {
+            // TRANS: Validation error shown when not providing an organisation in the "New application" form.
             $this->showForm(_('Organization is required.'));
             return;
         } elseif (mb_strlen($organization) > 255) {
+            // TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
             $this->showForm(_('Organization is too long (maximum 255 characters).'));
             return;
         } elseif (empty($homepage)) {
+            // TRANS: Form validation error show when an organisation name has not been provided in the new application form.
             $this->showForm(_('Organization homepage is required.'));
             return;
         } elseif ((strlen($homepage) > 0)
@@ -208,9 +217,11 @@ class NewApplicationAction extends OwnerDesignAction
                 )
             )
         {
+            // TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
             $this->showForm(_('Homepage is not a valid URL.'));
             return;
         } elseif (mb_strlen($callback_url) > 255) {
+            // TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
             $this->showForm(_('Callback is too long.'));
             return;
         } elseif (strlen($callback_url) > 0
@@ -220,6 +231,7 @@ class NewApplicationAction extends OwnerDesignAction
                 )
             )
         {
+            // TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
             $this->showForm(_('Callback URL is not valid.'));
             return;
         }
@@ -263,6 +275,7 @@ class NewApplicationAction extends OwnerDesignAction
 
         if (!$result) {
             common_log_db_error($consumer, 'INSERT', __FILE__);
+            // TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
             $this->serverError(_('Could not create application.'));
         }
 
@@ -272,6 +285,7 @@ class NewApplicationAction extends OwnerDesignAction
 
         if (!$this->app_id) {
             common_log_db_error($app, 'INSERT', __FILE__);
+            // TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
             $this->serverError(_('Could not create application.'));
             $app->query('ROLLBACK');
         }
@@ -281,7 +295,6 @@ class NewApplicationAction extends OwnerDesignAction
         $app->query('COMMIT');
 
         common_redirect(common_local_url('oauthappssettings'), 303);
-
     }
 
     /**
@@ -294,12 +307,9 @@ class NewApplicationAction extends OwnerDesignAction
      *
      * @return boolean true if the name already exists
      */
-
     function nameExists($name)
     {
         $app = Oauth_application::staticGet('name', $name);
         return !empty($app);
     }
-
 }
-
diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index 77b73711d2..eda2cf38eb 100644
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -44,7 +44,6 @@ require_once INSTALLDIR.'/lib/feedlist.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 ShowfavoritesAction extends OwnerDesignAction
 {
     /** User we're getting the faves of */
@@ -57,7 +56,6 @@ class ShowfavoritesAction extends OwnerDesignAction
      *
      * @return boolean true
      */
-
     function isReadOnly($args)
     {
         return true;
@@ -70,12 +68,15 @@ class ShowfavoritesAction extends OwnerDesignAction
      *
      * @return string title of page
      */
-
     function title()
     {
         if ($this->page == 1) {
+            // TRANS: Title for first page of favourite notices of a user.
+            // TRANS: %s is the user for whom the favourite notices are displayed.
             return sprintf(_('%s\'s favorite notices'), $this->user->nickname);
         } else {
+            // 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.
             return sprintf(_('%1$s\'s favorite notices, page %2$d'),
                            $this->user->nickname,
                            $this->page);
@@ -92,7 +93,6 @@ class ShowfavoritesAction extends OwnerDesignAction
      *
      * @return boolean success flag
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -102,6 +102,7 @@ class ShowfavoritesAction extends OwnerDesignAction
         $this->user = User::staticGet('nickname', $nickname);
 
         if (!$this->user) {
+            // TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
             $this->clientError(_('No such user.'));
             return false;
         }
@@ -129,6 +130,7 @@ class ShowfavoritesAction extends OwnerDesignAction
         }
 
         if (empty($this->notice)) {
+            // TRANS: Server error displayed when favourite notices could not be retrieved from the database.
             $this->serverError(_('Could not retrieve favorite notices.'));
             return;
         }
@@ -150,7 +152,6 @@ class ShowfavoritesAction extends OwnerDesignAction
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
@@ -162,12 +163,12 @@ class ShowfavoritesAction extends OwnerDesignAction
      *
      * @return array Feed objects to show
      */
-
     function getFeeds()
     {
         return array(new Feed(Feed::RSS1,
                               common_local_url('favoritesrss',
                                                array('nickname' => $this->user->nickname)),
+                              // TRANS: Feed link text. %s is a username.
                               sprintf(_('Feed for favorites of %s (RSS 1.0)'),
                                       $this->user->nickname)),
                      new Feed(Feed::RSS2,
@@ -175,6 +176,7 @@ class ShowfavoritesAction extends OwnerDesignAction
                                                array(
                                                     'id' => $this->user->nickname,
                                                     'format' => 'rss')),
+                              // TRANS: Feed link text. %s is a username.
                               sprintf(_('Feed for favorites of %s (RSS 2.0)'),
                                       $this->user->nickname)),
                      new Feed(Feed::ATOM,
@@ -182,6 +184,7 @@ class ShowfavoritesAction extends OwnerDesignAction
                                                array(
                                                     'id' => $this->user->nickname,
                                                     'format' => 'atom')),
+                              // TRANS: Feed link text. %s is a username.
                               sprintf(_('Feed for favorites of %s (Atom)'),
                                       $this->user->nickname)));
     }
@@ -191,7 +194,6 @@ class ShowfavoritesAction extends OwnerDesignAction
      *
      * @return void
      */
-
     function showLocalNav()
     {
         $nav = new PersonalGroupNav($this);
@@ -203,12 +205,18 @@ class ShowfavoritesAction extends OwnerDesignAction
         if (common_logged_in()) {
             $current_user = common_current_user();
             if ($this->user->id === $current_user->id) {
+                // TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
                 $message = _('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.');
             } else {
+                // TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
+                // TRANS: %s is a username.
                 $message = sprintf(_('%s hasn\'t added any favorite notices yet. Post something interesting they would add to their favorites :)'), $this->user->nickname);
             }
         }
         else {
+                // 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.
             $message = sprintf(_('%s hasn\'t added any favorite notices yet. Why not [register an account](%%%%action.register%%%%) and then post something interesting they would add to their favorites :)'), $this->user->nickname);
         }
 
@@ -224,7 +232,6 @@ class ShowfavoritesAction extends OwnerDesignAction
      *
      * @return void
      */
-
     function showContent()
     {
         $nl = new FavoritesNoticeList($this->notice, $this);
@@ -240,6 +247,7 @@ class ShowfavoritesAction extends OwnerDesignAction
     }
 
     function showPageNotice() {
+        // TRANS: Page notice for show favourites page.
         $this->element('p', 'instructions', _('This is a way to share what you like.'));
     }
 }
diff --git a/actions/smssettings.php b/actions/smssettings.php
index e672b6d8af..f9a79e1664 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -532,7 +532,7 @@ class SmssettingsAction extends ConnectSettingsAction
 
         if (!$code) {
             // TRANS: Message given saving SMS phone number confirmation code without having provided one.
-            $this->showForm(_('No code entered'));
+            $this->showForm(_('No code entered.'));
             return;
         }
 
@@ -551,6 +551,7 @@ class SmssettingsAction extends ConnectSettingsAction
         $user = common_current_user();
 
         if (!$user->incomingemail) {
+            // TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
             $this->showForm(_('No incoming email address.'));
             return;
         }

From 9c8b2b567f00b7a686a31190ad5caf70661cd31d Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sun, 30 Jan 2011 19:03:55 +0100
Subject: [PATCH 144/314] * Add/update translator documentation. * L10n tweaks
 (mostly domain MENU assignments). * Remove superfluous whitespace.

---
 lib/disfavorform.php            | 22 ++++++++--------------
 lib/favorform.php               | 21 ++++++++-------------
 lib/featureduserssection.php    |  2 +-
 lib/personalgroupnav.php        | 26 +++++++++++++++++---------
 lib/personaltagcloudsection.php |  3 +--
 lib/popularnoticesection.php    |  2 +-
 lib/profileformaction.php       |  8 ++++----
 7 files changed, 40 insertions(+), 44 deletions(-)

diff --git a/lib/disfavorform.php b/lib/disfavorform.php
index 6023766d7b..3a1c7d17fb 100644
--- a/lib/disfavorform.php
+++ b/lib/disfavorform.php
@@ -46,13 +46,11 @@ require_once INSTALLDIR.'/lib/form.php';
  *
  * @see      FavorForm
  */
-
 class DisfavorForm extends Form
 {
     /**
      * Notice to disfavor
      */
-
     var $notice = null;
 
     /**
@@ -61,7 +59,6 @@ class DisfavorForm extends Form
      * @param HTMLOutputter $out    output channel
      * @param Notice        $notice notice to disfavor
      */
-
     function __construct($out=null, $notice=null)
     {
         parent::__construct($out);
@@ -74,7 +71,6 @@ class DisfavorForm extends Form
      *
      * @return int ID of the form
      */
-
     function id()
     {
         return 'disfavor-' . $this->notice->id;
@@ -85,7 +81,6 @@ class DisfavorForm extends Form
      *
      * @return string URL of the action
      */
-
     function action()
     {
         return common_local_url('disfavor');
@@ -96,14 +91,12 @@ class DisfavorForm extends Form
      *
      * @return void
      */
-
     function sessionToken()
     {
         $this->out->hidden('token-' . $this->notice->id,
                            common_session_token());
     }
 
-
     /**
      * Legend of the Form
      *
@@ -111,10 +104,10 @@ class DisfavorForm extends Form
      */
     function formLegend()
     {
+        // TRANS: Form legend for removing the favourite status for a favourite notice.
         $this->out->element('legend', null, _('Disfavor this notice'));
     }
 
-
     /**
      * Data elements
      *
@@ -129,7 +122,6 @@ class DisfavorForm extends Form
                                'notice');
             Event::handle('EndDisFavorNoticeForm', array($this, $this->notice));
         }
-
     }
 
     /**
@@ -137,22 +129,24 @@ class DisfavorForm extends Form
      *
      * @return void
      */
-
     function formActions()
     {
         $this->out->submit('disfavor-submit-' . $this->notice->id,
-                           _('Disfavor favorite'), 'submit', null, _('Disfavor this notice'));
+                           // TRANS: Button text for removing the favourite status for a favourite notice.
+                           _m('BUTTON','Disfavor favorite'),
+                           'submit',
+                           null,
+                           // TRANS: Title for button text for removing the favourite status for a favourite notice.
+                           _('Disfavor this notice'));
     }
-    
+
     /**
      * Class of the form.
      *
      * @return string the form's class
      */
-
     function formClass()
     {
         return 'form_disfavor';
     }
-
 }
diff --git a/lib/favorform.php b/lib/favorform.php
index 4e2891ffd5..956cc896a2 100644
--- a/lib/favorform.php
+++ b/lib/favorform.php
@@ -46,13 +46,11 @@ require_once INSTALLDIR.'/lib/form.php';
  *
  * @see      DisfavorForm
  */
-
 class FavorForm extends Form
 {
     /**
      * Notice to favor
      */
-
     var $notice = null;
 
     /**
@@ -61,7 +59,6 @@ class FavorForm extends Form
      * @param HTMLOutputter $out    output channel
      * @param Notice        $notice notice to favor
      */
-
     function __construct($out=null, $notice=null)
     {
         parent::__construct($out);
@@ -74,7 +71,6 @@ class FavorForm extends Form
      *
      * @return int ID of the form
      */
-
     function id()
     {
         return 'favor-' . $this->notice->id;
@@ -85,7 +81,6 @@ class FavorForm extends Form
      *
      * @return string URL of the action
      */
-
     function action()
     {
         return common_local_url('favor');
@@ -96,14 +91,12 @@ class FavorForm extends Form
      *
      * @return void
      */
-
     function sessionToken()
     {
         $this->out->hidden('token-' . $this->notice->id,
                            common_session_token());
     }
 
-
     /**
      * Legend of the Form
      *
@@ -111,16 +104,15 @@ class FavorForm extends Form
      */
     function formLegend()
     {
+        // TRANS: Form legend for adding the favourite status to a notice.
         $this->out->element('legend', null, _('Favor this notice'));
     }
 
-
     /**
      * Data elements
      *
      * @return void
      */
-
     function formData()
     {
         if (Event::handle('StartFavorNoticeForm', array($this, $this->notice))) {
@@ -136,19 +128,22 @@ class FavorForm extends Form
      *
      * @return void
      */
-
     function formActions()
     {
         $this->out->submit('favor-submit-' . $this->notice->id,
-                           _('Favor'), 'submit', null, _('Favor this notice'));
+                           // TRANS: Button text for adding the favourite status to a notice.
+                           _m('BUTTON','Favor'),
+                           'submit',
+                           null,
+                           // TRANS: Title for button text for adding the favourite status to a notice.
+                           _('Favor this notice'));
     }
-    
+
     /**
      * Class of the form.
      *
      * @return string the form's class
      */
-    
     function formClass()
     {
         return 'form_favor';
diff --git a/lib/featureduserssection.php b/lib/featureduserssection.php
index f0753a25ed..8dacdc332d 100644
--- a/lib/featureduserssection.php
+++ b/lib/featureduserssection.php
@@ -40,7 +40,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class FeaturedUsersSection extends ProfileSection
 {
     function getProfiles()
@@ -84,6 +83,7 @@ class FeaturedUsersSection extends ProfileSection
 
     function title()
     {
+        // TRANS: Title for featured users section.
         return _('Featured users');
     }
 
diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php
index 1f543b8974..533e9f43d2 100644
--- a/lib/personalgroupnav.php
+++ b/lib/personalgroupnav.php
@@ -52,7 +52,6 @@ require_once INSTALLDIR.'/lib/widget.php';
  *
  * @see      HTMLOutputter
  */
-
 class PersonalGroupNav extends Widget
 {
     var $action = null;
@@ -62,7 +61,6 @@ class PersonalGroupNav extends Widget
      *
      * @param Action $action current action, used for output
      */
-
     function __construct($action=null)
     {
         parent::__construct($action);
@@ -74,7 +72,6 @@ class PersonalGroupNav extends Widget
      *
      * @return void
      */
-
     function show()
     {
         $user = null;
@@ -99,22 +96,29 @@ class PersonalGroupNav extends Widget
         if (Event::handle('StartPersonalGroupNav', array($this))) {
             $this->out->menuItem(common_local_url('all', array('nickname' =>
                                                            $nickname)),
-                             _('Personal'),
+                             // TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
+                             _m('MENU','Personal'),
+                             // TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
                              sprintf(_('%s and friends'), $name),
                              $action == 'all', 'nav_timeline_personal');
             $this->out->menuItem(common_local_url('replies', array('nickname' =>
                                                                   $nickname)),
-                             _('Replies'),
+                             // TRANS: Personal group navigation menu option when logged in for viewing @-replies.
+                             _m('MENU','Replies'),
+                             // TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
                              sprintf(_('Replies to %s'), $name),
                              $action == 'replies', 'nav_timeline_replies');
             $this->out->menuItem(common_local_url('showstream', array('nickname' =>
                                                                   $nickname)),
-                             _('Profile'),
+                             // TRANS: Personal group navigation menu option when logged in for seeing own profile.
+                             _m('MENU','Profile'),
                              $name,
                              $action == 'showstream', 'nav_profile');
             $this->out->menuItem(common_local_url('showfavorites', array('nickname' =>
                                                                   $nickname)),
-                             _('Favorites'),
+                             // TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
+                             _m('MENU','Favorites'),
+                             // TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
                              sprintf(_('%s\'s favorite notices'), ($user_profile) ? $name : _('User')),
                              $action == 'showfavorites', 'nav_timeline_favorites');
 
@@ -125,12 +129,16 @@ class PersonalGroupNav extends Widget
 
                 $this->out->menuItem(common_local_url('inbox', array('nickname' =>
                                                                          $nickname)),
-                                 _('Inbox'),
+                                 // TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+                                 _m('MENU','Inbox'),
+                                 // TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
                                  _('Your incoming messages'),
                                  $action == 'inbox');
                 $this->out->menuItem(common_local_url('outbox', array('nickname' =>
                                                                          $nickname)),
-                                 _('Outbox'),
+                                 // TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+                                 _m('MENU','Outbox'),
+                                 // TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
                                  _('Your sent messages'),
                                  $action == 'outbox');
             }
diff --git a/lib/personaltagcloudsection.php b/lib/personaltagcloudsection.php
index 5ea3f188db..fd10ba14d6 100644
--- a/lib/personaltagcloudsection.php
+++ b/lib/personaltagcloudsection.php
@@ -40,7 +40,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class PersonalTagCloudSection extends TagCloudSection
 {
     var $user = null;
@@ -53,6 +52,7 @@ class PersonalTagCloudSection extends TagCloudSection
 
     function title()
     {
+        // TRANS: Title for personal tag cloud section. %s is a user nickname.
         return sprintf(_('Tags in %s\'s notices'), $this->user->nickname);
     }
 
@@ -84,5 +84,4 @@ class PersonalTagCloudSection extends TagCloudSection
                                                  3600);
         return $tag;
     }
-
 }
diff --git a/lib/popularnoticesection.php b/lib/popularnoticesection.php
index a4f038b246..f6f27c6878 100644
--- a/lib/popularnoticesection.php
+++ b/lib/popularnoticesection.php
@@ -43,7 +43,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class PopularNoticeSection extends NoticeSection
 {
     function getNotices()
@@ -59,6 +58,7 @@ class PopularNoticeSection extends NoticeSection
 
     function title()
     {
+        // TRANS: Title for favourited notices section.
         return _('Popular notices');
     }
 
diff --git a/lib/profileformaction.php b/lib/profileformaction.php
index 51c89a922e..5706528223 100644
--- a/lib/profileformaction.php
+++ b/lib/profileformaction.php
@@ -40,7 +40,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
-
 class ProfileFormAction extends RedirectingAction
 {
     var $profile = null;
@@ -52,7 +51,6 @@ class ProfileFormAction extends RedirectingAction
      *
      * @return boolean success flag
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -61,6 +59,7 @@ class ProfileFormAction extends RedirectingAction
 
         if (!common_logged_in()) {
             if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+                // TRANS: Client error displayed when trying to change user options while not logged in.
                 $this->clientError(_('Not logged in.'));
             } else {
                 // Redirect to login.
@@ -76,6 +75,7 @@ class ProfileFormAction extends RedirectingAction
         $id = $this->trimmed('profileid');
 
         if (!$id) {
+            // TRANS: Client error displayed when trying to change user options without specifying a user to work on.
             $this->clientError(_('No profile specified.'));
             return false;
         }
@@ -83,6 +83,7 @@ class ProfileFormAction extends RedirectingAction
         $this->profile = Profile::staticGet('id', $id);
 
         if (!$this->profile) {
+            // TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
             $this->clientError(_('No profile with that ID.'));
             return false;
         }
@@ -99,7 +100,6 @@ class ProfileFormAction extends RedirectingAction
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
@@ -117,9 +117,9 @@ class ProfileFormAction extends RedirectingAction
      *
      * @return void
      */
-
     function handlePost()
     {
+        // TRANS: Server error displayed when using an unimplemented method.
         $this->serverError(_("Unimplemented method."));
     }
 }

From 3fc323f8f9f01b8d4186207b54575d3459f06762 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Mon, 31 Jan 2011 00:04:03 +0100
Subject: [PATCH 145/314] Localisation updates from http://translatewiki.net.

---
 locale/ar/LC_MESSAGES/statusnet.po            | 492 +++++++++++-------
 locale/arz/LC_MESSAGES/statusnet.po           | 402 ++++++++------
 locale/bg/LC_MESSAGES/statusnet.po            | 402 ++++++++------
 locale/br/LC_MESSAGES/statusnet.po            | 409 +++++++++------
 locale/ca/LC_MESSAGES/statusnet.po            | 433 +++++++++------
 locale/cs/LC_MESSAGES/statusnet.po            | 404 ++++++++------
 locale/de/LC_MESSAGES/statusnet.po            | 404 ++++++++------
 locale/en_GB/LC_MESSAGES/statusnet.po         | 404 ++++++++------
 locale/eo/LC_MESSAGES/statusnet.po            | 404 ++++++++------
 locale/es/LC_MESSAGES/statusnet.po            | 404 ++++++++------
 locale/fa/LC_MESSAGES/statusnet.po            | 404 ++++++++------
 locale/fi/LC_MESSAGES/statusnet.po            | 402 ++++++++------
 locale/fr/LC_MESSAGES/statusnet.po            | 404 ++++++++------
 locale/gl/LC_MESSAGES/statusnet.po            | 404 ++++++++------
 locale/hsb/LC_MESSAGES/statusnet.po           | 459 +++++++++-------
 locale/hu/LC_MESSAGES/statusnet.po            | 406 +++++++++------
 locale/ia/LC_MESSAGES/statusnet.po            | 433 +++++++++------
 locale/is/LC_MESSAGES/statusnet.po            | 402 ++++++++------
 locale/it/LC_MESSAGES/statusnet.po            | 404 ++++++++------
 locale/ja/LC_MESSAGES/statusnet.po            | 404 ++++++++------
 locale/ka/LC_MESSAGES/statusnet.po            | 406 +++++++++------
 locale/ko/LC_MESSAGES/statusnet.po            | 402 ++++++++------
 locale/mk/LC_MESSAGES/statusnet.po            | 433 +++++++++------
 locale/ml/LC_MESSAGES/statusnet.po            | 403 ++++++++------
 locale/nb/LC_MESSAGES/statusnet.po            | 404 ++++++++------
 locale/nl/LC_MESSAGES/statusnet.po            | 435 ++++++++++------
 locale/nn/LC_MESSAGES/statusnet.po            | 402 ++++++++------
 locale/pl/LC_MESSAGES/statusnet.po            | 435 ++++++++++------
 locale/pt/LC_MESSAGES/statusnet.po            | 404 ++++++++------
 locale/pt_BR/LC_MESSAGES/statusnet.po         | 404 ++++++++------
 locale/ru/LC_MESSAGES/statusnet.po            | 404 ++++++++------
 locale/statusnet.pot                          | 384 +++++++++-----
 locale/sv/LC_MESSAGES/statusnet.po            | 404 ++++++++------
 locale/te/LC_MESSAGES/statusnet.po            | 402 ++++++++------
 locale/tr/LC_MESSAGES/statusnet.po            | 403 ++++++++------
 locale/uk/LC_MESSAGES/statusnet.po            | 437 ++++++++++------
 locale/zh_CN/LC_MESSAGES/statusnet.po         | 404 ++++++++------
 .../locale/ca/LC_MESSAGES/Facebook.po         |  67 ++-
 .../OStatus/locale/fr/LC_MESSAGES/OStatus.po  |  11 +-
 .../OStatus/locale/ia/LC_MESSAGES/OStatus.po  |  11 +-
 .../OStatus/locale/mk/LC_MESSAGES/OStatus.po  |  11 +-
 .../OStatus/locale/nl/LC_MESSAGES/OStatus.po  |  11 +-
 .../OStatus/locale/uk/LC_MESSAGES/OStatus.po  |  11 +-
 .../locale/ia/LC_MESSAGES/SubMirror.po        |  10 +-
 .../locale/mk/LC_MESSAGES/SubMirror.po        |  10 +-
 .../locale/nl/LC_MESSAGES/SubMirror.po        |  10 +-
 .../locale/uk/LC_MESSAGES/SubMirror.po        |  10 +-
 47 files changed, 9731 insertions(+), 5677 deletions(-)

diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index 142ff0c7fe..acc2a41ee3 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 #
 # Author: Brion
+# Author: Majid Al-Dharrab
 # Author: Meno25
 # Author: OsamaK
 # --
@@ -11,19 +12,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:47:36+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52:00+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 (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
 "2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
 "99) ? 4 : 5 ) ) ) );\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -91,7 +92,7 @@ msgstr "حفظ إعدادت الوصول"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -104,7 +105,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/showfavorites.php:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "لا صفحة كهذه."
 
@@ -131,6 +132,8 @@ msgstr "لا صفحة كهذه."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +149,12 @@ msgstr "لا صفحة كهذه."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -168,9 +171,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s والأصدقاء"
@@ -321,8 +325,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -360,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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
 msgid ""
@@ -387,9 +391,8 @@ msgstr[5] ""
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
-#, fuzzy
 msgid "Unable to save your design settings."
-msgstr "تعذّر حذف إعدادات التصميم."
+msgstr "تعذّر حفظ إعدادات تصميمك."
 
 #. TRANS: Error displayed when updating design settings fails.
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
@@ -530,8 +533,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "تعذّر إنشاء مفضلة."
 
@@ -542,28 +546,26 @@ 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:91
+#: 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 "لم يمكن حفظ الملف."
+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
+#, php-format
 msgid "Could not follow user: %s is already on your list."
-msgstr "لم يمكن ضم المستخدم %1$s إلى المجموعة %2$s."
+msgstr "تعذر متابعة المستخدم: %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 "لا يمكنك عدم متابعة نفسك."
+msgstr "تعذر إلغاء الاشتراك: المستخدم غير موجود."
 
 #. TRANS: Client error displayed when trying to unfollow self.
 #: actions/apifriendshipsdestroy.php:121
@@ -608,10 +610,11 @@ msgstr "ليس اسمًا مستعارًا صحيحًا."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -624,20 +627,20 @@ msgstr "الصفحة الرئيسية ليست عنونًا صالحًا."
 #: actions/apigroupcreate.php:191 actions/editgroup.php:204
 #: actions/newgroup.php:151 actions/profilesettings.php:252
 #: actions/register.php:226
-#, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
-msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
+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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
@@ -693,7 +696,7 @@ msgstr "كنية غير صالحة: \"%s\"."
 #: actions/newgroup.php:192
 #, fuzzy, php-format
 msgid "Alias \"%s\" already in use. Try another one."
-msgstr "الاسم المستعار مستخدم بالفعل. جرّب اسمًا آخرًا."
+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.
@@ -817,8 +820,8 @@ msgstr "لا تملك تصريحًا."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -852,14 +855,15 @@ msgstr "خطأ في قاعدة البيانات أثناء حذف مستخدم 
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -898,7 +902,6 @@ msgstr ""
 
 #. TRANS: Fieldset legend.
 #: actions/apioauthauthorize.php:455
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "الحساب"
@@ -928,7 +931,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -937,7 +940,6 @@ 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 "اسمح"
@@ -1338,7 +1340,7 @@ 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 ""
+msgstr "أنت ممنوع من قِبل المدير."
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
 #: actions/atompubshowfavorite.php:90
@@ -1549,7 +1551,7 @@ msgstr "لم يُرفع ملف."
 #. 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"
-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.
@@ -1614,7 +1616,7 @@ 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 "لقد منعت مسبقا هذا المستخدم."
+msgstr "لقد منعتَ هذا المستخدم مسبقًا."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
@@ -1629,6 +1631,8 @@ msgid ""
 "unsubscribed from you, unable to subscribe to you in the future, and you "
 "will not be notified of any @-replies from them."
 msgstr ""
+"هل أنت متأكد من أنك تريد منع هذا المستخدم؟ إن قمتَ بذلك فسيُلغى اشتراكه معك، "
+"ولن يتمكن من الاشتراك لديك مستقبلًا، ولن تُبلغ بأي ردود منه."
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
@@ -1789,14 +1793,14 @@ 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 ""
+msgstr "يجب أن تكتب \"%s\" كما هي في الصندوق."
 
 #. TRANS: Confirmation that a user account has been deleted.
 #: actions/deleteaccount.php:206
@@ -1866,7 +1870,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:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr ""
@@ -1959,15 +1963,17 @@ 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.
+#. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "لست والجًا."
@@ -2223,12 +2229,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "أضف إلى المفضلات"
 
@@ -2261,66 +2267,76 @@ msgid "Use this form to edit your application."
 msgstr "استخدم هذا النموذج لتعدل تطبيقك."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "المنظمة طويلة جدا (الأقصى 255 حرفا)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "لم يمكن تحديث التطبيق."
 
@@ -2374,25 +2390,25 @@ msgid "Options saved."
 msgstr "حُفظت الخيارات."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 msgid "Email settings"
 msgstr "إعدادات البريد الإلكتروني"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "عنوان البريد الإلكتروني"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "عنوان البريد الإلكتروني المُؤكد الحالي."
 
@@ -2401,14 +2417,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "أزل"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2419,14 +2436,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2434,29 +2451,29 @@ msgstr "أضف"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "البريد الإلكتروني الوارد"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2464,89 +2481,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "جديد"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "تفضيلات البريد الإلكتروني"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 msgid "Send me notices of new subscriptions through email."
 msgstr "أرسل لي إشعارات بالاشتراكات الجديدة عبر البريد الإلكتروني."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:222
+#: actions/emailsettings.php:218
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "أرسل لي بريدًا إلكرتونيًا عندما يضيف أحدهم إشعاري مفضلة."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:229
+#: actions/emailsettings.php:225
 msgid "Send me email when someone sends me a private message."
 msgstr "أرسل لي بريدًا إلكترونيًا عندما يرسل لي أحد رسالة خاصة."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:235
+#: actions/emailsettings.php:231
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "أرسل لي بريدًا إلكترونيًا عندما يرسل لي أحد \"@-رد\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:241
+#: actions/emailsettings.php:237
 msgid "Allow friends to nudge me and send me an email."
 msgstr "اسمح لأصدقائي بتنبيهي ومراسلتي عبر البريد الإلكتروني."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:247
+#: actions/emailsettings.php:243
 msgid "Publish a MicroID for my email address."
 msgstr "انشر هوية مصغّرة لعنوان بريدي الإلكتروني."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:368
+#: actions/emailsettings.php:361
 msgid "Email preferences saved."
 msgstr "حُفظت تفضيلات البريد الإلكرتوني."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "لا عنوان بريد إلكتروني."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
+#: actions/emailsettings.php:388
 #, fuzzy
-msgid "Cannot normalize that email address"
+msgid "Cannot normalize that email address."
 msgstr "عنوان البريد الإلكتروني المُؤكد الحالي."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: 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:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "تعذّر إدراج رمز التأكيد."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:433
+#: actions/emailsettings.php:425
 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."
@@ -2555,142 +2572,171 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 #, 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:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "تعذّر حذف تأكيد البريد الإلكتروني."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 msgid "That is not your email address."
 msgstr "هذا ليس عنوان بريدك الإلكتروني."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "أزيل عنوان البريد الإلكتروني."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 #, fuzzy
 msgid "New incoming email address added."
 msgstr "لا عنوان بريد إلكتروني وارد."
 
-#: actions/favor.php:79
+#. 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 "هذا الإشعار مفضلة مسبقًا!"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. 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 "إشعارات محبوبة"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. TRANS: Description on page displaying favorited notices.
+#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "أشهر الإشعارات على الموقع حاليًا."
 
-#: actions/favorited.php:150
+#. 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."
 msgstr ""
 
-#: actions/favorited.php:156
+#. 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 "
 "notice to your favorites!"
 msgstr ""
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "إشعارات %s المُفضلة"
 
-#: actions/favoritesrss.php:115
+#. 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 "مستخدمون مختارون"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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"
 
-#: actions/file.php:34
+#. TRANS: Client error displayed when no notice ID was given trying do display a file.
+#: actions/file.php:36
 msgid "No notice ID."
 msgstr "لا رقم ملاحظة."
 
-#: actions/file.php:38
+#. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
+#: actions/file.php:41
 msgid "No notice."
 msgstr "لا ملاحظة."
 
-#: actions/file.php:42
+#. 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 "لا مرفقات."
 
-#: actions/file.php:51
+#. 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 "لا مرفقات مرفوعة."
 
@@ -2754,6 +2800,7 @@ msgstr "لدى المستخدم هذا الدور من قبل."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2762,9 +2809,10 @@ msgstr "لا ملف شخصي مُحدّد."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "لا ملف شخصي بهذه الهوية."
 
@@ -2863,7 +2911,7 @@ msgstr "مجموعات"
 #. TRANS: Form instructions on the group logo page.
 #: actions/grouplogo.php:379
 msgid "Pick a square area of the image to be the logo."
-msgstr ""
+msgstr "اختر منطقة مربعة من الصورة لتكون الشعار."
 
 #. TRANS: Form success message after updating a group logo.
 #: actions/grouplogo.php:414
@@ -2901,13 +2949,13 @@ msgstr "إداري"
 #: actions/groupmembers.php:399
 msgctxt "BUTTON"
 msgid "Block"
-msgstr ""
+msgstr "امنع"
 
 #. TRANS: Submit button title.
 #: actions/groupmembers.php:403
 msgctxt "TOOLTIP"
 msgid "Block this user"
-msgstr ""
+msgstr "امنع هذا المستخدم"
 
 #: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
@@ -2917,13 +2965,13 @@ msgstr "اجعل المستخدم إداريًا في المجموعة"
 #: actions/groupmembers.php:533
 msgctxt "BUTTON"
 msgid "Make Admin"
-msgstr ""
+msgstr "اجعله إداريًا"
 
 #. TRANS: Submit button title.
 #: actions/groupmembers.php:537
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
-msgstr ""
+msgstr "اجعل هذا المستخدم إداريًا"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #: actions/grouprss.php:142
@@ -3414,19 +3462,19 @@ msgstr "خاص"
 
 #: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
-msgstr ""
+msgstr "جميع الحقوق محفوظة"
 
 #: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
-msgstr ""
+msgstr "المشاع المبدع"
 
 #: actions/licenseadminpanel.php:245
 msgid "Type"
-msgstr ""
+msgstr "النوع"
 
 #: actions/licenseadminpanel.php:247
 msgid "Select license"
-msgstr ""
+msgstr "اختر رخصة"
 
 #: actions/licenseadminpanel.php:261
 msgid "License details"
@@ -3554,20 +3602,23 @@ msgid "New application"
 msgstr "تطبيق جديد"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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 "استخدم هذا النموذج لتسجل تطبيقا جديدا."
 
-#: actions/newapplication.php:184
+#. 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 "مسار المصدر ليس صحيحا."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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 "لم يمكن إنشاء التطبيق."
 
@@ -3616,7 +3667,7 @@ msgstr "لا مستلم حُدّد."
 #: actions/newmessage.php:167 lib/command.php:505
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr ""
+msgstr "لا ترسل رسالة إلى نفسك، قلها لنفسك في سرك بدلًا من ذلك."
 
 #: actions/newmessage.php:184
 msgid "Message sent"
@@ -4737,7 +4788,7 @@ 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 "حُفظت كلمة السر الجديدة بنجاح. أنت الآن والج."
 
 #: actions/register.php:92 actions/register.php:196 actions/register.php:413
 msgid "Sorry, only invited people can register."
@@ -4791,11 +4842,11 @@ msgstr "البريد الإلكتروني"
 
 #: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
+msgstr "لا يُستخدم إلا عند التحديثات، والتعميمات، ولاستعادة كلمة السر"
 
 #: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
-msgstr ""
+msgstr "اسم أطول. يُفضَّل استخدام اسمك الحقيقي"
 
 #: actions/register.php:462
 msgid "URL of your homepage, blog, or profile on another site"
@@ -4936,8 +4987,9 @@ msgstr "مكرر"
 msgid "Repeated!"
 msgstr "مكرر!"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "الردود على %s"
@@ -5222,38 +5274,47 @@ msgstr ""
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "أمتأكد من أنك تريد إعادة ضبط مفتاح المستهلك وكلمة سره؟"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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 "تعذّر إنشاء مفضلة."
 
-#: actions/showfavorites.php:171
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr ""
 
-#: actions/showfavorites.php:178
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr ""
 
-#: actions/showfavorites.php:185
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr ""
 
-#: actions/showfavorites.php:206
+#. 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."
 msgstr ""
 
-#: actions/showfavorites.php:208
+#. 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 "
@@ -5262,7 +5323,10 @@ msgstr ""
 "%s لم يضف أي إشعارات إلى مفضلته إلى الآن. أرسل شيئًا شيقًا ليضيفه إلى "
 "مفضلته. :)"
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5272,7 +5336,8 @@ msgstr ""
 "%s لم يضف أي إشعارات إلى مفضلته إلى الآن. لمّ لا [تسجل حسابًا](%%%%action."
 "register%%%%) وترسل شيئًا شيقًا ليضيفه إلى مفضلته. :)"
 
-#: actions/showfavorites.php:243
+#. TRANS: Page notice for show favourites page.
+#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "إنها إحدى وسائل مشاركة ما تحب."
 
@@ -5637,7 +5702,7 @@ msgstr "اللغة المبدئية"
 
 #: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
-msgstr ""
+msgstr "لغة الموقع إذا لم يتوفر اكتشاف اللغة آليًا من إعدادات المتصفح"
 
 #: actions/siteadminpanel.php:271
 msgid "Limits"
@@ -5659,6 +5724,8 @@ 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
@@ -5738,7 +5805,7 @@ msgstr "رمز التأكيد"
 #. TRANS: Form field instructions in SMS settings form.
 #: actions/smssettings.php:140
 msgid "Enter the code you received on your phone."
-msgstr ""
+msgstr "أدخِل الرمز الذي تلقيته على هاتفك."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
 #: actions/smssettings.php:144
@@ -5802,6 +5869,8 @@ 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
@@ -5827,13 +5896,12 @@ msgstr "تمت إزالة رقم هاتف الرسائل القصيرة."
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
 #: actions/smssettings.php:499
 msgid "Mobile carrier"
-msgstr ""
+msgstr "شركة الهاتف الخليوي"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
 #: actions/smssettings.php:504
-#, fuzzy
 msgid "Select a carrier"
-msgstr "اختر وسمًا لترشيحه"
+msgstr "اختر شركة"
 
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
@@ -5846,7 +5914,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "لم تدخل رمزًا"
 
 #. TRANS: Menu item for site administration
@@ -5967,7 +6036,7 @@ msgstr "هؤلاء هم الأشخاص الذين يستمعون إلى إشعا
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
-msgstr ""
+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.
@@ -6171,7 +6240,6 @@ msgstr ""
 
 #. TRANS: Link description in user account settings menu.
 #: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "الملف الشخصي"
 
@@ -6183,7 +6251,7 @@ 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 ""
+msgstr "الحد الأقصى لطول التعريف الشخصي في حساب المستخدم (بالأحرف)."
 
 #. TRANS: Form legend in user admin panel.
 #: actions/useradminpanel.php:231
@@ -6224,12 +6292,12 @@ 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 ""
+msgstr "اسمح للمستخدمين بدعوة مستخدمين جدد."
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
 msgid "Save user settings"
-msgstr ""
+msgstr "احفظ إعدادات المستخدم"
 
 #: actions/userauthorization.php:105
 #, fuzzy
@@ -6242,6 +6310,8 @@ msgid ""
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
 "click “Reject”."
 msgstr ""
+"يُرجى التحقق من هذه التفاصيل للتأكد من أنك تريد الاستماع لإشعارات هذا "
+"المستخدم. إذا لم تطلب للتو الاستماع لإشعارات شخص ما فانقر \"ارفض\"."
 
 #. TRANS: Menu item for site administration
 #: actions/userauthorization.php:196 actions/version.php:167
@@ -6321,7 +6391,7 @@ msgstr "مسار المصدر ليس صحيحا."
 #: actions/userauthorization.php:350
 #, php-format
 msgid "Can’t read avatar URL ‘%s’."
-msgstr ""
+msgstr "تعذر قراءة رابط الأفتار ‘%s’."
 
 #: actions/userauthorization.php:355
 #, php-format
@@ -6400,6 +6470,9 @@ msgid ""
 "Software Foundation, either version 3 of the License, or (at your option) "
 "any later version. "
 msgstr ""
+"StatusNet برمجية حرة، يمكنك إعادة توزيعها وتعديلها تحت شروط رخصة غنو أفيرو "
+"العمومية كما نشرتها مؤسسة البرمجيات الحرة، برخصتها الثالثة أو أي نسخة تليها "
+"(أيهما تشاء)."
 
 #: actions/version.php:176
 msgid ""
@@ -6430,7 +6503,7 @@ msgid "Author(s)"
 msgstr "المؤلف(ون)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "فضّل"
 
@@ -6705,7 +6778,7 @@ msgstr "غير مشترك!"
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:183
 msgid "Could not delete self-subscription."
-msgstr "تعذّر حفظ الاشتراك."
+msgstr "تعذّر حذف الاشتراك الذاتي."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:211
@@ -6845,61 +6918,62 @@ msgstr ""
 msgid "Primary site navigation"
 msgstr "ضبط الموقع الأساسي"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "الملف الشخصي ومسار الأصدقاء الزمني"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "الصفحة الشخصية"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "غير بريدك الإلكتروني وكلمة سرّك وأفتارك وملفك الشخصي"
 
-#. TRANS: Main menu option when logged in for access to user settings
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "الحساب"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 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
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "اتصل"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "غيّر ضبط الموقع"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
 #: lib/action.php:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "إداري"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, 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
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -6911,57 +6985,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "اخرج من الموقع"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "اخرج"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "أنشئ حسابًا"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "سجّل"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "لُج إلى الموقع"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "لُج"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "ساعدني!"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "مساعدة"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "ابحث عن أشخاص أو نصوص"
 
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7263,7 +7337,7 @@ msgid "User configuration"
 msgstr "ضبط المستخدم"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "المستخدم"
 
@@ -8064,14 +8138,32 @@ msgstr "استعيدت مبدئيات التصميم."
 msgid "Unable to find services for %s."
 msgstr "استخدم هذا النموذج لتعدل تطبيقك."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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 "ألغِ تفضيل هذا الإشعار"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+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
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Favor"
+msgstr "فضّل"
+
 #: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "آرإس​إس 1.0"
@@ -8883,34 +8975,52 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "تعذّر إدراج اشتراك جديد."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "شخصية"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "الردود"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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 "المفضلات"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "صندوق الوارد"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "رسائلك الواردة"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "صندوق الصادر"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -8964,6 +9074,7 @@ msgstr "المُعدّل اليومي"
 msgid "All groups"
 msgstr "كل المجموعات"
 
+#. TRANS: Server error displayed when using an unimplemented method.
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
@@ -9396,3 +9507,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Personal"
+#~ msgstr "شخصية"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index d04af4271e..952b5a7399 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:47:38+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52:04+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 (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: arz\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -94,7 +94,7 @@ msgstr "اذف إعدادت الموقع"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -108,7 +108,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/showfavorites.php:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "لا وسم كهذا."
 
@@ -135,6 +135,8 @@ msgstr "لا وسم كهذا."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +152,12 @@ msgstr "لا وسم كهذا."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -172,9 +174,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s والأصدقاء"
@@ -325,8 +328,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -364,7 +367,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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
 msgid ""
@@ -535,8 +538,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "تعذّر إنشاء مفضله."
 
@@ -547,7 +551,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "تعذّر حذف المفضله."
 
@@ -614,10 +618,11 @@ msgstr "ليس اسمًا مستعارًا صحيحًا."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -637,13 +642,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
@@ -824,8 +830,8 @@ msgstr "لا تملك تصريحًا."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -859,14 +865,15 @@ msgstr "خطأ قاعده البيانات أثناء إدخال المستخد
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -935,7 +942,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 #, fuzzy
@@ -1881,7 +1888,7 @@ msgstr "انت مش بتملك الapplication دى."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr ""
@@ -1976,15 +1983,17 @@ 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.
+#. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "لست والجًا."
@@ -2241,12 +2250,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "أضف إلى المفضلات"
 
@@ -2280,67 +2289,77 @@ msgid "Use this form to edit your application."
 msgstr "استعمل الفورمه دى علشان تعدّل الapplication بتاعتك."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "المنظمه طويله جدا (اكتر حاجه 255 رمز)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "ما نفعش تحديث الapplication."
 
@@ -2394,25 +2413,25 @@ msgid "Options saved."
 msgstr "حُفظت الخيارات."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 msgid "Email settings"
 msgstr "تظبيطات الايميل"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "عنوان الايميل"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "عنوان البريد الإلكترونى المُؤكد الحالى."
 
@@ -2421,14 +2440,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "استرجع"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2439,14 +2459,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 #, fuzzy
 msgctxt "BUTTON"
@@ -2455,29 +2475,29 @@ msgstr "أضف"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "البريد الإلكترونى الوارد"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2485,93 +2505,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 #, fuzzy
 msgctxt "BUTTON"
 msgid "New"
 msgstr "جديد"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "عناوين البريد الإلكتروني"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 msgid "Send me notices of new subscriptions through email."
 msgstr "أرسل لى إشعارات بالاشتراكات الجديده عبر البريد الإلكترونى."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:222
+#: actions/emailsettings.php:218
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "أرسل لى بريدًا إلكرتونيًا عندما يضيف أحدهم إشعارى مفضله."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:229
+#: actions/emailsettings.php:225
 #, fuzzy
 msgid "Send me email when someone sends me a private message."
 msgstr "أرسل لى بريدًا إلكترونيًا عندما يرسل لى أحدهم \"@-رد\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:235
+#: actions/emailsettings.php:231
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "أرسل لى بريدًا إلكترونيًا عندما يرسل لى أحدهم \"@-رد\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:241
+#: actions/emailsettings.php:237
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:247
+#: actions/emailsettings.php:243
 #, fuzzy
 msgid "Publish a MicroID for my email address."
 msgstr "هذا ليس عنوان بريدك الإلكترونى."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:368
+#: actions/emailsettings.php:361
 #, fuzzy
 msgid "Email preferences saved."
 msgstr "حُفِظت التفضيلات."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "لا عنوان بريد إلكترونى."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
+#: actions/emailsettings.php:388
 #, fuzzy
-msgid "Cannot normalize that email address"
+msgid "Cannot normalize that email address."
 msgstr "عنوان البريد الإلكترونى المُؤكد الحالى."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: 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:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "تعذّر إدراج رمز التأكيد."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:433
+#: actions/emailsettings.php:425
 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."
@@ -2580,144 +2600,173 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 #, 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:459
+#: actions/emailsettings.php:450
 #, 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "تعذّر حذف تأكيد البريد الإلكترونى."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 msgid "That is not your email address."
 msgstr "هذا ليس عنوان بريدك الإلكترونى."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "لا عنوان بريد إلكترونى."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 #, 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 #, fuzzy
 msgid "New incoming email address added."
 msgstr "لا عنوان بريد إلكترونى."
 
-#: actions/favor.php:79
+#. 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 "هذا الإشعار مفضله مسبقًا!"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. 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 "إشعارات مشهورة"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. TRANS: Description on page displaying favorited notices.
+#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "أشهر الإشعارات على الموقع حاليًا."
 
-#: actions/favorited.php:150
+#. 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."
 msgstr ""
 
-#: actions/favorited.php:156
+#. 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 "
 "notice to your favorites!"
 msgstr ""
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "إشعارات %s المُفضلة"
 
-#: actions/favoritesrss.php:115
+#. 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 "مستخدمون مختارون"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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"
 
-#: actions/file.php:34
+#. 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."
 
-#: actions/file.php:38
+#. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
+#: actions/file.php:41
 msgid "No notice."
 msgstr "ما فيش ملاحظه."
 
-#: actions/file.php:42
+#. 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 "لا مرفقات."
 
-#: actions/file.php:51
+#. 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."
 
@@ -2785,6 +2834,7 @@ msgstr "المستخدم مسكت من قبل."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2793,9 +2843,10 @@ msgstr "لا ملف شخصى مُحدّد."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "لا ملف شخصى بهذه الهويه."
 
@@ -3585,20 +3636,23 @@ msgid "New application"
 msgstr "ما فيش application زى كده."
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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 جديد."
 
-#: actions/newapplication.php:184
+#. 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 مش مظبوط."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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."
 
@@ -4964,8 +5018,9 @@ msgstr "مكرر"
 msgid "Repeated!"
 msgstr "مكرر!"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "الردود على %s"
@@ -5253,38 +5308,47 @@ msgstr ""
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟"
 
-#: actions/showfavorites.php:79
+#. 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 المُفضلة"
 
-#: actions/showfavorites.php:132
+#. 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 "تعذّر إنشاء مفضله."
 
-#: actions/showfavorites.php:171
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr ""
 
-#: actions/showfavorites.php:178
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr ""
 
-#: actions/showfavorites.php:185
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr ""
 
-#: actions/showfavorites.php:206
+#. 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."
 msgstr ""
 
-#: actions/showfavorites.php:208
+#. 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 "
@@ -5293,7 +5357,10 @@ msgstr ""
 "%s لم يضف أى إشعارات إلى مفضلته إلى الآن. أرسل شيئًا شيقًا ليضيفه إلى "
 "مفضلته. :)"
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5303,7 +5370,8 @@ msgstr ""
 "%s لم يضف أى إشعارات إلى مفضلته إلى الآن. لمّ لا [تسجل حسابًا](%%%%action."
 "register%%%%) وترسل شيئًا شيقًا ليضيفه إلى مفضلته. :)"
 
-#: actions/showfavorites.php:243
+#. TRANS: Page notice for show favourites page.
+#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "إنها إحدى وسائل مشاركه ما تحب."
 
@@ -5885,7 +5953,7 @@ msgstr ""
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
 #, fuzzy
-msgid "No code entered"
+msgid "No code entered."
 msgstr "لا محتوى!"
 
 #. TRANS: Menu item for site administration
@@ -6208,7 +6276,6 @@ msgstr ""
 
 #. TRANS: Link description in user account settings menu.
 #: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "الملف الشخصي"
 
@@ -6466,7 +6533,7 @@ msgid "Author(s)"
 msgstr "المؤلف/ين"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "فضّل"
 
@@ -6882,51 +6949,52 @@ msgstr ""
 msgid "Primary site navigation"
 msgstr "ضبط الموقع الأساسي"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "الملف الشخصى ومسار الأصدقاء الزمني"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 #, fuzzy
 msgctxt "MENU"
 msgid "Personal"
 msgstr "شخصية"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "غير كلمه سرّك"
 
-#. TRANS: Main menu option when logged in for access to user settings
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "الحساب"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 #, 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
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "اتصل"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "ضبط الموقع الأساسي"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
 #: lib/action.php:556 lib/groupnav.php:117
 #, fuzzy
@@ -6934,14 +7002,14 @@ msgctxt "MENU"
 msgid "Admin"
 msgstr "إداري"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 #, fuzzy
 msgctxt "MENU"
@@ -6954,19 +7022,19 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "سمه الموقع."
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "الشعار"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "أنشئ مجموعه جديدة"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 #, fuzzy
@@ -6974,14 +7042,14 @@ msgctxt "MENU"
 msgid "Register"
 msgstr "سجّل"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "لُج إلى الموقع"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 #, fuzzy
@@ -6989,27 +7057,27 @@ msgctxt "MENU"
 msgid "Login"
 msgstr "لُج"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "مساعدة"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 #, fuzzy
 msgctxt "MENU"
 msgid "Help"
 msgstr "مساعدة"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 #, 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
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 #, fuzzy
 msgctxt "MENU"
@@ -7317,7 +7385,7 @@ msgid "User configuration"
 msgstr "ضبط المسارات"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "المستخدم"
 
@@ -8088,14 +8156,32 @@ msgstr "استعيدت مبدئيات التصميم."
 msgid "Unable to find services for %s."
 msgstr "استعمل الفورمه دى علشان تعدّل الapplication بتاعتك."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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 "ألغِ تفضيل هذا الإشعار"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+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
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Favor"
+msgstr "فضّل"
+
 #: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "آرإس​إس 1.0"
@@ -8886,34 +8972,52 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "تعذّر إدراج اشتراك جديد."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "شخصية"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "الردود"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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 "المفضلات"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "صندوق الوارد"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "رسائلك الواردة"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "صندوق الصادر"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -8967,6 +9071,7 @@ msgstr ""
 msgid "All groups"
 msgstr "كل المجموعات"
 
+#. TRANS: Server error displayed when using an unimplemented method.
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
@@ -9402,3 +9507,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Personal"
+#~ msgstr "شخصية"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 6cb8c4cd2c..abff8da476 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:47:39+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52: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 (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: bg\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -88,7 +88,7 @@ msgstr "Запазване настройките за достъп"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -101,7 +101,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/showfavorites.php:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Няма такака страница."
 
@@ -128,6 +128,8 @@ msgstr "Няма такака страница."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +145,12 @@ msgstr "Няма такака страница."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -165,9 +167,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s и приятели"
@@ -316,8 +319,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -355,7 +358,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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
 msgid ""
@@ -523,8 +526,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "Грешка при отбелязване като любима."
 
@@ -535,7 +539,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Грешка при изтриване на любима бележка."
 
@@ -600,10 +604,11 @@ msgstr "Неправилен псевдоним."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -623,13 +628,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
@@ -800,8 +806,8 @@ msgstr "Не сте абонирани за никого."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -835,14 +841,15 @@ msgstr "Грешка в базата от данни — отговор при 
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -911,7 +918,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1839,7 +1846,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:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "Имаше проблем със сесията ви в сайта."
@@ -1932,15 +1939,17 @@ 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.
+#. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Не сте влезли в системата."
@@ -2204,12 +2213,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Добавяне към любимите"
 
@@ -2244,67 +2253,77 @@ msgid "Use this form to edit your application."
 msgstr "Използвайте тази бланка за създаване на нова група."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Името на организацията е твърде дълго (макс. 255 знака)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 #, fuzzy
 msgid "Could not update application."
 msgstr "Грешка при обновяване на групата."
@@ -2361,25 +2380,25 @@ msgid "Options saved."
 msgstr "Настройките са запазени."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 msgid "Email settings"
 msgstr "Настройки на е-поща"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "Адрес на е-поща"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "Текущ потвърден адрес на е-поща."
 
@@ -2388,14 +2407,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Премахване"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2408,14 +2428,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2423,29 +2443,29 @@ msgstr "Добавяне"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Входяща поща"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2453,90 +2473,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 #, fuzzy
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Ново"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "Настройки на е-поща"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 msgid "Send me notices of new subscriptions through email."
 msgstr "Изпращане на уведомления за нови абонаменти по пощата."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:222
+#: actions/emailsettings.php:218
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Изпращане на писмо при отбелязване на моя бележка като любима."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:229
+#: actions/emailsettings.php:225
 msgid "Send me email when someone sends me a private message."
 msgstr "Изпращане на писмо при ново лично съобщение."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:235
+#: actions/emailsettings.php:231
 #, fuzzy
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Изпращане на писмо при ново лично съобщение."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:241
+#: actions/emailsettings.php:237
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:247
+#: actions/emailsettings.php:243
 msgid "Publish a MicroID for my email address."
 msgstr "Публикуване на MicroID за адреса на е-пощата."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:368
+#: actions/emailsettings.php:361
 msgid "Email preferences saved."
 msgstr "Настройките на е-поща са запазени."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "Не е въведена е-поща."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, fuzzy
+msgid "Cannot normalize that email address."
 msgstr "Грешка при нормализиране адреса на е-пощата"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: 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:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Не може да се вмъкне код за потвърждение."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:433
+#: actions/emailsettings.php:425
 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."
@@ -2548,140 +2569,169 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Няма потвърждения, очакващи да бъдат отказани."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:459
+#: actions/emailsettings.php:450
 #, 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Грешка при изтриване потвърждението по е-поща."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 msgid "That is not your email address."
 msgstr "Това не е вашият адрес на е-поща."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "Входящият адрес на е-поща е премахнат."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Добавен е нов входящ адрес на е-поща."
 
-#: actions/favor.php:79
+#. 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 "Тази бележка вече е отбелязана като любима!"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. 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 "Популярни бележки"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. TRANS: Description on page displaying favorited notices.
+#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "Най-популярните бележки в момента в сайта."
 
-#: actions/favorited.php:150
+#. 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."
 msgstr ""
 
-#: actions/favorited.php:156
+#. 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 "
 "notice to your favorites!"
 msgstr ""
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Любими бележки на %s"
 
-#: actions/favoritesrss.php:115
+#. 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 "Избрани потребители"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
+#. TRANS: Description on page displaying featured users.
+#: actions/featured.php:102
 #, php-format
-msgid "A selection of some great users on %s"
+msgid "A selection of some great users on %s."
 msgstr ""
 
-#: actions/file.php:34
+#. 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 на бележка."
 
-#: actions/file.php:38
+#. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
+#: actions/file.php:41
 msgid "No notice."
 msgstr "Липсва бележка."
 
-#: actions/file.php:42
+#. 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 "Няма прикачени файлове."
 
-#: actions/file.php:51
+#. 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 "Няма прикачени файлове."
 
@@ -2749,6 +2799,7 @@ msgstr "Потребителят вече е заглушен."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2757,9 +2808,10 @@ msgstr "Не е указан профил."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Не е открит профил с такъв идентификатор."
 
@@ -3580,21 +3632,24 @@ msgid "New application"
 msgstr "Ново приложение"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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 "Използвайте тази бланка за създаване на нова група."
 
-#: actions/newapplication.php:184
+#. 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 "Името е задължително."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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 "Грешка при отбелязване като любима."
@@ -4973,8 +5028,9 @@ msgstr "Повторено"
 msgid "Repeated!"
 msgstr "Повторено!"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "Отговори на %s"
@@ -5259,44 +5315,56 @@ msgstr ""
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Наистина ли искате да изтриете тази бележка?"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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 "Грешка при изтегляне на любимите бележки"
 
-#: actions/showfavorites.php:171
+#. 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"
 
-#: actions/showfavorites.php:178
+#. 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"
 
-#: actions/showfavorites.php:185
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Емисия с приятелите на %s"
 
-#: actions/showfavorites.php:206
+#. 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."
 msgstr ""
 
-#: actions/showfavorites.php:208
+#. 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 "
 "would add to their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5304,7 +5372,8 @@ msgid ""
 "their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:243
+#. TRANS: Page notice for show favourites page.
+#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "Така можете да споделите какво харесвате."
 
@@ -5869,7 +5938,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "Не е въведен код."
 
 #. TRANS: Menu item for site administration
@@ -6190,7 +6260,6 @@ msgstr ""
 
 #. TRANS: Link description in user account settings menu.
 #: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "Профил"
 
@@ -6462,7 +6531,7 @@ msgid "Author(s)"
 msgstr "Автор(и)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Любимо"
 
@@ -6877,47 +6946,48 @@ msgstr ""
 msgid "Primary site navigation"
 msgstr "Основна настройка на сайта"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Лично"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Промяна на поща, аватар, парола, профил"
 
-#. TRANS: Main menu option when logged in for access to user settings
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "Сметка"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 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
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "Свързване"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Промяна настройките на сайта"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
 #: lib/action.php:556 lib/groupnav.php:117
 #, fuzzy
@@ -6925,14 +6995,14 @@ msgctxt "MENU"
 msgid "Admin"
 msgstr "Настройки"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, 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
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 #, fuzzy
 msgctxt "MENU"
@@ -6945,58 +7015,58 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Излизане от сайта"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Изход"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Създаване на нова сметка"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Регистриране"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Влизане в сайта"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Вход"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Помощ"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "Помощ"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Търсене за хора или бележки"
 
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7302,7 +7372,7 @@ msgid "User configuration"
 msgstr "Настройка на пътищата"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "Потребител"
 
@@ -8058,14 +8128,32 @@ msgstr ""
 msgid "Unable to find services for %s."
 msgstr "Използвайте тази бланка за създаване на нова група."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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 "Отбелязване като любимо"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+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
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Favor"
+msgstr "Любимо"
+
 #: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8838,34 +8926,52 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Грешка при добавяне на нов абонамент."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "Лично"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "Отговори"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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 "Любими"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "Входящи"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "Получените от вас съобщения"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "Изходящи"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -8920,6 +9026,7 @@ msgstr ""
 msgid "All groups"
 msgstr "Всички групи"
 
+#. TRANS: Server error displayed when using an unimplemented method.
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
@@ -9336,3 +9443,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Personal"
+#~ msgstr "Лично"
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 810dd18b7e..e3bf6299e8 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:47:41+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52: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 (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -91,7 +91,7 @@ msgstr "Enrollañ an arventennoù moned"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -104,7 +104,7 @@ 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:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "N'eus ket eus ar bajenn-se."
 
@@ -131,6 +131,8 @@ msgstr "N'eus ket eus ar bajenn-se."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +148,12 @@ msgstr "N'eus ket eus ar bajenn-se."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -168,9 +170,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s hag e vignoned"
@@ -325,8 +328,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -364,7 +367,7 @@ msgstr "Dibosupl eo enrollañ ar profil."
 #: 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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
 msgid ""
@@ -529,8 +532,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "Diposupl eo krouiñ ar pennroll-mañ."
 
@@ -541,7 +545,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Diposupl eo dilemel ar pennroll-mañ."
 
@@ -606,10 +610,11 @@ msgstr "N'eo ket ul lesanv mat."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -628,13 +633,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
@@ -800,8 +806,8 @@ msgstr "Aotreet eo bet ar jedouer reked dija."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -835,14 +841,15 @@ msgstr "Ur fazi 'zo bet en ur ensoc'hañ an avatar"
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -910,7 +917,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1704,7 +1711,7 @@ msgstr "Kadarnaet eo bet dija ar chomlec'h-mañ."
 #. TRANS: database fails in the contact address confirmation action.
 #: actions/confirmaddress.php:132
 msgid "Could not delete address confirmation."
-msgstr "Dibosubl eo dilemel kadarnadur ar chomlec'h."
+msgstr "Dibosupl dilemel ar gadarnadenn chomlec'h."
 
 #. TRANS: Title for the contact address confirmation action.
 #: actions/confirmaddress.php:150
@@ -1817,7 +1824,7 @@ msgstr "N'oc'h ket perc'henn ar poellad-se."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h."
@@ -1904,15 +1911,17 @@ msgstr "Dilemel ar strollad-mañ"
 
 #. 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 when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Nann-kevreet."
@@ -2163,12 +2172,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Ouzhpennañ d'ar pennrolloù"
 
@@ -2201,63 +2210,73 @@ 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.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: 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ñ)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Dibosupl eo hizivaat ar poellad"
 
@@ -2311,25 +2330,25 @@ msgid "Options saved."
 msgstr "Enrollet eo bet ho dibarzhioù."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 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:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "Chomlec'h postel"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "Chomlec'h postel gwiriekaet er mare-mañ."
 
@@ -2338,14 +2357,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Dilemel"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2356,14 +2376,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2371,31 +2391,31 @@ msgstr "Ouzhpennañ"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Postel o tont"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 #, 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 #, 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2403,90 +2423,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nevez"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "Penndibaboù ar posteloù"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 #, 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:222
+#: actions/emailsettings.php:218
 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:229
+#: actions/emailsettings.php:225
 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:235
+#: actions/emailsettings.php:231
 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:241
+#: actions/emailsettings.php:237
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:247
+#: actions/emailsettings.php:243
 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:368
+#: actions/emailsettings.php:361
 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:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "Chomlec'h postel ebet."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
+#: actions/emailsettings.php:388
 #, fuzzy
-msgid "Cannot normalize that email address"
+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:401 actions/register.php:212
+#: 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."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 #, 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:433
+#: actions/emailsettings.php:425
 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."
@@ -2495,94 +2515,106 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 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:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Dibosupl eo dilemel ar postel kadarnadur."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 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:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "Dilamet eo bet ar chomlec'h postel."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: actions/smssettings.php:565 actions/smssettings.php:588
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Dibosupl eo hizivaat doser an implijer."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: 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"
 
-#: actions/favor.php:79
+#. 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 !"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. TRANS: Page title for page on which favorite notices can be unfavourited.
+#: actions/favor.php:95
 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"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. 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ñ."
 
-#: actions/favorited.php:150
+#. 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."
 msgstr ""
 
-#: actions/favorited.php:156
+#. 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 "
@@ -2591,46 +2623,63 @@ msgstr ""
 "Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini "
 "gentañ da embann un dra !"
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Alioù pennrollet eus %s"
 
-#: actions/favoritesrss.php:115
+#. 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"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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"
 
-#: actions/file.php:34
+#. 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."
 
-#: actions/file.php:38
+#. 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."
 
-#: actions/file.php:42
+#. 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."
 
-#: actions/file.php:51
+#. 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."
@@ -2695,6 +2744,7 @@ msgstr "An implijer-mañ en deus dija ar roll-mañ."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2703,9 +2753,10 @@ msgstr "N'eo bet resisaet profil ebet"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "N'eus profil ebet gant an ID-mañ."
 
@@ -3273,10 +3324,10 @@ msgstr "Rankout a reoc'h bezañ luget evit mont en ur strollad."
 
 #. TRANS: Title for join group page after joining.
 #: actions/joingroup.php:147
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
-msgstr "%1$s a zo bet er strollad %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
@@ -3493,19 +3544,22 @@ msgid "New application"
 msgstr "Arload nevez"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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."
 
-#: actions/newapplication.php:184
+#. 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."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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."
 
@@ -4888,8 +4942,9 @@ msgstr "Adlavaret"
 msgid "Repeated!"
 msgstr "Adlavaret !"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "Respontoù da %s"
@@ -5173,44 +5228,56 @@ 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 ?"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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ù."
 
-#: actions/showfavorites.php:171
+#. 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)"
 
-#: actions/showfavorites.php:178
+#. 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)"
 
-#: actions/showfavorites.php:185
+#. 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)"
 
-#: actions/showfavorites.php:206
+#. 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."
 msgstr ""
 
-#: actions/showfavorites.php:208
+#. 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 "
 "would add to their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5218,7 +5285,8 @@ msgid ""
 "their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:243
+#. 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."
 
@@ -5787,7 +5855,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "N'eo bet lakaet kod ebet"
 
 #. TRANS: Menu item for site administration
@@ -6120,7 +6189,6 @@ msgstr ""
 
 #. TRANS: Link description in user account settings menu.
 #: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "Profil"
 
@@ -6379,7 +6447,7 @@ msgid "Author(s)"
 msgstr "Aozer(ien)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Pennrolloù"
 
@@ -6780,61 +6848,62 @@ msgstr "Diskouez muioc'h"
 msgid "Primary site navigation"
 msgstr "Arventennoù diazez al lec'hienn"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personel"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 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
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "Kont"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Liammañ d'ar servijoù"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "Kevreañ"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Kemmañ arventennoù al lec'hienn"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: 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:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Merañ"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Pediñ mignoned hag kenseurted da zont ganeoc'h war %s"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -6846,57 +6915,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Digevreañ diouzh al lec'hienn"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Digevreañ"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Krouiñ ur gont"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "En em enskrivañ"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Kevreañ d'al lec'hienn"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Kevreañ"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Sikour din !"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "Skoazell"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 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
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7191,7 +7260,7 @@ msgid "User configuration"
 msgstr "Kefluniadur an implijer"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "Implijer"
 
@@ -7937,14 +8006,32 @@ msgstr "Enrollet eo bet an arventennoù design."
 msgid "Unable to find services for %s."
 msgstr "Dibosupl eo nullañ moned ar poellad : "
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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ù"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Disfavor favorite"
+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"
@@ -8718,34 +8805,52 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Dibosupl eo dilemel ar c'houmanant."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "Hiniennel"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "Respontoù"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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ù"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "Boest resev"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "Ar gemennadennoù ho peus resevet"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "Boest kas"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -8799,6 +8904,7 @@ msgstr "Keidenn pemdeziek"
 msgid "All groups"
 msgstr "An holl strolladoù"
 
+#. TRANS: Server error displayed when using an unimplemented method.
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
@@ -9216,3 +9322,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Personal"
+#~ msgstr "Hiniennel"
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index b42a5321df..6648e3060c 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:47:42+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52: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 (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -96,7 +96,7 @@ msgstr "Desa els paràmetres d'accés"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -109,7 +109,7 @@ 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:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "No existeix la pàgina."
 
@@ -136,6 +136,8 @@ msgstr "No existeix la pàgina."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +153,12 @@ msgstr "No existeix la pàgina."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -173,9 +175,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s i amics"
@@ -334,8 +337,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -373,7 +376,7 @@ msgstr "No s'ha pogut desar el perfil."
 #: 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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
 msgid ""
@@ -540,8 +543,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "No es pot crear el preferit."
 
@@ -552,7 +556,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "No s'ha pogut eliminar el preferit."
 
@@ -616,10 +620,11 @@ msgstr "Sobrenom no vàlid."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -638,13 +643,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
@@ -809,8 +815,8 @@ msgstr "El testimoni de sol·licitud ja està autoritzat."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -845,14 +851,15 @@ msgstr "Error de la base de dades en inserir l'oauth_token_association."
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -926,7 +933,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1408,9 +1415,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Already subscribed to %s."
-msgstr "Ja hi esteu subscrit!"
+msgstr "Ja esteu subscrit a %s."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
@@ -1768,7 +1775,7 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr "Heu d'escriure «%s» exactament dins del quadre."
 
@@ -1841,7 +1848,7 @@ msgstr "No sou el propietari d'aquesta aplicació."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "S'ha produït un problema amb el testimoni de la vostra sessió."
@@ -1934,15 +1941,17 @@ msgstr "Elimina aquest 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 when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "No heu iniciat una sessió."
@@ -2196,12 +2205,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Afegeix als preferits"
 
@@ -2234,61 +2243,71 @@ 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.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: 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)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "No s'ha pogut actualitzar l'aplicació."
 
@@ -2342,25 +2361,25 @@ msgid "Options saved."
 msgstr "Configuració guardada."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 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:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "Adreça de correu electrònic"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "Adreça electrònica confirmada actualment."
 
@@ -2369,14 +2388,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Elimina"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2389,14 +2409,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2404,29 +2424,29 @@ msgstr "Afegeix"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Correu electrònic entrant"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2436,89 +2456,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nou"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "Preferències del correu electrònic"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 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:222
+#: actions/emailsettings.php:218
 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:229
+#: actions/emailsettings.php:225
 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:235
+#: actions/emailsettings.php:231
 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:241
+#: actions/emailsettings.php:237
 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:247
+#: actions/emailsettings.php:243
 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:368
+#: actions/emailsettings.php:361
 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:388
+#: actions/emailsettings.php:380
 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:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, fuzzy
+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:401 actions/register.php:212
+#: 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."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 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:433
+#: actions/emailsettings.php:425
 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."
@@ -2530,87 +2551,97 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 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:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 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:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 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:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "S'ha eliminat l'adreça de correu electrònic."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Nou correu electrònic entrant afegit."
 
-#: actions/favor.php:79
+#. 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."
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. 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"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. 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."
 
-#: actions/favorited.php:150
+#. 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 "
@@ -2619,7 +2650,9 @@ msgstr ""
 "Sigueu el primer en afegir un avís dels vostres preferits fent clic al botó "
 "de preferit que es troba al costat dels avisos que us poden agradar."
 
-#: actions/favorited.php:156
+#. 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 "
@@ -2628,45 +2661,62 @@ msgstr ""
 "Per què no [registreu un compte](%%action.register%%) i sou el primer en "
 "afegir un avís als vostres preferits!"
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Avisos preferits de %s"
 
-#: actions/favoritesrss.php:115
+#. 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"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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ó d'alguns dels millors usuaris a %s"
 
-#: actions/file.php:34
+#. 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."
 
-#: actions/file.php:38
+#. 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."
 
-#: actions/file.php:42
+#. 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ó."
 
-#: actions/file.php:51
+#. 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."
 
@@ -2728,6 +2778,7 @@ msgstr "L'usuari ja té aquest rol."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2736,9 +2787,10 @@ msgstr "No s'ha especificat cap perfil."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "No hi ha cap perfil amb aquesta ID."
 
@@ -3570,19 +3622,22 @@ msgid "New application"
 msgstr "Aplicació nova"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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ó."
 
-#: actions/newapplication.php:184
+#. 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."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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ó."
 
@@ -3603,7 +3658,6 @@ msgstr "Utilitza aquest formulari per crear un nou grup."
 
 #. TRANS: Group create form validation error.
 #: actions/newgroup.php:199
-#, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "L'àlies no pot ser el mateix que el sobrenom."
 
@@ -4966,8 +5020,9 @@ msgstr "Repetit"
 msgid "Repeated!"
 msgstr "Repetit!"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "Respostes a %s"
@@ -5259,31 +5314,38 @@ 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?"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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."
 
-#: actions/showfavorites.php:171
+#. 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)"
 
-#: actions/showfavorites.php:178
+#. 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)"
 
-#: actions/showfavorites.php:185
+#. 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)"
 
-#: actions/showfavorites.php:206
+#. 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."
@@ -5291,7 +5353,9 @@ msgstr ""
 "No heu triat cap avís preferit encara. Feu clic al botó de preferit dels "
 "avisos que us agraden per arxivar-los per a més endavant i fer-los conèixer."
 
-#: actions/showfavorites.php:208
+#. 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 "
@@ -5300,7 +5364,10 @@ msgstr ""
 "%s no ha afegit cap avís als seus preferits encara. Envieu quelcom "
 "interessant que pugui afegir-hi :)"
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5310,7 +5377,8 @@ msgstr ""
 "Per què no [registreu un compte](%%action.register%%) i sou el primer en "
 "afegir un avís als vostres preferits!"
 
-#: actions/showfavorites.php:243
+#. 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."
 
@@ -5895,7 +5963,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "No s'ha introduït cap codi"
 
 #. TRANS: Menu item for site administration
@@ -6229,7 +6298,6 @@ 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
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "Perfil"
 
@@ -6506,7 +6574,7 @@ msgid "Author(s)"
 msgstr "Autoria"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Preferit"
 
@@ -6842,23 +6910,23 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Cannot locate account %s."
-msgstr "No podeu eliminar el vostre compte."
+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 ""
+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 ""
+msgstr "No hi ha cap servei API d'AtomPub de %s."
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
@@ -6917,61 +6985,62 @@ msgstr "Mostra més"
 msgid "Primary site navigation"
 msgstr "Navegació primària del lloc"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Perfil personal i línia temporal dels amics"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personal"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 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
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "Compte"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Connecta als serveis"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "Connexió"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Canvia la configuració del lloc"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: 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:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrador"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Convida amics i coneguts perquè participin a %s"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -6983,57 +7052,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Finalitza la sessió del lloc"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Finalitza la sessió"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Crea un compte"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registre"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Inicia una sessió al lloc"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Inici de sessió"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Ajuda'm!"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "Ajuda"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 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
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7251,9 +7320,9 @@ msgid "No content for notice %s."
 msgstr "No hi ha contingut a l'avís %s."
 
 #: lib/activitymover.php:84
-#, fuzzy, php-format
+#, php-format
 msgid "No such user %s."
-msgstr "No existeix l'usuari."
+msgstr "No existeix l'usuari %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.
@@ -7262,10 +7331,10 @@ msgstr "No existeix l'usuari."
 #. 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
@@ -7337,7 +7406,7 @@ msgid "User configuration"
 msgstr "Configuració de l'usuari"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "Usuari"
 
@@ -8102,18 +8171,36 @@ msgstr "S'han restaurat els paràmetres de disseny per defecte."
 
 #. TRANS: Exception. %s is an ID.
 #: lib/discovery.php:153
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to find services for %s."
-msgstr "No s'ha pogut revocar l'accés de l'aplicació: %s"
+msgstr "No s'han pogut trobar els serveis de %s."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+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
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Favor"
+msgstr "Preferit"
+
 #: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8534,7 +8621,7 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "You have been nudged by %s"
 msgstr "%s us ha cridat l'atenció"
 
@@ -8982,34 +9069,52 @@ msgstr "Avís duplicat."
 msgid "Couldn't insert new subscription."
 msgstr "No s'ha pogut inserir una nova subscripció."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "Personal"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "Respostes"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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 "Preferits"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "Safata d'entrada"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "Els teus missatges rebuts"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "Safata de sortida"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -9063,6 +9168,7 @@ msgstr "Mitjana diària"
 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"
@@ -9471,3 +9577,6 @@ 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 "Personal"
+#~ msgstr "Personal"
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index cdd975a7c0..439f7c599b 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:47:44+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52:12+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 (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: cs\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n >= 2 && n <= 4) ? 1 : "
 "2 );\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -90,7 +90,7 @@ msgstr "uložit nastavení přístupu"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -103,7 +103,7 @@ 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:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Tady žádná taková stránka není."
 
@@ -130,6 +130,8 @@ msgstr "Tady žádná taková stránka není."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +147,12 @@ msgstr "Tady žádná taková stránka není."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -167,9 +169,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s a přátelé"
@@ -327,8 +330,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -366,7 +369,7 @@ msgstr "Nepodařilo se uložit profil."
 #: 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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, fuzzy, php-format
 msgid ""
@@ -536,8 +539,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "Nelze vytvořit oblíbenou položku."
 
@@ -548,7 +552,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Nelze smazat oblíbenou položku."
 
@@ -613,10 +617,11 @@ msgstr "Není platnou přezdívkou."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -636,13 +641,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
@@ -813,8 +819,8 @@ msgstr "Nejste autorizován."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -848,14 +854,15 @@ msgstr "Chyba databáze při vkládání uživatele aplikace OAuth."
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -930,7 +937,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1863,7 +1870,7 @@ msgstr "Nejste vlastníkem této aplikace."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "Nastal problém s vaším session tokenem."
@@ -1960,15 +1967,17 @@ msgstr "Odstranit tohoto uživatele"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to 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 when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Nejste přihlášen(a)."
@@ -2228,12 +2237,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Přidat do oblíbených"
 
@@ -2266,63 +2275,73 @@ 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.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: 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ů)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Nelze aktualizovat aplikaci."
 
@@ -2376,25 +2395,25 @@ msgid "Options saved."
 msgstr "Nastavení uloženo."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 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:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "E-mailová adresa"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "Aktuální potvrzená e-mailová adresa."
 
@@ -2403,14 +2422,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Odstranit"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2423,14 +2443,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2438,29 +2458,29 @@ msgstr "Přidat"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Příchozí e-mail"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2468,88 +2488,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nová"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "Nastavení e-mailu"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 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:222
+#: actions/emailsettings.php:218
 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:229
+#: actions/emailsettings.php:225
 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:235
+#: actions/emailsettings.php:231
 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:241
+#: actions/emailsettings.php:237
 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:247
+#: actions/emailsettings.php:243
 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:368
+#: actions/emailsettings.php:361
 msgid "Email preferences saved."
 msgstr "Email nastavení uloženo."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "Chybí e-mailová adresa."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, 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:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: 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:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 #, 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:433
+#: actions/emailsettings.php:425
 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."
@@ -2561,89 +2582,99 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 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:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 #, 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:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 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:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "E-mailová adresa byla odstraněna."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Přidána nová příchozí e-mailová adresa."
 
-#: actions/favor.php:79
+#. 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."
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. TRANS: Page title for page on which favorite notices can be unfavourited.
+#: actions/favor.php:95
 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í"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. 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."
 
-#: actions/favorited.php:150
+#. 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 "
@@ -2652,7 +2683,9 @@ msgstr ""
 "Buďte první, kdo přidá oznámení k oblíbeným kliknutím na tlačítko Oblíbené "
 "vedle kteréhokoli oznámení které se vám líbí."
 
-#: actions/favorited.php:156
+#. 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 "
@@ -2661,45 +2694,62 @@ msgstr ""
 "Proč ne [zaregistrovat účet](%%action.register%%) a být první, kdo přidá "
 "oznámení k oblíbeným!"
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "oblíbená oznámení uživatele %s"
 
-#: actions/favoritesrss.php:115
+#. 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é"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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"
 
-#: actions/file.php:34
+#. 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í."
 
-#: actions/file.php:38
+#. 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í."
 
-#: actions/file.php:42
+#. 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."
 
-#: actions/file.php:51
+#. 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."
 
@@ -2761,6 +2811,7 @@ msgstr "Uživatel již tuto roli má."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2769,9 +2820,10 @@ msgstr "Nebyl vybrán profil."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Neexistuje profil s tímto ID."
 
@@ -3600,19 +3652,22 @@ msgid "New application"
 msgstr "Nová aplikace"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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."
 
-#: actions/newapplication.php:184
+#. 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é."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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."
 
@@ -5015,8 +5070,9 @@ msgstr "Opakované"
 msgid "Repeated!"
 msgstr "Opakované!"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "Odpovědi na %s"
@@ -5307,31 +5363,38 @@ 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í?"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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í."
 
-#: actions/showfavorites.php:171
+#. 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)"
 
-#: actions/showfavorites.php:178
+#. 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)"
 
-#: actions/showfavorites.php:185
+#. 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)"
 
-#: actions/showfavorites.php:206
+#. 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."
@@ -5340,7 +5403,9 @@ msgstr ""
 "později nebo na ně upoutali pozornost, klikněte na tlačítko Oblíbené na "
 "oznámeních"
 
-#: actions/showfavorites.php:208
+#. 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 "
@@ -5349,7 +5414,10 @@ msgstr ""
 "%s ještě nemá žádná oblíbená oznámení. Napište neco zajímavého co by si "
 "přidali do oblíbených :)"
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5359,7 +5427,8 @@ msgstr ""
 "%s ještě nemá žádná oblíbená oznámení. Proč se ne [zaregistrovat](%%%%action."
 "register%%%%) a neposlat neco zajímavého co by si přidali do oblíbených :)"
 
-#: actions/showfavorites.php:243
+#. 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í."
 
@@ -5937,7 +6006,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "Nezadán kód"
 
 #. TRANS: Menu item for site administration
@@ -6271,7 +6341,6 @@ 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
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "Profil"
 
@@ -6549,7 +6618,7 @@ msgid "Author(s)"
 msgstr "Autoři"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Oblíbit"
 
@@ -6959,61 +7028,62 @@ msgstr ""
 msgid "Primary site navigation"
 msgstr "Primární navigace na webu"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Osobní profil a časová osa přátel"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Osobní"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 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
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "Účet"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Připojení ke službám"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "Připojit"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Změna konfigurace webu"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: 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:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Admin"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Pozvěte přátele a kolegy, aby se k vám připojili na %s"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -7025,57 +7095,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Odhlášení z webu"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Odhlásit se"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Zaregistrujte se"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrovat"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Přihlásit se na stránky"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Přihlásit"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Nápověda"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "Nápověda"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 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
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7373,7 +7443,7 @@ msgid "User configuration"
 msgstr "Akce uživatele"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "Uživatel"
 
@@ -8153,14 +8223,32 @@ msgstr "Obnoveno výchozí nastavení vzhledu."
 msgid "Unable to find services for %s."
 msgstr "Nelze zrušit přístup aplikace %s."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Disfavor favorite"
+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"
@@ -9032,34 +9120,52 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Nelze vložit odebírání"
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "Osobní"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "Odpovědi"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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é"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "Doručená pošta"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "Vaše příchozí zprávy"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "Odeslaná pošta"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -9113,6 +9219,7 @@ msgstr "Denní průměr"
 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."
@@ -9530,3 +9637,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Personal"
+#~ msgstr "Osobní"
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 7ef400e1c5..9011907a63 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -19,17 +19,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:47:45+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52: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-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -98,7 +98,7 @@ msgstr "Zugangs-Einstellungen speichern"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -111,7 +111,7 @@ 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:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Seite nicht vorhanden"
 
@@ -138,6 +138,8 @@ msgstr "Seite nicht vorhanden"
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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 +155,12 @@ msgstr "Seite nicht vorhanden"
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -175,9 +177,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s und Freunde"
@@ -336,8 +339,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -375,7 +378,7 @@ msgstr "Konnte Profil nicht speichern."
 #: 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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
 msgid ""
@@ -545,8 +548,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "Konnte keinen Favoriten erstellen."
 
@@ -557,7 +561,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Konnte Favoriten nicht löschen."
 
@@ -622,10 +626,11 @@ msgstr "Ungültiger Benutzername."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -645,13 +650,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
@@ -816,8 +822,8 @@ msgstr "Anfrage-Token bereits autorisiert."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -850,14 +856,15 @@ msgstr "Datenbankfehler beim Einfügen von oauth_token_association."
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -931,7 +938,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1851,7 +1858,7 @@ msgstr "Du bist Besitzer dieses Programms"
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "Es gab ein Problem mit deinem Sessiontoken."
@@ -1943,15 +1950,17 @@ msgstr "Diese Gruppe löschen"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to 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 when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Nicht angemeldet."
@@ -2207,12 +2216,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Zu Favoriten hinzufügen"
 
@@ -2245,62 +2254,72 @@ 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.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: 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)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Konnte Programm nicht aktualisieren."
 
@@ -2354,25 +2373,25 @@ msgid "Options saved."
 msgstr "Einstellungen gespeichert."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 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:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "E-Mail-Adresse"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "Aktuelle bestätigte E-Mail-Adresse."
 
@@ -2381,14 +2400,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Entfernen"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2401,14 +2421,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2416,31 +2436,31 @@ msgstr "Hinzufügen"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Eingehende E-Mail"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2448,90 +2468,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Neu"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "E-Mail Einstellungen"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 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:222
+#: actions/emailsettings.php:218
 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:229
+#: actions/emailsettings.php:225
 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:235
+#: actions/emailsettings.php:231
 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:241
+#: actions/emailsettings.php:237
 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:247
+#: actions/emailsettings.php:243
 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:368
+#: actions/emailsettings.php:361
 msgid "Email preferences saved."
 msgstr "E-Mail-Einstellungen gespeichert."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "Keine E-Mail-Adresse."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, 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:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: 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:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 #, 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:433
+#: actions/emailsettings.php:425
 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."
@@ -2543,89 +2564,99 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 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:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 #, 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:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 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:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "Die E-Mail-Adresse wurde entfernt."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Neue Eingangs-E-Mail-Adresse hinzugefügt."
 
-#: actions/favor.php:79
+#. 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!"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. TRANS: Page title for page on which favorite notices can be unfavourited.
+#: actions/favor.php:95
 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"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. 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."
 
-#: actions/favorited.php:150
+#. 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 "
@@ -2634,7 +2665,9 @@ msgstr ""
 "Sei der erste der eine Nachricht favorisiert indem du auf die entsprechenden "
 "Schaltfläche neben der Nachricht klickst."
 
-#: actions/favorited.php:156
+#. 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 "
@@ -2643,45 +2676,62 @@ msgstr ""
 "Warum [registrierst du nicht einen Account](%%%%action.register%%%%) und "
 "bist der erste der eine Nachricht favorisiert!"
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%ss favorisierte Nachrichten"
 
-#: actions/favoritesrss.php:115
+#. 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"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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"
 
-#: actions/file.php:34
+#. 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"
 
-#: actions/file.php:38
+#. 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"
 
-#: actions/file.php:42
+#. 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"
 
-#: actions/file.php:51
+#. 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."
 
@@ -2743,6 +2793,7 @@ msgstr "Benutzer hat bereits diese Aufgabe"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2751,9 +2802,10 @@ msgstr "Kein Profil angegeben."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Kein Benutzer-Profil mit dieser ID."
 
@@ -3589,19 +3641,22 @@ msgid "New application"
 msgstr "Neues Programm"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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."
 
-#: actions/newapplication.php:184
+#. 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."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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."
 
@@ -5000,8 +5055,9 @@ msgstr "Wiederholt"
 msgid "Repeated!"
 msgstr "Wiederholt!"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "Antworten an %s"
@@ -5292,31 +5348,38 @@ msgstr ""
 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?"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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."
 
-#: actions/showfavorites.php:171
+#. 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)"
 
-#: actions/showfavorites.php:178
+#. 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)"
 
-#: actions/showfavorites.php:185
+#. 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)"
 
-#: actions/showfavorites.php:206
+#. 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."
@@ -5325,7 +5388,9 @@ msgstr ""
 "Button bei einer Nachricht, die dir gefällt um die Aufmerksamkeit auf sie zu "
 "richten und sie in deine Lesezeichen aufzunehmen."
 
-#: actions/showfavorites.php:208
+#. 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 "
@@ -5334,7 +5399,10 @@ msgstr ""
 "%s hat noch keine Nachricht zu den Favoriten hinzugefügt. Sende doch einfach "
 "eine interessante Nachricht, damit sich daran etwas ändert :)"
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5345,7 +5413,8 @@ msgstr ""
 "[meldest du dich nicht an](%%%%action.register%%%%) und schreibst etwas, was "
 "%s hinzufügen kann!"
 
-#: actions/showfavorites.php:243
+#. 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."
 
@@ -5928,7 +5997,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "Kein Code eingegeben"
 
 #. TRANS: Menu item for site administration
@@ -6260,7 +6330,6 @@ 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
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "Profil"
 
@@ -6538,7 +6607,7 @@ msgid "Author(s)"
 msgstr "Autor(en)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Zu Favoriten hinzufügen"
 
@@ -6955,61 +7024,62 @@ msgstr "Mehr anzeigen"
 msgid "Primary site navigation"
 msgstr "Hauptnavigation"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Persönliches Profil und Freundes-Zeitleiste"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Eigene"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 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
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "Profil"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Zum Dienst verbinden"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "Verbinden"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Seiteneinstellung ändern"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: 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:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Admin"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Lade Freunde und Kollegen ein dir auf %s zu folgen"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -7021,57 +7091,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Von der Seite abmelden"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Abmelden"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Neues Benutzerkonto erstellen"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrieren"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Auf der Seite anmelden"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Anmelden"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Hilf mir!"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "Hilfe"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 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
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7373,7 +7443,7 @@ msgid "User configuration"
 msgstr "Benutzereinstellung"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "Benutzer"
 
@@ -8140,14 +8210,32 @@ msgstr "Standard-Design wieder hergestellt."
 msgid "Unable to find services for %s."
 msgstr "Kann Zugang dieses Programm nicht entfernen: %s."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Disfavor favorite"
+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"
@@ -9017,34 +9105,52 @@ msgstr "Doppelte Nachricht."
 msgid "Couldn't insert new subscription."
 msgstr "Konnte neues Abonnement nicht eintragen."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "Meine Zeitleiste"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "Antworten"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "Posteingang"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "Deine eingehenden Nachrichten"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "Postausgang"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -9098,6 +9204,7 @@ msgstr "Tagesdurchschnitt"
 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."
@@ -9511,3 +9618,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Hole Backup von der Datei „%s“."
+
+#~ msgid "Personal"
+#~ msgstr "Meine Zeitleiste"
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 349bd0b5a4..f22f1b9ec2 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:47:47+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52:14+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 (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: en-gb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -91,7 +91,7 @@ msgstr "Save access settings"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -104,7 +104,7 @@ 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:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "No such page."
 
@@ -131,6 +131,8 @@ msgstr "No such page."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +148,12 @@ msgstr "No such page."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -168,9 +170,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s and friends"
@@ -328,8 +331,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -367,7 +370,7 @@ msgstr "Could not save profile."
 #: 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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, fuzzy, php-format
 msgid ""
@@ -533,8 +536,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "Could not create favourite."
 
@@ -545,7 +549,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Could not delete favourite."
 
@@ -610,10 +614,11 @@ msgstr "Not a valid nickname."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -633,13 +638,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
@@ -806,8 +812,8 @@ msgstr "You are not authorised."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -841,14 +847,15 @@ msgstr "Database error inserting OAuth application user."
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -923,7 +930,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1851,7 +1858,7 @@ msgstr "You are not the owner of this application."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "There was a problem with your session token."
@@ -1944,15 +1951,17 @@ msgstr "Delete this group"
 
 #. 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 when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Not logged in."
@@ -2211,12 +2220,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Add to favourites"
 
@@ -2249,63 +2258,73 @@ 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.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: 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)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Could not update application."
 
@@ -2359,25 +2378,25 @@ msgid "Options saved."
 msgstr "Options saved."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 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:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "E-mail address"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "Current confirmed e-mail address."
 
@@ -2386,14 +2405,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Remove"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2406,14 +2426,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2421,29 +2441,29 @@ msgstr "Add"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Incoming e-mail"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2451,88 +2471,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "New"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "Email preferences"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 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:222
+#: actions/emailsettings.php:218
 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:229
+#: actions/emailsettings.php:225
 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:235
+#: actions/emailsettings.php:231
 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:241
+#: actions/emailsettings.php:237
 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:247
+#: actions/emailsettings.php:243
 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:368
+#: actions/emailsettings.php:361
 msgid "Email preferences saved."
 msgstr "E-mail preferences saved."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "No e-mail address."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, 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:401 actions/register.php:212
+#: 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."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 #, 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:433
+#: actions/emailsettings.php:425
 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."
@@ -2543,88 +2564,98 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 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:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 #, 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:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 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:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "The email address was removed."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "New incoming e-mail address added."
 
-#: actions/favor.php:79
+#. 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!"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. TRANS: Page title for page on which favorite notices can be unfavourited.
+#: actions/favor.php:95
 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"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. 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."
 
-#: actions/favorited.php:150
+#. 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 "
@@ -2633,7 +2664,9 @@ msgstr ""
 "Be the first to add a notice to your favourites by clicking the fave button "
 "next to any notice you like."
 
-#: actions/favorited.php:156
+#. 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 "
@@ -2642,45 +2675,62 @@ msgstr ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
 "notice to your favourites!"
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s's favourite notices"
 
-#: actions/favoritesrss.php:115
+#. 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"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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"
 
-#: actions/file.php:34
+#. 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."
 
-#: actions/file.php:38
+#. 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."
 
-#: actions/file.php:42
+#. 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."
 
-#: actions/file.php:51
+#. 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."
 
@@ -2742,6 +2792,7 @@ msgstr "User already has this role."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2750,9 +2801,10 @@ msgstr "No profile specified."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "No profile with that ID."
 
@@ -3577,19 +3629,22 @@ msgid "New application"
 msgstr "New Application"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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."
 
-#: actions/newapplication.php:184
+#. 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."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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."
 
@@ -4976,8 +5031,9 @@ msgstr "Repeated"
 msgid "Repeated!"
 msgstr "Repeated!"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "Replies to %s"
@@ -5261,31 +5317,38 @@ msgstr ""
 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?"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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."
 
-#: actions/showfavorites.php:171
+#. 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)"
 
-#: actions/showfavorites.php:178
+#. 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)"
 
-#: actions/showfavorites.php:185
+#. 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)"
 
-#: actions/showfavorites.php:206
+#. 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."
@@ -5293,7 +5356,9 @@ msgstr ""
 "You haven't chosen any favourite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
 
-#: actions/showfavorites.php:208
+#. 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 "
@@ -5302,7 +5367,10 @@ msgstr ""
 "%s has not added any favourite notices yet. Post something interesting they "
 "would add to their favourites."
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5313,7 +5381,8 @@ msgstr ""
 "%action.register%%%%) and then post something interesting they would add to "
 "their favourites."
 
-#: actions/showfavorites.php:243
+#. TRANS: Page notice for show favourites page.
+#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr ""
 
@@ -5886,7 +5955,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "No code entered"
 
 #. TRANS: Menu item for site administration
@@ -6210,7 +6280,6 @@ msgstr ""
 
 #. TRANS: Link description in user account settings menu.
 #: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "Profile"
 
@@ -6486,7 +6555,7 @@ msgid "Author(s)"
 msgstr ""
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Favour"
 
@@ -6885,61 +6954,62 @@ msgstr ""
 msgid "Primary site navigation"
 msgstr "Primary site navigation"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Personal profile and friends timeline"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personal"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 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
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "Account"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Connect to services"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "Connect"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Change site configuration"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: 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:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Admin"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invite friends and colleagues to join you on %s"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -6951,57 +7021,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Logout from the site"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Logout"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Create an account"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Register"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Login to the site"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Login"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Help me!"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "Help"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 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
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7299,7 +7369,7 @@ msgid "User configuration"
 msgstr "User configuration"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "User"
 
@@ -8059,14 +8129,32 @@ msgstr "Design defaults restored."
 msgid "Unable to find services for %s."
 msgstr "Use this form to edit your application."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Disfavor favorite"
+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 ""
@@ -8843,34 +8931,52 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Couldn't insert new subscription."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "Personal"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "Replies"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "Inbox"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "Your incoming messages"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "Outbox"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -8924,6 +9030,7 @@ msgstr ""
 msgid "All groups"
 msgstr "All groups"
 
+#. TRANS: Server error displayed when using an unimplemented method.
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
@@ -9330,3 +9437,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Personal"
+#~ msgstr "Personal"
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index 0fbd73e560..d26915da1d 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:47:48+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52:15+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 (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: eo\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -95,7 +95,7 @@ msgstr "Konservu atingan agordon"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -108,7 +108,7 @@ 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:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Ne estas tiu paĝo."
 
@@ -135,6 +135,8 @@ msgstr "Ne estas tiu paĝo."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +152,12 @@ msgstr "Ne estas tiu paĝo."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -172,9 +174,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s kaj amikoj"
@@ -332,8 +335,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -371,7 +374,7 @@ msgstr "Malsukcesis konservi la profilon."
 #: 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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
 msgid ""
@@ -537,8 +540,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "Malsukcesis krei ŝataton."
 
@@ -549,7 +553,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Malsukcesis forigi ŝataton."
 
@@ -613,10 +617,11 @@ msgstr "Ne valida kromnomo."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -635,13 +640,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
@@ -806,8 +812,8 @@ msgstr ""
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -841,14 +847,15 @@ msgstr "Datumbaza eraro enigi la uzanton de *OAuth-aplikaĵo."
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -922,7 +929,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1854,7 +1861,7 @@ msgstr "Vi ne estas la posedanto de ĉi tiu aplikaĵo."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "Problemo okazas pri via seancĵetono."
@@ -1951,15 +1958,17 @@ msgstr "Forigi la uzanton"
 
 #. 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 when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Ne konektita."
@@ -2217,12 +2226,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Aldoni al ŝatolisto"
 
@@ -2255,63 +2264,73 @@ 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.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: 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)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Malsukcesis ĝisdatigi la aplikaĵon."
 
@@ -2365,25 +2384,25 @@ msgid "Options saved."
 msgstr "Elektoj konserviĝis."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 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:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "Retpoŝtadreso"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "Nuna konfirmita retpoŝtadreso."
 
@@ -2392,14 +2411,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Forigi"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2412,14 +2432,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2427,29 +2447,29 @@ msgstr "Aldoni"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Alveninta poŝto"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2457,88 +2477,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nova"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "Retpoŝta agordo."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 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:222
+#: actions/emailsettings.php:218
 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:229
+#: actions/emailsettings.php:225
 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:235
+#: actions/emailsettings.php:231
 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:241
+#: actions/emailsettings.php:237
 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:247
+#: actions/emailsettings.php:243
 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:368
+#: actions/emailsettings.php:361
 msgid "Email preferences saved."
 msgstr "Retpoŝta prefero konserviĝis."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "Neniu retpoŝta adreso."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, 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:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: 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:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 #, 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:433
+#: actions/emailsettings.php:425
 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."
@@ -2549,87 +2570,97 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 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:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 #, 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:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 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:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "La retpoŝtadreso estas forigita."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Nova alvena retpoŝtadreso aldonita."
 
-#: actions/favor.php:79
+#. 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."
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. TRANS: Page title for page on which favorite notices can be unfavourited.
+#: actions/favor.php:95
 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"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. 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."
 
-#: actions/favorited.php:150
+#. 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 "
@@ -2638,7 +2669,9 @@ msgstr ""
 "Fariĝu la unua, kiu aldonis avizon al sia ŝatolisto, per alklako de la ŝato-"
 "klavo apud iu ajn avizo, kiun vi ŝatas."
 
-#: actions/favorited.php:156
+#. 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 "
@@ -2647,45 +2680,62 @@ msgstr ""
 "[Kreu konton](%%action.register%%) kaj estu la unua, kiu aldonos avizon al "
 "sia ŝatolisto!"
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Ŝatataj avizoj de %s"
 
-#: actions/favoritesrss.php:115
+#. 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"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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"
 
-#: actions/file.php:34
+#. 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"
 
-#: actions/file.php:38
+#. 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."
 
-#: actions/file.php:42
+#. 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."
 
-#: actions/file.php:51
+#. 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."
 
@@ -2747,6 +2797,7 @@ msgstr "Uzanto jam havas la rolon."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2755,9 +2806,10 @@ msgstr "Neniu profilo elektita."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Ne estas profilo kun tiu ID."
 
@@ -3575,19 +3627,22 @@ msgid "New application"
 msgstr "Nova Apliko"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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."
 
-#: actions/newapplication.php:184
+#. 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."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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."
 
@@ -4966,8 +5021,9 @@ msgstr "Ripetita"
 msgid "Repeated!"
 msgstr "Ripetita!"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "Respondoj al %s"
@@ -5259,31 +5315,38 @@ msgstr ""
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Ĉu vi certe volas rekomencigi vian konsumantan ŝlosilon kaj sekreton?"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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."
 
-#: actions/showfavorites.php:171
+#. 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)"
 
-#: actions/showfavorites.php:178
+#. 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)"
 
-#: actions/showfavorites.php:185
+#. 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)"
 
-#: actions/showfavorites.php:206
+#. 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."
@@ -5291,7 +5354,9 @@ msgstr ""
 "Vi ne jam ŝatis iun ajn avizon. Alklaku la ŝati-klavon apud avizo ŝatita por "
 "poste trovi ĝin kaj atentigi al ĝi."
 
-#: actions/showfavorites.php:208
+#. 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 "
@@ -5299,7 +5364,10 @@ msgid ""
 msgstr ""
 "%s ankoraŭ ne aldonis iun ajn ŝatatan avizon. Sendu ion, kion ili ŝatos. :)"
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5309,7 +5377,8 @@ msgstr ""
 "%s ankoraŭ ne aldonis iun ajn ŝatatan avizon. Kial ne [krei konton](%%%%"
 "action.register%%%%) kaj sendi ion, kion ili ŝatos. :)"
 
-#: actions/showfavorites.php:243
+#. 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."
 
@@ -5885,7 +5954,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "Neniu kodo entajpita"
 
 #. TRANS: Menu item for site administration
@@ -6211,7 +6281,6 @@ 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
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "Profilo"
 
@@ -6483,7 +6552,7 @@ msgid "Author(s)"
 msgstr "Aŭtoro(j)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Ŝati"
 
@@ -6886,61 +6955,62 @@ msgstr ""
 msgid "Primary site navigation"
 msgstr "Unua reteja navigado"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Tempstrio pri vi kaj amikoj"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Persona"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 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
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "Konto"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Konekti al servoj"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "Konekti"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Ŝanĝi agordojn de la retejo"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: 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:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administri"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Inviti amikojn kaj kolegojn al %s kun vi"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -6952,57 +7022,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Elsaluti el la retejo"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr " Elsaluti"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Krei konton"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registriĝi"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Ensaluti al la retejo"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Ensaluti"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Helpu min!"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "Helpo"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 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
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7303,7 +7373,7 @@ msgid "User configuration"
 msgstr "Uzanta agordo"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "Uzanto"
 
@@ -8078,14 +8148,32 @@ msgstr "Desegnaj defaŭltoj konserviĝas."
 msgid "Unable to find services for %s."
 msgstr "Maleble revoki aliradon al aplikaĵo: %s."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Disfavor favorite"
+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"
@@ -8953,34 +9041,52 @@ msgstr "Refoja avizo."
 msgid "Couldn't insert new subscription."
 msgstr "Eraris enmeti novan abonon."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "Persona"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "Respondoj"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "Alvenkesto"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "Viaj alvenaj mesaĝoj"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "Elirkesto"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -9034,6 +9140,7 @@ msgstr "Taga meznombro"
 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"
@@ -9445,3 +9552,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Personal"
+#~ msgstr "Persona"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index b99bd515cd..6f0735ba07 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:47:49+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52: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-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -95,7 +95,7 @@ msgstr "Guardar la configuración de acceso"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -108,7 +108,7 @@ 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:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "No existe tal página."
 
@@ -135,6 +135,8 @@ msgstr "No existe tal página."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +152,12 @@ msgstr "No existe tal página."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -172,9 +174,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s y sus amistades"
@@ -333,8 +336,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -372,7 +375,7 @@ msgstr "No se pudo guardar el perfil."
 #: 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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, fuzzy, php-format
 msgid ""
@@ -538,8 +541,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "No se pudo crear favorito."
 
@@ -550,7 +554,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "No se pudo borrar favorito."
 
@@ -615,10 +619,11 @@ msgstr "Usuario inválido"
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -638,13 +643,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
@@ -813,8 +819,8 @@ msgstr "No estás autorizado."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -849,14 +855,15 @@ msgstr "Error de base de datos al insertar usuario de la aplicación OAuth."
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -930,7 +937,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1861,7 +1868,7 @@ msgstr "No eres el propietario de esta aplicación."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "Hubo problemas con tu clave de sesión."
@@ -1956,15 +1963,17 @@ msgstr "Borrar 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.
+#. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "No conectado."
@@ -2225,12 +2234,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Agregar a favoritos"
 
@@ -2263,63 +2272,73 @@ 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.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: 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)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "No fue posible actualizar la aplicación."
 
@@ -2373,25 +2392,25 @@ msgid "Options saved."
 msgstr "Se guardó Opciones."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 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:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "Dirección de correo electrónico"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "Actual dirección de correo electrónico confirmada"
 
@@ -2400,14 +2419,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Eliminar"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2420,14 +2440,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2435,29 +2455,29 @@ msgstr "Añadir"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Correo entrante"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2465,91 +2485,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nuevo"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "Preferencias de correo electrónico"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 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:222
+#: actions/emailsettings.php:218
 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:229
+#: actions/emailsettings.php:225
 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:235
+#: actions/emailsettings.php:231
 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:241
+#: actions/emailsettings.php:237
 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:247
+#: actions/emailsettings.php:243
 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:368
+#: actions/emailsettings.php:361
 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:388
+#: actions/emailsettings.php:380
 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:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, 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:401 actions/register.php:212
+#: 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"
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 #, 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:433
+#: actions/emailsettings.php:425
 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."
@@ -2561,89 +2582,99 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 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:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 #, 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:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 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:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "La dirección de correo electrónico ha sido eliminada."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Nueva dirección de correo entrante agregada."
 
-#: actions/favor.php:79
+#. 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!"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. TRANS: Page title for page on which favorite notices can be unfavourited.
+#: actions/favor.php:95
 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"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. 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."
 
-#: actions/favorited.php:150
+#. 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 "
@@ -2652,7 +2683,9 @@ msgstr ""
 "Se la primera persona en añadir un mensaje a tus favoritos con el botón de "
 "favoritos que se encuentra al lado de cualquier mensaje que te guste."
 
-#: actions/favorited.php:156
+#. 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 "
@@ -2661,45 +2694,62 @@ msgstr ""
 "¿Por qué no [registrar una cuenta](%%action.register%%) y ser la primera "
 "persona en añadir un mensaje a tus favoritos?"
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Mensajes favoritos de %s"
 
-#: actions/favoritesrss.php:115
+#. 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"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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"
 
-#: actions/file.php:34
+#. 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."
 
-#: actions/file.php:38
+#. 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."
 
-#: actions/file.php:42
+#. 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"
 
-#: actions/file.php:51
+#. 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."
 
@@ -2761,6 +2811,7 @@ msgstr "El usuario ya tiene esta función."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2769,9 +2820,10 @@ msgstr "No se especificó perfil."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "No existe perfil con ese ID"
 
@@ -3607,19 +3659,22 @@ msgid "New application"
 msgstr "Nueva aplicación"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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."
 
-#: actions/newapplication.php:184
+#. 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."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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."
 
@@ -5041,8 +5096,9 @@ msgstr "Repetido"
 msgid "Repeated!"
 msgstr "¡Repetido!"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "Respuestas a %s"
@@ -5333,31 +5389,38 @@ msgstr ""
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "¿realmente deseas reiniciar tu clave y secreto de consumidor?"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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."
 
-#: actions/showfavorites.php:171
+#. 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)"
 
-#: actions/showfavorites.php:178
+#. 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)"
 
-#: actions/showfavorites.php:185
+#. 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)"
 
-#: actions/showfavorites.php:206
+#. 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."
@@ -5365,7 +5428,9 @@ msgstr ""
 "Aún no has elegido ningún aviso. Haz click sobre el botón \"favoritos\" en "
 "los avisos que quieras para ponerles un marcador o resaltarlos."
 
-#: actions/showfavorites.php:208
+#. 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 "
@@ -5374,7 +5439,10 @@ msgstr ""
 "%s aún no ha agregado ningún aviso a sus favoritos. Publica algo interesante "
 "que pueda añadir a sus favoritos :)"
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5385,7 +5453,8 @@ msgstr ""
 "cuenta](%%%%action.register%%%%) y publicas algo interesante que puedan "
 "añadir a sus favoritos :)"
 
-#: actions/showfavorites.php:243
+#. 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."
 
@@ -5972,7 +6041,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "No ingresó código"
 
 #. TRANS: Menu item for site administration
@@ -6307,7 +6377,6 @@ 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
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "Perfil"
 
@@ -6585,7 +6654,7 @@ msgid "Author(s)"
 msgstr "Autor(es)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Aceptar"
 
@@ -6996,61 +7065,62 @@ msgstr ""
 msgid "Primary site navigation"
 msgstr "Navegación de sitio primario"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Perfil personal y línea temporal de amistades"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personal"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 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
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "Cuenta"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Conectar a los servicios"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "Conectarse"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Cambiar la configuración del sitio"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: 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:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Admin"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invita a amistades y compañeros a unirse a tí en %s"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -7062,57 +7132,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Cerrar sesión en el sitio"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Cerrar sesión"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Crear una cuenta"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrarse"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Iniciar sesión en el sitio"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Inicio de sesión"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "¡Ayúdame!"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "Ayuda"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 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
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7417,7 +7487,7 @@ msgid "User configuration"
 msgstr "Configuración de usuario"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "Usuario"
 
@@ -8197,14 +8267,32 @@ msgstr "Diseño predeterminado restaurado."
 msgid "Unable to find services for %s."
 msgstr "No se puede revocar el acceso para la aplicación: %s."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Disfavor favorite"
+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"
@@ -9080,34 +9168,52 @@ msgstr "Mensaje duplicado."
 msgid "Couldn't insert new subscription."
 msgstr "No se pudo insertar una nueva suscripción."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "Personal"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "Respuestas"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "Bandeja de Entrada"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "Mensajes entrantes"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "Bandeja de Salida"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -9161,6 +9267,7 @@ msgstr "Promedio diario"
 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."
@@ -9573,3 +9680,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Personal"
+#~ msgstr "Personal"
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index 2bb0099982..49a8ecc3ef 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:47:50+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52: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,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 (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -95,7 +95,7 @@ msgstr "ذخیرهٔ تنظیمات دسترسی"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -108,7 +108,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/showfavorites.php:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "چنین صفحه‌ای وجود ندارد."
 
@@ -135,6 +135,8 @@ msgstr "چنین صفحه‌ای وجود ندارد."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +152,12 @@ msgstr "چنین صفحه‌ای وجود ندارد."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -172,9 +174,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s و دوستان"
@@ -330,8 +333,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -369,7 +372,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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, fuzzy, php-format
 msgid ""
@@ -531,8 +534,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "نمی‌توان پیام را برگزید."
 
@@ -543,7 +547,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "نمی‌توان پیام برگزیده را حذف کرد."
 
@@ -608,10 +612,11 @@ msgstr "لقب نا معتبر."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -631,13 +636,14 @@ msgstr "نام کامل خیلی طولانی است (حداکثر ۲۵۵ نوی
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
 #. 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
@@ -804,8 +810,8 @@ msgstr "شما شناسایی نشده اید."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -839,14 +845,15 @@ msgstr "هنگام افزودن کاربر برنامهٔ OAuth در پایگا
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -923,7 +930,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1855,7 +1862,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:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "یک مشکل با رمز نشست شما وجود داشت."
@@ -1953,15 +1960,17 @@ 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.
+#. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "شما به سیستم وارد نشده اید."
@@ -2224,12 +2233,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "افزودن به برگزیده‌ها"
 
@@ -2262,65 +2271,75 @@ msgid "Use this form to edit your application."
 msgstr "از این روش برای ویرایش برنامه‌تان استفاده کنید."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "نام سازمان خیلی طولانی است (حداکثر ۲۵۵ نویسه)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "نمی‌توان برنامه را به‌هنگام‌سازی کرد."
 
@@ -2374,25 +2393,25 @@ msgid "Options saved."
 msgstr "گزینه‌ها ذخیره شدند."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 msgid "Email settings"
 msgstr "تنظیمات پست الکترونیک"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "نشانی پست الکترونیک"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "نشانی پست الکترونیکی تایید شدهٔ کنونی"
 
@@ -2401,14 +2420,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "حذف"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2421,14 +2441,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2436,30 +2456,30 @@ msgstr "افزودن"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "پست الکترونیک ورودی"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2467,90 +2487,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "تازه"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "ترجیحات پست الکترونیکی"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 msgid "Send me notices of new subscriptions through email."
 msgstr "پیام‌های کسانی را که به تازگی دنبال می‌کنم با پست الکترونیک برایم بفرست."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:222
+#: actions/emailsettings.php:218
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "هرگاه کسی پیام من را به عنوان برگزیده اضافه کرد، به من نامه فرستاده شود."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:229
+#: actions/emailsettings.php:225
 msgid "Send me email when someone sends me a private message."
 msgstr "هر وقت کسی برای من پیام خصوصی فرستاد، مرا با پست الکترونیک با خبر کن."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:235
+#: actions/emailsettings.php:231
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "هرگاه کسی به من یک «@-پاسخ» می‌فرستد، به من نامه بفرست."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:241
+#: actions/emailsettings.php:237
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 "به دوستان اجازه داده شود که به من یادآوری کنند و یک نامه به من بفرستند."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:247
+#: actions/emailsettings.php:243
 msgid "Publish a MicroID for my email address."
 msgstr "یک شناسه برای پست الکترونیک  من منتشر کن."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:368
+#: actions/emailsettings.php:361
 msgid "Email preferences saved."
 msgstr "ترجیحات پست الکترونیکی ذخیره شد."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "پست الکترونیک وجود ندارد."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, fuzzy
+msgid "Cannot normalize that email address."
 msgstr "نمی‌توان نشانی را قانونی کرد"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: 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:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "نمی‌توان کد تایید را اضافه کرد."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:433
+#: actions/emailsettings.php:425
 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."
@@ -2561,89 +2582,99 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "هیچ تاییدی برای فسخ کردن وجود ندارد."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "نمی‌توان تصدیق پست الکترونیک را پاک کرد."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 msgid "That is not your email address."
 msgstr "آن نشانی شما نیست."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "نشانی پست الکترونیکی پاک شده است."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "نشانی ورودی جدید اضافه شد."
 
-#: actions/favor.php:79
+#. 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 "این پیام ازقبل برگزیده شده است!"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. 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 "پیام‌های برگزیده"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. TRANS: Description on page displaying favorited notices.
+#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "محبوب‌ترین پیام‌هایی که اکنون در این وب‌گاه هستند."
 
-#: actions/favorited.php:150
+#. 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 "
@@ -2652,7 +2683,9 @@ msgstr ""
 "با کلیک کردن روی دکمهٔ برگزیده کنار هر پیامی که می‌خواهید، اولین نفری باشید که "
 "یک پیام را به برگزیده‌هایش اضافه می‌کند."
 
-#: actions/favorited.php:156
+#. 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 "
@@ -2661,45 +2694,62 @@ msgstr ""
 "چرا به [باز کردن یک حساب](%%action.register%%) اقدام نمی‌کنید و اولین نفری "
 "باشید که یک پیام را به برگزیده‌هایش اضافه می‌کند!"
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "پیام‌های برگزیدهٔ %s"
 
-#: actions/favoritesrss.php:115
+#. 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 "کاربران ویژه"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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"
 
-#: actions/file.php:34
+#. TRANS: Client error displayed when no notice ID was given trying do display a file.
+#: actions/file.php:36
 msgid "No notice ID."
 msgstr "هیچ شناسهٔ پیامی وجود ندارد."
 
-#: actions/file.php:38
+#. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
+#: actions/file.php:41
 msgid "No notice."
 msgstr "هیچ پیامی وجود ندارد."
 
-#: actions/file.php:42
+#. 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 "هیچ پیوستی وجود ندارد."
 
-#: actions/file.php:51
+#. 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 "هیچ پیوست بارگذاری شده‌ای وجود ندارد."
 
@@ -2761,6 +2811,7 @@ msgstr "کاربر از قبل این وظیفه را داشته است."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2769,9 +2820,10 @@ msgstr "نمایه‌ای مشخص نشده است."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "کاربری با چنین شناسه‌ای وجود ندارد."
 
@@ -3588,19 +3640,22 @@ msgid "New application"
 msgstr "برنامهٔ تازه"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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 "از این شیوه برای ساختن یک برنامهٔ تازه استفاده کنید."
 
-#: actions/newapplication.php:184
+#. 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 "نشانی اینترنتی منبع مورد نیاز است."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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 "نمی‌توان برنامه را ساخت."
 
@@ -5001,8 +5056,9 @@ msgstr "تکرار شده"
 msgid "Repeated!"
 msgstr "تکرار شد!"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "پاسخ‌های به %s"
@@ -5291,31 +5347,38 @@ msgstr ""
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "آیا مطمئن هستید که می‌خواهید کلید و رمز خریدار را دوباره تعیین کنید؟"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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 "نمی‌توان پیام‌های برگزیده را دریافت کرد."
 
-#: actions/showfavorites.php:171
+#. 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)"
 
-#: actions/showfavorites.php:178
+#. 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)"
 
-#: actions/showfavorites.php:185
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "خوراک برای برگزیده‌های %s (Atom)"
 
-#: actions/showfavorites.php:206
+#. 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."
@@ -5324,7 +5387,9 @@ msgstr ""
 "که دوست دارید کلیک کنید تا آن‌ها را برای بعد چوب‌الفها کنید یا یک نشانه روی "
 "آن‌ها بگذارید."
 
-#: actions/showfavorites.php:208
+#. 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 "
@@ -5333,7 +5398,10 @@ msgstr ""
 "%s تاکنون هیچ پیامی را به برگزیده‌هایش اضافه نکرده است. چیز جالبی بفرستید که "
 "ممکن است به برگزیده‌هایشان اضافه کنند :)"
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5343,7 +5411,8 @@ msgstr ""
 "چرا به [باز کردن یک حساب](%%action.register%%) اقدام نمی‌کنید و اولین نفری "
 "باشید که یک پیام را به برگزیده‌هایش اضافه می‌کند!"
 
-#: actions/showfavorites.php:243
+#. TRANS: Page notice for show favourites page.
+#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "این یک راه است برای به اشتراک گذاشتن آنچه که دوست دارید."
 
@@ -5927,7 +5996,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "کدی وارد نشد"
 
 #. TRANS: Menu item for site administration
@@ -6260,7 +6330,6 @@ msgstr "اشتراک پیش‌فرض نامعتبر است: «%1$s» کاربر
 
 #. TRANS: Link description in user account settings menu.
 #: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "نمایه"
 
@@ -6531,7 +6600,7 @@ msgid "Author(s)"
 msgstr "مؤلف(ها)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "برگزیده‌کردن"
 
@@ -6937,61 +7006,62 @@ msgstr ""
 msgid "Primary site navigation"
 msgstr "مسیریابی اصلی وب‌گاه"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "نمایهٔ شخصی و خط‌زمانی دوستان"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "شخصی"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "پست الکترونیکی، تصویر، گذرواژه یا نمایهٔ خودتان را تغییر دهید"
 
-#. TRANS: Main menu option when logged in for access to user settings
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "حساب کاربری"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 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
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "وصل‌شدن"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "تغییر پیکربندی وب‌گاه"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
 #: lib/action.php:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "مدیر"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, 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
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -7003,57 +7073,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "خارج‌شدن از وب‌گاه"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "خروج"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "ساختن یک جساب‌کاربری"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "ثبت‌نام"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "ورود به وب‌گاه"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "ورود"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "به من کمک کنید!"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "کمک"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "جست‌وجو برای افراد یا متن"
 
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7352,7 +7422,7 @@ msgid "User configuration"
 msgstr "پیکربندی کاربر"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "کاربر"
 
@@ -8126,14 +8196,32 @@ msgstr "پیش‌فرض‌های طراحی برگردانده شدند."
 msgid "Unable to find services for %s."
 msgstr "نمی‌توان دسترسی را برای برنامهٔ %s لغو کرد."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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 "خارج‌کردن این پیام از برگزیده‌ها"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+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
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Favor"
+msgstr "برگزیده‌کردن"
+
 #: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr ""
@@ -8993,34 +9081,52 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "نمی‌توان اشتراک تازه‌ای افزود."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "شخصی"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "پاسخ ها"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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 "برگزیده‌ها"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "صندوق دریافتی"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "پیام های وارد شونده ی شما"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "صندوق خروجی"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -9074,6 +9180,7 @@ msgstr "میانگین روزانه"
 msgid "All groups"
 msgstr "تمام گروه‌ها"
 
+#. TRANS: Server error displayed when using an unimplemented method.
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "روش پیاده نشده است."
@@ -9482,3 +9589,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Personal"
+#~ msgstr "شخصی"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 1205d2a243..ce2dabb77f 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -14,17 +14,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:47:52+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52: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 (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -98,7 +98,7 @@ msgstr "Profiilikuva-asetukset"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -111,7 +111,7 @@ 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:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Sivua ei ole."
 
@@ -138,6 +138,8 @@ msgstr "Sivua ei ole."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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 +155,12 @@ msgstr "Sivua ei ole."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -175,9 +177,10 @@ msgstr "%s ja kaverit"
 #. 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s ja kaverit"
@@ -332,8 +335,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -371,7 +374,7 @@ msgstr "Profiilin tallennus epäonnistui."
 #: 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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
 msgid ""
@@ -537,8 +540,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "Ei voitu lisätä suosikiksi."
 
@@ -550,7 +554,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Ei voitu poistaa suosikkia."
 
@@ -615,10 +619,11 @@ msgstr "Tuo ei ole kelvollinen tunnus."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -638,13 +643,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
@@ -813,8 +819,8 @@ msgstr "Sinulla ei ole valtuutusta tähän."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -851,14 +857,15 @@ msgstr "Tietokantavirhe tallennettaessa risutagiä: %s"
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -927,7 +934,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1857,7 +1864,7 @@ msgstr "Sinä et kuulu tähän ryhmään."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "Istuntoavaimesi kanssa oli ongelma."
@@ -1953,15 +1960,17 @@ msgstr "Poista käyttäjä"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to 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 when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Et ole kirjautunut sisään."
@@ -2229,12 +2238,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Lisää suosikkeihin"
 
@@ -2271,67 +2280,77 @@ msgid "Use this form to edit your application."
 msgstr "Käytä tätä lomaketta muokataksesi ryhmää."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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 "Sama kuin ylläoleva salasana. Pakollinen."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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 "Koko nimi on liian pitkä (max 255 merkkiä)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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 "Tunnus on jo käytössä. Yritä toista tunnusta."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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 "Kuvaus"
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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 "Kotisivun verkko-osoite ei ole toimiva."
 
 #. TRANS: Validation error shown when not providing an organisation in the "Edit application" form.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 #, fuzzy
 msgid "Could not update application."
 msgstr "Ei voitu päivittää ryhmää."
@@ -2387,26 +2406,26 @@ msgid "Options saved."
 msgstr "Asetukset tallennettu."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 msgid "Email settings"
 msgstr "Profiiliasetukset"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 #, fuzzy
 msgid "Email address"
 msgstr "Sähköpostiosoitteet"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "Tämän hetken vahvistettu sähköpostiosoite."
 
@@ -2415,14 +2434,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Poista"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2436,14 +2456,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2451,31 +2471,31 @@ msgstr "Lisää"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Saapuva sähköposti"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2483,90 +2503,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 #, fuzzy
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Uusi"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "Sähköpostiosoitteet"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 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:222
+#: actions/emailsettings.php:218
 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:229
+#: actions/emailsettings.php:225
 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:235
+#: actions/emailsettings.php:231
 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:241
+#: actions/emailsettings.php:237
 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:247
+#: actions/emailsettings.php:243
 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:368
+#: actions/emailsettings.php:361
 #, fuzzy
 msgid "Email preferences saved."
 msgstr "Ulkoasuasetukset tallennettu."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "Sähköpostiosoitetta ei ole."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, 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:401 actions/register.php:212
+#: 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."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 #, 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:433
+#: actions/emailsettings.php:425
 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."
@@ -2578,140 +2599,169 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 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:459
+#: actions/emailsettings.php:450
 #, fuzzy
 msgid "That is the wrong email address."
 msgstr "Tämä on väärä pikaviestiosoite."
 
 #. 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 #, fuzzy
 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:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 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:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "Saapuvan sähköpostin osoite poistettu."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: actions/smssettings.php:565 actions/smssettings.php:588
 #, fuzzy
 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:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Uusi saapuvan sähköpostin osoite lisätty."
 
-#: actions/favor.php:79
+#. 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!"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. 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"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. 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."
 
-#: actions/favorited.php:150
+#. 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."
 msgstr ""
 
-#: actions/favorited.php:156
+#. 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 "
 "notice to your favorites!"
 msgstr ""
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Käyttäjän %s suosikkipäivitykset"
 
-#: actions/favoritesrss.php:115
+#. 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"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
+#. TRANS: Description on page displaying featured users.
+#: actions/featured.php:102
 #, fuzzy, php-format
-msgid "A selection of some great users on %s"
+msgid "A selection of some great users on %s."
 msgstr "Valikoima joitakin loistavia palvelun %s käyttäjiä"
 
-#: actions/file.php:34
+#. 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."
 
-#: actions/file.php:38
+#. 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."
 
-#: actions/file.php:42
+#. 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."
 
-#: actions/file.php:51
+#. 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."
 
@@ -2777,6 +2827,7 @@ msgstr "Käyttäjällä ei ole profiilia."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2785,9 +2836,10 @@ msgstr "Profiilia ei ole määritelty."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 #, fuzzy
 msgid "No profile with that ID."
 msgstr "Ei profiilia tuolle ID:lle."
@@ -3615,21 +3667,24 @@ 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:65
+#: 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."
 
-#: actions/newapplication.php:184
+#. 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 ""
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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."
@@ -5053,8 +5108,9 @@ msgstr "Luotu"
 msgid "Repeated!"
 msgstr "Luotu"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "Vastaukset käyttäjälle %s"
@@ -5348,44 +5404,56 @@ msgstr ""
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Oletko varma että haluat poistaa tämän päivityksen?"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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ä."
 
-#: actions/showfavorites.php:171
+#. 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)"
 
-#: actions/showfavorites.php:178
+#. 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)"
 
-#: actions/showfavorites.php:185
+#. 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)"
 
-#: actions/showfavorites.php:206
+#. 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."
 msgstr ""
 
-#: actions/showfavorites.php:208
+#. 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 "
 "would add to their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5393,7 +5461,8 @@ msgid ""
 "their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:243
+#. TRANS: Page notice for show favourites page.
+#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr ""
 
@@ -5974,7 +6043,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "Koodia ei ole syötetty."
 
 #. TRANS: Menu item for site administration
@@ -6301,7 +6371,6 @@ msgstr ""
 
 #. TRANS: Link description in user account settings menu.
 #: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "Profiili"
 
@@ -6577,7 +6646,7 @@ msgid "Author(s)"
 msgstr ""
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Lisää suosikiksi"
 
@@ -6991,51 +7060,52 @@ msgstr ""
 msgid "Primary site navigation"
 msgstr "Ensisijainen sivunavigointi"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Henkilökohtainen profiili ja kavereiden aikajana"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 #, fuzzy
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Omat"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Vaihda salasanasi"
 
-#. TRANS: Main menu option when logged in for access to user settings
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "Käyttäjätili"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Ei voitu uudelleenohjata palvelimelle: %s"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "Yhdistä"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Ensisijainen sivunavigointi"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
 #: lib/action.php:556 lib/groupnav.php:117
 #, fuzzy
@@ -7043,14 +7113,14 @@ msgctxt "MENU"
 msgid "Admin"
 msgstr "Ylläpito"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, fuzzy, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Kutsu kavereita ja työkavereita liittymään palveluun %s"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 #, fuzzy
 msgctxt "MENU"
@@ -7063,19 +7133,19 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Kirjaudu sisään"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Kirjaudu ulos"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Luo uusi ryhmä"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 #, fuzzy
@@ -7083,13 +7153,13 @@ msgctxt "MENU"
 msgid "Register"
 msgstr "Rekisteröidy"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Kirjaudu sisään"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 #, fuzzy
@@ -7097,25 +7167,25 @@ msgctxt "MENU"
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Ohjeet"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "Ohje"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 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
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 #, fuzzy
 msgctxt "MENU"
@@ -7426,7 +7496,7 @@ msgid "User configuration"
 msgstr "SMS vahvistus"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "Käyttäjä"
 
@@ -8180,14 +8250,32 @@ msgstr "Ulkoasuasetukset tallennettu."
 msgid "Unable to find services for %s."
 msgstr "Käytä tätä lomaketta muokataksesi ryhmää."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Disfavor favorite"
+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"
@@ -8976,34 +9064,52 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Ei voitu lisätä uutta tilausta."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "Omat"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "Vastaukset"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "Saapuneet"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "Sinulle saapuneet viestit"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "Lähetetyt"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -9059,6 +9165,7 @@ msgstr ""
 msgid "All groups"
 msgstr "Kaikki ryhmät"
 
+#. TRANS: Server error displayed when using an unimplemented method.
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
@@ -9481,3 +9588,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Personal"
+#~ msgstr "Omat"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index fdfe2a384f..102460b3b6 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:47:53+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52: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 (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -99,7 +99,7 @@ msgstr "Sauvegarder les paramètres d’accès"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -112,7 +112,7 @@ 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:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Page non trouvée."
 
@@ -139,6 +139,8 @@ msgstr "Page non trouvée."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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 +156,12 @@ msgstr "Page non trouvée."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -176,9 +178,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s et ses amis"
@@ -338,8 +341,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -377,7 +380,7 @@ msgstr "Impossible d’enregistrer le profil."
 #: 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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
 msgid ""
@@ -547,8 +550,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "Impossible de créer le favori."
 
@@ -559,7 +563,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Impossible de supprimer le favori."
 
@@ -623,10 +627,11 @@ msgstr "Pseudo invalide."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -645,13 +650,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
@@ -816,8 +822,8 @@ msgstr "Le jeton de requête a déjà été autorisé."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -854,14 +860,15 @@ msgstr ""
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -937,7 +944,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1871,7 +1878,7 @@ msgstr "Vous n’êtes pas le propriétaire de cette application."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "Un problème est survenu avec votre jeton de session."
@@ -1965,15 +1972,17 @@ msgstr "Supprimer ce groupe"
 
 #. 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 when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Non connecté."
@@ -2233,12 +2242,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Ajouter aux favoris"
 
@@ -2271,61 +2280,71 @@ 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.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: 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)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Impossible de mettre à jour l’application."
 
@@ -2379,25 +2398,25 @@ msgid "Options saved."
 msgstr "Vos options ont été enregistrées."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 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:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "Adresse électronique"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "Adresse courriel actuellement confirmée."
 
@@ -2406,14 +2425,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Enlever"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2426,14 +2446,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2441,29 +2461,29 @@ msgstr "Ajouter"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Courriel entrant"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2471,90 +2491,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nouveau"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "Préférences de courrier électronique"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 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:222
+#: actions/emailsettings.php:218
 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:229
+#: actions/emailsettings.php:225
 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:235
+#: actions/emailsettings.php:231
 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:241
+#: actions/emailsettings.php:237
 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:247
+#: actions/emailsettings.php:243
 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:368
+#: actions/emailsettings.php:361
 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:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "Aucune adresse électronique."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, 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:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: 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:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 #, 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:433
+#: actions/emailsettings.php:425
 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."
@@ -2565,89 +2586,99 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 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:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 #, 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:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 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:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "L’adresse électronique a été supprimée."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Nouvelle adresse de courriel entrant ajoutée."
 
-#: actions/favor.php:79
+#. 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 !"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. TRANS: Page title for page on which favorite notices can be unfavourited.
+#: actions/favor.php:95
 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"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. 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."
 
-#: actions/favorited.php:150
+#. 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 "
@@ -2656,7 +2687,9 @@ msgstr ""
 "Soyez le premier à ajouter un avis dans vos favoris en cliquant sur le "
 "bouton favori à côté d’un avis que vous aimez."
 
-#: actions/favorited.php:156
+#. 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 "
@@ -2665,45 +2698,62 @@ msgstr ""
 "Pourquoi ne pas [créer un nouveau compte](%%action.register%%) et être le "
 "premier à ajouter un avis à vos favoris !"
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Avis favoris de %s"
 
-#: actions/favoritesrss.php:115
+#. 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"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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"
 
-#: actions/file.php:34
+#. 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."
 
-#: actions/file.php:38
+#. 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."
 
-#: actions/file.php:42
+#. 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."
 
-#: actions/file.php:51
+#. 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."
 
@@ -2765,6 +2815,7 @@ msgstr "L’utilisateur a déjà ce rôle."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2773,9 +2824,10 @@ msgstr "Aucun profil n’a été spécifié."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Aucun profil ne correspond à cet identifiant."
 
@@ -3622,19 +3674,22 @@ msgid "New application"
 msgstr "Nouvelle application"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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."
 
-#: actions/newapplication.php:184
+#. 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."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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."
 
@@ -5036,8 +5091,9 @@ msgstr "Repris"
 msgid "Repeated!"
 msgstr "Repris !"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "Réponses à %s"
@@ -5330,31 +5386,38 @@ msgstr ""
 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 ?"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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."
 
-#: actions/showfavorites.php:171
+#. 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)"
 
-#: actions/showfavorites.php:178
+#. 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)"
 
-#: actions/showfavorites.php:185
+#. 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)"
 
-#: actions/showfavorites.php:206
+#. 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."
@@ -5363,7 +5426,9 @@ msgstr ""
 "favori sur les avis que vous aimez pour les mémoriser à l’avenir ou les "
 "mettre en lumière."
 
-#: actions/showfavorites.php:208
+#. 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 "
@@ -5372,7 +5437,10 @@ msgstr ""
 "%s n’a pas ajouté d’avis à ses favoris pour le moment. Publiez quelque chose "
 "d’intéressant, et cela pourrait être ajouté à ses favoris :)"
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5383,7 +5451,8 @@ msgstr ""
 "un compte](%%%%action.register%%%%), puis poster quelque chose "
 "d’intéressant, qu’il pourrait ajouter à ses favoris :)"
 
-#: actions/showfavorites.php:243
+#. 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."
 
@@ -5974,7 +6043,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "Aucun code entré"
 
 #. TRANS: Menu item for site administration
@@ -6308,7 +6378,6 @@ 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
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "Profil"
 
@@ -6590,7 +6659,7 @@ msgid "Author(s)"
 msgstr "Auteur(s)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Ajouter à mes favoris"
 
@@ -7002,61 +7071,62 @@ msgstr "Voir davantage"
 msgid "Primary site navigation"
 msgstr "Navigation primaire du site"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Profil personnel et flux des amis"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personnel"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 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
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "Compte"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Se connecter aux services"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "Connexion"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Modifier la configuration du site"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: 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:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrer"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Inviter des amis et collègues à vous rejoindre sur %s"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -7068,57 +7138,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Fermer la session"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Déconnexion"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Créer un compte"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "S’inscrire"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Ouvrir une session"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Connexion"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "À l’aide !"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "Aide"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 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
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7421,7 +7491,7 @@ msgid "User configuration"
 msgstr "Configuration utilisateur"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "Utilisateur"
 
@@ -8202,14 +8272,32 @@ msgstr "Les paramètre par défaut de la conception ont été restaurés."
 msgid "Unable to find services for %s."
 msgstr "Impossible de révoquer l’accès par l’application : %s."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Disfavor favorite"
+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"
@@ -9085,34 +9173,52 @@ msgstr "Avis en doublon."
 msgid "Couldn't insert new subscription."
 msgstr "Impossible d’insérer un nouvel abonnement."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "Personnel"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "Réponses"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "Boîte de réception"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "Vos messages reçus"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "Boîte d’envoi"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -9166,6 +9272,7 @@ msgstr "Moyenne journalière"
 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."
@@ -9584,3 +9691,6 @@ msgstr "XML invalide, racine XRD manquante."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Obtention de la sauvegarde depuis le fichier « %s »."
+
+#~ msgid "Personal"
+#~ msgstr "Personnel"
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index db84455380..5e72f4f4f8 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:47:54+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52: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 (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -89,7 +89,7 @@ msgstr "Gardar a configuración de acceso"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -102,7 +102,7 @@ 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:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Esa páxina non existe."
 
@@ -129,6 +129,8 @@ msgstr "Esa páxina non existe."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +146,12 @@ msgstr "Esa páxina non existe."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -166,9 +168,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amigos"
@@ -327,8 +330,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -366,7 +369,7 @@ msgstr "Non se puido gardar o perfil."
 #: 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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, fuzzy, php-format
 msgid ""
@@ -535,8 +538,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "Non se puido crear o favorito."
 
@@ -547,7 +551,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Non se puido eliminar o favorito."
 
@@ -612,10 +616,11 @@ msgstr "O formato do alcume non é correcto."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -635,13 +640,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
@@ -809,8 +815,8 @@ msgstr "Non está autorizado."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -846,14 +852,15 @@ msgstr ""
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -927,7 +934,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1857,7 +1864,7 @@ msgstr "Non é o dono desa aplicación."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "Houbo un problema co seu pase."
@@ -1954,15 +1961,17 @@ msgstr "Borrar o usuario"
 
 #. 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 when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Non iniciou sesión."
@@ -2224,12 +2233,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Engadir aos favoritos"
 
@@ -2262,63 +2271,73 @@ 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.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: 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)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Non se puido actualizar a aplicación."
 
@@ -2372,25 +2391,25 @@ msgid "Options saved."
 msgstr "Gardáronse as preferencias."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 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:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "Enderezo de correo electrónico"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "Enderezo de correo electrónico confirmado actualmente."
 
@@ -2399,14 +2418,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Borrar"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2419,14 +2439,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2434,32 +2454,32 @@ msgstr "Engadir"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Correo entrante"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2467,92 +2487,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Novo"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "Preferencias de correo electrónico"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 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:222
+#: actions/emailsettings.php:218
 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:229
+#: actions/emailsettings.php:225
 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:235
+#: actions/emailsettings.php:231
 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:241
+#: actions/emailsettings.php:237
 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:247
+#: actions/emailsettings.php:243
 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:368
+#: actions/emailsettings.php:361
 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:388
+#: actions/emailsettings.php:380
 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:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, 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:401 actions/register.php:212
+#: 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."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 #, 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:433
+#: actions/emailsettings.php:425
 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."
@@ -2564,87 +2585,97 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 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:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 #, 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:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 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:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "Borrouse o enderezo de correo electrónico."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Engadiuse un novo enderezo de correo electrónico entrante."
 
-#: actions/favor.php:79
+#. 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!"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. TRANS: Page title for page on which favorite notices can be unfavourited.
+#: actions/favor.php:95
 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"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. 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."
 
-#: actions/favorited.php:150
+#. 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 "
@@ -2653,7 +2684,9 @@ msgstr ""
 "Sexa o primeiro en engadir unha nota aos seus favoritos premendo sobre o "
 "botón de favoritos que aparece ao carón de calquera nota que lle guste."
 
-#: actions/favorited.php:156
+#. 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 "
@@ -2662,45 +2695,62 @@ msgstr ""
 "Por que non [rexistrar unha conta](%%action.register%%) e ser o primeiro en "
 "engadir unha nota aos seus favoritos?"
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Notas favoritas de %s"
 
-#: actions/favoritesrss.php:115
+#. 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"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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"
 
-#: actions/file.php:34
+#. 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."
 
-#: actions/file.php:38
+#. 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."
 
-#: actions/file.php:42
+#. 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."
 
-#: actions/file.php:51
+#. 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."
 
@@ -2762,6 +2812,7 @@ msgstr "O usuario xa ten este rol."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2770,9 +2821,10 @@ msgstr "Non se especificou ningún perfil."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Ningún perfil ten esa ID."
 
@@ -3609,19 +3661,22 @@ msgid "New application"
 msgstr "Aplicación nova"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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."
 
-#: actions/newapplication.php:184
+#. 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."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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."
 
@@ -5039,8 +5094,9 @@ msgstr "Repetida"
 msgid "Repeated!"
 msgstr "Repetida!"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "Respostas a %s"
@@ -5332,31 +5388,38 @@ msgstr ""
 "Seguro que quere restablecer a súa clave e maila súa pregunta secreta de "
 "consumidor?"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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."
 
-#: actions/showfavorites.php:171
+#. 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)"
 
-#: actions/showfavorites.php:178
+#. 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)"
 
-#: actions/showfavorites.php:185
+#. 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)"
 
-#: actions/showfavorites.php:206
+#. 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."
@@ -5364,7 +5427,9 @@ msgstr ""
 "Aínda non escolleu ningunha nota favorita. Prema no botón de nota favorita "
 "naquelas notas que lle gusten para marcalas para logo ou para salientalas."
 
-#: actions/showfavorites.php:208
+#. 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 "
@@ -5373,7 +5438,10 @@ msgstr ""
 "%s aínda non marcou ningunha nota como favorita. Publique algo interesante "
 "que poida querer engadir aos seus favoritos :)"
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5384,7 +5452,8 @@ msgstr ""
 "conta](%%%%action.register%%%%) e publicar algo interesante que puidese "
 "querer engadir aos seus favoritos? :)"
 
-#: actions/showfavorites.php:243
+#. 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."
 
@@ -5973,7 +6042,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "Non se introduciu ningún código"
 
 #. TRANS: Menu item for site administration
@@ -6307,7 +6377,6 @@ 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
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "Perfil"
 
@@ -6585,7 +6654,7 @@ msgid "Author(s)"
 msgstr "Autores"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Marcar como favorito"
 
@@ -6994,61 +7063,62 @@ msgstr "Mostrar máis"
 msgid "Primary site navigation"
 msgstr "Navegación principal do sitio"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Liña do tempo do perfil persoal e os amigos"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Persoal"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 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
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "Conta"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Conectarse aos servizos"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "Conectarse"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Cambiar a configuración do sitio"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: 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:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrador"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Convide a amigos e compañeiros a unírselle en %s"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -7060,57 +7130,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Saír ao anonimato"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Saír"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Crear unha conta"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Rexistrarse"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Identificarse no sitio"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Identificarse"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Axuda!"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "Axuda"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 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
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7414,7 +7484,7 @@ msgid "User configuration"
 msgstr "Configuración do usuario"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "Usuario"
 
@@ -8200,14 +8270,32 @@ msgstr "Restableceuse o deseño por defecto."
 msgid "Unable to find services for %s."
 msgstr "Non se puido revogar o acceso da aplicación: %s."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Disfavor favorite"
+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"
@@ -9082,34 +9170,52 @@ msgstr "Nota duplicada."
 msgid "Couldn't insert new subscription."
 msgstr "Non se puido inserir unha subscrición nova."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "Persoal"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "Respostas"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "As mensaxes recibidas"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "Caixa de saída"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -9163,6 +9269,7 @@ msgstr "Media diaria"
 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."
@@ -9579,3 +9686,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Personal"
+#~ msgstr "Persoal"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index d186e4db20..63ad1132f3 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:47:55+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52: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 (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hsb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || "
 "n%100==4) ? 2 : 3)\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -90,7 +90,7 @@ msgstr "Přistupne nastajenja składować"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -103,7 +103,7 @@ 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:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Strona njeeksistuje."
 
@@ -130,6 +130,8 @@ msgstr "Strona njeeksistuje."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +147,12 @@ msgstr "Strona njeeksistuje."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -167,9 +169,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s a přećeljo"
@@ -320,8 +323,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -359,7 +362,7 @@ msgstr "Profil njeje so składować dał."
 #: 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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
 msgid ""
@@ -526,8 +529,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "Faworit njeda so wutworić."
 
@@ -538,7 +542,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Faworit njeda so zhašeć."
 
@@ -602,10 +606,11 @@ msgstr "Žane płaćiwe přimjeno."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -624,13 +629,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
@@ -799,8 +805,8 @@ msgstr "Naprašowanski token hižo awtorizowany."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -833,14 +839,15 @@ msgstr "Zmylk datoweje banki při zasunjenju oauth_token_association."
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -908,7 +915,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1389,9 +1396,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Already subscribed to %s."
-msgstr "Hižo abonowany!"
+msgstr "%s hižo abonowany."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
@@ -1731,14 +1738,14 @@ 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 ""
+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
-#, fuzzy, php-format
+#, php-format
 msgid "You must write \"%s\" exactly in the box."
-msgstr "Dyrbiš \"%s\"eksaktnje do pola zapisać."
+msgstr "Dyrbiš \"%s\" eksaktnje do pola zapisać."
 
 #. TRANS: Confirmation that a user account has been deleted.
 #: actions/deleteaccount.php:206
@@ -1805,7 +1812,7 @@ msgstr "Njejsy wobsedźer tuteje aplikacije."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr ""
@@ -1892,15 +1899,17 @@ msgstr "Tutu skupinu zhašeć"
 
 #. 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 when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Njepřizjewjeny."
@@ -2150,12 +2159,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "K faworitam přidać"
 
@@ -2188,61 +2197,71 @@ 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.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: 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)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Aplikacija njeda so aktualizować."
 
@@ -2296,25 +2315,25 @@ msgid "Options saved."
 msgstr "Opcije składowane."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 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:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "E-mejlowa adresa"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "Aktualna wobkrućena e-mejlowa adresa."
 
@@ -2323,14 +2342,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Wotstronić"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2341,14 +2361,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2356,29 +2376,29 @@ msgstr "Přidać"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Dochadźaca e-mejl"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2386,87 +2406,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nowy"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "E-mejlowe nastajenja"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 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:222
+#: actions/emailsettings.php:218
 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:229
+#: actions/emailsettings.php:225
 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:235
+#: actions/emailsettings.php:231
 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:241
+#: actions/emailsettings.php:237
 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:247
+#: actions/emailsettings.php:243
 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:368
+#: actions/emailsettings.php:361
 msgid "Email preferences saved."
 msgstr "E-mejlowe nastajenja składowane."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "Žana e-mejlowa adresa."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, fuzzy
+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:401 actions/register.php:212
+#: 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."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 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:433
+#: actions/emailsettings.php:425
 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."
@@ -2475,137 +2496,166 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 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:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 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:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 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:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "E-mejlowa adresa bu wotstronjena."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Nowa adresa za dochadźace e-mejle přidata."
 
-#: actions/favor.php:79
+#. 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!"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. 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"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. TRANS: Description on page displaying favorited notices.
+#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr ""
 
-#: actions/favorited.php:150
+#. 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."
 msgstr ""
 
-#: actions/favorited.php:156
+#. 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 "
 "notice to your favorites!"
 msgstr ""
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Fawority wužiwarja %s"
 
-#: actions/favoritesrss.php:115
+#. 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"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. TRANS: Description on page displaying featured users.
+#: actions/featured.php:102
+#, fuzzy, php-format
+msgid "A selection of some great users on %s."
 msgstr "Wuběr wulkotnych wužiwarjow na %s"
 
-#: actions/file.php:34
+#. 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."
 
-#: actions/file.php:38
+#. 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."
 
-#: actions/file.php:42
+#. 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."
 
-#: actions/file.php:51
+#. 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."
 
@@ -2667,6 +2717,7 @@ msgstr "Wužiwar hižo ma tutu rólu."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2675,9 +2726,10 @@ msgstr "Žadyn profil podaty."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Žadyn profil z tym ID."
 
@@ -3454,19 +3506,22 @@ msgid "New application"
 msgstr "Nowa aplikacija"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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ł."
 
-#: actions/newapplication.php:184
+#. 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."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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ć."
 
@@ -3487,9 +3542,8 @@ msgstr "Wužij tutón formular, zo by nowu skupinu wutworił."
 
 #. TRANS: Group create form validation error.
 #: actions/newgroup.php:199
-#, fuzzy
 msgid "Alias cannot be the same as nickname."
-msgstr "Alias njemóže samsny kaž přimjeno być."
+msgstr "Alias njemóže samsne kaž přimjeno być."
 
 #: actions/newmessage.php:71 actions/newmessage.php:234
 msgid "New message"
@@ -4786,8 +4840,9 @@ msgstr "Wospjetowany"
 msgid "Repeated!"
 msgstr "Wospjetowany!"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "Wotmołwy na %s"
@@ -5034,11 +5089,11 @@ msgstr "Aplikaciske informacije"
 
 #: actions/showapplication.php:263
 msgid "Consumer key"
-msgstr ""
+msgstr "Kluč přetrjebowarja"
 
 #: actions/showapplication.php:268
 msgid "Consumer secret"
-msgstr ""
+msgstr "Potajnstwo přetrjebowarja"
 
 #: actions/showapplication.php:273
 msgid "Request token URL"
@@ -5062,44 +5117,56 @@ msgstr ""
 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ć?"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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ć."
 
-#: actions/showfavorites.php:171
+#. 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)"
 
-#: actions/showfavorites.php:178
+#. 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)"
 
-#: actions/showfavorites.php:185
+#. 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)"
 
-#: actions/showfavorites.php:206
+#. 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."
 msgstr ""
 
-#: actions/showfavorites.php:208
+#. 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 "
 "would add to their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5107,7 +5174,8 @@ msgid ""
 "their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:243
+#. TRANS: Page notice for show favourites page.
+#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr ""
 
@@ -5654,7 +5722,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "Žadyn kod zapodaty"
 
 #. TRANS: Menu item for site administration
@@ -5972,7 +6041,6 @@ 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
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "Profil"
 
@@ -6226,7 +6294,7 @@ msgid "Author(s)"
 msgstr "Awtorojo"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Faworit"
 
@@ -6347,7 +6415,7 @@ 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:537
 msgid "No database name or DSN found anywhere."
-msgstr ""
+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
@@ -6511,7 +6579,7 @@ msgstr "Slědować"
 #: classes/Subscription.php:268
 #, php-format
 msgid "%1$s is now following %2$s."
-msgstr ""
+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.
@@ -6553,16 +6621,16 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Cannot locate account %s."
-msgstr "Njemóžeš swoje konto zhašeć."
+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 ""
+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.
@@ -6628,61 +6696,62 @@ msgstr "Wjace pokazać"
 msgid "Primary site navigation"
 msgstr "Primarna sydłowa nawigacija"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Wosobinski"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 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
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "Konto"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Ze słužbami zwjazać"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "Zwjazać"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Sydłowu konfiguraciju změnić"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: 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:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrator"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Přećelow a kolegow přeprosyć, so tebi na %s  přidružić"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -6694,57 +6763,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Ze sydła wotzjewić"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Wotzjewić"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Konto załožić"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrować"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Při sydle přizjewić"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Přizjewjenje"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Pomhaj!"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "Pomoc"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 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
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -6810,7 +6879,7 @@ msgstr "Kontakt"
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
 #: lib/action.php:892
 msgid "Badge"
-msgstr ""
+msgstr "Plaketa"
 
 #. TRANS: DT element for StatusNet software license.
 #: lib/action.php:921
@@ -6908,7 +6977,7 @@ 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 ""
+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
@@ -6923,7 +6992,7 @@ 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 ""
+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
@@ -6948,9 +7017,9 @@ msgid "No content for notice %s."
 msgstr "!Žadyn wobsah za powěsć %s."
 
 #: lib/activitymover.php:84
-#, fuzzy, php-format
+#, php-format
 msgid "No such user %s."
-msgstr "Wužiwar njeeksistuje"
+msgstr "Wužiwar %s njeeksistuje."
 
 #. 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.
@@ -6959,10 +7028,10 @@ msgstr "Wužiwar njeeksistuje"
 #. 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
@@ -7034,7 +7103,7 @@ msgid "User configuration"
 msgstr "Wužiwarska konfiguracija"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "Wužiwar"
 
@@ -7066,7 +7135,7 @@ msgstr "Konfiguracija wobrazowkowych fotow"
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:401
 msgid "Set site license"
-msgstr ""
+msgstr "Licencu sydła nastajić"
 
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
@@ -7076,7 +7145,7 @@ 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 ""
+msgstr "Žana aplikacija za tón kluč přetrjebowarja."
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
 #: lib/apiauth.php:219
@@ -7192,7 +7261,7 @@ msgstr "Desktop"
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
-msgstr ""
+msgstr "Typ aplikacije, wobhladowaka abo dźěłanskeho powjercha"
 
 #. TRANS: Radio button label for access type.
 #: lib/applicationeditform.php:314
@@ -7773,18 +7842,36 @@ msgstr "Designowe standardne nastajenja wobnowjene."
 
 #. TRANS: Exception. %s is an ID.
 #: lib/discovery.php:153
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to find services for %s."
-msgstr "Njemóžno přistup za aplikaciju cofnyć: %s-"
+msgstr "Njemóžno słužby za %s namakać."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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ć"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+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
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Favor"
+msgstr "Faworit"
+
 #: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8180,9 +8267,9 @@ msgstr "%s: wobkruć, zo tute telefonowe čisło ze slědowacym kodom tebi słu
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
 #: lib/mail.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "You have been nudged by %s"
-msgstr "Sy so wot %s storčił"
+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,
@@ -8561,34 +8648,52 @@ msgstr "Dwójna zdźělenka."
 msgid "Couldn't insert new subscription."
 msgstr "Nowy abonement njeda so zasunyć."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "Wosobinski"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "Wotmołwy"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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 "Fawority"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "Dochadny póst"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "Twoje dochadźace powěsće"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "Wuchadny póst"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -8642,6 +8747,7 @@ msgstr "Dnjowy přerězk"
 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."
@@ -9062,3 +9168,6 @@ 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 "Personal"
+#~ msgstr "Wosobinski"
diff --git a/locale/hu/LC_MESSAGES/statusnet.po b/locale/hu/LC_MESSAGES/statusnet.po
index 6de25147f6..6a79f5e478 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:48:14+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52: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-01-22 19:49:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hu\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -92,7 +92,7 @@ msgstr "Hozzáférések beállításainak mentése"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -105,7 +105,7 @@ 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:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Nincs ilyen lap."
 
@@ -132,6 +132,8 @@ msgstr "Nincs ilyen lap."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +149,12 @@ msgstr "Nincs ilyen lap."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -169,9 +171,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s és barátai"
@@ -324,8 +327,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -363,7 +366,7 @@ msgstr "Nem sikerült menteni a profilt."
 #: 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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, fuzzy, php-format
 msgid ""
@@ -530,8 +533,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "Nem sikerült létrehozni a kedvencet."
 
@@ -542,7 +546,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Nem sikerült törölni a kedvencet."
 
@@ -606,10 +610,11 @@ msgstr "Nem érvényes becenév."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -629,13 +634,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
@@ -803,8 +809,8 @@ msgstr "Nincs jogosultságod."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -837,14 +843,15 @@ msgstr ""
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -913,7 +920,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1841,7 +1848,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:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr ""
@@ -1936,15 +1943,17 @@ msgstr "Töröljük ezt a felhasználót"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to 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 when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Nem vagy bejelentkezve."
@@ -2201,12 +2210,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Hozzáadás a kedvencekhez"
 
@@ -2239,63 +2248,73 @@ msgid "Use this form to edit your application."
 msgstr ""
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: 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)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr ""
 
@@ -2349,25 +2368,25 @@ msgid "Options saved."
 msgstr "Beállítások elmentve."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 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:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "Email-cím"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "A jelenleg megerősített e-mail cím."
 
@@ -2376,14 +2395,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Eltávolítás"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2397,14 +2417,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2412,29 +2432,29 @@ msgstr "Hozzáadás"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Bejövő email"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2442,90 +2462,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Új"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "E-mail beállítások"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 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:222
+#: actions/emailsettings.php:218
 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:229
+#: actions/emailsettings.php:225
 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:235
+#: actions/emailsettings.php:231
 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:241
+#: actions/emailsettings.php:237
 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:247
+#: actions/emailsettings.php:243
 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:368
+#: actions/emailsettings.php:361
 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:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "Nincs e-mail cím."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, 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:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: 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:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 #, 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:433
+#: actions/emailsettings.php:425
 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."
@@ -2537,141 +2558,170 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 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:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 #, 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:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 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:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr ""
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Új bejövő e-mail cím hozzáadva."
 
-#: actions/favor.php:79
+#. 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!"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. TRANS: Page title for page on which favorite notices can be unfavourited.
+#: actions/favor.php:95
 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"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. 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"
 
-#: actions/favorited.php:150
+#. 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."
 msgstr ""
 
-#: actions/favorited.php:156
+#. 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 "
 "notice to your favorites!"
 msgstr ""
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s kedvenc hírei"
 
-#: actions/favoritesrss.php:115
+#. 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"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
+#. TRANS: Description on page displaying featured users.
+#: actions/featured.php:102
 #, php-format
-msgid "A selection of some great users on %s"
+msgid "A selection of some great users on %s."
 msgstr ""
 
-#: actions/file.php:34
+#. 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."
 
-#: actions/file.php:38
+#. 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."
 
-#: actions/file.php:42
+#. 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."
 
-#: actions/file.php:51
+#. 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."
 
@@ -2733,6 +2783,7 @@ msgstr "A felhasználónak már van ilyen szerepe."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2741,9 +2792,10 @@ msgstr "Nincs profil megadva."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Nincs ilyen azonosítóval rendelkező profil."
 
@@ -3523,19 +3575,22 @@ msgid "New application"
 msgstr "Új alkalmazás"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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 ""
 
-#: actions/newapplication.php:184
+#. 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."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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."
 
@@ -4899,8 +4954,9 @@ msgstr ""
 msgid "Repeated!"
 msgstr ""
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr ""
@@ -5180,44 +5236,56 @@ msgstr ""
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
-#: actions/showfavorites.php:79
+#. 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 ""
 
-#: actions/showfavorites.php:132
+#. 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."
 
-#: actions/showfavorites.php:171
+#. 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"
 
-#: actions/showfavorites.php:178
+#. 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"
 
-#: actions/showfavorites.php:185
+#. 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"
 
-#: actions/showfavorites.php:206
+#. 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."
 msgstr ""
 
-#: actions/showfavorites.php:208
+#. 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 "
 "would add to their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5225,7 +5293,8 @@ msgid ""
 "their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:243
+#. 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."
 
@@ -5788,7 +5857,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "Nincs kód megadva"
 
 #. TRANS: Menu item for site administration
@@ -6104,7 +6174,6 @@ msgstr ""
 
 #. TRANS: Link description in user account settings menu.
 #: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "Profil"
 
@@ -6359,7 +6428,7 @@ msgid "Author(s)"
 msgstr "Szerző(k)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Kedvelem"
 
@@ -6755,61 +6824,62 @@ msgstr ""
 msgid "Primary site navigation"
 msgstr "Elsődleges navigáció"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to user settings
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "Kontó"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 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
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "Kapcsolódás"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr ""
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
 #: lib/action.php:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -6821,57 +6891,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr ""
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr ""
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr ""
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr ""
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr ""
 
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7164,7 +7234,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:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "Felhasználó"
 
@@ -7892,14 +7962,32 @@ msgstr ""
 msgid "Unable to find services for %s."
 msgstr ""
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Disfavor favorite"
+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 ""
@@ -8731,34 +8819,52 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr ""
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "Személyes"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "Válaszok"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
-msgstr ""
+msgstr "Homokozó"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "A bejövő üzeneteid"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
-msgstr ""
+msgstr "%s kimenő postafiókja"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -8812,6 +8918,7 @@ msgstr ""
 msgid "All groups"
 msgstr "Összes csoport"
 
+#. TRANS: Server error displayed when using an unimplemented method.
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
@@ -9218,3 +9325,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Personal"
+#~ msgstr "Személyes"
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index 25836c924a..258a513994 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:48:16+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52: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 (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -87,7 +87,7 @@ msgstr "Salveguardar configurationes de accesso"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -100,7 +100,7 @@ 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:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Pagina non existe."
 
@@ -127,6 +127,8 @@ msgstr "Pagina non existe."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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
@@ -142,12 +144,12 @@ msgstr "Pagina non existe."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -164,9 +166,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amicos"
@@ -325,8 +328,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -364,7 +367,7 @@ msgstr "Non poteva salveguardar le profilo."
 #: 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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
 msgid ""
@@ -531,8 +534,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "Non poteva crear le favorite."
 
@@ -543,7 +547,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Non poteva deler le favorite."
 
@@ -607,10 +611,11 @@ msgstr "Non un pseudonymo valide."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -629,13 +634,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
@@ -800,8 +806,8 @@ msgstr "Indicio de requesta jam autorisate."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -835,14 +841,15 @@ msgstr ""
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -916,7 +923,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1402,9 +1409,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Already subscribed to %s."
-msgstr "Ja subscribite!"
+msgstr "Ja subscribite a %s."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
@@ -1758,7 +1765,7 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr "Tu debe scriber \"%s\" exactemente in le quadro."
 
@@ -1831,7 +1838,7 @@ msgstr "Tu non es le proprietario de iste application."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "Il habeva un problema con tu indicio de session."
@@ -1924,15 +1931,17 @@ msgstr "Deler iste gruppo"
 
 #. 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 when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Tu non ha aperite un session."
@@ -2189,12 +2198,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Adder al favorites"
 
@@ -2227,61 +2236,71 @@ 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.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: 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)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Non poteva actualisar application."
 
@@ -2335,25 +2354,25 @@ msgid "Options saved."
 msgstr "Optiones salveguardate."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 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:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "Adresse de e-mail"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "Adresse de e-mail actualmente confirmate."
 
@@ -2362,14 +2381,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Remover"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2382,14 +2402,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2397,30 +2417,30 @@ msgstr "Adder"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "E-mail entrante"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2430,87 +2450,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nove"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "Preferentias de e-mail"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 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:222
+#: actions/emailsettings.php:218
 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:229
+#: actions/emailsettings.php:225
 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:235
+#: actions/emailsettings.php:231
 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:241
+#: actions/emailsettings.php:237
 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:247
+#: actions/emailsettings.php:243
 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:368
+#: actions/emailsettings.php:361
 msgid "Email preferences saved."
 msgstr "Preferentias de e-mail salveguardate."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "Nulle adresse de e-mail."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, fuzzy
+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:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: 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:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 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:433
+#: actions/emailsettings.php:425
 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."
@@ -2522,86 +2543,96 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 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:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 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:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 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:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "Le adresse de e-mail ha essite removite."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Nove adresse de e-mail entrante addite."
 
-#: actions/favor.php:79
+#. 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!"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. 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"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. 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."
 
-#: actions/favorited.php:150
+#. 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 "
@@ -2610,7 +2641,9 @@ msgstr ""
 "Sia le prime a adder un nota a tu favorites per cliccar le button Favorite "
 "juxta un nota que te place."
 
-#: actions/favorited.php:156
+#. 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 "
@@ -2619,45 +2652,62 @@ msgstr ""
 "Proque non [crear un conto](%%action.register%%) e esser le prime a adder un "
 "nota a tu favorites!"
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Notas favorite de %s"
 
-#: actions/favoritesrss.php:115
+#. 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"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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 selection de usatores eminente in %s"
 
-#: actions/file.php:34
+#. 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."
 
-#: actions/file.php:38
+#. 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."
 
-#: actions/file.php:42
+#. 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."
 
-#: actions/file.php:51
+#. 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."
 
@@ -2719,6 +2769,7 @@ msgstr "Le usator ha ja iste rolo."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2727,9 +2778,10 @@ msgstr "Nulle profilo specificate."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Non existe un profilo con iste ID."
 
@@ -3558,19 +3610,22 @@ msgid "New application"
 msgstr "Nove application"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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."
 
-#: actions/newapplication.php:184
+#. 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."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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."
 
@@ -3591,7 +3646,6 @@ msgstr "Usa iste formulario pro crear un nove gruppo."
 
 #. TRANS: Group create form validation error.
 #: actions/newgroup.php:199
-#, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "Le alias non pote esser identic al pseudonymo."
 
@@ -4948,8 +5002,9 @@ msgstr "Repetite"
 msgid "Repeated!"
 msgstr "Repetite!"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "Responsas a %s"
@@ -5238,31 +5293,38 @@ msgstr ""
 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?"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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."
 
-#: actions/showfavorites.php:171
+#. 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)"
 
-#: actions/showfavorites.php:178
+#. 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)"
 
-#: actions/showfavorites.php:185
+#. 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)"
 
-#: actions/showfavorites.php:206
+#. 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."
@@ -5271,7 +5333,9 @@ msgstr ""
 "Favorite sub notas que te place pro memorisar los pro plus tarde o pro "
 "mitter los in evidentia."
 
-#: actions/showfavorites.php:208
+#. 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 "
@@ -5280,7 +5344,10 @@ msgstr ""
 "%s non ha ancora addite un nota favorite. Publica alique interessante que "
 "ille adderea a su favorites :)"
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5291,7 +5358,8 @@ msgstr ""
 "action.register%%%%) e postea publicar alique interessante que ille adderea "
 "a su favorites :)"
 
-#: actions/showfavorites.php:243
+#. 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."
 
@@ -5872,7 +5940,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "Nulle codice entrate"
 
 #. TRANS: Menu item for site administration
@@ -6204,7 +6273,6 @@ 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
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "Profilo"
 
@@ -6481,7 +6549,7 @@ msgid "Author(s)"
 msgstr "Autor(es)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Favorir"
 
@@ -6812,23 +6880,23 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Cannot locate account %s."
-msgstr "Tu non pote deler tu conto."
+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 ""
+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 ""
+msgstr "Il non ha un servicio API AtomPub pro %s."
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
@@ -6887,61 +6955,62 @@ msgstr "Monstrar plus"
 msgid "Primary site navigation"
 msgstr "Navigation primari del sito"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Profilo personal e chronologia de amicos"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personal"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 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
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "Conto"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Connecter a servicios"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "Connecter"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Modificar le configuration del sito"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: 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:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Admin"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invitar amicos e collegas a accompaniar te in %s"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -6953,57 +7022,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Terminar le session del sito"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Clauder session"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Crear un conto"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Crear conto"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Authenticar te a iste sito"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Aperir session"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Adjuta me!"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "Adjuta"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 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
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7217,9 +7286,9 @@ msgid "No content for notice %s."
 msgstr "Nulle contento pro nota %s."
 
 #: lib/activitymover.php:84
-#, fuzzy, php-format
+#, php-format
 msgid "No such user %s."
-msgstr "Iste usator non existe."
+msgstr "Le usator %s non existe."
 
 #. 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.
@@ -7228,10 +7297,10 @@ msgstr "Iste usator non existe."
 #. 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
@@ -7303,7 +7372,7 @@ msgid "User configuration"
 msgstr "Configuration del usator"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "Usator"
 
@@ -8068,18 +8137,36 @@ msgstr "Apparentia predefinite restaurate."
 
 #. TRANS: Exception. %s is an ID.
 #: lib/discovery.php:153
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to find services for %s."
-msgstr "Impossibile revocar le accesso del application: %s."
+msgstr "Incapace de trovar servicios pro %s."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+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
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Favor"
+msgstr "Favorir"
+
 #: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8498,7 +8585,7 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "You have been nudged by %s"
 msgstr "%s te ha pulsate"
 
@@ -8945,34 +9032,52 @@ msgstr "Nota duplicate."
 msgid "Couldn't insert new subscription."
 msgstr "Non poteva inserer nove subscription."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "Personal"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "Responsas"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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 "Favorites"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "Cassa de entrata"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "Tu messages recipite"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "Cassa de exito"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -9026,6 +9131,7 @@ msgstr "Media de cata die"
 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."
@@ -9438,3 +9544,6 @@ msgstr "XML invalide, radice XRD mancante."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Obtene copia de reserva ex file '%s'."
+
+#~ msgid "Personal"
+#~ msgstr "Personal"
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index 615164e3ac..fc093d7706 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:48:18+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52:25+0000\n"
 "Language-Team: Icelandic <http://translatewiki.net/wiki/Portal:is>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: is\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -93,7 +93,7 @@ msgstr "Stillingar fyrir mynd"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -107,7 +107,7 @@ msgstr "Vista"
 #. 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:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 #, fuzzy
 msgid "No such page."
 msgstr "Ekkert þannig merki."
@@ -135,6 +135,8 @@ msgstr "Ekkert þannig merki."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +152,12 @@ msgstr "Ekkert þannig merki."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -172,9 +174,10 @@ msgstr "%s og vinirnir"
 #. 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s og vinirnir"
@@ -325,8 +328,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -366,7 +369,7 @@ msgstr "Gat ekki vistað persónulega síðu."
 #: 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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
 msgid ""
@@ -533,8 +536,9 @@ msgid "This status is already a favorite."
 msgstr "Þetta babl er nú þegar í uppáhaldi!"
 
 #. 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "Gat ekki búið til uppáhald."
 
@@ -546,7 +550,7 @@ msgstr "Þetta babl er ekki í uppáhaldi!"
 
 #. 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Gat ekki eytt uppáhaldi."
 
@@ -617,10 +621,11 @@ msgstr "Ekki tækt stuttnefni."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -640,13 +645,14 @@ msgstr "Fullt nafn er of langt (í mesta lagi 255 stafir)."
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
 #. 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
@@ -818,8 +824,8 @@ msgstr "Þú ert ekki áskrifandi."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -854,14 +860,15 @@ msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s"
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -930,7 +937,7 @@ msgstr "Lykilorð"
 #. 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 #, fuzzy
@@ -1870,7 +1877,7 @@ msgstr "Þú ert ekki meðlimur í þessum hópi."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "Það komu upp vandamál varðandi setutókann þinn."
@@ -1965,15 +1972,17 @@ msgstr "Eyða þessu babli"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to 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 when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Ekki innskráð(ur)."
@@ -2241,12 +2250,12 @@ 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:84
+#: actions/disfavor.php:83
 msgid "This notice is not a favorite!"
 msgstr "Þetta babl er ekki í uppáhaldi!"
 
 #. TRANS: Title for page on which favorites can be added.
-#: actions/disfavor.php:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Bæta við sem uppáhaldsbabli"
 
@@ -2282,67 +2291,77 @@ msgid "Use this form to edit your application."
 msgstr "Notaðu þetta eyðublað til að breyta hópnum."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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 "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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 "Fullt nafn er of langt (í mesta lagi 255 stafir)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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 "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
 
 #. TRANS: Validation error shown when not providing a description in the "Edit application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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 "Lýsing"
 
 #. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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 "Heimasíða er ekki gild vefslóð."
 
 #. TRANS: Validation error shown when not providing an organisation in the "Edit application" form.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Staðsetning er of löng (í mesta lagi 255 stafir)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 #, fuzzy
 msgid "Could not update application."
 msgstr "Gat ekki uppfært hóp."
@@ -2398,26 +2417,26 @@ msgid "Options saved."
 msgstr "Valmöguleikar vistaðir."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 msgid "Email settings"
 msgstr "Stillingar persónulegrar síðu"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:76
+#: actions/emailsettings.php:73
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Stilla það hvernig þú færð tölvupóst 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 #, fuzzy
 msgid "Email address"
 msgstr "Tölvupóstföng"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "Núverandi staðfesta tölvupóstfangið."
 
@@ -2426,14 +2445,15 @@ msgstr "Núverandi staðfesta tölvupóstfangið."
 #. 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Endurheimta"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2446,14 +2466,14 @@ 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:140
+#: actions/emailsettings.php:136
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Tölvupóstfang eins og \"notandi@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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 #, fuzzy
 msgctxt "BUTTON"
@@ -2462,29 +2482,29 @@ msgstr "Bæta við"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Móttökutölvupóstur"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 msgid "I want to post notices by email."
 msgstr "Ég vil babla í gegnum tölvupóst."
 
 #. 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 msgid "Send email to this address to post new notices."
 msgstr "Sendu tölvupóst á þetta póstfang til þess að senda inn nýtt babl."
 
 #. 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Búa til nýtt tölvupóstfang til að senda til. Skrifar yfir það gamla."
 
 #. TRANS: Instructions for incoming e-mail address input form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2492,91 +2512,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 #, fuzzy
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nýtt"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "Tölvupóstföng"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 msgid "Send me notices of new subscriptions through email."
 msgstr "Sendu mér tilkynningu varðandi nýjar áskriftir í gegnum tölvupóst."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:222
+#: actions/emailsettings.php:218
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Senda mér tölvupóst þegar einhver setur babl í mér í uppáhald hjá sér."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:229
+#: actions/emailsettings.php:225
 msgid "Send me email when someone sends me a private message."
 msgstr "Senda mér tölvupóst þegar einhver sendir mér persónuleg skilaboð."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:235
+#: actions/emailsettings.php:231
 #, fuzzy
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Senda mér tölvupóst þegar einhver sendir mér persónuleg skilaboð."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:241
+#: actions/emailsettings.php:237
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Leyfa vinum að ýta við mér og senda mér tölvupóst."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:247
+#: actions/emailsettings.php:243
 msgid "Publish a MicroID for my email address."
 msgstr "Birta MicroID fyrir tölvupóstfangið mitt."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:368
+#: actions/emailsettings.php:361
 #, fuzzy
 msgid "Email preferences saved."
 msgstr "Stillingar vistaðar."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "Ekkert tölvupóstfang."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, fuzzy
+msgid "Cannot normalize that email address."
 msgstr "Get ekki staðlað þetta tölvupóstfang"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Ekki tækt tölvupóstfang."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:405
+#: actions/emailsettings.php:397
 msgid "That is already your email address."
 msgstr "Þetta er nú þegar tölvupóstfangið þitt."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:409
+#: actions/emailsettings.php:401
 msgid "That email address already belongs to another user."
 msgstr "Þetta tölvupóstfang tilheyrir öðrum notanda."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Gat ekki sett inn staðfestingarlykil."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:433
+#: actions/emailsettings.php:425
 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."
@@ -2588,143 +2609,172 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Engin staðfesting í bið sem þarf að hætta við."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:459
+#: actions/emailsettings.php:450
 #, fuzzy
 msgid "That is the wrong email address."
 msgstr "Þetta er rangt snarskilaboðafang."
 
 #. 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Gat ekki eytt tölvupóstsstaðfestingu."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:473
+#: actions/emailsettings.php:464
 msgid "Email confirmation cancelled."
 msgstr "Engin staðfesting í bið sem þarf að hætta við."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
-#: actions/emailsettings.php:493
+#: actions/emailsettings.php:483
 msgid "That is not your email address."
 msgstr "Þetta er ekki tölvupóstfangið þitt."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "Móttökutölvupóstfang fjarlægt."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 msgid "No incoming email address."
 msgstr "Ekkert móttökutölvupóstfang."
 
 #. 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: actions/smssettings.php:565 actions/smssettings.php:588
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Gat ekki uppfært skráarfærslu notanda."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: actions/emailsettings.php:534 actions/smssettings.php:568
 msgid "Incoming email address removed."
 msgstr "Móttökutölvupóstfang fjarlægt."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Nýju móttökutölvupóstfangi bætt við."
 
-#: actions/favor.php:79
+#. 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 "Þetta babl er nú þegar í uppáhaldi!"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. TRANS: Page title for page on which favorite notices can be unfavourited.
+#: actions/favor.php:95
 msgid "Disfavor favorite"
 msgstr "Ekki lengur í uppáhaldi"
 
+#. 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 "Vinsælt babl"
 
-#: actions/favorited.php:67
+#. 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 "Vinsælt babl, síða %d"
 
-#: actions/favorited.php:79
+#. TRANS: Description on page displaying favorited notices.
+#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "Vinsælasta bablið á síðunni um þessar mundir."
 
-#: actions/favorited.php:150
+#. 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."
 msgstr ""
 
-#: actions/favorited.php:156
+#. 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 "
 "notice to your favorites!"
 msgstr ""
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Uppáhaldsbabl %s"
 
-#: actions/favoritesrss.php:115
+#. 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 "Færslur frá %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 "Notendur í sviðsljósinu"
 
-#: actions/featured.php:71
+#. 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 "Notendur í sviðsljósinu, síða %d"
 
-#: actions/featured.php:99
+#. TRANS: Description on page displaying featured users.
+#: actions/featured.php:102
 #, fuzzy, php-format
-msgid "A selection of some great users on %s"
+msgid "A selection of some great users on %s."
 msgstr "Úrval nokkurra frábærra notenda á %s"
 
-#: actions/file.php:34
+#. TRANS: Client error displayed when no notice ID was given trying do display a file.
+#: actions/file.php:36
 #, fuzzy
 msgid "No notice ID."
 msgstr "Ekkert svoleiðis babl."
 
-#: actions/file.php:38
+#. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
+#: actions/file.php:41
 #, fuzzy
 msgid "No notice."
 msgstr "Ekkert svoleiðis babl."
 
-#: actions/file.php:42
+#. 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 "Ekkert svoleiðis skjal."
 
-#: actions/file.php:51
+#. 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 ""
 
@@ -2794,6 +2844,7 @@ msgstr "Notandi hefur enga persónulega síðu."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2802,9 +2853,10 @@ msgstr "Engin persónuleg síða tilgreind"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Engin persónulega síða með þessu einkenni"
 
@@ -3642,21 +3694,24 @@ msgid "New application"
 msgstr "Ekkert svoleiðis babl."
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: actions/newapplication.php:64
 #, fuzzy
 msgid "You must be logged in to register an application."
 msgstr "Þú verður að hafa skráð þig inn til að búa til hóp."
 
+#. TRANS: Form instructions for registering a new application.
 #: actions/newapplication.php:147
 #, fuzzy
 msgid "Use this form to register a new application."
 msgstr "Notaðu þetta eyðublað til að búa til nýjan hóp."
 
-#: actions/newapplication.php:184
+#. 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 ""
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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 "Gat ekki búið til uppáhald."
@@ -5072,8 +5127,9 @@ msgstr "Í sviðsljósinu"
 msgid "Repeated!"
 msgstr ""
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "Svör við %s"
@@ -5362,44 +5418,56 @@ msgstr ""
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Ertu viss um að þú viljir eyða þessu babli?"
 
-#: actions/showfavorites.php:79
+#. 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 "Uppáhaldsbabl %s"
 
-#: actions/showfavorites.php:132
+#. 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 "Gat ekki sótt uppáhaldsbabl."
 
-#: actions/showfavorites.php:171
+#. 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 "Bablveita uppáhaldsbabls %s"
 
-#: actions/showfavorites.php:178
+#. 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 "Bablveita uppáhaldsbabls %s"
 
-#: actions/showfavorites.php:185
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:188
 #, fuzzy, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Bablveita uppáhaldsbabls %s"
 
-#: actions/showfavorites.php:206
+#. 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."
 msgstr ""
 
-#: actions/showfavorites.php:208
+#. 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 "
 "would add to their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5407,7 +5475,8 @@ msgid ""
 "their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:243
+#. TRANS: Page notice for show favourites page.
+#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr ""
 
@@ -5981,7 +6050,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "Enginn lykill sleginn inn"
 
 #. TRANS: Menu item for site administration
@@ -6308,7 +6378,6 @@ msgstr ""
 
 #. TRANS: Link description in user account settings menu.
 #: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "Persónuleg síða"
 
@@ -6584,7 +6653,7 @@ msgid "Author(s)"
 msgstr ""
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Uppáhald"
 
@@ -6999,51 +7068,52 @@ msgstr ""
 msgid "Primary site navigation"
 msgstr "Stikl aðalsíðu"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Persónuleg síða og vinarás"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 #, fuzzy
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Persónulegt"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Breyta lykilorðinu þínu"
 
-#. TRANS: Main menu option when logged in for access to user settings
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "Aðgangur"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Gat ekki framsent til vefþjóns: %s"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "Tengjast"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Stikl aðalsíðu"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
 #: lib/action.php:556 lib/groupnav.php:117
 #, fuzzy
@@ -7051,14 +7121,14 @@ msgctxt "MENU"
 msgid "Admin"
 msgstr "Stjórnandi"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, fuzzy, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Bjóða vinum og vandamönnum að slást í hópinn á %s"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 #, fuzzy
 msgctxt "MENU"
@@ -7071,19 +7141,19 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Skrá þig inn á síðuna"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Einkennismerki"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Búa til nýjan hóp"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 #, fuzzy
@@ -7091,14 +7161,14 @@ msgctxt "MENU"
 msgid "Register"
 msgstr "Nýskrá"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Skrá þig inn á síðuna"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 #, fuzzy
@@ -7106,27 +7176,27 @@ msgctxt "MENU"
 msgid "Login"
 msgstr "Innskráning"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Hjálp"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 #, fuzzy
 msgctxt "MENU"
 msgid "Help"
 msgstr "Hjálp"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Leita að fólki eða texta"
 
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 #, fuzzy
 msgctxt "MENU"
@@ -7436,7 +7506,7 @@ msgid "User configuration"
 msgstr "SMS staðfesting"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "Notandi"
 
@@ -8189,14 +8259,32 @@ msgstr ""
 msgid "Unable to find services for %s."
 msgstr "Notaðu þetta eyðublað til að breyta hópnum."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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 "Taka þetta babl út sem uppáhald"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Disfavor favorite"
+msgstr "Ekki lengur í uppáhaldi"
+
+#. 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 "Setja þetta babl í uppáhald"
 
+#. TRANS: Button text for adding the favourite status to a notice.
+#: lib/favorform.php:135
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Favor"
+msgstr "Uppáhald"
+
 #: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr ""
@@ -8974,34 +9062,52 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Gat ekki sett inn nýja áskrift."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "Persónulegt"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "Svör"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, fuzzy
+msgctxt "MENU"
+msgid "Profile"
+msgstr "Persónuleg síða"
+
+#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
+#: lib/personalgroupnav.php:120
+#, fuzzy
+msgctxt "MENU"
 msgid "Favorites"
 msgstr "Uppáhald"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "Innhólf"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "Mótteknu skilaboðin þín"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "Úthólf"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 msgid "Your sent messages"
 msgstr "Skilaboð sem þú hefur sent"
 
+#. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
@@ -9057,6 +9163,7 @@ msgstr ""
 msgid "All groups"
 msgstr "Allir hópar"
 
+#. TRANS: Server error displayed when using an unimplemented method.
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
@@ -9480,3 +9587,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Personal"
+#~ msgstr "Persónulegt"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index d1d54dd6bf..57408f8f09 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:48:22+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52:26+0000\n"
 "Language-Team: Italian <http://translatewiki.net/wiki/Portal:it>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: it\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -91,7 +91,7 @@ msgstr "Salva impostazioni di accesso"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -104,7 +104,7 @@ 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:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Pagina inesistente."
 
@@ -131,6 +131,8 @@ msgstr "Pagina inesistente."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +148,12 @@ msgstr "Pagina inesistente."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -168,9 +170,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amici"
@@ -327,8 +330,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -366,7 +369,7 @@ msgstr "Impossibile salvare il profilo."
 #: 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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, fuzzy, php-format
 msgid ""
@@ -534,8 +537,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "Impossibile creare un preferito."
 
@@ -546,7 +550,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Impossibile eliminare un preferito."
 
@@ -611,10 +615,11 @@ msgstr "Non è un soprannome valido."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -634,13 +639,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
@@ -809,8 +815,8 @@ msgstr "Autorizzazione non presente."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -845,14 +851,15 @@ msgstr "Errore nel database nell'inserire l'applicazione utente OAuth."
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -927,7 +934,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1860,7 +1867,7 @@ msgstr "Questa applicazione non è di tua proprietà."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "Si è verificato un problema con il tuo token di sessione."
@@ -1957,15 +1964,17 @@ msgstr "Elimina questo utente"
 
 #. 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 when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Accesso non effettuato."
@@ -2226,12 +2235,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Aggiungi ai preferiti"
 
@@ -2264,63 +2273,73 @@ 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.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: 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)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Impossibile aggiornare l'applicazione."
 
@@ -2374,25 +2393,25 @@ msgid "Options saved."
 msgstr "Opzioni salvate."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 msgid "Email settings"
 msgstr "Impostazioni email"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "Indirizzo email"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "Indirizzo email attualmente confermato."
 
@@ -2401,14 +2420,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2422,14 +2442,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2437,31 +2457,31 @@ msgstr "Aggiungi"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Email di ricezione"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2469,89 +2489,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nuovo"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "Preferenze dell'email"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 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:222
+#: actions/emailsettings.php:218
 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:229
+#: actions/emailsettings.php:225
 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:235
+#: actions/emailsettings.php:231
 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:241
+#: actions/emailsettings.php:237
 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:247
+#: actions/emailsettings.php:243
 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:368
+#: actions/emailsettings.php:361
 msgid "Email preferences saved."
 msgstr "Preferenze dell'email salvate."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "Nessun indirizzo email."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, 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:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: 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:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 #, 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:433
+#: actions/emailsettings.php:425
 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."
@@ -2563,89 +2584,99 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 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:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 #, 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:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 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:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "L'indirizzo email è stato rimosso."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Nuovo indirizzo email di ricezione aggiunto."
 
-#: actions/favor.php:79
+#. 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!"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. TRANS: Page title for page on which favorite notices can be unfavourited.
+#: actions/favor.php:95
 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"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. 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."
 
-#: actions/favorited.php:150
+#. 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 "
@@ -2654,7 +2685,9 @@ msgstr ""
 "Aggiungi tu un messaggio tra i tuoi preferiti facendo clic sul pulsante a "
 "forma di cuore."
 
-#: actions/favorited.php:156
+#. 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 "
@@ -2663,45 +2696,62 @@ msgstr ""
 "Perché non [crei un account](%%action.register%%) e aggiungi un messaggio "
 "tra i tuoi preferiti!"
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Messaggi preferiti di %s"
 
-#: actions/favoritesrss.php:115
+#. 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"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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"
 
-#: actions/file.php:34
+#. 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."
 
-#: actions/file.php:38
+#. 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."
 
-#: actions/file.php:42
+#. 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."
 
-#: actions/file.php:51
+#. 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."
 
@@ -2763,6 +2813,7 @@ msgstr "L'utente ricopre già questo ruolo."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2771,9 +2822,10 @@ msgstr "Nessun profilo specificato."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Nessun profilo con quel ID."
 
@@ -3607,19 +3659,22 @@ msgid "New application"
 msgstr "Nuova applicazione"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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."
 
-#: actions/newapplication.php:184
+#. 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."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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."
 
@@ -5030,8 +5085,9 @@ msgstr "Ripetuti"
 msgid "Repeated!"
 msgstr "Ripetuti!"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "Risposte a %s"
@@ -5319,31 +5375,38 @@ msgstr ""
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Ripristinare la chiave e il segreto?"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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."
 
-#: actions/showfavorites.php:171
+#. 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)"
 
-#: actions/showfavorites.php:178
+#. 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)"
 
-#: actions/showfavorites.php:185
+#. 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)"
 
-#: actions/showfavorites.php:206
+#. 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."
@@ -5351,7 +5414,9 @@ msgstr ""
 "Non hai ancora scelto alcun messaggio come preferito. Fai clic sul pulsate a "
 "forma di cuore per salvare i messaggi e rileggerli in un altro momento."
 
-#: actions/showfavorites.php:208
+#. 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 "
@@ -5360,7 +5425,10 @@ msgstr ""
 "%s non ha aggiunto alcun messaggio tra i suoi preferiti. Scrivi qualche cosa "
 "di interessante in modo che lo inserisca tra i suoi preferiti! :)"
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5370,7 +5438,8 @@ msgstr ""
 "Perché non [crei un account](%%action.register%%) e aggiungi un messaggio "
 "tra i tuoi preferiti!"
 
-#: actions/showfavorites.php:243
+#. 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."
 
@@ -5953,7 +6022,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "Nessun codice inserito"
 
 #. TRANS: Menu item for site administration
@@ -6289,7 +6359,6 @@ 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
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "Profilo"
 
@@ -6566,7 +6635,7 @@ msgid "Author(s)"
 msgstr "Autori"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Preferisci"
 
@@ -6978,61 +7047,62 @@ msgstr ""
 msgid "Primary site navigation"
 msgstr "Esplorazione sito primaria"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Profilo personale e attività degli amici"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personale"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 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
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "Account"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Connettiti con altri servizi"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "Connetti"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Modifica la configurazione del sito"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: 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:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Amministra"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Invita amici e colleghi a seguirti su %s"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -7044,57 +7114,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Termina la tua sessione sul sito"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Esci"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Crea un account"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrati"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Accedi al sito"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Accedi"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Aiutami!"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "Aiuto"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 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
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7397,7 +7467,7 @@ msgid "User configuration"
 msgstr "Configurazione utente"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "Utente"
 
@@ -8179,14 +8249,32 @@ msgstr "Valori predefiniti ripristinati."
 msgid "Unable to find services for %s."
 msgstr "Impossibile revocare l'accesso per l'applicazione: %s."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Disfavor favorite"
+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"
@@ -9059,34 +9147,52 @@ msgstr "Messaggio duplicato."
 msgid "Couldn't insert new subscription."
 msgstr "Impossibile inserire un nuovo abbonamento."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "Personale"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "Risposte"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "In arrivo"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "I tuoi messaggi in arrivo"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "Inviati"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -9140,6 +9246,7 @@ msgstr "Media giornaliera"
 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"
@@ -9552,3 +9659,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Personal"
+#~ msgstr "Personale"
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 20a06f0892..e11f6adbd1 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:48:24+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52:27+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -93,7 +93,7 @@ msgstr "アクセス設定の保存"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -106,7 +106,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/showfavorites.php:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "そのようなページはありません。"
 
@@ -133,6 +133,8 @@ msgstr "そのようなページはありません。"
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +150,12 @@ msgstr "そのようなページはありません。"
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -170,9 +172,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%sとその友人"
@@ -330,8 +333,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -369,7 +372,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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, fuzzy, php-format
 msgid ""
@@ -532,8 +535,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "お気に入りを作成できません。"
 
@@ -544,7 +548,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "お気に入りを取り消すことができません。"
 
@@ -610,10 +614,11 @@ msgstr "有効なニックネームではありません。"
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -633,13 +638,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
@@ -807,8 +813,8 @@ msgstr "認証されていません。"
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -842,14 +848,15 @@ msgstr "OAuth アプリケーションユーザの追加時ＤＢエラー。"
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -918,7 +925,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 #, fuzzy
@@ -1851,7 +1858,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:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "あなたのセッショントークンに関する問題がありました。"
@@ -1950,15 +1957,17 @@ 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.
+#. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "ログインしていません。"
@@ -2220,12 +2229,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "お気に入りに加える"
 
@@ -2258,63 +2267,73 @@ msgid "Use this form to edit your application."
 msgstr "このフォームを使ってアプリケーションを編集します。"
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "組織が長すぎます。（最大255字）"
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "アプリケーションを更新できません。"
 
@@ -2368,25 +2387,25 @@ msgid "Options saved."
 msgstr "オプションが保存されました。"
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 msgid "Email settings"
 msgstr "メール設定"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "メールアドレス"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "現在確認されているメールアドレス。"
 
@@ -2395,14 +2414,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "回復"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2415,14 +2435,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 #, fuzzy
 msgctxt "BUTTON"
@@ -2431,29 +2451,29 @@ msgstr "追加"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "入ってくるメール"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2461,93 +2481,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 #, fuzzy
 msgctxt "BUTTON"
 msgid "New"
 msgstr "New"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "メールアドレス"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 msgid "Send me notices of new subscriptions through email."
 msgstr "メールで新規フォローの通知を私に送ってください。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:222
+#: actions/emailsettings.php:218
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "だれかがお気に入りとして私のつぶやきを加えたら、メールを私に送ってください。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:229
+#: actions/emailsettings.php:225
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "だれかがプライベート・メッセージを私に送るときには、メールを私に送ってくださ"
 "い。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:235
+#: actions/emailsettings.php:231
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "だれかが\"@-返信\"を私を送るときには、メールを私に送ってください、"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:241
+#: actions/emailsettings.php:237
 msgid "Allow friends to nudge me and send me an email."
 msgstr "友達が私に合図とメールを送ることを許可する。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:247
+#: actions/emailsettings.php:243
 msgid "Publish a MicroID for my email address."
 msgstr "私のメールアドレスのためにMicroIDを発行してください。"
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:368
+#: actions/emailsettings.php:361
 #, fuzzy
 msgid "Email preferences saved."
 msgstr "デザイン設定が保存されました。"
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "メールアドレスがありません。"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, fuzzy
+msgid "Cannot normalize that email address."
 msgstr "そのメールアドレスを正規化できません"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: 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:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "承認コードを追加できません"
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:433
+#: actions/emailsettings.php:425
 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."
@@ -2559,90 +2580,100 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "承認待ちのものはありません。"
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:459
+#: actions/emailsettings.php:450
 #, 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "メール承認を削除できません"
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 msgid "That is not your email address."
 msgstr "これはあなたのメールアドレスではありません。"
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "入ってくるメールアドレスは削除されました。"
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "新しい入ってくるメールアドレスが追加されました。"
 
-#: actions/favor.php:79
+#. 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 "このつぶやきはすでにお気に入りです!"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. 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 "人気のつぶやき"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. TRANS: Description on page displaying favorited notices.
+#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "現在サイトで最も人気のつぶやき。"
 
-#: actions/favorited.php:150
+#. 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 "
@@ -2651,7 +2682,9 @@ msgstr ""
 "あなたの好きなつぶやきを、お気に入りボタンをクリックしてあなたのお気に入りに"
 "加える最初になってください。"
 
-#: actions/favorited.php:156
+#. 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 "
@@ -2660,45 +2693,62 @@ msgstr ""
 "なぜ [アカウント登録](%%action.register%%) しないのですか、そして、あなたのお"
 "気に入りにつぶやきを加える最初になりましょう!"
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s のお気に入りのつぶやき"
 
-#: actions/favoritesrss.php:115
+#. 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 "フィーチャーされたユーザ"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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 上の優れたユーザの集まり"
 
-#: actions/file.php:34
+#. TRANS: Client error displayed when no notice ID was given trying do display a file.
+#: actions/file.php:36
 msgid "No notice ID."
 msgstr "つぶやきＩＤがありません。"
 
-#: actions/file.php:38
+#. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
+#: actions/file.php:41
 msgid "No notice."
 msgstr "つぶやきがありません。"
 
-#: actions/file.php:42
+#. 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 "そのような添付はありません。"
 
-#: actions/file.php:51
+#. 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 "アップロードされた添付はありません。"
 
@@ -2765,6 +2815,7 @@ msgstr "ユーザは既に黙っています。"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2773,9 +2824,10 @@ msgstr "プロファイル記述がありません。"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "そのＩＤのプロファイルがありません。"
 
@@ -3601,19 +3653,22 @@ msgid "New application"
 msgstr "新しいアプリケーション"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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 "このフォームを使って新しいアプリケーションを登録します。"
 
-#: actions/newapplication.php:184
+#. 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が必要です。"
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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 "アプリケーションを作成できません。"
 
@@ -5018,8 +5073,9 @@ msgstr "繰り返された"
 msgid "Repeated!"
 msgstr "繰り返されました!"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "%s への返信"
@@ -5312,31 +5368,38 @@ msgstr ""
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "本当にこのつぶやきを削除しますか？"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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 "お気に入りのつぶやきを検索できません。"
 
-#: actions/showfavorites.php:171
+#. 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)"
 
-#: actions/showfavorites.php:178
+#. 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)"
 
-#: actions/showfavorites.php:185
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "%s のお気に入りのフィード (Atom)"
 
-#: actions/showfavorites.php:206
+#. 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."
@@ -5345,7 +5408,9 @@ msgstr ""
 "加するあなたがそれらがお気に入りのつぶやきのときにお気に入りボタンをクリック"
 "するか、またはそれらの上でスポットライトをはじいてください。"
 
-#: actions/showfavorites.php:208
+#. 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 "
@@ -5354,7 +5419,10 @@ msgstr ""
 "%s はまだ彼のお気に入りに少しのつぶやきも加えていません。 彼らがお気に入りに"
 "加えることおもしろいものを投稿してください:)"
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5364,7 +5432,8 @@ msgstr ""
 "なぜ [アカウント登録](%%action.register%%) しないのですか、そして、あなたのお"
 "気に入りにつぶやきを加える最初になりましょう!"
 
-#: actions/showfavorites.php:243
+#. TRANS: Page notice for show favourites page.
+#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "これは、あなたが好きなことを共有する方法です。"
 
@@ -5959,7 +6028,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "コードが入力されていません"
 
 #. TRANS: Menu item for site administration
@@ -6294,7 +6364,6 @@ msgstr "不正なデフォルトフォローです: '%1$s'  はユーザでは
 
 #. TRANS: Link description in user account settings menu.
 #: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "プロファイル"
 
@@ -6562,7 +6631,7 @@ msgid "Author(s)"
 msgstr "作者"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "お気に入り"
 
@@ -6967,49 +7036,50 @@ msgstr ""
 msgid "Primary site navigation"
 msgstr "プライマリサイトナビゲーション"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "パーソナルプロファイルと友人のタイムライン"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 #, fuzzy
 msgctxt "MENU"
 msgid "Personal"
 msgstr "パーソナル"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "パスワードの変更"
 
-#. TRANS: Main menu option when logged in for access to user settings
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "アカウント"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 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
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "接続"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "基本サイト設定"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
 #: lib/action.php:556 lib/groupnav.php:117
 #, fuzzy
@@ -7017,14 +7087,14 @@ msgctxt "MENU"
 msgid "Admin"
 msgstr "管理者"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, 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
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 #, fuzzy
 msgctxt "MENU"
@@ -7037,19 +7107,19 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "サイトのテーマ"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "ロゴ"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "新しいグループを作成"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 #, fuzzy
@@ -7057,14 +7127,14 @@ msgctxt "MENU"
 msgid "Register"
 msgstr "登録"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "サイトへログイン"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 #, fuzzy
@@ -7072,26 +7142,26 @@ msgctxt "MENU"
 msgid "Login"
 msgstr "ログイン"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "ヘルプ"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 #, fuzzy
 msgctxt "MENU"
 msgid "Help"
 msgstr "ヘルプ"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "もっとグループを検索"
 
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 #, fuzzy
 msgctxt "MENU"
@@ -7392,7 +7462,7 @@ msgid "User configuration"
 msgstr "ユーザ設定"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "ユーザ"
 
@@ -8134,14 +8204,32 @@ msgstr "デフォルトのデザインを回復。"
 msgid "Unable to find services for %s."
 msgstr "アプリケーションのための取消しアクセスができません: "
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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 "このつぶやきのお気に入りをやめる"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+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
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Favor"
+msgstr "お気に入り"
+
 #: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8980,34 +9068,52 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "サブスクリプションを追加できません"
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "パーソナル"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "返信"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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 "お気に入り"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "受信箱"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "あなたの入ってくるメッセージ"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "送信箱"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -9061,6 +9167,7 @@ msgstr ""
 msgid "All groups"
 msgstr "全てのグループ"
 
+#. TRANS: Server error displayed when using an unimplemented method.
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "未実装のメソッド。"
@@ -9466,3 +9573,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Personal"
+#~ msgstr "パーソナル"
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
index b880550e74..2fc02c3ab9 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:48:25+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52:28+0000\n"
 "Language-Team: Georgian <http://translatewiki.net/wiki/Portal:ka>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ka\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -87,7 +87,7 @@ msgstr "შეინახე შესვლის პარამეტრე
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -100,7 +100,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/showfavorites.php:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "ასეთი გვერდი არ არსებობს."
 
@@ -127,6 +127,8 @@ msgstr "ასეთი გვერდი არ არსებობს."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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
@@ -142,12 +144,12 @@ msgstr "ასეთი გვერდი არ არსებობს."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -164,9 +166,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr " %s და მეგობრები"
@@ -323,8 +326,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -362,7 +365,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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, fuzzy, php-format
 msgid ""
@@ -524,8 +527,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "ფავორიტის შექმნა ვერ მოხერხდა."
 
@@ -536,7 +540,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "ფავორიტის წაშლა ვერ მოხერხდა."
 
@@ -601,10 +605,11 @@ msgstr "მეტსახელი არასწორია."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -624,13 +629,14 @@ msgstr "სრული სახელი ძალიან გრძელი
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
 #. 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
@@ -796,8 +802,8 @@ msgstr "თქვენ არ ხართ ავტორიზირებუ
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -831,14 +837,15 @@ msgstr "ბაზამ დაუშვა შეცდომა OAuth აპლ
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -907,7 +914,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1833,7 +1840,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:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr ""
@@ -1930,15 +1937,17 @@ 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.
+#. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "ავტორიზებული არ ხართ."
@@ -2198,12 +2207,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "რჩეულებში დამატება"
 
@@ -2236,63 +2245,73 @@ msgid "Use this form to edit your application."
 msgstr "აპლიკაციაში ცვლილებების შესატანად გამოიყენეთ ეს ფორმა."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "ორგანიზაცია ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "აპლიკაციის განახლება ვერ მოხერხდა."
 
@@ -2346,25 +2365,25 @@ msgid "Options saved."
 msgstr "პარამეტრები შენახულია."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 msgid "Email settings"
 msgstr "ელ. ფოსტის პარამეტრები"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "ელ. ფოსტის მისამართი"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "მიმდინარე დადასტურებული ელ. ფოსტის მისამართი."
 
@@ -2373,14 +2392,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "წაშლა"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2393,14 +2413,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2408,29 +2428,29 @@ msgstr "დამატება"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "შემომავალი ელ. ფოსტა"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2438,90 +2458,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "ახალი"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "ელ. ფოსტის პარამეტრები"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 "გამომიგზავნე შეტყობინებები ახალი გამოწერების შესახებ ელ. ფოსტის საშუალებით."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:222
+#: actions/emailsettings.php:218
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "გამომიგზავნე ელ. წერილი როდესაც ვინმე ჩემს შეტყობინებას რჩეულებში დაიმატებს."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:229
+#: actions/emailsettings.php:225
 msgid "Send me email when someone sends me a private message."
 msgstr "გამომიგზავნე ელ. წერილი როდესაც ვინმე პირად შეტყობინებას მომწერს."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:235
+#: actions/emailsettings.php:231
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "გამომიგზავნე წერილი როდესაც ვინმე გამომიგზავნის \"@-პასუხს\"."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:241
+#: actions/emailsettings.php:237
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:247
+#: actions/emailsettings.php:243
 msgid "Publish a MicroID for my email address."
 msgstr "გამოაქვეყნე MicroID ჩემი ელ. ფოსტის მისამართისთვის."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:368
+#: actions/emailsettings.php:361
 msgid "Email preferences saved."
 msgstr "ელ. ფოსტის პარამეტრები შენახულია."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr " ელ. ფოსტის მისამართი მითითებული არ არის."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-msgid "Cannot normalize that email address"
-msgstr ""
+#: actions/emailsettings.php:388
+#, fuzzy
+msgid "Cannot normalize that email address."
+msgstr "Jabber ID-ს ნორმალიზაცია ვერ ხერხდება"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: 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:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "დასტურის კოდის ჩასმა ვერ მოხერხდა."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:433
+#: actions/emailsettings.php:425
 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."
@@ -2533,89 +2554,99 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "გასაუქმებელიარაფერია. არ არის მომლოდინე დასტური."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "ელ. ფოსტის დადასტურების წაშლა ვერ მოხერხდა."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 msgid "That is not your email address."
 msgstr "ეს არ არის თქვენი ელ. ფოსტის მისამართი."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "ელ. ფოსტის მისამართი მოშორებულია."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "დამატებულია ახალი შემომავალი ელ. ფოსტა."
 
-#: actions/favor.php:79
+#. 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 "ეს შეტყობინება უკვე რჩეულია!"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. 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 "პოპულარული შეტყობინებები"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. TRANS: Description on page displaying favorited notices.
+#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "ყველაზე პოპულარული შეტყობინებები ამ მომენტისათვის საიტზე."
 
-#: actions/favorited.php:150
+#. 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 "
@@ -2624,7 +2655,9 @@ msgstr ""
 "გახდი პირველი და შეიტანე შეტყობინება შენს რჩეულებში! დაკლიკე ღილაკზე რჩეული "
 "ნებისმიერი შეტყობინების გვერდით."
 
-#: actions/favorited.php:156
+#. 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 "
@@ -2632,45 +2665,62 @@ msgid ""
 msgstr ""
 "[დარეგისტრირდი](%%action.register%%) და შეიტანე შეტყობინება შენს რჩეულებში!"
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s-ს რჩეული შეტყობინებები"
 
-#: actions/favoritesrss.php:115
+#. 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 "წარმოდგენილი მომხმარებლები"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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-ზე"
 
-#: actions/file.php:34
+#. 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 არ არის."
 
-#: actions/file.php:38
+#. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
+#: actions/file.php:41
 msgid "No notice."
 msgstr "შეტყობინება არ არის."
 
-#: actions/file.php:42
+#. 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 "მიმაგრებული დოკუმენტი არ არის."
 
-#: actions/file.php:51
+#. 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 "ატვირთული მიმაგრებული დოკუმენტი არ არის."
 
@@ -2732,6 +2782,7 @@ msgstr "მომხმარებელს უკვე აქვს ეს 
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2740,9 +2791,10 @@ msgstr "პროფილი მითითებული არ არის
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "ასეთი ID-ს მქონე პროფილი ვერ მოიძებნა."
 
@@ -3569,19 +3621,22 @@ msgid "New application"
 msgstr "ახალი აპლიკაცია"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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 "აპლიკაციაში დასარეგისტრირებლად გამოიყენეთ ეს ფორმა."
 
-#: actions/newapplication.php:184
+#. 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 სავალდებულოა."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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 "აპლიკაციის შექმნა ვერ მოხერხდა."
 
@@ -4975,8 +5030,9 @@ msgstr "გამეორებული"
 msgid "Repeated!"
 msgstr "გამეორებული!"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "პასუხები %s–ს"
@@ -5267,31 +5323,38 @@ msgstr ""
 "დარწმუნებული ხართ რომ გნებავთ თქვენი მომხმარებლის გასაღების და საიდუმლოს "
 "გადაყენება?"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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 "რჩეული შეტყობინებების გამოთხოვნა ვერ მოხერხდა."
 
-#: actions/showfavorites.php:171
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr ""
 
-#: actions/showfavorites.php:178
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr ""
 
-#: actions/showfavorites.php:185
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr ""
 
-#: actions/showfavorites.php:206
+#. 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."
@@ -5299,14 +5362,19 @@ msgstr ""
 "თქვენ არ აგირჩევიათ არცერთი შეტყობინება. დააწკაპუნეთ ღილაკზე \"რჩეული\", რომ "
 "ჩაინიშნოთ შეტყობინება მომავლისთვის ან გაამახვილოთ ყურადღება მასზე."
 
-#: actions/showfavorites.php:208
+#. 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 "
 "would add to their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5314,7 +5382,8 @@ msgid ""
 "their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:243
+#. TRANS: Page notice for show favourites page.
+#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr ""
 
@@ -5878,7 +5947,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "კოდი არ არის შეყვანილი"
 
 #. TRANS: Menu item for site administration
@@ -6214,7 +6284,6 @@ msgstr ""
 
 #. TRANS: Link description in user account settings menu.
 #: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "პროფილი"
 
@@ -6492,7 +6561,7 @@ msgid "Author(s)"
 msgstr "ავტორი(ები)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "რჩეული"
 
@@ -6898,61 +6967,62 @@ msgstr ""
 msgid "Primary site navigation"
 msgstr "საიტის ძირითადი ნავიგაცია"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "პირადი პროფილი და მეგობრების ნაკადი"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "პირადი"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "შეცვალე ელ. ფოსტა, ავატარი, პაროლი, პროფილი"
 
-#. TRANS: Main menu option when logged in for access to user settings
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "ანგარიში"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 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
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "კავშირი"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "საიტის კონფიგურაცია"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
 #: lib/action.php:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "ადმინი"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, 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
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -6964,57 +7034,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "გასვლა საიტიდან"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "გასვლა"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "გახსენი ანგარიში"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "რეგისტრაცია"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "საიტზე შესვლა"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "შესვლა"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "დამეხმარეთ!"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "დახმარება"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "მოძებნე ხალხი ან ტექსტი"
 
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7313,7 +7383,7 @@ msgid "User configuration"
 msgstr "მომხმარებლის კონფიგურაცია"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "მომხმარებელი"
 
@@ -8049,14 +8119,32 @@ msgstr "დიზაინის პირველადი პარამე
 msgid "Unable to find services for %s."
 msgstr "%s აპლიკაციის მიერ ზვდომის გაუქმება ვერ ხერხდება."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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 "ამოშალე რჩეულებიდან ეს შეტყობინება"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+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
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Favor"
+msgstr "რჩეული"
+
 #: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8897,34 +8985,52 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "ახალი გამოწერის ჩასმა ვერ მოხერხდა."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "პირადი"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "პასუხები"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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 "რჩეულები"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "შემომავალი წერილების ყუთი"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "თქვენი შემომავალი შეტყობინებები"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "გამავალი წერილების ყუთი"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -8978,6 +9084,7 @@ msgstr "დღიური საშუალო"
 msgid "All groups"
 msgstr "ყველა ჯგუფი"
 
+#. TRANS: Server error displayed when using an unimplemented method.
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "მეთოდი განუხორციელებელია."
@@ -9385,3 +9492,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Personal"
+#~ msgstr "პირადი"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 6ba4b49ac6..679944b147 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:48:27+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52:29+0000\n"
 "Language-Team: Korean <http://translatewiki.net/wiki/Portal:ko>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ko\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -89,7 +89,7 @@ msgstr "접근 설정을 저장"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -102,7 +102,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/showfavorites.php:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "해당하는 페이지 없음"
 
@@ -129,6 +129,8 @@ msgstr "해당하는 페이지 없음"
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +146,12 @@ msgstr "해당하는 페이지 없음"
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -166,9 +168,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s 및 친구들"
@@ -319,8 +322,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -358,7 +361,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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, fuzzy, php-format
 msgid ""
@@ -521,8 +524,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "관심소식을 생성할 수 없습니다."
 
@@ -533,7 +537,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "관심소식을 삭제할 수 없습니다."
 
@@ -598,10 +602,11 @@ msgstr "유효한 별명이 아닙니다"
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -621,13 +626,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
@@ -794,8 +800,8 @@ msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -829,14 +835,15 @@ msgstr "OAuth 응용 프로그램 사용자 추가 중 데이터베이스 오류
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -911,7 +918,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1839,7 +1846,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:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "당신의 세션토큰관련 문제가 있습니다."
@@ -1932,15 +1939,17 @@ 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.
+#. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "로그인하고 있지 않습니다."
@@ -2199,12 +2208,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "좋아하는 게시글로 추가하기"
 
@@ -2238,64 +2247,74 @@ msgid "Use this form to edit your application."
 msgstr "다음 양식을 이용해 그룹을 편집하십시오."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "기관 이름이 너무 깁니다. (최대 255글자)"
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "관심소식을 생성할 수 없습니다."
 
@@ -2349,25 +2368,25 @@ msgid "Options saved."
 msgstr "옵션을 저장했습니다."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 msgid "Email settings"
 msgstr "메일 설정"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "메일 주소"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "확인된 최신의 메일 계정"
 
@@ -2376,14 +2395,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "제거"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2396,14 +2416,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2411,29 +2431,29 @@ msgstr "추가"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "받은 메일"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2441,88 +2461,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "새 게임"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "메일 설정"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 msgid "Send me notices of new subscriptions through email."
 msgstr "새로운 예약 구독의 통지를 메일로 보내주세요."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:222
+#: actions/emailsettings.php:218
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "누군가 내 글을 좋아하는 게시글로 추가했을 때, 메일을 보냅니다."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:229
+#: actions/emailsettings.php:225
 msgid "Send me email when someone sends me a private message."
 msgstr "누군가 내게 비밀메시지를 보냈을 때, 메일을 보냅니다."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:235
+#: actions/emailsettings.php:231
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "누군가 내게 @ 답장을 보냈을 때, 메일을 보냅니다."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:241
+#: actions/emailsettings.php:237
 msgid "Allow friends to nudge me and send me an email."
 msgstr "친구들이 내게 메일이나 쪽지를 보낼 수 있도록 허용합니다."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:247
+#: actions/emailsettings.php:243
 msgid "Publish a MicroID for my email address."
 msgstr "메일 주소를 위한 MicroID의 생성"
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:368
+#: actions/emailsettings.php:361
 msgid "Email preferences saved."
 msgstr "메일 설정이 저장되었습니다."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "메일 주소가 없습니다."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, fuzzy
+msgid "Cannot normalize that email address."
 msgstr "메일 주소를 정규화 할 수 없습니다."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: 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:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "확인 코드를 추가 할 수 없습니다."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:433
+#: actions/emailsettings.php:425
 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."
@@ -2533,140 +2554,169 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "취소 할 대기중인 인증이 없습니다."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:459
+#: actions/emailsettings.php:450
 #, 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "메일 승인을 삭제 할 수 없습니다."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 msgid "That is not your email address."
 msgstr "그 메일 주소는 귀하의 것이 아닙니다."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "메일 주소를 지웠습니다."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "새로운 받는 메일 주소를 추가했습니다."
 
-#: actions/favor.php:79
+#. 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 "이 게시글은 이미 좋아하는 게시글입니다."
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. 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 "인기있는 게시글"
 
-#: actions/favorited.php:67
+#. 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 페이지"
 
-#: actions/favorited.php:79
+#. TRANS: Description on page displaying favorited notices.
+#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "사이트에서 지금 가장 인기있는 게시글"
 
-#: actions/favorited.php:150
+#. 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."
 msgstr ""
 
-#: actions/favorited.php:156
+#. 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 "
 "notice to your favorites!"
 msgstr ""
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s 님의 좋아하는 글"
 
-#: actions/favoritesrss.php:115
+#. 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 "인기있는 회원"
 
-#: actions/featured.php:71
+#. 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페이지"
 
-#: actions/featured.php:99
+#. TRANS: Description on page displaying featured users.
+#: actions/featured.php:102
 #, fuzzy, php-format
-msgid "A selection of some great users on %s"
+msgid "A selection of some great users on %s."
 msgstr "%s의 훌륭한 회원의 일부 선택"
 
-#: actions/file.php:34
+#. TRANS: Client error displayed when no notice ID was given trying do display a file.
+#: actions/file.php:36
 msgid "No notice ID."
 msgstr "그러한 통지는 없습니다."
 
-#: actions/file.php:38
+#. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
+#: actions/file.php:41
 msgid "No notice."
 msgstr "그러한 통지는 없습니다."
 
-#: actions/file.php:42
+#. 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 "첨부문서 없음"
 
-#: actions/file.php:51
+#. 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 "첨부문서 없음"
 
@@ -2733,6 +2783,7 @@ msgstr "이용자가 프로필을 가지고 있지 않습니다."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2741,9 +2792,10 @@ msgstr "프로필을 지정하지 않았습니다."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "해당 ID의 프로필이 없습니다."
 
@@ -3551,20 +3603,23 @@ msgid "New application"
 msgstr "신규 응용 프로그램"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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 "새 그룹을 만들기 위해 이 양식을 사용하세요."
 
-#: actions/newapplication.php:184
+#. 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이 필요합니다."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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 "관심소식을 생성할 수 없습니다."
 
@@ -4942,8 +4997,9 @@ msgstr "재전송됨"
 msgid "Repeated!"
 msgstr "재전송됨!"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "%s에 답신"
@@ -5226,44 +5282,56 @@ msgstr ""
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "정말로 통지를 삭제하시겠습니까?"
 
-#: actions/showfavorites.php:79
+#. 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 님의 좋아하는 글"
 
-#: actions/showfavorites.php:132
+#. 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 "좋아하는 게시글을 복구할 수 없습니다."
 
-#: actions/showfavorites.php:171
+#. 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)"
 
-#: actions/showfavorites.php:178
+#. 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)"
 
-#: actions/showfavorites.php:185
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "%s의 좋아하는 글 피드 (Atom)"
 
-#: actions/showfavorites.php:206
+#. 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."
 msgstr ""
 
-#: actions/showfavorites.php:208
+#. 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 "
 "would add to their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5271,7 +5339,8 @@ msgid ""
 "their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:243
+#. TRANS: Page notice for show favourites page.
+#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "좋아하는 글을 지정하면 자기가 무엇을 좋아하는지 알릴 수 있습니다."
 
@@ -5839,7 +5908,8 @@ msgstr "귀하의 휴대폰의 통신회사는 무엇입니까?"
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "코드가 입력 되지 않았습니다."
 
 #. TRANS: Menu item for site administration
@@ -6162,7 +6232,6 @@ msgstr ""
 
 #. TRANS: Link description in user account settings menu.
 #: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "프로필"
 
@@ -6443,7 +6512,7 @@ msgid "Author(s)"
 msgstr "작성자"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "좋아합니다"
 
@@ -6850,62 +6919,63 @@ msgstr ""
 msgid "Primary site navigation"
 msgstr "주 사이트 네비게이션"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "개인 프로필과 친구 타임라인"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "개인"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "당신의 메일, 아바타, 비밀 번호, 프로필을 변경하세요."
 
-#. TRANS: Main menu option when logged in for access to user settings
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "계정"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 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
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "연결"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "메일 주소 확인"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
 #: lib/action.php:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "관리"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, 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
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -6917,57 +6987,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "이 사이트에서 로그아웃"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "로그아웃"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "새 계정 만들기"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "등록"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "이 사이트에 로그인"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "로그인"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "도움말"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "도움말"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "사람이나 단어 검색"
 
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7269,7 +7339,7 @@ msgid "User configuration"
 msgstr "메일 주소 확인"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "사용자"
 
@@ -8003,14 +8073,32 @@ msgstr "메일 설정이 저장되었습니다."
 msgid "Unable to find services for %s."
 msgstr "다음 양식을 이용해 그룹을 편집하십시오."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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 "이 게시글 좋아하기 취소"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+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
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Favor"
+msgstr "좋아합니다"
+
 #: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8772,34 +8860,52 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "예약 구독을 추가 할 수 없습니다."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "개인"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "답신"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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 "좋아하는 글들"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "받은 쪽지함"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "받은 메시지"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "보낸 쪽지함"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -8854,6 +8960,7 @@ msgstr "하루 평균"
 msgid "All groups"
 msgstr "모든 그룹"
 
+#. TRANS: Server error displayed when using an unimplemented method.
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
@@ -9262,3 +9369,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Personal"
+#~ msgstr "개인"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 8998ab2ef5..73cde5fdbb 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:48:29+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52:31+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -90,7 +90,7 @@ msgstr "Зачувај нагодувања на пристап"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -103,7 +103,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/showfavorites.php:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Нема таква страница."
 
@@ -130,6 +130,8 @@ msgstr "Нема таква страница."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +147,12 @@ msgstr "Нема таква страница."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -167,9 +169,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s и пријатели"
@@ -327,8 +330,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -366,7 +369,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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
 msgid ""
@@ -534,8 +537,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "Не можам да создадам бендисана забелешка."
 
@@ -546,7 +550,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Не можам да ја избришам бендисаната забелешка."
 
@@ -611,10 +615,11 @@ msgstr "Неправилен прекар."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -633,13 +638,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
@@ -804,8 +810,8 @@ msgstr "Жетонот за барање е веќе овластен."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -838,14 +844,15 @@ msgstr "Грешка во базата при вметнувањето на auth
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -919,7 +926,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1404,9 +1411,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Already subscribed to %s."
-msgstr "Веќе претплатено!"
+msgstr "Веќе сте претплатени на %s."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
@@ -1761,7 +1768,7 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr "Во кутијата морате точно да го впишете „%s“ како што е."
 
@@ -1833,7 +1840,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:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "Се појави проблем со Вашиот сесиски жетон."
@@ -1926,15 +1933,17 @@ 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.
+#. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Не сте најавени."
@@ -2189,12 +2198,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Додај во бендисани"
 
@@ -2227,61 +2236,71 @@ msgid "Use this form to edit your application."
 msgstr "Образецов служи за уредување на програмот."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: actions/editapplication.php:224 actions/newapplication.php:207
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Името на организацијата е предолго (највеќе 255 знаци)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Не можев да го подновам програмот."
 
@@ -2335,25 +2354,25 @@ msgid "Options saved."
 msgstr "Нагодувањата се зачувани."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 msgid "Email settings"
 msgstr "Нагодувања за е-пошта"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "Е-поштенска адреса"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "Тековна потврдена е-поштенска адреса."
 
@@ -2362,14 +2381,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Отстрани"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2382,14 +2402,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2397,30 +2417,30 @@ msgstr "Додај"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Приемна пошта"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2430,89 +2450,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Нова"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "Нагодувања за е-пошта"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 msgid "Send me notices of new subscriptions through email."
 msgstr "Испраќај ми известувања за нови претплати по е-пошта."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:222
+#: actions/emailsettings.php:218
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Испраќај ми е-пошта кога некој ќе бендиса моја забелешка."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:229
+#: actions/emailsettings.php:225
 msgid "Send me email when someone sends me a private message."
 msgstr "Испраќај ми е-пошта кога некој ќе ми испрати приватна порака."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:235
+#: actions/emailsettings.php:231
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Испраќај ми е-пошта кога некој ќе ми испрати „@-одговор“"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:241
+#: actions/emailsettings.php:237
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 "Дозволи им на пријателите да можат да ме подбуцнуваат и да ми испраќаат е-"
 "пошта."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:247
+#: actions/emailsettings.php:243
 msgid "Publish a MicroID for my email address."
 msgstr "Објави MicroID за мојата е-поштенска адреса."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:368
+#: actions/emailsettings.php:361
 msgid "Email preferences saved."
 msgstr "Нагодувањата за е-пошта се зачувани."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "Нема е-поштенска адреса."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, fuzzy
+msgid "Cannot normalize that email address."
 msgstr "Неможам да ја нормализирам таа е-поштенска адреса"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: 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:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 msgid "Could not insert confirmation code."
 msgstr "Не можев да го внесам потврдниот код."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:433
+#: actions/emailsettings.php:425
 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."
@@ -2524,87 +2545,97 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Нема потврди кои може да се откажат."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 msgid "Could not delete email confirmation."
 msgstr "Не можев да ја избришам потврдата по е-пошта."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 msgid "That is not your email address."
 msgstr "Ова не е Вашата е-поштенска адреса."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "Е-поштенската адреса е отстранета."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Додадена е нова влезна е-поштенска адреса."
 
-#: actions/favor.php:79
+#. 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 "Веќе сте ја бендисале оваа забелешка!"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. 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 "Популарни забелешки"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. TRANS: Description on page displaying favorited notices.
+#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "Моментално најпопуларни забелешки на мрежното место."
 
-#: actions/favorited.php:150
+#. 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 "
@@ -2613,7 +2644,9 @@ msgstr ""
 "Бидете првиот што ќе бендиса забелешка со тоа што ќе кликнете на копчето за "
 "бендисување веднаш до забелешката која Ви се допаѓа."
 
-#: actions/favorited.php:156
+#. 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 "
@@ -2622,45 +2655,62 @@ msgstr ""
 "А зошто не [регистрирате сметка](%%action.register%%) и да бидете први што "
 "ќе бендисате забелешка!"
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Бендисани забелешки на %s"
 
-#: actions/favoritesrss.php:115
+#. 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 "Избрани корисници"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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"
 
-#: actions/file.php:34
+#. 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 за белешка."
 
-#: actions/file.php:38
+#. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
+#: actions/file.php:41
 msgid "No notice."
 msgstr "Нема забелешка."
 
-#: actions/file.php:42
+#. 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 "Нема прилози."
 
-#: actions/file.php:51
+#. 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 "Нема подигнато прилози."
 
@@ -2722,6 +2772,7 @@ msgstr "Корисникот веќе ја има таа улога."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2730,9 +2781,10 @@ msgstr "Нема назначено профил."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Нема профил со тоа ID."
 
@@ -3565,19 +3617,22 @@ msgid "New application"
 msgstr "Нов програм"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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 "Овој образец служи за регистрирање на нов програм."
 
-#: actions/newapplication.php:184
+#. 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-адреса."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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 "Не можеше да се создаде програмот."
 
@@ -3598,7 +3653,6 @@ msgstr "Овој образец служи за создавање нова гр
 
 #. TRANS: Group create form validation error.
 #: actions/newgroup.php:199
-#, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "Алијасот не може да биде ист како прекарот."
 
@@ -4963,8 +5017,9 @@ msgstr "Повторено"
 msgid "Repeated!"
 msgstr "Повторено!"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "Одговори испратени до %s"
@@ -5257,31 +5312,38 @@ msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Дали сте сигурни дека сакате да го смените Вашиот кориснички клуч и тајна?"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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 "Не можев да ги повратам бендисаните забелешки."
 
-#: actions/showfavorites.php:171
+#. 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)"
 
-#: actions/showfavorites.php:178
+#. 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)"
 
-#: actions/showfavorites.php:185
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Канал за бендисани забелешки на %s (Atom)"
 
-#: actions/showfavorites.php:206
+#. 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."
@@ -5290,7 +5352,9 @@ msgstr ""
 "бендисување веднаш до самата забелешката што Ви се допаѓа за да ја обележите "
 "за подоцна, или за да ѝ дадете на важност."
 
-#: actions/showfavorites.php:208
+#. 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 "
@@ -5299,7 +5363,10 @@ msgstr ""
 "%s сè уште нема бендисано ниедна забелешка. Објавете нешто интересно, што "
 "корисникот би го бендисал :)"
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5310,7 +5377,8 @@ msgstr ""
 "action.register%%%%) и потоа објавите нешто интересно што корисникот би го "
 "бендисал :)"
 
-#: actions/showfavorites.php:243
+#. TRANS: Page notice for show favourites page.
+#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "Ова е начин да го споделите она што Ви се допаѓа."
 
@@ -5894,7 +5962,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "Нема внесено код"
 
 #. TRANS: Menu item for site administration
@@ -6226,7 +6295,6 @@ msgstr "Неважечки опис по основно: „%1$s“ не е ко
 
 #. TRANS: Link description in user account settings menu.
 #: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "Профил"
 
@@ -6504,7 +6572,7 @@ msgid "Author(s)"
 msgstr "Автор(и)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Бендисај"
 
@@ -6842,23 +6910,23 @@ 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
+#, php-format
 msgid "Cannot locate account %s."
-msgstr "Не можете да си ја избришете сметката."
+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 ""
+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 ""
+msgstr "Нема служба за API на AtomPub за %s."
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
@@ -6917,61 +6985,62 @@ msgstr "Повеќе"
 msgid "Primary site navigation"
 msgstr "Главна навигација"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Личен профил и хронологија на пријатели"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Лично"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Промена на е-пошта, аватар, лозинка, профил"
 
-#. TRANS: Main menu option when logged in for access to user settings
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "Сметка"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 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
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "Поврзи се"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Промена на поставките на мрежното место"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
 #: lib/action.php:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Админ"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, 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
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -6983,57 +7052,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Одјава"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Одјава"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Создај сметка"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Регистрација"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Најава"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Најава"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Напомош!"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "Помош"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Пребарајте луѓе или текст"
 
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7246,9 +7315,9 @@ msgid "No content for notice %s."
 msgstr "Нема содржина за забелешката %s."
 
 #: lib/activitymover.php:84
-#, 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.
@@ -7257,10 +7326,10 @@ msgstr "Нема таков корисник."
 #. 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
@@ -7332,7 +7401,7 @@ msgid "User configuration"
 msgstr "Кориснички поставки"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "Корисник"
 
@@ -8096,18 +8165,36 @@ msgstr "Основно-зададениот изглед е вратен."
 
 #. TRANS: Exception. %s is an ID.
 #: lib/discovery.php:153
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to find services for %s."
-msgstr "Не можам да му го одземам пристапот на програмот: %s."
+msgstr "Не можам да пронајдам служби за: %s."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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 "Одбендисај ја забелешкава"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+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
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Favor"
+msgstr "Бендисај"
+
 #: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8529,7 +8616,7 @@ msgstr "%s: потврдете го како свој телефонскиов 
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
 #: lib/mail.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "You have been nudged by %s"
 msgstr "%s Ве подбуцна"
 
@@ -8976,34 +9063,52 @@ msgstr "Дуплирана забелешка."
 msgid "Couldn't insert new subscription."
 msgstr "Не може да се внесе нова претплата."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "Личен"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "Одговори"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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 "Бендисани"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "Примени"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "Ваши приемни пораки"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "За праќање"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -9057,6 +9162,7 @@ msgstr "Дневен просек"
 msgid "All groups"
 msgstr "Сите групи"
 
+#. TRANS: Server error displayed when using an unimplemented method.
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "Неимплементиран метод."
@@ -9467,3 +9573,6 @@ msgstr "Неважечки XML. Нема XRD-корен."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Земам резерва на податотеката „%s“."
+
+#~ msgid "Personal"
+#~ msgstr "Личен"
diff --git a/locale/ml/LC_MESSAGES/statusnet.po b/locale/ml/LC_MESSAGES/statusnet.po
index 7faca5ff83..2bd222d498 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:48:48+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52:32+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-01-22 19:49:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ml\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -87,7 +87,7 @@ msgstr "അഭിഗമ്യതാ സജ്ജീകരണങ്ങൾ സേ
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -100,7 +100,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/showfavorites.php:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "അത്തരത്തിൽ ഒരു താളില്ല."
 
@@ -127,6 +127,8 @@ msgstr "അത്തരത്തിൽ ഒരു താളില്ല."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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
@@ -142,12 +144,12 @@ msgstr "അത്തരത്തിൽ ഒരു താളില്ല."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -164,9 +166,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s ഒപ്പം സുഹൃത്തുക്കളും"
@@ -315,8 +318,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -354,7 +357,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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
 msgid ""
@@ -515,8 +518,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr ""
 
@@ -527,7 +531,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr ""
 
@@ -591,10 +595,11 @@ msgstr "സാധുവായ വിളിപ്പേര് അല്ല."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -613,13 +618,14 @@ msgstr "പൂർണ്ണ നാമത്തിന്റെ നീളം വള
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
 #. 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
@@ -784,8 +790,8 @@ msgstr "അഭ്യർത്ഥനാ ചീട്ട് മുമ്പേ ത
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -818,14 +824,15 @@ msgstr ""
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -893,7 +900,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1794,7 +1801,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:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "താങ്കളുടെ സെഷൻ ചീട്ടിൽ ഒരു പ്രശ്നമുണ്ടായിരുന്നു."
@@ -1881,15 +1888,17 @@ 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.
+#. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "ലോഗിൻ ചെയ്തിട്ടില്ല"
@@ -2146,12 +2155,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr ""
 
@@ -2184,61 +2193,71 @@ msgid "Use this form to edit your application."
 msgstr ""
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: actions/editapplication.php:224 actions/newapplication.php:207
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "സംഘടനയുടെ പേരിന്റെ നീളം വളരെക്കൂടുതലാണ് (പരമാവധി 255 അക്ഷരങ്ങൾ)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr ""
 
@@ -2292,25 +2311,25 @@ msgid "Options saved."
 msgstr "ഐച്ഛികങ്ങൾ സേവ് ചെയ്തിരിക്കുന്നു."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 msgid "Email settings"
 msgstr "ഇമെയിൽ സജ്ജീകരണങ്ങൾ"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "ഇമെയിൽ വിലാസം"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "ഇപ്പോൾ സ്ഥിരീകരിക്കപ്പെട്ടിട്ടുള്ള ഇമെയിൽ വിലാസം."
 
@@ -2319,14 +2338,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "നീക്കം ചെയ്യുക"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2339,14 +2359,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2354,29 +2374,29 @@ msgstr "കൂട്ടിച്ചേർക്കുക"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "ഇങ്ങോട്ടുള്ള ഇമെയിൽ"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2386,87 +2406,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "പുതിയത്"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "ഇമെയിൽ ക്രമീകരണങ്ങൾ"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:222
+#: actions/emailsettings.php:218
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:229
+#: actions/emailsettings.php:225
 msgid "Send me email when someone sends me a private message."
 msgstr "ആരെങ്കിലും എനിക്കൊരു സ്വകാര്യ സന്ദേശമയച്ചാൽ എനിക്ക് ഇമെയിൽ അയയ്ക്കുക."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:235
+#: actions/emailsettings.php:231
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "ആരെങ്കിലും എനിക്കൊരു \"@-reply\" അയച്ചാൽ എനിക്ക് ഇമെയിൽ അയയ്ക്കുക."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:241
+#: actions/emailsettings.php:237
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:247
+#: actions/emailsettings.php:243
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:368
+#: actions/emailsettings.php:361
 msgid "Email preferences saved."
 msgstr "ഇമെയിൽ ക്രമീകരണങ്ങൾ സേവ് ചെയ്തിരിക്കുന്നു."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "ഇമെയിൽ വിലാസം ഇല്ല."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-msgid "Cannot normalize that email address"
-msgstr ""
+#: actions/emailsettings.php:388
+#, fuzzy
+msgid "Cannot normalize that email address."
+msgstr "സാധുവായ ഇമെയിൽ വിലാസം അല്ല."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: 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:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 msgid "Could not insert confirmation code."
 msgstr "സ്ഥിരീകരണ കോഡ് ഉൾപ്പെടുത്താൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:433
+#: actions/emailsettings.php:425
 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."
@@ -2478,138 +2499,167 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "റദ്ദാക്കാനായി സ്ഥിരീകരണങ്ങളൊന്നും അവശേഷിക്കുന്നില്ല."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 msgid "Could not delete email confirmation."
 msgstr "ഇമെയിൽ സ്ഥിരീകരണം നീക്കം ചെയ്യാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 msgid "That is not your email address."
 msgstr "അത് താങ്കളുടെ ഇമെയിൽ വിലാസമല്ല."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "ഇമെയിൽ വിലാസം നീക്കം ചെയ്തിരിക്കുന്നു."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "സ്വീകരിക്കാനുള്ള പുതിയ ഇമെയിൽ വിലാസം കൂട്ടിച്ചേർത്തിരിക്കുന്നു."
 
-#: actions/favor.php:79
+#. 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 ""
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. 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 "ജനപ്രിയ അറിയിപ്പുകൾ"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. TRANS: Description on page displaying favorited notices.
+#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "ഈ സൈറ്റിൽ ഇപ്പോഴുള്ള ഏറ്റവും ജനപ്രിയ അറിയിപ്പുകൾ."
 
-#: actions/favorited.php:150
+#. 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."
 msgstr ""
 
-#: actions/favorited.php:156
+#. 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 "
 "notice to your favorites!"
 msgstr ""
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:115
+#. 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 "പ്രമുഖ ഉപയോക്താക്കൾ"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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 പദ്ധതിയിലെ ചില മഹദ് ഉപയോക്താക്കൾ"
 
-#: actions/file.php:34
+#. TRANS: Client error displayed when no notice ID was given trying do display a file.
+#: actions/file.php:36
 msgid "No notice ID."
 msgstr "അറിയിപ്പിന്റെ ഐ.ഡി. ഇല്ല."
 
-#: actions/file.php:38
+#. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
+#: actions/file.php:41
 msgid "No notice."
 msgstr "അറിയിപ്പ് ഇല്ല."
 
-#: actions/file.php:42
+#. 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 ""
 
-#: actions/file.php:51
+#. 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 ""
 
@@ -2671,6 +2721,7 @@ msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2679,9 +2730,10 @@ msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr ""
 
@@ -3468,19 +3520,22 @@ msgid "New application"
 msgstr ""
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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 ""
 
-#: actions/newapplication.php:184
+#. 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 "സ്രോതസ്സ് യു.ആർ.എൽ. ആവശ്യമാണ്."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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 ""
 
@@ -4803,8 +4858,9 @@ msgstr "ആവർത്തിച്ചു"
 msgid "Repeated!"
 msgstr "ആവർത്തിച്ചു!"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr ""
@@ -5081,44 +5137,56 @@ msgstr ""
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
-#: actions/showfavorites.php:79
+#. 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 ""
 
-#: actions/showfavorites.php:132
+#. 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 ""
 
-#: actions/showfavorites.php:171
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr ""
 
-#: actions/showfavorites.php:178
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr ""
 
-#: actions/showfavorites.php:185
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr ""
 
-#: actions/showfavorites.php:206
+#. 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."
 msgstr ""
 
-#: actions/showfavorites.php:208
+#. 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 "
 "would add to their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5126,7 +5194,8 @@ msgid ""
 "their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:243
+#. TRANS: Page notice for show favourites page.
+#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "താങ്കളാഗ്രഹിക്കുന്നത് പങ്ക് വെയ്ക്കാനുള്ള ഒരു മാർഗ്ഗമാണിത്."
 
@@ -5679,7 +5748,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "യാതൊരു കോഡും ചേർത്തിട്ടില്ല"
 
 #. TRANS: Menu item for site administration
@@ -5994,7 +6064,6 @@ msgstr ""
 
 #. TRANS: Link description in user account settings menu.
 #: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr ""
 
@@ -6248,7 +6317,7 @@ msgid "Author(s)"
 msgstr "രചയിതാവ് (രചയിതാക്കൾ)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr ""
 
@@ -6644,61 +6713,62 @@ msgstr "കൂടുതൽ പ്രദർശിപ്പിക്കുക"
 msgid "Primary site navigation"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "വ്യക്തിപരം"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to user settings
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "അംഗത്വം"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 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
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "ബന്ധപ്പെടുക"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "സൈറ്റ് ക്രമീകരണങ്ങൾ മാറ്റുക"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
 #: lib/action.php:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "കാര്യനിർവാഹക(ൻ)"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, 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
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -6710,57 +6780,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "സൈറ്റിൽ നിന്നും പുറത്തുകടക്കുക"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "ലോഗൗട്ട്"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "ഒരംഗത്വമെടുക്കുക"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "രജിസ്റ്റർ"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "സൈറ്റിലേക്ക് പ്രവേശിക്കുക"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "പ്രവേശിക്കുക"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "എന്നെ സഹായിക്കൂ!"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "സഹായം"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr ""
 
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7051,7 +7121,7 @@ msgid "User configuration"
 msgstr "ഉപയോക്തൃ ക്രമീകരണം"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "ഉപയോക്താവ്"
 
@@ -7763,14 +7833,30 @@ msgstr "സ്വതേയുള്ള രൂപകല്പന പുനഃസ
 msgid "Unable to find services for %s."
 msgstr ""
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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 ""
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. 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"
@@ -8531,34 +8617,51 @@ msgstr "അറിയിപ്പിന്റെ പകർപ്പ്."
 msgid "Couldn't insert new subscription."
 msgstr ""
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "വ്യക്തിപരം"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "മറുപടികൾ"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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 ""
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "ഇൻബോക്സ്"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "താങ്കൾക്ക് വരുന്ന സന്ദേശങ്ങൾ"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "ഔട്ട്ബോക്സ്"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -8612,6 +8715,7 @@ msgstr "ദൈനിക ശരാശരി"
 msgid "All groups"
 msgstr "എല്ലാ സംഘങ്ങളും"
 
+#. TRANS: Server error displayed when using an unimplemented method.
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
@@ -9014,3 +9118,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Personal"
+#~ msgstr "വ്യക്തിപരം"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 7e7708b6bc..ee2ef70953 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:48:53+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52:35+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -89,7 +89,7 @@ msgstr "Lagre tilgangsinnstillinger"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -102,7 +102,7 @@ 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:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Ingen slik side."
 
@@ -129,6 +129,8 @@ msgstr "Ingen slik side."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +146,12 @@ msgstr "Ingen slik side."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -166,9 +168,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s og venner"
@@ -323,8 +326,8 @@ 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.
 #: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -362,7 +365,7 @@ msgstr "Kunne ikke lagre profil."
 #: 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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
 msgid ""
@@ -529,8 +532,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "Kunne ikke opprette favoritt."
 
@@ -541,7 +545,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Kunne ikke slette favoritt."
 
@@ -605,10 +609,11 @@ msgstr "Ugyldig nick."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -627,13 +632,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
@@ -801,8 +807,8 @@ msgstr "Du er ikke autorisert."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -835,14 +841,15 @@ msgstr "Databasefeil ved innsetting av oauth_token_association."
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -916,7 +923,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1836,7 +1843,7 @@ msgstr "Du er ikke eieren av dette programmet."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 #, fuzzy
 msgid "There was a problem with your session token."
@@ -1930,15 +1937,17 @@ msgstr "Slett denne gruppen"
 
 #. 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 when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Ikke logget inn."
@@ -2196,12 +2205,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Legg til i favoritter"
 
@@ -2234,61 +2243,71 @@ 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.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: actions/editapplication.php:224 actions/newapplication.php:207
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Organisasjon er for lang (maks 255 tegn)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Kunne ikke oppdatere programmet."
 
@@ -2342,25 +2361,25 @@ msgid "Options saved."
 msgstr "Lagret valg."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 msgid "Email settings"
 msgstr "E-postinnstillinger"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "E-postadresse"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "Nåværende bekreftede e-postadresse"
 
@@ -2369,14 +2388,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Fjern"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2389,14 +2409,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2404,29 +2424,29 @@ msgstr "Legg til"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "innkommende e-post"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2434,88 +2454,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Ny"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "E-postinnstillinger"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 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:222
+#: actions/emailsettings.php:218
 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:229
+#: actions/emailsettings.php:225
 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:235
+#: actions/emailsettings.php:231
 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:241
+#: actions/emailsettings.php:237
 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:247
+#: actions/emailsettings.php:243
 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:368
+#: actions/emailsettings.php:361
 msgid "Email preferences saved."
 msgstr "E-postinnstillinger lagret."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "Ingen e-postadresse."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, 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:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: 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:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 #, 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:433
+#: actions/emailsettings.php:425
 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."
@@ -2526,89 +2547,99 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 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:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 #, 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:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 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:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "E-postadressen ble fjernet."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Ny innkommende e-postadresse lagt til."
 
-#: actions/favor.php:79
+#. 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."
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. TRANS: Page title for page on which favorite notices can be unfavourited.
+#: actions/favor.php:95
 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"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. 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å."
 
-#: actions/favorited.php:150
+#. 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 "
@@ -2617,7 +2648,9 @@ msgstr ""
 "Vær den første til å legge en notis til dine favoritter ved å klikke på "
 "favoritt-knappen ved siden av notisen du liker."
 
-#: actions/favorited.php:156
+#. 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 "
@@ -2626,45 +2659,62 @@ msgstr ""
 "Hvorfor ikke [registrere en konto](%%action.register%%) og vær den første "
 "til å legge notisen til dine favoritter."
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s sine favorittnotiser"
 
-#: actions/favoritesrss.php:115
+#. 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"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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"
 
-#: actions/file.php:34
+#. 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."
 
-#: actions/file.php:38
+#. 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."
 
-#: actions/file.php:42
+#. 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."
 
-#: actions/file.php:51
+#. 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."
 
@@ -2726,6 +2776,7 @@ msgstr "Bruker har allerede denne rollen."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2734,9 +2785,10 @@ msgstr "Ingen profil oppgitt."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Ingen profil med den ID'en."
 
@@ -3552,19 +3604,22 @@ msgid "New application"
 msgstr "Ny applikasjon"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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."
 
-#: actions/newapplication.php:184
+#. 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."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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."
 
@@ -4950,8 +5005,9 @@ msgstr "Gjentatt"
 msgid "Repeated!"
 msgstr "Gjentatt!"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "Svar til %s"
@@ -5239,31 +5295,38 @@ 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?"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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."
 
-#: actions/showfavorites.php:171
+#. 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)"
 
-#: actions/showfavorites.php:178
+#. 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)"
 
-#: actions/showfavorites.php:185
+#. 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)"
 
-#: actions/showfavorites.php:206
+#. 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."
@@ -5271,7 +5334,9 @@ msgstr ""
 "Du har ikke valgt en favorittnotis ennå. Klikk på favorittknappen på notiser "
 "du liker for å bokmerke dem for senere eller for å kaste et søkelys på dem."
 
-#: actions/showfavorites.php:208
+#. 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 "
@@ -5280,7 +5345,10 @@ msgstr ""
 "%s har ikke lagt til noen favorittnotiser ennå. Post noe interessant som de "
 "vil legge til sine favoritter :)"
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5291,7 +5359,8 @@ msgstr ""
 "konto](%%%%action.register%%%%) og post noe interessant som de vil legge til "
 "sine favoritter :)"
 
-#: actions/showfavorites.php:243
+#. 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."
 
@@ -5869,7 +5938,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "Ingen kode skrevet inn"
 
 #. TRANS: Menu item for site administration
@@ -6203,7 +6273,6 @@ msgstr "Ugyldig standardabonnement: '%1$s' er ikke bruker."
 
 #. TRANS: Link description in user account settings menu.
 #: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "Profil"
 
@@ -6465,7 +6534,7 @@ msgid "Author(s)"
 msgstr "Forfatter(e)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 #, fuzzy
 msgid "Favor"
 msgstr "Favoritter"
@@ -6869,61 +6938,62 @@ msgstr ""
 msgid "Primary site navigation"
 msgstr "Endre nettstedskonfigurasjon"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personlig"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 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
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "Konto"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Koble til tjenester"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "Koble til"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Endre nettstedskonfigurasjon"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: 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:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrator"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Inviter venner og kollegaer til å bli med deg på %s"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -6935,57 +7005,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Logg ut fra nettstedet"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Logg ut"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Opprett en konto"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrer"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Log inn på nettstedet"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Logg inn"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Hjelp meg."
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "Hjelp"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 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
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7288,7 +7358,7 @@ msgid "User configuration"
 msgstr "Brukerkonfigurasjon"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "Bruker"
 
@@ -8034,16 +8104,34 @@ msgstr "Utseende lagret."
 msgid "Unable to find services for %s."
 msgstr "Kunne ikke fjerne tilgang for applikasjonen: %s."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Disfavor favorite"
+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"
@@ -8910,34 +8998,52 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Kunne ikke sette inn bekreftelseskode."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "Personlig"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "Svar"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "Innboks"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "Dine innkommende meldinger"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "Utboks"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -8991,6 +9097,7 @@ msgstr "Daglig gjennomsnitt"
 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."
@@ -9410,3 +9517,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Personal"
+#~ msgstr "Personlig"
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 5b736f9a76..579f3af544 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:48:50+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52: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-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -90,7 +90,7 @@ msgstr "Toegangsinstellingen opslaan"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -103,7 +103,7 @@ 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:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Deze pagina bestaat niet."
 
@@ -130,6 +130,8 @@ msgstr "Deze pagina bestaat niet."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +147,12 @@ msgstr "Deze pagina bestaat niet."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -167,9 +169,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s en vrienden"
@@ -329,8 +332,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -368,7 +371,7 @@ msgstr "Het was niet mogelijk het profiel op te slaan."
 #: 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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
 msgid ""
@@ -535,8 +538,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "Het was niet mogelijk een favoriet aan te maken."
 
@@ -547,7 +551,7 @@ 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:91
+#: 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."
@@ -615,10 +619,11 @@ msgstr "Ongeldige gebruikersnaam!"
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -637,13 +642,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
@@ -808,8 +814,8 @@ msgstr "Het verzoektoken is al geautoriseerd."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -846,14 +852,15 @@ msgstr ""
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -927,7 +934,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1420,9 +1427,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Already subscribed to %s."
-msgstr "U bent al gebonneerd!"
+msgstr "U bent al geabonneerd op %s."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
@@ -1776,7 +1783,7 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr "U moet de tekst \"%s\" precies in het veld overnemen."
 
@@ -1851,7 +1858,7 @@ msgstr "U bent niet de eigenaar van deze applicatie."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "Er is een probleem met uw sessietoken."
@@ -1945,15 +1952,17 @@ msgstr "Groep verwijderen"
 
 #. 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 when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Niet aangemeld."
@@ -2209,12 +2218,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Aan favorieten toevoegen"
 
@@ -2247,61 +2256,71 @@ 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.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: 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)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Het was niet mogelijk de applicatie bij te werken."
 
@@ -2355,25 +2374,25 @@ msgid "Options saved."
 msgstr "De instellingen zijn opgeslagen."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 msgid "Email settings"
 msgstr "E-mailvoorkeuren"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "E-mailadres"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "Huidige bevestigde e-mailadres"
 
@@ -2382,14 +2401,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2402,14 +2422,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2417,31 +2437,31 @@ msgstr "Toevoegen"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Inkomende e-mail"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2451,87 +2471,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nieuw"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "E-mailvoorkeuren"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 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:222
+#: actions/emailsettings.php:218
 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:229
+#: actions/emailsettings.php:225
 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:235
+#: actions/emailsettings.php:231
 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:241
+#: actions/emailsettings.php:237
 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:247
+#: actions/emailsettings.php:243
 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:368
+#: actions/emailsettings.php:361
 msgid "Email preferences saved."
 msgstr "De e-mailvoorkeuren zijn opgeslagen."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "Geen e-mailadres"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, fuzzy
+msgid "Cannot normalize that email address."
 msgstr "Kan het emailadres niet normaliseren"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: 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:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 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:433
+#: actions/emailsettings.php:425
 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."
@@ -2543,87 +2564,97 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 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:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 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:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 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:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "Het e-mailadres is verwijderd."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Het nieuwe binnenkomende e-mailadres is toegevoegd."
 
-#: actions/favor.php:79
+#. 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."
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. TRANS: Page title for page on which favorite notices can be unfavourited.
+#: actions/favor.php:95
 msgid "Disfavor favorite"
 msgstr "Van 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"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. 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."
 
-#: actions/favorited.php:150
+#. 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 "
@@ -2633,7 +2664,9 @@ msgstr ""
 "favorieten toevoegen\" te klikken bij mededelingen die u de moeite waard "
 "vindt."
 
-#: actions/favorited.php:156
+#. 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 "
@@ -2642,45 +2675,62 @@ msgstr ""
 "U kunt een [gebruiker aanmaken](%%action.register%%) en de eerste mededeling "
 "voor de favorietenlijst plaatsen!"
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Favoriete mededelingen van %s"
 
-#: actions/favoritesrss.php:115
+#. 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"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. TRANS: Description on page displaying featured users.
+#: actions/featured.php:102
+#, fuzzy, php-format
+msgid "A selection of some great users on %s."
 msgstr "Een selectie van gewaardeerde gebruikers op %s"
 
-#: actions/file.php:34
+#. 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."
 
-#: actions/file.php:38
+#. 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."
 
-#: actions/file.php:42
+#. 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."
 
-#: actions/file.php:51
+#. 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."
 
@@ -2746,6 +2796,7 @@ msgstr "Deze gebruiker heeft deze rol al."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2754,9 +2805,10 @@ msgstr "Er is geen profiel opgegeven."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Er is geen profiel met dat ID."
 
@@ -3589,19 +3641,22 @@ msgid "New application"
 msgstr "Nieuwe applicatie"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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."
 
-#: actions/newapplication.php:184
+#. 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."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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."
 
@@ -3622,7 +3677,6 @@ msgstr "Gebruik dit formulier om een nieuwe groep aan te maken."
 
 #. TRANS: Group create form validation error.
 #: actions/newgroup.php:199
-#, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "Een alias kan niet hetzelfde zijn als de gebruikersnaam."
 
@@ -4991,8 +5045,9 @@ msgstr "Herhaald"
 msgid "Repeated!"
 msgstr "Herhaald!"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "Antwoorden aan %s"
@@ -5285,31 +5340,38 @@ 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?"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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."
 
-#: actions/showfavorites.php:171
+#. 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)"
 
-#: actions/showfavorites.php:178
+#. 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)"
 
-#: actions/showfavorites.php:185
+#. 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)"
 
-#: actions/showfavorites.php:206
+#. 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 +5380,9 @@ msgstr ""
 "toevoegen\" bij mededelingen die u aanstaan om ze op een lijst te bewaren en "
 "ze uit te lichten."
 
-#: actions/showfavorites.php:208
+#. 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 +5392,10 @@ msgstr ""
 "een interessant bericht, en dan komt u misschien wel op de "
 "favorietenlijst. :)"
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5339,7 +5406,8 @@ msgstr ""
 "%%%action.register%%%%) en dan interessante mededelingen plaatsten die "
 "misschien aan favorietenlijsten zijn toe te voegen. :)"
 
-#: actions/showfavorites.php:243
+#. 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."
 
@@ -5927,7 +5995,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "Er is geen code ingevoerd"
 
 #. TRANS: Menu item for site administration
@@ -6263,7 +6332,6 @@ msgstr "Ongeldig standaardabonnement: \"%1$s\" is geen gebruiker."
 
 #. TRANS: Link description in user account settings menu.
 #: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "Profiel"
 
@@ -6542,7 +6610,7 @@ msgid "Author(s)"
 msgstr "Auteur(s)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Aan favorieten toevoegen"
 
@@ -6887,23 +6955,23 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Cannot locate account %s."
-msgstr "U kunt uw gebruiker niet verwijderen."
+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 ""
+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 ""
+msgstr "Er is geen AtomPub API-dienst voor %s."
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
@@ -6962,61 +7030,62 @@ msgstr "Meer weergeven"
 msgid "Primary site navigation"
 msgstr "Primaire sitenavigatie"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Persoonlijk profiel en tijdlijn van vrienden"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Persoonlijk"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 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
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "Gebruiker"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Met andere diensten koppelen"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "Koppelen"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Websiteinstellingen wijzigen"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: 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:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Beheer"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Vrienden en collega's uitnodigen om u te vergezellen op %s"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -7028,57 +7097,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Gebruiker afmelden"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Afmelden"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Gebruiker aanmaken"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registreren"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Gebruiker aanmelden"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Aanmelden"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Help me!"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "Help"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 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
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7297,9 +7366,9 @@ msgid "No content for notice %s."
 msgstr "Geen inhoud voor mededeling %s."
 
 #: lib/activitymover.php:84
-#, fuzzy, php-format
+#, php-format
 msgid "No such user %s."
-msgstr "Onbekende gebruiker."
+msgstr "De gebruiker %s bestaat niet."
 
 #. 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.
@@ -7308,10 +7377,10 @@ msgstr "Onbekende gebruiker."
 #. 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
@@ -7383,7 +7452,7 @@ msgid "User configuration"
 msgstr "Gebruikersinstellingen"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "Gebruiker"
 
@@ -8159,20 +8228,36 @@ msgstr "Het standaardontwerp is weer ingesteld."
 
 #. TRANS: Exception. %s is an ID.
 #: lib/discovery.php:153
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to find services for %s."
-msgstr ""
-"Het was niet mogelijk de toegang te ontzeggen voor de volgende applicatie: %"
-"s."
+msgstr "Er zijn geen diensten aantroffen voor %s."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+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
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Favor"
+msgstr "Aan favorieten toevoegen"
+
 #: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8590,7 +8675,7 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "You have been nudged by %s"
 msgstr "%s heeft u gepord"
 
@@ -9041,34 +9126,52 @@ msgstr "Dubbele mededeling."
 msgid "Couldn't insert new subscription."
 msgstr "Kon nieuw abonnement niet toevoegen."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "Persoonlijk"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "Antwoorden"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, fuzzy
+msgctxt "MENU"
+msgid "Profile"
+msgstr "Profiel"
+
+#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
+#: lib/personalgroupnav.php:120
+#, fuzzy
+msgctxt "MENU"
 msgid "Favorites"
 msgstr "Favorieten"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "Postvak IN"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "Uw inkomende berichten"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "Postvak UIT"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -9122,6 +9225,7 @@ msgstr "Dagelijks gemiddelde"
 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."
@@ -9541,3 +9645,6 @@ 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 "Personal"
+#~ msgstr "Persoonlijk"
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index d530402b53..a68fa77d2a 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:48:52+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52:34+0000\n"
 "Language-Team: Norwegian Nynorsk <http://translatewiki.net/wiki/Portal:nn>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nn\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -95,7 +95,7 @@ msgstr "Avatar-innstillingar"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -109,7 +109,7 @@ 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:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 #, fuzzy
 msgid "No such page."
 msgstr "Dette emneord finst ikkje."
@@ -137,6 +137,8 @@ msgstr "Dette emneord finst ikkje."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +154,12 @@ msgstr "Dette emneord finst ikkje."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -174,9 +176,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s med vener"
@@ -326,8 +329,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -365,7 +368,7 @@ msgstr "Kan ikkje lagra profil."
 #: 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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
 msgid ""
@@ -533,8 +536,9 @@ msgid "This status is already a favorite."
 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "Kunne ikkje lagre favoritt."
 
@@ -546,7 +550,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Kunne ikkje slette favoritt."
 
@@ -612,10 +616,11 @@ msgstr "Ikkje eit gyldig brukarnamn."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -635,13 +640,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
@@ -813,8 +819,8 @@ msgstr "Du tingar ikkje oppdateringar til den profilen."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -849,14 +855,15 @@ msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s"
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -925,7 +932,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 #, fuzzy
@@ -1863,7 +1870,7 @@ msgstr "Du er ikkje medlem av den gruppa."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "Det var eit problem med sesjons billetten din."
@@ -1957,15 +1964,17 @@ msgstr "Slett denne gruppa"
 
 #. 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 when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Ikkje logga inn"
@@ -2233,12 +2242,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Legg til i favorittar"
 
@@ -2274,66 +2283,76 @@ 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.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: 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)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 #, fuzzy
 msgid "Could not update application."
 msgstr "Kann ikkje oppdatera gruppa."
@@ -2389,26 +2408,26 @@ msgid "Options saved."
 msgstr "Lagra innstillingar."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 msgid "Email settings"
 msgstr "Profilinnstillingar"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 #, fuzzy
 msgid "Email address"
 msgstr "Epostadresser"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "Godkjent epostadresse."
 
@@ -2417,14 +2436,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Gjenopprett"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2437,14 +2457,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 #, fuzzy
 msgctxt "BUTTON"
@@ -2453,29 +2473,29 @@ msgstr "Legg til"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Innkomande epost"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2483,91 +2503,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 #, fuzzy
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Ny"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "Epostadresser"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 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:222
+#: actions/emailsettings.php:218
 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:229
+#: actions/emailsettings.php:225
 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:235
+#: actions/emailsettings.php:231
 #, 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:241
+#: actions/emailsettings.php:237
 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:247
+#: actions/emailsettings.php:243
 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:368
+#: actions/emailsettings.php:361
 msgid "Email preferences saved."
 msgstr "Lagra brukarval."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "Ingen epostadresse."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, 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:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: 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:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 #, 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:433
+#: actions/emailsettings.php:425
 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."
@@ -2578,141 +2599,170 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 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:459
+#: actions/emailsettings.php:450
 #, 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 #, 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:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 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:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "Fjerna innkomande epostadresse."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "La til ny innkomande epostadresse."
 
-#: actions/favor.php:79
+#. 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!"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. TRANS: Page title for page on which favorite notices can be unfavourited.
+#: actions/favor.php:95
 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"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. 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."
 
-#: actions/favorited.php:150
+#. 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."
 msgstr ""
 
-#: actions/favorited.php:156
+#. 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 "
 "notice to your favorites!"
 msgstr ""
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s's favoritt meldingar"
 
-#: actions/favoritesrss.php:115
+#. 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"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
+#. TRANS: Description on page displaying featured users.
+#: actions/featured.php:102
 #, fuzzy, php-format
-msgid "A selection of some great users on %s"
+msgid "A selection of some great users on %s."
 msgstr "Eit utval av nokre av dei flotte folka på %s"
 
-#: actions/file.php:34
+#. 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."
 
-#: actions/file.php:38
+#. 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."
 
-#: actions/file.php:42
+#. 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."
 
-#: actions/file.php:51
+#. 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."
@@ -2782,6 +2832,7 @@ msgstr "Brukaren har inga profil."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2790,9 +2841,10 @@ msgstr "Ingen vald profil."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Fann ingen profil med den IDen."
 
@@ -3616,21 +3668,24 @@ 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:65
+#: 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."
 
-#: actions/newapplication.php:184
+#. 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 ""
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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."
@@ -5039,8 +5094,9 @@ msgstr "Framheva"
 msgid "Repeated!"
 msgstr "Lag"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "Svar til %s"
@@ -5329,44 +5385,56 @@ msgstr ""
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Sikker på at du vil sletta notisen?"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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."
 
-#: actions/showfavorites.php:171
+#. 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"
 
-#: actions/showfavorites.php:178
+#. 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"
 
-#: actions/showfavorites.php:185
+#. 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"
 
-#: actions/showfavorites.php:206
+#. 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."
 msgstr ""
 
-#: actions/showfavorites.php:208
+#. 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 "
 "would add to their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5374,7 +5442,8 @@ msgid ""
 "their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:243
+#. TRANS: Page notice for show favourites page.
+#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr ""
 
@@ -5948,7 +6017,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "Ingen innskriven kode"
 
 #. TRANS: Menu item for site administration
@@ -6274,7 +6344,6 @@ msgstr ""
 
 #. TRANS: Link description in user account settings menu.
 #: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "Profil"
 
@@ -6550,7 +6619,7 @@ msgid "Author(s)"
 msgstr ""
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Tjeneste"
 
@@ -6963,51 +7032,52 @@ msgstr ""
 msgid "Primary site navigation"
 msgstr "Navigasjon for hovudsida"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Personleg profil og oversyn over vener"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 #, fuzzy
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personleg"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 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
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "Konto"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Klarte ikkje å omdirigera til tenaren: %s"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "Kopla til"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Navigasjon for hovudsida"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
 #: lib/action.php:556 lib/groupnav.php:117
 #, fuzzy
@@ -7015,14 +7085,14 @@ msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrator"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, fuzzy, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Inviter vennar og kollega til å bli med deg på %s"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 #, fuzzy
 msgctxt "MENU"
@@ -7035,19 +7105,19 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Logg inn "
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Logo"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 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: Main menu option when not logged in to register a new account.
 #. TRANS: Menu item for registering with the StatusNet site.
 #: lib/action.php:580 lib/logingroupnav.php:85
 #, fuzzy
@@ -7055,13 +7125,13 @@ msgctxt "MENU"
 msgid "Register"
 msgstr "Registrér"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Logg inn "
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 #, fuzzy
@@ -7069,26 +7139,26 @@ msgctxt "MENU"
 msgid "Login"
 msgstr "Logg inn"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Hjelp"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "Hjelp"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 #, 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
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 #, fuzzy
 msgctxt "MENU"
@@ -7399,7 +7469,7 @@ msgid "User configuration"
 msgstr "SMS bekreftelse"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "Brukar"
 
@@ -8145,14 +8215,32 @@ msgstr ""
 msgid "Unable to find services for %s."
 msgstr "Bruk dette skjemaet for å redigere gruppa"
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Disfavor favorite"
+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 ""
@@ -8934,34 +9022,52 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Kan ikkje leggja til ny tinging."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "Personleg"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "Svar"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "Innboks"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "Dine innkomande meldinger"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "Utboks"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -9017,6 +9123,7 @@ msgstr ""
 msgid "All groups"
 msgstr "Alle gruppar"
 
+#. TRANS: Server error displayed when using an unimplemented method.
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
@@ -9439,3 +9546,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Personal"
+#~ msgstr "Personleg"
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index 557e44d412..e937fa443b 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:48:55+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52:36+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <http://translatewiki.net/wiki/Portal:pl>\n"
 "MIME-Version: 1.0\n"
@@ -20,11 +20,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
 "(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-core\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -92,7 +92,7 @@ msgstr "Zapisz ustawienia dostępu"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -105,7 +105,7 @@ 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:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Nie ma takiej strony."
 
@@ -132,6 +132,8 @@ msgstr "Nie ma takiej strony."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +149,12 @@ msgstr "Nie ma takiej strony."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -169,9 +171,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "Użytkownik %s i przyjaciele"
@@ -329,8 +332,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -368,7 +371,7 @@ msgstr "Nie można zapisać profilu."
 #: 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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
 msgid ""
@@ -539,8 +542,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "Nie można utworzyć ulubionego wpisu."
 
@@ -551,7 +555,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Nie można usunąć ulubionego wpisu."
 
@@ -616,10 +620,11 @@ msgstr "To nie jest prawidłowy pseudonim."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -638,13 +643,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
@@ -811,8 +817,8 @@ msgstr "Token żądania został już upoważniony."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -845,14 +851,15 @@ msgstr "Błąd bazy danych podczas wprowadzania oauth_token_association."
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -926,7 +933,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1412,9 +1419,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Already subscribed to %s."
-msgstr "Już subskrybowane."
+msgstr "%s jest już subskrybowane."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
@@ -1768,7 +1775,7 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr "Należy wpisać dokładnie \"%s\" w polu obok."
 
@@ -1840,7 +1847,7 @@ msgstr "Nie jesteś właścicielem tej aplikacji."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "Wystąpił problem z tokenem sesji."
@@ -1932,15 +1939,17 @@ msgstr "Usuń tę 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 when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Niezalogowany."
@@ -2193,12 +2202,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Dodaj do ulubionych"
 
@@ -2231,61 +2240,71 @@ 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.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: 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)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Nie można zaktualizować aplikacji."
 
@@ -2339,25 +2358,25 @@ msgid "Options saved."
 msgstr "Zapisano opcje."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 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:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "Adres e-mail"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "Obecnie potwierdzone adresy e-mail."
 
@@ -2366,14 +2385,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Usuń"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2387,14 +2407,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2402,29 +2422,29 @@ msgstr "Dodaj"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Wiadomości przychodzące"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2434,87 +2454,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nowy"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "Preferencje e-mail"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 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:222
+#: actions/emailsettings.php:218
 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:229
+#: actions/emailsettings.php:225
 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:235
+#: actions/emailsettings.php:231
 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:241
+#: actions/emailsettings.php:237
 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:247
+#: actions/emailsettings.php:243
 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:368
+#: actions/emailsettings.php:361
 msgid "Email preferences saved."
 msgstr "Zapisano preferencje e-mail."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "Brak adresu e-mail."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, 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:401 actions/register.php:212
+#: 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."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 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:433
+#: actions/emailsettings.php:425
 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."
@@ -2526,87 +2547,97 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 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:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 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:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 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:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "Adres e-mail został usunięty."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Dodano nowy przychodzący adres e-mail."
 
-#: actions/favor.php:79
+#. 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."
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. TRANS: Page title for page on which favorite notices can be unfavourited.
+#: actions/favor.php:95
 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"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. 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."
 
-#: actions/favorited.php:150
+#. 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 "
@@ -2615,7 +2646,9 @@ msgstr ""
 "Bądź pierwszym, który doda wpis do ulubionych naciskając przycisk ulubionego "
 "obok wpisu, który ci się podoba."
 
-#: actions/favorited.php:156
+#. 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 "
@@ -2624,45 +2657,62 @@ msgstr ""
 "Dlaczego nie [zarejestrujesz konta](%%action.register%%) i zostaniesz "
 "pierwszym, który doda wpis do ulubionych."
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Ulubione wpisy użytkownika %s"
 
-#: actions/favoritesrss.php:115
+#. 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"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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"
 
-#: actions/file.php:34
+#. 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."
 
-#: actions/file.php:38
+#. 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."
 
-#: actions/file.php:42
+#. 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."
 
-#: actions/file.php:51
+#. 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."
 
@@ -2724,6 +2774,7 @@ msgstr "Użytkownik ma już tę rolę."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2732,9 +2783,10 @@ msgstr "Nie podano profilu."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Brak profilu o tym identyfikatorze."
 
@@ -3563,19 +3615,22 @@ msgid "New application"
 msgstr "Nowa aplikacja"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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ę."
 
-#: actions/newapplication.php:184
+#. 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."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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."
 
@@ -3596,7 +3651,6 @@ msgstr "Użyj tego formularza, aby utworzyć nową grupę."
 
 #. TRANS: Group create form validation error.
 #: actions/newgroup.php:199
-#, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "Alias nie może być taki sam jak pseudonim."
 
@@ -4952,8 +5006,9 @@ msgstr "Powtórzono"
 msgid "Repeated!"
 msgstr "Powtórzono."
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "Odpowiedzi na %s"
@@ -5241,31 +5296,38 @@ msgstr ""
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Jesteś pewien, że chcesz przywrócić klucz i sekret klienta?"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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."
 
-#: actions/showfavorites.php:171
+#. 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)"
 
-#: actions/showfavorites.php:178
+#. 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)"
 
-#: actions/showfavorites.php:185
+#. 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)"
 
-#: actions/showfavorites.php:206
+#. 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."
@@ -5274,7 +5336,9 @@ msgstr ""
 "na wpisach, które chciałbyś dodać do zakładek na później lub rzucić na nie "
 "trochę światła."
 
-#: actions/showfavorites.php:208
+#. 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 "
@@ -5283,7 +5347,10 @@ msgstr ""
 "Użytkownik %s nie dodał jeszcze żadnych wpisów do ulubionych. Wyślij coś "
 "interesującego, aby chcieli dodać to do swoich ulubionych. :)"
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5294,7 +5361,8 @@ msgstr ""
 "[zarejestrujesz konta](%%%%action.register%%%%) i wyślesz coś "
 "interesującego, aby chcieli dodać to do swoich ulubionych. :)"
 
-#: actions/showfavorites.php:243
+#. 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."
 
@@ -5876,7 +5944,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "Nie podano kodu"
 
 #. TRANS: Menu item for site administration
@@ -6210,7 +6279,6 @@ 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
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "Profil"
 
@@ -6486,7 +6554,7 @@ msgid "Author(s)"
 msgstr "Autorzy"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Dodaj do ulubionych"
 
@@ -6831,23 +6899,23 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Cannot locate account %s."
-msgstr "Użytkownik nie może usunąć konta."
+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 ""
+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 ""
+msgstr "Brak API usługi AtomPub dla %s."
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
@@ -6906,61 +6974,62 @@ msgstr "Wyświetl więcej"
 msgid "Primary site navigation"
 msgstr "Główna nawigacja witryny"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Profil osobisty i oś czasu przyjaciół"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Osobiste"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 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
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "Konto"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Połącz z serwisami"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "Połącz"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Zmień konfigurację witryny"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: 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:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrator"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Zaproś przyjaciół i kolegów do dołączenia do ciebie na %s"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -6972,57 +7041,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Wyloguj się z witryny"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Wyloguj się"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Utwórz konto"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Zarejestruj się"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Zaloguj się na witrynie"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Zaloguj się"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Pomóż mi."
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "Pomoc"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 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
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7238,9 +7307,9 @@ msgid "No content for notice %s."
 msgstr "Brak zawartości dla wpisu %s."
 
 #: lib/activitymover.php:84
-#, fuzzy, php-format
+#, php-format
 msgid "No such user %s."
-msgstr "Brak takiego użytkownika."
+msgstr "Brak użytkownika %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.
@@ -7249,10 +7318,10 @@ msgstr "Brak takiego użytkownika."
 #. 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
@@ -7324,7 +7393,7 @@ msgid "User configuration"
 msgstr "Konfiguracja użytkownika"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "Użytkownik"
 
@@ -8087,18 +8156,36 @@ msgstr "Przywrócono domyślny wygląd."
 
 #. TRANS: Exception. %s is an ID.
 #: lib/discovery.php:153
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to find services for %s."
-msgstr "Nie można unieważnić dostępu dla aplikacji: %s."
+msgstr "Nie można odnaleźć usług dla %s."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Disfavor favorite"
+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"
@@ -8527,9 +8614,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "You have been nudged by %s"
-msgstr "Zostałeś szturchnięty przez %s"
+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,
@@ -8974,34 +9061,52 @@ msgstr "Podwójny wpis."
 msgid "Couldn't insert new subscription."
 msgstr "Nie można wprowadzić nowej subskrypcji."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "Osobiste"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "Odpowiedzi"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "Odebrane"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "Wiadomości przychodzące"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "Wysłane"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -9055,6 +9160,7 @@ msgstr "Dziennie średnio"
 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."
@@ -9477,3 +9583,6 @@ 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 "Personal"
+#~ msgstr "Osobiste"
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 07b073ea94..1b6b69908f 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:48:56+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52:37+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 (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -93,7 +93,7 @@ msgstr "Gravar configurações de acesso"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -106,7 +106,7 @@ 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:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Página não foi encontrada."
 
@@ -133,6 +133,8 @@ msgstr "Página não foi encontrada."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +150,12 @@ msgstr "Página não foi encontrada."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -170,9 +172,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amigos"
@@ -329,8 +332,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -368,7 +371,7 @@ msgstr "Não foi possível gravar o perfil."
 #: 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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
 msgid ""
@@ -536,8 +539,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "Não foi possível criar o favorito."
 
@@ -548,7 +552,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Não foi possível eliminar o favorito."
 
@@ -614,10 +618,11 @@ msgstr "Utilizador não é válido."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -637,13 +642,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
@@ -812,8 +818,8 @@ msgstr "Não tem autorização."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -847,14 +853,15 @@ msgstr "Erro na base de dados ao inserir o utilizador da aplicação OAuth."
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -929,7 +936,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1860,7 +1867,7 @@ msgstr "Não é o proprietário desta aplicação."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "Ocorreu um problema com a sua sessão."
@@ -1958,15 +1965,17 @@ msgstr "Apagar este utilizador"
 
 #. 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 when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Não iniciou sessão."
@@ -2229,12 +2238,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Adicionar às favoritas"
 
@@ -2267,63 +2276,73 @@ 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.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: 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)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Não foi possível actualizar a aplicação."
 
@@ -2377,25 +2396,25 @@ msgid "Options saved."
 msgstr "Opções gravadas."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 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:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "Endereço de correio electrónico"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "Endereço de correio já confirmado."
 
@@ -2404,14 +2423,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Remover"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2424,7 +2444,7 @@ 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:140
+#: actions/emailsettings.php:136
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 "Endereço de correio electrónico, por ex. \"nomedeutilizador@exemplo.pt\""
@@ -2432,7 +2452,7 @@ 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2440,29 +2460,29 @@ msgstr "Adicionar"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Correio recebido"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2470,92 +2490,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Novo"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "Preferências de correio electrónico"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 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:222
+#: actions/emailsettings.php:218
 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:229
+#: actions/emailsettings.php:225
 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:235
+#: actions/emailsettings.php:231
 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:241
+#: actions/emailsettings.php:237
 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:247
+#: actions/emailsettings.php:243
 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:368
+#: actions/emailsettings.php:361
 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:388
+#: actions/emailsettings.php:380
 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:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, 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:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: 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:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 #, 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:433
+#: actions/emailsettings.php:425
 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."
@@ -2567,88 +2588,98 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 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:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 #, 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:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 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:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "O endereço de correio electrónico foi removido."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Adicionado endereço electrónico de entrada novo."
 
-#: actions/favor.php:79
+#. 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!"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. TRANS: Page title for page on which favorite notices can be unfavourited.
+#: actions/favor.php:95
 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"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. 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."
 
-#: actions/favorited.php:150
+#. 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 "
@@ -2657,7 +2688,9 @@ msgstr ""
 "Seja a primeira pessoa a adicionar uma nota às favoritas, clicando o botão "
 "de marcação correspondente a uma nota de que goste."
 
-#: actions/favorited.php:156
+#. 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 "
@@ -2666,45 +2699,62 @@ msgstr ""
 "Podia [registar uma conta](%%action.register%%) e ser o primeiro a adicionar "
 "uma nota às favoritas!"
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Notas favoritas de %s"
 
-#: actions/favoritesrss.php:115
+#. 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"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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"
 
-#: actions/file.php:34
+#. 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."
 
-#: actions/file.php:38
+#. 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."
 
-#: actions/file.php:42
+#. 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."
 
-#: actions/file.php:51
+#. 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."
 
@@ -2766,6 +2816,7 @@ msgstr "O utilizador já tem esta função."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2774,9 +2825,10 @@ msgstr "Não foi especificado um perfil."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: 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."
 
@@ -3607,19 +3659,22 @@ msgid "New application"
 msgstr "Aplicação Nova"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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."
 
-#: actions/newapplication.php:184
+#. 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."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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."
 
@@ -5033,8 +5088,9 @@ msgstr "Repetida"
 msgid "Repeated!"
 msgstr "Repetida!"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "Respostas a %s"
@@ -5324,31 +5380,38 @@ 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?"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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."
 
-#: actions/showfavorites.php:171
+#. 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)"
 
-#: actions/showfavorites.php:178
+#. 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)"
 
-#: actions/showfavorites.php:185
+#. 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)"
 
-#: actions/showfavorites.php:206
+#. 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."
@@ -5357,7 +5420,9 @@ msgstr ""
 "notas de que goste, para marcá-las para mais tarde ou para lhes dar "
 "relevância."
 
-#: actions/showfavorites.php:208
+#. 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 "
@@ -5366,7 +5431,10 @@ msgstr ""
 "%s ainda não adicionou nenhuma nota às favoritas. Publique algo interessante "
 "que mude este estado de coisas :)"
 
-#: actions/showfavorites.php:212
+#. 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,7 +5445,8 @@ msgstr ""
 "conta](%%%%action.register%%%%) e publicar algo tão interessante que mude "
 "este estado de coisas :)"
 
-#: actions/showfavorites.php:243
+#. 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."
 
@@ -5962,7 +6031,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "Nenhum código introduzido"
 
 #. TRANS: Menu item for site administration
@@ -6295,7 +6365,6 @@ 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
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "Perfil"
 
@@ -6572,7 +6641,7 @@ msgid "Author(s)"
 msgstr "Autores"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Eleger como favorita"
 
@@ -6984,61 +7053,62 @@ msgstr ""
 msgid "Primary site navigation"
 msgstr "Navegação primária deste site"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Perfil pessoal e notas dos amigos"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Pessoal"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 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
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "Conta"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Ligar aos serviços"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "Ligar"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Alterar a configuração do site"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: 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:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Gestor"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Convidar amigos e colegas para se juntarem a si em %s"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -7050,57 +7120,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Terminar esta sessão"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Sair"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Criar uma conta"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registar"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Iniciar uma sessão"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Entrar"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Ajudem-me!"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "Ajuda"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 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
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7406,7 +7476,7 @@ msgid "User configuration"
 msgstr "Configuração do utilizador"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "Utilizador"
 
@@ -8178,14 +8248,32 @@ msgstr "Predefinições do estilo repostas"
 msgid "Unable to find services for %s."
 msgstr "Não foi possível retirar acesso da aplicação: %s"
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Disfavor favorite"
+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"
@@ -9055,34 +9143,52 @@ msgstr "Nota duplicada."
 msgid "Couldn't insert new subscription."
 msgstr "Não foi possível inserir nova subscrição."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "Pessoal"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "Respostas"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "Recebidas"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "Mensagens recebidas"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "Enviadas"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -9136,6 +9242,7 @@ msgstr "Média diária"
 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."
@@ -9549,3 +9656,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Personal"
+#~ msgstr "Pessoal"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index c269531444..544ab38734 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:48:58+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52:38+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 (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -94,7 +94,7 @@ msgstr "Salvar as configurações de acesso"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -107,7 +107,7 @@ 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:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Esta página não existe."
 
@@ -134,6 +134,8 @@ msgstr "Esta página não existe."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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 +151,12 @@ msgstr "Esta página não existe."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -171,9 +173,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s e amigos"
@@ -332,8 +335,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -371,7 +374,7 @@ msgstr "Não foi possível salvar o perfil."
 #: 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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
 msgid ""
@@ -543,8 +546,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "Não foi possível criar a favorita."
 
@@ -555,7 +559,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Não foi possível excluir a favorita."
 
@@ -619,10 +623,11 @@ msgstr "Não é uma identificação válida."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -641,13 +646,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
@@ -812,8 +818,8 @@ msgstr "O token solicitado já foi autorizado."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -847,14 +853,15 @@ msgstr "Erro no banco de dados durante a inserção de oauth_token_association."
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -929,7 +936,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1851,7 +1858,7 @@ msgstr "Você não é o dono desta aplicação."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "Ocorreu um problema com o seu token de sessão."
@@ -1944,15 +1951,17 @@ msgstr "Excluir 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.
+#. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Você não está autenticado."
@@ -2213,12 +2222,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Adicionar às favoritas"
 
@@ -2251,61 +2260,71 @@ 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.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: 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)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Não foi possível atualizar a aplicação."
 
@@ -2359,25 +2378,25 @@ msgid "Options saved."
 msgstr "As configurações foram salvas."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 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:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "Endereço de e-mail"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "Endereço de e-mail já confirmado."
 
@@ -2386,14 +2405,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Remover"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2406,14 +2426,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2421,29 +2441,29 @@ msgstr "Adicionar"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "E-mail de recebimento"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2451,92 +2471,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Novo"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "Preferências de e-mail"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 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:222
+#: actions/emailsettings.php:218
 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:229
+#: actions/emailsettings.php:225
 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:235
+#: actions/emailsettings.php:231
 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:241
+#: actions/emailsettings.php:237
 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:247
+#: actions/emailsettings.php:243
 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:368
+#: actions/emailsettings.php:361
 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:388
+#: actions/emailsettings.php:380
 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:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, 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:401 actions/register.php:212
+#: 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."
 
 #. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 #, 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:433
+#: actions/emailsettings.php:425
 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."
@@ -2548,90 +2569,100 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 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:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 #, 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:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 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:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "O endereço de e-mail foi removido."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: 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."
 
-#: actions/favor.php:79
+#. 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!"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. TRANS: Page title for page on which favorite notices can be unfavourited.
+#: actions/favor.php:95
 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"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. 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."
 
-#: actions/favorited.php:150
+#. 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 "
@@ -2640,7 +2671,9 @@ msgstr ""
 "Seja o primeiro a marcar uma mensagem como favorita, clicando no botão "
 "próximo a qualquer uma que você goste."
 
-#: actions/favorited.php:156
+#. 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 "
@@ -2649,45 +2682,62 @@ msgstr ""
 "Por que você não [registra uma conta](%%action.register%%) pra ser o "
 "primeiro a adicionar uma mensagem aos favoritos?"
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Mensagens favoritas de %s"
 
-#: actions/favoritesrss.php:115
+#. 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"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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"
 
-#: actions/file.php:34
+#. 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."
 
-#: actions/file.php:38
+#. 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."
 
-#: actions/file.php:42
+#. 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."
 
-#: actions/file.php:51
+#. 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."
 
@@ -2749,6 +2799,7 @@ msgstr "O usuário já possui este papel."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2757,9 +2808,10 @@ msgstr "Não foi especificado nenhum perfil."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Não foi encontrado nenhum perfil com esse ID."
 
@@ -3597,19 +3649,22 @@ msgid "New application"
 msgstr "Nova aplicação"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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."
 
-#: actions/newapplication.php:184
+#. 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."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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."
 
@@ -5005,8 +5060,9 @@ msgstr "Repetida"
 msgid "Repeated!"
 msgstr "Repetida!"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "Respostas para %s"
@@ -5298,31 +5354,38 @@ msgstr ""
 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?"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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."
 
-#: actions/showfavorites.php:171
+#. 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)"
 
-#: actions/showfavorites.php:178
+#. 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)"
 
-#: actions/showfavorites.php:185
+#. 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)"
 
-#: actions/showfavorites.php:206
+#. 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."
@@ -5331,7 +5394,9 @@ msgstr ""
 "\"Favorita\" nas mensagens que você quer guardar para referência futura ou "
 "para destacar."
 
-#: actions/showfavorites.php:208
+#. 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 "
@@ -5340,7 +5405,10 @@ msgstr ""
 "%s ainda não adicionou nenhuma nota às favoritas. Publique algo interessante "
 "para que as pessoas as marcarem como favorita. :)"
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5350,7 +5418,8 @@ msgstr ""
 "Por que você não [registra uma conta](%%action.register%%) pra ser o "
 "primeiro a adicionar uma mensagem aos favoritos?"
 
-#: actions/showfavorites.php:243
+#. 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."
 
@@ -5932,7 +6001,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "Não foi digitado nenhum código"
 
 #. TRANS: Menu item for site administration
@@ -6264,7 +6334,6 @@ 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
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "Perfil"
 
@@ -6543,7 +6612,7 @@ msgid "Author(s)"
 msgstr "Autor(es)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Tornar favorita"
 
@@ -6950,61 +7019,62 @@ msgstr ""
 msgid "Primary site navigation"
 msgstr "Navegação primária no site"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Perfil pessoal e fluxo de mensagens dos amigos"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Pessoal"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 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
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "Conta"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Conecte-se a outros serviços"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "Conectar"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Altere as configurações do site"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: 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:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrar"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Convide seus amigos e colegas para unir-se a você no %s"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -7016,57 +7086,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Sair do site"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Sair"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Criar uma conta"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrar-se"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Autentique-se no site"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Entrar"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Ajudem-me!"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "Ajuda"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 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
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7368,7 +7438,7 @@ msgid "User configuration"
 msgstr "Configuração do usuário"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "Usuário"
 
@@ -8152,14 +8222,32 @@ msgstr "A aparência padrão foi restaurada."
 msgid "Unable to find services for %s."
 msgstr "Não foi possível revogar o acesso para a aplicação: %s."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Disfavor favorite"
+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"
@@ -9034,34 +9122,52 @@ msgstr "Nota duplicada."
 msgid "Couldn't insert new subscription."
 msgstr "Não foi possível inserir a nova assinatura."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "Pessoal"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "Respostas"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "Recebidas"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "Suas mensagens recebidas"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "Enviadas"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -9115,6 +9221,7 @@ msgstr "Média diária"
 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."
@@ -9528,3 +9635,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Personal"
+#~ msgstr "Pessoal"
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index f0c789e37a..6e421b570b 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -17,18 +17,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:48:59+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52:39+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 (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -97,7 +97,7 @@ msgstr "Сохранить настройки доступа"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -110,7 +110,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/showfavorites.php:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Нет такой страницы."
 
@@ -137,6 +137,8 @@ msgstr "Нет такой страницы."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +154,12 @@ msgstr "Нет такой страницы."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -174,9 +176,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s и друзья"
@@ -333,8 +336,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -372,7 +375,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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
 msgid ""
@@ -543,8 +546,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "Не удаётся создать любимую запись."
 
@@ -555,7 +559,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Не удаётся удалить любимую запись."
 
@@ -621,10 +625,11 @@ msgstr "Неверное имя."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -643,13 +648,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
@@ -816,8 +822,8 @@ msgstr "Ключ запроса уже авторизован."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -850,14 +856,15 @@ msgstr "Ошибка базы данных при вставке oauth_token_ass
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -932,7 +939,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1850,7 +1857,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:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "Проблема с вашим ключом сессии."
@@ -1943,15 +1950,17 @@ 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.
+#. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Не авторизован."
@@ -2210,12 +2219,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Добавить в любимые"
 
@@ -2248,61 +2257,71 @@ msgid "Use this form to edit your application."
 msgstr "Воспользуйтесь этой формой, чтобы изменить приложение."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: actions/editapplication.php:224 actions/newapplication.php:207
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Слишком длинное название организации (максимум 255 символов)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Не удаётся обновить приложение."
 
@@ -2356,25 +2375,25 @@ msgid "Options saved."
 msgstr "Настройки сохранены."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 msgid "Email settings"
 msgstr "Настройка почты"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "Адрес эл. почты"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "Подтверждённый в настоящее время электронный адрес."
 
@@ -2383,14 +2402,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Удалить"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2403,14 +2423,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2418,32 +2438,32 @@ msgstr "Добавить"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Входящий электронный адрес"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2451,95 +2471,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Новый"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "Настройки эл. почты"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 msgid "Send me notices of new subscriptions through email."
 msgstr "Уведомлять меня о новых подписчиках по почте."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:222
+#: actions/emailsettings.php:218
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Посылать мне сообщение по электронной почте, если кто-нибудь добавит мою "
 "запись в число любимых."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:229
+#: actions/emailsettings.php:225
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "Посылать мне сообщение по электронной почте, если кто-нибудь пошлёт мне "
 "приватное сообщение."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:235
+#: actions/emailsettings.php:231
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 "Посылать мне сообщение по электронной почте, если кто-нибудь пошлёт мне «@-"
 "ответ»."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:241
+#: actions/emailsettings.php:237
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 "Разрешить друзьям «подталкивать» меня и посылать мне электронные сообщения."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:247
+#: actions/emailsettings.php:243
 msgid "Publish a MicroID for my email address."
 msgstr "Опубликовать MicroID для моего электронного адреса."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:368
+#: actions/emailsettings.php:361
 msgid "Email preferences saved."
 msgstr "Настройки эл. почты сохранены."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "Нет электронного адреса."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, fuzzy
+msgid "Cannot normalize that email address."
 msgstr "Не удаётся стандартизировать этот электронный адрес"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: 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:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "Не удаётся вставить код подтверждения."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:433
+#: actions/emailsettings.php:425
 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."
@@ -2551,89 +2572,99 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Нет подтверждения отказа."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Не удаётся удалить подверждение по электронному адресу."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 msgid "That is not your email address."
 msgstr "Это не Ваш электронный адрес."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "Адрес эл. почты удалён."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Новый входящий электронный адрес добавлен."
 
-#: actions/favor.php:79
+#. 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 "Эта запись уже входит в число любимых!"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. 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 "Популярные записи"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. TRANS: Description on page displaying favorited notices.
+#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "Самые популярные записи на сайте на данный момент."
 
-#: actions/favorited.php:150
+#. 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 "
@@ -2642,7 +2673,9 @@ msgstr ""
 "Добавьте первую запись в число любимых, нажав соответствующую кнопку рядом с "
 "любой понравившейся записью."
 
-#: actions/favorited.php:156
+#. 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 "
@@ -2651,45 +2684,62 @@ msgstr ""
 "Почему бы не [зарегистрироваться](%%action.register%%) и первым добавить "
 "запись в число любимых?"
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Любимые записи %s"
 
-#: actions/favoritesrss.php:115
+#. 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 "Особые пользователи"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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"
 
-#: actions/file.php:34
+#. 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 записи."
 
-#: actions/file.php:38
+#. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
+#: actions/file.php:41
 msgid "No notice."
 msgstr "Запись отсутствует."
 
-#: actions/file.php:42
+#. 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 "Нет вложений."
 
-#: actions/file.php:51
+#. 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 "Нет загруженных вложений."
 
@@ -2751,6 +2801,7 @@ msgstr "Пользователь уже имеет эту роль."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2759,9 +2810,10 @@ msgstr "Профиль не определен."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Нет профиля с таким ID."
 
@@ -3597,19 +3649,22 @@ msgid "New application"
 msgstr "Новое приложение"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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 "Используйте эту форму для создания нового приложения."
 
-#: actions/newapplication.php:184
+#. 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 источника обязателен."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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 "Не удаётся создать приложение."
 
@@ -4995,8 +5050,9 @@ msgstr "Повторено"
 msgid "Repeated!"
 msgstr "Повторено!"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "Ответы для %s"
@@ -5287,31 +5343,38 @@ msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Вы уверены, что хотите сбросить ваш ключ потребителя и секретную фразу?"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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 "Не удаётся восстановить любимые записи."
 
-#: actions/showfavorites.php:171
+#. 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)"
 
-#: actions/showfavorites.php:178
+#. 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)"
 
-#: actions/showfavorites.php:185
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Лента друзей %s (Atom)"
 
-#: actions/showfavorites.php:206
+#. 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."
@@ -5319,7 +5382,9 @@ msgstr ""
 "Вы пока не выбрали ни одной любимой записи. Нажмите на кнопку добавления в "
 "любимые рядом с понравившейся записью, чтобы позже уделить ей внимание."
 
-#: actions/showfavorites.php:208
+#. 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 +5393,10 @@ msgstr ""
 "%s пока не выбрал ни одной любимой записи. Напишите такую интересную запись, "
 "которую он добавит её в число любимых :)"
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5339,7 +5407,8 @@ msgstr ""
 "[зарегистрироваться](%%%%action.register%%%%) и не написать что-нибудь "
 "интересное, что понравилось бы этому пользователю? :)"
 
-#: actions/showfavorites.php:243
+#. TRANS: Page notice for show favourites page.
+#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "Это способ поделиться тем, что вам нравится."
 
@@ -5923,7 +5992,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "Код не введён"
 
 #. TRANS: Menu item for site administration
@@ -6257,7 +6327,6 @@ msgstr "Неверная подписка по умолчанию: «%1$s» не
 
 #. TRANS: Link description in user account settings menu.
 #: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "Профиль"
 
@@ -6533,7 +6602,7 @@ msgid "Author(s)"
 msgstr "Автор(ы)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Пометить"
 
@@ -6946,61 +7015,62 @@ msgstr "Показать ещё"
 msgid "Primary site navigation"
 msgstr "Главная навигация"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Личный профиль и лента друзей"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Личное"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Изменить ваш email, аватар, пароль, профиль"
 
-#. TRANS: Main menu option when logged in for access to user settings
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "Настройки"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 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
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "Соединить"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Изменить конфигурацию сайта"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
 #: lib/action.php:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Настройки"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, 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
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -7012,57 +7082,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Выйти"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Выход"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Создать новый аккаунт"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Регистрация"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Войти"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Вход"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Помощь"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "Помощь"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Искать людей или текст"
 
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7364,7 +7434,7 @@ msgid "User configuration"
 msgstr "Конфигурация пользователя"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "Пользователь"
 
@@ -8140,14 +8210,32 @@ msgstr "Оформление по умолчанию восстановлено.
 msgid "Unable to find services for %s."
 msgstr "Не удаётся отозвать доступ для приложения: %s."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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 "Мне не нравится эта запись"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+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
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Favor"
+msgstr "Пометить"
+
 #: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -9025,34 +9113,52 @@ msgstr "Дублирующаяся запись."
 msgid "Couldn't insert new subscription."
 msgstr "Не удаётся вставить новую подписку."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "Личное"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "Ответы"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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 "Любимое"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "Входящие"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "Ваши входящие сообщения"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "Исходящие"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -9106,6 +9212,7 @@ msgstr "Среднесуточная"
 msgid "All groups"
 msgstr "Все группы"
 
+#. TRANS: Server error displayed when using an unimplemented method.
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "Нереализованный метод."
@@ -9529,3 +9636,6 @@ msgstr "Неверный XML, отсутствует корень XRD."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Получение резервной копии из файла «%s»."
+
+#~ msgid "Personal"
+#~ msgstr "Личное"
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 9c5e44cf46..0ecdbf9827 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-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+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"
@@ -83,7 +83,7 @@ msgstr ""
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -96,7 +96,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/showfavorites.php:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr ""
 
@@ -123,6 +123,8 @@ msgstr ""
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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
@@ -138,12 +140,12 @@ msgstr ""
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -160,9 +162,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr ""
@@ -311,8 +314,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -350,7 +353,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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
 msgid ""
@@ -511,8 +514,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr ""
 
@@ -523,7 +527,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr ""
 
@@ -587,10 +591,11 @@ msgstr ""
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -609,13 +614,14 @@ msgstr ""
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
 #. 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
@@ -780,8 +786,8 @@ msgstr ""
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -814,14 +820,15 @@ msgstr ""
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -889,7 +896,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1781,7 +1788,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:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr ""
@@ -1868,15 +1875,17 @@ 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.
+#. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr ""
@@ -2125,12 +2134,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr ""
 
@@ -2163,61 +2172,71 @@ msgid "Use this form to edit your application."
 msgstr ""
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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 ""
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: actions/editapplication.php:224 actions/newapplication.php:207
 msgid "Organization is too long (maximum 255 characters)."
 msgstr ""
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr ""
 
@@ -2271,25 +2290,25 @@ msgid "Options saved."
 msgstr ""
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 msgid "Email settings"
 msgstr ""
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr ""
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr ""
 
@@ -2298,14 +2317,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr ""
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2316,14 +2336,14 @@ 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:140
+#: actions/emailsettings.php:136
 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 IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2331,29 +2351,29 @@ msgstr ""
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2361,87 +2381,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr ""
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:222
+#: actions/emailsettings.php:218
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:229
+#: actions/emailsettings.php:225
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:235
+#: actions/emailsettings.php:231
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:241
+#: actions/emailsettings.php:237
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:247
+#: actions/emailsettings.php:243
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:368
+#: actions/emailsettings.php:361
 msgid "Email preferences saved."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+msgid "Cannot normalize that email address."
 msgstr ""
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: 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:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 msgid "Could not insert confirmation code."
 msgstr ""
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:433
+#: actions/emailsettings.php:425
 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."
@@ -2450,137 +2470,166 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr ""
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 msgid "Could not delete email confirmation."
 msgstr ""
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 msgid "That is not your email address."
 msgstr ""
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr ""
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr ""
 
-#: actions/favor.php:79
+#. 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 ""
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. 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 ""
 
-#: actions/favorited.php:67
+#. 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 ""
 
-#: actions/favorited.php:79
+#. TRANS: Description on page displaying favorited notices.
+#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr ""
 
-#: actions/favorited.php:150
+#. 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."
 msgstr ""
 
-#: actions/favorited.php:156
+#. 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 "
 "notice to your favorites!"
 msgstr ""
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
 
-#: actions/favoritesrss.php:115
+#. 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 ""
 
-#: actions/featured.php:71
+#. 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 ""
 
-#: actions/featured.php:99
+#. TRANS: Description on page displaying featured users.
+#: actions/featured.php:102
 #, php-format
-msgid "A selection of some great users on %s"
+msgid "A selection of some great users on %s."
 msgstr ""
 
-#: actions/file.php:34
+#. TRANS: Client error displayed when no notice ID was given trying do display a file.
+#: actions/file.php:36
 msgid "No notice ID."
 msgstr ""
 
-#: actions/file.php:38
+#. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
+#: actions/file.php:41
 msgid "No notice."
 msgstr ""
 
-#: actions/file.php:42
+#. 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 ""
 
-#: actions/file.php:51
+#. 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 ""
 
@@ -2642,6 +2691,7 @@ msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2650,9 +2700,10 @@ msgstr ""
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr ""
 
@@ -3410,19 +3461,22 @@ msgid "New application"
 msgstr ""
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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 ""
 
-#: actions/newapplication.php:184
+#. 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 ""
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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 ""
 
@@ -4729,8 +4783,9 @@ msgstr ""
 msgid "Repeated!"
 msgstr ""
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr ""
@@ -5005,44 +5060,56 @@ msgstr ""
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
-#: actions/showfavorites.php:79
+#. 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 ""
 
-#: actions/showfavorites.php:132
+#. 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 ""
 
-#: actions/showfavorites.php:171
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:172
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
 msgstr ""
 
-#: actions/showfavorites.php:178
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:180
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
 msgstr ""
 
-#: actions/showfavorites.php:185
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr ""
 
-#: actions/showfavorites.php:206
+#. 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."
 msgstr ""
 
-#: actions/showfavorites.php:208
+#. 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 "
 "would add to their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5050,7 +5117,8 @@ msgid ""
 "their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:243
+#. TRANS: Page notice for show favourites page.
+#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr ""
 
@@ -5597,7 +5665,7 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+msgid "No code entered."
 msgstr ""
 
 #. TRANS: Menu item for site administration
@@ -5912,7 +5980,6 @@ msgstr ""
 
 #. TRANS: Link description in user account settings menu.
 #: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr ""
 
@@ -6166,7 +6233,7 @@ msgid "Author(s)"
 msgstr ""
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr ""
 
@@ -6562,61 +6629,62 @@ msgstr ""
 msgid "Primary site navigation"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to user settings
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 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
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr ""
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr ""
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
 #: lib/action.php:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -6628,57 +6696,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr ""
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr ""
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr ""
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr ""
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr ""
 
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -6968,7 +7036,7 @@ msgid "User configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr ""
 
@@ -7680,14 +7748,30 @@ msgstr ""
 msgid "Unable to find services for %s."
 msgstr ""
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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 ""
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. 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 ""
@@ -8440,34 +8524,47 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr ""
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr ""
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+msgctxt "MENU"
 msgid "Replies"
 msgstr ""
 
-#: lib/personalgroupnav.php:117
+#. 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"
 msgid "Favorites"
 msgstr ""
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+msgctxt "MENU"
 msgid "Inbox"
 msgstr ""
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr ""
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+msgctxt "MENU"
 msgid "Outbox"
 msgstr ""
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -8521,6 +8618,7 @@ msgstr ""
 msgid "All groups"
 msgstr ""
 
+#. TRANS: Server error displayed when using an unimplemented method.
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 2d00860b61..5015c37dbe 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:01+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52:40+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 (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -91,7 +91,7 @@ msgstr "Spara inställningar för åtkomst"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -104,7 +104,7 @@ 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:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Ingen sådan sida"
 
@@ -131,6 +131,8 @@ msgstr "Ingen sådan sida"
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +148,12 @@ msgstr "Ingen sådan sida"
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -168,9 +170,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s och vänner"
@@ -325,8 +328,8 @@ 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.
 #: actions/apiaccountupdatedeliverydevice.php:130
-#: actions/confirmaddress.php:118 actions/emailsettings.php:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -364,7 +367,7 @@ msgstr "Kunde inte spara profil."
 #: 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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
 msgid ""
@@ -531,8 +534,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "Kunde inte skapa favorit."
 
@@ -543,7 +547,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Kunde inte ta bort favoriten."
 
@@ -608,10 +612,11 @@ msgstr "Inte ett giltigt smeknamn."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -630,13 +635,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
@@ -802,8 +808,8 @@ msgstr "Begäran-token är redan auktoriserad."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -837,14 +843,15 @@ msgstr "Databasfel vid infogning av OAuth-applikationsanvändare."
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -918,7 +925,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1843,7 +1850,7 @@ msgstr "Du är inte ägaren av denna applikation."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "Det var ett problem med din sessions-token."
@@ -1936,15 +1943,17 @@ msgstr "Ta bort denna grupp"
 
 #. 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 when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Inte inloggad."
@@ -2203,12 +2212,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Lägg till i favoriter"
 
@@ -2241,61 +2250,71 @@ 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.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: 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)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Kunde inte uppdatera applikation."
 
@@ -2349,25 +2368,25 @@ msgid "Options saved."
 msgstr "Alternativ sparade."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 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:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "E-postadress"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "Aktuell, bekräftad e-postadress."
 
@@ -2376,14 +2395,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Ta bort"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2396,14 +2416,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2411,30 +2431,30 @@ msgstr "Lägg till"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Inkommande e-post"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2442,88 +2462,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Ny"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "E-postinställningar"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 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:222
+#: actions/emailsettings.php:218
 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:229
+#: actions/emailsettings.php:225
 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:235
+#: actions/emailsettings.php:231
 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:241
+#: actions/emailsettings.php:237
 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:247
+#: actions/emailsettings.php:243
 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:368
+#: actions/emailsettings.php:361
 msgid "Email preferences saved."
 msgstr "E-postinställningar sparade."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "Ingen e-postadress."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, 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:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: 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:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 #, 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:433
+#: actions/emailsettings.php:425
 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."
@@ -2535,89 +2556,99 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 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:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 #, 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:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 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:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "E-postadressen togs bort."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Ny inkommande e-postadress tillagd."
 
-#: actions/favor.php:79
+#. 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!"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. TRANS: Page title for page on which favorite notices can be unfavourited.
+#: actions/favor.php:95
 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"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. 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."
 
-#: actions/favorited.php:150
+#. 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 "
@@ -2626,7 +2657,9 @@ msgstr ""
 "Var den första att lägga en notis till dina favoriter genom att klicka på "
 "favorit-knappen bredvid någon notis du gillar."
 
-#: actions/favorited.php:156
+#. 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 "
@@ -2635,45 +2668,62 @@ msgstr ""
 "Varför inte [registrera ett konto](%%action.register%%) och vara först med "
 "att lägga en notis till dina favoriter!"
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%ss favoritnotiser"
 
-#: actions/favoritesrss.php:115
+#. 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"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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"
 
-#: actions/file.php:34
+#. 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."
 
-#: actions/file.php:38
+#. 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."
 
-#: actions/file.php:42
+#. 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."
 
-#: actions/file.php:51
+#. 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."
 
@@ -2735,6 +2785,7 @@ msgstr "Användaren har redan denna roll."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2743,9 +2794,10 @@ msgstr "Ingen profil angiven."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Ingen profil med det ID:t."
 
@@ -3574,19 +3626,22 @@ msgid "New application"
 msgstr "Ny applikation"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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."
 
-#: actions/newapplication.php:184
+#. 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."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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."
 
@@ -4988,8 +5043,9 @@ msgstr "Upprepad"
 msgid "Repeated!"
 msgstr "Upprepad!"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "Svarat till %s"
@@ -5279,31 +5335,38 @@ 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?"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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."
 
-#: actions/showfavorites.php:171
+#. 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)"
 
-#: actions/showfavorites.php:178
+#. 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)"
 
-#: actions/showfavorites.php:185
+#. 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)"
 
-#: actions/showfavorites.php:206
+#. 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."
@@ -5312,7 +5375,9 @@ msgstr ""
 "bredvid någon notis du skulle vilja bokmärka för senare tillfälle eller för "
 "att sätta strålkastarljuset på."
 
-#: actions/showfavorites.php:208
+#. 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 "
@@ -5321,7 +5386,10 @@ msgstr ""
 "%s har inte lagt till några favoritnotiser ännu. Posta något intressant de "
 "skulle lägga till sina favoriter :)"
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5331,7 +5399,8 @@ msgstr ""
 "Varför inte [registrera ett konto](%%action.register%%) och vara först med "
 "att lägga en notis till dina favoriter!"
 
-#: actions/showfavorites.php:243
+#. 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."
 
@@ -5910,7 +5979,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "Ingen kod ifylld"
 
 #. TRANS: Menu item for site administration
@@ -6244,7 +6314,6 @@ 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
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "Profil"
 
@@ -6524,7 +6593,7 @@ msgid "Author(s)"
 msgstr "Författare"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Markera som favorit"
 
@@ -6931,61 +7000,62 @@ msgstr "Visa mer"
 msgid "Primary site navigation"
 msgstr "Primär webbplatsnavigation"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Personlig profil och vänners tidslinje"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personligt"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 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
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "Konto"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Anslut till tjänster"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "Anslut"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Ändra webbplatskonfiguration"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: 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:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administratör"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Bjud in vänner och kollegor att gå med dig på %s"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -6997,57 +7067,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Logga ut från webbplatsen"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Logga ut"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Skapa ett konto"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrera"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Logga in på webbplatsen"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Logga in"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Hjälp mig!"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "Hjälp"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 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
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7346,7 +7416,7 @@ msgid "User configuration"
 msgstr "Konfiguration av användare"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "Användare"
 
@@ -8113,14 +8183,32 @@ msgstr "Standardvärden för utseende återställda."
 msgid "Unable to find services for %s."
 msgstr "Kunde inte återkalla åtkomst för applikation: %s."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Disfavor favorite"
+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"
@@ -8988,34 +9076,52 @@ msgstr "Duplicera notis."
 msgid "Couldn't insert new subscription."
 msgstr "Kunde inte infoga ny prenumeration."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "Personligt"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "Svar"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "Inkorg"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "Dina inkommande meddelanden"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "Utkorg"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -9069,6 +9175,7 @@ msgstr "Dagligt genomsnitt"
 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."
@@ -9478,3 +9585,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Personal"
+#~ msgstr "Personligt"
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index b57903e480..01b0e56fc5 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:05+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52:43+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 (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -88,7 +88,7 @@ msgstr "అందుబాటు అమరికలను భద్రపరచ
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -101,7 +101,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/showfavorites.php:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "అటువంటి పేజీ లేదు."
 
@@ -128,6 +128,8 @@ msgstr "అటువంటి పేజీ లేదు."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +145,12 @@ msgstr "అటువంటి పేజీ లేదు."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -165,9 +167,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s మరియు మిత్రులు"
@@ -318,8 +321,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -358,7 +361,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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
 msgid ""
@@ -523,8 +526,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "ఇష్టాంశాన్ని సృష్టించలేకపోయాం."
 
@@ -535,7 +539,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "ఇష్టాంశాన్ని తొలగించలేకపోయాం."
 
@@ -599,10 +603,11 @@ msgstr "సరైన పేరు కాదు."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -622,13 +627,14 @@ msgstr "పూర్తి పేరు చాలా పెద్దగా ఉ
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
 #. 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, fuzzy, php-format
 msgid "Description is too long (maximum %d character)."
@@ -797,8 +803,8 @@ msgstr "మీకు అధీకరణ లేదు."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -832,14 +838,15 @@ msgstr "అవతారాన్ని పెట్టడంలో పొరప
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -907,7 +914,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1831,7 +1838,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:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr ""
@@ -1923,15 +1930,17 @@ 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.
+#. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "లోనికి ప్రవేశించలేదు."
@@ -2191,12 +2200,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "ఇష్టాంశాలకు చేర్చు"
 
@@ -2229,65 +2238,75 @@ msgid "Use this form to edit your application."
 msgstr "మీ ఉపకరణాన్ని మార్చడానికి ఈ ఫారాన్ని ఉపయోగించండి."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "సంస్థ పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "ఉపకరణాన్ని తాజాకరించలేకున్నాం."
 
@@ -2341,25 +2360,25 @@ msgid "Options saved."
 msgstr "ఎంపికలు భద్రమయ్యాయి."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 msgid "Email settings"
 msgstr "ఈమెయిల్ అమరికలు"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "ఈమెయిలు చిరునామా"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "ప్రస్తుత నిర్ధారిత ఈమెయిలు చిరునామా."
 
@@ -2368,14 +2387,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "తొలగించు"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2388,14 +2408,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2403,31 +2423,31 @@ msgstr "చేర్చు"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 #, 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 #, 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2435,91 +2455,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "కొత్తది"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "ఈమెయిలు అభిరుచులు"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:222
+#: actions/emailsettings.php:218
 #, fuzzy
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "%s (@%s) మీ నోటీసుని ఇష్టపడ్డారు"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:229
+#: actions/emailsettings.php:225
 msgid "Send me email when someone sends me a private message."
 msgstr "ఎవరైనా నాకు అంతరంగిక సందేశాన్ని పంపించినప్పుడు నాకు ఈమెయిలుని పంపించు"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:235
+#: actions/emailsettings.php:231
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:241
+#: actions/emailsettings.php:237
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:247
+#: actions/emailsettings.php:243
 #, fuzzy
 msgid "Publish a MicroID for my email address."
 msgstr "అది మీ ఈమెయిలు చిరునామా కాదు."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:368
+#: actions/emailsettings.php:361
 msgid "Email preferences saved."
 msgstr "ఈమెయిలు అభిరుచులు భద్రమయ్యాయి."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "ఈమెయిలు చిరునామా లేదు."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
+#: actions/emailsettings.php:388
 #, fuzzy
-msgid "Cannot normalize that email address"
+msgid "Cannot normalize that email address."
 msgstr "ప్రస్తుత నిర్ధారిత ఈమెయిలు చిరునామా."
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: 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:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 #, fuzzy
 msgid "Could not insert confirmation code."
 msgstr "నిర్ధారణ సంకేతాన్ని చేర్చలేకపోయాం."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:433
+#: actions/emailsettings.php:425
 #, fuzzy
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
@@ -2531,143 +2551,172 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "రద్దుచేయడానికి వేచివున్న నిర్ధారణలేమీ లేవు."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "ఈమెయిల్ నిర్ధారణని తొలగించలేకున్నాం."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 msgid "That is not your email address."
 msgstr "అది మీ ఈమెయిలు చిరునామా కాదు."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "ఆ ఈమెయిలు చిరునామాని తొలగించాం."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 #, 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 #, fuzzy
 msgid "New incoming email address added."
 msgstr "ఈమెయిలు చిరునామా లేదు."
 
-#: actions/favor.php:79
+#. 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 "ఈ నోటీసు ఇప్పటికే మీ ఇష్టాంశం!"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. 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 "ప్రాచుర్య నోటీసులు"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. TRANS: Description on page displaying favorited notices.
+#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "ప్రస్తుతం ఈ సైటులో అత్యంత ప్రాచుర్య నోటీసులు."
 
-#: actions/favorited.php:150
+#. 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."
 msgstr ""
 
-#: actions/favorited.php:156
+#. 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 "
 "notice to your favorites!"
 msgstr "[ఒక ఖాతాని నమోదుచేసుకుని](%%action.register%%) మీరే మొదట వ్రాసేవారు ఎందుకు కాకూడదు!"
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%sకి ఇష్టమైన నోటీసులు"
 
-#: actions/favoritesrss.php:115
+#. 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 "విశేష వాడుకరులు"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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లో కొందరు గొప్ప వాడుకరుల యొక్క ఎంపిక"
 
-#: actions/file.php:34
+#. TRANS: Client error displayed when no notice ID was given trying do display a file.
+#: actions/file.php:36
 msgid "No notice ID."
 msgstr "సందేశం లేదు."
 
-#: actions/file.php:38
+#. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
+#: actions/file.php:41
 msgid "No notice."
 msgstr "సందేశం లేదు."
 
-#: actions/file.php:42
+#. 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 "జోడింపులు లేవు."
 
-#: actions/file.php:51
+#. 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 "ఎక్కించిన జోడింపులేమీ లేవు."
 
@@ -2730,6 +2779,7 @@ msgstr "వాడుకరికి ఇప్పటికే ఈ పాత్ర
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2739,9 +2789,10 @@ msgstr "గుంపు ఏమీ పేర్కొనలేదు."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 #, fuzzy
 msgid "No profile with that ID."
 msgstr "ఆ IDతో ఏ నోటీసూ కనబడలేదు."
@@ -3546,20 +3597,23 @@ msgid "New application"
 msgstr "కొత్త ఉపకరణం"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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 "కొత్త ఉపకరణాన్ని నమోదుచేసుకోడానికి ఈ ఫారాన్ని ఉపయోగించండి."
 
-#: actions/newapplication.php:184
+#. 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 "పేరు తప్పనిసరి."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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 "ఉపకరణాన్ని సృష్టించలేకపోయాం."
 
@@ -4952,8 +5006,9 @@ msgstr "సృష్టితం"
 msgid "Repeated!"
 msgstr "పునరావృతించారు!"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "%sకి స్పందనలు"
@@ -5241,45 +5296,57 @@ msgstr ""
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "మీరు నిజంగానే ఈ నోటీసుని తొలగించాలనుకుంటున్నారా?"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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 "ఇష్టాంశాన్ని సృష్టించలేకపోయాం."
 
-#: actions/showfavorites.php:171
+#. 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)"
 
-#: actions/showfavorites.php:178
+#. 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)"
 
-#: actions/showfavorites.php:185
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "%s యొక్క ఇష్టాంశాల ఫీడు (ఆటమ్)"
 
-#: actions/showfavorites.php:206
+#. 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."
 msgstr ""
 
-#: actions/showfavorites.php:208
+#. 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 "
 "would add to their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5289,7 +5356,8 @@ msgstr ""
 "%sకి చందాదార్లు ఎవరూ లేరు. [ఒక ఖాతాని నమోదు చేసుకుని](%%%%action.register%%%%) మీరు "
 "ఎందుకు మొదటి చందాదారు కాకూడదు?"
 
-#: actions/showfavorites.php:243
+#. TRANS: Page notice for show favourites page.
+#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "మీకు నచ్చినవి పంచుకోడానికి ఇదొక మార్గం."
 
@@ -5872,7 +5940,7 @@ msgstr ""
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
 #, fuzzy
-msgid "No code entered"
+msgid "No code entered."
 msgstr "విషయం లేదు!"
 
 #. TRANS: Menu item for site administration
@@ -6199,7 +6267,6 @@ msgstr ""
 
 #. TRANS: Link description in user account settings menu.
 #: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "ప్రొఫైలు"
 
@@ -6457,7 +6524,7 @@ msgid "Author(s)"
 msgstr "రచయిత(లు)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "ఇష్టపడు"
 
@@ -6860,62 +6927,63 @@ msgstr "మరింత చూపించు"
 msgid "Primary site navigation"
 msgstr "ప్రాధమిక సైటు మార్గదర్శిని"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "వ్యక్తిగత"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "మీ ఈమెయిలు, అవతారం, సంకేతపదం మరియు ప్రౌఫైళ్ళను మార్చుకోండి"
 
-#. TRANS: Main menu option when logged in for access to user settings
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "ఖాతా"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "అనుసంధానాలు"
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "అనుసంధానించు"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "సైటు స్వరూపణాన్ని మార్చండి"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
 #: lib/action.php:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "నిర్వాహకులు"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, 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
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -6927,57 +6995,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "సైటు నుండి నిష్క్రమించు"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "నిష్క్రమించు"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "ఖాతాని సృష్టించుకోండి"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "నమోదు"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "సైటు లోనికి ప్రవేశించండి"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "ప్రవేశించు"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "సహాయం కావాలి!"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "సహాయం"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "ప్రజలు లేదా పాఠ్యం కొరకు వెతకండి"
 
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7277,7 +7345,7 @@ msgid "User configuration"
 msgstr "వాడుకరి స్వరూపణం"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "వాడుకరి"
 
@@ -8017,15 +8085,33 @@ msgstr ""
 msgid "Unable to find services for %s."
 msgstr "మీ ఉపకరణాన్ని మార్చడానికి ఈ ఫారాన్ని ఉపయోగించండి."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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 "ఈ నోటీసుని తొలగించు"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+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
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Favor"
+msgstr "ఇష్టపడు"
+
 #: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8881,34 +8967,52 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "కొత్త చందాని చేర్చలేకపోయాం."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "వ్యక్తిగత"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "స్పందనలు"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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 "ఇష్టాంశాలు"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "వచ్చినవి"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "మీకు వచ్చిన సందేశాలు"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "పంపినవి"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -8963,6 +9067,7 @@ msgstr "రోజువారీ సగటు"
 msgid "All groups"
 msgstr "అన్ని గుంపులు"
 
+#. TRANS: Server error displayed when using an unimplemented method.
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
@@ -9371,3 +9476,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Personal"
+#~ msgstr "వ్యక్తిగత"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 94c17886f6..29326d5287 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:07+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52:44+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 (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -91,7 +91,7 @@ msgstr "Erişim ayarlarını kaydet"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -104,7 +104,7 @@ 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:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Böyle bir sayfa yok."
 
@@ -131,6 +131,8 @@ msgstr "Böyle bir sayfa yok."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +148,12 @@ msgstr "Böyle bir sayfa yok."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -168,9 +170,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s ve arkadaşları"
@@ -330,8 +333,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -369,7 +372,7 @@ msgstr "Profil kaydedilemedi."
 #: 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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
 msgid ""
@@ -532,8 +535,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "Favori oluşturulamadı."
 
@@ -544,7 +548,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Favori silinemedi."
 
@@ -608,10 +612,11 @@ msgstr "Geçersiz bir takma ad."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -630,13 +635,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
@@ -799,8 +805,8 @@ msgstr "İstek belirteci zaten yetkili."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -833,14 +839,15 @@ msgstr "oauth_token_association eklerken veritabanı hatası."
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -916,7 +923,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1843,7 +1850,7 @@ msgstr "Bu uygulamanın sahibi değilsiniz."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr ""
@@ -1942,15 +1949,17 @@ msgstr "Bu kullanıcıyı sil"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to 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 when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Giriş yapılmadı."
@@ -2210,12 +2219,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Favorilere ekle"
 
@@ -2248,63 +2257,73 @@ 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.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: actions/editapplication.php:224 actions/newapplication.php:207
 #, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Organizasyon çok uzun (maksimum 255 karakter)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Uygulama güncellenemedi."
 
@@ -2358,25 +2377,25 @@ msgid "Options saved."
 msgstr "Seçenekler kaydedildi."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 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:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "E-posta adresi"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "Mevcut doğrulanmış e-posta adresi."
 
@@ -2385,14 +2404,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Geri al"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2405,14 +2425,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2420,31 +2440,31 @@ msgstr "Ekle"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Gelen e-posta"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2452,79 +2472,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Yeni"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "E-posta tercihleri"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 #, 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:222
+#: actions/emailsettings.php:218
 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:229
+#: actions/emailsettings.php:225
 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:235
+#: actions/emailsettings.php:231
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:241
+#: actions/emailsettings.php:237
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:247
+#: actions/emailsettings.php:243
 #, 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:368
+#: actions/emailsettings.php:361
 msgid "Email preferences saved."
 msgstr "E-posta tercihleri kaydedildi."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 #, 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:396
+#: actions/emailsettings.php:388
 #, fuzzy
-msgid "Cannot normalize that email address"
+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:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: 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:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 #, fuzzy
 msgid "That email address already belongs to another user."
 msgstr "Jabber ID başka bir kullanıcıya ait."
@@ -2532,14 +2552,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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 #, 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:433
+#: actions/emailsettings.php:425
 #, fuzzy
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
@@ -2551,142 +2571,171 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 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:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 #, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Eposta onayı silinemedi."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 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:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "Eposta adresi zaten var."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 #, 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Yeni gelen e-posta adresi eklendi."
 
-#: actions/favor.php:79
+#. 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!"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. TRANS: Page title for page on which favorite notices can be unfavourited.
+#: actions/favor.php:95
 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ı"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. 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ı."
 
-#: actions/favorited.php:150
+#. 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."
 msgstr ""
 
-#: actions/favorited.php:156
+#. 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 "
 "notice to your favorites!"
 msgstr ""
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s kullanıcısının favori durum mesajları"
 
-#: actions/favoritesrss.php:115
+#. 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"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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"
 
-#: actions/file.php:34
+#. 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."
 
-#: actions/file.php:38
+#. 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."
 
-#: actions/file.php:42
+#. 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."
 
-#: actions/file.php:51
+#. 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."
 
@@ -2753,6 +2802,7 @@ msgstr "Kullanıcının profili yok."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2761,9 +2811,10 @@ msgstr "Hiçbir profil belirtilmedi."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr ""
 
@@ -3552,19 +3603,22 @@ msgid "New application"
 msgstr "Yeni Uygulama"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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 ""
 
-#: actions/newapplication.php:184
+#. 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 ""
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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."
 
@@ -4945,8 +4999,9 @@ msgstr "Sıfırla"
 msgid "Repeated!"
 msgstr "Yarat"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "%s için cevaplar"
@@ -5231,45 +5286,57 @@ msgstr ""
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
-#: actions/showfavorites.php:79
+#. 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ı"
 
-#: actions/showfavorites.php:132
+#. 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."
 
-#: actions/showfavorites.php:171
+#. 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"
 
-#: actions/showfavorites.php:178
+#. 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"
 
-#: actions/showfavorites.php:185
+#. 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"
 
-#: actions/showfavorites.php:206
+#. 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."
 msgstr ""
 
-#: actions/showfavorites.php:208
+#. 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 "
 "would add to their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5277,7 +5344,8 @@ msgid ""
 "their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:243
+#. TRANS: Page notice for show favourites page.
+#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr ""
 
@@ -5852,7 +5920,7 @@ msgstr ""
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
 #, fuzzy
-msgid "No code entered"
+msgid "No code entered."
 msgstr "İçerik yok!"
 
 #. TRANS: Menu item for site administration
@@ -6179,7 +6247,6 @@ msgstr ""
 
 #. TRANS: Link description in user account settings menu.
 #: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "Profil"
 
@@ -6442,7 +6509,7 @@ msgid "Author(s)"
 msgstr ""
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr ""
 
@@ -6845,54 +6912,55 @@ msgstr ""
 msgid "Primary site navigation"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Kişisel profil ve arkadaşların zaman çizelgesi"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Kişisel"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 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
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "Hesap"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 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
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "Bağlan"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 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: 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:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Yönetim"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, php-format
 msgctxt "TOOLTIP"
@@ -6901,7 +6969,7 @@ 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
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -6913,58 +6981,58 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr ""
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 #, fuzzy
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Çıkış"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Bir hesap oluştur"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Kayıt"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Siteye giriş"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Giriş"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Bana yardım et!"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "Yardım"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 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
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7265,7 +7333,7 @@ msgid "User configuration"
 msgstr "Onay kodu yok."
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "Kullanıcı"
 
@@ -8003,15 +8071,32 @@ msgstr ""
 msgid "Unable to find services for %s."
 msgstr "Uygulamayı düzenlemek için bu biçimi kullan."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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 ""
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Disfavor favorite"
+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"
@@ -8786,34 +8871,50 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Yeni abonelik eklenemedi."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "Kişisel"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "Cevaplar"
 
-#: lib/personalgroupnav.php:117
-msgid "Favorites"
-msgstr ""
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, fuzzy
+msgctxt "MENU"
+msgid "Profile"
+msgstr "Profil"
 
-#: lib/personalgroupnav.php:128
+#. 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"
 msgid "Inbox"
 msgstr ""
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr ""
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+msgctxt "MENU"
 msgid "Outbox"
 msgstr ""
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -8868,6 +8969,7 @@ msgstr ""
 msgid "All groups"
 msgstr ""
 
+#. TRANS: Server error displayed when using an unimplemented method.
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
@@ -9286,3 +9388,6 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "Personal"
+#~ msgstr "Kişisel"
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 2a85789ebb..4ffe2ae0c6 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:10+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52: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-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -93,7 +93,7 @@ msgstr "Зберегти параметри доступу"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -106,7 +106,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/showfavorites.php:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "Немає такої сторінки."
 
@@ -133,6 +133,8 @@ msgstr "Немає такої сторінки."
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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,12 +150,12 @@ msgstr "Немає такої сторінки."
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -170,9 +172,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s з друзями"
@@ -328,8 +331,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -367,7 +370,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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
 msgid ""
@@ -539,8 +542,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "Не можна позначити як обране."
 
@@ -551,7 +555,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "Не можна видалити зі списку обраних."
 
@@ -617,10 +621,11 @@ msgstr "Це недійсне ім’я користувача."
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -639,13 +644,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
@@ -812,8 +818,8 @@ msgstr "Токен запиту вже авторизовано."
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -847,14 +853,15 @@ msgstr "Помилка бази даних при додаванні парам
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -929,7 +936,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1418,9 +1425,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Already subscribed to %s."
-msgstr "Вже підписаний!"
+msgstr "Вже підписаний до %s."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
@@ -1776,9 +1783,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "You must write \"%s\" exactly in the box."
-msgstr "Ви мусите написати «%s» у даному віконці."
+msgstr "Ви мусите написати «%s» саме у цьому віконці."
 
 #. TRANS: Confirmation that a user account has been deleted.
 #: actions/deleteaccount.php:206
@@ -1849,7 +1856,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:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "Виникли певні проблеми з токеном поточної сесії."
@@ -1942,15 +1949,17 @@ 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.
+#. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "Не увійшли."
@@ -2203,12 +2212,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "Додати до обраних"
 
@@ -2241,61 +2250,71 @@ msgid "Use this form to edit your application."
 msgstr "Скористайтесь цією формою, щоб відредагувати додаток."
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: actions/editapplication.php:224 actions/newapplication.php:207
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "Назва організації надто довга (не більше 255 знаків)."
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "Не вдалося оновити додаток."
 
@@ -2351,25 +2370,25 @@ msgid "Options saved."
 msgstr "Опції збережено."
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 msgid "Email settings"
 msgstr "Налаштування пошти"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "Електронна адреса"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "Поточна підтверджена поштова адреса."
 
@@ -2378,14 +2397,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Видалити"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2398,14 +2418,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2413,29 +2433,29 @@ msgstr "Додати"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "Вхідна пошта"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2445,87 +2465,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Нове"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "Преференції ел. пошти"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 msgid "Send me notices of new subscriptions through email."
 msgstr "Поівдомляти мене поштою про нові підписки."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:222
+#: actions/emailsettings.php:218
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Надсилати мені листа, коли хтось додає мій допис до списку обраних."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:229
+#: actions/emailsettings.php:225
 msgid "Send me email when someone sends me a private message."
 msgstr "Надсилати мені листа, коли хтось має приватне повідомлення для мене."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:235
+#: actions/emailsettings.php:231
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Надсилати мені листа, коли на мій допис з’являється «@-відповідь»."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:241
+#: actions/emailsettings.php:237
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Дозволити друзям «розштовхати» мене, надіславши мені листа."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:247
+#: actions/emailsettings.php:243
 msgid "Publish a MicroID for my email address."
 msgstr "Позначати міткою MicroID мою електронну адресу."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:368
+#: actions/emailsettings.php:361
 msgid "Email preferences saved."
 msgstr "Преференції пошти збережно."
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "Немає електронної адреси."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, fuzzy
+msgid "Cannot normalize that email address."
 msgstr "Не можна полагодити цю поштову адресу"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: 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:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 msgid "Could not insert confirmation code."
 msgstr "Не вдалося додати код підтвердження."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:433
+#: actions/emailsettings.php:425
 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."
@@ -2537,85 +2558,95 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "Не очікується підтвердження для скасування."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 msgid "Could not delete email confirmation."
 msgstr "Не вдається видалити підтвердження електронної адреси."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 msgid "That is not your email address."
 msgstr "Це не є вашою адресою."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "Адреса була видалена."
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "Нову адресу для вхідних повідомлень додано."
 
-#: actions/favor.php:79
+#. 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 "Цей допис вже є обраним!"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. 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 "Популярні дописи"
 
-#: actions/favorited.php:67
+#. 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"
 
-#: actions/favorited.php:79
+#. TRANS: Description on page displaying favorited notices.
+#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "Представлено найбільш популярні дописи на сайті."
 
-#: actions/favorited.php:150
+#. 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 "
@@ -2624,7 +2655,9 @@ msgstr ""
 "Додайте свій перший вподобаний допис, варто лише натиснути на відповідну "
 "кнопку."
 
-#: actions/favorited.php:156
+#. 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 "
@@ -2633,45 +2666,62 @@ msgstr ""
 "Чому б не [зареєструватись](%%action.register%%) і не почати додавати цікаві "
 "дописи до улюблених!"
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "Обрані дописи %s"
 
-#: actions/favoritesrss.php:115
+#. 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 "Користувачі варті уваги"
 
-#: actions/featured.php:71
+#. 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"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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"
 
-#: actions/file.php:34
+#. 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 допису."
 
-#: actions/file.php:38
+#. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
+#: actions/file.php:41
 msgid "No notice."
 msgstr "Немає допису."
 
-#: actions/file.php:42
+#. 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 "Немає вкладень."
 
-#: actions/file.php:51
+#. 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 "Немає завантажених вкладень."
 
@@ -2733,6 +2783,7 @@ msgstr "Користувач вже має цю роль."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2741,9 +2792,10 @@ msgstr "Не визначено жодного профілю."
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "Не визначено профілю з таким ID."
 
@@ -3583,19 +3635,22 @@ msgid "New application"
 msgstr "Новий додаток"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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 "Скористайтесь цією формою, щоб зареєструвати новий додаток."
 
-#: actions/newapplication.php:184
+#. 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-адреса."
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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 "Не вдалося створити додаток."
 
@@ -3616,9 +3671,8 @@ msgstr "Скористайтесь цією формою для створенн
 
 #. TRANS: Group create form validation error.
 #: actions/newgroup.php:199
-#, fuzzy
 msgid "Alias cannot be the same as nickname."
-msgstr "Додаткове ім’я не може бути таким самим що й основне."
+msgstr "Додаткове ім’я не може збігатися з псевдонімом."
 
 #: actions/newmessage.php:71 actions/newmessage.php:234
 msgid "New message"
@@ -4970,8 +5024,9 @@ msgstr "Повторено"
 msgid "Repeated!"
 msgstr "Повторено!"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "Відповіді до %s"
@@ -5262,31 +5317,38 @@ msgstr ""
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Ви впевнені, що бажаєте скинути ваш ключ споживача і секретний код?"
 
-#: actions/showfavorites.php:79
+#. 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"
 
-#: actions/showfavorites.php:132
+#. 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 "Не можна відновити обрані дописи."
 
-#: actions/showfavorites.php:171
+#. 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)"
 
-#: actions/showfavorites.php:178
+#. 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)"
 
-#: actions/showfavorites.php:185
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "Стрічка обраних дописів %s (Atom)"
 
-#: actions/showfavorites.php:206
+#. 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."
@@ -5295,7 +5357,9 @@ msgstr ""
 "дописі який ви вподобали, аби повернутись до нього пізніше, або звернути на "
 "нього увагу інших."
 
-#: actions/showfavorites.php:208
+#. 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 "
@@ -5304,7 +5368,10 @@ msgstr ""
 "%s поки що не вподобав жодного допису. Може ви написали б йому щось "
 "цікаве? :)"
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5315,7 +5382,8 @@ msgstr ""
 "action.register%%%%) і не написати щось цікаве, що мало б сподобатись цьому "
 "користувачеві :)"
 
-#: actions/showfavorites.php:243
+#. TRANS: Page notice for show favourites page.
+#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "Це спосіб поділитись з усіма тим, що вам подобається."
 
@@ -5898,7 +5966,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "Код не введено"
 
 #. TRANS: Menu item for site administration
@@ -6227,7 +6296,6 @@ msgstr "Помилкова підписка за замовчуванням: «%
 
 #. TRANS: Link description in user account settings menu.
 #: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "Профіль"
 
@@ -6507,7 +6575,7 @@ msgid "Author(s)"
 msgstr "Автор(и)"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "Обрати"
 
@@ -6842,23 +6910,23 @@ 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
+#, php-format
 msgid "Cannot locate account %s."
-msgstr "Ви не можете видалити свій акаунт."
+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 ""
+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 ""
+msgstr "Немає послуги AtomPub API для %s."
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
@@ -6917,61 +6985,62 @@ msgstr "Розгорнути"
 msgid "Primary site navigation"
 msgstr "Відправна навігація по сайту"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Персональний профіль і стрічка друзів"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Стрічка"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Змінити електронну адресу, аватару, пароль, профіль"
 
-#. TRANS: Main menu option when logged in for access to user settings
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "Акаунт"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 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
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "З’єднання"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Змінити конфігурацію сайту"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
 #: lib/action.php:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Адмін"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, 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
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -6983,57 +7052,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Вийти з сайту"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Вийти"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Створити новий акаунт"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Реєстрація"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Увійти на сайт"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Увійти"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Допоможіть!"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "Довідка"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Пошук людей або текстів"
 
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7245,9 +7314,9 @@ msgid "No content for notice %s."
 msgstr "Допис %s не має змісту."
 
 #: lib/activitymover.php:84
-#, 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.
@@ -7256,10 +7325,10 @@ msgstr "Такого користувача немає."
 #. 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
@@ -7331,7 +7400,7 @@ msgid "User configuration"
 msgstr "Конфігурація користувача"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "Користувач"
 
@@ -8100,18 +8169,36 @@ msgstr "Дизайн за замовчуванням відновлено."
 
 #. TRANS: Exception. %s is an ID.
 #: lib/discovery.php:153
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to find services for %s."
-msgstr "Неможливо скасувати доступ для додатку: %s."
+msgstr "Не вдається знайти послуги для %s."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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 "Видалити з обраних"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+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
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Favor"
+msgstr "Обрати"
+
 #: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8540,7 +8627,7 @@ msgstr ""
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
 #: lib/mail.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "You have been nudged by %s"
 msgstr "Вас спробував «розштовхати» %s"
 
@@ -8989,34 +9076,52 @@ msgstr "Дублікат допису."
 msgid "Couldn't insert new subscription."
 msgstr "Не вдалося додати нову підписку."
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "Особисте"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "Відповіді"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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 "Обрані"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "Вхідні"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "Ваші вхідні повідомлення"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "Вихідні"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -9070,6 +9175,7 @@ msgstr "Щоденно"
 msgid "All groups"
 msgstr "Всі спільноти"
 
+#. TRANS: Server error displayed when using an unimplemented method.
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "Метод не виконується."
@@ -9495,3 +9601,6 @@ msgstr "Неправильний XML, корінь XRD відсутній."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Отримання резервної копії файлу «%s»."
+
+#~ msgid "Personal"
+#~ msgstr "Особисте"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index fb494e11c4..89fa1d9810 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:11+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:52:46+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 (r81195); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-01-22 19:49:58+0000\n"
+"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -94,7 +94,7 @@ msgstr "保存访问设置"
 #. 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:254 actions/imsettings.php:183
+#: actions/emailsettings.php:250 actions/imsettings.php:183
 #: actions/othersettings.php:134 actions/pathsadminpanel.php:512
 #: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
 #: actions/smssettings.php:205 actions/subscriptions.php:259
@@ -107,7 +107,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/showfavorites.php:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
 msgid "No such page."
 msgstr "没有这个页面。"
 
@@ -134,6 +134,8 @@ msgstr "没有这个页面。"
 #. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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 +151,12 @@ msgstr "没有这个页面。"
 #: 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:74
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
 #: actions/foaf.php:40 actions/foaf.php:58 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:105 actions/userbyid.php:74
+#: 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
 #: lib/mailbox.php:82 lib/profileaction.php:77
@@ -171,9 +173,10 @@ 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:103
+#: lib/personalgroupnav.php:102
 #, php-format
 msgid "%s and friends"
 msgstr "%s 和好友们"
@@ -327,8 +330,8 @@ msgstr ""
 #. 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:359
-#: actions/emailsettings.php:508 actions/imsettings.php:276
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
 #: actions/imsettings.php:432 actions/othersettings.php:184
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
@@ -366,7 +369,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:104 actions/newnotice.php:95
+#: actions/newapplication.php:102 actions/newnotice.php:95
 #: lib/designsettings.php:298
 #, php-format
 msgid ""
@@ -525,8 +528,9 @@ 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:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "无法创建收藏。"
 
@@ -537,7 +541,7 @@ 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:91
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
 msgid "Could not delete favorite."
 msgstr "无法删除收藏。"
 
@@ -601,10 +605,11 @@ msgstr "不是有效的昵称。"
 #. TRANS: Client error in form for group creation.
 #. 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/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:200 actions/newapplication.php:221
 #: actions/newgroup.php:147 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
@@ -623,13 +628,14 @@ 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: 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.
 #. TRANS: Form validation error in New application form.
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:209 actions/newapplication.php:182
 #: actions/newgroup.php:156
 #, php-format
 msgid "Description is too long (maximum %d character)."
@@ -792,8 +798,8 @@ msgstr "请求 token 已被授权了。"
 #. TRANS: Form validation error.
 #. TRANS: Form validation error message.
 #: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:76
-#: actions/emailsettings.php:297 actions/favor.php:75 actions/geocode.php:55
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
 #: actions/groupblock.php:66 actions/grouplogo.php:324
 #: actions/groupunblock.php:65 actions/imsettings.php:224
 #: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
@@ -826,14 +832,15 @@ msgstr "插入 oauth_token_association 时数据库出错。"
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. 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:316 actions/grouplogo.php:335
-#: actions/imsettings.php:239 actions/newapplication.php:125
+#: actions/emailsettings.php:310 actions/grouplogo.php:335
+#: actions/imsettings.php:239 actions/newapplication.php:124
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
@@ -905,7 +912,7 @@ 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:128
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
 #: actions/imsettings.php:127 actions/smssettings.php:133
 #: lib/applicationeditform.php:351
 msgctxt "BUTTON"
@@ -1800,7 +1807,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:114 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:118
 #: lib/action.php:1409
 msgid "There was a problem with your session token."
 msgstr "你的 session token 出现了问题。"
@@ -1891,15 +1898,17 @@ 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.
+#. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
 #. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
 #. TRANS: Client error displayed trying a change a subscription while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:52 actions/disfavor.php:62 actions/favor.php:62
+#. 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:61 actions/groupunblock.php:60 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
 #: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "未登录。"
@@ -2149,12 +2158,12 @@ 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:84
+#: 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:99
+#: actions/disfavor.php:98
 msgid "Add to favorites"
 msgstr "加入收藏"
 
@@ -2187,61 +2196,71 @@ msgid "Use this form to edit your application."
 msgstr "通过此表单来编辑你的应用。"
 
 #. TRANS: Validation error shown when not providing a name in the "Edit application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. 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.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. 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.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. 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.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. 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:208
+#: 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.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. 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.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. 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:223 actions/newapplication.php:199
+#: actions/editapplication.php:224 actions/newapplication.php:207
 msgid "Organization is too long (maximum 255 characters)."
 msgstr "组织名称过长（不能超过255个字符）。"
 
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. 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.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. 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.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. 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:282
+#: actions/editapplication.php:284
 msgid "Could not update application."
 msgstr "无法更新应用。"
 
@@ -2295,25 +2314,25 @@ msgid "Options saved."
 msgstr "选项已保存。"
 
 #. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
 msgid "Email settings"
 msgstr "Email 设置"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:76
+#: actions/emailsettings.php:73
 #, 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:107 actions/emailsettings.php:133
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
 msgid "Email address"
 msgstr "电邮地址"
 
 #. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:109
 msgid "Current confirmed email address."
 msgstr "当前确认的电子邮件。"
 
@@ -2322,14 +2341,15 @@ 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:116 actions/emailsettings.php:183
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
 #: actions/imsettings.php:112 actions/smssettings.php:120
 #: actions/smssettings.php:176
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "移除"
 
-#: actions/emailsettings.php:123
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -2342,14 +2362,14 @@ 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:140
+#: actions/emailsettings.php:136
 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:144 actions/imsettings.php:147
+#: actions/emailsettings.php:140 actions/imsettings.php:147
 #: actions/smssettings.php:158
 msgctxt "BUTTON"
 msgid "Add"
@@ -2357,29 +2377,29 @@ msgstr "添加"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:152 actions/smssettings.php:167
+#: actions/emailsettings.php:148 actions/smssettings.php:167
 msgid "Incoming email"
 msgstr "接收用 email"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:158
+#: actions/emailsettings.php:154
 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:180 actions/smssettings.php:174
+#: actions/emailsettings.php:176 actions/smssettings.php:174
 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:189 actions/smssettings.php:182
+#: actions/emailsettings.php:185 actions/smssettings.php:182
 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:193
+#: actions/emailsettings.php:189
 msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
@@ -2388,87 +2408,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:199 actions/smssettings.php:185
+#: actions/emailsettings.php:195 actions/smssettings.php:185
 msgctxt "BUTTON"
 msgid "New"
 msgstr "新增"
 
 #. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:208
+#: actions/emailsettings.php:204
 msgid "Email preferences"
 msgstr "Email 偏好"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:216
+#: actions/emailsettings.php:212
 msgid "Send me notices of new subscriptions through email."
 msgstr "将新的关注通过电子邮件发送给我。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:222
+#: actions/emailsettings.php:218
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "有人收藏我的消息时，发邮件通知我。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:229
+#: actions/emailsettings.php:225
 msgid "Send me email when someone sends me a private message."
 msgstr "有人给我发送私信时，发邮件通知我。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:235
+#: actions/emailsettings.php:231
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "有人给我发送 @ 消息时，发邮件通知我。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:241
+#: actions/emailsettings.php:237
 msgid "Allow friends to nudge me and send me an email."
 msgstr "允许朋友们呼叫我并给我发送邮件。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:247
+#: actions/emailsettings.php:243
 msgid "Publish a MicroID for my email address."
 msgstr "公开电子邮件的 MicroID。"
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:368
+#: actions/emailsettings.php:361
 msgid "Email preferences saved."
 msgstr "Email 偏好已保存。"
 
 #. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:388
+#: actions/emailsettings.php:380
 msgid "No email address."
 msgstr "没有电子邮件地址。"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:396
-msgid "Cannot normalize that email address"
+#: actions/emailsettings.php:388
+#, fuzzy
+msgid "Cannot normalize that email address."
 msgstr "无法识别此电子邮件"
 
 #. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:401 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
 #: 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:405
+#: actions/emailsettings.php:397
 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:409
+#: actions/emailsettings.php:401
 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 IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:426 actions/imsettings.php:343
+#: actions/emailsettings.php:418 actions/imsettings.php:343
 #: actions/smssettings.php:365
 msgid "Could not insert confirmation code."
 msgstr "无法插入确认码。"
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:433
+#: actions/emailsettings.php:425
 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."
@@ -2479,137 +2500,166 @@ msgstr ""
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:454 actions/imsettings.php:377
+#: actions/emailsettings.php:445 actions/imsettings.php:377
 #: actions/smssettings.php:399
 msgid "No pending confirmation to cancel."
 msgstr "没有可以取消的确认。"
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:459
+#: actions/emailsettings.php:450
 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:468 actions/smssettings.php:413
+#: actions/emailsettings.php:459 actions/smssettings.php:413
 msgid "Could not delete email confirmation."
 msgstr "无法删除电子邮件确认。"
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:473
+#: actions/emailsettings.php:464
 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:493
+#: actions/emailsettings.php:483
 msgid "That is not your email address."
 msgstr "这个不是你的电子邮件地址。"
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:514
+#: actions/emailsettings.php:504
 msgid "The email address was removed."
 msgstr "电子邮件地址已被删除。"
 
-#: actions/emailsettings.php:528 actions/smssettings.php:554
+#. 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
 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:540 actions/emailsettings.php:565
-#: actions/smssettings.php:564 actions/smssettings.php:587
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: 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.
-#: actions/emailsettings.php:544 actions/smssettings.php:567
+#: 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.
-#: actions/emailsettings.php:569 actions/smssettings.php:590
+#: actions/emailsettings.php:558 actions/smssettings.php:591
 msgid "New incoming email address added."
 msgstr "已添加新的发布用的电子邮件地址。"
 
-#: actions/favor.php:79
+#. 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 "已收藏过此消息！"
 
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. 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 "最新被收藏的消息"
 
-#: actions/favorited.php:67
+#. 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页"
 
-#: actions/favorited.php:79
+#. TRANS: Description on page displaying favorited notices.
+#: actions/favorited.php:81
 msgid "The most popular notices on the site right now."
 msgstr "目前网站上最新被收藏的消息。"
 
-#: actions/favorited.php:150
+#. 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."
 msgstr "通过点击任意消息下的收藏图标成为第一个给自己的收藏添加消息的人。"
 
-#: actions/favorited.php:156
+#. 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 "
 "notice to your favorites!"
 msgstr "现在就[注册一个账户](%%action.register%%)并成为第一个添加收藏的人！"
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s收藏的消息"
 
-#: actions/favoritesrss.php:115
+#. 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 "推荐用户"
 
-#: actions/featured.php:71
+#. 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 页"
 
-#: actions/featured.php:99
-#, php-format
-msgid "A selection of some great users on %s"
+#. 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上的优秀用户摘选"
 
-#: actions/file.php:34
+#. 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。"
 
-#: actions/file.php:38
+#. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
+#: actions/file.php:41
 msgid "No notice."
 msgstr "没有消息。"
 
-#: actions/file.php:42
+#. 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 "没有附件。"
 
-#: actions/file.php:51
+#. 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 "没有已上传的附件。"
 
@@ -2671,6 +2721,7 @@ msgstr "用户已有此权限。"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
 #. 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
@@ -2679,9 +2730,10 @@ msgstr "没有指定的用户。"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
 #. 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:76 actions/groupunblock.php:77
 #: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
 msgid "No profile with that ID."
 msgstr "此 ID 没有用户。"
 
@@ -3474,19 +3526,22 @@ msgid "New application"
 msgstr "新应用"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: 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 "通过此表单登记一个新的应用。"
 
-#: actions/newapplication.php:184
+#. 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 必填。"
 
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. 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 "无法创建应用。"
 
@@ -4825,8 +4880,9 @@ msgstr "已转发"
 msgid "Repeated!"
 msgstr "已转发！"
 
+#. 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:108
+#: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
 msgstr "对 %s 的回复"
@@ -5106,31 +5162,38 @@ msgstr "提示：我们支持HMAC-SHA1签名。我们不支持明文的签名方
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "你确定要重置你的consumer key和secret吗？"
 
-#: actions/showfavorites.php:79
+#. 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页"
 
-#: actions/showfavorites.php:132
+#. 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 "无法获取收藏的消息。"
 
-#: actions/showfavorites.php:171
+#. 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 好友的聚合"
 
-#: actions/showfavorites.php:178
+#. 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 好友的聚合"
 
-#: actions/showfavorites.php:185
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:188
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
 msgstr "%s 好友的聚合"
 
-#: actions/showfavorites.php:206
+#. 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."
@@ -5138,14 +5201,19 @@ msgstr ""
 "你还没收藏任何消息呢。点击消息上的添加收藏按钮就可以添加到收藏夹以后查看或者"
 "收藏一堆有趣的消息。"
 
-#: actions/showfavorites.php:208
+#. 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 "
 "would add to their favorites :)"
 msgstr "%s还没有收藏任何的消息。发一些他/她可能会添加到收藏的有趣的消息吧 :)"
 
-#: actions/showfavorites.php:212
+#. 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](%%%%"
@@ -5155,7 +5223,8 @@ msgstr ""
 "%s还没有收藏任何的消息。现在就 [注册账户](%%%%action.register%%%%) 并发一些"
 "他/她可能会添加到收藏的有趣的消息吧 :)"
 
-#: actions/showfavorites.php:243
+#. TRANS: Page notice for show favourites page.
+#: actions/showfavorites.php:251
 msgid "This is a way to share what you like."
 msgstr "这是一种分享你喜欢的内容的方式。"
 
@@ -5723,7 +5792,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-msgid "No code entered"
+#, fuzzy
+msgid "No code entered."
 msgstr "没有输入验证码"
 
 #. TRANS: Menu item for site administration
@@ -6045,7 +6115,6 @@ msgstr "无效的默认关注：“%1$s”不是一个用户。"
 
 #. TRANS: Link description in user account settings menu.
 #: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:112
 msgid "Profile"
 msgstr "个人信息"
 
@@ -6308,7 +6377,7 @@ msgid "Author(s)"
 msgstr "作者"
 
 #. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:164 lib/favorform.php:143
+#: classes/Fave.php:164
 msgid "Favor"
 msgstr "收藏"
 
@@ -6701,61 +6770,62 @@ msgstr "显示更多"
 msgid "Primary site navigation"
 msgstr "主站导航"
 
-#. TRANS: Tooltip for main menu option "Personal"
+#. TRANS: Tooltip for main menu option "Personal".
 #: lib/action.php:537
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "个人资料及朋友的时间线"
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:540
+#. 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:540 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "个人"
 
-#. TRANS: Tooltip for main menu option "Account"
+#. TRANS: Tooltip for main menu option "Account".
 #: lib/action.php:542
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "修改你的 email 地址、头像、密码、资料"
 
-#. TRANS: Main menu option when logged in for access to user settings
+#. TRANS: Main menu option when logged in for access to user settings.
 #: lib/action.php:545
 msgid "Account"
 msgstr "帐号"
 
-#. TRANS: Tooltip for main menu option "Services"
+#. TRANS: Tooltip for main menu option "Services".
 #: lib/action.php:547
 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
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
 #: lib/action.php:550
 msgid "Connect"
 msgstr "关联"
 
-#. TRANS: Tooltip for menu option "Admin"
+#. TRANS: Tooltip for menu option "Admin".
 #: lib/action.php:553
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "更改网站配置"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
 #: lib/action.php:556 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "管理"
 
-#. TRANS: Tooltip for main menu option "Invite"
+#. TRANS: Tooltip for main menu option "Invite".
 #: lib/action.php:560
 #, 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
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
 #: lib/action.php:563
 msgctxt "MENU"
 msgid "Invite"
@@ -6767,57 +6837,57 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "从网站登出"
 
-#. TRANS: Main menu option when logged in to log out the current user
+#. TRANS: Main menu option when logged in to log out the current user.
 #: lib/action.php:572
 msgctxt "MENU"
 msgid "Logout"
 msgstr "登出"
 
-#. TRANS: Tooltip for main menu option "Register"
+#. TRANS: Tooltip for main menu option "Register".
 #: lib/action.php:577
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "创建一个账户"
 
-#. TRANS: Main menu option when not logged in to register a new account
+#. 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:580 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "注册"
 
-#. TRANS: Tooltip for main menu option "Login"
+#. TRANS: Tooltip for main menu option "Login".
 #: lib/action.php:583
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "登录这个网站"
 
-#. TRANS: Main menu option when not logged in to log in
+#. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
 #: lib/action.php:586 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "登录"
 
-#. TRANS: Tooltip for main menu option "Help"
+#. TRANS: Tooltip for main menu option "Help".
 #: lib/action.php:589
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "帮助我！"
 
-#. TRANS: Main menu option for help on the StatusNet site
+#. TRANS: Main menu option for help on the StatusNet site.
 #: lib/action.php:592
 msgctxt "MENU"
 msgid "Help"
 msgstr "帮助"
 
-#. TRANS: Tooltip for main menu option "Search"
+#. TRANS: Tooltip for main menu option "Search".
 #: lib/action.php:595
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "搜索人或文字"
 
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:598
 msgctxt "MENU"
 msgid "Search"
@@ -7111,7 +7181,7 @@ msgid "User configuration"
 msgstr "用户配置"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
 msgid "User"
 msgstr "用户"
 
@@ -7858,14 +7928,32 @@ msgstr "默认外观已恢复。"
 msgid "Unable to find services for %s."
 msgstr "不能取消%s应用的访问。"
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. 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 "取消收藏这个消息"
 
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+#, fuzzy
+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
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Favor"
+msgstr "收藏"
+
 #: lib/feed.php:84
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -8712,34 +8800,52 @@ msgstr "复制消息。"
 msgid "Couldn't insert new subscription."
 msgstr "无法添加新的关注。"
 
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "我的主页"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
+#, fuzzy
+msgctxt "MENU"
 msgid "Replies"
 msgstr "回复"
 
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+#, 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 "收藏夹"
 
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+#, fuzzy
+msgctxt "MENU"
 msgid "Inbox"
 msgstr "收件箱"
 
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
 msgid "Your incoming messages"
 msgstr "你收到的私信"
 
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+#, fuzzy
+msgctxt "MENU"
 msgid "Outbox"
 msgstr "发件箱"
 
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
 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"
@@ -8793,6 +8899,7 @@ msgstr "日均"
 msgid "All groups"
 msgstr "所有小组"
 
+#. TRANS: Server error displayed when using an unimplemented method.
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr "未使用的方法。"
@@ -9190,3 +9297,6 @@ msgstr "不合法的XML, 缺少XRD根"
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "从文件'%s'获取备份。"
+
+#~ msgid "Personal"
+#~ msgstr "我的主页"
diff --git a/plugins/Facebook/locale/ca/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/ca/LC_MESSAGES/Facebook.po
index 8d244a71e6..8628e7e777 100644
--- a/plugins/Facebook/locale/ca/LC_MESSAGES/Facebook.po
+++ b/plugins/Facebook/locale/ca/LC_MESSAGES/Facebook.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Facebook\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:42+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:53: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-22 19:30:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:24:12+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-facebook\n"
@@ -35,22 +35,36 @@ msgid ""
 "\n"
 "%2$s"
 msgstr ""
+"Hola, %1$s. lamentem informar-vos que no podem actualitzar l'estat del "
+"vostre Facebook des de %2$s, i hem inhabilitat l'aplicació del Facebook del "
+"vostre compte. Això pot ser perquè hagiu eliminat l'autorització de "
+"l'aplicació al Facebook, o perquè hàgiu eliminat el vostre compte del "
+"Facebook. Podeu tornar a habilitar l'aplicació del Facebook i "
+"l'actualització automàtica d'estat reinstal·lant l'aplicació de Facebook de %"
+"2$s.\n"
+"\n"
+"Atentament,\n"
+"\n"
+"%2$s"
 
 #: FBConnectAuth.php:55
 msgid "You must be logged into Facebook to use Facebook Connect."
 msgstr ""
+"Heu d'iniciar una sessió al Facebook per fer servir el Facebook Connect."
 
 #: FBConnectAuth.php:79
 msgid "There is already a local user linked with this Facebook account."
-msgstr ""
+msgstr "Ja hi ha un usuari local enllaçat amb aquest compte del Facebook."
 
 #: FBConnectAuth.php:91 FBConnectSettings.php:166
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
+"S'ha produït un problema amb el testimoni de la vostre sessió. Torneu-ho a "
+"provar."
 
 #: FBConnectAuth.php:96
 msgid "You can't register if you don't agree to the license."
-msgstr ""
+msgstr "No us podeu registrar si no accepteu la llicència."
 
 #: FBConnectAuth.php:106
 msgid "An unknown error has occured."
@@ -64,6 +78,9 @@ msgid ""
 "Facebook to a local account. You can either create a new account, or connect "
 "with your existing account, if you have one."
 msgstr ""
+"És la primera vegada que inicieu una sessió a %s, per tant hem de connectar "
+"el vostre Facebook a un compte local. Podeu crear un compte nou, o bé "
+"connectar-vos amb un ja existent si ja en teniu un."
 
 #. TRANS: Page title.
 #: FBConnectAuth.php:128
@@ -82,6 +99,9 @@ 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 sota %s, excepte les dades "
+"privades següents: contrasenya, adreça electrònica, adreça de MI i número de "
+"telèfon."
 
 #. TRANS: Legend.
 #: FBConnectAuth.php:189
@@ -100,6 +120,7 @@ msgstr "Nou sobrenom"
 #: FBConnectAuth.php:197
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
+"1-64 lletres en minúscules o nombres, sense signes de puntuació o espais"
 
 #. TRANS: Submit button.
 #: FBConnectAuth.php:201
@@ -216,10 +237,12 @@ msgid ""
 "If you would like the %s app to automatically update your Facebook status "
 "with your latest notice, you need to give it permission."
 msgstr ""
+"Si voleu que l'aplicació %s actualitzi automàticament el vostre estat del "
+"Facebook amb el darrer avís, cal que li doneu permisos."
 
 #: facebookhome.php:210
 msgid "Okay, do it!"
-msgstr ""
+msgstr "Endavant, fes-ho!"
 
 #. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
 #: facebookhome.php:217
@@ -250,24 +273,24 @@ msgstr "Gràcies per convidar els vostres amics perquè facin servir el %s."
 #. TRANS: Followed by an unordered list with invited friends.
 #: facebookinvite.php:72
 msgid "Invitations have been sent to the following users:"
-msgstr ""
+msgstr "S'han enviat invitacions als usuaris següents:"
 
 #: facebookinvite.php:91
 #, php-format
 msgid "You have been invited to %s"
-msgstr ""
+msgstr "Us han convidat a %s"
 
 #. TRANS: %s is the name of the site.
 #: facebookinvite.php:101
 #, php-format
 msgid "Invite your friends to use %s"
-msgstr ""
+msgstr "Convideu els vostres amics a fer servir %s"
 
 #. TRANS: %s is the name of the site.
 #: facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
-msgstr ""
+msgstr "Amics que ja fan servir %s:"
 
 #. TRANS: Page title.
 #: facebookinvite.php:143
@@ -299,22 +322,24 @@ msgstr "Inicieu una sessió o registreu-vos fent servir el Facebook"
 #. TRANS: Page title.
 #: FacebookPlugin.php:487 FBConnectSettings.php:55
 msgid "Facebook Connect Settings"
-msgstr ""
+msgstr "Paràmetres de connexió del Facebook"
 
 #: FacebookPlugin.php:591
 msgid ""
 "The Facebook plugin allows integrating StatusNet instances with <a href="
 "\"http://facebook.com/\">Facebook</a> and Facebook Connect."
 msgstr ""
+"El connector del Facebook permet integrar instàncies de l'StatusNet amb el "
+"<a href=\"http://facebook.com/\">Facebook</a> i el Facebook Connect."
 
 #: FBConnectLogin.php:33
 msgid "Already logged in."
-msgstr ""
+msgstr "Ja heu iniciat una sessió."
 
 #. TRANS: Instructions.
 #: FBConnectLogin.php:42
 msgid "Login with your Facebook Account"
-msgstr ""
+msgstr "Inicieu una sessió amb el compte del Facebook"
 
 #. TRANS: Page title.
 #: FBConnectLogin.php:57
@@ -323,11 +348,11 @@ msgstr "Inici de sessió del Facebook"
 
 #: facebookremove.php:53
 msgid "Couldn't remove Facebook user: already deleted."
-msgstr ""
+msgstr "No s'ha pogut eliminar l'usuari del Facebook: ja s'ha eliminat."
 
 #: facebookremove.php:63
 msgid "Couldn't remove Facebook user."
-msgstr ""
+msgstr "No s'ha pogut eliminar l'usuari del Facebook."
 
 #. TRANS: Link description for 'Home' link that leads to a start page.
 #: facebookaction.php:169
@@ -368,10 +393,12 @@ msgid ""
 "To use the %s Facebook Application you need to login with your username and "
 "password. Don't have a username yet?"
 msgstr ""
+"Per fer servir l'aplicació del Facebook %s cal que inicieu una sessió amb el "
+"vostre usuari i contrasenya. No teniu cap nom d'usuari encara?"
 
 #: facebookaction.php:235
 msgid " a new account."
-msgstr ""
+msgstr " un compte nou."
 
 #: facebookaction.php:242
 msgid "Register"
@@ -419,6 +446,8 @@ msgstr "Clau API del Facebook no vàlida. La longitud màxima són 255 caràcter
 #: facebookadminpanel.php:129
 msgid "Invalid Facebook API secret. Max length is 255 characters."
 msgstr ""
+"Clau secreta API del Facebook no vàlida. La longitud màxima són 255 "
+"caràcters."
 
 #: facebookadminpanel.php:178
 msgid "Facebook application settings"
@@ -438,7 +467,7 @@ msgstr "Clau secreta"
 
 #: facebookadminpanel.php:194
 msgid "API secret provided by Facebook"
-msgstr ""
+msgstr "Clau secreta API proporcionada pel Facebook"
 
 #: facebookadminpanel.php:210
 msgid "Save"
@@ -491,7 +520,7 @@ msgstr "Desconnecta"
 
 #: FBConnectSettings.php:180
 msgid "Couldn't delete link to Facebook."
-msgstr ""
+msgstr "No s'ha pogut eliminar l'enllaç al Facebook."
 
 #: FBConnectSettings.php:196
 msgid "You have disconnected from Facebook."
diff --git a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
index 8753af641f..71d9a514d7 100644
--- a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:58+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:54: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-15 11:02:38+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -801,6 +801,3 @@ 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 "Unable to find services for %s."
-#~ msgstr "Impossible de trouver des services pour « %s »."
diff --git a/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po
index a4e6a059f8..c2217033f6 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:59+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:54: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-15 11:02:38+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -772,6 +772,3 @@ 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 "Unable to find services for %s."
-#~ msgstr "Incapace de trovar servicios pro %s."
diff --git a/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po
index cc94ca5622..6ac2c956f8 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:59+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:54: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-15 11:02:38+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -775,6 +775,3 @@ msgstr "Неочекувано барање за претплата за %s."
 #, php-format
 msgid "Unexpected unsubscribe request for %s."
 msgstr "Неочекувано барање за отпишување од претплата за %s."
-
-#~ msgid "Unable to find services for %s."
-#~ msgstr "Не можев да најдам служби за %s."
diff --git a/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po
index a5a9debeb1..546598e437 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:59+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:54: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-15 11:02:38+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -804,6 +804,3 @@ msgstr "Onverwacht abonneringsverzoek voor %s."
 #, php-format
 msgid "Unexpected unsubscribe request for %s."
 msgstr "Onverwacht verzoek om abonnement op te hebben voor %s."
-
-#~ msgid "Unable to find services for %s."
-#~ msgstr "Het was niet mogelijk diensten te vinden voor %s."
diff --git a/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po
index 56d3542bab..104d357396 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:59+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:54: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-15 11:02:38+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-29 22:28:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -786,6 +786,3 @@ msgstr "Несподіваний запит підписки для %s."
 #, php-format
 msgid "Unexpected unsubscribe request for %s."
 msgstr "Несподіваний запит щодо скасування підписки для %s."
-
-#~ msgid "Unable to find services for %s."
-#~ msgstr "Не вдається знайти сервіси для %s."
diff --git a/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/ia/LC_MESSAGES/SubMirror.po
index 97c0414183..7c93ce7168 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-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:27+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:54: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-15 11:02:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
@@ -38,7 +38,7 @@ msgstr "Configurar le republication de messages de altere syndicationes"
 
 #: SubMirrorPlugin.php:183
 msgid "Mirrored feeds"
-msgstr ""
+msgstr "Speculos de syndicationes"
 
 #: lib/editmirrorform.php:83
 msgctxt "LABEL"
diff --git a/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/mk/LC_MESSAGES/SubMirror.po
index 238dc1cfd6..9629c5bca4 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-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:27+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:54: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-15 11:02:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
@@ -38,7 +38,7 @@ msgstr "Нагодување на отсликувањето на објавит
 
 #: SubMirrorPlugin.php:183
 msgid "Mirrored feeds"
-msgstr ""
+msgstr "Огледални канали"
 
 #: lib/editmirrorform.php:83
 msgctxt "LABEL"
diff --git a/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/nl/LC_MESSAGES/SubMirror.po
index 8ddfb28809..679e2bcefd 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-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:27+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:54: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-15 11:02:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
@@ -38,7 +38,7 @@ msgstr "Spiegelen instellen voor berichten van andere feeds"
 
 #: SubMirrorPlugin.php:183
 msgid "Mirrored feeds"
-msgstr ""
+msgstr "Gespiegelde feeds"
 
 #: lib/editmirrorform.php:83
 msgctxt "LABEL"
diff --git a/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/uk/LC_MESSAGES/SubMirror.po
index 8cf9ed5795..5806ac9551 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-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:27+0000\n"
+"POT-Creation-Date: 2011-01-30 22:50+0000\n"
+"PO-Revision-Date: 2011-01-30 22:54: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-15 11:02:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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"

From 8f776ec12d4a6c73a1e65e8732bf12a583eb2445 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Mon, 31 Jan 2011 16:39:54 +0100
Subject: [PATCH 146/314] * update/add translator documentation. * fix L10n
 issues. * update comments and tag missing documentation on some classes. *
 remove superfluous whitespace *

---
 actions/finishremotesubscribe.php | 11 +++++++++--
 actions/foaf.php                  | 15 +++++++++------
 actions/foafgroup.php             |  4 ++++
 actions/geocode.php               |  3 +--
 actions/getfile.php               |  9 ++-------
 actions/grantrole.php             | 13 +++++++------
 actions/groupblock.php            | 23 +++++++++++++++--------
 actions/groupbyid.php             |  7 +++----
 actions/groupdesignsettings.php   | 29 ++++++++++++-----------------
 actions/grouplogo.php             |  7 +------
 10 files changed, 63 insertions(+), 58 deletions(-)

diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php
index 0325f6adbb..59725af27f 100644
--- a/actions/finishremotesubscribe.php
+++ b/actions/finishremotesubscribe.php
@@ -48,7 +48,6 @@ require_once INSTALLDIR.'/lib/omb.php';
  */
 class FinishremotesubscribeAction extends Action
 {
-
     /**
      * Class handler.
      *
@@ -56,7 +55,7 @@ class FinishremotesubscribeAction extends Action
      *
      * @return nothing
      *
-     **/
+     */
     function handle($args)
     {
         parent::handle($args);
@@ -66,6 +65,7 @@ class FinishremotesubscribeAction extends Action
         $service  = unserialize($_SESSION['oauth_authorization_request']);
 
         if (!$service) {
+            // TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
             $this->clientError(_('Not expecting this response!'));
             return;
         }
@@ -77,6 +77,7 @@ class FinishremotesubscribeAction extends Action
         $user = User::staticGet('uri', $service->getListeneeURI());
 
         if (!$user) {
+            // TRANS: Client error displayed when subscribing to a remote profile that does not exist.
             $this->clientError(_('User being listened to does not exist.'));
             return;
         }
@@ -84,6 +85,7 @@ class FinishremotesubscribeAction extends Action
         $other = User::staticGet('uri', $service->getListenerURI());
 
         if ($other) {
+            // TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
             $this->clientError(_('You can use the local subscription!'));
             return;
         }
@@ -96,6 +98,7 @@ class FinishremotesubscribeAction extends Action
             $profile = Profile::staticGet($remote->id);
 
             if ($user->hasBlocked($profile)) {
+                // TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
                 $this->clientError(_('That user has blocked you from subscribing.'));
                 return;
             }
@@ -107,14 +110,17 @@ class FinishremotesubscribeAction extends Action
         } catch (OAuthException $e) {
             if ($e->getMessage() == 'The authorized token does not equal the ' .
                                     'submitted token.') {
+                // TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
                 $this->clientError(_('You are not authorized.'));
                 return;
             } else {
+                // TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
                 $this->clientError(_('Could not convert request token to ' .
                                      'access token.'));
                 return;
             }
         } catch (OMB_RemoteServiceException $e) {
+            // TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
             $this->clientError(_('Remote service uses unknown version of ' .
                                  'OMB protocol.'));
             return;
@@ -135,6 +141,7 @@ class FinishremotesubscribeAction extends Action
                             $service->getServiceURI(OMB_ENDPOINT_UPDATEPROFILE);
 
         if (!$remote->update($orig_remote)) {
+                // TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
                 $this->serverError(_('Error updating remote profile.'));
                 return;
         }
diff --git a/actions/foaf.php b/actions/foaf.php
index 09af7b5026..ceb575c736 100644
--- a/actions/foaf.php
+++ b/actions/foaf.php
@@ -23,6 +23,7 @@ define('LISTENER', 1);
 define('LISTENEE', -1);
 define('BOTH', 0);
 
+// @todo XXX: Documentation missing.
 class FoafAction extends Action
 {
     function isReadOnly($args)
@@ -37,6 +38,7 @@ class FoafAction extends Action
         $nickname_arg = $this->arg('nickname');
 
         if (empty($nickname_arg)) {
+            // TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
             $this->clientError(_('No such user.'), 404);
             return false;
         }
@@ -55,6 +57,7 @@ class FoafAction extends Action
         $this->user = User::staticGet('nickname', $this->nickname);
 
         if (!$this->user) {
+            // TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
             $this->clientError(_('No such user.'), 404);
             return false;
         }
@@ -62,6 +65,7 @@ class FoafAction extends Action
         $this->profile = $this->user->getProfile();
 
         if (!$this->profile) {
+            // TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
             $this->serverError(_('User has no profile.'), 500);
             return false;
         }
@@ -110,7 +114,7 @@ class FoafAction extends Action
         if ($this->profile->bio) {
             $this->element('bio:olb', null, $this->profile->bio);
         }
-        
+
         $location = $this->profile->getLocation();
         if ($location) {
             $attr = array();
@@ -118,7 +122,7 @@ class FoafAction extends Action
                 $attr['rdf:about'] = $location->getRdfURL();
             }
             $location_name = $location->getName();
-            
+
             $this->elementStart('based_near');
             $this->elementStart('geo:SpatialThing', $attr);
             if ($location_name) {
@@ -193,7 +197,7 @@ class FoafAction extends Action
                 $this->element('knows', array('rdf:resource' => $uri));
             }
         }
-        
+
         $this->elementEnd('Agent');
 
 
@@ -239,18 +243,17 @@ class FoafAction extends Action
 
     /**
      * Output FOAF <account> bit for the given profile.
-     * 
+     *
      * @param Profile $profile
      * @param mixed $service Root URL of this StatusNet instance for a local
      *                       user, otherwise null.
      * @param mixed $useruri URI string for the referenced profile..
      * @param boolean $fetchSubscriptions Should we load and list all their subscriptions?
      * @param boolean $isSubscriber if not fetching subs, we can still mark the user as following the current page.
-     * 
+     *
      * @return array if $fetchSubscribers is set, return a list of info on those
      *               subscriptions.
      */
-
     function showMicrobloggingAccount($profile, $service=null, $useruri=null, $fetchSubscriptions=false, $isSubscriber=false)
     {
         $attr = array();
diff --git a/actions/foafgroup.php b/actions/foafgroup.php
index 4db40c28be..9638ea0f34 100644
--- a/actions/foafgroup.php
+++ b/actions/foafgroup.php
@@ -27,6 +27,7 @@
 
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
+// @todo XXX: Documentation missing.
 class FoafGroupAction extends Action
 {
     function isReadOnly($args)
@@ -41,6 +42,7 @@ class FoafGroupAction extends Action
         $nickname_arg = $this->arg('nickname');
 
         if (empty($nickname_arg)) {
+            // TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
             $this->clientError(_('No such group.'), 404);
             return false;
         }
@@ -59,6 +61,7 @@ class FoafGroupAction extends Action
         $local = Local_group::staticGet('nickname', $this->nickname);
 
         if (!$local) {
+            // TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
             $this->clientError(_('No such group.'), 404);
             return false;
         }
@@ -66,6 +69,7 @@ class FoafGroupAction extends Action
         $this->group = User_group::staticGet('id', $local->group_id);
 
         if (!$this->group) {
+            // TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
             $this->clientError(_('No such group.'), 404);
             return false;
         }
diff --git a/actions/geocode.php b/actions/geocode.php
index d934930608..123a839f56 100644
--- a/actions/geocode.php
+++ b/actions/geocode.php
@@ -68,7 +68,7 @@ class GeocodeAction extends Action
      *
      * @return nothing
      *
-     **/
+     */
     function handle($args)
     {
         header('Content-Type: application/json; charset=utf-8');
@@ -89,7 +89,6 @@ class GeocodeAction extends Action
      *
      * @return boolean true
      */
-
     function isReadOnly($args)
     {
         return true;
diff --git a/actions/getfile.php b/actions/getfile.php
index 9cbe8e1d99..ad41122503 100644
--- a/actions/getfile.php
+++ b/actions/getfile.php
@@ -47,13 +47,11 @@ require_once 'MIME/Type.php';
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class GetfileAction extends Action
 {
     /**
      * Path of file to return
      */
-
     var $path = null;
 
     /**
@@ -63,7 +61,6 @@ class GetfileAction extends Action
      *
      * @return success flag
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -76,10 +73,12 @@ class GetfileAction extends Action
         }
 
         if (empty($path) or !file_exists($path)) {
+            // TRANS: Client error displayed when requesting a non-existent file.
             $this->clientError(_('No such file.'), 404);
             return false;
         }
         if (!is_readable($path)) {
+            // TRANS: Client error displayed when requesting a file without having read access to it.
             $this->clientError(_('Cannot read file.'), 403);
             return false;
         }
@@ -93,7 +92,6 @@ class GetfileAction extends Action
      *
      * @return boolean true
      */
-
     function isReadOnly($args)
     {
         return true;
@@ -104,7 +102,6 @@ class GetfileAction extends Action
      *
      * @return int last-modified date as unix timestamp
      */
-
     function lastModified()
     {
         if (common_config('site', 'use_x_sendfile')) {
@@ -122,7 +119,6 @@ class GetfileAction extends Action
      *
      * @return string etag http header
      */
-
     function etag()
     {
         if (common_config('site', 'use_x_sendfile')) {
@@ -151,7 +147,6 @@ class GetfileAction extends Action
      *
      * @return void
      */
-
     function handle($args)
     {
         // undo headers set by PHP sessions
diff --git a/actions/grantrole.php b/actions/grantrole.php
index b8b23d02e9..36369a8600 100644
--- a/actions/grantrole.php
+++ b/actions/grantrole.php
@@ -2,7 +2,7 @@
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
- * Action class to sandbox an abusive user
+ * Action class to grant user roles.
  *
  * PHP version 5
  *
@@ -32,7 +32,7 @@ if (!defined('STATUSNET')) {
 }
 
 /**
- * Sandbox a user.
+ * Assign role to user.
  *
  * @category Action
  * @package  StatusNet
@@ -40,7 +40,6 @@ if (!defined('STATUSNET')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
-
 class GrantRoleAction extends ProfileFormAction
 {
     /**
@@ -50,19 +49,20 @@ class GrantRoleAction extends ProfileFormAction
      *
      * @return boolean success flag
      */
-
     function prepare($args)
     {
         if (!parent::prepare($args)) {
             return false;
         }
-        
+
         $this->role = $this->arg('role');
         if (!Profile_role::isValid($this->role)) {
+            // TRANS: Client error displayed when trying to assign an invalid role to a user.
             $this->clientError(_('Invalid role.'));
             return false;
         }
         if (!Profile_role::isSettable($this->role)) {
+            // TRANS: Client error displayed when trying to assign an reserved role to a user.
             $this->clientError(_('This role is reserved and cannot be set.'));
             return false;
         }
@@ -72,6 +72,7 @@ class GrantRoleAction extends ProfileFormAction
         assert(!empty($cur)); // checked by parent
 
         if (!$cur->hasRight(Right::GRANTROLE)) {
+            // TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
             $this->clientError(_('You cannot grant user roles on this site.'));
             return false;
         }
@@ -79,6 +80,7 @@ class GrantRoleAction extends ProfileFormAction
         assert(!empty($this->profile)); // checked by parent
 
         if ($this->profile->hasRole($this->role)) {
+            // TRANS: Client error displayed when trying to assign a role to a user that already has that role.
             $this->clientError(_('User already has this role.'));
             return false;
         }
@@ -91,7 +93,6 @@ class GrantRoleAction extends ProfileFormAction
      *
      * @return void
      */
-
     function handlePost()
     {
         $this->profile->grantRole($this->role);
diff --git a/actions/groupblock.php b/actions/groupblock.php
index 39f783397a..2ac0f633bb 100644
--- a/actions/groupblock.php
+++ b/actions/groupblock.php
@@ -40,7 +40,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
-
 class GroupblockAction extends RedirectingAction
 {
     var $profile = null;
@@ -53,11 +52,11 @@ class GroupblockAction extends RedirectingAction
      *
      * @return boolean success flag
      */
-
     function prepare($args)
     {
         parent::prepare($args);
         if (!common_logged_in()) {
+            // TRANS: Client error displayed trying to block a user from a group while not logged in.
             $this->clientError(_('Not logged in.'));
             return false;
         }
@@ -68,35 +67,42 @@ class GroupblockAction extends RedirectingAction
         }
         $id = $this->trimmed('blockto');
         if (empty($id)) {
+            // TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
             $this->clientError(_('No profile specified.'));
             return false;
         }
         $this->profile = Profile::staticGet('id', $id);
         if (empty($this->profile)) {
+            // TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
             $this->clientError(_('No profile with that ID.'));
             return false;
         }
         $group_id = $this->trimmed('blockgroup');
         if (empty($group_id)) {
+            // TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
             $this->clientError(_('No group specified.'));
             return false;
         }
         $this->group = User_group::staticGet('id', $group_id);
         if (empty($this->group)) {
+            // TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
             $this->clientError(_('No such group.'));
             return false;
         }
         $user = common_current_user();
         if (!$user->isAdmin($this->group)) {
+            // TRANS: Client error displayed trying to block a user from a group while not being an admin user.
             $this->clientError(_('Only an admin can block group members.'), 401);
             return false;
         }
         if (Group_block::isBlocked($this->group, $this->profile)) {
+            // TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
             $this->clientError(_('User is already blocked from group.'));
             return false;
         }
         // XXX: could have proactive blocks, but we don't have UI for it.
         if (!$this->profile->isMember($this->group)) {
+            // TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
             $this->clientError(_('User is not a member of group.'));
             return false;
         }
@@ -131,6 +137,7 @@ class GroupblockAction extends RedirectingAction
     }
 
     function title() {
+        // TRANS: Title for block user from group page.
         return _('Block user from group');
     }
 
@@ -145,7 +152,6 @@ class GroupblockAction extends RedirectingAction
      *
      * @return void
      */
-
     function areYouSureForm()
     {
         $id = $this->profile->id;
@@ -155,8 +161,11 @@ class GroupblockAction extends RedirectingAction
                                            'action' => common_local_url('groupblock')));
         $this->elementStart('fieldset');
         $this->hidden('token', common_session_token());
+        // TRANS: Fieldset legend for block user from group form.
         $this->element('legend', _('Block user'));
         $this->element('p', null,
+                       // 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.
                        sprintf(_('Are you sure you want to block user "%1$s" from the group "%2$s"? '.
                                  'They will be removed from the group, unable to post, and '.
                                  'unable to subscribe to the group in the future.'),
@@ -196,24 +205,24 @@ class GroupblockAction extends RedirectingAction
      *
      * @return void
      */
-
     function blockProfile()
     {
         $block = Group_block::blockProfile($this->group, $this->profile,
                                            common_current_user());
 
         if (empty($block)) {
+            // TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
             $this->serverError(_("Database error blocking user from group."));
             return false;
         }
-        
+
         $this->returnToPrevious();
     }
 
     /**
      * If we reached this form without returnto arguments, default to
      * the top of the group's member list.
-     * 
+     *
      * @return string URL
      */
     function defaultReturnTo()
@@ -227,6 +236,4 @@ class GroupblockAction extends RedirectingAction
         parent::showScripts();
         $this->autofocus('form_action-yes');
     }
-
 }
-
diff --git a/actions/groupbyid.php b/actions/groupbyid.php
index 5af7109cb4..f18e4540c0 100644
--- a/actions/groupbyid.php
+++ b/actions/groupbyid.php
@@ -47,7 +47,6 @@ require_once INSTALLDIR.'/lib/feedlist.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 GroupbyidAction extends Action
 {
     /** group we're viewing. */
@@ -58,7 +57,6 @@ class GroupbyidAction extends Action
      *
      * @return boolean true
      */
-
     function isReadOnly($args)
     {
         return true;
@@ -71,6 +69,7 @@ class GroupbyidAction extends Action
         $id = $this->arg('id');
 
         if (!$id) {
+            // TRANS: Client error displayed referring to a group's permalink without providing a group ID.
             $this->clientError(_('No ID.'));
             return false;
         }
@@ -80,6 +79,7 @@ class GroupbyidAction extends Action
         $this->group = User_group::staticGet('id', $id);
 
         if (!$this->group) {
+            // TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
             $this->clientError(_('No such group.'), 404);
             return false;
         }
@@ -95,9 +95,8 @@ class GroupbyidAction extends Action
      *
      * @return void
      */
-
     function handle($args)
     {
         common_redirect($this->group->homeUrl(), 303);
     }
-}
\ No newline at end of file
+}
diff --git a/actions/groupdesignsettings.php b/actions/groupdesignsettings.php
index 6fd4da2c8e..3ef5e20e44 100644
--- a/actions/groupdesignsettings.php
+++ b/actions/groupdesignsettings.php
@@ -2,7 +2,7 @@
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
- * Change user password
+ * Saves a design for a given group.
  *
  * PHP version 5
  *
@@ -46,7 +46,6 @@ require_once INSTALLDIR . '/lib/designsettings.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 GroupDesignSettingsAction extends DesignSettingsAction
 {
     var $group = null;
@@ -59,12 +58,12 @@ class GroupDesignSettingsAction extends DesignSettingsAction
      *
      * @return boolean true
      */
-
     function prepare($args)
     {
         parent::prepare($args);
 
         if (!common_logged_in()) {
+            // TRANS: Client error displayed trying to change group design settings while not logged in.
             $this->clientError(_('You must be logged in to edit a group.'));
             return false;
         }
@@ -81,6 +80,7 @@ class GroupDesignSettingsAction extends DesignSettingsAction
         }
 
         if (!$nickname) {
+            // TRANS: Client error displayed trying to change group design settings without providing a group nickname.
             $this->clientError(_('No nickname.'), 404);
             return false;
         }
@@ -97,6 +97,7 @@ class GroupDesignSettingsAction extends DesignSettingsAction
         }
 
         if (!$this->group) {
+            // TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
             $this->clientError(_('No such group.'), 404);
             return false;
         }
@@ -104,6 +105,7 @@ class GroupDesignSettingsAction extends DesignSettingsAction
         $cur = common_current_user();
 
         if (!$cur->isAdmin($this->group)) {
+            // TRANS: Client error displayed trying to change group design settings without being a (group) admin.
             $this->clientError(_('You must be an admin to edit the group.'), 403);
             return false;
         }
@@ -122,7 +124,6 @@ class GroupDesignSettingsAction extends DesignSettingsAction
      *
      * @return Design a design object to use
      */
-
     function getDesign()
     {
 
@@ -141,6 +142,7 @@ class GroupDesignSettingsAction extends DesignSettingsAction
 
     function title()
     {
+        // TRANS: Title group design settings page.
         return _('Group design');
     }
 
@@ -149,9 +151,9 @@ class GroupDesignSettingsAction extends DesignSettingsAction
      *
      * @return instructions for use
      */
-
     function getInstructions()
     {
+        // TRANS: Instructions for group design settings page.
         return _('Customize the way your group looks ' .
         'with a background image and a colour palette of your choice.');
     }
@@ -161,7 +163,6 @@ class GroupDesignSettingsAction extends DesignSettingsAction
      *
      * @return nothing
      */
-
     function showLocalNav()
     {
         $nav = new GroupNav($this, $this->group);
@@ -173,7 +174,6 @@ class GroupDesignSettingsAction extends DesignSettingsAction
      *
      * @return Design
      */
-
     function getWorkingDesign()
     {
         $design = null;
@@ -192,7 +192,6 @@ class GroupDesignSettingsAction extends DesignSettingsAction
      *
      * @return void
      */
-
     function showContent()
     {
         $design = $this->getWorkingDesign();
@@ -209,17 +208,14 @@ class GroupDesignSettingsAction extends DesignSettingsAction
      *
      * @return void
      */
-
     function saveDesign()
     {
         try {
-
             $bgcolor = new WebColor($this->trimmed('design_background'));
             $ccolor  = new WebColor($this->trimmed('design_content'));
             $sbcolor = new WebColor($this->trimmed('design_sidebar'));
             $tcolor  = new WebColor($this->trimmed('design_text'));
             $lcolor  = new WebColor($this->trimmed('design_links'));
-
         } catch (WebColorException $e) {
             $this->showForm($e->getMessage());
             return;
@@ -246,7 +242,6 @@ class GroupDesignSettingsAction extends DesignSettingsAction
         $design = $this->group->getDesign();
 
         if (!empty($design)) {
-
             // update design
 
             $original = clone($design);
@@ -263,12 +258,11 @@ class GroupDesignSettingsAction extends DesignSettingsAction
 
             if ($result === false) {
                 common_log_db_error($design, 'UPDATE', __FILE__);
-                $this->showForm(_('Could not update your design.'));
+                // TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
+                $this->showForm(_('Unable to update your design settings.'));
                 return;
             }
-
         } else {
-
             $this->group->query('BEGIN');
 
             // save new design
@@ -287,6 +281,7 @@ class GroupDesignSettingsAction extends DesignSettingsAction
 
             if (empty($id)) {
                 common_log_db_error($id, 'INSERT', __FILE__);
+                // TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
                 $this->showForm(_('Unable to save your design settings.'));
                 return;
             }
@@ -297,18 +292,18 @@ class GroupDesignSettingsAction extends DesignSettingsAction
 
             if (empty($result)) {
                 common_log_db_error($original, 'UPDATE', __FILE__);
+                // TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
                 $this->showForm(_('Unable to save your design settings.'));
                 $this->group->query('ROLLBACK');
                 return;
             }
 
             $this->group->query('COMMIT');
-
         }
 
         $this->saveBackgroundImage($design);
 
+        // TRANS: Form text to confirm saved group design settings.
         $this->showForm(_('Design preferences saved.'), true);
     }
-
 }
diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index d2e8fd0e91..022abb5fe5 100644
--- a/actions/grouplogo.php
+++ b/actions/grouplogo.php
@@ -60,7 +60,6 @@ class GrouplogoAction extends GroupDesignAction
     /**
      * Prepare to run
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -83,7 +82,7 @@ class GrouplogoAction extends GroupDesignAction
         }
 
         if (!$nickname) {
-            // TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+            // TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
             $this->clientError(_('No nickname.'), 404);
             return false;
         }
@@ -247,7 +246,6 @@ class GrouplogoAction extends GroupDesignAction
 
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
-
     }
 
     function showCropForm()
@@ -304,7 +302,6 @@ class GrouplogoAction extends GroupDesignAction
         $this->elementEnd('ul');
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
-
     }
 
     /**
@@ -438,7 +435,6 @@ class GrouplogoAction extends GroupDesignAction
      *
      * @return void
      */
-
     function showStylesheets()
     {
         parent::showStylesheets();
@@ -450,7 +446,6 @@ class GrouplogoAction extends GroupDesignAction
      *
      * @return void
      */
-
     function showScripts()
     {
         parent::showScripts();

From dd5721848f80f4126dc2794099ecae8c42c67e62 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Mon, 31 Jan 2011 17:12:39 +0100
Subject: [PATCH 147/314] * tag i18n issue. * add translator documentation. *
 remove superfluous whitespace.

---
 actions/groupmembers.php | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/actions/groupmembers.php b/actions/groupmembers.php
index d03d0b5a3a..39fea736b2 100644
--- a/actions/groupmembers.php
+++ b/actions/groupmembers.php
@@ -43,7 +43,6 @@ require_once INSTALLDIR.'/lib/publicgroupnav.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 GroupmembersAction extends GroupDesignAction
 {
     var $page = null;
@@ -73,6 +72,7 @@ class GroupmembersAction extends GroupDesignAction
         }
 
         if (!$nickname) {
+            // TRANS: Client error displayed when trying to view group members without providing a group nickname.
             $this->clientError(_('No nickname.'), 404);
             return false;
         }
@@ -80,6 +80,7 @@ class GroupmembersAction extends GroupDesignAction
         $local = Local_group::staticGet('nickname', $nickname);
 
         if (!$local) {
+            // TRANS: Client error displayed when trying to view group members for a non-existing group.
             $this->clientError(_('No such group.'), 404);
             return false;
         }
@@ -87,6 +88,7 @@ class GroupmembersAction extends GroupDesignAction
         $this->group = User_group::staticGet('id', $local->group_id);
 
         if (!$this->group) {
+            // TRANS: Client error displayed when trying to view group members for an object that is not a group.
             $this->clientError(_('No such group.'), 404);
             return false;
         }
@@ -119,6 +121,7 @@ class GroupmembersAction extends GroupDesignAction
     function showPageNotice()
     {
         $this->element('p', 'instructions',
+                       // TRANS: Page notice for group members page.
                        _('A list of the users in this group.'));
     }
 
@@ -180,9 +183,12 @@ class GroupMemberListItem extends ProfileListItem
 
     function showFullName()
     {
+        // @todo FIXME: i18n issue. Message should be "%s (Admin)" instead of patchwork.
         parent::showFullName();
         if ($this->profile->isAdmin($this->group)) {
             $this->out->text(' ');
+            // TRANS: Suffix for group members that are group administrators. Separated from user name with a space.
+            // TRANS: This is a to be addressed i18n issue.
             $this->out->element('span', 'role', _('Admin'));
         }
     }
@@ -254,7 +260,7 @@ class GroupMemberListItem extends ProfileListItem
     /**
      * Fetch necessary return-to arguments for the profile forms
      * to return to this list when they're done.
-     * 
+     *
      * @return array
      */
     protected function returnToArgs()
@@ -281,7 +287,6 @@ class GroupMemberListItem extends ProfileListItem
  *
  * @see      BlockForm
  */
-
 class GroupBlockForm extends Form
 {
     /**
@@ -310,7 +315,6 @@ class GroupBlockForm extends Form
      * @param User_group    $group   group to block user from
      * @param array         $args    return-to args
      */
-
     function __construct($out=null, $profile=null, $group=null, $args=null)
     {
         parent::__construct($out);
@@ -325,7 +329,6 @@ class GroupBlockForm extends Form
      *
      * @return int ID of the form
      */
-
     function id()
     {
         // This should be unique for the page.
@@ -337,7 +340,6 @@ class GroupBlockForm extends Form
      *
      * @return string class of the form
      */
-
     function formClass()
     {
         return 'form_group_block';
@@ -348,7 +350,6 @@ class GroupBlockForm extends Form
      *
      * @return string URL of the action
      */
-
     function action()
     {
         return common_local_url('groupblock');
@@ -361,6 +362,7 @@ class GroupBlockForm extends Form
      */
     function formLegend()
     {
+        // TRANS: Form legend for form to block user from a group.
         $this->out->element('legend', null, _('Block user from group'));
     }
 
@@ -369,7 +371,6 @@ class GroupBlockForm extends Form
      *
      * @return void
      */
-
     function formData()
     {
         $this->out->hidden('blockto-' . $this->profile->id,
@@ -390,7 +391,6 @@ class GroupBlockForm extends Form
      *
      * @return void
      */
-
     function formActions()
     {
         $this->out->submit(
@@ -414,25 +414,21 @@ class GroupBlockForm extends Form
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class MakeAdminForm extends Form
 {
     /**
      * Profile of user to block
      */
-
     var $profile = null;
 
     /**
      * Group to block the user from
      */
-
     var $group = null;
 
     /**
      * Return-to args
      */
-
     var $args = null;
 
     /**
@@ -443,7 +439,6 @@ class MakeAdminForm extends Form
      * @param User_group    $group   group to block user from
      * @param array         $args    return-to args
      */
-
     function __construct($out=null, $profile=null, $group=null, $args=null)
     {
         parent::__construct($out);
@@ -458,7 +453,6 @@ class MakeAdminForm extends Form
      *
      * @return int ID of the form
      */
-
     function id()
     {
         // This should be unique for the page.
@@ -470,7 +464,6 @@ class MakeAdminForm extends Form
      *
      * @return string class of the form
      */
-
     function formClass()
     {
         return 'form_make_admin';
@@ -481,7 +474,6 @@ class MakeAdminForm extends Form
      *
      * @return string URL of the action
      */
-
     function action()
     {
         return common_local_url('makeadmin', array('nickname' => $this->group->nickname));
@@ -492,9 +484,9 @@ class MakeAdminForm extends Form
      *
      * @return void
      */
-
     function formLegend()
     {
+        // TRANS: Form legend for form to make a user a group admin.
         $this->out->element('legend', null, _('Make user an admin of the group'));
     }
 
@@ -503,7 +495,6 @@ class MakeAdminForm extends Form
      *
      * @return void
      */
-
     function formData()
     {
         $this->out->hidden('profileid-' . $this->profile->id,
@@ -524,7 +515,6 @@ class MakeAdminForm extends Form
      *
      * @return void
      */
-
     function formActions()
     {
         $this->out->submit(

From 13991f7eb9c389fccc5fb6c4829d054d8428b42a Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Mon, 31 Jan 2011 18:16:55 +0100
Subject: [PATCH 148/314] * add/update translator documentation. * remove
 superfluous whitespace. * update punctuation on form validation messages. *
 L10n tweaks. * add fixme for missing class documentation.

---
 actions/grouprss.php     |  7 ++-
 actions/groups.php       | 14 ++++--
 actions/groupsearch.php  | 10 ++++-
 actions/groupunblock.php |  1 +
 actions/hcard.php        |  5 ++-
 actions/hostmeta.php     | 12 ++---
 actions/imsettings.php   | 94 ++++++++++++++++++++--------------------
 actions/inbox.php        | 10 ++---
 actions/invite.php       |  3 +-
 9 files changed, 85 insertions(+), 71 deletions(-)

diff --git a/actions/grouprss.php b/actions/grouprss.php
index 98fdea38de..39dcff83d9 100644
--- a/actions/grouprss.php
+++ b/actions/grouprss.php
@@ -45,7 +45,6 @@ define('MEMBERS_PER_SECTION', 27);
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class groupRssAction extends Rss10Action
 {
     /** group we're viewing. */
@@ -56,7 +55,6 @@ class groupRssAction extends Rss10Action
      *
      * @return boolean true
      */
-
     function isReadOnly($args)
     {
         return true;
@@ -71,7 +69,6 @@ class groupRssAction extends Rss10Action
      *
      * @return boolean success flag
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -88,6 +85,7 @@ class groupRssAction extends Rss10Action
         }
 
         if (!$nickname) {
+            // TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
             $this->clientError(_('No nickname.'), 404);
             return false;
         }
@@ -95,6 +93,7 @@ class groupRssAction extends Rss10Action
         $local = Local_group::staticGet('nickname', $nickname);
 
         if (!$local) {
+            // TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
             $this->clientError(_('No such group.'), 404);
             return false;
         }
@@ -102,6 +101,7 @@ class groupRssAction extends Rss10Action
         $this->group = User_group::staticGet('id', $local->group_id);
 
         if (!$this->group) {
+            // TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
             $this->clientError(_('No such group.'), 404);
             return false;
         }
@@ -112,7 +112,6 @@ class groupRssAction extends Rss10Action
 
     function getNotices($limit=0)
     {
-
         $group = $this->group;
 
         if (is_null($group)) {
diff --git a/actions/groups.php b/actions/groups.php
index 8aacff8b0e..958c5921bf 100644
--- a/actions/groups.php
+++ b/actions/groups.php
@@ -45,7 +45,6 @@ require_once INSTALLDIR.'/lib/grouplist.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 GroupsAction extends Action
 {
     var $page = null;
@@ -59,9 +58,12 @@ class GroupsAction extends Action
     function title()
     {
         if ($this->page == 1) {
-            return _("Groups");
+            // TRANS: Title for first page of the groups list.
+            return _m('TITLE',"Groups");
         } else {
-            return sprintf(_("Groups, page %d"), $this->page);
+            // TRANS: Title for all but the first page of the groups list.
+            // TRANS: %d is the page number.
+            return sprintf(_m('TITLE',"Groups, page %d"), $this->page);
         }
     }
 
@@ -87,12 +89,15 @@ class GroupsAction extends Action
     function showPageNotice()
     {
         $notice =
+          // 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).
           sprintf(_('%%%%site.name%%%% groups let you find and talk with ' .
                     'people of similar interests. After you join a group ' .
                     'you can send messages to all other members using the ' .
                     'syntax "!groupname". Don\'t see a group you like? Try ' .
                     '[searching for one](%%%%action.groupsearch%%%%) or ' .
-                    '[start your own!](%%%%action.newgroup%%%%)'));
+                    '[start your own](%%%%action.newgroup%%%%)!'));
         $this->elementStart('div', 'instructions');
         $this->raw(common_markup_to_html($notice));
         $this->elementEnd('div');
@@ -104,6 +109,7 @@ class GroupsAction extends Action
             $this->elementStart('p', array('id' => 'new_group'));
             $this->element('a', array('href' => common_local_url('newgroup'),
                                       'class' => 'more'),
+                           // TRANS: Link to create a new group on the group list page.
                            _('Create a new group'));
             $this->elementEnd('p');
         }
diff --git a/actions/groupsearch.php b/actions/groupsearch.php
index 55f4cee625..fce5c2b16a 100644
--- a/actions/groupsearch.php
+++ b/actions/groupsearch.php
@@ -49,12 +49,14 @@ class GroupsearchAction extends SearchAction
 {
     function getInstructions()
     {
+        // TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
         return _('Search for groups on %%site.name%% by their name, location, or description. ' .
                   'Separate the terms by spaces; they must be 3 characters or more.');
     }
 
     function title()
     {
+        // TRANS: Title for page where groups can be searched.
         return _('Group search');
     }
 
@@ -76,12 +78,17 @@ class GroupsearchAction extends SearchAction
             $this->pagination($page > 1, $cnt > GROUPS_PER_PAGE,
                           $page, 'groupsearch', array('q' => $q));
         } else {
+            // TRANS: Text on page where groups can be searched if no results were found for a query.
             $this->element('p', 'error', _('No results.'));
             $this->searchSuggestions($q);
             if (common_logged_in()) {
-                $message = _('If you can\'t find the group you\'re looking for, you can [create it](%%action.newgroup%%) yourself.');
+                // 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).
+                $message = _('If you cannot find the group you\'re looking for, you can [create it](%%action.newgroup%%) yourself.');
             }
             else {
+                // 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).
                 $message = _('Why not [register an account](%%action.register%%) and [create the group](%%action.newgroup%%) yourself!');
             }
             $this->elementStart('div', 'guide');
@@ -116,4 +123,3 @@ class GroupSearchResults extends GroupList
         return preg_replace($this->pattern, '<strong>\\1</strong>', htmlspecialchars($text));
     }
 }
-
diff --git a/actions/groupunblock.php b/actions/groupunblock.php
index ef2380725e..de0af59821 100644
--- a/actions/groupunblock.php
+++ b/actions/groupunblock.php
@@ -79,6 +79,7 @@ class GroupunblockAction extends Action
         }
         $group_id = $this->trimmed('unblockgroup');
         if (empty($group_id)) {
+            // TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
             $this->clientError(_('No group specified.'));
             return false;
         }
diff --git a/actions/hcard.php b/actions/hcard.php
index 55d0f65c8f..8781f6f882 100644
--- a/actions/hcard.php
+++ b/actions/hcard.php
@@ -40,7 +40,6 @@ if (!defined('STATUSNET')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
  * @link     http://status.net/
  */
-
 class HcardAction extends Action
 {
     var $user;
@@ -64,6 +63,7 @@ class HcardAction extends Action
         $this->user = User::staticGet('nickname', $nickname);
 
         if (!$this->user) {
+            // TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
             $this->clientError(_('No such user.'), 404);
             return false;
         }
@@ -71,6 +71,7 @@ class HcardAction extends Action
         $this->profile = $this->user->getProfile();
 
         if (!$this->profile) {
+            // TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
             $this->serverError(_('User has no profile.'));
             return false;
         }
@@ -117,4 +118,4 @@ class ShortUserProfile extends UserProfile
     {
         return;
     }
-}
\ No newline at end of file
+}
diff --git a/actions/hostmeta.php b/actions/hostmeta.php
index 2587bb6b91..7093a441d7 100644
--- a/actions/hostmeta.php
+++ b/actions/hostmeta.php
@@ -28,9 +28,9 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
+// @todo XXX: Add documentation.
 class HostMetaAction extends Action
 {
-
     /**
      * Is read only?
      *
@@ -51,11 +51,11 @@ class HostMetaAction extends Action
         $xrd->host = $domain;
 
         if(Event::handle('StartHostMetaLinks', array(&$xrd->links))) {
-	    $url = common_local_url('userxrd');
-	    $url.= '?uri={uri}';
-	    $xrd->links[] = array('rel' => Discovery::LRDD_REL,
-				  'template' => $url,
-				  'title' => array('Resource Descriptor'));
+            $url = common_local_url('userxrd');
+            $url.= '?uri={uri}';
+            $xrd->links[] = array('rel' => Discovery::LRDD_REL,
+                                  'template' => $url,
+                                  'title' => array('Resource Descriptor'));
             Event::handle('EndHostMetaLinks', array(&$xrd->links));
         }
 
diff --git a/actions/imsettings.php b/actions/imsettings.php
index dc72290345..eb3f0cfd15 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -54,7 +54,7 @@ class ImsettingsAction extends ConnectSettingsAction
      */
     function title()
     {
-        // TRANS: Title for instance messaging settings.
+        // TRANS: Title for Instant Messaging settings.
         return _('IM settings');
     }
 
@@ -69,7 +69,7 @@ class ImsettingsAction extends ConnectSettingsAction
         // TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
         // TRANS: the order and formatting of link text and link should remain unchanged.
         return _('You can send and receive notices through '.
-                 'Jabber/GTalk [instant messages](%%doc.im%%). '.
+                 'Jabber/Google Talk [instant messages](%%doc.im%%). '.
                  'Configure your address and settings below.');
     }
 
@@ -86,7 +86,7 @@ class ImsettingsAction extends ConnectSettingsAction
     {
         if (!common_config('xmpp', 'enabled')) {
             $this->element('div', array('class' => 'error'),
-                           // TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+                           // TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
                            _('IM is not available.'));
             return;
         }
@@ -98,88 +98,88 @@ class ImsettingsAction extends ConnectSettingsAction
                                           'action' =>
                                           common_local_url('imsettings')));
         $this->elementStart('fieldset', array('id' => 'settings_im_address'));
-        // TRANS: Form legend for IM settings form.
+        // TRANS: Form legend for Instant Messaging settings form.
         $this->element('legend', null, _('IM address'));
         $this->hidden('token', common_session_token());
 
         if ($user->jabber) {
             $this->element('p', 'form_confirmed', $user->jabber);
-            // TRANS: Form note in IM settings form.
+            // TRANS: Form note in Instant Messaging settings form.
             $this->element('p', 'form_note',
-                           _('Current confirmed Jabber/GTalk address.'));
+                           _('Current confirmed Jabber/Google Talk address.'));
             $this->hidden('jabber', $user->jabber);
-            // TRANS: Button label to remove a confirmed IM address.
+            // TRANS: Button label to remove a confirmed Instant Messaging address.
             $this->submit('remove', _m('BUTTON','Remove'));
         } else {
             $confirm = $this->getConfirmation();
             if ($confirm) {
                 $this->element('p', 'form_unconfirmed', $confirm->address);
                 $this->element('p', 'form_note',
-                               // TRANS: Form note in IM settings form.
-                               // TRANS: %s is the IM address set for the site.
+                               // TRANS: Form note in Instant Messaging settings form.
+                               // TRANS: %s is the Instant Messaging address set for the site.
                                sprintf(_('Awaiting confirmation on this address. '.
-                                         'Check your Jabber/GTalk account for a '.
+                                         'Check your Jabber/Google Talk account for a '.
                                          'message with further instructions. '.
                                          '(Did you add %s to your buddy list?)'),
                                        jabber_daemon_address()));
                 $this->hidden('jabber', $confirm->address);
-                // TRANS: Button label to cancel an IM address confirmation procedure.
+                // TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
                 $this->submit('cancel', _m('BUTTON','Cancel'));
             } else {
                 $this->elementStart('ul', 'form_data');
                 $this->elementStart('li');
-                // TRANS: Field label for IM address input in IM settings form.
+                // TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
                 $this->input('jabber', _('IM address'),
                              ($this->arg('jabber')) ? $this->arg('jabber') : null,
-                             // TRANS: IM address input field instructions in IM settings form.
-                             // TRANS: %s is the IM address set for the site.
+                             // 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.
-                             sprintf(_('Jabber or GTalk address, '.
+                             sprintf(_('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 GTalk.'),
+                                       'buddy list in your IM client or on Google Talk.'),
                                      jabber_daemon_address()));
                 $this->elementEnd('li');
                 $this->elementEnd('ul');
-                // TRANS: Button label for adding an IM address in IM settings form.
+                // TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
                 $this->submit('add', _m('BUTTON','Add'));
             }
         }
         $this->elementEnd('fieldset');
 
         $this->elementStart('fieldset', array('id' => 'settings_im_preferences'));
-        // TRANS: Form legend for IM preferences form.
+        // TRANS: Form legend for Instant Messaging preferences form.
         $this->element('legend', null, _('IM preferences'));
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
         $this->checkbox('jabbernotify',
-                        // TRANS: Checkbox label in IM preferences form.
-                        _('Send me notices through Jabber/GTalk.'),
+                        // TRANS: Checkbox label in Instant Messaging preferences form.
+                        _('Send me notices through Jabber/Google Talk.'),
                         $user->jabbernotify);
         $this->elementEnd('li');
         $this->elementStart('li');
         $this->checkbox('updatefrompresence',
-                        // TRANS: Checkbox label in IM preferences form.
-                        _('Post a notice when my Jabber/GTalk status changes.'),
+                        // TRANS: Checkbox label in Instant Messaging preferences form.
+                        _('Post a notice when my Jabber/Google Talk status changes.'),
                         $user->updatefrompresence);
         $this->elementEnd('li');
         $this->elementStart('li');
         $this->checkbox('jabberreplies',
-                        // TRANS: Checkbox label in IM preferences form.
-                        _('Send me replies through Jabber/GTalk '.
+                        // TRANS: Checkbox label in Instant Messaging preferences form.
+                        _('Send me replies through Jabber/Google Talk '.
                           'from people I\'m not subscribed to.'),
                         $user->jabberreplies);
         $this->elementEnd('li');
         $this->elementStart('li');
         $this->checkbox('jabbermicroid',
-                        // TRANS: Checkbox label in IM preferences form.
-                        _('Publish a MicroID for my Jabber/GTalk address.'),
+                        // TRANS: Checkbox label in Instant Messaging preferences form.
+                        _('Publish a MicroID for my Jabber/Google Talk address.'),
                         $user->jabbermicroid);
         $this->elementEnd('li');
         $this->elementEnd('ul');
-        // TRANS: Button label to save IM preferences.
+        // TRANS: Button label to save Instant Messaging preferences.
         $this->submit('save', _m('BUTTON','Save'));
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
@@ -235,7 +235,7 @@ class ImsettingsAction extends ConnectSettingsAction
         } else if ($this->arg('remove')) {
             $this->removeAddress();
         } else {
-            // TRANS: Message given submitting a form with an unknown action in IM settings.
+            // TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
             $this->showForm(_('Unexpected form submission.'));
         }
     }
@@ -272,14 +272,14 @@ class ImsettingsAction extends ConnectSettingsAction
 
         if ($result === false) {
             common_log_db_error($user, 'UPDATE', __FILE__);
-            // TRANS: Server error thrown on database error updating IM preferences.
+            // TRANS: Server error thrown on database error updating Instant Messaging preferences.
             $this->serverError(_('Could not update user.'));
             return;
         }
 
         $user->query('COMMIT');
 
-        // TRANS: Confirmation message for successful IM preferences save.
+        // TRANS: Confirmation message for successful Instant Messaging preferences save.
         $this->showForm(_('Preferences saved.'), true);
     }
 
@@ -300,7 +300,7 @@ class ImsettingsAction extends ConnectSettingsAction
         // Some validation
 
         if (!$jabber) {
-            // TRANS: Message given saving IM address without having provided one.
+            // TRANS: Message given saving Instant Messaging address without having provided one.
             $this->showForm(_('No Jabber ID.'));
             return;
         }
@@ -308,20 +308,20 @@ class ImsettingsAction extends ConnectSettingsAction
         $jabber = jabber_normalize_jid($jabber);
 
         if (!$jabber) {
-            // TRANS: Message given saving IM address that cannot be normalised.
-            $this->showForm(_('Cannot normalize that Jabber ID'));
+            // TRANS: Message given saving Instant Messaging address that cannot be normalised.
+            $this->showForm(_('Cannot normalize that Jabber ID.'));
             return;
         }
         if (!jabber_valid_base_jid($jabber, common_config('email', 'domain_check'))) {
-            // TRANS: Message given saving IM address that not valid.
-            $this->showForm(_('Not a valid Jabber ID'));
+            // TRANS: Message given saving Instant Messaging address that not valid.
+            $this->showForm(_('Not a valid Jabber ID.'));
             return;
         } else if ($user->jabber == $jabber) {
-            // TRANS: Message given saving IM address that is already set.
+            // TRANS: Message given saving Instant Messaging address that is already set.
             $this->showForm(_('That is already your Jabber ID.'));
             return;
         } else if ($this->jabberExists($jabber)) {
-            // TRANS: Message given saving IM address that is already set for another user.
+            // TRANS: Message given saving Instant Messaging address that is already set for another user.
             $this->showForm(_('Jabber ID already belongs to another user.'));
             return;
         }
@@ -339,7 +339,7 @@ class ImsettingsAction extends ConnectSettingsAction
 
         if ($result === false) {
             common_log_db_error($confirm, 'INSERT', __FILE__);
-            // TRANS: Server error thrown on database error adding IM confirmation code.
+            // TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
             $this->serverError(_('Could not insert confirmation code.'));
             return;
         }
@@ -348,8 +348,8 @@ class ImsettingsAction extends ConnectSettingsAction
                                $user->nickname,
                                $jabber);
 
-        // TRANS: Message given saving valid IM address that is to be confirmed.
-        // TRANS: %s is the IM address set for the site.
+        // TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
+        // TRANS: %s is the Instant Messaging address set for the site.
         $msg = sprintf(_('A confirmation code was sent '.
                          'to the IM address you added. '.
                          'You must approve %s for '.
@@ -373,12 +373,12 @@ class ImsettingsAction extends ConnectSettingsAction
         $confirm = $this->getConfirmation();
 
         if (!$confirm) {
-            // TRANS: Message given canceling IM address confirmation that is not pending.
+            // TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
             $this->showForm(_('No pending confirmation to cancel.'));
             return;
         }
         if ($confirm->address != $jabber) {
-            // TRANS: Message given canceling IM address confirmation for the wrong IM address.
+            // TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
             $this->showForm(_('That is the wrong IM address.'));
             return;
         }
@@ -387,12 +387,12 @@ class ImsettingsAction extends ConnectSettingsAction
 
         if (!$result) {
             common_log_db_error($confirm, 'DELETE', __FILE__);
-            // TRANS: Server error thrown on database error canceling IM address confirmation.
+            // TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
             $this->serverError(_('Could not delete IM confirmation.'));
             return;
         }
 
-        // TRANS: Message given after successfully canceling IM address confirmation.
+        // TRANS: Message given after successfully canceling Instant Messaging address confirmation.
         $this->showForm(_('IM confirmation cancelled.'), true);
     }
 
@@ -412,7 +412,7 @@ class ImsettingsAction extends ConnectSettingsAction
         // Maybe an old tab open...?
 
         if ($user->jabber != $jabber) {
-            // TRANS: Message given trying to remove an IM address that is not
+            // TRANS: Message given trying to remove an Instant Messaging address that is not
             // TRANS: registered for the active user.
             $this->showForm(_('That is not your Jabber ID.'));
             return;
@@ -428,7 +428,7 @@ class ImsettingsAction extends ConnectSettingsAction
 
         if (!$result) {
             common_log_db_error($user, 'UPDATE', __FILE__);
-            // TRANS: Server error thrown on database error removing a registered IM address.
+            // TRANS: Server error thrown on database error removing a registered Instant Messaging address.
             $this->serverError(_('Could not update user.'));
             return;
         }
@@ -436,7 +436,7 @@ class ImsettingsAction extends ConnectSettingsAction
 
         // XXX: unsubscribe to the old address
 
-        // TRANS: Message given after successfully removing a registered IM address.
+        // TRANS: Message given after successfully removing a registered Instant Messaging address.
         $this->showForm(_('The IM address was removed.'), true);
     }
 
diff --git a/actions/inbox.php b/actions/inbox.php
index 8330f753ff..3a50f4964f 100644
--- a/actions/inbox.php
+++ b/actions/inbox.php
@@ -43,7 +43,6 @@ require_once INSTALLDIR.'/lib/mailbox.php';
  * @link     http://status.net/
  * @see      MailboxAction
  */
-
 class InboxAction extends MailboxAction
 {
 
@@ -52,13 +51,16 @@ class InboxAction extends MailboxAction
      *
      * @return string page title
      */
-
     function title()
     {
         if ($this->page > 1) {
+            // 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.
             return sprintf(_('Inbox for %1$s - page %2$d'), $this->user->nickname,
                 $this->page);
         } else {
+            // TRANS: Title for the first page of the inbox page.
+            // TRANS: %s is the user's nickname.
             return sprintf(_('Inbox for %s'), $this->user->nickname);
         }
     }
@@ -72,7 +74,6 @@ class InboxAction extends MailboxAction
      *
      * @see MailboxAction::getMessages()
      */
-
     function getMessages()
     {
         $message = new Message();
@@ -98,7 +99,6 @@ class InboxAction extends MailboxAction
      *
      * @return Profile The profile that matches the message
      */
-
     function getMessageProfile($message)
     {
         return $message->getFrom();
@@ -109,9 +109,9 @@ class InboxAction extends MailboxAction
      *
      * @return string localised instructions for using the page
      */
-
     function getInstructions()
     {
+        // TRANS: Instructions for user inbox page.
         return _('This is your inbox, which lists your incoming private messages.');
     }
 }
diff --git a/actions/invite.php b/actions/invite.php
index e9adb3b7f9..a2a0e0714a 100644
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -19,6 +19,7 @@
 
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
+// @todo XXX: Add documentation.
 class InviteAction extends CurrentUserDesignAction
 {
     var $mode = null;
@@ -217,7 +218,7 @@ class InviteAction extends CurrentUserDesignAction
         $this->textarea('addresses', _('Email addresses'),
                         $this->trimmed('addresses'),
                         // TRANS: Tooltip for field label for a list of e-mail addresses.
-                        _('Addresses of friends to invite (one per line)'));
+                        _('Addresses of friends to invite (one per line).'));
         $this->elementEnd('li');
         $this->elementStart('li');
         // TRANS: Field label for a personal message to send to invitees.

From f41dcb644c8e72bd6db33071655a07b21e100ad7 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Mon, 31 Jan 2011 18:43:39 +0100
Subject: [PATCH 149/314] Update translator documentation, remove FIXME and add
 comment.

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

diff --git a/actions/groupmembers.php b/actions/groupmembers.php
index 39fea736b2..7b1512dfab 100644
--- a/actions/groupmembers.php
+++ b/actions/groupmembers.php
@@ -183,12 +183,10 @@ class GroupMemberListItem extends ProfileListItem
 
     function showFullName()
     {
-        // @todo FIXME: i18n issue. Message should be "%s (Admin)" instead of patchwork.
         parent::showFullName();
         if ($this->profile->isAdmin($this->group)) {
-            $this->out->text(' ');
-            // TRANS: Suffix for group members that are group administrators. Separated from user name with a space.
-            // TRANS: This is a to be addressed i18n issue.
+            $this->out->text(' '); // for separating the classes.
+            // TRANS: Indicator in group members list that this user is a group administrator.
             $this->out->element('span', 'role', _('Admin'));
         }
     }

From ca4bf541310eb36fae5a69697bba76a2211218f4 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 31 Jan 2011 13:59:38 -0500
Subject: [PATCH 150/314] add a comment to show runtime at the end of a page

---
 index.php      |  2 ++
 lib/action.php | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/index.php b/index.php
index 6f011e7e5b..37c157b01f 100644
--- a/index.php
+++ b/index.php
@@ -37,6 +37,8 @@
  * @license  GNU Affero General Public License http://www.gnu.org/licenses/
  */
 
+$_startTime = microtime(true);
+
 define('INSTALLDIR', dirname(__FILE__));
 define('STATUSNET', true);
 define('LACONICA', true); // compatibility
diff --git a/lib/action.php b/lib/action.php
index 0e5d7ae361..24d7527196 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -111,6 +111,19 @@ class Action extends HTMLOutputter // lawsuit
         }
     }
 
+    function endHTML()
+    {
+        global $_startTime;
+
+        if (isset($_startTime)) {
+            $endTime = microtime(true);
+            $diff = round(($endTime - $_startTime) * 1000);
+            $this->raw("<!-- ${diff}ms -->");
+        }
+
+        return parent::endHTML();
+    }
+
     /**
      * Show head, a template method.
      *

From b2f4a023774258b13d3db8f537c904b4cfb5bb38 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 31 Jan 2011 11:02:29 -0800
Subject: [PATCH 151/314] Update jquery.form.js to 2.63 -- 2.60 fixed our Opera
 regression per issue #3015

Thanks to the fine folks at http://forum.jquery.com/topic/regression-form-plugin-ajaxform-cannot-access-xml-return-data-in-opera#14737000001950332 :D
---
 js/jquery.form.js     | 94 ++++++++++++++++++++++++++-----------------
 js/jquery.form.min.js |  4 +-
 2 files changed, 58 insertions(+), 40 deletions(-)

diff --git a/js/jquery.form.js b/js/jquery.form.js
index 2b853df428..14e14572af 100644
--- a/js/jquery.form.js
+++ b/js/jquery.form.js
@@ -1,6 +1,6 @@
 /*!
  * jQuery Form Plugin
- * version: 2.49 (18-OCT-2010)
+ * version: 2.63 (29-JAN-2011)
  * @requires jQuery v1.3.2 or later
  *
  * Examples and documentation at: http://malsup.com/jquery/form/
@@ -54,7 +54,8 @@ $.fn.ajaxSubmit = function(options) {
 		options = { success: options };
 	}
 
-	var url = $.trim(this.attr('action'));
+	var action = this.attr('action');
+	var url = (typeof action === 'string') ? $.trim(action) : '';
 	if (url) {
 		// clean url (don't include hash vaue)
 		url = (url.match(/^([^#]+)/)||[])[1];
@@ -63,7 +64,7 @@ $.fn.ajaxSubmit = function(options) {
 
 	options = $.extend(true, {
 		url:  url,
-		type: this.attr('method') || 'GET',
+		type: this[0].getAttribute('method') || 'GET', // IE7 massage (see issue 57)
 		iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank'
 	}, options);
 
@@ -167,7 +168,7 @@ $.fn.ajaxSubmit = function(options) {
 		}
    }
    else {
-	   $.ajax(options);
+		$.ajax(options);
    }
 
 	// fire 'notify' event
@@ -189,15 +190,7 @@ $.fn.ajaxSubmit = function(options) {
 		var s = $.extend(true, {}, $.ajaxSettings, options);
 		s.context = s.context || s;
 		var id = 'jqFormIO' + (new Date().getTime()), fn = '_'+id;
-		window[fn] = function() {
-			var f = $io.data('form-plugin-onload');
-			if (f) {
-				f();
-				window[fn] = undefined;
-				try { delete window[fn]; } catch(e){}
-			}
-		}
-		var $io = $('<iframe id="' + id + '" name="' + id + '" src="'+ s.iframeSrc +'" onload="window[\'_\'+this.id]()" />');
+		var $io = $('<iframe id="' + id + '" name="' + id + '" src="'+ s.iframeSrc +'" />');
 		var io = $io[0];
 
 		$io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
@@ -236,7 +229,6 @@ $.fn.ajaxSubmit = function(options) {
 			return;
 		}
 
-		var cbInvoked = false;
 		var timedOut = 0;
 
 		// add submitting element to data if we know it
@@ -293,7 +285,7 @@ $.fn.ajaxSubmit = function(options) {
 
 				// add iframe to doc and submit the form
 				$io.appendTo('body');
-				$io.data('form-plugin-onload', cb);
+                io.attachEvent ? io.attachEvent('onload', cb) : io.addEventListener('load', cb, false);
 				form.submit();
 			}
 			finally {
@@ -318,20 +310,19 @@ $.fn.ajaxSubmit = function(options) {
 		var data, doc, domCheckCount = 50;
 
 		function cb() {
-			if (cbInvoked) {
+			doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
+			if (!doc || doc.location.href == s.iframeSrc) {
+				// response not received yet
 				return;
 			}
+            io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
 
-			$io.removeData('form-plugin-onload');
-			
 			var ok = true;
 			try {
 				if (timedOut) {
 					throw 'timeout';
 				}
-				// extract the server response from the iframe
-				doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
-				
+
 				var isXml = s.dataType == 'xml' || doc.XMLDocument || $.isXMLDoc(doc);
 				log('isXml='+isXml);
 				if (!isXml && window.opera && (doc.body == null || doc.body.innerHTML == '')) {
@@ -348,8 +339,7 @@ $.fn.ajaxSubmit = function(options) {
 				}
 
 				//log('response detected');
-				cbInvoked = true;
-				xhr.responseText = doc.documentElement ? doc.documentElement.innerHTML : null; 
+				xhr.responseText = doc.body ? doc.body.innerHTML : doc.documentElement ? doc.documentElement.innerHTML : null; 
 				xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
 				xhr.getResponseHeader = function(header){
 					var headers = {'content-type': s.dataType};
@@ -368,7 +358,7 @@ $.fn.ajaxSubmit = function(options) {
 						var pre = doc.getElementsByTagName('pre')[0];
 						var b = doc.getElementsByTagName('body')[0];
 						if (pre) {
-							xhr.responseText = pre.innerHTML;
+							xhr.responseText = pre.textContent;
 						}
 						else if (b) {
 							xhr.responseText = b.innerHTML;
@@ -378,31 +368,35 @@ $.fn.ajaxSubmit = function(options) {
 				else if (s.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
 					xhr.responseXML = toXml(xhr.responseText);
 				}
-				data = $.httpData(xhr, s.dataType);
+				
+				data = httpData(xhr, s.dataType, s);
 			}
 			catch(e){
 				log('error caught:',e);
 				ok = false;
 				xhr.error = e;
-				$.handleError(s, xhr, 'error', e);
+				s.error.call(s.context, xhr, 'error', e);
+				g && $.event.trigger("ajaxError", [xhr, s, e]);
+			}
+			
+			if (xhr.aborted) {
+				log('upload aborted');
+				ok = false;
 			}
 
 			// ordering of these callbacks/triggers is odd, but that's how $.ajax does it
 			if (ok) {
 				s.success.call(s.context, data, 'success', xhr);
-				if (g) {
-					$.event.trigger("ajaxSuccess", [xhr, s]);
-				}
-			}
-			if (g) {
-				$.event.trigger("ajaxComplete", [xhr, s]);
+				g && $.event.trigger("ajaxSuccess", [xhr, s]);
 			}
+			
+			g && $.event.trigger("ajaxComplete", [xhr, s]);
+
 			if (g && ! --$.active) {
 				$.event.trigger("ajaxStop");
 			}
-			if (s.complete) {
-				s.complete.call(s.context, xhr, ok ? 'success' : 'error');
-			}
+			
+			s.complete && s.complete.call(s.context, xhr, ok ? 'success' : 'error');
 
 			// clean up
 			setTimeout(function() {
@@ -412,7 +406,7 @@ $.fn.ajaxSubmit = function(options) {
 			}, 100);
 		}
 
-		function toXml(s, doc) {
+		var toXml = $.parseXML || function(s, doc) { // use parseXML if available (jQuery 1.5+)
 			if (window.ActiveXObject) {
 				doc = new ActiveXObject('Microsoft.XMLDOM');
 				doc.async = 'false';
@@ -421,8 +415,32 @@ $.fn.ajaxSubmit = function(options) {
 			else {
 				doc = (new DOMParser()).parseFromString(s, 'text/xml');
 			}
-			return (doc && doc.documentElement && doc.documentElement.tagName != 'parsererror') ? doc : null;
-		}
+			return (doc && doc.documentElement && doc.documentElement.nodeName != 'parsererror') ? doc : null;
+		};
+		var parseJSON = $.parseJSON || function(s) {
+			return window['eval']('(' + s + ')');
+		};
+		
+		var httpData = function( xhr, type, s ) { // mostly lifted from jq1.4.4
+			var ct = xhr.getResponseHeader('content-type') || '',
+				xml = type === 'xml' || !type && ct.indexOf('xml') >= 0,
+				data = xml ? xhr.responseXML : xhr.responseText;
+
+			if (xml && data.documentElement.nodeName === 'parsererror') {
+				$.error && $.error('parsererror');
+			}
+			if (s && s.dataFilter) {
+				data = s.dataFilter(data, type);
+			}
+			if (typeof data === 'string') {
+				if (type === 'json' || !type && ct.indexOf('json') >= 0) {
+					data = parseJSON(data);
+				} else if (type === "script" || !type && ct.indexOf("javascript") >= 0) {
+					$.globalEval(data);
+				}
+			}
+			return data;
+		};
 	}
 };
 
diff --git a/js/jquery.form.min.js b/js/jquery.form.min.js
index 04c26a6ece..7ecc4ca923 100644
--- a/js/jquery.form.min.js
+++ b/js/jquery.form.min.js
@@ -1,6 +1,6 @@
 /*
  * jQuery Form Plugin
- * version: 2.49 (18-OCT-2010)
+ * version: 2.63 (29-JAN-2011)
  * @requires jQuery v1.3.2 or later
  *
  * Examples and documentation at: http://malsup.com/jquery/form/
@@ -8,4 +8,4 @@
  *   http://www.opensource.org/licenses/mit-license.php
  *   http://www.gnu.org/licenses/gpl.html
  */
-(function(b){b.fn.ajaxSubmit=function(s){if(!this.length){a("ajaxSubmit: skipping submit process - no element selected");return this}if(typeof s=="function"){s={success:s}}var d=b.trim(this.attr("action"));if(d){d=(d.match(/^([^#]+)/)||[])[1]}d=d||window.location.href||"";s=b.extend(true,{url:d,type:this.attr("method")||"GET",iframeSrc:/^https/i.test(window.location.href||"")?"javascript:false":"about:blank"},s);var t={};this.trigger("form-pre-serialize",[this,s,t]);if(t.veto){a("ajaxSubmit: submit vetoed via form-pre-serialize trigger");return this}if(s.beforeSerialize&&s.beforeSerialize(this,s)===false){a("ajaxSubmit: submit aborted via beforeSerialize callback");return this}var f,o,l=this.formToArray(s.semantic);if(s.data){s.extraData=s.data;for(f in s.data){if(s.data[f] instanceof Array){for(var h in s.data[f]){l.push({name:f,value:s.data[f][h]})}}else{o=s.data[f];o=b.isFunction(o)?o():o;l.push({name:f,value:o})}}}if(s.beforeSubmit&&s.beforeSubmit(l,this,s)===false){a("ajaxSubmit: submit aborted via beforeSubmit callback");return this}this.trigger("form-submit-validate",[l,this,s,t]);if(t.veto){a("ajaxSubmit: submit vetoed via form-submit-validate trigger");return this}var c=b.param(l);if(s.type.toUpperCase()=="GET"){s.url+=(s.url.indexOf("?")>=0?"&":"?")+c;s.data=null}else{s.data=c}var r=this,j=[];if(s.resetForm){j.push(function(){r.resetForm()})}if(s.clearForm){j.push(function(){r.clearForm()})}if(!s.dataType&&s.target){var p=s.success||function(){};j.push(function(n){var k=s.replaceTarget?"replaceWith":"html";b(s.target)[k](n).each(p,arguments)})}else{if(s.success){j.push(s.success)}}s.success=function(v,n,w){var u=s.context||s;for(var q=0,k=j.length;q<k;q++){j[q].apply(u,[v,n,w||r,r])}};var g=b("input:file",this).length>0;var e="multipart/form-data";var i=(r.attr("enctype")==e||r.attr("encoding")==e);if(s.iframe!==false&&(g||s.iframe||i)){if(s.closeKeepAlive){b.get(s.closeKeepAlive,m)}else{m()}}else{b.ajax(s)}this.trigger("form-submit-notify",[this,s]);return this;function m(){var k=r[0];if(b(":input[name=submit],:input[id=submit]",k).length){alert('Error: Form elements must not have name or id of "submit".');return}var y=b.extend(true,{},b.ajaxSettings,s);y.context=y.context||y;var B="jqFormIO"+(new Date().getTime()),w="_"+B;window[w]=function(){var n=q.data("form-plugin-onload");if(n){n();window[w]=undefined;try{delete window[w]}catch(K){}}};var q=b('<iframe id="'+B+'" name="'+B+'" src="'+y.iframeSrc+'" onload="window[\'_\'+this.id]()" />');var x=q[0];q.css({position:"absolute",top:"-1000px",left:"-1000px"});var u={aborted:0,responseText:null,responseXML:null,status:0,statusText:"n/a",getAllResponseHeaders:function(){},getResponseHeader:function(){},setRequestHeader:function(){},abort:function(){this.aborted=1;q.attr("src",y.iframeSrc)}};var G=y.global;if(G&&!b.active++){b.event.trigger("ajaxStart")}if(G){b.event.trigger("ajaxSend",[u,y])}if(y.beforeSend&&y.beforeSend.call(y.context,u,y)===false){if(y.global){b.active--}return}if(u.aborted){return}var C=false;var F=0;var v=k.clk;if(v){var D=v.name;if(D&&!v.disabled){y.extraData=y.extraData||{};y.extraData[D]=v.value;if(v.type=="image"){y.extraData[D+".x"]=k.clk_x;y.extraData[D+".y"]=k.clk_y}}}function E(){var M=r.attr("target"),K=r.attr("action");k.setAttribute("target",B);if(k.getAttribute("method")!="POST"){k.setAttribute("method","POST")}if(k.getAttribute("action")!=y.url){k.setAttribute("action",y.url)}if(!y.skipEncodingOverride){r.attr({encoding:"multipart/form-data",enctype:"multipart/form-data"})}if(y.timeout){setTimeout(function(){F=true;A()},y.timeout)}var L=[];try{if(y.extraData){for(var N in y.extraData){L.push(b('<input type="hidden" name="'+N+'" value="'+y.extraData[N]+'" />').appendTo(k)[0])}}q.appendTo("body");q.data("form-plugin-onload",A);k.submit()}finally{k.setAttribute("action",K);if(M){k.setAttribute("target",M)}else{r.removeAttr("target")}b(L).remove()}}if(y.forceSync){E()}else{setTimeout(E,10)}var I,J,H=50;function A(){if(C){return}q.removeData("form-plugin-onload");var L=true;try{if(F){throw"timeout"}J=x.contentWindow?x.contentWindow.document:x.contentDocument?x.contentDocument:x.document;var P=y.dataType=="xml"||J.XMLDocument||b.isXMLDoc(J);a("isXml="+P);if(!P&&window.opera&&(J.body==null||J.body.innerHTML=="")){if(--H){a("requeing onLoad callback, DOM not available");setTimeout(A,250);return}}C=true;u.responseText=J.documentElement?J.documentElement.innerHTML:null;u.responseXML=J.XMLDocument?J.XMLDocument:J;u.getResponseHeader=function(R){var Q={"content-type":y.dataType};return Q[R]};var O=/(json|script)/.test(y.dataType);if(O||y.textarea){var K=J.getElementsByTagName("textarea")[0];if(K){u.responseText=K.value}else{if(O){var N=J.getElementsByTagName("pre")[0];var n=J.getElementsByTagName("body")[0];if(N){u.responseText=N.innerHTML}else{if(n){u.responseText=n.innerHTML}}}}}else{if(y.dataType=="xml"&&!u.responseXML&&u.responseText!=null){u.responseXML=z(u.responseText)}}I=b.httpData(u,y.dataType)}catch(M){a("error caught:",M);L=false;u.error=M;b.handleError(y,u,"error",M)}if(L){y.success.call(y.context,I,"success",u);if(G){b.event.trigger("ajaxSuccess",[u,y])}}if(G){b.event.trigger("ajaxComplete",[u,y])}if(G&&!--b.active){b.event.trigger("ajaxStop")}if(y.complete){y.complete.call(y.context,u,L?"success":"error")}setTimeout(function(){q.removeData("form-plugin-onload");q.remove();u.responseXML=null},100)}function z(n,K){if(window.ActiveXObject){K=new ActiveXObject("Microsoft.XMLDOM");K.async="false";K.loadXML(n)}else{K=(new DOMParser()).parseFromString(n,"text/xml")}return(K&&K.documentElement&&K.documentElement.tagName!="parsererror")?K:null}}};b.fn.ajaxForm=function(c){if(this.length===0){var d={s:this.selector,c:this.context};if(!b.isReady&&d.s){a("DOM not ready, queuing ajaxForm");b(function(){b(d.s,d.c).ajaxForm(c)});return this}a("terminating; zero elements found by selector"+(b.isReady?"":" (DOM not ready)"));return this}return this.ajaxFormUnbind().bind("submit.form-plugin",function(f){if(!f.isDefaultPrevented()){f.preventDefault();b(this).ajaxSubmit(c)}}).bind("click.form-plugin",function(j){var i=j.target;var g=b(i);if(!(g.is(":submit,input:image"))){var f=g.closest(":submit");if(f.length==0){return}i=f[0]}var h=this;h.clk=i;if(i.type=="image"){if(j.offsetX!=undefined){h.clk_x=j.offsetX;h.clk_y=j.offsetY}else{if(typeof b.fn.offset=="function"){var k=g.offset();h.clk_x=j.pageX-k.left;h.clk_y=j.pageY-k.top}else{h.clk_x=j.pageX-i.offsetLeft;h.clk_y=j.pageY-i.offsetTop}}}setTimeout(function(){h.clk=h.clk_x=h.clk_y=null},100)})};b.fn.ajaxFormUnbind=function(){return this.unbind("submit.form-plugin click.form-plugin")};b.fn.formToArray=function(q){var p=[];if(this.length===0){return p}var d=this[0];var g=q?d.getElementsByTagName("*"):d.elements;if(!g){return p}var k,h,f,r,e,m,c;for(k=0,m=g.length;k<m;k++){e=g[k];f=e.name;if(!f){continue}if(q&&d.clk&&e.type=="image"){if(!e.disabled&&d.clk==e){p.push({name:f,value:b(e).val()});p.push({name:f+".x",value:d.clk_x},{name:f+".y",value:d.clk_y})}continue}r=b.fieldValue(e,true);if(r&&r.constructor==Array){for(h=0,c=r.length;h<c;h++){p.push({name:f,value:r[h]})}}else{if(r!==null&&typeof r!="undefined"){p.push({name:f,value:r})}}}if(!q&&d.clk){var l=b(d.clk),o=l[0];f=o.name;if(f&&!o.disabled&&o.type=="image"){p.push({name:f,value:l.val()});p.push({name:f+".x",value:d.clk_x},{name:f+".y",value:d.clk_y})}}return p};b.fn.formSerialize=function(c){return b.param(this.formToArray(c))};b.fn.fieldSerialize=function(d){var c=[];this.each(function(){var h=this.name;if(!h){return}var f=b.fieldValue(this,d);if(f&&f.constructor==Array){for(var g=0,e=f.length;g<e;g++){c.push({name:h,value:f[g]})}}else{if(f!==null&&typeof f!="undefined"){c.push({name:this.name,value:f})}}});return b.param(c)};b.fn.fieldValue=function(h){for(var g=[],e=0,c=this.length;e<c;e++){var f=this[e];var d=b.fieldValue(f,h);if(d===null||typeof d=="undefined"||(d.constructor==Array&&!d.length)){continue}d.constructor==Array?b.merge(g,d):g.push(d)}return g};b.fieldValue=function(c,j){var e=c.name,p=c.type,q=c.tagName.toLowerCase();if(j===undefined){j=true}if(j&&(!e||c.disabled||p=="reset"||p=="button"||(p=="checkbox"||p=="radio")&&!c.checked||(p=="submit"||p=="image")&&c.form&&c.form.clk!=c||q=="select"&&c.selectedIndex==-1)){return null}if(q=="select"){var k=c.selectedIndex;if(k<0){return null}var m=[],d=c.options;var g=(p=="select-one");var l=(g?k+1:d.length);for(var f=(g?k:0);f<l;f++){var h=d[f];if(h.selected){var o=h.value;if(!o){o=(h.attributes&&h.attributes.value&&!(h.attributes.value.specified))?h.text:h.value}if(g){return o}m.push(o)}}return m}return b(c).val()};b.fn.clearForm=function(){return this.each(function(){b("input,select,textarea",this).clearFields()})};b.fn.clearFields=b.fn.clearInputs=function(){return this.each(function(){var d=this.type,c=this.tagName.toLowerCase();if(d=="text"||d=="password"||c=="textarea"){this.value=""}else{if(d=="checkbox"||d=="radio"){this.checked=false}else{if(c=="select"){this.selectedIndex=-1}}}})};b.fn.resetForm=function(){return this.each(function(){if(typeof this.reset=="function"||(typeof this.reset=="object"&&!this.reset.nodeType)){this.reset()}})};b.fn.enable=function(c){if(c===undefined){c=true}return this.each(function(){this.disabled=!c})};b.fn.selected=function(c){if(c===undefined){c=true}return this.each(function(){var d=this.type;if(d=="checkbox"||d=="radio"){this.checked=c}else{if(this.tagName.toLowerCase()=="option"){var e=b(this).parent("select");if(c&&e[0]&&e[0].type=="select-one"){e.find("option").selected(false)}this.selected=c}}})};function a(){if(b.fn.ajaxSubmit.debug){var c="[jquery.form] "+Array.prototype.join.call(arguments,"");if(window.console&&window.console.log){window.console.log(c)}else{if(window.opera&&window.opera.postError){window.opera.postError(c)}}}}})(jQuery);
\ No newline at end of file
+(function(b){b.fn.ajaxSubmit=function(t){if(!this.length){a("ajaxSubmit: skipping submit process - no element selected");return this}if(typeof t=="function"){t={success:t}}var h=this.attr("action");var d=(typeof h==="string")?b.trim(h):"";if(d){d=(d.match(/^([^#]+)/)||[])[1]}d=d||window.location.href||"";t=b.extend(true,{url:d,type:this[0].getAttribute("method")||"GET",iframeSrc:/^https/i.test(window.location.href||"")?"javascript:false":"about:blank"},t);var u={};this.trigger("form-pre-serialize",[this,t,u]);if(u.veto){a("ajaxSubmit: submit vetoed via form-pre-serialize trigger");return this}if(t.beforeSerialize&&t.beforeSerialize(this,t)===false){a("ajaxSubmit: submit aborted via beforeSerialize callback");return this}var f,p,m=this.formToArray(t.semantic);if(t.data){t.extraData=t.data;for(f in t.data){if(t.data[f] instanceof Array){for(var i in t.data[f]){m.push({name:f,value:t.data[f][i]})}}else{p=t.data[f];p=b.isFunction(p)?p():p;m.push({name:f,value:p})}}}if(t.beforeSubmit&&t.beforeSubmit(m,this,t)===false){a("ajaxSubmit: submit aborted via beforeSubmit callback");return this}this.trigger("form-submit-validate",[m,this,t,u]);if(u.veto){a("ajaxSubmit: submit vetoed via form-submit-validate trigger");return this}var c=b.param(m);if(t.type.toUpperCase()=="GET"){t.url+=(t.url.indexOf("?")>=0?"&":"?")+c;t.data=null}else{t.data=c}var s=this,l=[];if(t.resetForm){l.push(function(){s.resetForm()})}if(t.clearForm){l.push(function(){s.clearForm()})}if(!t.dataType&&t.target){var r=t.success||function(){};l.push(function(n){var k=t.replaceTarget?"replaceWith":"html";b(t.target)[k](n).each(r,arguments)})}else{if(t.success){l.push(t.success)}}t.success=function(w,n,x){var v=t.context||t;for(var q=0,k=l.length;q<k;q++){l[q].apply(v,[w,n,x||s,s])}};var g=b("input:file",this).length>0;var e="multipart/form-data";var j=(s.attr("enctype")==e||s.attr("encoding")==e);if(t.iframe!==false&&(g||t.iframe||j)){if(t.closeKeepAlive){b.get(t.closeKeepAlive,o)}else{o()}}else{b.ajax(t)}this.trigger("form-submit-notify",[this,t]);return this;function o(){var v=s[0];if(b(":input[name=submit],:input[id=submit]",v).length){alert('Error: Form elements must not have name or id of "submit".');return}var B=b.extend(true,{},b.ajaxSettings,t);B.context=B.context||B;var E="jqFormIO"+(new Date().getTime()),z="_"+E;var w=b('<iframe id="'+E+'" name="'+E+'" src="'+B.iframeSrc+'" />');var A=w[0];w.css({position:"absolute",top:"-1000px",left:"-1000px"});var x={aborted:0,responseText:null,responseXML:null,status:0,statusText:"n/a",getAllResponseHeaders:function(){},getResponseHeader:function(){},setRequestHeader:function(){},abort:function(){this.aborted=1;w.attr("src",B.iframeSrc)}};var I=B.global;if(I&&!b.active++){b.event.trigger("ajaxStart")}if(I){b.event.trigger("ajaxSend",[x,B])}if(B.beforeSend&&B.beforeSend.call(B.context,x,B)===false){if(B.global){b.active--}return}if(x.aborted){return}var H=0;var y=v.clk;if(y){var F=y.name;if(F&&!y.disabled){B.extraData=B.extraData||{};B.extraData[F]=y.value;if(y.type=="image"){B.extraData[F+".x"]=v.clk_x;B.extraData[F+".y"]=v.clk_y}}}function G(){var O=s.attr("target"),M=s.attr("action");v.setAttribute("target",E);if(v.getAttribute("method")!="POST"){v.setAttribute("method","POST")}if(v.getAttribute("action")!=B.url){v.setAttribute("action",B.url)}if(!B.skipEncodingOverride){s.attr({encoding:"multipart/form-data",enctype:"multipart/form-data"})}if(B.timeout){setTimeout(function(){H=true;D()},B.timeout)}var N=[];try{if(B.extraData){for(var P in B.extraData){N.push(b('<input type="hidden" name="'+P+'" value="'+B.extraData[P]+'" />').appendTo(v)[0])}}w.appendTo("body");A.attachEvent?A.attachEvent("onload",D):A.addEventListener("load",D,false);v.submit()}finally{v.setAttribute("action",M);if(O){v.setAttribute("target",O)}else{s.removeAttr("target")}b(N).remove()}}if(B.forceSync){G()}else{setTimeout(G,10)}var K,L,J=50;function D(){L=A.contentWindow?A.contentWindow.document:A.contentDocument?A.contentDocument:A.document;if(!L||L.location.href==B.iframeSrc){return}A.detachEvent?A.detachEvent("onload",D):A.removeEventListener("load",D,false);var N=true;try{if(H){throw"timeout"}var R=B.dataType=="xml"||L.XMLDocument||b.isXMLDoc(L);a("isXml="+R);if(!R&&window.opera&&(L.body==null||L.body.innerHTML=="")){if(--J){a("requeing onLoad callback, DOM not available");setTimeout(D,250);return}}x.responseText=L.body?L.body.innerHTML:L.documentElement?L.documentElement.innerHTML:null;x.responseXML=L.XMLDocument?L.XMLDocument:L;x.getResponseHeader=function(T){var S={"content-type":B.dataType};return S[T]};var Q=/(json|script)/.test(B.dataType);if(Q||B.textarea){var M=L.getElementsByTagName("textarea")[0];if(M){x.responseText=M.value}else{if(Q){var P=L.getElementsByTagName("pre")[0];var n=L.getElementsByTagName("body")[0];if(P){x.responseText=P.textContent}else{if(n){x.responseText=n.innerHTML}}}}}else{if(B.dataType=="xml"&&!x.responseXML&&x.responseText!=null){x.responseXML=C(x.responseText)}}K=k(x,B.dataType,B)}catch(O){a("error caught:",O);N=false;x.error=O;B.error.call(B.context,x,"error",O);I&&b.event.trigger("ajaxError",[x,B,O])}if(x.aborted){a("upload aborted");N=false}if(N){B.success.call(B.context,K,"success",x);I&&b.event.trigger("ajaxSuccess",[x,B])}I&&b.event.trigger("ajaxComplete",[x,B]);if(I&&!--b.active){b.event.trigger("ajaxStop")}B.complete&&B.complete.call(B.context,x,N?"success":"error");setTimeout(function(){w.removeData("form-plugin-onload");w.remove();x.responseXML=null},100)}var C=b.parseXML||function(n,M){if(window.ActiveXObject){M=new ActiveXObject("Microsoft.XMLDOM");M.async="false";M.loadXML(n)}else{M=(new DOMParser()).parseFromString(n,"text/xml")}return(M&&M.documentElement&&M.documentElement.nodeName!="parsererror")?M:null};var q=b.parseJSON||function(n){return window["eval"]("("+n+")")};var k=function(Q,O,N){var M=Q.getResponseHeader("content-type")||"",n=O==="xml"||!O&&M.indexOf("xml")>=0,P=n?Q.responseXML:Q.responseText;if(n&&P.documentElement.nodeName==="parsererror"){b.error&&b.error("parsererror")}if(N&&N.dataFilter){P=N.dataFilter(P,O)}if(typeof P==="string"){if(O==="json"||!O&&M.indexOf("json")>=0){P=q(P)}else{if(O==="script"||!O&&M.indexOf("javascript")>=0){b.globalEval(P)}}}return P}}};b.fn.ajaxForm=function(c){if(this.length===0){var d={s:this.selector,c:this.context};if(!b.isReady&&d.s){a("DOM not ready, queuing ajaxForm");b(function(){b(d.s,d.c).ajaxForm(c)});return this}a("terminating; zero elements found by selector"+(b.isReady?"":" (DOM not ready)"));return this}return this.ajaxFormUnbind().bind("submit.form-plugin",function(f){if(!f.isDefaultPrevented()){f.preventDefault();b(this).ajaxSubmit(c)}}).bind("click.form-plugin",function(j){var i=j.target;var g=b(i);if(!(g.is(":submit,input:image"))){var f=g.closest(":submit");if(f.length==0){return}i=f[0]}var h=this;h.clk=i;if(i.type=="image"){if(j.offsetX!=undefined){h.clk_x=j.offsetX;h.clk_y=j.offsetY}else{if(typeof b.fn.offset=="function"){var k=g.offset();h.clk_x=j.pageX-k.left;h.clk_y=j.pageY-k.top}else{h.clk_x=j.pageX-i.offsetLeft;h.clk_y=j.pageY-i.offsetTop}}}setTimeout(function(){h.clk=h.clk_x=h.clk_y=null},100)})};b.fn.ajaxFormUnbind=function(){return this.unbind("submit.form-plugin click.form-plugin")};b.fn.formToArray=function(q){var p=[];if(this.length===0){return p}var d=this[0];var g=q?d.getElementsByTagName("*"):d.elements;if(!g){return p}var k,h,f,r,e,m,c;for(k=0,m=g.length;k<m;k++){e=g[k];f=e.name;if(!f){continue}if(q&&d.clk&&e.type=="image"){if(!e.disabled&&d.clk==e){p.push({name:f,value:b(e).val()});p.push({name:f+".x",value:d.clk_x},{name:f+".y",value:d.clk_y})}continue}r=b.fieldValue(e,true);if(r&&r.constructor==Array){for(h=0,c=r.length;h<c;h++){p.push({name:f,value:r[h]})}}else{if(r!==null&&typeof r!="undefined"){p.push({name:f,value:r})}}}if(!q&&d.clk){var l=b(d.clk),o=l[0];f=o.name;if(f&&!o.disabled&&o.type=="image"){p.push({name:f,value:l.val()});p.push({name:f+".x",value:d.clk_x},{name:f+".y",value:d.clk_y})}}return p};b.fn.formSerialize=function(c){return b.param(this.formToArray(c))};b.fn.fieldSerialize=function(d){var c=[];this.each(function(){var h=this.name;if(!h){return}var f=b.fieldValue(this,d);if(f&&f.constructor==Array){for(var g=0,e=f.length;g<e;g++){c.push({name:h,value:f[g]})}}else{if(f!==null&&typeof f!="undefined"){c.push({name:this.name,value:f})}}});return b.param(c)};b.fn.fieldValue=function(h){for(var g=[],e=0,c=this.length;e<c;e++){var f=this[e];var d=b.fieldValue(f,h);if(d===null||typeof d=="undefined"||(d.constructor==Array&&!d.length)){continue}d.constructor==Array?b.merge(g,d):g.push(d)}return g};b.fieldValue=function(c,j){var e=c.name,p=c.type,q=c.tagName.toLowerCase();if(j===undefined){j=true}if(j&&(!e||c.disabled||p=="reset"||p=="button"||(p=="checkbox"||p=="radio")&&!c.checked||(p=="submit"||p=="image")&&c.form&&c.form.clk!=c||q=="select"&&c.selectedIndex==-1)){return null}if(q=="select"){var k=c.selectedIndex;if(k<0){return null}var m=[],d=c.options;var g=(p=="select-one");var l=(g?k+1:d.length);for(var f=(g?k:0);f<l;f++){var h=d[f];if(h.selected){var o=h.value;if(!o){o=(h.attributes&&h.attributes.value&&!(h.attributes.value.specified))?h.text:h.value}if(g){return o}m.push(o)}}return m}return b(c).val()};b.fn.clearForm=function(){return this.each(function(){b("input,select,textarea",this).clearFields()})};b.fn.clearFields=b.fn.clearInputs=function(){return this.each(function(){var d=this.type,c=this.tagName.toLowerCase();if(d=="text"||d=="password"||c=="textarea"){this.value=""}else{if(d=="checkbox"||d=="radio"){this.checked=false}else{if(c=="select"){this.selectedIndex=-1}}}})};b.fn.resetForm=function(){return this.each(function(){if(typeof this.reset=="function"||(typeof this.reset=="object"&&!this.reset.nodeType)){this.reset()}})};b.fn.enable=function(c){if(c===undefined){c=true}return this.each(function(){this.disabled=!c})};b.fn.selected=function(c){if(c===undefined){c=true}return this.each(function(){var d=this.type;if(d=="checkbox"||d=="radio"){this.checked=c}else{if(this.tagName.toLowerCase()=="option"){var e=b(this).parent("select");if(c&&e[0]&&e[0].type=="select-one"){e.find("option").selected(false)}this.selected=c}}})};function a(){if(b.fn.ajaxSubmit.debug){var c="[jquery.form] "+Array.prototype.join.call(arguments,"");if(window.console&&window.console.log){window.console.log(c)}else{if(window.opera&&window.opera.postError){window.opera.postError(c)}}}}})(jQuery);
\ No newline at end of file

From 5b8e74f8d466901d5fd408496f2c5569c6c02f08 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 31 Jan 2011 11:09:20 -0800
Subject: [PATCH 152/314] normalize line endings in shiny/css/display.css

---
 theme/shiny/css/display.css | 48 ++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/theme/shiny/css/display.css b/theme/shiny/css/display.css
index cb4625093a..bf915bf952 100644
--- a/theme/shiny/css/display.css
+++ b/theme/shiny/css/display.css
@@ -292,28 +292,28 @@ h6 {font-size: 1em;}
     margin-left: 1px;
 }
 
-#site_nav_local_views {
-	position: relative;
-	z-index: 9;
+#site_nav_local_views {
+	position: relative;
+	z-index: 9;
 	float: right;
     margin: 0px;
     width: 290px;
-}
-
-#site_nav_local_views li {
-	width: 100%;
-	margin-right: 0;
+}
+
+#site_nav_local_views li {
+	width: 100%;
+	margin-right: 0;
 	margin-bottom: 0px;
 	text-align: right;
 }
 
 #site_nav_local_views a {
     background: url(../images/overlay10.png) repeat-x top left;
-	display:block;
-	padding-right: 10px;
-	border: 1px solid #fff;
-	border-color: transparent;
-	padding-top: 4px;
+	display:block;
+	padding-right: 10px;
+	border: 1px solid #fff;
+	border-color: transparent;
+	padding-top: 4px;
 	padding-bottom: 4px;
 	font-size: 1.1em;
 	font-weight: normal;
@@ -324,17 +324,17 @@ h6 {font-size: 1em;}
 	border-bottom: 1px solid #999;
 	border-left: none;
 	text-shadow: 0px 1px 0px rgba(0,0,0,0.8); 
-	border-radius:0;
-	-moz-border-radius:0;
+	border-radius:0;
+	-moz-border-radius:0;
 	-webkit-border-radius:0;
     text-decoration: none;
 }
 
 #site_nav_local_views li:first-child a {
-	border-top-right-radius:4px;
+	border-top-right-radius:4px;
 	-moz-border-radius-topright:4px;
 	-webkit-border-top-right-radius:4px;
-}
+}
 
 #site_nav_local_views a:hover {
     background: url(../images/overlay20.png) repeat-x top left;
@@ -349,7 +349,7 @@ h6 {font-size: 1em;}
     color: #4d4d4d !important;
     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);
+	-webkit-box-shadow: 1px 1px 1px rgba(0,0,0,0.5);
 	border-bottom: 1px solid #fff;
 	text-shadow: 1px 1px 0px rgba(0,0,0,0.2);
     background-color: #e2e2e2;
@@ -368,7 +368,7 @@ h6 {font-size: 1em;}
 	border-radius: 4px;
 	-moz-border-radius: 4px;
 	-webkit-border-radius: 4px;
-	border-top-right-radius: 0px;
+	border-top-right-radius: 0px;
 	-moz-border-radius-topright: 0px;
 	-webkit-border-top-right-radius: 0px;
     padding: 14px 10px 20px 10px;
@@ -383,7 +383,7 @@ h6 {font-size: 1em;}
     padding-top: 16px;
     padding-left: 10px;
     background-color: #262626;
-	border-bottom-right-radius: 6px;
+	border-bottom-right-radius: 6px;
 	-moz-border-radius-bottomright: 6px;
 	-webkit-border-bottom-right-radius: 6px;
 }
@@ -403,10 +403,10 @@ h6 {font-size: 1em;}
     width: 248px;
 }
 
-#aside_primary .section H2 {
-	font-size: 1.1em;
-	font-weight: normal;
-	letter-spacing: 0.2em;
+#aside_primary .section H2 {
+	font-size: 1.1em;
+	font-weight: normal;
+	letter-spacing: 0.2em;
 	margin-bottom: 10px;
     margin-left: -4px;
 	padding: 6px;

From 54f7154db8146e42dfa557d3d0651fd3255ac380 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 31 Jan 2011 11:45:19 -0800
Subject: [PATCH 153/314] Fix for ticket #3020: set MySQL session time_zone
 variable to UTC ('+0:00') so TIMESTAMP column values are comparable against
 our other UTC timestamp values.

MySQL stores TIMESTAMP columns as UTC, but with a local time interface. (SRSLY?!) DATETIME columns are always bare and assumed to be local time, but we keep only UTC in them.
Forcing the session time_zone to UTC means we won't have to worry as much about what we're sending/receiving in there.

Also will let us remove the hack in master commit a7abb2323e7d57125b9fbc903a1cecc06c27944e for session tweaks
---
 classes/Memcached_DataObject.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index d50b4071d1..a3c2de8e64 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -480,6 +480,10 @@ class Memcached_DataObject extends Safe_DataObject
                     }
                 }
             }
+            // Needed to make timestamp values usefully comparable.
+            if (common_config('db', 'type') == 'mysql') {
+                parent::_query("set time_zone='+0:00'");
+            }
         }
 
         return $result;

From 2a29738dc1240b534c1eb1e60472e42168ee5d05 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 31 Jan 2011 11:50:24 -0800
Subject: [PATCH 154/314] Revert "Session GC fix: save session.modified field
 as UTC so our comparisons work." - no longer needed with ticket #3020 fix to
 time zone settings

This reverts commit a7abb2323e7d57125b9fbc903a1cecc06c27944e.
---
 classes/Session.php   |  2 --
 classes/statusnet.ini | 15 +--------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/classes/Session.php b/classes/Session.php
index b9daf364db..166b89815a 100644
--- a/classes/Session.php
+++ b/classes/Session.php
@@ -87,7 +87,6 @@ class Session extends Memcached_DataObject
             $session->id           = $id;
             $session->session_data = $session_data;
             $session->created      = common_sql_now();
-            $session->modified     = common_sql_now();
 
             $result = $session->insert();
 
@@ -109,7 +108,6 @@ class Session extends Memcached_DataObject
                 $orig = clone($session);
 
                 $session->session_data = $session_data;
-                $session->modified     = common_sql_now();
 
                 $result = $session->update($orig);
 
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 29fde93b5d..ef631e28d3 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -513,20 +513,7 @@ profile_id = K
 id = 130
 session_data = 34
 created = 142
-modified = 142
-; Warning: using DB_DATAOBJECT_MYSQLTIMESTAMP (256) causes DB_DataObject
-; to SILENTLY REMOVE ATTEMPTS TO SET THIS FIELD DIRECTLY, which is pretty
-; bad because the default behavior for auto-updated TIMESTAMP fields is
-; to use local time. Local time can't be compared to UTC in any useful
-; way, so doing that breaks session GC.
-;
-; Instead we'll use the plain datetime settings so it'll actually save the
-; UTC value we provide when updating.
-;
-; Long-term fix: punch MySQL in the face until it understands that local
-; time is a tool of the cyber-devil.
-;
-;modified = 384
+modified = 384
 
 [session__keys]
 id = K

From b896a37da0b2ce78802c3e0007084fe739b2ba0d Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 31 Jan 2011 12:22:50 -0800
Subject: [PATCH 155/314] Use cachedQuery on File::getAttachments, plus other
 cleanups: * dropped unnecessary join on notice table * made the function
 actually static, since it makes no sense as an instance variable. The only
 caller (in AttachmentList) is updated.

---
 classes/File.php       | 18 ++++++++++++------
 lib/attachmentlist.php |  3 +--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/classes/File.php b/classes/File.php
index 29a8f0f1c5..e9a0131c4e 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -55,14 +55,20 @@ class File extends Memcached_DataObject
         return 'http://www.facebook.com/login.php' === $url;
     }
 
-    function getAttachments($post_id) {
-        $query = "select file.* from file join file_to_post on (file_id = file.id) join notice on (post_id = notice.id) where post_id = " . $this->escape($post_id);
-        $this->query($query);
+    /**
+     * Get the attachments for a particlar notice.
+     *
+     * @param int $post_id
+     * @return array of File objects
+     */
+    static function getAttachments($post_id) {
+        $file = new File();
+        $query = "select file.* from file join file_to_post on (file_id = file.id) where post_id = " . $file->escape($post_id);
+        $file = Memcached_DataObject::cachedQuery('File', $query);
         $att = array();
-        while ($this->fetch()) {
-            $att[] = clone($this);
+        while ($file->fetch()) {
+            $att[] = clone($file);
         }
-        $this->free();
         return $att;
     }
 
diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index 7e536925bf..c3d3f4d116 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -76,8 +76,7 @@ class AttachmentList extends Widget
      */
     function show()
     {
-        $atts = new File;
-        $att = $atts->getAttachments($this->notice->id);
+        $att = File::getAttachments($this->notice->id);
         if (empty($att)) return 0;
         $this->showListStart();
 

From de7726dd0037ea3cee91bf64162fc8b19853ec7a Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 31 Jan 2011 13:12:56 -0800
Subject: [PATCH 156/314] Performance counters: records number of total and
 unique cache get/set/incr/deletes and queries, and logs to syslog.

$config['site']['logperf'] = true; // to record & dump total hits of each type and the runtime to syslog
$config['site']['logperf_detail'] = true; // very verbose -- dump the individual cache keys and queries as they get used (may contain private info in some queries)

Seeing 180 cache gets on a timeline page seems not unusual currently; since these run in serial, even relatively small roundtrip times can add up heavily.
We should consider ways to reduce the number of round trips, such as more frequently storing compound objects or the output of processing in memcached.
Doing parallel multi-key lookups could also help by collapsing round-trip times, but might not be easy to fit into SN's object model. (For things like streams this should actually work pretty well -- grab the list, then when it's returned go grab all the individual items in parallel and return the list)
---
 classes/Memcached_DataObject.php |  1 +
 index.php                        |  3 +++
 lib/cache.php                    |  4 ++++
 lib/default.php                  |  2 ++
 lib/util.php                     | 37 ++++++++++++++++++++++++++++++++
 5 files changed, 47 insertions(+)

diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index a3c2de8e64..867b40cf3c 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -340,6 +340,7 @@ class Memcached_DataObject extends Safe_DataObject
         $start = microtime(true);
         $result = null;
         if (Event::handle('StartDBQuery', array($this, $string, &$result))) {
+            common_perf_counter('query', $string);
             $result = parent::_query($string);
             Event::handle('EndDBQuery', array($this, $string, &$result));
         }
diff --git a/index.php b/index.php
index 37c157b01f..7f2afffb5a 100644
--- a/index.php
+++ b/index.php
@@ -38,6 +38,7 @@
  */
 
 $_startTime = microtime(true);
+$_perfCounters = array();
 
 define('INSTALLDIR', dirname(__FILE__));
 define('STATUSNET', true);
@@ -45,6 +46,8 @@ define('LACONICA', true); // compatibility
 
 require_once INSTALLDIR . '/lib/common.php';
 
+register_shutdown_function('common_log_perf_counters');
+
 $user = null;
 $action = null;
 
diff --git a/lib/cache.php b/lib/cache.php
index dc667654ab..bf0603c62d 100644
--- a/lib/cache.php
+++ b/lib/cache.php
@@ -164,6 +164,7 @@ class Cache
     {
         $value = false;
 
+        common_perf_counter('Cache::get', $key);
         if (Event::handle('StartCacheGet', array(&$key, &$value))) {
             if (array_key_exists($key, $this->_items)) {
                 $value = unserialize($this->_items[$key]);
@@ -188,6 +189,7 @@ class Cache
     {
         $success = false;
 
+        common_perf_counter('Cache::set', $key);
         if (Event::handle('StartCacheSet', array(&$key, &$value, &$flag,
                                                  &$expiry, &$success))) {
 
@@ -214,6 +216,7 @@ class Cache
     function increment($key, $step=1)
     {
         $value = false;
+        common_perf_counter('Cache::increment', $key);
         if (Event::handle('StartCacheIncrement', array(&$key, &$step, &$value))) {
             // Fallback is not guaranteed to be atomic,
             // and may original expiry value.
@@ -239,6 +242,7 @@ class Cache
     {
         $success = false;
 
+        common_perf_counter('Cache::delete', $key);
         if (Event::handle('StartCacheDelete', array(&$key, &$success))) {
             if (array_key_exists($key, $this->_items)) {
                 unset($this->_items[$key]);
diff --git a/lib/default.php b/lib/default.php
index 405213fbea..2ddc47bd17 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -39,6 +39,8 @@ $default =
               'logo' => null,
               'ssllogo' => null,
               'logdebug' => false,
+              'logperf' => false, // Enable to dump performance counters to syslog
+              'logperf_detail' => false, // Enable to dump every counter hit
               'fancy' => false,
               'locale_path' => INSTALLDIR.'/locale',
               'language' => 'en',
diff --git a/lib/util.php b/lib/util.php
index da36121ffd..85f49e4c59 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -2184,3 +2184,40 @@ function common_nicknamize($str)
     $str = preg_replace('/\W/', '', $str);
     return strtolower($str);
 }
+
+function common_perf_counter($key, $val=null)
+{
+    global $_perfCounters;
+    if (isset($_perfCounters)) {
+        if (common_config('site', 'logperf')) {
+            if (array_key_exists($key, $_perfCounters)) {
+                $_perfCounters[$key][] = $val;
+            } else {
+                $_perfCounters[$key] = array($val);
+            }
+            if (common_config('site', 'logperf_detail')) {
+                common_log(LOG_DEBUG, "PERF COUNTER HIT: $key $val");
+            }
+        }
+    }
+}
+
+function common_log_perf_counters()
+{
+    if (common_config('site', 'logperf')) {
+        global $_startTime, $_perfCounters;
+
+        if (isset($_startTime)) {
+            $endTime = microtime(true);
+            $diff = round(($endTime - $_startTime) * 1000);
+            common_log(LOG_DEBUG, "PERF runtime: ${diff}ms");
+        }
+        $counters = $_perfCounters;
+        ksort($counters);
+        foreach ($counters as $key => $values) {
+            $count = count($values);
+            $unique = count(array_unique($values));
+            common_log(LOG_DEBUG, "PERF COUNTER: $key $count ($unique unique)");
+        }
+    }
+}

From b46ce3b67d189d729a4a7679dfb6d6434190d392 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 31 Jan 2011 14:00:22 -0800
Subject: [PATCH 157/314] Fix "$s"s that slipped into double-quoted
 translatable strings' '%1$s' pattern. Switch to single-quote to fix.

---
 actions/atompubfavoritefeed.php     | 2 +-
 actions/atompubmembershipfeed.php   | 2 +-
 actions/atompubsubscriptionfeed.php | 2 +-
 lib/activityimporter.php            | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/actions/atompubfavoritefeed.php b/actions/atompubfavoritefeed.php
index d35bd9f53e..c31fcbd72a 100644
--- a/actions/atompubfavoritefeed.php
+++ b/actions/atompubfavoritefeed.php
@@ -144,7 +144,7 @@ class AtompubfavoritefeedAction extends ApiAuthAction
 
         // TRANS: Subtitle for Atom favorites feed.
         // TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-        $feed->setSubtitle(sprintf(_("Notices %1$s has favorited on %2$s"),
+        $feed->setSubtitle(sprintf(_('Notices %1$s has favorited on %2$s'),
                                    $this->_profile->getBestName(),
                                    common_config('site', 'name')));
 
diff --git a/actions/atompubmembershipfeed.php b/actions/atompubmembershipfeed.php
index 57cf465a0c..b52583314d 100644
--- a/actions/atompubmembershipfeed.php
+++ b/actions/atompubmembershipfeed.php
@@ -146,7 +146,7 @@ class AtompubmembershipfeedAction extends ApiAuthAction
 
         // TRANS: Subtitle for group membership feed.
         // TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-        $feed->setSubtitle(sprintf(_("Groups %1$s is a member of on %2$s"),
+        $feed->setSubtitle(sprintf(_('Groups %1$s is a member of on %2$s'),
                                    $this->_profile->getBestName(),
                                    common_config('site', 'name')));
 
diff --git a/actions/atompubsubscriptionfeed.php b/actions/atompubsubscriptionfeed.php
index 1b22efeac3..26740da835 100644
--- a/actions/atompubsubscriptionfeed.php
+++ b/actions/atompubsubscriptionfeed.php
@@ -150,7 +150,7 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction
 
         // TRANS: Subtitle for Atom subscription feed.
         // TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-        $feed->setSubtitle(sprintf(_("People %1$s has subscribed to on %2$s"),
+        $feed->setSubtitle(sprintf(_("People %1\$s has subscribed to on %2\$s"),
                                    $this->_profile->getBestName(),
                                    common_config('site', 'name')));
 
diff --git a/lib/activityimporter.php b/lib/activityimporter.php
index 0bd7620da3..aa9b95e084 100644
--- a/lib/activityimporter.php
+++ b/lib/activityimporter.php
@@ -198,8 +198,8 @@ class ActivityImporter extends QueueHandler
                 } else {
                     // 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.
-                    throw new ClientException(sprintf(_("Already know about notice %1$s and ".
-                                                        " it has a different author %2$s."),
+                    throw new ClientException(sprintf(_('Already know about notice %1$s and '.
+                                                        ' it has a different author %2$s.'),
                                                       $sourceUri, $uri));
                 }
             } else {

From 1e746da54514d5a062f8e308b8d752c32b60b662 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 31 Jan 2011 14:00:22 -0800
Subject: [PATCH 158/314] Fix "$s"s that slipped into double-quoted
 translatable strings' '%1$s' pattern. Switch to single-quote to fix.

---
 actions/atompubfavoritefeed.php     | 2 +-
 actions/atompubmembershipfeed.php   | 2 +-
 actions/atompubsubscriptionfeed.php | 2 +-
 lib/activityimporter.php            | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/actions/atompubfavoritefeed.php b/actions/atompubfavoritefeed.php
index d35bd9f53e..c31fcbd72a 100644
--- a/actions/atompubfavoritefeed.php
+++ b/actions/atompubfavoritefeed.php
@@ -144,7 +144,7 @@ class AtompubfavoritefeedAction extends ApiAuthAction
 
         // TRANS: Subtitle for Atom favorites feed.
         // TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-        $feed->setSubtitle(sprintf(_("Notices %1$s has favorited on %2$s"),
+        $feed->setSubtitle(sprintf(_('Notices %1$s has favorited on %2$s'),
                                    $this->_profile->getBestName(),
                                    common_config('site', 'name')));
 
diff --git a/actions/atompubmembershipfeed.php b/actions/atompubmembershipfeed.php
index 57cf465a0c..b52583314d 100644
--- a/actions/atompubmembershipfeed.php
+++ b/actions/atompubmembershipfeed.php
@@ -146,7 +146,7 @@ class AtompubmembershipfeedAction extends ApiAuthAction
 
         // TRANS: Subtitle for group membership feed.
         // TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-        $feed->setSubtitle(sprintf(_("Groups %1$s is a member of on %2$s"),
+        $feed->setSubtitle(sprintf(_('Groups %1$s is a member of on %2$s'),
                                    $this->_profile->getBestName(),
                                    common_config('site', 'name')));
 
diff --git a/actions/atompubsubscriptionfeed.php b/actions/atompubsubscriptionfeed.php
index 1b22efeac3..26740da835 100644
--- a/actions/atompubsubscriptionfeed.php
+++ b/actions/atompubsubscriptionfeed.php
@@ -150,7 +150,7 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction
 
         // TRANS: Subtitle for Atom subscription feed.
         // TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-        $feed->setSubtitle(sprintf(_("People %1$s has subscribed to on %2$s"),
+        $feed->setSubtitle(sprintf(_("People %1\$s has subscribed to on %2\$s"),
                                    $this->_profile->getBestName(),
                                    common_config('site', 'name')));
 
diff --git a/lib/activityimporter.php b/lib/activityimporter.php
index 0bd7620da3..aa9b95e084 100644
--- a/lib/activityimporter.php
+++ b/lib/activityimporter.php
@@ -198,8 +198,8 @@ class ActivityImporter extends QueueHandler
                 } else {
                     // 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.
-                    throw new ClientException(sprintf(_("Already know about notice %1$s and ".
-                                                        " it has a different author %2$s."),
+                    throw new ClientException(sprintf(_('Already know about notice %1$s and '.
+                                                        ' it has a different author %2$s.'),
                                                       $sourceUri, $uri));
                 }
             } else {

From 7f1b8720887a6e97df15bc761635418c75870711 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 31 Jan 2011 23:42:43 +0000
Subject: [PATCH 159/314] FacebookPlugin: Fix up FBML canvas app so it keeps
 working after Facebook removed Profile Boxes and some API calls it relied
 upon. See: http://developers.facebook.com/roadmap/deprecations

---
 plugins/Facebook/facebookaction.php | 36 +++++++++--------------------
 plugins/Facebook/facebookhome.php   | 34 ++++-----------------------
 plugins/Facebook/facebookutil.php   | 33 +-------------------------
 3 files changed, 16 insertions(+), 87 deletions(-)

diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php
index 4c15fc0397..1a45033a38 100644
--- a/plugins/Facebook/facebookaction.php
+++ b/plugins/Facebook/facebookaction.php
@@ -81,9 +81,20 @@ class FacebookAction extends Action
 
     function showStylesheets()
     {
+        // Loading CSS via files in Facebook FBML Canvas apps is still busted as of 1/31/11
+        // See: http://bugs.developers.facebook.net/show_bug.cgi?id=10052
         $this->cssLink('css/display.css', 'base');
         $this->cssLink('css/display.css', null, 'screen, projection, tv');
         $this->cssLink('plugins/Facebook/facebookapp.css');
+
+	// Also, Facebook refuses to let me do this... gar!
+/*
+	$baseCss = file_get_contents(INSTALLDIR . '/theme/base/css/display.css');
+	$this->style($baseCss);
+
+        $facebookCss = file_get_contents(INSTALLDIR . '/plugins/Facebook/facebookapp.css');
+        $this->style($facebookCss);
+*/
     }
 
     function showScripts()
@@ -292,31 +303,6 @@ class FacebookAction extends Action
         $this->elementEnd('div');
     }
 
-    function updateProfileBox($notice)
-    {
-
-        // Need to include inline CSS for styling the Profile box
-
-        $app_props = $this->facebook->api_client->Admin_getAppProperties(array('icon_url'));
-        $icon_url = $app_props['icon_url'];
-
-        $style = '<style> .entry-title *, .entry-content * { font-size:14px; font-family:"Lucida Sans Unicode", "Lucida Grande", sans-serif; } .entry-title a, .entry-content a { color:#002E6E; } .entry-title .vcard .photo { float:left; display:inline; margin-right:11px; margin-bottom:11px } .entry-title { margin-bottom:11px; } .entry-title p.entry-content { display:inline; margin-left:5px; } div.entry-content { clear:both; } div.entry-content dl, div.entry-content dt, div.entry-content dd { display:inline; text-transform:lowercase; } div.entry-content dd, div.entry-content .device dt { margin-left:0; margin-right:5px; } div.entry-content dl.timestamp dt, div.entry-content dl.response dt { display:none; } div.entry-content dd a { display:inline-block; } #facebook_statusnet_app { text-indent:-9999px; height:16px; width:16px; display:block; background:url('.$icon_url.') no-repeat 0 0; float:right; } </style>';
-
-        $this->xw->openMemory();
-
-        $item = new FacebookProfileBoxNotice($notice, $this);
-        $item->show();
-
-        $fbml = "<fb:wide>$style " . $this->xw->outputMemory(false) . "</fb:wide>";
-        $fbml .= "<fb:narrow>$style " . $this->xw->outputMemory(false) . "</fb:narrow>";
-
-        $fbml_main = "<fb:narrow>$style " . $this->xw->outputMemory(false) . "</fb:narrow>";
-
-        $this->facebook->api_client->profile_setFBML(null, $this->fbuid, $fbml, null, null, $fbml_main);
-
-        $this->xw->openURI('php://output');
-    }
-
     /**
      * Generate pagination links
      *
diff --git a/plugins/Facebook/facebookhome.php b/plugins/Facebook/facebookhome.php
index 8b8b974458..9b18a695bf 100644
--- a/plugins/Facebook/facebookhome.php
+++ b/plugins/Facebook/facebookhome.php
@@ -44,33 +44,15 @@ class FacebookhomeAction extends FacebookAction
     {
         parent::handle($args);
 
-        // If the user has opted not to initially allow the app to have
-        // Facebook status update permission, store that preference. Only
-        // promt the user the first time she uses the app
-        if ($this->arg('skip') || $args['fb_sig_request_method'] == 'GET') {
-            $this->facebook->api_client->data_setUserPreference(
-                FACEBOOK_PROMPTED_UPDATE_PREF, 'true');
-        }
-
-        if ($this->flink) {
+        if (!empty($this->flink)) {
             $this->user = $this->flink->getUser();
 
             // If this is the first time the user has started the app
             // prompt for Facebook status update permission
             if (!$this->facebook->api_client->users_hasAppPermission('publish_stream')) {
-
-                 if ($this->facebook->api_client->data_getUserPreference(
-                    FACEBOOK_PROMPTED_UPDATE_PREF) != 'true') {
-                        $this->getUpdatePermission();
-                        return;
-                 }
-             }
-
-             // Make sure the user's profile box has the lastest notice
-             $notice = $this->user->getCurrentNotice();
-             if ($notice) {
-                 $this->updateProfileBox($notice);
-             }
+                $this->getUpdatePermission();
+		return;
+            }
 
              if ($this->arg('status_submit') == 'Send') {
                 $this->saveNewNotice();
@@ -114,8 +96,6 @@ class FacebookhomeAction extends FacebookAction
 
                 // XXX: Do some error handling here
 
-                $this->setDefaults();
-
                 $this->getUpdatePermission();
                 return;
             } else {
@@ -127,12 +107,6 @@ class FacebookhomeAction extends FacebookAction
         $this->showFooter();
     }
 
-    function setDefaults()
-    {
-        $this->facebook->api_client->data_setUserPreference(
-            FACEBOOK_PROMPTED_UPDATE_PREF, 'false');
-    }
-
     function showNoticeForm()
     {
         $post_action = "$this->app_uri/index.php";
diff --git a/plugins/Facebook/facebookutil.php b/plugins/Facebook/facebookutil.php
index fb70c51bc5..3996459a63 100644
--- a/plugins/Facebook/facebookutil.php
+++ b/plugins/Facebook/facebookutil.php
@@ -50,6 +50,7 @@ function getFacebook()
 
 function isFacebookBound($notice, $flink) {
     if (empty($flink)) {
+	common_debug("QQQQQ empty flink");
         return false;
     }
 
@@ -157,11 +158,6 @@ function facebookBroadcastNotice($notice)
                 common_log(LOG_WARNING, $msg);
             }
 
-            // Finally, attempt to update the user's profile box
-            if ($canPublish == 1 || $canUpdate == 1) {
-                updateProfileBox($facebook, $flink, $notice, $user);
-            }
-
         } catch (FacebookRestClientException $e) {
             return handleFacebookError($e, $notice, $flink);
         }
@@ -293,33 +289,6 @@ function publishStream($notice, $user, $fbuid)
     );
 }
 
-function updateProfileBox($facebook, $flink, $notice, $user) {
-
-    $facebook = getFacebook();
-    $fbaction = new FacebookAction(
-        $output = 'php://output',
-        $indent = null,
-        $facebook,
-        $flink
-    );
-
-    $fbuid = $flink->foreign_id;
-
-    common_debug(
-          'FacebookPlugin - Attempting to update profile box with '
-          . "content from notice $notice->id for $user->nickname ($user->id), "
-          . "Facebook UID: $fbuid"
-    );
-
-    $fbaction->updateProfileBox($notice);
-
-    common_debug(
-        'FacebookPlugin - finished updating profile box for '
-        . "$user->nickname ($user->id) Facebook UID: $fbuid"
-    );
-
-}
-
 function format_attachments($attachments)
 {
     $fbattachment          = array();

From 071d6e72e0c3c7b1d9fe8d75f30a43831fe54edd Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 31 Jan 2011 23:42:43 +0000
Subject: [PATCH 160/314] FacebookPlugin: Fix up FBML canvas app so it keeps
 working after Facebook removed Profile Boxes and some API calls it relied
 upon. See: http://developers.facebook.com/roadmap/deprecations

---
 plugins/Facebook/facebookaction.php | 36 +++++++++--------------------
 plugins/Facebook/facebookhome.php   | 34 ++++-----------------------
 plugins/Facebook/facebookutil.php   | 33 +-------------------------
 3 files changed, 16 insertions(+), 87 deletions(-)

diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php
index e4edcea0d9..003bf8cd7e 100644
--- a/plugins/Facebook/facebookaction.php
+++ b/plugins/Facebook/facebookaction.php
@@ -81,9 +81,20 @@ class FacebookAction extends Action
 
     function showStylesheets()
     {
+        // Loading CSS via files in Facebook FBML Canvas apps is still busted as of 1/31/11
+        // See: http://bugs.developers.facebook.net/show_bug.cgi?id=10052
         $this->cssLink('css/display.css', 'base');
         $this->cssLink('css/display.css', null, 'screen, projection, tv');
         $this->cssLink('plugins/Facebook/facebookapp.css');
+
+	// Also, Facebook refuses to let me do this... gar!
+/*
+	$baseCss = file_get_contents(INSTALLDIR . '/theme/base/css/display.css');
+	$this->style($baseCss);
+
+        $facebookCss = file_get_contents(INSTALLDIR . '/plugins/Facebook/facebookapp.css');
+        $this->style($facebookCss);
+*/
     }
 
     function showScripts()
@@ -292,31 +303,6 @@ class FacebookAction extends Action
         $this->elementEnd('div');
     }
 
-    function updateProfileBox($notice)
-    {
-
-        // Need to include inline CSS for styling the Profile box
-
-        $app_props = $this->facebook->api_client->Admin_getAppProperties(array('icon_url'));
-        $icon_url = $app_props['icon_url'];
-
-        $style = '<style> .entry-title *, .entry-content * { font-size:14px; font-family:"Lucida Sans Unicode", "Lucida Grande", sans-serif; } .entry-title a, .entry-content a { color:#002E6E; } .entry-title .vcard .photo { float:left; display:inline; margin-right:11px; margin-bottom:11px } .entry-title { margin-bottom:11px; } .entry-title p.entry-content { display:inline; margin-left:5px; } div.entry-content { clear:both; } div.entry-content dl, div.entry-content dt, div.entry-content dd { display:inline; text-transform:lowercase; } div.entry-content dd, div.entry-content .device dt { margin-left:0; margin-right:5px; } div.entry-content dl.timestamp dt, div.entry-content dl.response dt { display:none; } div.entry-content dd a { display:inline-block; } #facebook_statusnet_app { text-indent:-9999px; height:16px; width:16px; display:block; background:url('.$icon_url.') no-repeat 0 0; float:right; } </style>';
-
-        $this->xw->openMemory();
-
-        $item = new FacebookProfileBoxNotice($notice, $this);
-        $item->show();
-
-        $fbml = "<fb:wide>$style " . $this->xw->outputMemory(false) . "</fb:wide>";
-        $fbml .= "<fb:narrow>$style " . $this->xw->outputMemory(false) . "</fb:narrow>";
-
-        $fbml_main = "<fb:narrow>$style " . $this->xw->outputMemory(false) . "</fb:narrow>";
-
-        $this->facebook->api_client->profile_setFBML(null, $this->fbuid, $fbml, null, null, $fbml_main);
-
-        $this->xw->openURI('php://output');
-    }
-
     /**
      * Generate pagination links
      *
diff --git a/plugins/Facebook/facebookhome.php b/plugins/Facebook/facebookhome.php
index 8b8b974458..9b18a695bf 100644
--- a/plugins/Facebook/facebookhome.php
+++ b/plugins/Facebook/facebookhome.php
@@ -44,33 +44,15 @@ class FacebookhomeAction extends FacebookAction
     {
         parent::handle($args);
 
-        // If the user has opted not to initially allow the app to have
-        // Facebook status update permission, store that preference. Only
-        // promt the user the first time she uses the app
-        if ($this->arg('skip') || $args['fb_sig_request_method'] == 'GET') {
-            $this->facebook->api_client->data_setUserPreference(
-                FACEBOOK_PROMPTED_UPDATE_PREF, 'true');
-        }
-
-        if ($this->flink) {
+        if (!empty($this->flink)) {
             $this->user = $this->flink->getUser();
 
             // If this is the first time the user has started the app
             // prompt for Facebook status update permission
             if (!$this->facebook->api_client->users_hasAppPermission('publish_stream')) {
-
-                 if ($this->facebook->api_client->data_getUserPreference(
-                    FACEBOOK_PROMPTED_UPDATE_PREF) != 'true') {
-                        $this->getUpdatePermission();
-                        return;
-                 }
-             }
-
-             // Make sure the user's profile box has the lastest notice
-             $notice = $this->user->getCurrentNotice();
-             if ($notice) {
-                 $this->updateProfileBox($notice);
-             }
+                $this->getUpdatePermission();
+		return;
+            }
 
              if ($this->arg('status_submit') == 'Send') {
                 $this->saveNewNotice();
@@ -114,8 +96,6 @@ class FacebookhomeAction extends FacebookAction
 
                 // XXX: Do some error handling here
 
-                $this->setDefaults();
-
                 $this->getUpdatePermission();
                 return;
             } else {
@@ -127,12 +107,6 @@ class FacebookhomeAction extends FacebookAction
         $this->showFooter();
     }
 
-    function setDefaults()
-    {
-        $this->facebook->api_client->data_setUserPreference(
-            FACEBOOK_PROMPTED_UPDATE_PREF, 'false');
-    }
-
     function showNoticeForm()
     {
         $post_action = "$this->app_uri/index.php";
diff --git a/plugins/Facebook/facebookutil.php b/plugins/Facebook/facebookutil.php
index fb70c51bc5..3996459a63 100644
--- a/plugins/Facebook/facebookutil.php
+++ b/plugins/Facebook/facebookutil.php
@@ -50,6 +50,7 @@ function getFacebook()
 
 function isFacebookBound($notice, $flink) {
     if (empty($flink)) {
+	common_debug("QQQQQ empty flink");
         return false;
     }
 
@@ -157,11 +158,6 @@ function facebookBroadcastNotice($notice)
                 common_log(LOG_WARNING, $msg);
             }
 
-            // Finally, attempt to update the user's profile box
-            if ($canPublish == 1 || $canUpdate == 1) {
-                updateProfileBox($facebook, $flink, $notice, $user);
-            }
-
         } catch (FacebookRestClientException $e) {
             return handleFacebookError($e, $notice, $flink);
         }
@@ -293,33 +289,6 @@ function publishStream($notice, $user, $fbuid)
     );
 }
 
-function updateProfileBox($facebook, $flink, $notice, $user) {
-
-    $facebook = getFacebook();
-    $fbaction = new FacebookAction(
-        $output = 'php://output',
-        $indent = null,
-        $facebook,
-        $flink
-    );
-
-    $fbuid = $flink->foreign_id;
-
-    common_debug(
-          'FacebookPlugin - Attempting to update profile box with '
-          . "content from notice $notice->id for $user->nickname ($user->id), "
-          . "Facebook UID: $fbuid"
-    );
-
-    $fbaction->updateProfileBox($notice);
-
-    common_debug(
-        'FacebookPlugin - finished updating profile box for '
-        . "$user->nickname ($user->id) Facebook UID: $fbuid"
-    );
-
-}
-
 function format_attachments($attachments)
 {
     $fbattachment          = array();

From ad12384d8c021c31f91060ccbc4f91eda9d33f02 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 31 Jan 2011 23:42:43 +0000
Subject: [PATCH 161/314] FacebookPlugin: Fix up FBML canvas app so it keeps
 working after Facebook removed Profile Boxes and some API calls it relied
 upon. See: http://developers.facebook.com/roadmap/deprecations

---
 plugins/Facebook/facebookaction.php | 36 +++++++++--------------------
 plugins/Facebook/facebookhome.php   | 34 ++++-----------------------
 plugins/Facebook/facebookutil.php   | 33 +-------------------------
 3 files changed, 16 insertions(+), 87 deletions(-)

diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php
index e4edcea0d9..003bf8cd7e 100644
--- a/plugins/Facebook/facebookaction.php
+++ b/plugins/Facebook/facebookaction.php
@@ -81,9 +81,20 @@ class FacebookAction extends Action
 
     function showStylesheets()
     {
+        // Loading CSS via files in Facebook FBML Canvas apps is still busted as of 1/31/11
+        // See: http://bugs.developers.facebook.net/show_bug.cgi?id=10052
         $this->cssLink('css/display.css', 'base');
         $this->cssLink('css/display.css', null, 'screen, projection, tv');
         $this->cssLink('plugins/Facebook/facebookapp.css');
+
+	// Also, Facebook refuses to let me do this... gar!
+/*
+	$baseCss = file_get_contents(INSTALLDIR . '/theme/base/css/display.css');
+	$this->style($baseCss);
+
+        $facebookCss = file_get_contents(INSTALLDIR . '/plugins/Facebook/facebookapp.css');
+        $this->style($facebookCss);
+*/
     }
 
     function showScripts()
@@ -292,31 +303,6 @@ class FacebookAction extends Action
         $this->elementEnd('div');
     }
 
-    function updateProfileBox($notice)
-    {
-
-        // Need to include inline CSS for styling the Profile box
-
-        $app_props = $this->facebook->api_client->Admin_getAppProperties(array('icon_url'));
-        $icon_url = $app_props['icon_url'];
-
-        $style = '<style> .entry-title *, .entry-content * { font-size:14px; font-family:"Lucida Sans Unicode", "Lucida Grande", sans-serif; } .entry-title a, .entry-content a { color:#002E6E; } .entry-title .vcard .photo { float:left; display:inline; margin-right:11px; margin-bottom:11px } .entry-title { margin-bottom:11px; } .entry-title p.entry-content { display:inline; margin-left:5px; } div.entry-content { clear:both; } div.entry-content dl, div.entry-content dt, div.entry-content dd { display:inline; text-transform:lowercase; } div.entry-content dd, div.entry-content .device dt { margin-left:0; margin-right:5px; } div.entry-content dl.timestamp dt, div.entry-content dl.response dt { display:none; } div.entry-content dd a { display:inline-block; } #facebook_statusnet_app { text-indent:-9999px; height:16px; width:16px; display:block; background:url('.$icon_url.') no-repeat 0 0; float:right; } </style>';
-
-        $this->xw->openMemory();
-
-        $item = new FacebookProfileBoxNotice($notice, $this);
-        $item->show();
-
-        $fbml = "<fb:wide>$style " . $this->xw->outputMemory(false) . "</fb:wide>";
-        $fbml .= "<fb:narrow>$style " . $this->xw->outputMemory(false) . "</fb:narrow>";
-
-        $fbml_main = "<fb:narrow>$style " . $this->xw->outputMemory(false) . "</fb:narrow>";
-
-        $this->facebook->api_client->profile_setFBML(null, $this->fbuid, $fbml, null, null, $fbml_main);
-
-        $this->xw->openURI('php://output');
-    }
-
     /**
      * Generate pagination links
      *
diff --git a/plugins/Facebook/facebookhome.php b/plugins/Facebook/facebookhome.php
index 8b8b974458..9b18a695bf 100644
--- a/plugins/Facebook/facebookhome.php
+++ b/plugins/Facebook/facebookhome.php
@@ -44,33 +44,15 @@ class FacebookhomeAction extends FacebookAction
     {
         parent::handle($args);
 
-        // If the user has opted not to initially allow the app to have
-        // Facebook status update permission, store that preference. Only
-        // promt the user the first time she uses the app
-        if ($this->arg('skip') || $args['fb_sig_request_method'] == 'GET') {
-            $this->facebook->api_client->data_setUserPreference(
-                FACEBOOK_PROMPTED_UPDATE_PREF, 'true');
-        }
-
-        if ($this->flink) {
+        if (!empty($this->flink)) {
             $this->user = $this->flink->getUser();
 
             // If this is the first time the user has started the app
             // prompt for Facebook status update permission
             if (!$this->facebook->api_client->users_hasAppPermission('publish_stream')) {
-
-                 if ($this->facebook->api_client->data_getUserPreference(
-                    FACEBOOK_PROMPTED_UPDATE_PREF) != 'true') {
-                        $this->getUpdatePermission();
-                        return;
-                 }
-             }
-
-             // Make sure the user's profile box has the lastest notice
-             $notice = $this->user->getCurrentNotice();
-             if ($notice) {
-                 $this->updateProfileBox($notice);
-             }
+                $this->getUpdatePermission();
+		return;
+            }
 
              if ($this->arg('status_submit') == 'Send') {
                 $this->saveNewNotice();
@@ -114,8 +96,6 @@ class FacebookhomeAction extends FacebookAction
 
                 // XXX: Do some error handling here
 
-                $this->setDefaults();
-
                 $this->getUpdatePermission();
                 return;
             } else {
@@ -127,12 +107,6 @@ class FacebookhomeAction extends FacebookAction
         $this->showFooter();
     }
 
-    function setDefaults()
-    {
-        $this->facebook->api_client->data_setUserPreference(
-            FACEBOOK_PROMPTED_UPDATE_PREF, 'false');
-    }
-
     function showNoticeForm()
     {
         $post_action = "$this->app_uri/index.php";
diff --git a/plugins/Facebook/facebookutil.php b/plugins/Facebook/facebookutil.php
index fb70c51bc5..3996459a63 100644
--- a/plugins/Facebook/facebookutil.php
+++ b/plugins/Facebook/facebookutil.php
@@ -50,6 +50,7 @@ function getFacebook()
 
 function isFacebookBound($notice, $flink) {
     if (empty($flink)) {
+	common_debug("QQQQQ empty flink");
         return false;
     }
 
@@ -157,11 +158,6 @@ function facebookBroadcastNotice($notice)
                 common_log(LOG_WARNING, $msg);
             }
 
-            // Finally, attempt to update the user's profile box
-            if ($canPublish == 1 || $canUpdate == 1) {
-                updateProfileBox($facebook, $flink, $notice, $user);
-            }
-
         } catch (FacebookRestClientException $e) {
             return handleFacebookError($e, $notice, $flink);
         }
@@ -293,33 +289,6 @@ function publishStream($notice, $user, $fbuid)
     );
 }
 
-function updateProfileBox($facebook, $flink, $notice, $user) {
-
-    $facebook = getFacebook();
-    $fbaction = new FacebookAction(
-        $output = 'php://output',
-        $indent = null,
-        $facebook,
-        $flink
-    );
-
-    $fbuid = $flink->foreign_id;
-
-    common_debug(
-          'FacebookPlugin - Attempting to update profile box with '
-          . "content from notice $notice->id for $user->nickname ($user->id), "
-          . "Facebook UID: $fbuid"
-    );
-
-    $fbaction->updateProfileBox($notice);
-
-    common_debug(
-        'FacebookPlugin - finished updating profile box for '
-        . "$user->nickname ($user->id) Facebook UID: $fbuid"
-    );
-
-}
-
 function format_attachments($attachments)
 {
     $fbattachment          = array();

From c35d8e3a3e98cdbdba4e1f052806ced6acfb9602 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 31 Jan 2011 23:50:22 +0000
Subject: [PATCH 162/314] Remove old Facebook Plugin (use FacebookBridge now)

---
 plugins/Facebook/FBC_XDReceiver.php           |   66 -
 plugins/Facebook/FBConnect.css                |   36 -
 plugins/Facebook/FBConnectAuth.php            |  486 ---
 plugins/Facebook/FBConnectLogin.php           |   74 -
 plugins/Facebook/FBConnectSettings.php        |  203 -
 plugins/Facebook/FacebookPlugin.php           |  599 ---
 plugins/Facebook/README                       |  163 -
 plugins/Facebook/facebook/facebook.php        |  609 ---
 .../Facebook/facebook/facebook_desktop.php    |  104 -
 plugins/Facebook/facebook/facebook_mobile.php |  260 --
 .../facebook/facebookapi_php5_restlib.php     | 3702 -----------------
 .../facebook/jsonwrapper/JSON/JSON.php        |  806 ----
 .../facebook/jsonwrapper/JSON/LICENSE         |   21 -
 .../facebook/jsonwrapper/jsonwrapper.php      |    6 -
 .../jsonwrapper/jsonwrapper_inner.php         |   23 -
 plugins/Facebook/facebookaction.php           |  531 ---
 plugins/Facebook/facebookadminpanel.php       |  212 -
 plugins/Facebook/facebookapp.css              |  115 -
 plugins/Facebook/facebookapp.js               |   33 -
 plugins/Facebook/facebookhome.php             |  246 --
 plugins/Facebook/facebookinvite.php           |  145 -
 plugins/Facebook/facebooklogin.php            |   97 -
 plugins/Facebook/facebooknoticeform.php       |  198 -
 plugins/Facebook/facebookqueuehandler.php     |   51 -
 plugins/Facebook/facebookremove.php           |   73 -
 plugins/Facebook/facebooksettings.php         |  136 -
 plugins/Facebook/facebookutil.php             |  409 --
 plugins/Facebook/fbfavicon.ico                |  Bin 1150 -> 0 bytes
 plugins/Facebook/locale/Facebook.pot          |  535 ---
 .../locale/be-tarask/LC_MESSAGES/Facebook.po  |  562 ---
 .../locale/br/LC_MESSAGES/Facebook.po         |  544 ---
 .../locale/ca/LC_MESSAGES/Facebook.po         |  575 ---
 .../locale/de/LC_MESSAGES/Facebook.po         |  578 ---
 .../locale/es/LC_MESSAGES/Facebook.po         |  563 ---
 .../locale/fr/LC_MESSAGES/Facebook.po         |  581 ---
 .../locale/gl/LC_MESSAGES/Facebook.po         |  545 ---
 .../locale/ia/LC_MESSAGES/Facebook.po         |  572 ---
 .../locale/mk/LC_MESSAGES/Facebook.po         |  568 ---
 .../locale/nb/LC_MESSAGES/Facebook.po         |  540 ---
 .../locale/nl/LC_MESSAGES/Facebook.po         |  578 ---
 .../locale/pt_BR/LC_MESSAGES/Facebook.po      |  544 ---
 .../locale/tl/LC_MESSAGES/Facebook.po         |  583 ---
 .../locale/uk/LC_MESSAGES/Facebook.po         |  573 ---
 .../locale/vi/LC_MESSAGES/Facebook.po         |  540 ---
 .../locale/zh_CN/LC_MESSAGES/Facebook.po      |  556 ---
 45 files changed, 18941 deletions(-)
 delete mode 100644 plugins/Facebook/FBC_XDReceiver.php
 delete mode 100644 plugins/Facebook/FBConnect.css
 delete mode 100644 plugins/Facebook/FBConnectAuth.php
 delete mode 100644 plugins/Facebook/FBConnectLogin.php
 delete mode 100644 plugins/Facebook/FBConnectSettings.php
 delete mode 100644 plugins/Facebook/FacebookPlugin.php
 delete mode 100644 plugins/Facebook/README
 delete mode 100644 plugins/Facebook/facebook/facebook.php
 delete mode 100644 plugins/Facebook/facebook/facebook_desktop.php
 delete mode 100644 plugins/Facebook/facebook/facebook_mobile.php
 delete mode 100755 plugins/Facebook/facebook/facebookapi_php5_restlib.php
 delete mode 100644 plugins/Facebook/facebook/jsonwrapper/JSON/JSON.php
 delete mode 100644 plugins/Facebook/facebook/jsonwrapper/JSON/LICENSE
 delete mode 100644 plugins/Facebook/facebook/jsonwrapper/jsonwrapper.php
 delete mode 100644 plugins/Facebook/facebook/jsonwrapper/jsonwrapper_inner.php
 delete mode 100644 plugins/Facebook/facebookaction.php
 delete mode 100644 plugins/Facebook/facebookadminpanel.php
 delete mode 100644 plugins/Facebook/facebookapp.css
 delete mode 100644 plugins/Facebook/facebookapp.js
 delete mode 100644 plugins/Facebook/facebookhome.php
 delete mode 100644 plugins/Facebook/facebookinvite.php
 delete mode 100644 plugins/Facebook/facebooklogin.php
 delete mode 100644 plugins/Facebook/facebooknoticeform.php
 delete mode 100644 plugins/Facebook/facebookqueuehandler.php
 delete mode 100644 plugins/Facebook/facebookremove.php
 delete mode 100644 plugins/Facebook/facebooksettings.php
 delete mode 100644 plugins/Facebook/facebookutil.php
 delete mode 100644 plugins/Facebook/fbfavicon.ico
 delete mode 100644 plugins/Facebook/locale/Facebook.pot
 delete mode 100644 plugins/Facebook/locale/be-tarask/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/ca/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/vi/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po

diff --git a/plugins/Facebook/FBC_XDReceiver.php b/plugins/Facebook/FBC_XDReceiver.php
deleted file mode 100644
index bf4b59bba1..0000000000
--- a/plugins/Facebook/FBC_XDReceiver.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * @todo Add header and documentation
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-/*
- * Generates the cross domain communication channel file
- * (xd_receiver.html). By generating it we can add some caching
- * instructions.
- *
- * See: http://wiki.developers.facebook.com/index.php/Cross_Domain_Communication_Channel
- */
-class FBC_XDReceiverAction extends Action
-{
-    /**
-     * Do we need to write to the database?
-     *
-     * @return boolean true
-     */
-    function isReadonly()
-    {
-        return true;
-    }
-
-    /**
-     * Handle a request
-     *
-     * @param array $args Arguments from $_REQUEST
-     *
-     * @return void
-     */
-    function handle($args)
-    {
-        // Parent handling, including cache check
-        parent::handle($args);
-        $this->showPage();
-    }
-
-    function showPage()
-    {
-        // cache the xd_receiver
-        header('Cache-Control: max-age=225065900');
-        header('Expires:');
-        header('Pragma:');
-
-        $this->startXML('html');
-
-        $language = $this->getLanguage();
-
-        $this->elementStart('html', array('xmlns' => 'http://www.w3.org/1999/xhtml',
-                                          'xml:lang' => $language,
-                                          'lang' => $language));
-        $this->elementStart('head');
-        $this->element('title', null, 'cross domain receiver page');
-        $this->script('http://static.ak.connect.facebook.com/js/api_lib/v0.4/XdCommReceiver.debug.js');
-        $this->elementEnd('head');
-        $this->elementStart('body');
-        $this->elementEnd('body');
-
-        $this->elementEnd('html');
-    }
-}
diff --git a/plugins/Facebook/FBConnect.css b/plugins/Facebook/FBConnect.css
deleted file mode 100644
index 49217bf13f..0000000000
--- a/plugins/Facebook/FBConnect.css
+++ /dev/null
@@ -1,36 +0,0 @@
-/** Styles for Facebook logo and Facebook user profile avatar.
- *
- * @package   StatusNet
- * @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/
- */
-
-#site_nav_global_primary #nav_fb {
-position:relative;
-margin-left:18px;
-}
-
-#nav_fb #fbc_profile-pic {
-position:absolute;
-top:-3px;
-left:-18px;
-display:inline;
-border:1px solid #3B5998;
-padding:1px;
-}
-
-#nav_fb #fb_favicon {
-position:absolute;
-top:-13px;
-left:-25px;
-display:inline;
-}
-
-#settings_facebook_connect_options legend {
-display:none;
-}
-#form_settings_facebook_connect fieldset fieldset legend {
-display:block;
-}
diff --git a/plugins/Facebook/FBConnectAuth.php b/plugins/Facebook/FBConnectAuth.php
deleted file mode 100644
index 937db56e56..0000000000
--- a/plugins/Facebook/FBConnectAuth.php
+++ /dev/null
@@ -1,486 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Plugin to enable Facebook Connect
- *
- * PHP version 5
- *
- * LICENCE: This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @category  Plugin
- * @package   StatusNet
- * @author    Zach Copley <zach@status.net>
- * @copyright 2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-require_once INSTALLDIR . '/plugins/Facebook/FacebookPlugin.php';
-
-class FBConnectauthAction extends Action
-{
-    var $fbuid      = null;
-    var $fb_fields  = null;
-
-    function prepare($args) {
-        parent::prepare($args);
-
-        $this->fbuid = getFacebook()->get_loggedin_user();
-
-        if ($this->fbuid > 0) {
-            $this->fb_fields = $this->getFacebookFields($this->fbuid,
-                                                        array('first_name', 'last_name', 'name'));
-        } else {
-            list($proxy, $ip) = common_client_ip();
-
-            common_log(LOG_WARNING, 'Facebook Connect Plugin - ' .
-                       "Failed auth attempt, proxy = $proxy, ip = $ip.");
-
-            $this->clientError(_m('You must be logged into Facebook to ' .
-                                  'use Facebook Connect.'));
-        }
-
-        return true;
-    }
-
-    function handle($args)
-    {
-        parent::handle($args);
-
-        if (common_is_real_login()) {
-            // User is already logged in.  Does she already have a linked Facebook acct?
-            $flink = Foreign_link::getByForeignID($this->fbuid, FACEBOOK_CONNECT_SERVICE);
-
-            if (!empty($flink)) {
-                // User already has a linked Facebook account and shouldn't be here
-                common_debug('Facebook Connect Plugin - ' .
-                             'There is already a local user (' . $flink->user_id .
-                             ') linked with this Facebook (' . $this->fbuid . ').');
-
-                // We don't want these cookies
-                getFacebook()->clear_cookie_state();
-
-                $this->clientError(_m('There is already a local user linked with this Facebook account.'));
-            } else {
-
-                // User came from the Facebook connect settings tab, and
-                // probably just wants to link/relink their Facebook account
-                $this->connectUser();
-            }
-
-        } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-
-            $token = $this->trimmed('token');
-            if (!$token || $token != common_session_token()) {
-                $this->showForm(_m('There was a problem with your session token. Try again, please.'));
-                return;
-            }
-            if ($this->arg('create')) {
-                if (!$this->boolean('license')) {
-                    $this->showForm(_m('You can\'t register if you don\'t agree to the license.'),
-                                    $this->trimmed('newname'));
-                    return;
-                }
-                $this->createNewUser();
-            } else if ($this->arg('connect')) {
-                $this->connectNewUser();
-            } else {
-                common_debug('Facebook Connect Plugin - ' .
-                             print_r($this->args, true));
-                $this->showForm(_m('An unknown error has occured.'),
-                                $this->trimmed('newname'));
-            }
-        } else {
-            $this->tryLogin();
-        }
-    }
-
-    function showPageNotice()
-    {
-        if ($this->error) {
-            $this->element('div', array('class' => 'error'), $this->error);
-        } else {
-            $this->element('div', 'instructions',
-                           // TRANS: %s is the site name.
-                           sprintf(_m('This is the first time you\'ve logged into %s so we must connect your Facebook to a local account. You can either create a new account, or connect with your existing account, if you have one.'), common_config('site', 'name')));
-        }
-    }
-
-    function title()
-    {
-        // TRANS: Page title.
-        return _m('Facebook Account Setup');
-    }
-
-    function showForm($error=null, $username=null)
-    {
-        $this->error = $error;
-        $this->username = $username;
-
-        $this->showPage();
-    }
-
-    function showPage()
-    {
-        parent::showPage();
-    }
-
-    /**
-     * @fixme much of this duplicates core code, which is very fragile.
-     * Should probably be replaced with an extensible mini version of
-     * the core registration form.
-     */
-    function showContent()
-    {
-        if (!empty($this->message_text)) {
-            $this->element('p', null, $this->message);
-            return;
-        }
-
-        $this->elementStart('form', array('method' => 'post',
-                                          'id' => 'form_settings_facebook_connect',
-                                          'class' => 'form_settings',
-                                          'action' => common_local_url('FBConnectAuth')));
-        $this->elementStart('fieldset', array('id' => 'settings_facebook_connect_options'));
-        // TRANS: Legend.
-        $this->element('legend', null, _m('Connection options'));
-        $this->elementStart('ul', 'form_data');
-        $this->elementStart('li');
-        $this->element('input', array('type' => 'checkbox',
-                                      'id' => 'license',
-                                      'class' => 'checkbox',
-                                      'name' => 'license',
-                                      'value' => 'true'));
-        $this->elementStart('label', array('class' => 'checkbox', 'for' => 'license'));
-        // TRANS: %s is the name of the license used by the user for their status updates.
-        $message = _m('My text and files are available under %s ' .
-                     'except this private data: password, ' .
-                     'email address, IM address, and phone number.');
-        $link = '<a href="' .
-                htmlspecialchars(common_config('license', 'url')) .
-                '">' .
-                htmlspecialchars(common_config('license', 'title')) .
-                '</a>';
-        $this->raw(sprintf(htmlspecialchars($message), $link));
-        $this->elementEnd('label');
-        $this->elementEnd('li');
-        $this->elementEnd('ul');
-
-        $this->elementStart('fieldset');
-        $this->hidden('token', common_session_token());
-        $this->element('legend', null,
-                       // TRANS: Legend.
-                       _m('Create new account'));
-        $this->element('p', null,
-                       _m('Create a new user with this nickname.'));
-        $this->elementStart('ul', 'form_data');
-        $this->elementStart('li');
-        // TRANS: Field label.
-        $this->input('newname', _m('New nickname'),
-                     ($this->username) ? $this->username : '',
-                     _m('1-64 lowercase letters or numbers, no punctuation or spaces'));
-        $this->elementEnd('li');
-        $this->elementEnd('ul');
-        // TRANS: Submit button.
-        $this->submit('create', _m('BUTTON','Create'));
-        $this->elementEnd('fieldset');
-
-        $this->elementStart('fieldset');
-        // TRANS: Legend.
-        $this->element('legend', null,
-                       _m('Connect existing account'));
-        $this->element('p', null,
-                       _m('If you already have an account, login with your username and password to connect it to your Facebook.'));
-        $this->elementStart('ul', 'form_data');
-        $this->elementStart('li');
-        // TRANS: Field label.
-        $this->input('nickname', _m('Existing nickname'));
-        $this->elementEnd('li');
-        $this->elementStart('li');
-        $this->password('password', _m('Password'));
-        $this->elementEnd('li');
-        $this->elementEnd('ul');
-        // TRANS: Submit button.
-        $this->submit('connect', _m('BUTTON','Connect'));
-        $this->elementEnd('fieldset');
-
-        $this->elementEnd('fieldset');
-        $this->elementEnd('form');
-    }
-
-    function message($msg)
-    {
-        $this->message_text = $msg;
-        $this->showPage();
-    }
-
-    function createNewUser()
-    {
-        if (!Event::handle('StartRegistrationTry', array($this))) {
-            return;
-        }
-
-        if (common_config('site', 'closed')) {
-            // TRANS: Client error trying to register with registrations not allowed.
-            $this->clientError(_m('Registration not allowed.'));
-            return;
-        }
-
-        $invite = null;
-
-        if (common_config('site', 'inviteonly')) {
-            $code = $_SESSION['invitecode'];
-            if (empty($code)) {
-                // TRANS: Client error trying to register with registrations 'invite only'.
-                $this->clientError(_m('Registration not allowed.'));
-                return;
-            }
-
-            $invite = Invitation::staticGet($code);
-
-            if (empty($invite)) {
-                // TRANS: Client error trying to register with an invalid invitation code.
-                $this->clientError(_m('Not a valid invitation code.'));
-                return;
-            }
-        }
-
-        try {
-            $nickname = Nickname::normalize($this->trimmed('newname'));
-        } catch (NicknameException $e) {
-            $this->showForm($e->getMessage());
-        }
-
-        if (!User::allowed_nickname($nickname)) {
-            $this->showForm(_m('Nickname not allowed.'));
-            return;
-        }
-
-        if (User::staticGet('nickname', $nickname)) {
-            $this->showForm(_m('Nickname already in use. Try another one.'));
-            return;
-        }
-
-        $fullname = trim($this->fb_fields['firstname'] .
-            ' ' . $this->fb_fields['lastname']);
-
-        $args = array('nickname' => $nickname, 'fullname' => $fullname);
-
-        if (!empty($invite)) {
-            $args['code'] = $invite->code;
-        }
-
-        $user = User::register($args);
-
-        $result = $this->flinkUser($user->id, $this->fbuid);
-
-        if (!$result) {
-            $this->serverError(_m('Error connecting user to Facebook.'));
-            return;
-        }
-
-        common_set_user($user);
-        common_real_login(true);
-
-        common_debug('Facebook Connect Plugin - ' .
-                     "Registered new user $user->id from Facebook user $this->fbuid");
-
-        Event::handle('EndRegistrationTry', array($this));
-
-        common_redirect(common_local_url('showstream', array('nickname' => $user->nickname)),
-                        303);
-    }
-
-    function connectNewUser()
-    {
-        $nickname = $this->trimmed('nickname');
-        $password = $this->trimmed('password');
-
-        if (!common_check_user($nickname, $password)) {
-            $this->showForm(_m('Invalid username or password.'));
-            return;
-        }
-
-        $user = User::staticGet('nickname', $nickname);
-
-        if (!empty($user)) {
-            common_debug('Facebook Connect Plugin - ' .
-                         "Legit user to connect to Facebook: $nickname");
-        }
-
-        $result = $this->flinkUser($user->id, $this->fbuid);
-
-        if (!$result) {
-            $this->serverError(_m('Error connecting user to Facebook.'));
-            return;
-        }
-
-        common_debug('Facebook Connnect Plugin - ' .
-                     "Connected Facebook user $this->fbuid to local user $user->id");
-
-        common_set_user($user);
-        common_real_login(true);
-
-        $this->goHome($user->nickname);
-    }
-
-    function connectUser()
-    {
-        $user = common_current_user();
-
-        $result = $this->flinkUser($user->id, $this->fbuid);
-
-        if (empty($result)) {
-            $this->serverError(_m('Error connecting user to Facebook.'));
-            return;
-        }
-
-        common_debug('Facebook Connect Plugin - ' .
-                     "Connected Facebook user $this->fbuid to local user $user->id");
-
-        // Return to Facebook connection settings tab
-        common_redirect(common_local_url('FBConnectSettings'), 303);
-    }
-
-    function tryLogin()
-    {
-        common_debug('Facebook Connect Plugin - ' .
-                     "Trying login for Facebook user $this->fbuid.");
-
-        $flink = Foreign_link::getByForeignID($this->fbuid, FACEBOOK_CONNECT_SERVICE);
-
-        if (!empty($flink)) {
-            $user = $flink->getUser();
-
-            if (!empty($user)) {
-
-                common_debug('Facebook Connect Plugin - ' .
-                             "Logged in Facebook user $flink->foreign_id as user $user->id ($user->nickname)");
-
-                common_set_user($user);
-                common_real_login(true);
-                $this->goHome($user->nickname);
-            }
-
-        } else {
-
-            common_debug('Facebook Connect Plugin - ' .
-                         "No flink found for fbuid: $this->fbuid - new user");
-
-            $this->showForm(null, $this->bestNewNickname());
-        }
-    }
-
-    function goHome($nickname)
-    {
-        $url = common_get_returnto();
-        if ($url) {
-            // We don't have to return to it again
-            common_set_returnto(null);
-        } else {
-            $url = common_local_url('all',
-                                    array('nickname' =>
-                                          $nickname));
-        }
-
-        common_redirect($url, 303);
-    }
-
-    function flinkUser($user_id, $fbuid)
-    {
-        $flink = new Foreign_link();
-        $flink->user_id = $user_id;
-        $flink->foreign_id = $fbuid;
-        $flink->service = FACEBOOK_CONNECT_SERVICE;
-        $flink->created = common_sql_now();
-
-        $flink_id = $flink->insert();
-
-        return $flink_id;
-    }
-
-    function bestNewNickname()
-    {
-        if (!empty($this->fb_fields['name'])) {
-            $nickname = $this->nicknamize($this->fb_fields['name']);
-            if ($this->isNewNickname($nickname)) {
-                return $nickname;
-            }
-        }
-
-        // Try the full name
-
-        $fullname = trim($this->fb_fields['firstname'] .
-            ' ' . $this->fb_fields['lastname']);
-
-        if (!empty($fullname)) {
-            $fullname = $this->nicknamize($fullname);
-            if ($this->isNewNickname($fullname)) {
-                return $fullname;
-            }
-        }
-
-        return null;
-    }
-
-     /**
-      * Given a string, try to make it work as a nickname
-      */
-     function nicknamize($str)
-     {
-         $str = preg_replace('/\W/', '', $str);
-         return strtolower($str);
-     }
-
-    function isNewNickname($str)
-    {
-        if (!Nickname::isValid($str)) {
-            return false;
-        }
-        if (!User::allowed_nickname($str)) {
-            return false;
-        }
-        if (User::staticGet('nickname', $str)) {
-            return false;
-        }
-        return true;
-    }
-
-    // XXX: Consider moving this to lib/facebookutil.php
-    function getFacebookFields($fb_uid, $fields) {
-        try {
-
-            $facebook = getFacebook();
-
-            $infos = $facebook->api_client->users_getInfo($fb_uid, $fields);
-
-            if (empty($infos)) {
-                return null;
-            }
-            return reset($infos);
-
-        } catch (Exception $e) {
-            common_log(LOG_WARNING, 'Facebook Connect Plugin - ' .
-                       "Facebook client failure when requesting " .
-                join(",", $fields) . " on uid " . $fb_uid .
-                    " : ". $e->getMessage());
-            return null;
-        }
-    }
-}
diff --git a/plugins/Facebook/FBConnectLogin.php b/plugins/Facebook/FBConnectLogin.php
deleted file mode 100644
index 8345532dbd..0000000000
--- a/plugins/Facebook/FBConnectLogin.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/*
- * StatusNet - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR . '/plugins/Facebook/FacebookPlugin.php';
-
-class FBConnectLoginAction extends Action
-{
-    function handle($args)
-    {
-        parent::handle($args);
-
-        if (common_is_real_login()) {
-            $this->clientError(_m('Already logged in.'));
-        }
-
-        $this->showPage();
-    }
-
-    function getInstructions()
-    {
-        // TRANS: Instructions.
-        return _m('Login with your Facebook Account');
-    }
-
-    function showPageNotice()
-    {
-        $instr = $this->getInstructions();
-        $output = common_markup_to_html($instr);
-        $this->elementStart('div', 'instructions');
-        $this->raw($output);
-        $this->elementEnd('div');
-    }
-
-    function title()
-    {
-        // TRANS: Page title.
-        return _m('Facebook Login');
-    }
-
-    function showContent() {
-
-        $this->elementStart('fieldset');
-        $this->element('fb:login-button', array('onlogin' => 'goto_login()',
-            'length' => 'long'));
-
-        $this->elementEnd('fieldset');
-    }
-
-    function showLocalNav()
-    {
-        $nav = new LoginGroupNav($this);
-        $nav->show();
-    }
-}
diff --git a/plugins/Facebook/FBConnectSettings.php b/plugins/Facebook/FBConnectSettings.php
deleted file mode 100644
index 701994d0d0..0000000000
--- a/plugins/Facebook/FBConnectSettings.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Facebook Connect settings
- *
- * 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    Zach Copley <zach@status.net>
- * @copyright 2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR.'/lib/connectsettingsaction.php';
-
-/**
- * Facebook Connect settings action
- *
- * @category Settings
- * @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 FBConnectSettingsAction extends ConnectSettingsAction
-{
-    /**
-     * Title of the page
-     *
-     * @return string Title of the page
-     */
-    function title()
-    {
-        // TRANS: Page title.
-        return _m('Facebook Connect Settings');
-    }
-
-    /**
-     * Instructions for use
-     *
-     * @return instructions for use
-     */
-    function getInstructions()
-    {
-    	// TRANS: Instructions.
-        return _m('Manage how your account connects to Facebook');
-    }
-
-    /**
-     * Content area of the page
-     *
-     * Shows a form for uploading an avatar.
-     *
-     * @return void
-     */
-    function showContent()
-    {
-        $user = common_current_user();
-        $flink = Foreign_link::getByUserID($user->id, FACEBOOK_CONNECT_SERVICE);
-
-        $this->elementStart('form', array('method' => 'post',
-                                          'id' => 'form_settings_facebook',
-                                          'class' => 'form_settings',
-                                          'action' =>
-                                          common_local_url('FBConnectSettings')));
-
-        if (!$flink) {
-
-            $this->element('p', 'instructions',
-                _m('There is no Facebook user connected to this account.'));
-
-            $this->element('fb:login-button', array('onlogin' => 'goto_login()',
-                'length' => 'long'));
-
-        } else {
-
-            $this->element('p', 'form_note',
-                           _m('Connected Facebook user'));
-
-            $this->elementStart('p', array('class' => 'facebook-user-display'));
-            $this->elementStart('fb:profile-pic',
-                array('uid' => $flink->foreign_id,
-                      'size' => 'small',
-                      'linked' => 'true',
-                      'facebook-logo' => 'true'));
-            $this->elementEnd('fb:profile-pic');
-
-            $this->elementStart('fb:name', array('uid' => $flink->foreign_id,
-                                                 'useyou' => 'false'));
-            $this->elementEnd('fb:name');
-            $this->elementEnd('p');
-
-            $this->hidden('token', common_session_token());
-
-            $this->elementStart('fieldset');
-
-            // TRANS: Legend.
-            $this->element('legend', null, _m('Disconnect my account from Facebook'));
-
-            if (!$user->password) {
-
-                $this->elementStart('p', array('class' => 'form_guide'));
-                // @todo FIXME: Bad i18n. Patchwork message in three parts.
-                // TRANS: Followed by a link containing text "set a password".
-                $this->text(_m('Disconnecting your Faceboook ' .
-                               'would make it impossible to log in! Please '));
-                $this->element('a',
-                    array('href' => common_local_url('passwordsettings')),
-                        // TRANS: Preceded by "Please " and followed by " first."
-                        _m('set a password'));
-                // TRANS: Preceded by "Please set a password".
-                $this->text(_m(' first.'));
-                $this->elementEnd('p');
-            } else {
-
-                $note = 'Keep your %s account but disconnect from Facebook. ' .
-                    'You\'ll use your %s password to log in.';
-
-                $site = common_config('site', 'name');
-
-                $this->element('p', 'instructions',
-                    sprintf($note, $site, $site));
-
-                // TRANS: Submit button.
-                $this->submit('disconnect', _m('BUTTON','Disconnect'));
-            }
-
-            $this->elementEnd('fieldset');
-        }
-
-        $this->elementEnd('form');
-    }
-
-    /**
-     * Handle post
-     *
-     * Disconnects the current Facebook user from the current user's account
-     *
-     * @return void
-     */
-    function handlePost()
-    {
-        // CSRF protection
-        $token = $this->trimmed('token');
-        if (!$token || $token != common_session_token()) {
-            $this->showForm(_m('There was a problem with your session token. '.
-                               'Try again, please.'));
-            return;
-        }
-
-        if ($this->arg('disconnect')) {
-
-            $user = common_current_user();
-
-            $flink = Foreign_link::getByUserID($user->id, FACEBOOK_CONNECT_SERVICE);
-            $result = $flink->delete();
-
-            if ($result === false) {
-                common_log_db_error($user, 'DELETE', __FILE__);
-                $this->serverError(_m('Couldn\'t delete link to Facebook.'));
-                return;
-            }
-
-            try {
-
-                // Clear FB Connect cookies out
-                $facebook = getFacebook();
-                $facebook->clear_cookie_state();
-
-            } catch (Exception $e) {
-                common_log(LOG_WARNING, 'Facebook Connect Plugin - ' .
-                           'Couldn\'t clear Facebook cookies: ' .
-                           $e->getMessage());
-            }
-
-            $this->showForm(_m('You have disconnected from Facebook.'), true);
-
-        } else {
-            $this->showForm(_m('Not sure what you\'re trying to do.'));
-            return;
-        }
-    }
-}
diff --git a/plugins/Facebook/FacebookPlugin.php b/plugins/Facebook/FacebookPlugin.php
deleted file mode 100644
index e877d300b6..0000000000
--- a/plugins/Facebook/FacebookPlugin.php
+++ /dev/null
@@ -1,599 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Plugin to add a StatusNet Facebook application
- *
- * PHP version 5
- *
- * LICENCE: This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @category  Plugin
- * @package   StatusNet
- * @author    Zach Copley <zach@status.net>
- * @copyright 2009-2010 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-define("FACEBOOK_CONNECT_SERVICE", 3);
-
-require_once INSTALLDIR . '/plugins/Facebook/facebookutil.php';
-
-/**
- * Facebook plugin to add a StatusNet Facebook canvas application
- * and allow registration and authentication via Facebook Connect
- *
- * @category Plugin
- * @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 FacebookPlugin extends Plugin
-{
-    const VERSION = STATUSNET_VERSION;
-
-    /**
-     * Initializer for the plugin.
-     */
-
-    function initialize()
-    {
-        // Allow the key and secret to be passed in
-        // Control panel will override
-        if (isset($this->apikey)) {
-            $key = common_config('facebook', 'apikey');
-            if (empty($key)) {
-                Config::save('facebook', 'apikey', $this->apikey);
-            }
-        }
-
-        if (isset($this->secret)) {
-            $secret = common_config('facebook', 'secret');
-            if (empty($secret)) {
-                Config::save(
-                    'facebook',
-                    'secret',
-                    $this->secret
-                );
-            }
-        }
-    }
-
-    /**
-     * Check to see if there is an API key and secret defined
-     * for Facebook integration.
-     *
-     * @return boolean result
-     */
-    static function hasKeys()
-    {
-        $apiKey    = common_config('facebook', 'apikey');
-        $apiSecret = common_config('facebook', 'secret');
-
-        if (!empty($apiKey) && !empty($apiSecret)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Add Facebook app actions to the router table
-     *
-     * Hook for RouterInitialized event.
-     *
-     * @param Net_URL_Mapper &$m path-to-action mapper
-     *
-     * @return boolean hook return
-     */
-    function onStartInitializeRouter($m)
-    {
-        $m->connect('admin/facebook', array('action' => 'facebookadminpanel'));
-
-        if (self::hasKeys()) {
-            // Facebook App stuff
-
-            $m->connect('facebook/app', array('action' => 'facebookhome'));
-            $m->connect('facebook/app/index.php', array('action' => 'facebookhome'));
-            $m->connect('facebook/app/settings.php',
-                        array('action' => 'facebooksettings'));
-            $m->connect('facebook/app/invite.php', array('action' => 'facebookinvite'));
-            $m->connect('facebook/app/remove', array('action' => 'facebookremove'));
-
-            // Facebook Connect stuff
-
-            $m->connect('main/facebookconnect', array('action' => 'FBConnectAuth'));
-            $m->connect('main/facebooklogin', array('action' => 'FBConnectLogin'));
-            $m->connect('settings/facebook', array('action' => 'FBConnectSettings'));
-            $m->connect('xd_receiver.html', array('action' => 'FBC_XDReceiver'));
-        }
-
-        return true;
-    }
-
-    /**
-     * Automatically load the actions and libraries used by the Facebook app
-     *
-     * @param Class $cls the class
-     *
-     * @return boolean hook return
-     *
-     */
-    function onAutoload($cls)
-    {
-        switch ($cls) {
-        case 'FacebookAction':
-        case 'FacebookhomeAction':
-        case 'FacebookinviteAction':
-        case 'FacebookremoveAction':
-        case 'FacebooksettingsAction':
-        case 'FacebookadminpanelAction':
-            include_once INSTALLDIR . '/plugins/Facebook/' .
-              strtolower(mb_substr($cls, 0, -6)) . '.php';
-            return false;
-        case 'FBConnectAuthAction':
-        case 'FBConnectLoginAction':
-        case 'FBConnectSettingsAction':
-        case 'FBC_XDReceiverAction':
-            include_once INSTALLDIR . '/plugins/Facebook/' .
-              mb_substr($cls, 0, -6) . '.php';
-            return false;
-        case 'FBCLoginGroupNav':
-            include_once INSTALLDIR . '/plugins/Facebook/FBCLoginGroupNav.php';
-            return false;
-        case 'FBCSettingsNav':
-            include_once INSTALLDIR . '/plugins/Facebook/FBCSettingsNav.php';
-            return false;
-        case 'FacebookQueueHandler':
-            include_once INSTALLDIR . '/plugins/Facebook/facebookqueuehandler.php';
-            return false;
-        default:
-            return true;
-        }
-    }
-
-    /**
-     * Add a Facebook tab to the admin panels
-     *
-     * @param Widget $nav Admin panel nav
-     *
-     * @return boolean hook value
-     */
-    function onEndAdminPanelNav($nav)
-    {
-        if (AdminPanelAction::canAdmin('facebook')) {
-
-            $action_name = $nav->action->trimmed('action');
-
-            $nav->out->menuItem(
-                common_local_url('facebookadminpanel'),
-                // TRANS: Menu item.
-                _m('MENU','Facebook'),
-                // TRANS: Tooltip for menu item "Facebook".
-                _m('Facebook integration configuration'),
-                $action_name == 'facebookadminpanel',
-                'nav_facebook_admin_panel'
-            );
-        }
-
-        return true;
-    }
-
-    /**
-     * Override normal HTML output to force the content type to
-     * text/html and add in xmlns:fb
-     *
-     * @param Action $action the current action
-     *
-     * @return void
-     */
-    function onStartShowHTML($action)
-    {
-        if ($this->reqFbScripts($action)) {
-            // XXX: Horrible hack to make Safari, FF2, and Chrome work with
-            // Facebook Connect. These browser cannot use Facebook's
-            // DOM parsing routines unless the mime type of the page is
-            // text/html even though Facebook Connect uses XHTML.  This is
-            // A bug in Facebook Connect, and this is a temporary solution
-            // until they fix their JavaScript libs.
-
-            header('Content-Type: text/html');
-
-            $action->extraHeaders();
-
-            $action->startXML('html');
-
-            $language = $action->getLanguage();
-
-            $action->elementStart('html',
-                array('xmlns'  => 'http://www.w3.org/1999/xhtml',
-                      'xmlns:fb' => 'http://www.facebook.com/2008/fbml',
-                      'xml:lang' => $language,
-                      'lang'     => $language));
-
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * Add in the Facebook Connect JavaScript stuff
-     *
-     * Note: this script needs to appear in the <body>
-     *
-     * @param Action $action the current action
-     *
-     * @return void
-     *
-     */
-    function onEndShowScripts($action)
-    {
-        if ($this->reqFbScripts($action)) {
-
-            $apikey      = common_config('facebook', 'apikey');
-            $plugin_path = 'plugins/Facebook';
-
-            $login_url  = common_local_url('FBConnectAuth');
-            $logout_url = common_local_url('logout');
-
-            // XXX: Facebook says we don't need this FB_RequireFeatures(),
-            // but we actually do, for IE and Safari. Gar.
-
-            $js .= '    $(document).ready(function () {';
-            $js .= '         FB_RequireFeatures(';
-            $js .= '             ["XFBML"], function() {';
-            $js .= '                 FB.init("%1$s", "../xd_receiver.html");';
-            $js .= '             }';
-            $js .= '         );';
-            $js .= '    });';
-
-            $js .= '    function goto_login() {';
-            $js .= '        window.location = "%2$s";';
-            $js .= '    }';
-
-            // The below function alters the logout link so that it logs the user out
-            // of Facebook Connect as well as the site.  However, for some pages
-            // (FB Connect Settings) we need to output the FB Connect scripts (to
-            // show an existing FB connection even if the user isn't authenticated
-            // with Facebook connect) but NOT alter the logout link. And the only
-            // way to reliably do that is with the FB Connect .js libs.  Crazy.
-
-            $js .= '    FB.ensureInit(function() {';
-            $js .= '        FB.Connect.ifUserConnected(';
-            $js .= '            function() { ';
-            $js .= '                $(\'#nav_logout a\').attr(\'href\', \'#\');';
-            $js .= '                $(\'#nav_logout a\').click(function() {';
-            $js .= '                   FB.Connect.logoutAndRedirect(\'%3$s\');';
-            $js .= '                   return false;';
-            $js .= '                })';
-            $js .= '            },';
-            $js .= '            function() {';
-            $js .= '                return false;';
-            $js .= '            }';
-            $js .= '        );';
-            $js .= '     });';
-
-            $js = sprintf($js, $apikey, $login_url, $logout_url);
-
-            // Compress the bugger down a bit
-            $js = str_replace('  ', '', $js);
-
-            $action->inlineScript($js);
-        }
-    }
-
-    /**
-     * Add in an additional Facebook Connect script that's supposed to
-     * appear as close as possible to </body>
-     *
-     * @param Action $action the current action
-     *
-     * @return void
-     *
-     */
-    function onEndShowFooter($action)
-    {
-        if ($this->reqFbScripts($action)) {
-            $action->script('http://static.ak.connect.facebook.com' .
-                            '/js/api_lib/v0.4/FeatureLoader.js.php');
-        }
-    }
-
-    /**
-     * Output Facebook Connect specific CSS link
-     *
-     * @param Action $action the current action
-     *
-     * @return void
-     *
-     */
-    function onEndShowStatusNetStyles($action)
-    {
-        if ($this->reqFbScripts($action)) {
-            $action->cssLink('plugins/Facebook/FBConnect.css');
-        }
-    }
-
-    /**
-     * Does the Action we're plugged into require the FB Scripts?  We only
-     * want to output FB namespace, scripts, CSS, etc. on the pages that
-     * really need them.
-     *
-     * @param Action $action the current action
-     *
-     * @return boolean true
-     */
-    function reqFbScripts($action)
-    {
-        if (!self::hasKeys()) {
-            return false;
-        }
-
-        // If you're logged in w/FB Connect, you always need the FB stuff
-        $fbuid = $this->loggedIn();
-
-        if (!empty($fbuid)) {
-            return true;
-        }
-
-        // List of actions that require FB stuff
-        $needy = array('FBConnectLoginAction',
-                       'FBConnectauthAction',
-                       'FBConnectSettingsAction');
-
-        if (in_array(get_class($action), $needy)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Is the user currently logged in with FB Connect?
-     *
-     * @return mixed $fbuid the Facebook ID of the logged in user, or null
-     */
-    function loggedIn()
-    {
-        $user = common_current_user();
-
-        if (!empty($user)) {
-
-            $flink = Foreign_link::getByUserId($user->id,
-                FACEBOOK_CONNECT_SERVICE);
-            $fbuid = 0;
-
-            if (!empty($flink)) {
-                try {
-                    $facebook = getFacebook();
-                    $fbuid    = $facebook->get_loggedin_user();
-                } catch (Exception $e) {
-                    common_log(LOG_WARNING, 'Facebook Connect Plugin - ' .
-                        'Problem getting Facebook user: ' .
-                            $e->getMessage());
-                }
-
-                if ($fbuid > 0) {
-                    return $fbuid;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Add in a Facebook Connect avatar to the primary nav menu
-     *
-     * @param Action $action the current action
-     *
-     * @return void
-     *
-     */
-    function onStartPrimaryNav($action)
-    {
-        if (self::hasKeys()) {
-            $user = common_current_user();
-            if (!empty($user)) {
-                $fbuid = $this->loggedIn();
-
-                if (!empty($fbuid)) {
-                    /* Default FB silhouette pic for FB users who haven't
-                       uploaded a profile pic yet. */
-
-                    $silhouetteUrl =
-                        'http://static.ak.fbcdn.net/pics/q_silhouette.gif';
-
-                    $url = $this->getProfilePicURL($fbuid);
-
-                    $action->elementStart('li', array('id' => 'nav_fb'));
-
-                    $action->element('img', array('id' => 'fbc_profile-pic',
-                        'src' => (!empty($url)) ? $url : $silhouetteUrl,
-                        'alt' => _m('Facebook Connect User'),
-                        'width' => '16'), '');
-
-                    $iconurl =  common_path('plugins/Facebook/fbfavicon.ico');
-                    $action->element('img', array('id' => 'fb_favicon',
-                        'src' => $iconurl));
-
-                    $action->elementEnd('li');
-                }
-            }
-        }
-
-        return true;
-    }
-
-    /*
-     * Add a login tab for Facebook Connect
-     *
-     * @param Action $action the current action
-     *
-     * @return void
-     */
-    function onEndLoginGroupNav($action)
-    {
-        if (self::hasKeys()) {
-            $action_name = $action->trimmed('action');
-
-            $action->menuItem(common_local_url('FBConnectLogin'),
-                                               // @todo CHECKME: Should be 'Facebook Login'?
-                                               // TRANS: Menu item.
-                                               _m('MENU','Facebook'),
-                                               // TRANS: Tooltip for menu item "Facebook".
-                                               _m('Login or register using Facebook'),
-                                               'FBConnectLogin' === $action_name);
-        }
-
-        return true;
-    }
-
-    /*
-     * Add a tab for managing Facebook Connect settings
-     *
-     * @param Action $action the current action
-     *
-     * @return void
-     */
-    function onEndConnectSettingsNav($action)
-    {
-        if (self::hasKeys()) {
-            $action_name = $action->trimmed('action');
-
-            $action->menuItem(common_local_url('FBConnectSettings'),
-                              // @todo CHECKME: Should be 'Facebook Connect'? 
-                              // TRANS: Menu item tab.
-                              _m('MENU','Facebook'),
-                              // TRANS: Tooltip for menu item "Facebook".
-                              _m('Facebook Connect Settings'),
-                              $action_name === 'FBConnectSettings');
-        }
-
-        return true;
-    }
-
-    /**
-     * Have the logout process do some Facebook Connect cookie cleanup
-     *
-     * @param Action $action the current action
-     *
-     * @return void
-     */
-    function onStartLogout($action)
-    {
-        if (self::hasKeys()) {
-
-            $action->logout();
-            $fbuid = $this->loggedIn();
-
-            if (!empty($fbuid)) {
-                try {
-                    $facebook = getFacebook();
-                    $facebook->expire_session();
-                } catch (Exception $e) {
-                    common_log(LOG_WARNING, 'Facebook Connect Plugin - ' .
-                               'Could\'t logout of Facebook: ' .
-                               $e->getMessage());
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Get the URL of the user's Facebook avatar
-     *
-     * @param int $fbuid the Facebook user ID
-     *
-     * @return string $url the url for the user's Facebook avatar
-     */
-    function getProfilePicURL($fbuid)
-    {
-        $facebook = getFacebook();
-        $url      = null;
-
-        try {
-            $fqry = 'SELECT pic_square FROM user WHERE uid = %s';
-
-            $result = $facebook->api_client->fql_query(sprintf($fqry, $fbuid));
-
-            if (!empty($result)) {
-                $url = $result[0]['pic_square'];
-            }
-
-        } catch (Exception $e) {
-            common_log(LOG_WARNING, 'Facebook Connect Plugin - ' .
-                       "Facebook client failure requesting profile pic!");
-        }
-
-        return $url;
-    }
-
-    /**
-     * Add a Facebook queue item for each notice
-     *
-     * @param Notice $notice      the notice
-     * @param array  &$transports the list of transports (queues)
-     *
-     * @return boolean hook return
-     */
-    function onStartEnqueueNotice($notice, &$transports)
-    {
-        if (self::hasKeys() && $notice->isLocal()) {
-            array_push($transports, 'facebook');
-        }
-        return true;
-    }
-
-    /**
-     * Register Facebook notice queue handler
-     *
-     * @param QueueManager $manager
-     *
-     * @return boolean hook return
-     */
-    function onEndInitializeQueueManager($manager)
-    {
-        if (self::hasKeys()) {
-            $manager->connect('facebook', 'FacebookQueueHandler');
-        }
-        return true;
-    }
-
-    function onPluginVersion(&$versions)
-    {
-        $versions[] = array(
-            'name' => 'Facebook',
-            'version' => self::VERSION,
-            'author' => 'Zach Copley',
-            'homepage' => 'http://status.net/wiki/Plugin:Facebook',
-            // TRANS: Plugin description.
-            'rawdescription' => _m(
-                'The Facebook plugin allows integrating ' .
-                'StatusNet instances with ' .
-                '<a href="http://facebook.com/">Facebook</a> ' .
-                'and Facebook Connect.'
-            )
-        );
-        return true;
-    }
-}
diff --git a/plugins/Facebook/README b/plugins/Facebook/README
deleted file mode 100644
index 454dd44e79..0000000000
--- a/plugins/Facebook/README
+++ /dev/null
@@ -1,163 +0,0 @@
-*** WARNING ***
-This plugin is deprecated as of StatusNet 0.9.7, and will soon be removed
-completely from the StatusNet codebase. Please install or upgrade to the
-new "Facebook Bridge" (plugins/FacebookBridge) plugin ASAP.
-***************
-
-Facebook Plugin
-===============
-
-This plugin allows you to use Facebook Connect with StatusNet, provides
-a Facebook canvas application for your users, and allows them to update
-their Facebook statuses from StatusNet.
-
-Facebook Connect
-----------------
-
-Facebook connect allows users to register and login using nothing but their
-Facebook credentials. With Facebook Connect, your users can:
-
-- Authenticate (register/login/logout -- works similar to OpenID)
-- Associate an existing StatusNet account with a Facebook account
-- Disconnect a Facebook account from a StatusNet account
-
-Built-in Facebook Application
------------------------------
-
-The plugin also installs a StatusNet Facebook canvas application that
-allows your users to automatically update their Facebook status with
-their latest notices, invite their friends to use the app (and thus your
-site), view their notice timelines and post notices -- all from within
-Facebook.  The application is built into the StatusNet Facebook plugin
-and runs on your host.
-
-Quick setup instructions*
--------------------------
-
-Install the Facebook Developer application on Facebook:
-
-    http://www.facebook.com/developers/
-
-Use it to create a new application and generate an API key and secret.
-You will need the key and secret so cut-n-paste them into your text
-editor or write them down.
-
-In Facebook's application editor, specify the following URLs for your app:
-
-- Canvas Callback URL         : http://example.net/mublog/facebook/app/
-- Post-Remove Callback URL    : http://example.net/mublog/facebook/app/remove
-- Post-Authorize Redirect URL : http://apps.facebook.com/yourapp/
-- Canvas Page URL             : http://apps.facebook.com/yourapp/
-- Connect URL                 : http://example.net/mublog/
-
-    *** ATTENTION ***
-    These URLs have changed slightly since StatusNet version 0.8.1,
-    so if you have been using the Facebook app previously, you will
-    need to update your configuration!
-
-Replace "example.net" with your host's URL, "mublog" with the path to your
-StatusNet installation, and 'yourapp' with the name of the Facebook
-application you created. (If you don't have "Fancy URLs" on, you'll need to
-change http://example.net/mublog/ to http://example.net/mublog/index.php/).
-
-Additionally, Choose "Web" for Application type in the Advanced tab. In the
-"Canvas setting" section, choose the "FBML" for Render Method, "Smart Size"
-for IFrame size, and "Full width (760px)" for Canvas Width. Everything else
-can be left with default values.
-
-* NOTE: For more under-the-hood detailed instructions about setting up a
-        Facebook application and getting an API key, check out the
-        following pages on the Facebook wiki:
-
-    http://wiki.developers.facebook.com/index.php/Connect/Setting_Up_Your_Site
-    http://wiki.developers.facebook.com/index.php/Creating_your_first_application
-
-Finally you must activate the plugin by adding it in your config.php
-(this is where you'll need the API key and secret generated earlier):
-
-    addPlugin(
-        'Facebook',
-        array(
-            'apikey' => 'YOUR_APIKEY',
-            'secret' => 'YOUR_SECRET'
-        )
-    );
-
-Administration Panel
---------------------
-
-As of StatusNet 0.9.0 you can alternatively specify the key and secret
-via a Facebook administration panel from within StatusNet, in which case
-you can just add:
-
-    addPlugin('Facebook');
-
-to activate the plugin.
-
-NOTE: To enable the administration panel you'll need to add it to the
-list of active administration panels, e.g.:
-
-    $config['admin']['panels'][] = 'facebook';
-
-and of course you'll need a user with the administrative role to access
-it and input the API key and secret (see: scripts/userrole.php).
-
-Testing It Out
---------------
-
-If the Facebook plugin is enabled and working, there will be a new Facebook
-Connect Settings tab under each user's Connect menu. Users can connect and
-disconnect* to their Facebook accounts from it.
-
-To try out the plugin, fire up your browser and connect to:
-
-    http://example.net/mublog/main/facebooklogin
-
-or, if you do not have fancy URLs turned on:
-
-    http://example.net/mublog/index.php/main/facebooklogin
-
-You should see a page with a blue button that says: "Connect with Facebook"
-and you should be able to login or register.
-
-From within Facebook, you should also be able to get to the Facebook
-application, and run it by hitting the link you specified above when
-configuring it:
-
-    http://apps.facebook.com/yourapp/
-
-That link should be present you with a login screen.  After logging in to
-the app, you are given the option to update their Facebook status via
-StatusNet.
-
-* Note: Before a user can disconnect from Facebook, she must set a normal
-  StatusNet password.  Otherwise, she might not be able to login in to her
-  account in the future.  This is usually only required for users who have
-  used Facebook Connect to register their StatusNet account, and therefore
-  haven't already set a local password.
-
-Offline Queue Handling
-----------------------
-
-For larger sites needing better performance it's possible to enable
-queuing and have users' notices posted to Facebook via a separate
-"offline" process -- FacebookQueueHandler (facebookqueuhandler.php in
-the Facebook plugin directory).  It will run automatically if you have
-enabled StatusNet's offline queueing subsystem.  See the "Queues and
-daemons" section in the StatusNet README for more about queuing.
-
-
-TODO
-----
-
-- Make Facebook Connect work for authentication for multi-site setups
-  (e.g.: *.status.net)
-- Posting to Facebook user streams using only Facebook Connect
-- Invite Facebook friends to use your StatusNet installation via Facebook
-  Connect
-- Auto-subscribe Facebook friends already using StatusNet
-- Share StatusNet favorite notices to your Facebook stream
-- Allow users to update their Facebook statuses once they have authenticated
-  with Facebook Connect (no need for them to use the Facebook app if they
-  don't want to).
-- Import a user's Facebook updates into StatusNet
diff --git a/plugins/Facebook/facebook/facebook.php b/plugins/Facebook/facebook/facebook.php
deleted file mode 100644
index 76696c1d55..0000000000
--- a/plugins/Facebook/facebook/facebook.php
+++ /dev/null
@@ -1,609 +0,0 @@
-<?php
-// Copyright 2004-2009 Facebook. All Rights Reserved.
-//
-// +---------------------------------------------------------------------------+
-// | Facebook Platform PHP5 client                                             |
-// +---------------------------------------------------------------------------+
-// | Copyright (c) 2007 Facebook, Inc.                                         |
-// | All rights reserved.                                                      |
-// |                                                                           |
-// | Redistribution and use in source and binary forms, with or without        |
-// | modification, are permitted provided that the following conditions        |
-// | are met:                                                                  |
-// |                                                                           |
-// | 1. Redistributions of source code must retain the above copyright         |
-// |    notice, this list of conditions and the following disclaimer.          |
-// | 2. 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.   |
-// |                                                                           |
-// | THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.         |
-// +---------------------------------------------------------------------------+
-// | For help with this library, contact developers-help@facebook.com          |
-// +---------------------------------------------------------------------------+
-
-include_once 'facebookapi_php5_restlib.php';
-
-define('FACEBOOK_API_VALIDATION_ERROR', 1);
-class Facebook {
-  public $api_client;
-  public $api_key;
-  public $secret;
-  public $generate_session_secret;
-  public $session_expires;
-
-  public $fb_params;
-  public $user;
-  public $profile_user;
-  public $canvas_user;
-  public $ext_perms = array();
-  protected $base_domain;
-
-  /*
-   * Create a Facebook client like this:
-   *
-   * $fb = new Facebook(API_KEY, SECRET);
-   *
-   * This will automatically pull in any parameters, validate them against the
-   * session signature, and chuck them in the public $fb_params member variable.
-   *
-   * @param api_key                  your Developer API key
-   * @param secret                   your Developer API secret
-   * @param generate_session_secret  whether to automatically generate a session
-   *                                 if the user doesn't have one, but
-   *                                 there is an auth token present in the url,
-   */
-  public function __construct($api_key, $secret, $generate_session_secret=false) {
-    $this->api_key                 = $api_key;
-    $this->secret                  = $secret;
-    $this->generate_session_secret = $generate_session_secret;
-    $this->api_client = new FacebookRestClient($api_key, $secret, null);
-    $this->validate_fb_params();
-
-    // Set the default user id for methods that allow the caller to
-    // pass an explicit uid instead of using a session key.
-    $defaultUser = null;
-    if ($this->user) {
-      $defaultUser = $this->user;
-    } else if ($this->profile_user) {
-      $defaultUser = $this->profile_user;
-    } else if ($this->canvas_user) {
-      $defaultUser = $this->canvas_user;
-    }
-
-    $this->api_client->set_user($defaultUser);
-
-
-    if (isset($this->fb_params['friends'])) {
-      $this->api_client->friends_list =
-        array_filter(explode(',', $this->fb_params['friends']));
-    }
-    if (isset($this->fb_params['added'])) {
-      $this->api_client->added = $this->fb_params['added'];
-    }
-    if (isset($this->fb_params['canvas_user'])) {
-      $this->api_client->canvas_user = $this->fb_params['canvas_user'];
-    }
-  }
-
-  /*
-   * Validates that the parameters passed in were sent from Facebook. It does so
-   * by validating that the signature matches one that could only be generated
-   * by using your application's secret key.
-   *
-   * Facebook-provided parameters will come from $_POST, $_GET, or $_COOKIE,
-   * in that order. $_POST and $_GET are always more up-to-date than cookies,
-   * so we prefer those if they are available.
-   *
-   * For nitty-gritty details of when each of these is used, check out
-   * http://wiki.developers.facebook.com/index.php/Verifying_The_Signature
-   */
-  public function validate_fb_params() {
-    $this->fb_params = $this->get_valid_fb_params($_POST, 48 * 3600, 'fb_sig');
-
-    // note that with preload FQL, it's possible to receive POST params in
-    // addition to GET, so use a different prefix to differentiate them
-    if (!$this->fb_params) {
-      $fb_params = $this->get_valid_fb_params($_GET, 48 * 3600, 'fb_sig');
-      $fb_post_params = $this->get_valid_fb_params($_POST,
-                                                   48 * 3600, // 48 hours
-                                                   'fb_post_sig');
-      $this->fb_params = array_merge($fb_params, $fb_post_params);
-    }
-
-    // Okay, something came in via POST or GET
-    if ($this->fb_params) {
-      $user               = isset($this->fb_params['user']) ?
-                            $this->fb_params['user'] : null;
-      $this->profile_user = isset($this->fb_params['profile_user']) ?
-                            $this->fb_params['profile_user'] : null;
-      $this->canvas_user  = isset($this->fb_params['canvas_user']) ?
-                            $this->fb_params['canvas_user'] : null;
-      $this->base_domain  = isset($this->fb_params['base_domain']) ?
-                            $this->fb_params['base_domain'] : null;
-      $this->ext_perms    = isset($this->fb_params['ext_perms']) ?
-                            explode(',', $this->fb_params['ext_perms'])
-                            : array();
-
-      if (isset($this->fb_params['session_key'])) {
-        $session_key =  $this->fb_params['session_key'];
-      } else if (isset($this->fb_params['profile_session_key'])) {
-        $session_key =  $this->fb_params['profile_session_key'];
-      } else {
-        $session_key = null;
-      }
-      $expires     = isset($this->fb_params['expires']) ?
-                     $this->fb_params['expires'] : null;
-      $this->set_user($user,
-                      $session_key,
-                      $expires);
-    } else if ($cookies =
-               $this->get_valid_fb_params($_COOKIE, null, $this->api_key)) {
-      // if no Facebook parameters were found in the GET or POST variables,
-      // then fall back to cookies, which may have cached user information
-      // Cookies are also used to receive session data via the Javascript API
-      $base_domain_cookie = 'base_domain_' . $this->api_key;
-      if (isset($_COOKIE[$base_domain_cookie])) {
-        $this->base_domain = $_COOKIE[$base_domain_cookie];
-      }
-
-      // use $api_key . '_' as a prefix for the cookies in case there are
-      // multiple facebook clients on the same domain.
-      $expires = isset($cookies['expires']) ? $cookies['expires'] : null;
-      $this->set_user($cookies['user'],
-                      $cookies['session_key'],
-                      $expires);
-    }
-
-    return !empty($this->fb_params);
-  }
-
-  // Store a temporary session secret for the current session
-  // for use with the JS client library
-  public function promote_session() {
-    try {
-      $session_secret = $this->api_client->auth_promoteSession();
-      if (!$this->in_fb_canvas()) {
-        $this->set_cookies($this->user, $this->api_client->session_key, $this->session_expires, $session_secret);
-      }
-      return $session_secret;
-    } catch (FacebookRestClientException $e) {
-      // API_EC_PARAM means we don't have a logged in user, otherwise who
-      // knows what it means, so just throw it.
-      if ($e->getCode() != FacebookAPIErrorCodes::API_EC_PARAM) {
-        throw $e;
-      }
-    }
-  }
-
-  public function do_get_session($auth_token) {
-    try {
-      return $this->api_client->auth_getSession($auth_token, $this->generate_session_secret);
-    } catch (FacebookRestClientException $e) {
-      // API_EC_PARAM means we don't have a logged in user, otherwise who
-      // knows what it means, so just throw it.
-      if ($e->getCode() != FacebookAPIErrorCodes::API_EC_PARAM) {
-        throw $e;
-      }
-    }
-  }
-
-  // Invalidate the session currently being used, and clear any state associated
-  // with it. Note that the user will still remain logged into Facebook.
-  public function expire_session() {
-    try {
-      if ($this->api_client->auth_expireSession()) {
-        $this->clear_cookie_state();
-        return true;
-      } else {
-        return false;
-      }
-    } catch (Exception $e) {
-      $this->clear_cookie_state();
-    }
-  }
-
-  /** Logs the user out of all temporary application sessions as well as their
-   * Facebook session.  Note this will only work if the user has a valid current
-   * session with the application.
-   *
-   * @param string  $next  URL to redirect to upon logging out
-   *
-   */
-   public function logout($next) {
-    $logout_url = $this->get_logout_url($next);
-
-    // Clear any stored state
-    $this->clear_cookie_state();
-
-    $this->redirect($logout_url);
-  }
-
-  /**
-   *  Clears any persistent state stored about the user, including
-   *  cookies and information related to the current session in the
-   *  client.
-   *
-   */
-  public function clear_cookie_state() {
-    if (!$this->in_fb_canvas() && isset($_COOKIE[$this->api_key . '_user'])) {
-       $cookies = array('user', 'session_key', 'expires', 'ss');
-       foreach ($cookies as $name) {
-         setcookie($this->api_key . '_' . $name,
-                   false,
-                   time() - 3600,
-                   '',
-                   $this->base_domain);
-         unset($_COOKIE[$this->api_key . '_' . $name]);
-       }
-       setcookie($this->api_key, false, time() - 3600, '', $this->base_domain);
-       unset($_COOKIE[$this->api_key]);
-     }
-
-     // now, clear the rest of the stored state
-     $this->user = 0;
-     $this->api_client->session_key = 0;
-  }
-
-  public function redirect($url) {
-    if ($this->in_fb_canvas()) {
-      echo '<fb:redirect url="' . $url . '"/>';
-    } else if (preg_match('/^https?:\/\/([^\/]*\.)?facebook\.com(:\d+)?/i', $url)) {
-      // make sure facebook.com url's load in the full frame so that we don't
-      // get a frame within a frame.
-      echo "<script type=\"text/javascript\">\ntop.location.href = \"$url\";\n</script>";
-    } else {
-      header('Location: ' . $url);
-    }
-    exit;
-  }
-
-  public function in_frame() {
-    return isset($this->fb_params['in_canvas'])
-        || isset($this->fb_params['in_iframe']);
-  }
-  public function in_fb_canvas() {
-    return isset($this->fb_params['in_canvas']);
-  }
-
-  public function get_loggedin_user() {
-    return $this->user;
-  }
-
-  public function get_canvas_user() {
-    return $this->canvas_user;
-  }
-
-  public function get_profile_user() {
-    return $this->profile_user;
-  }
-
-  public static function current_url() {
-    return 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
-  }
-
-  // require_add and require_install have been removed.
-  // see http://developer.facebook.com/news.php?blog=1&story=116 for more details
-  public function require_login($required_permissions = '') {
-    $user = $this->get_loggedin_user();
-    $has_permissions = true;
-
-    if ($required_permissions) {
-      $this->require_frame();
-      $permissions = array_map('trim', explode(',', $required_permissions));
-      foreach ($permissions as $permission) {
-        if (!in_array($permission, $this->ext_perms)) {
-          $has_permissions = false;
-          break;
-        }
-      }
-    }
-
-    if ($user && $has_permissions) {
-      return $user;
-    }
-
-    $this->redirect(
-      $this->get_login_url(self::current_url(), $this->in_frame(),
-                           $required_permissions));
-  }
-
-  public function require_frame() {
-    if (!$this->in_frame()) {
-      $this->redirect($this->get_login_url(self::current_url(), true));
-    }
-  }
-
-  public static function get_facebook_url($subdomain='www') {
-    return 'http://' . $subdomain . '.facebook.com';
-  }
-
-  public function get_install_url($next=null) {
-    // this was renamed, keeping for compatibility's sake
-    return $this->get_add_url($next);
-  }
-
-  public function get_add_url($next=null) {
-    $page = self::get_facebook_url().'/add.php';
-    $params = array('api_key' => $this->api_key);
-
-    if ($next) {
-      $params['next'] = $next;
-    }
-
-    return $page . '?' . http_build_query($params);
-  }
-
-  public function get_login_url($next, $canvas, $req_perms = '') {
-    $page = self::get_facebook_url().'/login.php';
-    $params = array('api_key'   => $this->api_key,
-                    'v'         => '1.0',
-                    'req_perms' => $req_perms);
-
-    if ($next) {
-      $params['next'] = $next;
-    }
-    if ($canvas) {
-      $params['canvas'] = '1';
-    }
-
-    return $page . '?' . http_build_query($params);
-  }
-
-  public function get_logout_url($next) {
-    $page = self::get_facebook_url().'/logout.php';
-    $params = array('app_key'     => $this->api_key,
-                    'session_key' => $this->api_client->session_key);
-
-    if ($next) {
-      $params['connect_next'] = 1;
-      $params['next'] = $next;
-    }
-
-    return $page . '?' . http_build_query($params);
-  }
-
-  public function set_user($user, $session_key, $expires=null, $session_secret=null) {
-    if (!$this->in_fb_canvas() && (!isset($_COOKIE[$this->api_key . '_user'])
-                                   || $_COOKIE[$this->api_key . '_user'] != $user)) {
-      $this->set_cookies($user, $session_key, $expires, $session_secret);
-    }
-    $this->user = $user;
-    $this->api_client->session_key = $session_key;
-    $this->session_expires = $expires;
-  }
-
-  public function set_cookies($user, $session_key, $expires=null, $session_secret=null) {
-    $cookies = array();
-    $cookies['user'] = $user;
-    $cookies['session_key'] = $session_key;
-    if ($expires != null) {
-      $cookies['expires'] = $expires;
-    }
-    if ($session_secret != null) {
-      $cookies['ss'] = $session_secret;
-    }
-
-    foreach ($cookies as $name => $val) {
-      setcookie($this->api_key . '_' . $name, $val, (int)$expires, '', $this->base_domain);
-      $_COOKIE[$this->api_key . '_' . $name] = $val;
-    }
-    $sig = self::generate_sig($cookies, $this->secret);
-    setcookie($this->api_key, $sig, (int)$expires, '', $this->base_domain);
-    $_COOKIE[$this->api_key] = $sig;
-
-    if ($this->base_domain != null) {
-      $base_domain_cookie = 'base_domain_' . $this->api_key;
-      setcookie($base_domain_cookie, $this->base_domain, (int)$expires, '', $this->base_domain);
-      $_COOKIE[$base_domain_cookie] = $this->base_domain;
-    }
-  }
-
-  /**
-   * Tries to undo the badness of magic quotes as best we can
-   * @param     string   $val   Should come directly from $_GET, $_POST, etc.
-   * @return    string   val without added slashes
-   */
-  public static function no_magic_quotes($val) {
-    if (get_magic_quotes_gpc()) {
-      return stripslashes($val);
-    } else {
-      return $val;
-    }
-  }
-
-  /*
-   * Get the signed parameters that were sent from Facebook. Validates the set
-   * of parameters against the included signature.
-   *
-   * Since Facebook sends data to your callback URL via unsecured means, the
-   * signature is the only way to make sure that the data actually came from
-   * Facebook. So if an app receives a request at the callback URL, it should
-   * always verify the signature that comes with against your own secret key.
-   * Otherwise, it's possible for someone to spoof a request by
-   * pretending to be someone else, i.e.:
-   *      www.your-callback-url.com/?fb_user=10101
-   *
-   * This is done automatically by verify_fb_params.
-   *
-   * @param  assoc  $params     a full array of external parameters.
-   *                            presumed $_GET, $_POST, or $_COOKIE
-   * @param  int    $timeout    number of seconds that the args are good for.
-   *                            Specifically good for forcing cookies to expire.
-   * @param  string $namespace  prefix string for the set of parameters we want
-   *                            to verify. i.e., fb_sig or fb_post_sig
-   *
-   * @return  assoc the subset of parameters containing the given prefix,
-   *                and also matching the signature associated with them.
-   *          OR    an empty array if the params do not validate
-   */
-  public function get_valid_fb_params($params, $timeout=null, $namespace='fb_sig') {
-    $prefix = $namespace . '_';
-    $prefix_len = strlen($prefix);
-    $fb_params = array();
-    if (empty($params)) {
-      return array();
-    }
-
-    foreach ($params as $name => $val) {
-      // pull out only those parameters that match the prefix
-      // note that the signature itself ($params[$namespace]) is not in the list
-      if (strpos($name, $prefix) === 0) {
-        $fb_params[substr($name, $prefix_len)] = self::no_magic_quotes($val);
-      }
-    }
-
-    // validate that the request hasn't expired. this is most likely
-    // for params that come from $_COOKIE
-    if ($timeout && (!isset($fb_params['time']) || time() - $fb_params['time'] > $timeout)) {
-      return array();
-    }
-
-    // validate that the params match the signature
-    $signature = isset($params[$namespace]) ? $params[$namespace] : null;
-    if (!$signature || (!$this->verify_signature($fb_params, $signature))) {
-      return array();
-    }
-    return $fb_params;
-  }
-
-  /**
-   *  Validates the account that a user was trying to set up an
-   *  independent account through Facebook Connect.
-   *
-   *  @param  user The user attempting to set up an independent account.
-   *  @param  hash The hash passed to the reclamation URL used.
-   *  @return bool True if the user is the one that selected the
-   *               reclamation link.
-   */
-  public function verify_account_reclamation($user, $hash) {
-    return $hash == md5($user . $this->secret);
-  }
-
-  /**
-   * Validates that a given set of parameters match their signature.
-   * Parameters all match a given input prefix, such as "fb_sig".
-   *
-   * @param $fb_params     an array of all Facebook-sent parameters,
-   *                       not including the signature itself
-   * @param $expected_sig  the expected result to check against
-   */
-  public function verify_signature($fb_params, $expected_sig) {
-    return self::generate_sig($fb_params, $this->secret) == $expected_sig;
-  }
-
-  /**
-   * Validate the given signed public session data structure with
-   * public key of the app that
-   * the session proof belongs to.
-   *
-   * @param $signed_data the session info that is passed by another app
-   * @param string $public_key Optional public key of the app. If this
-   *               is not passed, function will make an API call to get it.
-   * return true if the session proof passed verification.
-   */
-  public function verify_signed_public_session_data($signed_data,
-                                                    $public_key = null) {
-
-    // If public key is not already provided, we need to get it through API
-    if (!$public_key) {
-      $public_key = $this->api_client->auth_getAppPublicKey(
-        $signed_data['api_key']);
-    }
-
-    // Create data to verify
-    $data_to_serialize = $signed_data;
-    unset($data_to_serialize['sig']);
-    $serialized_data = implode('_', $data_to_serialize);
-
-    // Decode signature
-    $signature = base64_decode($signed_data['sig']);
-    $result = openssl_verify($serialized_data, $signature, $public_key,
-                             OPENSSL_ALGO_SHA1);
-    return $result == 1;
-  }
-
-  /*
-   * Generate a signature using the application secret key.
-   *
-   * The only two entities that know your secret key are you and Facebook,
-   * according to the Terms of Service. Since nobody else can generate
-   * the signature, you can rely on it to verify that the information
-   * came from Facebook.
-   *
-   * @param $params_array   an array of all Facebook-sent parameters,
-   *                        NOT INCLUDING the signature itself
-   * @param $secret         your app's secret key
-   *
-   * @return a hash to be checked against the signature provided by Facebook
-   */
-  public static function generate_sig($params_array, $secret) {
-    $str = '';
-
-    ksort($params_array);
-    // Note: make sure that the signature parameter is not already included in
-    //       $params_array.
-    foreach ($params_array as $k=>$v) {
-      $str .= "$k=$v";
-    }
-    $str .= $secret;
-
-    return md5($str);
-  }
-
-  public function encode_validationError($summary, $message) {
-    return json_encode(
-               array('errorCode'    => FACEBOOK_API_VALIDATION_ERROR,
-                     'errorTitle'   => $summary,
-                     'errorMessage' => $message));
-  }
-
-  public function encode_multiFeedStory($feed, $next) {
-    return json_encode(
-               array('method'   => 'multiFeedStory',
-                     'content'  =>
-                     array('next' => $next,
-                           'feed' => $feed)));
-  }
-
-  public function encode_feedStory($feed, $next) {
-    return json_encode(
-               array('method'   => 'feedStory',
-                     'content'  =>
-                     array('next' => $next,
-                           'feed' => $feed)));
-  }
-
-  public function create_templatizedFeedStory($title_template, $title_data=array(),
-                                    $body_template='', $body_data = array(), $body_general=null,
-                                    $image_1=null, $image_1_link=null,
-                                    $image_2=null, $image_2_link=null,
-                                    $image_3=null, $image_3_link=null,
-                                    $image_4=null, $image_4_link=null) {
-    return array('title_template'=> $title_template,
-                 'title_data'   => $title_data,
-                 'body_template'=> $body_template,
-                 'body_data'    => $body_data,
-                 'body_general' => $body_general,
-                 'image_1'      => $image_1,
-                 'image_1_link' => $image_1_link,
-                 'image_2'      => $image_2,
-                 'image_2_link' => $image_2_link,
-                 'image_3'      => $image_3,
-                 'image_3_link' => $image_3_link,
-                 'image_4'      => $image_4,
-                 'image_4_link' => $image_4_link);
-  }
-
-
-}
-
diff --git a/plugins/Facebook/facebook/facebook_desktop.php b/plugins/Facebook/facebook/facebook_desktop.php
deleted file mode 100644
index ed4762215b..0000000000
--- a/plugins/Facebook/facebook/facebook_desktop.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-// Copyright 2004-2009 Facebook. All Rights Reserved.
-//
-// +---------------------------------------------------------------------------+
-// | Facebook Platform PHP5 client                                             |
-// +---------------------------------------------------------------------------+
-// | Copyright (c) 2007 Facebook, Inc.                                         |
-// | All rights reserved.                                                      |
-// |                                                                           |
-// | Redistribution and use in source and binary forms, with or without        |
-// | modification, are permitted provided that the following conditions        |
-// | are met:                                                                  |
-// |                                                                           |
-// | 1. Redistributions of source code must retain the above copyright         |
-// |    notice, this list of conditions and the following disclaimer.          |
-// | 2. 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.   |
-// |                                                                           |
-// | THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.         |
-// +---------------------------------------------------------------------------+
-// | For help with this library, contact developers-help@facebook.com          |
-// +---------------------------------------------------------------------------+
-//
-
-/**
- *  This class extends and modifies the "Facebook" class to better
- *  suit desktop apps.
- */
-class FacebookDesktop extends Facebook {
-  // the application secret, which differs from the session secret
-  public $app_secret;
-  public $verify_sig;
-
-  public function __construct($api_key, $secret) {
-    $this->app_secret = $secret;
-    $this->verify_sig = false;
-    parent::__construct($api_key, $secret);
-  }
-
-  public function do_get_session($auth_token) {
-    $this->api_client->secret = $this->app_secret;
-    $this->api_client->session_key = null;
-    $session_info = parent::do_get_session($auth_token);
-    if (!empty($session_info['secret'])) {
-      // store the session secret
-      $this->set_session_secret($session_info['secret']);
-    }
-    return $session_info;
-  }
-
-  public function set_session_secret($session_secret) {
-    $this->secret = $session_secret;
-    $this->api_client->use_session_secret($session_secret);
-  }
-
-  public function require_login() {
-    if ($this->get_loggedin_user()) {
-      try {
-        // try a session-based API call to ensure that we have the correct
-        // session secret
-        $user = $this->api_client->users_getLoggedInUser();
-
-        // now that we have a valid session secret, verify the signature
-        $this->verify_sig = true;
-        if ($this->validate_fb_params(false)) {
-          return $user;
-        } else {
-          // validation failed
-          return null;
-        }
-      } catch (FacebookRestClientException $ex) {
-        if (isset($_GET['auth_token'])) {
-          // if we have an auth_token, use it to establish a session
-          $session_info = $this->do_get_session($_GET['auth_token']);
-          if ($session_info) {
-            return $session_info['uid'];
-          }
-        }
-      }
-    }
-    // if we get here, we need to redirect the user to log in
-    $this->redirect($this->get_login_url(self::current_url(), $this->in_fb_canvas()));
-  }
-
-  public function verify_signature($fb_params, $expected_sig) {
-    // we don't want to verify the signature until we have a valid
-    // session secret
-    if ($this->verify_sig) {
-      return parent::verify_signature($fb_params, $expected_sig);
-    } else {
-      return true;
-    }
-  }
-}
diff --git a/plugins/Facebook/facebook/facebook_mobile.php b/plugins/Facebook/facebook/facebook_mobile.php
deleted file mode 100644
index 5ee7f4ed5b..0000000000
--- a/plugins/Facebook/facebook/facebook_mobile.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-// Copyright 2004-2009 Facebook. All Rights Reserved.
-//
-// +---------------------------------------------------------------------------+
-// | Facebook Platform PHP5 client                                             |
-// +---------------------------------------------------------------------------+
-// | Copyright (c) 2007 Facebook, Inc.                                         |
-// | All rights reserved.                                                      |
-// |                                                                           |
-// | Redistribution and use in source and binary forms, with or without        |
-// | modification, are permitted provided that the following conditions        |
-// | are met:                                                                  |
-// |                                                                           |
-// | 1. Redistributions of source code must retain the above copyright         |
-// |    notice, this list of conditions and the following disclaimer.          |
-// | 2. 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.   |
-// |                                                                           |
-// | THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.         |
-// +---------------------------------------------------------------------------+
-// | For help with this library, contact developers-help@facebook.com          |
-// +---------------------------------------------------------------------------+
-//
-/**
- *  This class extends and modifies the "Facebook" class to better suit wap
- *  apps. Since there is no javascript support, we need to use server redirect
- *  to implement Facebook connect functionalities such as authenticate,
- *  authorize, feed form etc.. This library provide many helper functions for
- *  wap developer to locate the right wap url. The url here is targed at
- *  facebook wap site or wap-friendly url.
- */
-class FacebookMobile extends Facebook {
-  // the application secret, which differs from the session secret
-
-  public function __construct($api_key, $secret, $generate_session_secret=false) {
-    parent::__construct($api_key, $secret, $generate_session_secret);
-  }
-
-  public function redirect($url) {
-    header('Location: '. $url);
-  }
-
-  public function get_m_url($action, $params) {
-    $page = parent::get_facebook_url('m'). '/' .$action;
-    foreach($params as $key => $val) {
-      if (!$val) {
-        unset($params[$key]);
-      }
-    }
-    return $page . '?' . http_build_query($params);
-  }
-
-  public function get_www_url($action, $params) {
-    $page = parent::get_facebook_url('www'). '/' .$action;
-    foreach($params as $key => $val) {
-      if (!$val) {
-        unset($params[$key]);
-      }
-    }
-    return $page . '?' . http_build_query($params);
-  }
-
-  public function get_add_url($next=null) {
-
-    return $this->get_m_url('add.php', array('api_key' => $this->api_key,
-                                             'next'    => $next));
-  }
-
-  public function get_tos_url($next=null, $cancel = null, $canvas=null) {
-    return $this->get_m_url('tos.php', array('api_key' => $this->api_key,
-                                             'v'       => '1.0',
-                                             'next'    => $next,
-                                             'canvas'  => $canvas,
-                                             'cancel'   => $cancel));
-  }
-
-  public function get_logout_url($next=null) {
-    $params = array('api_key'     => $this->api_key,
-                    'session_key' => $this->api_client->session_key,
-                   );
-
-    if ($next) {
-      $params['connect_next'] = 1;
-      $params['next'] = $next;
-    }
-
-    return $this->get_m_url('logout.php', $params);
-  }
-  public function get_register_url($next=null, $cancel_url=null) {
-    return $this->get_m_url('r.php',
-      array('fbconnect' => 1,
-            'api_key' => $this->api_key,
-            'next' => $next ? $next : parent::current_url(),
-            'cancel_url' => $cancel_url ? $cancel_url : parent::current_url()));
-  }
-  /**
-   * These set of fbconnect style url redirect back to the application current
-   * page when the action is done. Developer can also use the non fbconnect
-   * style url and provide their own redirect link by giving the right parameter
-   * to $next and/or $cancel_url
-   */
-  public function get_fbconnect_register_url() {
-    return $this->get_register_url(parent::current_url(), parent::current_url());
-  }
-  public function get_fbconnect_tos_url() {
-    return $this->get_tos_url(parent::current_url(), parent::current_url(), $this->in_frame());
-  }
-
-  public function get_fbconnect_logout_url() {
-    return $this->get_logout_url(parent::current_url());
-  }
-
-  public function logout_user() {
-    $this->user = null;
-  }
-
-  public function get_prompt_permissions_url($ext_perm,
-                                             $next=null,
-                                             $cancel_url=null) {
-
-    return $this->get_www_url('connect/prompt_permissions.php',
-      array('api_key' => $this->api_key,
-            'ext_perm' => $ext_perm,
-            'next' => $next ? $next : parent::current_url(),
-            'cancel' => $cancel_url ? $cancel_url : parent::current_url(),
-            'display' => 'wap'));
-
-  }
-
-  /**
-   * support both prompt_permissions.php and authorize.php for now.
-   * authorized.php is to be deprecate though.
-   */
-  public function get_extended_permission_url($ext_perm,
-                                              $next=null,
-                                              $cancel_url=null) {
-    $next = $next ? $next : parent::current_url();
-    $cancel_url = $cancel_url ? $cancel_url : parent::current_url();
-
-    return $this->get_m_url('authorize.php',
-                      array('api_key' => $this->api_key,
-                            'ext_perm' => $ext_perm,
-                            'next' => $next,
-                            'cancel_url' => $cancel_url));
-
-  }
-
-  public function render_prompt_feed_url($action_links=NULL,
-                                         $target_id=NULL,
-                                         $message='',
-                                         $user_message_prompt='',
-                                         $caption=NULL,
-                                         $callback ='',
-                                         $cancel='',
-                                         $attachment=NULL,
-                                         $preview=true) {
-
-    $params = array('api_key'     => $this->api_key,
-                    'session_key' => $this->api_client->session_key,
-                   );
-    if (!empty($attachment)) {
-      $params['attachment'] = urlencode(json_encode($attachment));
-    } else {
-      $attachment = new stdClass();
-      $app_display_info = $this->api_client->admin_getAppProperties(array('application_name',
-                                                                          'callback_url',
-                                                                          'description',
-                                                                          'logo_url'));
-      $app_display_info = $app_display_info;
-      $attachment->name = $app_display_info['application_name'];
-      $attachment->caption = !empty($caption) ? $caption : 'Just see what\'s new!';
-      $attachment->description = $app_display_info['description'];
-      $attachment->href = $app_display_info['callback_url'];
-      if (!empty($app_display_info['logo_url'])) {
-        $logo = new stdClass();
-        $logo->type = 'image';
-        $logo->src = $app_display_info['logo_url'];
-        $logo->href = $app_display_info['callback_url'];
-        $attachment->media = array($logo);
-      }
-      $params['attachment'] = urlencode(json_encode($attachment));
-    }
-    $params['preview'] = $preview;
-    $params['message'] = $message;
-    $params['user_message_prompt'] = $user_message_prompt;
-    if (!empty($callback)) {
-      $params['callback'] = $callback;
-    } else {
-      $params['callback'] = $this->current_url();
-    }
-    if (!empty($cancel)) {
-      $params['cancel'] = $cancel;
-    } else {
-      $params['cancel'] = $this->current_url();
-    }
-
-    if (!empty($target_id)) {
-      $params['target_id'] = $target_id;
-    }
-    if (!empty($action_links)) {
-      $params['action_links'] = urlencode(json_encode($action_links));
-    }
-
-    $params['display'] = 'wap';
-    header('Location: '. $this->get_www_url('connect/prompt_feed.php', $params));
-  }
-
-//use template_id
-  public function render_feed_form_url($template_id=NULL,
-                                       $template_data=NULL,
-                                       $user_message=NULL,
-                                       $body_general=NULL,
-                                       $user_message_prompt=NULL,
-                                       $target_id=NULL,
-                                       $callback=NULL,
-                                       $cancel=NULL,
-                                       $preview=true) {
-
-    $params = array('api_key' => $this->api_key);
-    $params['preview'] = $preview;
-    if (isset($template_id) && $template_id) {
-      $params['template_id'] = $template_id;
-    }
-    $params['message'] = $user_message ? $user_message['value'] : '';
-    if (isset($body_general) && $body_general) {
-      $params['body_general'] = $body_general;
-    }
-    if (isset($user_message_prompt) && $user_message_prompt) {
-      $params['user_message_prompt'] = $user_message_prompt;
-    }
-    if (isset($callback) && $callback) {
-      $params['callback'] = $callback;
-    } else {
-      $params['callback'] = $this->current_url();
-    }
-    if (isset($cancel) && $cancel) {
-      $params['cancel'] = $cancel;
-    } else {
-      $params['cancel'] = $this->current_url();
-    }
-    if (isset($template_data) && $template_data) {
-      $params['template_data'] = $template_data;
-    }
-    if (isset($target_id) && $target_id) {
-      $params['to_ids'] = $target_id;
-    }
-    $params['display'] = 'wap';
-    header('Location: '. $this->get_www_url('connect/prompt_feed.php', $params));
-  }
-}
diff --git a/plugins/Facebook/facebook/facebookapi_php5_restlib.php b/plugins/Facebook/facebook/facebookapi_php5_restlib.php
deleted file mode 100755
index e249a326b2..0000000000
--- a/plugins/Facebook/facebook/facebookapi_php5_restlib.php
+++ /dev/null
@@ -1,3702 +0,0 @@
-<?php
-// Copyright 2004-2009 Facebook. All Rights Reserved.
-//
-// +---------------------------------------------------------------------------+
-// | Facebook Platform PHP5 client                                             |
-// +---------------------------------------------------------------------------+
-// | Copyright (c) 2007-2009 Facebook, Inc.                                    |
-// | All rights reserved.                                                      |
-// |                                                                           |
-// | Redistribution and use in source and binary forms, with or without        |
-// | modification, are permitted provided that the following conditions        |
-// | are met:                                                                  |
-// |                                                                           |
-// | 1. Redistributions of source code must retain the above copyright         |
-// |    notice, this list of conditions and the following disclaimer.          |
-// | 2. 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.   |
-// |                                                                           |
-// | THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.         |
-// +---------------------------------------------------------------------------+
-// | For help with this library, contact developers-help@facebook.com          |
-// +---------------------------------------------------------------------------+
-//
-
-include_once 'jsonwrapper/jsonwrapper.php';
-
-class FacebookRestClient {
-  public $secret;
-  public $session_key;
-  public $api_key;
-  // to save making the friends.get api call, this will get prepopulated on
-  // canvas pages
-  public $friends_list;
-  public $user;
-  // to save making the pages.isAppAdded api call, this will get prepopulated
-  // on canvas pages
-  public $added;
-  public $is_user;
-  // we don't pass friends list to iframes, but we want to make
-  // friends_get really simple in the canvas_user (non-logged in) case.
-  // So we use the canvas_user as default arg to friends_get
-  public $canvas_user;
-  public $batch_mode;
-  private $batch_queue;
-  private $pending_batch;
-  private $call_as_apikey;
-  private $use_curl_if_available;
-  private $format = null;
-  private $using_session_secret = false;
-  private $rawData = null;
-
-  const BATCH_MODE_DEFAULT = 0;
-  const BATCH_MODE_SERVER_PARALLEL = 0;
-  const BATCH_MODE_SERIAL_ONLY = 2;
-
-  /**
-   * Create the client.
-   * @param string $session_key if you haven't gotten a session key yet, leave
-   *                            this as null and then set it later by just
-   *                            directly accessing the $session_key member
-   *                            variable.
-   */
-  public function __construct($api_key, $secret, $session_key=null) {
-    $this->secret       = $secret;
-    $this->session_key  = $session_key;
-    $this->api_key      = $api_key;
-    $this->batch_mode = FacebookRestClient::BATCH_MODE_DEFAULT;
-    $this->last_call_id = 0;
-    $this->call_as_apikey = '';
-    $this->use_curl_if_available = true;
-    $this->server_addr =
-      Facebook::get_facebook_url('api') . '/restserver.php';
-    $this->photo_server_addr =
-      Facebook::get_facebook_url('api-photo') . '/restserver.php';
-
-    if (!empty($GLOBALS['facebook_config']['debug'])) {
-      $this->cur_id = 0;
-      ?>
-<script type="text/javascript">
-var types = ['params', 'xml', 'php', 'sxml'];
-function getStyle(elem, style) {
-  if (elem.getStyle) {
-    return elem.getStyle(style);
-  } else {
-    return elem.style[style];
-  }
-}
-function setStyle(elem, style, value) {
-  if (elem.setStyle) {
-    elem.setStyle(style, value);
-  } else {
-    elem.style[style] = value;
-  }
-}
-function toggleDisplay(id, type) {
-  for (var i = 0; i < types.length; i++) {
-    var t = types[i];
-    var pre = document.getElementById(t + id);
-    if (pre) {
-      if (t != type || getStyle(pre, 'display') == 'block') {
-        setStyle(pre, 'display', 'none');
-      } else {
-        setStyle(pre, 'display', 'block');
-      }
-    }
-  }
-  return false;
-}
-</script>
-<?php
-    }
-  }
-
-  /**
-   * Set the default user id for methods that allow the caller
-   * to pass an uid parameter to identify the target user
-   * instead of a session key. This currently applies to
-   * the user preferences methods.
-   *
-   * @param $uid int the user id
-   */
-  public function set_user($uid) {
-    $this->user = $uid;
-  }
-
-
-  /**
-   * Switch to use the session secret instead of the app secret,
-   * for desktop and unsecured environment
-   */
-  public function use_session_secret($session_secret) {
-    $this->secret = $session_secret;
-    $this->using_session_secret = true;
-  }
-
-  /**
-   * Normally, if the cURL library/PHP extension is available, it is used for
-   * HTTP transactions.  This allows that behavior to be overridden, falling
-   * back to a vanilla-PHP implementation even if cURL is installed.
-   *
-   * @param $use_curl_if_available bool whether or not to use cURL if available
-   */
-  public function set_use_curl_if_available($use_curl_if_available) {
-    $this->use_curl_if_available = $use_curl_if_available;
-  }
-
-  /**
-   * Start a batch operation.
-   */
-  public function begin_batch() {
-    if ($this->pending_batch()) {
-      $code = FacebookAPIErrorCodes::API_EC_BATCH_ALREADY_STARTED;
-      $description = FacebookAPIErrorCodes::$api_error_descriptions[$code];
-      throw new FacebookRestClientException($description, $code);
-    }
-
-    $this->batch_queue = array();
-    $this->pending_batch = true;
-  }
-
-  /*
-   * End current batch operation
-   */
-  public function end_batch() {
-    if (!$this->pending_batch()) {
-      $code = FacebookAPIErrorCodes::API_EC_BATCH_NOT_STARTED;
-      $description = FacebookAPIErrorCodes::$api_error_descriptions[$code];
-      throw new FacebookRestClientException($description, $code);
-    }
-
-    $this->pending_batch = false;
-
-    $this->execute_server_side_batch();
-    $this->batch_queue = null;
-  }
-
-  /**
-   * are we currently queueing up calls for a batch?
-   */
-  public function pending_batch() {
-    return $this->pending_batch;
-  }
-
-  private function execute_server_side_batch() {
-    $item_count = count($this->batch_queue);
-    $method_feed = array();
-    foreach ($this->batch_queue as $batch_item) {
-      $method = $batch_item['m'];
-      $params = $batch_item['p'];
-      list($get, $post) = $this->finalize_params($method, $params);
-      $method_feed[] = $this->create_url_string(array_merge($post, $get));
-    }
-
-    $serial_only =
-      ($this->batch_mode == FacebookRestClient::BATCH_MODE_SERIAL_ONLY);
-
-    $params = array('method_feed' => json_encode($method_feed),
-                    'serial_only' => $serial_only,
-                    'format' => $this->format);
-    $result = $this->call_method('facebook.batch.run', $params);
-
-    if (is_array($result) && isset($result['error_code'])) {
-      throw new FacebookRestClientException($result['error_msg'],
-                                            $result['error_code']);
-    }
-
-    for ($i = 0; $i < $item_count; $i++) {
-      $batch_item = $this->batch_queue[$i];
-      $batch_item['p']['format'] = $this->format;
-      $batch_item_result = $this->convert_result($result[$i],
-                                                 $batch_item['m'],
-                                                 $batch_item['p']);
-
-      if (is_array($batch_item_result) &&
-          isset($batch_item_result['error_code'])) {
-        throw new FacebookRestClientException($batch_item_result['error_msg'],
-                                              $batch_item_result['error_code']);
-      }
-      $batch_item['r'] = $batch_item_result;
-    }
-  }
-
-  public function begin_permissions_mode($permissions_apikey) {
-    $this->call_as_apikey = $permissions_apikey;
-  }
-
-  public function end_permissions_mode() {
-    $this->call_as_apikey = '';
-  }
-
-
-  /*
-   * If a page is loaded via HTTPS, then all images and static
-   * resources need to be printed with HTTPS urls to avoid
-   * mixed content warnings. If your page loads with an HTTPS
-   * url, then call set_use_ssl_resources to retrieve the correct
-   * urls.
-   */
-  public function set_use_ssl_resources($is_ssl = true) {
-    $this->use_ssl_resources = $is_ssl;
-  }
-
-  /**
-   * Returns public information for an application (as shown in the application
-   * directory) by either application ID, API key, or canvas page name.
-   *
-   * @param int $application_id              (Optional) app id
-   * @param string $application_api_key      (Optional) api key
-   * @param string $application_canvas_name  (Optional) canvas name
-   *
-   * Exactly one argument must be specified, otherwise it is an error.
-   *
-   * @return array  An array of public information about the application.
-   */
-  public function application_getPublicInfo($application_id=null,
-                                            $application_api_key=null,
-                                            $application_canvas_name=null) {
-    return $this->call_method('facebook.application.getPublicInfo',
-        array('application_id' => $application_id,
-              'application_api_key' => $application_api_key,
-              'application_canvas_name' => $application_canvas_name));
-  }
-
-  /**
-   * Creates an authentication token to be used as part of the desktop login
-   * flow.  For more information, please see
-   * http://wiki.developers.facebook.com/index.php/Auth.createToken.
-   *
-   * @return string  An authentication token.
-   */
-  public function auth_createToken() {
-    return $this->call_method('facebook.auth.createToken');
-  }
-
-  /**
-   * Returns the session information available after current user logs in.
-   *
-   * @param string $auth_token the token returned by auth_createToken or
-   *               passed back to your callback_url.
-   * @param bool $generate_session_secret whether the session returned should
-   *             include a session secret
-   * @param string $host_url the connect site URL for which the session is
-   *               being generated.  This parameter is optional, unless
-   *               you want Facebook to determine which of several base domains
-   *               to choose from.  If this third argument isn't provided but
-   *               there are several base domains, the first base domain is
-   *               chosen.
-   *
-   * @return array  An assoc array containing session_key, uid
-   */
-  public function auth_getSession($auth_token,
-                                  $generate_session_secret = false,
-                                  $host_url = null) {
-    if (!$this->pending_batch()) {
-      $result = $this->call_method(
-        'facebook.auth.getSession',
-        array('auth_token' => $auth_token,
-              'generate_session_secret' => $generate_session_secret,
-              'host_url' => $host_url));
-      $this->session_key = $result['session_key'];
-
-      if (!empty($result['secret']) && !$generate_session_secret) {
-        // desktop apps have a special secret
-        $this->secret = $result['secret'];
-      }
-
-      return $result;
-    }
-  }
-
-  /**
-   * Generates a session-specific secret. This is for integration with
-   * client-side API calls, such as the JS library.
-   *
-   * @return array  A session secret for the current promoted session
-   *
-   * @error API_EC_PARAM_SESSION_KEY
-   *        API_EC_PARAM_UNKNOWN
-   */
-  public function auth_promoteSession() {
-      return $this->call_method('facebook.auth.promoteSession');
-  }
-
-  /**
-   * Expires the session that is currently being used.  If this call is
-   * successful, no further calls to the API (which require a session) can be
-   * made until a valid session is created.
-   *
-   * @return bool  true if session expiration was successful, false otherwise
-   */
-  public function auth_expireSession() {
-      return $this->call_method('facebook.auth.expireSession');
-  }
-
-  /**
-   *  Revokes the given extended permission that the user granted at some
-   *  prior time (for instance, offline_access or email).  If no user is
-   *  provided, it will be revoked for the user of the current session.
-   *
-   *  @param  string  $perm  The permission to revoke
-   *  @param  int     $uid   The user for whom to revoke the permission.
-   */
-  public function auth_revokeExtendedPermission($perm, $uid=null) {
-    return $this->call_method('facebook.auth.revokeExtendedPermission',
-        array('perm' => $perm, 'uid' => $uid));
-  }
-
-  /**
-   * Revokes the user's agreement to the Facebook Terms of Service for your
-   * application.  If you call this method for one of your users, you will no
-   * longer be able to make API requests on their behalf until they again
-   * authorize your application.  Use with care.  Note that if this method is
-   * called without a user parameter, then it will revoke access for the
-   * current session's user.
-   *
-   * @param int $uid  (Optional) User to revoke
-   *
-   * @return bool  true if revocation succeeds, false otherwise
-   */
-  public function auth_revokeAuthorization($uid=null) {
-      return $this->call_method('facebook.auth.revokeAuthorization',
-          array('uid' => $uid));
-  }
-
-  /**
-   * Get public key that is needed to verify digital signature
-   * an app may pass to other apps. The public key is only used by
-   * other apps for verification purposes.
-   * @param  string  API key of an app
-   * @return string  The public key for the app.
-   */
-  public function auth_getAppPublicKey($target_app_key) {
-    return $this->call_method('facebook.auth.getAppPublicKey',
-          array('target_app_key' => $target_app_key));
-  }
-
-  /**
-   * Get a structure that can be passed to another app
-   * as proof of session. The other app can verify it using public
-   * key of this app.
-   *
-   * @return signed public session data structure.
-   */
-  public function auth_getSignedPublicSessionData() {
-    return $this->call_method('facebook.auth.getSignedPublicSessionData',
-                              array());
-  }
-
-  /**
-   * Returns the number of unconnected friends that exist in this application.
-   * This number is determined based on the accounts registered through
-   * connect.registerUsers() (see below).
-   */
-  public function connect_getUnconnectedFriendsCount() {
-    return $this->call_method('facebook.connect.getUnconnectedFriendsCount',
-        array());
-  }
-
- /**
-  * This method is used to create an association between an external user
-  * account and a Facebook user account, as per Facebook Connect.
-  *
-  * This method takes an array of account data, including a required email_hash
-  * and optional account data. For each connected account, if the user exists,
-  * the information is added to the set of the user's connected accounts.
-  * If the user has already authorized the site, the connected account is added
-  * in the confirmed state. If the user has not yet authorized the site, the
-  * connected account is added in the pending state.
-  *
-  * This is designed to help Facebook Connect recognize when two Facebook
-  * friends are both members of a external site, but perhaps are not aware of
-  * it.  The Connect dialog (see fb:connect-form) is used when friends can be
-  * identified through these email hashes. See the following url for details:
-  *
-  *   http://wiki.developers.facebook.com/index.php/Connect.registerUsers
-  *
-  * @param mixed $accounts A (JSON-encoded) array of arrays, where each array
-  *                        has three properties:
-  *                        'email_hash'  (req) - public email hash of account
-  *                        'account_id'  (opt) - remote account id;
-  *                        'account_url' (opt) - url to remote account;
-  *
-  * @return array  The list of email hashes for the successfully registered
-  *                accounts.
-  */
-  public function connect_registerUsers($accounts) {
-    return $this->call_method('facebook.connect.registerUsers',
-        array('accounts' => $accounts));
-  }
-
- /**
-  * Unregisters a set of accounts registered using connect.registerUsers.
-  *
-  * @param array $email_hashes  The (JSON-encoded) list of email hashes to be
-  *                             unregistered.
-  *
-  * @return array  The list of email hashes which have been successfully
-  *                unregistered.
-  */
-  public function connect_unregisterUsers($email_hashes) {
-    return $this->call_method('facebook.connect.unregisterUsers',
-        array('email_hashes' => $email_hashes));
-  }
-
-  /**
-   * Returns events according to the filters specified.
-   *
-   * @param int $uid            (Optional) User associated with events. A null
-   *                            parameter will default to the session user.
-   * @param array/string $eids  (Optional) Filter by these event
-   *                            ids. A null parameter will get all events for
-   *                            the user. (A csv list will work but is deprecated)
-   * @param int $start_time     (Optional) Filter with this unix time as lower
-   *                            bound.  A null or zero parameter indicates no
-   *                            lower bound.
-   * @param int $end_time       (Optional) Filter with this UTC as upper bound.
-   *                            A null or zero parameter indicates no upper
-   *                            bound.
-   * @param string $rsvp_status (Optional) Only show events where the given uid
-   *                            has this rsvp status.  This only works if you
-   *                            have specified a value for $uid.  Values are as
-   *                            in events.getMembers.  Null indicates to ignore
-   *                            rsvp status when filtering.
-   *
-   * @return array  The events matching the query.
-   */
-  public function &events_get($uid=null,
-                              $eids=null,
-                              $start_time=null,
-                              $end_time=null,
-                              $rsvp_status=null) {
-    return $this->call_method('facebook.events.get',
-        array('uid' => $uid,
-              'eids' => $eids,
-              'start_time' => $start_time,
-              'end_time' => $end_time,
-              'rsvp_status' => $rsvp_status));
-  }
-
-  /**
-   * Returns membership list data associated with an event.
-   *
-   * @param int $eid  event id
-   *
-   * @return array  An assoc array of four membership lists, with keys
-   *                'attending', 'unsure', 'declined', and 'not_replied'
-   */
-  public function &events_getMembers($eid) {
-    return $this->call_method('facebook.events.getMembers',
-      array('eid' => $eid));
-  }
-
-  /**
-   * RSVPs the current user to this event.
-   *
-   * @param int $eid             event id
-   * @param string $rsvp_status  'attending', 'unsure', or 'declined'
-   *
-   * @return bool  true if successful
-   */
-  public function &events_rsvp($eid, $rsvp_status) {
-    return $this->call_method('facebook.events.rsvp',
-        array(
-        'eid' => $eid,
-        'rsvp_status' => $rsvp_status));
-  }
-
-  /**
-   * Cancels an event. Only works for events where application is the admin.
-   *
-   * @param int $eid                event id
-   * @param string $cancel_message  (Optional) message to send to members of
-   *                                the event about why it is cancelled
-   *
-   * @return bool  true if successful
-   */
-  public function &events_cancel($eid, $cancel_message='') {
-    return $this->call_method('facebook.events.cancel',
-        array('eid' => $eid,
-              'cancel_message' => $cancel_message));
-  }
-
-  /**
-   * Creates an event on behalf of the user is there is a session, otherwise on
-   * behalf of app.  Successful creation guarantees app will be admin.
-   *
-   * @param assoc array $event_info  json encoded event information
-   * @param string $file             (Optional) filename of picture to set
-   *
-   * @return int  event id
-   */
-  public function events_create($event_info, $file = null) {
-    if ($file) {
-      return $this->call_upload_method('facebook.events.create',
-        array('event_info' => $event_info),
-        $file,
-        $this->photo_server_addr);
-    } else {
-      return $this->call_method('facebook.events.create',
-        array('event_info' => $event_info));
-    }
-  }
-
-  /**
-   * Invites users to an event. If a session user exists, the session user
-   * must have permissions to invite friends to the event and $uids must contain
-   * a list of friend ids. Otherwise, the event must have been
-   * created by the app and $uids must contain users of the app.
-   * This method requires the 'create_event' extended permission to
-   * invite people on behalf of a user.
-   *
-   * @param $eid   the event id
-   * @param $uids  an array of users to invite
-   * @param $personal_message  a string containing the user's message
-   *                           (text only)
-   *
-   */
-  public function events_invite($eid, $uids, $personal_message) {
-    return $this->call_method('facebook.events.invite',
-                              array('eid' => $eid,
-                                    'uids' => $uids,
-                                    'personal_message' => $personal_message));
-  }
-
-  /**
-   * Edits an existing event. Only works for events where application is admin.
-   *
-   * @param int $eid                 event id
-   * @param assoc array $event_info  json encoded event information
-   * @param string $file             (Optional) filename of new picture to set
-   *
-   * @return bool  true if successful
-   */
-  public function events_edit($eid, $event_info, $file = null) {
-    if ($file) {
-      return $this->call_upload_method('facebook.events.edit',
-        array('eid' => $eid, 'event_info' => $event_info),
-        $file,
-        $this->photo_server_addr);
-    } else {
-      return $this->call_method('facebook.events.edit',
-        array('eid' => $eid,
-        'event_info' => $event_info));
-    }
-  }
-
-  /**
-   * Fetches and re-caches the image stored at the given URL, for use in images
-   * published to non-canvas pages via the API (for example, to user profiles
-   * via profile.setFBML, or to News Feed via feed.publishUserAction).
-   *
-   * @param string $url  The absolute URL from which to refresh the image.
-   *
-   * @return bool  true on success
-   */
-  public function &fbml_refreshImgSrc($url) {
-    return $this->call_method('facebook.fbml.refreshImgSrc',
-        array('url' => $url));
-  }
-
-  /**
-   * Fetches and re-caches the content stored at the given URL, for use in an
-   * fb:ref FBML tag.
-   *
-   * @param string $url  The absolute URL from which to fetch content. This URL
-   *                     should be used in a fb:ref FBML tag.
-   *
-   * @return bool  true on success
-   */
-  public function &fbml_refreshRefUrl($url) {
-    return $this->call_method('facebook.fbml.refreshRefUrl',
-        array('url' => $url));
-  }
-
- /**
-   * Associates a given "handle" with FBML markup so that the handle can be
-   * used within the fb:ref FBML tag. A handle is unique within an application
-   * and allows an application to publish identical FBML to many user profiles
-   * and do subsequent updates without having to republish FBML on behalf of
-   * each user.
-   *
-   * @param string $handle  The handle to associate with the given FBML.
-   * @param string $fbml    The FBML to associate with the given handle.
-   *
-   * @return bool  true on success
-   */
-  public function &fbml_setRefHandle($handle, $fbml) {
-    return $this->call_method('facebook.fbml.setRefHandle',
-        array('handle' => $handle, 'fbml' => $fbml));
-  }
-
-  /**
-   * Register custom tags for the application. Custom tags can be used
-   * to extend the set of tags available to applications in FBML
-   * markup.
-   *
-   * Before you call this function,
-   * make sure you read the full documentation at
-   *
-   * http://wiki.developers.facebook.com/index.php/Fbml.RegisterCustomTags
-   *
-   * IMPORTANT: This function overwrites the values of
-   * existing tags if the names match. Use this function with care because
-   * it may break the FBML of any application that is using the
-   * existing version of the tags.
-   *
-   * @param mixed $tags an array of tag objects (the full description is on the
-   *   wiki page)
-   *
-   * @return int  the number of tags that were registered
-   */
-  public function &fbml_registerCustomTags($tags) {
-    $tags = json_encode($tags);
-    return $this->call_method('facebook.fbml.registerCustomTags',
-                              array('tags' => $tags));
-  }
-
-  /**
-   * Get the custom tags for an application. If $app_id
-   * is not specified, the calling app's tags are returned.
-   * If $app_id is different from the id of the calling app,
-   * only the app's public tags are returned.
-   * The return value is an array of the same type as
-   * the $tags parameter of fbml_registerCustomTags().
-   *
-   * @param int $app_id the application's id (optional)
-   *
-   * @return mixed  an array containing the custom tag  objects
-   */
-  public function &fbml_getCustomTags($app_id = null) {
-    return $this->call_method('facebook.fbml.getCustomTags',
-                              array('app_id' => $app_id));
-  }
-
-
-  /**
-   * Delete custom tags the application has registered. If
-   * $tag_names is null, all the application's custom tags will be
-   * deleted.
-   *
-   * IMPORTANT: If your application has registered public tags
-   * that other applications may be using, don't delete those tags!
-   * Doing so can break the FBML ofapplications that are using them.
-   *
-   * @param array $tag_names the names of the tags to delete (optinal)
-   * @return bool true on success
-   */
-  public function &fbml_deleteCustomTags($tag_names = null) {
-    return $this->call_method('facebook.fbml.deleteCustomTags',
-                              array('tag_names' => json_encode($tag_names)));
-  }
-
-  /**
-   * Gets the best translations for native strings submitted by an application
-   * for translation. If $locale is not specified, only native strings and their
-   * descriptions are returned. If $all is true, then unapproved translations
-   * are returned as well, otherwise only approved translations are returned.
-   *
-   * A mapping of locale codes -> language names is available at
-   * http://wiki.developers.facebook.com/index.php/Facebook_Locales
-   *
-   * @param string $locale the locale to get translations for, or 'all' for all
-   *                       locales, or 'en_US' for native strings
-   * @param bool   $all    whether to return all or only approved translations
-   *
-   * @return array (locale, array(native_strings, array('best translation
-   *                available given enough votes or manual approval', approval
-   *                                                                  status)))
-   * @error API_EC_PARAM
-   * @error API_EC_PARAM_BAD_LOCALE
-   */
-  public function &intl_getTranslations($locale = 'en_US', $all = false) {
-    return $this->call_method('facebook.intl.getTranslations',
-                              array('locale' => $locale,
-                                    'all'    => $all));
-  }
-
-  /**
-   * Lets you insert text strings in their native language into the Facebook
-   * Translations database so they can be translated.
-   *
-   * @param array $native_strings  An array of maps, where each map has a 'text'
-   *                               field and a 'description' field.
-   *
-   * @return int  Number of strings uploaded.
-   */
-  public function &intl_uploadNativeStrings($native_strings) {
-    return $this->call_method('facebook.intl.uploadNativeStrings',
-        array('native_strings' => json_encode($native_strings)));
-  }
-
-  /**
-   * This method is deprecated for calls made on behalf of users. This method
-   * works only for publishing stories on a Facebook Page that has installed
-   * your application. To publish stories to a user's profile, use
-   * feed.publishUserAction instead.
-   *
-   * For more details on this call, please visit the wiki page:
-   *
-   * http://wiki.developers.facebook.com/index.php/Feed.publishTemplatizedAction
-   */
-  public function &feed_publishTemplatizedAction($title_template,
-                                                 $title_data,
-                                                 $body_template,
-                                                 $body_data,
-                                                 $body_general,
-                                                 $image_1=null,
-                                                 $image_1_link=null,
-                                                 $image_2=null,
-                                                 $image_2_link=null,
-                                                 $image_3=null,
-                                                 $image_3_link=null,
-                                                 $image_4=null,
-                                                 $image_4_link=null,
-                                                 $target_ids='',
-                                                 $page_actor_id=null) {
-    return $this->call_method('facebook.feed.publishTemplatizedAction',
-      array('title_template' => $title_template,
-            'title_data' => $title_data,
-            'body_template' => $body_template,
-            'body_data' => $body_data,
-            'body_general' => $body_general,
-            'image_1' => $image_1,
-            'image_1_link' => $image_1_link,
-            'image_2' => $image_2,
-            'image_2_link' => $image_2_link,
-            'image_3' => $image_3,
-            'image_3_link' => $image_3_link,
-            'image_4' => $image_4,
-            'image_4_link' => $image_4_link,
-            'target_ids' => $target_ids,
-            'page_actor_id' => $page_actor_id));
-  }
-
-  /**
-   * Registers a template bundle.  Template bundles are somewhat involved, so
-   * it's recommended you check out the wiki for more details:
-   *
-   *  http://wiki.developers.facebook.com/index.php/Feed.registerTemplateBundle
-   *
-   * @return string  A template bundle id
-   */
-  public function &feed_registerTemplateBundle($one_line_story_templates,
-                                               $short_story_templates = array(),
-                                               $full_story_template = null,
-                                               $action_links = array()) {
-
-    $one_line_story_templates = json_encode($one_line_story_templates);
-
-    if (!empty($short_story_templates)) {
-      $short_story_templates = json_encode($short_story_templates);
-    }
-
-    if (isset($full_story_template)) {
-      $full_story_template = json_encode($full_story_template);
-    }
-
-    if (isset($action_links)) {
-      $action_links = json_encode($action_links);
-    }
-
-    return $this->call_method('facebook.feed.registerTemplateBundle',
-        array('one_line_story_templates' => $one_line_story_templates,
-              'short_story_templates' => $short_story_templates,
-              'full_story_template' => $full_story_template,
-              'action_links' => $action_links));
-  }
-
-  /**
-   * Retrieves the full list of active template bundles registered by the
-   * requesting application.
-   *
-   * @return array  An array of template bundles
-   */
-  public function &feed_getRegisteredTemplateBundles() {
-    return $this->call_method('facebook.feed.getRegisteredTemplateBundles',
-        array());
-  }
-
-  /**
-   * Retrieves information about a specified template bundle previously
-   * registered by the requesting application.
-   *
-   * @param string $template_bundle_id  The template bundle id
-   *
-   * @return array  Template bundle
-   */
-  public function &feed_getRegisteredTemplateBundleByID($template_bundle_id) {
-    return $this->call_method('facebook.feed.getRegisteredTemplateBundleByID',
-        array('template_bundle_id' => $template_bundle_id));
-  }
-
-  /**
-   * Deactivates a previously registered template bundle.
-   *
-   * @param string $template_bundle_id  The template bundle id
-   *
-   * @return bool  true on success
-   */
-  public function &feed_deactivateTemplateBundleByID($template_bundle_id) {
-    return $this->call_method('facebook.feed.deactivateTemplateBundleByID',
-        array('template_bundle_id' => $template_bundle_id));
-  }
-
-  const STORY_SIZE_ONE_LINE = 1;
-  const STORY_SIZE_SHORT = 2;
-  const STORY_SIZE_FULL = 4;
-
-  /**
-   * Publishes a story on behalf of the user owning the session, using the
-   * specified template bundle. This method requires an active session key in
-   * order to be called.
-   *
-   * The parameters to this method ($templata_data in particular) are somewhat
-   * involved.  It's recommended you visit the wiki for details:
-   *
-   *  http://wiki.developers.facebook.com/index.php/Feed.publishUserAction
-   *
-   * @param int $template_bundle_id  A template bundle id previously registered
-   * @param array $template_data     See wiki article for syntax
-   * @param array $target_ids        (Optional) An array of friend uids of the
-   *                                 user who shared in this action.
-   * @param string $body_general     (Optional) Additional markup that extends
-   *                                 the body of a short story.
-   * @param int $story_size          (Optional) A story size (see above)
-   * @param string $user_message     (Optional) A user message for a short
-   *                                 story.
-   *
-   * @return bool  true on success
-   */
-  public function &feed_publishUserAction(
-      $template_bundle_id, $template_data, $target_ids='', $body_general='',
-      $story_size=FacebookRestClient::STORY_SIZE_ONE_LINE,
-      $user_message='') {
-
-    if (is_array($template_data)) {
-      $template_data = json_encode($template_data);
-    } // allow client to either pass in JSON or an assoc that we JSON for them
-
-    if (is_array($target_ids)) {
-      $target_ids = json_encode($target_ids);
-      $target_ids = trim($target_ids, "[]"); // we don't want square brackets
-    }
-
-    return $this->call_method('facebook.feed.publishUserAction',
-        array('template_bundle_id' => $template_bundle_id,
-              'template_data' => $template_data,
-              'target_ids' => $target_ids,
-              'body_general' => $body_general,
-              'story_size' => $story_size,
-              'user_message' => $user_message));
-  }
-
-
-  /**
-   * Publish a post to the user's stream.
-   *
-   * @param $message        the user's message
-   * @param $attachment     the post's attachment (optional)
-   * @param $action links   the post's action links (optional)
-   * @param $target_id      the user on whose wall the post will be posted
-   *                        (optional)
-   * @param $uid            the actor (defaults to session user)
-   * @return string the post id
-   */
-  public function stream_publish(
-    $message, $attachment = null, $action_links = null, $target_id = null,
-    $uid = null) {
-
-    return $this->call_method(
-      'facebook.stream.publish',
-      array('message' => $message,
-            'attachment' => $attachment,
-            'action_links' => $action_links,
-            'target_id' => $target_id,
-            'uid' => $this->get_uid($uid)));
-  }
-
-  /**
-   * Remove a post from the user's stream.
-   * Currently, you may only remove stories you application created.
-   *
-   * @param $post_id  the post id
-   * @param $uid      the actor (defaults to session user)
-   * @return bool
-   */
-  public function stream_remove($post_id, $uid = null) {
-    return $this->call_method(
-      'facebook.stream.remove',
-      array('post_id' => $post_id,
-            'uid' => $this->get_uid($uid)));
-  }
-
-  /**
-   * Add a comment to a stream post
-   *
-   * @param $post_id  the post id
-   * @param $comment  the comment text
-   * @param $uid      the actor (defaults to session user)
-   * @return string the id of the created comment
-   */
-  public function stream_addComment($post_id, $comment, $uid = null) {
-    return $this->call_method(
-      'facebook.stream.addComment',
-      array('post_id' => $post_id,
-            'comment' => $comment,
-            'uid' => $this->get_uid($uid)));
-  }
-
-
-  /**
-   * Remove a comment from a stream post
-   *
-   * @param $comment_id  the comment id
-   * @param $uid      the actor (defaults to session user)
-   * @return bool
-   */
-  public function stream_removeComment($comment_id, $uid = null) {
-    return $this->call_method(
-      'facebook.stream.removeComment',
-      array('comment_id' => $comment_id,
-            'uid' => $this->get_uid($uid)));
-  }
-
-  /**
-   * Add a like to a stream post
-   *
-   * @param $post_id  the post id
-   * @param $uid      the actor (defaults to session user)
-   * @return bool
-   */
-  public function stream_addLike($post_id, $uid = null) {
-    return $this->call_method(
-      'facebook.stream.addLike',
-      array('post_id' => $post_id,
-            'uid' => $this->get_uid($uid)));
-  }
-
-  /**
-   * Remove a like from a stream post
-   *
-   * @param $post_id  the post id
-   * @param $uid      the actor (defaults to session user)
-   * @return bool
-   */
-  public function stream_removeLike($post_id, $uid = null) {
-    return $this->call_method(
-      'facebook.stream.removeLike',
-      array('post_id' => $post_id,
-            'uid' => $this->get_uid($uid)));
-  }
-
-  /**
-   * For the current user, retrieves stories generated by the user's friends
-   * while using this application.  This can be used to easily create a
-   * "News Feed" like experience.
-   *
-   * @return array  An array of feed story objects.
-   */
-  public function &feed_getAppFriendStories() {
-    return $this->call_method('facebook.feed.getAppFriendStories');
-  }
-
-  /**
-   * Makes an FQL query.  This is a generalized way of accessing all the data
-   * in the API, as an alternative to most of the other method calls.  More
-   * info at http://wiki.developers.facebook.com/index.php/FQL
-   *
-   * @param string $query  the query to evaluate
-   *
-   * @return array  generalized array representing the results
-   */
-  public function &fql_query($query) {
-    return $this->call_method('facebook.fql.query',
-      array('query' => $query));
-  }
-
-  /**
-   * Makes a set of FQL queries in parallel.  This method takes a dictionary
-   * of FQL queries where the keys are names for the queries.  Results from
-   * one query can be used within another query to fetch additional data.  More
-   * info about FQL queries at http://wiki.developers.facebook.com/index.php/FQL
-   *
-   * @param string $queries  JSON-encoded dictionary of queries to evaluate
-   *
-   * @return array  generalized array representing the results
-   */
-  public function &fql_multiquery($queries) {
-    return $this->call_method('facebook.fql.multiquery',
-      array('queries' => $queries));
-  }
-
-  /**
-   * Returns whether or not pairs of users are friends.
-   * Note that the Facebook friend relationship is symmetric.
-   *
-   * @param array/string $uids1  list of ids (id_1, id_2,...)
-   *                       of some length X (csv is deprecated)
-   * @param array/string $uids2  list of ids (id_A, id_B,...)
-   *                       of SAME length X (csv is deprecated)
-   *
-   * @return array  An array with uid1, uid2, and bool if friends, e.g.:
-   *   array(0 => array('uid1' => id_1, 'uid2' => id_A, 'are_friends' => 1),
-   *         1 => array('uid1' => id_2, 'uid2' => id_B, 'are_friends' => 0)
-   *         ...)
-   * @error
-   *    API_EC_PARAM_USER_ID_LIST
-   */
-  public function &friends_areFriends($uids1, $uids2) {
-    return $this->call_method('facebook.friends.areFriends',
-                 array('uids1' => $uids1,
-                       'uids2' => $uids2));
-  }
-
-  /**
-   * Returns the friends of the current session user.
-   *
-   * @param int $flid  (Optional) Only return friends on this friend list.
-   * @param int $uid   (Optional) Return friends for this user.
-   *
-   * @return array  An array of friends
-   */
-  public function &friends_get($flid=null, $uid = null) {
-    if (isset($this->friends_list)) {
-      return $this->friends_list;
-    }
-    $params = array();
-    if (!$uid && isset($this->canvas_user)) {
-      $uid = $this->canvas_user;
-    }
-    if ($uid) {
-      $params['uid'] = $uid;
-    }
-    if ($flid) {
-      $params['flid'] = $flid;
-    }
-    return $this->call_method('facebook.friends.get', $params);
-
-  }
-
-  /**
-   * Returns the mutual friends between the target uid and a source uid or
-   * the current session user.
-   *
-   * @param int $target_uid Target uid for which mutual friends will be found.
-   * @param int $source_uid (optional) Source uid for which mutual friends will
-   *                                   be found. If no source_uid is specified,
-   *                                   source_id will default to the session
-   *                                   user.
-   * @return array  An array of friend uids
-   */
-  public function &friends_getMutualFriends($target_uid, $source_uid = null) {
-    return $this->call_method('facebook.friends.getMutualFriends',
-                              array("target_uid" => $target_uid,
-                                    "source_uid" => $source_uid));
-  }
-
-  /**
-   * Returns the set of friend lists for the current session user.
-   *
-   * @return array  An array of friend list objects
-   */
-  public function &friends_getLists() {
-    return $this->call_method('facebook.friends.getLists');
-  }
-
-  /**
-   * Returns the friends of the session user, who are also users
-   * of the calling application.
-   *
-   * @return array  An array of friends also using the app
-   */
-  public function &friends_getAppUsers() {
-    return $this->call_method('facebook.friends.getAppUsers');
-  }
-
-  /**
-   * Returns groups according to the filters specified.
-   *
-   * @param int $uid     (Optional) User associated with groups.  A null
-   *                     parameter will default to the session user.
-   * @param array/string $gids (Optional) Array of group ids to query. A null
-   *                     parameter will get all groups for the user.
-   *                     (csv is deprecated)
-   *
-   * @return array  An array of group objects
-   */
-  public function &groups_get($uid, $gids) {
-    return $this->call_method('facebook.groups.get',
-        array('uid' => $uid,
-              'gids' => $gids));
-  }
-
-  /**
-   * Returns the membership list of a group.
-   *
-   * @param int $gid  Group id
-   *
-   * @return array  An array with four membership lists, with keys 'members',
-   *                'admins', 'officers', and 'not_replied'
-   */
-  public function &groups_getMembers($gid) {
-    return $this->call_method('facebook.groups.getMembers',
-      array('gid' => $gid));
-  }
-
-  /**
-   * Returns cookies according to the filters specified.
-   *
-   * @param int $uid     User for which the cookies are needed.
-   * @param string $name (Optional) A null parameter will get all cookies
-   *                     for the user.
-   *
-   * @return array  Cookies!  Nom nom nom nom nom.
-   */
-  public function data_getCookies($uid, $name) {
-    return $this->call_method('facebook.data.getCookies',
-        array('uid' => $uid,
-              'name' => $name));
-  }
-
-  /**
-   * Sets cookies according to the params specified.
-   *
-   * @param int $uid       User for which the cookies are needed.
-   * @param string $name   Name of the cookie
-   * @param string $value  (Optional) if expires specified and is in the past
-   * @param int $expires   (Optional) Expiry time
-   * @param string $path   (Optional) Url path to associate with (default is /)
-   *
-   * @return bool  true on success
-   */
-  public function data_setCookie($uid, $name, $value, $expires, $path) {
-    return $this->call_method('facebook.data.setCookie',
-        array('uid' => $uid,
-              'name' => $name,
-              'value' => $value,
-              'expires' => $expires,
-              'path' => $path));
-  }
-
-  /**
-   * Retrieves links posted by the given user.
-   *
-   * @param int    $uid      The user whose links you wish to retrieve
-   * @param int    $limit    The maximimum number of links to retrieve
-   * @param array $link_ids (Optional) Array of specific link
-   *                          IDs to retrieve by this user
-   *
-   * @return array  An array of links.
-   */
-  public function &links_get($uid, $limit, $link_ids = null) {
-    return $this->call_method('links.get',
-        array('uid' => $uid,
-              'limit' => $limit,
-              'link_ids' => $link_ids));
-  }
-
-  /**
-   * Posts a link on Facebook.
-   *
-   * @param string $url     URL/link you wish to post
-   * @param string $comment (Optional) A comment about this link
-   * @param int    $uid     (Optional) User ID that is posting this link;
-   *                        defaults to current session user
-   *
-   * @return bool
-   */
-  public function &links_post($url, $comment='', $uid = null) {
-    return $this->call_method('links.post',
-        array('uid' => $uid,
-              'url' => $url,
-              'comment' => $comment));
-  }
-
-  /**
-   * Permissions API
-   */
-
-  /**
-   * Checks API-access granted by self to the specified application.
-   *
-   * @param string $permissions_apikey  Other application key
-   *
-   * @return array  API methods/namespaces which are allowed access
-   */
-  public function permissions_checkGrantedApiAccess($permissions_apikey) {
-    return $this->call_method('facebook.permissions.checkGrantedApiAccess',
-        array('permissions_apikey' => $permissions_apikey));
-  }
-
-  /**
-   * Checks API-access granted to self by the specified application.
-   *
-   * @param string $permissions_apikey  Other application key
-   *
-   * @return array  API methods/namespaces which are allowed access
-   */
-  public function permissions_checkAvailableApiAccess($permissions_apikey) {
-    return $this->call_method('facebook.permissions.checkAvailableApiAccess',
-        array('permissions_apikey' => $permissions_apikey));
-  }
-
-  /**
-   * Grant API-access to the specified methods/namespaces to the specified
-   * application.
-   *
-   * @param string $permissions_apikey  Other application key
-   * @param array(string) $method_arr   (Optional) API methods/namespaces
-   *                                    allowed
-   *
-   * @return array  API methods/namespaces which are allowed access
-   */
-  public function permissions_grantApiAccess($permissions_apikey, $method_arr) {
-    return $this->call_method('facebook.permissions.grantApiAccess',
-        array('permissions_apikey' => $permissions_apikey,
-              'method_arr' => $method_arr));
-  }
-
-  /**
-   * Revoke API-access granted to the specified application.
-   *
-   * @param string $permissions_apikey  Other application key
-   *
-   * @return bool  true on success
-   */
-  public function permissions_revokeApiAccess($permissions_apikey) {
-    return $this->call_method('facebook.permissions.revokeApiAccess',
-        array('permissions_apikey' => $permissions_apikey));
-  }
-
-  /**
-   * Payments Order API
-   */
-
-  /**
-   * Set Payments properties for an app.
-   *
-   * @param  properties  a map from property names to  values
-   * @return             true on success
-   */
-  public function payments_setProperties($properties) {
-    return $this->call_method ('facebook.payments.setProperties',
-        array('properties' => json_encode($properties)));
-  }
-
-  public function payments_getOrderDetails($order_id) {
-    return json_decode($this->call_method(
-        'facebook.payments.getOrderDetails',
-        array('order_id' => $order_id)), true);
-  }
-
-  public function payments_updateOrder($order_id, $status,
-                                         $params) {
-    return $this->call_method('facebook.payments.updateOrder',
-        array('order_id' => $order_id,
-              'status' => $status,
-              'params' => json_encode($params)));
-  }
-
-  public function payments_getOrders($status, $start_time,
-                                       $end_time, $test_mode=false) {
-    return json_decode($this->call_method('facebook.payments.getOrders',
-        array('status' => $status,
-              'start_time' => $start_time,
-              'end_time' => $end_time,
-              'test_mode' => $test_mode)), true);
-  }
-
-  /**
-   * Gifts API
-   */
-
-  /**
-   * Get Gifts associated with an app
-   *
-   * @return             array of gifts
-   */
-  public function gifts_get() {
-    return json_decode(
-        $this->call_method('facebook.gifts.get',
-                           array()),
-        true
-        );
-  }
-
-  /*
-   * Update gifts stored by an app
-   *
-   * @param array containing gift_id => gift_data to be updated
-   * @return array containing gift_id => true/false indicating success
-   *                                     in updating that gift
-   */
-  public function gifts_update($update_array) {
-    return json_decode(
-      $this->call_method('facebook.gifts.update',
-                         array('update_str' => json_encode($update_array))
-                        ),
-      true
-    );
-  }
-
-
-  /**
-   * Creates a note with the specified title and content.
-   *
-   * @param string $title   Title of the note.
-   * @param string $content Content of the note.
-   * @param int    $uid     (Optional) The user for whom you are creating a
-   *                        note; defaults to current session user
-   *
-   * @return int   The ID of the note that was just created.
-   */
-  public function &notes_create($title, $content, $uid = null) {
-    return $this->call_method('notes.create',
-        array('uid' => $uid,
-              'title' => $title,
-              'content' => $content));
-  }
-
-  /**
-   * Deletes the specified note.
-   *
-   * @param int $note_id  ID of the note you wish to delete
-   * @param int $uid      (Optional) Owner of the note you wish to delete;
-   *                      defaults to current session user
-   *
-   * @return bool
-   */
-  public function &notes_delete($note_id, $uid = null) {
-    return $this->call_method('notes.delete',
-        array('uid' => $uid,
-              'note_id' => $note_id));
-  }
-
-  /**
-   * Edits a note, replacing its title and contents with the title
-   * and contents specified.
-   *
-   * @param int    $note_id  ID of the note you wish to edit
-   * @param string $title    Replacement title for the note
-   * @param string $content  Replacement content for the note
-   * @param int    $uid      (Optional) Owner of the note you wish to edit;
-   *                         defaults to current session user
-   *
-   * @return bool
-   */
-  public function &notes_edit($note_id, $title, $content, $uid = null) {
-    return $this->call_method('notes.edit',
-        array('uid' => $uid,
-              'note_id' => $note_id,
-              'title' => $title,
-              'content' => $content));
-  }
-
-  /**
-   * Retrieves all notes by a user. If note_ids are specified,
-   * retrieves only those specific notes by that user.
-   *
-   * @param int    $uid      User whose notes you wish to retrieve
-   * @param array  $note_ids (Optional) List of specific note
-   *                         IDs by this user to retrieve
-   *
-   * @return array A list of all of the given user's notes, or an empty list
-   *               if the viewer lacks permissions or if there are no visible
-   *               notes.
-   */
-  public function &notes_get($uid, $note_ids = null) {
-    return $this->call_method('notes.get',
-        array('uid' => $uid,
-              'note_ids' => $note_ids));
-  }
-
-
-  /**
-   * Returns the outstanding notifications for the session user.
-   *
-   * @return array An assoc array of notification count objects for
-   *               'messages', 'pokes' and 'shares', a uid list of
-   *               'friend_requests', a gid list of 'group_invites',
-   *               and an eid list of 'event_invites'
-   */
-  public function &notifications_get() {
-    return $this->call_method('facebook.notifications.get');
-  }
-
-  /**
-   * Sends a notification to the specified users.
-   *
-   * @return A comma separated list of successful recipients
-   * @error
-   *    API_EC_PARAM_USER_ID_LIST
-   */
-  public function &notifications_send($to_ids, $notification, $type) {
-    return $this->call_method('facebook.notifications.send',
-        array('to_ids' => $to_ids,
-              'notification' => $notification,
-              'type' => $type));
-  }
-
-  /**
-   * Sends an email to the specified user of the application.
-   *
-   * @param array/string $recipients array of ids of the recipients (csv is deprecated)
-   * @param string $subject    subject of the email
-   * @param string $text       (plain text) body of the email
-   * @param string $fbml       fbml markup for an html version of the email
-   *
-   * @return string  A comma separated list of successful recipients
-   * @error
-   *    API_EC_PARAM_USER_ID_LIST
-   */
-  public function &notifications_sendEmail($recipients,
-                                           $subject,
-                                           $text,
-                                           $fbml) {
-    return $this->call_method('facebook.notifications.sendEmail',
-        array('recipients' => $recipients,
-              'subject' => $subject,
-              'text' => $text,
-              'fbml' => $fbml));
-  }
-
-  /**
-   * Returns the requested info fields for the requested set of pages.
-   *
-   * @param array/string $page_ids  an array of page ids (csv is deprecated)
-   * @param array/string  $fields    an array of strings describing the
-   *                           info fields desired (csv is deprecated)
-   * @param int    $uid       (Optional) limit results to pages of which this
-   *                          user is a fan.
-   * @param string type       limits results to a particular type of page.
-   *
-   * @return array  An array of pages
-   */
-  public function &pages_getInfo($page_ids, $fields, $uid, $type) {
-    return $this->call_method('facebook.pages.getInfo',
-        array('page_ids' => $page_ids,
-              'fields' => $fields,
-              'uid' => $uid,
-              'type' => $type));
-  }
-
-  /**
-   * Returns true if the given user is an admin for the passed page.
-   *
-   * @param int $page_id  target page id
-   * @param int $uid      (Optional) user id (defaults to the logged-in user)
-   *
-   * @return bool  true on success
-   */
-  public function &pages_isAdmin($page_id, $uid = null) {
-    return $this->call_method('facebook.pages.isAdmin',
-        array('page_id' => $page_id,
-              'uid' => $uid));
-  }
-
-  /**
-   * Returns whether or not the given page has added the application.
-   *
-   * @param int $page_id  target page id
-   *
-   * @return bool  true on success
-   */
-  public function &pages_isAppAdded($page_id) {
-    return $this->call_method('facebook.pages.isAppAdded',
-        array('page_id' => $page_id));
-  }
-
-  /**
-   * Returns true if logged in user is a fan for the passed page.
-   *
-   * @param int $page_id target page id
-   * @param int $uid user to compare.  If empty, the logged in user.
-   *
-   * @return bool  true on success
-   */
-  public function &pages_isFan($page_id, $uid = null) {
-    return $this->call_method('facebook.pages.isFan',
-        array('page_id' => $page_id,
-              'uid' => $uid));
-  }
-
-  /**
-   * Adds a tag with the given information to a photo. See the wiki for details:
-   *
-   *  http://wiki.developers.facebook.com/index.php/Photos.addTag
-   *
-   * @param int $pid          The ID of the photo to be tagged
-   * @param int $tag_uid      The ID of the user being tagged. You must specify
-   *                          either the $tag_uid or the $tag_text parameter
-   *                          (unless $tags is specified).
-   * @param string $tag_text  Some text identifying the person being tagged.
-   *                          You must specify either the $tag_uid or $tag_text
-   *                          parameter (unless $tags is specified).
-   * @param float $x          The horizontal position of the tag, as a
-   *                          percentage from 0 to 100, from the left of the
-   *                          photo.
-   * @param float $y          The vertical position of the tag, as a percentage
-   *                          from 0 to 100, from the top of the photo.
-   * @param array $tags       (Optional) An array of maps, where each map
-   *                          can contain the tag_uid, tag_text, x, and y
-   *                          parameters defined above.  If specified, the
-   *                          individual arguments are ignored.
-   * @param int $owner_uid    (Optional)  The user ID of the user whose photo
-   *                          you are tagging. If this parameter is not
-   *                          specified, then it defaults to the session user.
-   *
-   * @return bool  true on success
-   */
-  public function &photos_addTag($pid,
-                                 $tag_uid,
-                                 $tag_text,
-                                 $x,
-                                 $y,
-                                 $tags,
-                                 $owner_uid=0) {
-    return $this->call_method('facebook.photos.addTag',
-        array('pid' => $pid,
-              'tag_uid' => $tag_uid,
-              'tag_text' => $tag_text,
-              'x' => $x,
-              'y' => $y,
-              'tags' => (is_array($tags)) ? json_encode($tags) : null,
-              'owner_uid' => $this->get_uid($owner_uid)));
-  }
-
-  /**
-   * Creates and returns a new album owned by the specified user or the current
-   * session user.
-   *
-   * @param string $name         The name of the album.
-   * @param string $description  (Optional) A description of the album.
-   * @param string $location     (Optional) A description of the location.
-   * @param string $visible      (Optional) A privacy setting for the album.
-   *                             One of 'friends', 'friends-of-friends',
-   *                             'networks', or 'everyone'.  Default 'everyone'.
-   * @param int $uid             (Optional) User id for creating the album; if
-   *                             not specified, the session user is used.
-   *
-   * @return array  An album object
-   */
-  public function &photos_createAlbum($name,
-                                      $description='',
-                                      $location='',
-                                      $visible='',
-                                      $uid=0) {
-    return $this->call_method('facebook.photos.createAlbum',
-        array('name' => $name,
-              'description' => $description,
-              'location' => $location,
-              'visible' => $visible,
-              'uid' => $this->get_uid($uid)));
-  }
-
-  /**
-   * Returns photos according to the filters specified.
-   *
-   * @param int $subj_id  (Optional) Filter by uid of user tagged in the photos.
-   * @param int $aid      (Optional) Filter by an album, as returned by
-   *                      photos_getAlbums.
-   * @param array/string $pids   (Optional) Restrict to an array of pids
-   *                             (csv is deprecated)
-   *
-   * Note that at least one of these parameters needs to be specified, or an
-   * error is returned.
-   *
-   * @return array  An array of photo objects.
-   */
-  public function &photos_get($subj_id, $aid, $pids) {
-    return $this->call_method('facebook.photos.get',
-      array('subj_id' => $subj_id, 'aid' => $aid, 'pids' => $pids));
-  }
-
-  /**
-   * Returns the albums created by the given user.
-   *
-   * @param int $uid      (Optional) The uid of the user whose albums you want.
-   *                       A null will return the albums of the session user.
-   * @param string $aids  (Optional) An array of aids to restrict
-   *                       the query. (csv is deprecated)
-   *
-   * Note that at least one of the (uid, aids) parameters must be specified.
-   *
-   * @returns an array of album objects.
-   */
-  public function &photos_getAlbums($uid, $aids) {
-    return $this->call_method('facebook.photos.getAlbums',
-      array('uid' => $uid,
-            'aids' => $aids));
-  }
-
-  /**
-   * Returns the tags on all photos specified.
-   *
-   * @param string $pids  A list of pids to query
-   *
-   * @return array  An array of photo tag objects, which include pid,
-   *                subject uid, and two floating-point numbers (xcoord, ycoord)
-   *                for tag pixel location.
-   */
-  public function &photos_getTags($pids) {
-    return $this->call_method('facebook.photos.getTags',
-      array('pids' => $pids));
-  }
-
-  /**
-   * Uploads a photo.
-   *
-   * @param string $file     The location of the photo on the local filesystem.
-   * @param int $aid         (Optional) The album into which to upload the
-   *                         photo.
-   * @param string $caption  (Optional) A caption for the photo.
-   * @param int uid          (Optional) The user ID of the user whose photo you
-   *                         are uploading
-   *
-   * @return array  An array of user objects
-   */
-  public function photos_upload($file, $aid=null, $caption=null, $uid=null) {
-    return $this->call_upload_method('facebook.photos.upload',
-                                     array('aid' => $aid,
-                                           'caption' => $caption,
-                                           'uid' => $uid),
-                                     $file);
-  }
-
-
-  /**
-   * Uploads a video.
-   *
-   * @param  string $file        The location of the video on the local filesystem.
-   * @param  string $title       (Optional) A title for the video. Titles over 65 characters in length will be truncated.
-   * @param  string $description (Optional) A description for the video.
-   *
-   * @return array  An array with the video's ID, title, description, and a link to view it on Facebook.
-   */
-  public function video_upload($file, $title=null, $description=null) {
-    return $this->call_upload_method('facebook.video.upload',
-                                     array('title' => $title,
-                                           'description' => $description),
-                                     $file,
-                                     Facebook::get_facebook_url('api-video') . '/restserver.php');
-  }
-
-  /**
-   * Returns an array with the video limitations imposed on the current session's
-   * associated user. Maximum length is measured in seconds; maximum size is
-   * measured in bytes.
-   *
-   * @return array  Array with "length" and "size" keys
-   */
-  public function &video_getUploadLimits() {
-    return $this->call_method('facebook.video.getUploadLimits');
-  }
-
-  /**
-   * Returns the requested info fields for the requested set of users.
-   *
-   * @param array/string $uids    An array of user ids (csv is deprecated)
-   * @param array/string $fields  An array of info field names desired (csv is deprecated)
-   *
-   * @return array  An array of user objects
-   */
-  public function &users_getInfo($uids, $fields) {
-    return $this->call_method('facebook.users.getInfo',
-                  array('uids' => $uids,
-                        'fields' => $fields));
-  }
-
-  /**
-   * Returns the requested info fields for the requested set of users. A
-   * session key must not be specified. Only data about users that have
-   * authorized your application will be returned.
-   *
-   * Check the wiki for fields that can be queried through this API call.
-   * Data returned from here should not be used for rendering to application
-   * users, use users.getInfo instead, so that proper privacy rules will be
-   * applied.
-   *
-   * @param array/string $uids    An array of user ids (csv is deprecated)
-   * @param array/string $fields  An array of info field names desired (csv is deprecated)
-   *
-   * @return array  An array of user objects
-   */
-  public function &users_getStandardInfo($uids, $fields) {
-    return $this->call_method('facebook.users.getStandardInfo',
-                              array('uids' => $uids,
-                                    'fields' => $fields));
-  }
-
-  /**
-   * Returns the user corresponding to the current session object.
-   *
-   * @return integer  User id
-   */
-  public function &users_getLoggedInUser() {
-    return $this->call_method('facebook.users.getLoggedInUser');
-  }
-
-  /**
-   * Returns 1 if the user has the specified permission, 0 otherwise.
-   * http://wiki.developers.facebook.com/index.php/Users.hasAppPermission
-   *
-   * @return integer  1 or 0
-   */
-  public function &users_hasAppPermission($ext_perm, $uid=null) {
-    return $this->call_method('facebook.users.hasAppPermission',
-        array('ext_perm' => $ext_perm, 'uid' => $uid));
-  }
-
-  /**
-   * Returns whether or not the user corresponding to the current
-   * session object has the give the app basic authorization.
-   *
-   * @return boolean  true if the user has authorized the app
-   */
-  public function &users_isAppUser($uid=null) {
-    if ($uid === null && isset($this->is_user)) {
-      return $this->is_user;
-    }
-
-    return $this->call_method('facebook.users.isAppUser', array('uid' => $uid));
-  }
-
-  /**
-   * Returns whether or not the user corresponding to the current
-   * session object is verified by Facebook. See the documentation
-   * for Users.isVerified for details.
-   *
-   * @return boolean  true if the user is verified
-   */
-  public function &users_isVerified() {
-    return $this->call_method('facebook.users.isVerified');
-  }
-
-  /**
-   * Sets the users' current status message. Message does NOT contain the
-   * word "is" , so make sure to include a verb.
-   *
-   * Example: setStatus("is loving the API!")
-   * will produce the status "Luke is loving the API!"
-   *
-   * @param string $status                text-only message to set
-   * @param int    $uid                   user to set for (defaults to the
-   *                                      logged-in user)
-   * @param bool   $clear                 whether or not to clear the status,
-   *                                      instead of setting it
-   * @param bool   $status_includes_verb  if true, the word "is" will *not* be
-   *                                      prepended to the status message
-   *
-   * @return boolean
-   */
-  public function &users_setStatus($status,
-                                   $uid = null,
-                                   $clear = false,
-                                   $status_includes_verb = true) {
-    $args = array(
-      'status' => $status,
-      'uid' => $uid,
-      'clear' => $clear,
-      'status_includes_verb' => $status_includes_verb,
-    );
-    return $this->call_method('facebook.users.setStatus', $args);
-  }
-
-  /**
-   * Gets the comments for a particular xid. This is essentially a wrapper
-   * around the comment FQL table.
-   *
-   * @param string $xid external id associated with the comments
-   *
-   * @return array of comment objects
-   */
-  public function &comments_get($xid) {
-    $args = array('xid' => $xid);
-    return $this->call_method('facebook.comments.get', $args);
-  }
-
-  /**
-   * Add a comment to a particular xid on behalf of a user. If called
-   * without an app_secret (with session secret), this will only work
-   * for the session user.
-   *
-   * @param string $xid   external id associated with the comments
-   * @param string $text  text of the comment
-   * @param int    $uid   user adding the comment (def: session user)
-   * @param string $title optional title for the stream story
-   * @param string $url   optional url for the stream story
-   * @param bool   $publish_to_stream publish a feed story about this comment?
-   *                      a link will be generated to title/url in the story
-   *
-   * @return string comment_id associated with the comment
-   */
-  public function &comments_add($xid, $text, $uid=0, $title='', $url='',
-                                $publish_to_stream=false) {
-    $args = array(
-      'xid'               => $xid,
-      'uid'               => $this->get_uid($uid),
-      'text'              => $text,
-      'title'             => $title,
-      'url'               => $url,
-      'publish_to_stream' => $publish_to_stream);
-
-    return $this->call_method('facebook.comments.add', $args);
-  }
-
-  /**
-   * Remove a particular comment.
-   *
-   * @param string $xid        the external id associated with the comments
-   * @param string $comment_id id of the comment to remove (returned by
-   *                           comments.add and comments.get)
-   *
-   * @return boolean
-   */
-  public function &comments_remove($xid, $comment_id) {
-    $args = array(
-      'xid'        => $xid,
-      'comment_id' => $comment_id);
-    return $this->call_method('facebook.comments.remove', $args);
-  }
-
-  /**
-   * Gets the stream on behalf of a user using a set of users. This
-   * call will return the latest $limit queries between $start_time
-   * and $end_time.
-   *
-   * @param int    $viewer_id  user making the call (def: session)
-   * @param array  $source_ids users/pages to look at (def: all connections)
-   * @param int    $start_time start time to look for stories (def: 1 day ago)
-   * @param int    $end_time   end time to look for stories (def: now)
-   * @param int    $limit      number of stories to attempt to fetch (def: 30)
-   * @param string $filter_key key returned by stream.getFilters to fetch
-   * @param array  $metadata   metadata to include with the return, allows
-   *                           requested metadata to be returned, such as
-   *                           profiles, albums, photo_tags
-   *
-   * @return array(
-   *           'posts'      => array of posts,
-   *           // if requested, the following data may be returned
-   *           'profiles'   => array of profile metadata of users/pages in posts
-   *           'albums'     => array of album metadata in posts
-   *           'photo_tags' => array of photo_tags for photos in posts
-   *         )
-   */
-  public function &stream_get($viewer_id = null,
-                              $source_ids = null,
-                              $start_time = 0,
-                              $end_time = 0,
-                              $limit = 30,
-                              $filter_key = '',
-                              $exportable_only = false,
-                              $metadata = null,
-                              $post_ids = null) {
-    $args = array(
-      'viewer_id'  => $viewer_id,
-      'source_ids' => $source_ids,
-      'start_time' => $start_time,
-      'end_time'   => $end_time,
-      'limit'      => $limit,
-      'filter_key' => $filter_key,
-      'exportable_only' => $exportable_only,
-      'metadata' => $metadata,
-      'post_ids' => $post_ids);
-    return $this->call_method('facebook.stream.get', $args);
-  }
-
-  /**
-   * Gets the filters (with relevant filter keys for stream.get) for a
-   * particular user. These filters are typical things like news feed,
-   * friend lists, networks. They can be used to filter the stream
-   * without complex queries to determine which ids belong in which groups.
-   *
-   * @param int $uid user to get filters for
-   *
-   * @return array of stream filter objects
-   */
-  public function &stream_getFilters($uid = null) {
-    $args = array('uid' => $uid);
-    return $this->call_method('facebook.stream.getFilters', $args);
-  }
-
-  /**
-   * Gets the full comments given a post_id from stream.get or the
-   * stream FQL table. Initially, only a set of preview comments are
-   * returned because some posts can have many comments.
-   *
-   * @param string $post_id id of the post to get comments for
-   *
-   * @return array of comment objects
-   */
-  public function &stream_getComments($post_id) {
-    $args = array('post_id' => $post_id);
-    return $this->call_method('facebook.stream.getComments', $args);
-  }
-
-  /**
-   * Sets the FBML for the profile of the user attached to this session.
-   *
-   * @param   string   $markup           The FBML that describes the profile
-   *                                     presence of this app for the user
-   * @param   int      $uid              The user
-   * @param   string   $profile          Profile FBML
-   * @param   string   $profile_action   Profile action FBML (deprecated)
-   * @param   string   $mobile_profile   Mobile profile FBML
-   * @param   string   $profile_main     Main Tab profile FBML
-   *
-   * @return  array  A list of strings describing any compile errors for the
-   *                 submitted FBML
-   */
-  public function profile_setFBML($markup,
-                           $uid=null,
-                           $profile='',
-                           $profile_action='',
-                           $mobile_profile='',
-                           $profile_main='') {
-    return $this->call_method('facebook.profile.setFBML',
-        array('markup' => $markup,
-              'uid' => $uid,
-              'profile' => $profile,
-              'profile_action' => $profile_action,
-              'mobile_profile' => $mobile_profile,
-              'profile_main' => $profile_main));
-  }
-
-  /**
-   * Gets the FBML for the profile box that is currently set for a user's
-   * profile (your application set the FBML previously by calling the
-   * profile.setFBML method).
-   *
-   * @param int $uid   (Optional) User id to lookup; defaults to session.
-   * @param int $type  (Optional) 1 for original style, 2 for profile_main boxes
-   *
-   * @return string  The FBML
-   */
-  public function &profile_getFBML($uid=null, $type=null) {
-    return $this->call_method('facebook.profile.getFBML',
-        array('uid' => $uid,
-              'type' => $type));
-  }
-
-  /**
-   * Returns the specified user's application info section for the calling
-   * application. These info sections have either been set via a previous
-   * profile.setInfo call or by the user editing them directly.
-   *
-   * @param int $uid  (Optional) User id to lookup; defaults to session.
-   *
-   * @return array  Info fields for the current user.  See wiki for structure:
-   *
-   *  http://wiki.developers.facebook.com/index.php/Profile.getInfo
-   *
-   */
-  public function &profile_getInfo($uid=null) {
-    return $this->call_method('facebook.profile.getInfo',
-        array('uid' => $uid));
-  }
-
-  /**
-   * Returns the options associated with the specified info field for an
-   * application info section.
-   *
-   * @param string $field  The title of the field
-   *
-   * @return array  An array of info options.
-   */
-  public function &profile_getInfoOptions($field) {
-    return $this->call_method('facebook.profile.getInfoOptions',
-        array('field' => $field));
-  }
-
-  /**
-   * Configures an application info section that the specified user can install
-   * on the Info tab of her profile.  For details on the structure of an info
-   * field, please see:
-   *
-   *  http://wiki.developers.facebook.com/index.php/Profile.setInfo
-   *
-   * @param string $title       Title / header of the info section
-   * @param int $type           1 for text-only, 5 for thumbnail views
-   * @param array $info_fields  An array of info fields. See wiki for details.
-   * @param int $uid            (Optional)
-   *
-   * @return bool  true on success
-   */
-  public function &profile_setInfo($title, $type, $info_fields, $uid=null) {
-    return $this->call_method('facebook.profile.setInfo',
-        array('uid' => $uid,
-              'type' => $type,
-              'title'   => $title,
-              'info_fields' => json_encode($info_fields)));
-  }
-
-  /**
-   * Specifies the objects for a field for an application info section. These
-   * options populate the typeahead for a thumbnail.
-   *
-   * @param string $field   The title of the field
-   * @param array $options  An array of items for a thumbnail, including
-   *                        'label', 'link', and optionally 'image',
-   *                        'description' and 'sublabel'
-   *
-   * @return bool  true on success
-   */
-  public function profile_setInfoOptions($field, $options) {
-    return $this->call_method('facebook.profile.setInfoOptions',
-        array('field'   => $field,
-              'options' => json_encode($options)));
-  }
-
-  /////////////////////////////////////////////////////////////////////////////
-  // Data Store API
-
-  /**
-   * Set a user preference.
-   *
-   * @param  pref_id    preference identifier (0-200)
-   * @param  value      preferece's value
-   * @param  uid        the user id (defaults to current session user)
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   *    API_EC_PERMISSION_OTHER_USER
-   */
-  public function &data_setUserPreference($pref_id, $value, $uid = null) {
-    return $this->call_method('facebook.data.setUserPreference',
-       array('pref_id' => $pref_id,
-             'value' => $value,
-             'uid' => $this->get_uid($uid)));
-  }
-
-  /**
-   * Set a user's all preferences for this application.
-   *
-   * @param  values     preferece values in an associative arrays
-   * @param  replace    whether to replace all existing preferences or
-   *                    merge into them.
-   * @param  uid        the user id (defaults to current session user)
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   *    API_EC_PERMISSION_OTHER_USER
-   */
-  public function &data_setUserPreferences($values,
-                                           $replace = false,
-                                           $uid = null) {
-    return $this->call_method('facebook.data.setUserPreferences',
-       array('values' => json_encode($values),
-             'replace' => $replace,
-             'uid' => $this->get_uid($uid)));
-  }
-
-  /**
-   * Get a user preference.
-   *
-   * @param  pref_id    preference identifier (0-200)
-   * @param  uid        the user id (defaults to current session user)
-   * @return            preference's value
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   *    API_EC_PERMISSION_OTHER_USER
-   */
-  public function &data_getUserPreference($pref_id, $uid = null) {
-    return $this->call_method('facebook.data.getUserPreference',
-       array('pref_id' => $pref_id,
-             'uid' => $this->get_uid($uid)));
-  }
-
-  /**
-   * Get a user preference.
-   *
-   * @param  uid        the user id (defaults to current session user)
-   * @return            preference values
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   *    API_EC_PERMISSION_OTHER_USER
-   */
-  public function &data_getUserPreferences($uid = null) {
-    return $this->call_method('facebook.data.getUserPreferences',
-       array('uid' => $this->get_uid($uid)));
-  }
-
-  /**
-   * Create a new object type.
-   *
-   * @param  name       object type's name
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_ALREADY_EXISTS
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_createObjectType($name) {
-    return $this->call_method('facebook.data.createObjectType',
-       array('name' => $name));
-  }
-
-  /**
-   * Delete an object type.
-   *
-   * @param  obj_type       object type's name
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_dropObjectType($obj_type) {
-    return $this->call_method('facebook.data.dropObjectType',
-       array('obj_type' => $obj_type));
-  }
-
-  /**
-   * Rename an object type.
-   *
-   * @param  obj_type       object type's name
-   * @param  new_name       new object type's name
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_DATA_OBJECT_ALREADY_EXISTS
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_renameObjectType($obj_type, $new_name) {
-    return $this->call_method('facebook.data.renameObjectType',
-       array('obj_type' => $obj_type,
-             'new_name' => $new_name));
-  }
-
-  /**
-   * Add a new property to an object type.
-   *
-   * @param  obj_type       object type's name
-   * @param  prop_name      name of the property to add
-   * @param  prop_type      1: integer; 2: string; 3: text blob
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_ALREADY_EXISTS
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_defineObjectProperty($obj_type,
-                                             $prop_name,
-                                             $prop_type) {
-    return $this->call_method('facebook.data.defineObjectProperty',
-       array('obj_type' => $obj_type,
-             'prop_name' => $prop_name,
-             'prop_type' => $prop_type));
-  }
-
-  /**
-   * Remove a previously defined property from an object type.
-   *
-   * @param  obj_type      object type's name
-   * @param  prop_name     name of the property to remove
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_undefineObjectProperty($obj_type, $prop_name) {
-    return $this->call_method('facebook.data.undefineObjectProperty',
-       array('obj_type' => $obj_type,
-             'prop_name' => $prop_name));
-  }
-
-  /**
-   * Rename a previously defined property of an object type.
-   *
-   * @param  obj_type      object type's name
-   * @param  prop_name     name of the property to rename
-   * @param  new_name      new name to use
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_DATA_OBJECT_ALREADY_EXISTS
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_renameObjectProperty($obj_type, $prop_name,
-                                            $new_name) {
-    return $this->call_method('facebook.data.renameObjectProperty',
-       array('obj_type' => $obj_type,
-             'prop_name' => $prop_name,
-             'new_name' => $new_name));
-  }
-
-  /**
-   * Retrieve a list of all object types that have defined for the application.
-   *
-   * @return               a list of object type names
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_getObjectTypes() {
-    return $this->call_method('facebook.data.getObjectTypes');
-  }
-
-  /**
-   * Get definitions of all properties of an object type.
-   *
-   * @param obj_type       object type's name
-   * @return               pairs of property name and property types
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_getObjectType($obj_type) {
-    return $this->call_method('facebook.data.getObjectType',
-       array('obj_type' => $obj_type));
-  }
-
-  /**
-   * Create a new object.
-   *
-   * @param  obj_type      object type's name
-   * @param  properties    (optional) properties to set initially
-   * @return               newly created object's id
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_createObject($obj_type, $properties = null) {
-    return $this->call_method('facebook.data.createObject',
-       array('obj_type' => $obj_type,
-             'properties' => json_encode($properties)));
-  }
-
-  /**
-   * Update an existing object.
-   *
-   * @param  obj_id        object's id
-   * @param  properties    new properties
-   * @param  replace       true for replacing existing properties;
-   *                       false for merging
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_updateObject($obj_id, $properties, $replace = false) {
-    return $this->call_method('facebook.data.updateObject',
-       array('obj_id' => $obj_id,
-             'properties' => json_encode($properties),
-             'replace' => $replace));
-  }
-
-  /**
-   * Delete an existing object.
-   *
-   * @param  obj_id        object's id
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_deleteObject($obj_id) {
-    return $this->call_method('facebook.data.deleteObject',
-       array('obj_id' => $obj_id));
-  }
-
-  /**
-   * Delete a list of objects.
-   *
-   * @param  obj_ids       objects to delete
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_deleteObjects($obj_ids) {
-    return $this->call_method('facebook.data.deleteObjects',
-       array('obj_ids' => json_encode($obj_ids)));
-  }
-
-  /**
-   * Get a single property value of an object.
-   *
-   * @param  obj_id        object's id
-   * @param  prop_name     individual property's name
-   * @return               individual property's value
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_getObjectProperty($obj_id, $prop_name) {
-    return $this->call_method('facebook.data.getObjectProperty',
-       array('obj_id' => $obj_id,
-             'prop_name' => $prop_name));
-  }
-
-  /**
-   * Get properties of an object.
-   *
-   * @param  obj_id      object's id
-   * @param  prop_names  (optional) properties to return; null for all.
-   * @return             specified properties of an object
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_getObject($obj_id, $prop_names = null) {
-    return $this->call_method('facebook.data.getObject',
-       array('obj_id' => $obj_id,
-             'prop_names' => json_encode($prop_names)));
-  }
-
-  /**
-   * Get properties of a list of objects.
-   *
-   * @param  obj_ids     object ids
-   * @param  prop_names  (optional) properties to return; null for all.
-   * @return             specified properties of an object
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_getObjects($obj_ids, $prop_names = null) {
-    return $this->call_method('facebook.data.getObjects',
-       array('obj_ids' => json_encode($obj_ids),
-             'prop_names' => json_encode($prop_names)));
-  }
-
-  /**
-   * Set a single property value of an object.
-   *
-   * @param  obj_id        object's id
-   * @param  prop_name     individual property's name
-   * @param  prop_value    new value to set
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_setObjectProperty($obj_id, $prop_name,
-                                         $prop_value) {
-    return $this->call_method('facebook.data.setObjectProperty',
-       array('obj_id' => $obj_id,
-             'prop_name' => $prop_name,
-             'prop_value' => $prop_value));
-  }
-
-  /**
-   * Read hash value by key.
-   *
-   * @param  obj_type      object type's name
-   * @param  key           hash key
-   * @param  prop_name     (optional) individual property's name
-   * @return               hash value
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_getHashValue($obj_type, $key, $prop_name = null) {
-    return $this->call_method('facebook.data.getHashValue',
-       array('obj_type' => $obj_type,
-             'key' => $key,
-             'prop_name' => $prop_name));
-  }
-
-  /**
-   * Write hash value by key.
-   *
-   * @param  obj_type      object type's name
-   * @param  key           hash key
-   * @param  value         hash value
-   * @param  prop_name     (optional) individual property's name
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_setHashValue($obj_type,
-                                     $key,
-                                     $value,
-                                     $prop_name = null) {
-    return $this->call_method('facebook.data.setHashValue',
-       array('obj_type' => $obj_type,
-             'key' => $key,
-             'value' => $value,
-             'prop_name' => $prop_name));
-  }
-
-  /**
-   * Increase a hash value by specified increment atomically.
-   *
-   * @param  obj_type      object type's name
-   * @param  key           hash key
-   * @param  prop_name     individual property's name
-   * @param  increment     (optional) default is 1
-   * @return               incremented hash value
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_incHashValue($obj_type,
-                                     $key,
-                                     $prop_name,
-                                     $increment = 1) {
-    return $this->call_method('facebook.data.incHashValue',
-       array('obj_type' => $obj_type,
-             'key' => $key,
-             'prop_name' => $prop_name,
-             'increment' => $increment));
-  }
-
-  /**
-   * Remove a hash key and its values.
-   *
-   * @param  obj_type    object type's name
-   * @param  key         hash key
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_removeHashKey($obj_type, $key) {
-    return $this->call_method('facebook.data.removeHashKey',
-       array('obj_type' => $obj_type,
-             'key' => $key));
-  }
-
-  /**
-   * Remove hash keys and their values.
-   *
-   * @param  obj_type    object type's name
-   * @param  keys        hash keys
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_removeHashKeys($obj_type, $keys) {
-    return $this->call_method('facebook.data.removeHashKeys',
-       array('obj_type' => $obj_type,
-             'keys' => json_encode($keys)));
-  }
-
-  /**
-   * Define an object association.
-   *
-   * @param  name        name of this association
-   * @param  assoc_type  1: one-way 2: two-way symmetric 3: two-way asymmetric
-   * @param  assoc_info1 needed info about first object type
-   * @param  assoc_info2 needed info about second object type
-   * @param  inverse     (optional) name of reverse association
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_ALREADY_EXISTS
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_defineAssociation($name, $assoc_type, $assoc_info1,
-                                         $assoc_info2, $inverse = null) {
-    return $this->call_method('facebook.data.defineAssociation',
-       array('name' => $name,
-             'assoc_type' => $assoc_type,
-             'assoc_info1' => json_encode($assoc_info1),
-             'assoc_info2' => json_encode($assoc_info2),
-             'inverse' => $inverse));
-  }
-
-  /**
-   * Undefine an object association.
-   *
-   * @param  name        name of this association
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_undefineAssociation($name) {
-    return $this->call_method('facebook.data.undefineAssociation',
-       array('name' => $name));
-  }
-
-  /**
-   * Rename an object association or aliases.
-   *
-   * @param  name        name of this association
-   * @param  new_name    (optional) new name of this association
-   * @param  new_alias1  (optional) new alias for object type 1
-   * @param  new_alias2  (optional) new alias for object type 2
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_ALREADY_EXISTS
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_renameAssociation($name, $new_name, $new_alias1 = null,
-                                         $new_alias2 = null) {
-    return $this->call_method('facebook.data.renameAssociation',
-       array('name' => $name,
-             'new_name' => $new_name,
-             'new_alias1' => $new_alias1,
-             'new_alias2' => $new_alias2));
-  }
-
-  /**
-   * Get definition of an object association.
-   *
-   * @param  name        name of this association
-   * @return             specified association
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_getAssociationDefinition($name) {
-    return $this->call_method('facebook.data.getAssociationDefinition',
-       array('name' => $name));
-  }
-
-  /**
-   * Get definition of all associations.
-   *
-   * @return             all defined associations
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_getAssociationDefinitions() {
-    return $this->call_method('facebook.data.getAssociationDefinitions',
-       array());
-  }
-
-  /**
-   * Create or modify an association between two objects.
-   *
-   * @param  name        name of association
-   * @param  obj_id1     id of first object
-   * @param  obj_id2     id of second object
-   * @param  data        (optional) extra string data to store
-   * @param  assoc_time  (optional) extra time data; default to creation time
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_setAssociation($name, $obj_id1, $obj_id2, $data = null,
-                                      $assoc_time = null) {
-    return $this->call_method('facebook.data.setAssociation',
-       array('name' => $name,
-             'obj_id1' => $obj_id1,
-             'obj_id2' => $obj_id2,
-             'data' => $data,
-             'assoc_time' => $assoc_time));
-  }
-
-  /**
-   * Create or modify associations between objects.
-   *
-   * @param  assocs      associations to set
-   * @param  name        (optional) name of association
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_setAssociations($assocs, $name = null) {
-    return $this->call_method('facebook.data.setAssociations',
-       array('assocs' => json_encode($assocs),
-             'name' => $name));
-  }
-
-  /**
-   * Remove an association between two objects.
-   *
-   * @param  name        name of association
-   * @param  obj_id1     id of first object
-   * @param  obj_id2     id of second object
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_removeAssociation($name, $obj_id1, $obj_id2) {
-    return $this->call_method('facebook.data.removeAssociation',
-       array('name' => $name,
-             'obj_id1' => $obj_id1,
-             'obj_id2' => $obj_id2));
-  }
-
-  /**
-   * Remove associations between objects by specifying pairs of object ids.
-   *
-   * @param  assocs      associations to remove
-   * @param  name        (optional) name of association
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_removeAssociations($assocs, $name = null) {
-    return $this->call_method('facebook.data.removeAssociations',
-       array('assocs' => json_encode($assocs),
-             'name' => $name));
-  }
-
-  /**
-   * Remove associations between objects by specifying one object id.
-   *
-   * @param  name        name of association
-   * @param  obj_id      who's association to remove
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_removeAssociatedObjects($name, $obj_id) {
-    return $this->call_method('facebook.data.removeAssociatedObjects',
-       array('name' => $name,
-             'obj_id' => $obj_id));
-  }
-
-  /**
-   * Retrieve a list of associated objects.
-   *
-   * @param  name        name of association
-   * @param  obj_id      who's association to retrieve
-   * @param  no_data     only return object ids
-   * @return             associated objects
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_getAssociatedObjects($name, $obj_id, $no_data = true) {
-    return $this->call_method('facebook.data.getAssociatedObjects',
-       array('name' => $name,
-             'obj_id' => $obj_id,
-             'no_data' => $no_data));
-  }
-
-  /**
-   * Count associated objects.
-   *
-   * @param  name        name of association
-   * @param  obj_id      who's association to retrieve
-   * @return             associated object's count
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_getAssociatedObjectCount($name, $obj_id) {
-    return $this->call_method('facebook.data.getAssociatedObjectCount',
-       array('name' => $name,
-             'obj_id' => $obj_id));
-  }
-
-  /**
-   * Get a list of associated object counts.
-   *
-   * @param  name        name of association
-   * @param  obj_ids     whose association to retrieve
-   * @return             associated object counts
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_getAssociatedObjectCounts($name, $obj_ids) {
-    return $this->call_method('facebook.data.getAssociatedObjectCounts',
-       array('name' => $name,
-             'obj_ids' => json_encode($obj_ids)));
-  }
-
-  /**
-   * Find all associations between two objects.
-   *
-   * @param  obj_id1     id of first object
-   * @param  obj_id2     id of second object
-   * @param  no_data     only return association names without data
-   * @return             all associations between objects
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_getAssociations($obj_id1, $obj_id2, $no_data = true) {
-    return $this->call_method('facebook.data.getAssociations',
-       array('obj_id1' => $obj_id1,
-             'obj_id2' => $obj_id2,
-             'no_data' => $no_data));
-  }
-
-  /**
-   * Get the properties that you have set for an app.
-   *
-   * @param properties  List of properties names to fetch
-   *
-   * @return array  A map from property name to value
-   */
-  public function admin_getAppProperties($properties) {
-    return json_decode(
-        $this->call_method('facebook.admin.getAppProperties',
-            array('properties' => json_encode($properties))), true);
-  }
-
-  /**
-   * Set properties for an app.
-   *
-   * @param properties  A map from property names to values
-   *
-   * @return bool  true on success
-   */
-  public function admin_setAppProperties($properties) {
-    return $this->call_method('facebook.admin.setAppProperties',
-       array('properties' => json_encode($properties)));
-  }
-
-  /**
-   * Sets href and text for a Live Stream Box xid's via link
-   *
-   * @param  string  $xid       xid of the Live Stream
-   * @param  string  $via_href  Href for the via link
-   * @param  string  $via_text  Text for the via link
-   *
-   * @return boolWhether the set was successful
-   */
-  public function admin_setLiveStreamViaLink($xid, $via_href, $via_text) {
-    return $this->call_method('facebook.admin.setLiveStreamViaLink',
-                              array('xid'      => $xid,
-                                    'via_href' => $via_href,
-                                    'via_text' => $via_text));
-  }
-
-  /**
-   * Gets href and text for a Live Stream Box xid's via link
-   *
-   * @param  string  $xid  xid of the Live Stream
-   *
-   * @return Array  Associative array with keys 'via_href' and 'via_text'
-   *                False if there was an error.
-   */
-  public function admin_getLiveStreamViaLink($xid) {
-    return $this->call_method('facebook.admin.getLiveStreamViaLink',
-                              array('xid' => $xid));
-  }
-
-  /**
-   * Returns the allocation limit value for a specified integration point name
-   * Integration point names are defined in lib/api/karma/constants.php in the
-   * limit_map.
-   *
-   * @param string $integration_point_name  Name of an integration point
-   *                                        (see developer wiki for list).
-   * @param int    $uid                     Specific user to check the limit.
-   *
-   * @return int  Integration point allocation value
-   */
-  public function &admin_getAllocation($integration_point_name, $uid=null) {
-    return $this->call_method('facebook.admin.getAllocation',
-        array('integration_point_name' => $integration_point_name,
-              'uid' => $uid));
-  }
-
-  /**
-   * Returns values for the specified metrics for the current application, in
-   * the given time range.  The metrics are collected for fixed-length periods,
-   * and the times represent midnight at the end of each period.
-   *
-   * @param start_time  unix time for the start of the range
-   * @param end_time    unix time for the end of the range
-   * @param period      number of seconds in the desired period
-   * @param metrics     list of metrics to look up
-   *
-   * @return array  A map of the names and values for those metrics
-   */
-  public function &admin_getMetrics($start_time, $end_time, $period, $metrics) {
-    return $this->call_method('admin.getMetrics',
-        array('start_time' => $start_time,
-              'end_time' => $end_time,
-              'period' => $period,
-              'metrics' => json_encode($metrics)));
-  }
-
-  /**
-   * Sets application restriction info.
-   *
-   * Applications can restrict themselves to only a limited user demographic
-   * based on users' age and/or location or based on static predefined types
-   * specified by facebook for specifying diff age restriction for diff
-   * locations.
-   *
-   * @param array $restriction_info  The age restriction settings to set.
-   *
-   * @return bool  true on success
-   */
-  public function admin_setRestrictionInfo($restriction_info = null) {
-    $restriction_str = null;
-    if (!empty($restriction_info)) {
-      $restriction_str = json_encode($restriction_info);
-    }
-    return $this->call_method('admin.setRestrictionInfo',
-        array('restriction_str' => $restriction_str));
-  }
-
-  /**
-   * Gets application restriction info.
-   *
-   * Applications can restrict themselves to only a limited user demographic
-   * based on users' age and/or location or based on static predefined types
-   * specified by facebook for specifying diff age restriction for diff
-   * locations.
-   *
-   * @return array  The age restriction settings for this application.
-   */
-  public function admin_getRestrictionInfo() {
-    return json_decode(
-        $this->call_method('admin.getRestrictionInfo'),
-        true);
-  }
-
-
-  /**
-   * Bans a list of users from the app. Banned users can't
-   * access the app's canvas page and forums.
-   *
-   * @param array $uids an array of user ids
-   * @return bool true on success
-   */
-  public function admin_banUsers($uids) {
-    return $this->call_method(
-      'admin.banUsers', array('uids' => json_encode($uids)));
-  }
-
-  /**
-   * Unban users that have been previously banned with
-   * admin_banUsers().
-   *
-   * @param array $uids an array of user ids
-   * @return bool true on success
-   */
-  public function admin_unbanUsers($uids) {
-    return $this->call_method(
-      'admin.unbanUsers', array('uids' => json_encode($uids)));
-  }
-
-  /**
-   * Gets the list of users that have been banned from the application.
-   * $uids is an optional parameter that filters the result with the list
-   * of provided user ids. If $uids is provided,
-   * only banned user ids that are contained in $uids are returned.
-   *
-   * @param array $uids an array of user ids to filter by
-   * @return bool true on success
-   */
-
-  public function admin_getBannedUsers($uids = null) {
-    return $this->call_method(
-      'admin.getBannedUsers',
-      array('uids' => $uids ? json_encode($uids) : null));
-  }
-
-
-  /* UTILITY FUNCTIONS */
-
-  /**
-   * Calls the specified normal POST method with the specified parameters.
-   *
-   * @param string $method  Name of the Facebook method to invoke
-   * @param array $params   A map of param names => param values
-   *
-   * @return mixed  Result of method call; this returns a reference to support
-   *                'delayed returns' when in a batch context.
-   *     See: http://wiki.developers.facebook.com/index.php/Using_batching_API
-   */
-  public function &call_method($method, $params = array()) {
-    if ($this->format) {
-      $params['format'] = $this->format;
-    }
-    if (!$this->pending_batch()) {
-      if ($this->call_as_apikey) {
-        $params['call_as_apikey'] = $this->call_as_apikey;
-      }
-      $data = $this->post_request($method, $params);
-      $this->rawData = $data;
-      $result = $this->convert_result($data, $method, $params);
-      if (is_array($result) && isset($result['error_code'])) {
-        throw new FacebookRestClientException($result['error_msg'],
-                                              $result['error_code']);
-      }
-    }
-    else {
-      $result = null;
-      $batch_item = array('m' => $method, 'p' => $params, 'r' => & $result);
-      $this->batch_queue[] = $batch_item;
-    }
-
-    return $result;
-  }
-
-  protected function convert_result($data, $method, $params) {
-    $is_xml = (empty($params['format']) ||
-               strtolower($params['format']) != 'json');
-    return ($is_xml) ? $this->convert_xml_to_result($data, $method, $params)
-                     : json_decode($data, true);
-  }
-
-  /**
-   * Change the response format
-   *
-   * @param string $format The response format (json, xml)
-   */
-  public function setFormat($format) {
-    $this->format = $format;
-    return $this;
-  }
-
-  /**
-   * get the current response serialization format
-   *
-   * @return string 'xml', 'json', or null (which means 'xml')
-   */
-  public function getFormat() {
-    return $this->format;
-  }
-
-  /**
-   * Returns the raw JSON or XML output returned by the server in the most
-   * recent API call.
-   *
-   * @return string
-   */
-   public function getRawData() {
-     return $this->rawData;
-   }
-
-  /**
-   * Calls the specified file-upload POST method with the specified parameters
-   *
-   * @param string $method Name of the Facebook method to invoke
-   * @param array  $params A map of param names => param values
-   * @param string $file   A path to the file to upload (required)
-   *
-   * @return array A dictionary representing the response.
-   */
-  public function call_upload_method($method, $params, $file, $server_addr = null) {
-    if (!$this->pending_batch()) {
-      if (!file_exists($file)) {
-        $code =
-          FacebookAPIErrorCodes::API_EC_PARAM;
-        $description = FacebookAPIErrorCodes::$api_error_descriptions[$code];
-        throw new FacebookRestClientException($description, $code);
-      }
-
-      if ($this->format) {
-        $params['format'] = $this->format;
-      }
-      $data = $this->post_upload_request($method,
-                                         $params,
-                                         $file,
-                                         $server_addr);
-      $result = $this->convert_result($data, $method, $params);
-
-      if (is_array($result) && isset($result['error_code'])) {
-        throw new FacebookRestClientException($result['error_msg'],
-                                              $result['error_code']);
-      }
-    }
-    else {
-      $code =
-        FacebookAPIErrorCodes::API_EC_BATCH_METHOD_NOT_ALLOWED_IN_BATCH_MODE;
-      $description = FacebookAPIErrorCodes::$api_error_descriptions[$code];
-      throw new FacebookRestClientException($description, $code);
-    }
-
-    return $result;
-  }
-
-  protected function convert_xml_to_result($xml, $method, $params) {
-    $sxml = simplexml_load_string($xml);
-    $result = self::convert_simplexml_to_array($sxml);
-
-    if (!empty($GLOBALS['facebook_config']['debug'])) {
-      // output the raw xml and its corresponding php object, for debugging:
-      print '<div style="margin: 10px 30px; padding: 5px; border: 2px solid black; background: gray; color: white; font-size: 12px; font-weight: bold;">';
-      $this->cur_id++;
-      print $this->cur_id . ': Called ' . $method . ', show ' .
-            '<a href=# onclick="return toggleDisplay(' . $this->cur_id . ', \'params\');">Params</a> | '.
-            '<a href=# onclick="return toggleDisplay(' . $this->cur_id . ', \'xml\');">XML</a> | '.
-            '<a href=# onclick="return toggleDisplay(' . $this->cur_id . ', \'sxml\');">SXML</a> | '.
-            '<a href=# onclick="return toggleDisplay(' . $this->cur_id . ', \'php\');">PHP</a>';
-      print '<pre id="params'.$this->cur_id.'" style="display: none; overflow: auto;">'.print_r($params, true).'</pre>';
-      print '<pre id="xml'.$this->cur_id.'" style="display: none; overflow: auto;">'.htmlspecialchars($xml).'</pre>';
-      print '<pre id="php'.$this->cur_id.'" style="display: none; overflow: auto;">'.print_r($result, true).'</pre>';
-      print '<pre id="sxml'.$this->cur_id.'" style="display: none; overflow: auto;">'.print_r($sxml, true).'</pre>';
-      print '</div>';
-    }
-    return $result;
-  }
-
-  protected function finalize_params($method, $params) {
-    list($get, $post) = $this->add_standard_params($method, $params);
-    // we need to do this before signing the params
-    $this->convert_array_values_to_json($post);
-    $post['sig'] = Facebook::generate_sig(array_merge($get, $post),
-                                          $this->secret);
-    return array($get, $post);
-  }
-
-  private function convert_array_values_to_json(&$params) {
-    foreach ($params as $key => &$val) {
-      if (is_array($val)) {
-        $val = json_encode($val);
-      }
-    }
-  }
-
-  /**
-   * Add the generally required params to our request.
-   * Params method, api_key, and v should be sent over as get.
-   */
-  private function add_standard_params($method, $params) {
-    $post = $params;
-    $get = array();
-    if ($this->call_as_apikey) {
-      $get['call_as_apikey'] = $this->call_as_apikey;
-    }
-    if ($this->using_session_secret) {
-      $get['ss'] = '1';
-    }
-
-    $get['method'] = $method;
-    $get['session_key'] = $this->session_key;
-    $get['api_key'] = $this->api_key;
-    $post['call_id'] = microtime(true);
-    if ($post['call_id'] <= $this->last_call_id) {
-      $post['call_id'] = $this->last_call_id + 0.001;
-    }
-    $this->last_call_id = $post['call_id'];
-    if (isset($post['v'])) {
-      $get['v'] = $post['v'];
-      unset($post['v']);
-    } else {
-      $get['v'] = '1.0';
-    }
-    if (isset($this->use_ssl_resources)) {
-      $post['return_ssl_resources'] = (bool) $this->use_ssl_resources;
-    }
-    return array($get, $post);
-  }
-
-  private function create_url_string($params) {
-    $post_params = array();
-    foreach ($params as $key => &$val) {
-      $post_params[] = $key.'='.urlencode($val);
-    }
-    return implode('&', $post_params);
-  }
-
-  private function run_multipart_http_transaction($method, $params, $file, $server_addr) {
-
-    // the format of this message is specified in RFC1867/RFC1341.
-    // we add twenty pseudo-random digits to the end of the boundary string.
-    $boundary = '--------------------------FbMuLtIpArT' .
-                sprintf("%010d", mt_rand()) .
-                sprintf("%010d", mt_rand());
-    $content_type = 'multipart/form-data; boundary=' . $boundary;
-    // within the message, we prepend two extra hyphens.
-    $delimiter = '--' . $boundary;
-    $close_delimiter = $delimiter . '--';
-    $content_lines = array();
-    foreach ($params as $key => &$val) {
-      $content_lines[] = $delimiter;
-      $content_lines[] = 'Content-Disposition: form-data; name="' . $key . '"';
-      $content_lines[] = '';
-      $content_lines[] = $val;
-    }
-    // now add the file data
-    $content_lines[] = $delimiter;
-    $content_lines[] =
-      'Content-Disposition: form-data; filename="' . $file . '"';
-    $content_lines[] = 'Content-Type: application/octet-stream';
-    $content_lines[] = '';
-    $content_lines[] = file_get_contents($file);
-    $content_lines[] = $close_delimiter;
-    $content_lines[] = '';
-    $content = implode("\r\n", $content_lines);
-    return $this->run_http_post_transaction($content_type, $content, $server_addr);
-  }
-
-  public function post_request($method, $params) {
-    list($get, $post) = $this->finalize_params($method, $params);
-    $post_string = $this->create_url_string($post);
-    $get_string = $this->create_url_string($get);
-    $url_with_get = $this->server_addr . '?' . $get_string;
-    if ($this->use_curl_if_available && function_exists('curl_init')) {
-      $useragent = 'Facebook API PHP5 Client 1.1 (curl) ' . phpversion();
-      $ch = curl_init();
-      curl_setopt($ch, CURLOPT_URL, $url_with_get);
-      curl_setopt($ch, CURLOPT_POSTFIELDS, $post_string);
-      curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-      curl_setopt($ch, CURLOPT_USERAGENT, $useragent);
-      curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
-      curl_setopt($ch, CURLOPT_TIMEOUT, 30);
-      $result = $this->curl_exec($ch);
-      curl_close($ch);
-    } else {
-      $content_type = 'application/x-www-form-urlencoded';
-      $content = $post_string;
-      $result = $this->run_http_post_transaction($content_type,
-                                                 $content,
-                                                 $url_with_get);
-    }
-    return $result;
-  }
-
-  /**
-   * execute a curl transaction -- this exists mostly so subclasses can add
-   * extra options and/or process the response, if they wish.
-   *
-   * @param resource $ch a curl handle
-   */
-  protected function curl_exec($ch) {
-      $result = curl_exec($ch);
-      return $result;
-  }
-
-  protected function post_upload_request($method, $params, $file, $server_addr = null) {
-    $server_addr = $server_addr ? $server_addr : $this->server_addr;
-    list($get, $post) = $this->finalize_params($method, $params);
-    $get_string = $this->create_url_string($get);
-    $url_with_get = $server_addr . '?' . $get_string;
-    if ($this->use_curl_if_available && function_exists('curl_init')) {
-      // prepending '@' causes cURL to upload the file; the key is ignored.
-      $post['_file'] = '@' . $file;
-      $useragent = 'Facebook API PHP5 Client 1.1 (curl) ' . phpversion();
-      $ch = curl_init();
-      curl_setopt($ch, CURLOPT_URL, $url_with_get);
-      // this has to come before the POSTFIELDS set!
-      curl_setopt($ch, CURLOPT_POST, 1);
-      // passing an array gets curl to use the multipart/form-data content type
-      curl_setopt($ch, CURLOPT_POSTFIELDS, $post);
-      curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-      curl_setopt($ch, CURLOPT_USERAGENT, $useragent);
-      $result = $this->curl_exec($ch);
-      curl_close($ch);
-    } else {
-      $result = $this->run_multipart_http_transaction($method, $post,
-                                                      $file, $url_with_get);
-    }
-    return $result;
-  }
-
-  private function run_http_post_transaction($content_type, $content, $server_addr) {
-
-    $user_agent = 'Facebook API PHP5 Client 1.1 (non-curl) ' . phpversion();
-    $content_length = strlen($content);
-    $context =
-      array('http' =>
-              array('method' => 'POST',
-                    'user_agent' => $user_agent,
-                    'header' => 'Content-Type: ' . $content_type . "\r\n" .
-                                'Content-Length: ' . $content_length,
-                    'content' => $content));
-    $context_id = stream_context_create($context);
-    $sock = fopen($server_addr, 'r', false, $context_id);
-
-    $result = '';
-    if ($sock) {
-      while (!feof($sock)) {
-        $result .= fgets($sock, 4096);
-      }
-      fclose($sock);
-    }
-    return $result;
-  }
-
-  public static function convert_simplexml_to_array($sxml) {
-    $arr = array();
-    if ($sxml) {
-      foreach ($sxml as $k => $v) {
-        if ($sxml['list']) {
-          $arr[] = self::convert_simplexml_to_array($v);
-        } else {
-          $arr[$k] = self::convert_simplexml_to_array($v);
-        }
-      }
-    }
-    if (sizeof($arr) > 0) {
-      return $arr;
-    } else {
-      return (string)$sxml;
-    }
-  }
-
-  protected function get_uid($uid) {
-    return $uid ? $uid : $this->user;
-  }
-}
-
-
-class FacebookRestClientException extends Exception {
-}
-
-// Supporting methods and values------
-
-/**
- * Error codes and descriptions for the Facebook API.
- */
-
-class FacebookAPIErrorCodes {
-
-  const API_EC_SUCCESS = 0;
-
-  /*
-   * GENERAL ERRORS
-   */
-  const API_EC_UNKNOWN = 1;
-  const API_EC_SERVICE = 2;
-  const API_EC_METHOD = 3;
-  const API_EC_TOO_MANY_CALLS = 4;
-  const API_EC_BAD_IP = 5;
-  const API_EC_HOST_API = 6;
-  const API_EC_HOST_UP = 7;
-  const API_EC_SECURE = 8;
-  const API_EC_RATE = 9;
-  const API_EC_PERMISSION_DENIED = 10;
-  const API_EC_DEPRECATED = 11;
-  const API_EC_VERSION = 12;
-  const API_EC_INTERNAL_FQL_ERROR = 13;
-  const API_EC_HOST_PUP = 14;
-  const API_EC_SESSION_SECRET_NOT_ALLOWED = 15;
-  const API_EC_HOST_READONLY = 16;
-
-  /*
-   * PARAMETER ERRORS
-   */
-  const API_EC_PARAM = 100;
-  const API_EC_PARAM_API_KEY = 101;
-  const API_EC_PARAM_SESSION_KEY = 102;
-  const API_EC_PARAM_CALL_ID = 103;
-  const API_EC_PARAM_SIGNATURE = 104;
-  const API_EC_PARAM_TOO_MANY = 105;
-  const API_EC_PARAM_USER_ID = 110;
-  const API_EC_PARAM_USER_FIELD = 111;
-  const API_EC_PARAM_SOCIAL_FIELD = 112;
-  const API_EC_PARAM_EMAIL = 113;
-  const API_EC_PARAM_USER_ID_LIST = 114;
-  const API_EC_PARAM_FIELD_LIST = 115;
-  const API_EC_PARAM_ALBUM_ID = 120;
-  const API_EC_PARAM_PHOTO_ID = 121;
-  const API_EC_PARAM_FEED_PRIORITY = 130;
-  const API_EC_PARAM_CATEGORY = 140;
-  const API_EC_PARAM_SUBCATEGORY = 141;
-  const API_EC_PARAM_TITLE = 142;
-  const API_EC_PARAM_DESCRIPTION = 143;
-  const API_EC_PARAM_BAD_JSON = 144;
-  const API_EC_PARAM_BAD_EID = 150;
-  const API_EC_PARAM_UNKNOWN_CITY = 151;
-  const API_EC_PARAM_BAD_PAGE_TYPE = 152;
-  const API_EC_PARAM_BAD_LOCALE = 170;
-  const API_EC_PARAM_BLOCKED_NOTIFICATION = 180;
-
-  /*
-   * USER PERMISSIONS ERRORS
-   */
-  const API_EC_PERMISSION = 200;
-  const API_EC_PERMISSION_USER = 210;
-  const API_EC_PERMISSION_NO_DEVELOPERS = 211;
-  const API_EC_PERMISSION_OFFLINE_ACCESS = 212;
-  const API_EC_PERMISSION_ALBUM = 220;
-  const API_EC_PERMISSION_PHOTO = 221;
-  const API_EC_PERMISSION_MESSAGE = 230;
-  const API_EC_PERMISSION_OTHER_USER = 240;
-  const API_EC_PERMISSION_STATUS_UPDATE = 250;
-  const API_EC_PERMISSION_PHOTO_UPLOAD = 260;
-  const API_EC_PERMISSION_VIDEO_UPLOAD = 261;
-  const API_EC_PERMISSION_SMS = 270;
-  const API_EC_PERMISSION_CREATE_LISTING = 280;
-  const API_EC_PERMISSION_CREATE_NOTE = 281;
-  const API_EC_PERMISSION_SHARE_ITEM = 282;
-  const API_EC_PERMISSION_EVENT = 290;
-  const API_EC_PERMISSION_LARGE_FBML_TEMPLATE = 291;
-  const API_EC_PERMISSION_LIVEMESSAGE = 292;
-  const API_EC_PERMISSION_CREATE_EVENT = 296;
-  const API_EC_PERMISSION_RSVP_EVENT = 299;
-
-  /*
-   * DATA EDIT ERRORS
-   */
-  const API_EC_EDIT = 300;
-  const API_EC_EDIT_USER_DATA = 310;
-  const API_EC_EDIT_PHOTO = 320;
-  const API_EC_EDIT_ALBUM_SIZE = 321;
-  const API_EC_EDIT_PHOTO_TAG_SUBJECT = 322;
-  const API_EC_EDIT_PHOTO_TAG_PHOTO = 323;
-  const API_EC_EDIT_PHOTO_FILE = 324;
-  const API_EC_EDIT_PHOTO_PENDING_LIMIT = 325;
-  const API_EC_EDIT_PHOTO_TAG_LIMIT = 326;
-  const API_EC_EDIT_ALBUM_REORDER_PHOTO_NOT_IN_ALBUM = 327;
-  const API_EC_EDIT_ALBUM_REORDER_TOO_FEW_PHOTOS = 328;
-
-  const API_EC_MALFORMED_MARKUP = 329;
-  const API_EC_EDIT_MARKUP = 330;
-
-  const API_EC_EDIT_FEED_TOO_MANY_USER_CALLS = 340;
-  const API_EC_EDIT_FEED_TOO_MANY_USER_ACTION_CALLS = 341;
-  const API_EC_EDIT_FEED_TITLE_LINK = 342;
-  const API_EC_EDIT_FEED_TITLE_LENGTH = 343;
-  const API_EC_EDIT_FEED_TITLE_NAME = 344;
-  const API_EC_EDIT_FEED_TITLE_BLANK = 345;
-  const API_EC_EDIT_FEED_BODY_LENGTH = 346;
-  const API_EC_EDIT_FEED_PHOTO_SRC = 347;
-  const API_EC_EDIT_FEED_PHOTO_LINK = 348;
-
-  const API_EC_EDIT_VIDEO_SIZE = 350;
-  const API_EC_EDIT_VIDEO_INVALID_FILE = 351;
-  const API_EC_EDIT_VIDEO_INVALID_TYPE = 352;
-  const API_EC_EDIT_VIDEO_FILE = 353;
-
-  const API_EC_EDIT_FEED_TITLE_ARRAY = 360;
-  const API_EC_EDIT_FEED_TITLE_PARAMS = 361;
-  const API_EC_EDIT_FEED_BODY_ARRAY = 362;
-  const API_EC_EDIT_FEED_BODY_PARAMS = 363;
-  const API_EC_EDIT_FEED_PHOTO = 364;
-  const API_EC_EDIT_FEED_TEMPLATE = 365;
-  const API_EC_EDIT_FEED_TARGET = 366;
-  const API_EC_EDIT_FEED_MARKUP = 367;
-
-  /**
-   * SESSION ERRORS
-   */
-  const API_EC_SESSION_TIMED_OUT = 450;
-  const API_EC_SESSION_METHOD = 451;
-  const API_EC_SESSION_INVALID = 452;
-  const API_EC_SESSION_REQUIRED = 453;
-  const API_EC_SESSION_REQUIRED_FOR_SECRET = 454;
-  const API_EC_SESSION_CANNOT_USE_SESSION_SECRET = 455;
-
-
-  /**
-   * FQL ERRORS
-   */
-  const FQL_EC_UNKNOWN_ERROR = 600;
-  const FQL_EC_PARSER = 601; // backwards compatibility
-  const FQL_EC_PARSER_ERROR = 601;
-  const FQL_EC_UNKNOWN_FIELD = 602;
-  const FQL_EC_UNKNOWN_TABLE = 603;
-  const FQL_EC_NOT_INDEXABLE = 604; // backwards compatibility
-  const FQL_EC_NO_INDEX = 604;
-  const FQL_EC_UNKNOWN_FUNCTION = 605;
-  const FQL_EC_INVALID_PARAM = 606;
-  const FQL_EC_INVALID_FIELD = 607;
-  const FQL_EC_INVALID_SESSION = 608;
-  const FQL_EC_UNSUPPORTED_APP_TYPE = 609;
-  const FQL_EC_SESSION_SECRET_NOT_ALLOWED = 610;
-  const FQL_EC_DEPRECATED_TABLE = 611;
-  const FQL_EC_EXTENDED_PERMISSION = 612;
-  const FQL_EC_RATE_LIMIT_EXCEEDED = 613;
-  const FQL_EC_UNRESOLVED_DEPENDENCY = 614;
-  const FQL_EC_INVALID_SEARCH = 615;
-  const FQL_EC_CONTAINS_ERROR = 616;
-
-  const API_EC_REF_SET_FAILED = 700;
-
-  /**
-   * DATA STORE API ERRORS
-   */
-  const API_EC_DATA_UNKNOWN_ERROR = 800;
-  const API_EC_DATA_INVALID_OPERATION = 801;
-  const API_EC_DATA_QUOTA_EXCEEDED = 802;
-  const API_EC_DATA_OBJECT_NOT_FOUND = 803;
-  const API_EC_DATA_OBJECT_ALREADY_EXISTS = 804;
-  const API_EC_DATA_DATABASE_ERROR = 805;
-  const API_EC_DATA_CREATE_TEMPLATE_ERROR = 806;
-  const API_EC_DATA_TEMPLATE_EXISTS_ERROR = 807;
-  const API_EC_DATA_TEMPLATE_HANDLE_TOO_LONG = 808;
-  const API_EC_DATA_TEMPLATE_HANDLE_ALREADY_IN_USE = 809;
-  const API_EC_DATA_TOO_MANY_TEMPLATE_BUNDLES = 810;
-  const API_EC_DATA_MALFORMED_ACTION_LINK = 811;
-  const API_EC_DATA_TEMPLATE_USES_RESERVED_TOKEN = 812;
-
-  /*
-   * APPLICATION INFO ERRORS
-   */
-  const API_EC_NO_SUCH_APP = 900;
-
-  /*
-   * BATCH ERRORS
-   */
-  const API_EC_BATCH_TOO_MANY_ITEMS = 950;
-  const API_EC_BATCH_ALREADY_STARTED = 951;
-  const API_EC_BATCH_NOT_STARTED = 952;
-  const API_EC_BATCH_METHOD_NOT_ALLOWED_IN_BATCH_MODE = 953;
-
-  /*
-   * EVENT API ERRORS
-   */
-  const API_EC_EVENT_INVALID_TIME = 1000;
-  const API_EC_EVENT_NAME_LOCKED  = 1001;
-
-  /*
-   * INFO BOX ERRORS
-   */
-  const API_EC_INFO_NO_INFORMATION = 1050;
-  const API_EC_INFO_SET_FAILED = 1051;
-
-  /*
-   * LIVEMESSAGE API ERRORS
-   */
-  const API_EC_LIVEMESSAGE_SEND_FAILED = 1100;
-  const API_EC_LIVEMESSAGE_EVENT_NAME_TOO_LONG = 1101;
-  const API_EC_LIVEMESSAGE_MESSAGE_TOO_LONG = 1102;
-
-  /*
-   * PAYMENTS API ERRORS
-   */
-  const API_EC_PAYMENTS_UNKNOWN = 1150;
-  const API_EC_PAYMENTS_APP_INVALID = 1151;
-  const API_EC_PAYMENTS_DATABASE = 1152;
-  const API_EC_PAYMENTS_PERMISSION_DENIED = 1153;
-  const API_EC_PAYMENTS_APP_NO_RESPONSE = 1154;
-  const API_EC_PAYMENTS_APP_ERROR_RESPONSE = 1155;
-  const API_EC_PAYMENTS_INVALID_ORDER = 1156;
-  const API_EC_PAYMENTS_INVALID_PARAM = 1157;
-  const API_EC_PAYMENTS_INVALID_OPERATION = 1158;
-  const API_EC_PAYMENTS_PAYMENT_FAILED = 1159;
-  const API_EC_PAYMENTS_DISABLED = 1160;
-
-  /*
-   * CONNECT SESSION ERRORS
-   */
-  const API_EC_CONNECT_FEED_DISABLED = 1300;
-
-  /*
-   * Platform tag bundles errors
-   */
-  const API_EC_TAG_BUNDLE_QUOTA = 1400;
-
-  /*
-   * SHARE
-   */
-  const API_EC_SHARE_BAD_URL = 1500;
-
-  /*
-   * NOTES
-   */
-  const API_EC_NOTE_CANNOT_MODIFY = 1600;
-
-  /*
-   * COMMENTS
-   */
-  const API_EC_COMMENTS_UNKNOWN = 1700;
-  const API_EC_COMMENTS_POST_TOO_LONG = 1701;
-  const API_EC_COMMENTS_DB_DOWN = 1702;
-  const API_EC_COMMENTS_INVALID_XID = 1703;
-  const API_EC_COMMENTS_INVALID_UID = 1704;
-  const API_EC_COMMENTS_INVALID_POST = 1705;
-  const API_EC_COMMENTS_INVALID_REMOVE = 1706;
-
-  /*
-   * GIFTS
-   */
-  const API_EC_GIFTS_UNKNOWN = 1900;
-
-  /*
-   * APPLICATION MORATORIUM ERRORS
-   */
-  const API_EC_DISABLED_ALL = 2000;
-  const API_EC_DISABLED_STATUS = 2001;
-  const API_EC_DISABLED_FEED_STORIES = 2002;
-  const API_EC_DISABLED_NOTIFICATIONS = 2003;
-  const API_EC_DISABLED_REQUESTS = 2004;
-  const API_EC_DISABLED_EMAIL = 2005;
-
-  /**
-   * This array is no longer maintained; to view the description of an error
-   * code, please look at the message element of the API response or visit
-   * the developer wiki at http://wiki.developers.facebook.com/.
-   */
-  public static $api_error_descriptions = array(
-      self::API_EC_SUCCESS           => 'Success',
-      self::API_EC_UNKNOWN           => 'An unknown error occurred',
-      self::API_EC_SERVICE           => 'Service temporarily unavailable',
-      self::API_EC_METHOD            => 'Unknown method',
-      self::API_EC_TOO_MANY_CALLS    => 'Application request limit reached',
-      self::API_EC_BAD_IP            => 'Unauthorized source IP address',
-      self::API_EC_PARAM             => 'Invalid parameter',
-      self::API_EC_PARAM_API_KEY     => 'Invalid API key',
-      self::API_EC_PARAM_SESSION_KEY => 'Session key invalid or no longer valid',
-      self::API_EC_PARAM_CALL_ID     => 'Call_id must be greater than previous',
-      self::API_EC_PARAM_SIGNATURE   => 'Incorrect signature',
-      self::API_EC_PARAM_USER_ID     => 'Invalid user id',
-      self::API_EC_PARAM_USER_FIELD  => 'Invalid user info field',
-      self::API_EC_PARAM_SOCIAL_FIELD => 'Invalid user field',
-      self::API_EC_PARAM_USER_ID_LIST => 'Invalid user id list',
-      self::API_EC_PARAM_FIELD_LIST => 'Invalid field list',
-      self::API_EC_PARAM_ALBUM_ID    => 'Invalid album id',
-      self::API_EC_PARAM_BAD_EID     => 'Invalid eid',
-      self::API_EC_PARAM_UNKNOWN_CITY => 'Unknown city',
-      self::API_EC_PERMISSION        => 'Permissions error',
-      self::API_EC_PERMISSION_USER   => 'User not visible',
-      self::API_EC_PERMISSION_NO_DEVELOPERS  => 'Application has no developers',
-      self::API_EC_PERMISSION_ALBUM  => 'Album not visible',
-      self::API_EC_PERMISSION_PHOTO  => 'Photo not visible',
-      self::API_EC_PERMISSION_EVENT  => 'Creating and modifying events required the extended permission create_event',
-      self::API_EC_PERMISSION_RSVP_EVENT => 'RSVPing to events required the extended permission rsvp_event',
-      self::API_EC_EDIT_ALBUM_SIZE   => 'Album is full',
-      self::FQL_EC_PARSER            => 'FQL: Parser Error',
-      self::FQL_EC_UNKNOWN_FIELD     => 'FQL: Unknown Field',
-      self::FQL_EC_UNKNOWN_TABLE     => 'FQL: Unknown Table',
-      self::FQL_EC_NOT_INDEXABLE     => 'FQL: Statement not indexable',
-      self::FQL_EC_UNKNOWN_FUNCTION  => 'FQL: Attempted to call unknown function',
-      self::FQL_EC_INVALID_PARAM     => 'FQL: Invalid parameter passed in',
-      self::API_EC_DATA_UNKNOWN_ERROR => 'Unknown data store API error',
-      self::API_EC_DATA_INVALID_OPERATION => 'Invalid operation',
-      self::API_EC_DATA_QUOTA_EXCEEDED => 'Data store allowable quota was exceeded',
-      self::API_EC_DATA_OBJECT_NOT_FOUND => 'Specified object cannot be found',
-      self::API_EC_DATA_OBJECT_ALREADY_EXISTS => 'Specified object already exists',
-      self::API_EC_DATA_DATABASE_ERROR => 'A database error occurred. Please try again',
-      self::API_EC_BATCH_ALREADY_STARTED => 'begin_batch already called, please make sure to call end_batch first',
-      self::API_EC_BATCH_NOT_STARTED => 'end_batch called before begin_batch',
-      self::API_EC_BATCH_METHOD_NOT_ALLOWED_IN_BATCH_MODE => 'This method is not allowed in batch mode'
-  );
-}
diff --git a/plugins/Facebook/facebook/jsonwrapper/JSON/JSON.php b/plugins/Facebook/facebook/jsonwrapper/JSON/JSON.php
deleted file mode 100644
index 0cddbddb41..0000000000
--- a/plugins/Facebook/facebook/jsonwrapper/JSON/JSON.php
+++ /dev/null
@@ -1,806 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Converts to and from JSON format.
- *
- * JSON (JavaScript Object Notation) is a lightweight data-interchange
- * format. It is easy for humans to read and write. It is easy for machines
- * to parse and generate. It is based on a subset of the JavaScript
- * Programming Language, Standard ECMA-262 3rd Edition - December 1999.
- * This feature can also be found in  Python. JSON is a text format that is
- * completely language independent but uses conventions that are familiar
- * to programmers of the C-family of languages, including C, C++, C#, Java,
- * JavaScript, Perl, TCL, and many others. These properties make JSON an
- * ideal data-interchange language.
- *
- * This package provides a simple encoder and decoder for JSON notation. It
- * is intended for use with client-side Javascript applications that make
- * use of HTTPRequest to perform server communication functions - data can
- * be encoded into JSON notation for use in a client-side javascript, or
- * decoded from incoming Javascript requests. JSON format is native to
- * Javascript, and can be directly eval()'ed with no further parsing
- * overhead
- *
- * All strings should be in ASCII or UTF-8 format!
- *
- * LICENSE: 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.
- *
- * THIS SOFTWARE IS PROVIDED ``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 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
- * @package     Services_JSON
- * @author      Michal Migurski <mike-json@teczno.com>
- * @author      Matt Knapp <mdknapp[at]gmail[dot]com>
- * @author      Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
- * @copyright   2005 Michal Migurski
- * @version     CVS: $Id: JSON.php,v 1.31 2006/06/28 05:54:17 migurski Exp $
- * @license     http://www.opensource.org/licenses/bsd-license.php
- * @link        http://pear.php.net/pepr/pepr-proposal-show.php?id=198
- */
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_SLICE',   1);
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_IN_STR',  2);
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_IN_ARR',  3);
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_IN_OBJ',  4);
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_IN_CMT', 5);
-
-/**
- * Behavior switch for Services_JSON::decode()
- */
-define('SERVICES_JSON_LOOSE_TYPE', 16);
-
-/**
- * Behavior switch for Services_JSON::decode()
- */
-define('SERVICES_JSON_SUPPRESS_ERRORS', 32);
-
-/**
- * Converts to and from JSON format.
- *
- * Brief example of use:
- *
- * <code>
- * // create a new instance of Services_JSON
- * $json = new Services_JSON();
- *
- * // convert a complexe value to JSON notation, and send it to the browser
- * $value = array('foo', 'bar', array(1, 2, 'baz'), array(3, array(4)));
- * $output = $json->encode($value);
- *
- * print($output);
- * // prints: ["foo","bar",[1,2,"baz"],[3,[4]]]
- *
- * // accept incoming POST data, assumed to be in JSON notation
- * $input = file_get_contents('php://input', 1000000);
- * $value = $json->decode($input);
- * </code>
- */
-class Services_JSON
-{
-   /**
-    * constructs a new JSON instance
-    *
-    * @param    int     $use    object behavior flags; combine with boolean-OR
-    *
-    *                           possible values:
-    *                           - SERVICES_JSON_LOOSE_TYPE:  loose typing.
-    *                                   "{...}" syntax creates associative arrays
-    *                                   instead of objects in decode().
-    *                           - SERVICES_JSON_SUPPRESS_ERRORS:  error suppression.
-    *                                   Values which can't be encoded (e.g. resources)
-    *                                   appear as NULL instead of throwing errors.
-    *                                   By default, a deeply-nested resource will
-    *                                   bubble up with an error, so all return values
-    *                                   from encode() should be checked with isError()
-    */
-    function Services_JSON($use = 0)
-    {
-        $this->use = $use;
-    }
-
-   /**
-    * convert a string from one UTF-16 char to one UTF-8 char
-    *
-    * Normally should be handled by mb_convert_encoding, but
-    * provides a slower PHP-only method for installations
-    * that lack the multibye string extension.
-    *
-    * @param    string  $utf16  UTF-16 character
-    * @return   string  UTF-8 character
-    * @access   private
-    */
-    function utf162utf8($utf16)
-    {
-        // oh please oh please oh please oh please oh please
-        if(function_exists('mb_convert_encoding')) {
-            return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
-        }
-
-        $bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
-
-        switch(true) {
-            case ((0x7F & $bytes) == $bytes):
-                // this case should never be reached, because we are in ASCII range
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x7F & $bytes);
-
-            case (0x07FF & $bytes) == $bytes:
-                // return a 2-byte UTF-8 character
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xC0 | (($bytes >> 6) & 0x1F))
-                     . chr(0x80 | ($bytes & 0x3F));
-
-            case (0xFFFF & $bytes) == $bytes:
-                // return a 3-byte UTF-8 character
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xE0 | (($bytes >> 12) & 0x0F))
-                     . chr(0x80 | (($bytes >> 6) & 0x3F))
-                     . chr(0x80 | ($bytes & 0x3F));
-        }
-
-        // ignoring UTF-32 for now, sorry
-        return '';
-    }
-
-   /**
-    * convert a string from one UTF-8 char to one UTF-16 char
-    *
-    * Normally should be handled by mb_convert_encoding, but
-    * provides a slower PHP-only method for installations
-    * that lack the multibye string extension.
-    *
-    * @param    string  $utf8   UTF-8 character
-    * @return   string  UTF-16 character
-    * @access   private
-    */
-    function utf82utf16($utf8)
-    {
-        // oh please oh please oh please oh please oh please
-        if(function_exists('mb_convert_encoding')) {
-            return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
-        }
-
-        switch(strlen($utf8)) {
-            case 1:
-                // this case should never be reached, because we are in ASCII range
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return $utf8;
-
-            case 2:
-                // return a UTF-16 character from a 2-byte UTF-8 char
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x07 & (ord($utf8{0}) >> 2))
-                     . chr((0xC0 & (ord($utf8{0}) << 6))
-                         | (0x3F & ord($utf8{1})));
-
-            case 3:
-                // return a UTF-16 character from a 3-byte UTF-8 char
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr((0xF0 & (ord($utf8{0}) << 4))
-                         | (0x0F & (ord($utf8{1}) >> 2)))
-                     . chr((0xC0 & (ord($utf8{1}) << 6))
-                         | (0x7F & ord($utf8{2})));
-        }
-
-        // ignoring UTF-32 for now, sorry
-        return '';
-    }
-
-   /**
-    * encodes an arbitrary variable into JSON format
-    *
-    * @param    mixed   $var    any number, boolean, string, array, or object to be encoded.
-    *                           see argument 1 to Services_JSON() above for array-parsing behavior.
-    *                           if var is a strng, note that encode() always expects it
-    *                           to be in ASCII or UTF-8 format!
-    *
-    * @return   mixed   JSON string representation of input var or an error if a problem occurs
-    * @access   public
-    */
-    function encode($var)
-    {
-        switch (gettype($var)) {
-            case 'boolean':
-                return $var ? 'true' : 'false';
-
-            case 'NULL':
-                return 'null';
-
-            case 'integer':
-                return (int) $var;
-
-            case 'double':
-            case 'float':
-                return (float) $var;
-
-            case 'string':
-                // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
-                $ascii = '';
-                $strlen_var = strlen($var);
-
-               /*
-                * Iterate over every character in the string,
-                * escaping with a slash or encoding to UTF-8 where necessary
-                */
-                for ($c = 0; $c < $strlen_var; ++$c) {
-
-                    $ord_var_c = ord($var{$c});
-
-                    switch (true) {
-                        case $ord_var_c == 0x08:
-                            $ascii .= '\b';
-                            break;
-                        case $ord_var_c == 0x09:
-                            $ascii .= '\t';
-                            break;
-                        case $ord_var_c == 0x0A:
-                            $ascii .= '\n';
-                            break;
-                        case $ord_var_c == 0x0C:
-                            $ascii .= '\f';
-                            break;
-                        case $ord_var_c == 0x0D:
-                            $ascii .= '\r';
-                            break;
-
-                        case $ord_var_c == 0x22:
-                        case $ord_var_c == 0x2F:
-                        case $ord_var_c == 0x5C:
-                            // double quote, slash, slosh
-                            $ascii .= '\\'.$var{$c};
-                            break;
-
-                        case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
-                            // characters U-00000000 - U-0000007F (same as ASCII)
-                            $ascii .= $var{$c};
-                            break;
-
-                        case (($ord_var_c & 0xE0) == 0xC0):
-                            // characters U-00000080 - U-000007FF, mask 110XXXXX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c, ord($var{$c + 1}));
-                            $c += 1;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xF0) == 0xE0):
-                            // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}));
-                            $c += 2;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xF8) == 0xF0):
-                            // characters U-00010000 - U-001FFFFF, mask 11110XXX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}));
-                            $c += 3;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xFC) == 0xF8):
-                            // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}),
-                                         ord($var{$c + 4}));
-                            $c += 4;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xFE) == 0xFC):
-                            // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}),
-                                         ord($var{$c + 4}),
-                                         ord($var{$c + 5}));
-                            $c += 5;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-                    }
-                }
-
-                return '"'.$ascii.'"';
-
-            case 'array':
-               /*
-                * As per JSON spec if any array key is not an integer
-                * we must treat the the whole array as an object. We
-                * also try to catch a sparsely populated associative
-                * array with numeric keys here because some JS engines
-                * will create an array with empty indexes up to
-                * max_index which can cause memory issues and because
-                * the keys, which may be relevant, will be remapped
-                * otherwise.
-                *
-                * As per the ECMA and JSON specification an object may
-                * have any string as a property. Unfortunately due to
-                * a hole in the ECMA specification if the key is a
-                * ECMA reserved word or starts with a digit the
-                * parameter is only accessible using ECMAScript's
-                * bracket notation.
-                */
-
-                // treat as a JSON object
-                if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
-                    $properties = array_map(array($this, 'name_value'),
-                                            array_keys($var),
-                                            array_values($var));
-
-                    foreach($properties as $property) {
-                        if(Services_JSON::isError($property)) {
-                            return $property;
-                        }
-                    }
-
-                    return '{' . join(',', $properties) . '}';
-                }
-
-                // treat it like a regular array
-                $elements = array_map(array($this, 'encode'), $var);
-
-                foreach($elements as $element) {
-                    if(Services_JSON::isError($element)) {
-                        return $element;
-                    }
-                }
-
-                return '[' . join(',', $elements) . ']';
-
-            case 'object':
-                $vars = get_object_vars($var);
-
-                $properties = array_map(array($this, 'name_value'),
-                                        array_keys($vars),
-                                        array_values($vars));
-
-                foreach($properties as $property) {
-                    if(Services_JSON::isError($property)) {
-                        return $property;
-                    }
-                }
-
-                return '{' . join(',', $properties) . '}';
-
-            default:
-                return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS)
-                    ? 'null'
-                    : new Services_JSON_Error(gettype($var)." can not be encoded as JSON string");
-        }
-    }
-
-   /**
-    * array-walking function for use in generating JSON-formatted name-value pairs
-    *
-    * @param    string  $name   name of key to use
-    * @param    mixed   $value  reference to an array element to be encoded
-    *
-    * @return   string  JSON-formatted name-value pair, like '"name":value'
-    * @access   private
-    */
-    function name_value($name, $value)
-    {
-        $encoded_value = $this->encode($value);
-
-        if(Services_JSON::isError($encoded_value)) {
-            return $encoded_value;
-        }
-
-        return $this->encode(strval($name)) . ':' . $encoded_value;
-    }
-
-   /**
-    * reduce a string by removing leading and trailing comments and whitespace
-    *
-    * @param    $str    string      string value to strip of comments and whitespace
-    *
-    * @return   string  string value stripped of comments and whitespace
-    * @access   private
-    */
-    function reduce_string($str)
-    {
-        $str = preg_replace(array(
-
-                // eliminate single line comments in '// ...' form
-                '#^\s*//(.+)$#m',
-
-                // eliminate multi-line comments in '/* ... */' form, at start of string
-                '#^\s*/\*(.+)\*/#Us',
-
-                // eliminate multi-line comments in '/* ... */' form, at end of string
-                '#/\*(.+)\*/\s*$#Us'
-
-            ), '', $str);
-
-        // eliminate extraneous space
-        return trim($str);
-    }
-
-   /**
-    * decodes a JSON string into appropriate variable
-    *
-    * @param    string  $str    JSON-formatted string
-    *
-    * @return   mixed   number, boolean, string, array, or object
-    *                   corresponding to given JSON input string.
-    *                   See argument 1 to Services_JSON() above for object-output behavior.
-    *                   Note that decode() always returns strings
-    *                   in ASCII or UTF-8 format!
-    * @access   public
-    */
-    function decode($str)
-    {
-        $str = $this->reduce_string($str);
-
-        switch (strtolower($str)) {
-            case 'true':
-                return true;
-
-            case 'false':
-                return false;
-
-            case 'null':
-                return null;
-
-            default:
-                $m = array();
-
-                if (is_numeric($str)) {
-                    // Lookie-loo, it's a number
-
-                    // This would work on its own, but I'm trying to be
-                    // good about returning integers where appropriate:
-                    // return (float)$str;
-
-                    // Return float or int, as appropriate
-                    return ((float)$str == (integer)$str)
-                        ? (integer)$str
-                        : (float)$str;
-
-                } elseif (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
-                    // STRINGS RETURNED IN UTF-8 FORMAT
-                    $delim = substr($str, 0, 1);
-                    $chrs = substr($str, 1, -1);
-                    $utf8 = '';
-                    $strlen_chrs = strlen($chrs);
-
-                    for ($c = 0; $c < $strlen_chrs; ++$c) {
-
-                        $substr_chrs_c_2 = substr($chrs, $c, 2);
-                        $ord_chrs_c = ord($chrs{$c});
-
-                        switch (true) {
-                            case $substr_chrs_c_2 == '\b':
-                                $utf8 .= chr(0x08);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\t':
-                                $utf8 .= chr(0x09);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\n':
-                                $utf8 .= chr(0x0A);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\f':
-                                $utf8 .= chr(0x0C);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\r':
-                                $utf8 .= chr(0x0D);
-                                ++$c;
-                                break;
-
-                            case $substr_chrs_c_2 == '\\"':
-                            case $substr_chrs_c_2 == '\\\'':
-                            case $substr_chrs_c_2 == '\\\\':
-                            case $substr_chrs_c_2 == '\\/':
-                                if (($delim == '"' && $substr_chrs_c_2 != '\\\'') ||
-                                   ($delim == "'" && $substr_chrs_c_2 != '\\"')) {
-                                    $utf8 .= $chrs{++$c};
-                                }
-                                break;
-
-                            case preg_match('/\\\u[0-9A-F]{4}/i', substr($chrs, $c, 6)):
-                                // single, escaped unicode character
-                                $utf16 = chr(hexdec(substr($chrs, ($c + 2), 2)))
-                                       . chr(hexdec(substr($chrs, ($c + 4), 2)));
-                                $utf8 .= $this->utf162utf8($utf16);
-                                $c += 5;
-                                break;
-
-                            case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
-                                $utf8 .= $chrs{$c};
-                                break;
-
-                            case ($ord_chrs_c & 0xE0) == 0xC0:
-                                // characters U-00000080 - U-000007FF, mask 110XXXXX
-                                //see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 2);
-                                ++$c;
-                                break;
-
-                            case ($ord_chrs_c & 0xF0) == 0xE0:
-                                // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 3);
-                                $c += 2;
-                                break;
-
-                            case ($ord_chrs_c & 0xF8) == 0xF0:
-                                // characters U-00010000 - U-001FFFFF, mask 11110XXX
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 4);
-                                $c += 3;
-                                break;
-
-                            case ($ord_chrs_c & 0xFC) == 0xF8:
-                                // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 5);
-                                $c += 4;
-                                break;
-
-                            case ($ord_chrs_c & 0xFE) == 0xFC:
-                                // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 6);
-                                $c += 5;
-                                break;
-
-                        }
-
-                    }
-
-                    return $utf8;
-
-                } elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
-                    // array, or object notation
-
-                    if ($str{0} == '[') {
-                        $stk = array(SERVICES_JSON_IN_ARR);
-                        $arr = array();
-                    } else {
-                        if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                            $stk = array(SERVICES_JSON_IN_OBJ);
-                            $obj = array();
-                        } else {
-                            $stk = array(SERVICES_JSON_IN_OBJ);
-                            $obj = new stdClass();
-                        }
-                    }
-
-                    array_push($stk, array('what'  => SERVICES_JSON_SLICE,
-                                           'where' => 0,
-                                           'delim' => false));
-
-                    $chrs = substr($str, 1, -1);
-                    $chrs = $this->reduce_string($chrs);
-
-                    if ($chrs == '') {
-                        if (reset($stk) == SERVICES_JSON_IN_ARR) {
-                            return $arr;
-
-                        } else {
-                            return $obj;
-
-                        }
-                    }
-
-                    //print("\nparsing {$chrs}\n");
-
-                    $strlen_chrs = strlen($chrs);
-
-                    for ($c = 0; $c <= $strlen_chrs; ++$c) {
-
-                        $top = end($stk);
-                        $substr_chrs_c_2 = substr($chrs, $c, 2);
-
-                        if (($c == $strlen_chrs) || (($chrs{$c} == ',') && ($top['what'] == SERVICES_JSON_SLICE))) {
-                            // found a comma that is not inside a string, array, etc.,
-                            // OR we've reached the end of the character list
-                            $slice = substr($chrs, $top['where'], ($c - $top['where']));
-                            array_push($stk, array('what' => SERVICES_JSON_SLICE, 'where' => ($c + 1), 'delim' => false));
-                            //print("Found split at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                            if (reset($stk) == SERVICES_JSON_IN_ARR) {
-                                // we are in an array, so just push an element onto the stack
-                                array_push($arr, $this->decode($slice));
-
-                            } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
-                                // we are in an object, so figure
-                                // out the property name and set an
-                                // element in an associative array,
-                                // for now
-                                $parts = array();
-                                
-                                if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
-                                    // "name":value pair
-                                    $key = $this->decode($parts[1]);
-                                    $val = $this->decode($parts[2]);
-
-                                    if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                                        $obj[$key] = $val;
-                                    } else {
-                                        $obj->$key = $val;
-                                    }
-                                } elseif (preg_match('/^\s*(\w+)\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
-                                    // name:value pair, where name is unquoted
-                                    $key = $parts[1];
-                                    $val = $this->decode($parts[2]);
-
-                                    if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                                        $obj[$key] = $val;
-                                    } else {
-                                        $obj->$key = $val;
-                                    }
-                                }
-
-                            }
-
-                        } elseif ((($chrs{$c} == '"') || ($chrs{$c} == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) {
-                            // found a quote, and we are not inside a string
-                            array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs{$c}));
-                            //print("Found start of string at {$c}\n");
-
-                        } elseif (($chrs{$c} == $top['delim']) &&
-                                 ($top['what'] == SERVICES_JSON_IN_STR) &&
-                                 ((strlen(substr($chrs, 0, $c)) - strlen(rtrim(substr($chrs, 0, $c), '\\'))) % 2 != 1)) {
-                            // found a quote, we're in a string, and it's not escaped
-                            // we know that it's not escaped becase there is _not_ an
-                            // odd number of backslashes at the end of the string so far
-                            array_pop($stk);
-                            //print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
-
-                        } elseif (($chrs{$c} == '[') &&
-                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
-                            // found a left-bracket, and we are in an array, object, or slice
-                            array_push($stk, array('what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false));
-                            //print("Found start of array at {$c}\n");
-
-                        } elseif (($chrs{$c} == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
-                            // found a right-bracket, and we're in an array
-                            array_pop($stk);
-                            //print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                        } elseif (($chrs{$c} == '{') &&
-                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
-                            // found a left-brace, and we are in an array, object, or slice
-                            array_push($stk, array('what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false));
-                            //print("Found start of object at {$c}\n");
-
-                        } elseif (($chrs{$c} == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
-                            // found a right-brace, and we're in an object
-                            array_pop($stk);
-                            //print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                        } elseif (($substr_chrs_c_2 == '/*') &&
-                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
-                            // found a comment start, and we are in an array, object, or slice
-                            array_push($stk, array('what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false));
-                            $c++;
-                            //print("Found start of comment at {$c}\n");
-
-                        } elseif (($substr_chrs_c_2 == '*/') && ($top['what'] == SERVICES_JSON_IN_CMT)) {
-                            // found a comment end, and we're in one now
-                            array_pop($stk);
-                            $c++;
-
-                            for ($i = $top['where']; $i <= $c; ++$i)
-                                $chrs = substr_replace($chrs, ' ', $i, 1);
-
-                            //print("Found end of comment at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                        }
-
-                    }
-
-                    if (reset($stk) == SERVICES_JSON_IN_ARR) {
-                        return $arr;
-
-                    } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
-                        return $obj;
-
-                    }
-
-                }
-        }
-    }
-
-    /**
-     * @todo Ultimately, this should just call PEAR::isError()
-     */
-    function isError($data, $code = null)
-    {
-        if (class_exists('pear')) {
-            return PEAR::isError($data, $code);
-        } elseif (is_object($data) && (get_class($data) == 'services_json_error' ||
-                                 is_subclass_of($data, 'services_json_error'))) {
-            return true;
-        }
-
-        return false;
-    }
-}
-
-if (class_exists('PEAR_Error')) {
-
-    class Services_JSON_Error extends PEAR_Error
-    {
-        function Services_JSON_Error($message = 'unknown error', $code = null,
-                                     $mode = null, $options = null, $userinfo = null)
-        {
-            parent::PEAR_Error($message, $code, $mode, $options, $userinfo);
-        }
-    }
-
-} else {
-
-    /**
-     * @todo Ultimately, this class shall be descended from PEAR_Error
-     */
-    class Services_JSON_Error
-    {
-        function Services_JSON_Error($message = 'unknown error', $code = null,
-                                     $mode = null, $options = null, $userinfo = null)
-        {
-
-        }
-    }
-
-}
-    
-?>
diff --git a/plugins/Facebook/facebook/jsonwrapper/JSON/LICENSE b/plugins/Facebook/facebook/jsonwrapper/JSON/LICENSE
deleted file mode 100644
index 4ae6bef55d..0000000000
--- a/plugins/Facebook/facebook/jsonwrapper/JSON/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-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.
-
-THIS SOFTWARE IS PROVIDED ``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 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/Facebook/facebook/jsonwrapper/jsonwrapper.php b/plugins/Facebook/facebook/jsonwrapper/jsonwrapper.php
deleted file mode 100644
index 29509debad..0000000000
--- a/plugins/Facebook/facebook/jsonwrapper/jsonwrapper.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-# In PHP 5.2 or higher we don't need to bring this in
-if (!function_exists('json_encode')) {
-	require_once 'jsonwrapper_inner.php';
-} 
-?>
diff --git a/plugins/Facebook/facebook/jsonwrapper/jsonwrapper_inner.php b/plugins/Facebook/facebook/jsonwrapper/jsonwrapper_inner.php
deleted file mode 100644
index 36a3f28635..0000000000
--- a/plugins/Facebook/facebook/jsonwrapper/jsonwrapper_inner.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-require_once 'JSON/JSON.php';
-
-function json_encode($arg)
-{
-	global $services_json;
-	if (!isset($services_json)) {
-		$services_json = new Services_JSON();
-	}
-	return $services_json->encode($arg);
-}
-
-function json_decode($arg)
-{
-	global $services_json;
-	if (!isset($services_json)) {
-		$services_json = new Services_JSON();
-	}
-	return $services_json->decode($arg);
-}
-
-?>
diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php
deleted file mode 100644
index 003bf8cd7e..0000000000
--- a/plugins/Facebook/facebookaction.php
+++ /dev/null
@@ -1,531 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Base Facebook Action
- *
- * 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  Faceboook
- * @package   StatusNet
- * @author    Zach Copley <zach@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 . '/plugins/Facebook/facebookutil.php';
-require_once INSTALLDIR . '/plugins/Facebook/facebooknoticeform.php';
-
-class FacebookAction extends Action
-{
-    var $facebook = null;
-    var $fbuid    = null;
-    var $flink    = null;
-    var $action   = null;
-    var $app_uri  = null;
-    var $app_name = null;
-
-    function __construct($output='php://output', $indent=null, $facebook=null, $flink=null)
-    {
-        parent::__construct($output, $indent);
-
-        $this->facebook = $facebook;
-        $this->flink = $flink;
-
-        if ($this->flink) {
-            $this->fbuid = $flink->foreign_id;
-            $this->user = $flink->getUser();
-        }
-
-        $this->args = array();
-    }
-
-    function prepare($argarray)
-    {
-        parent::prepare($argarray);
-
-        $this->facebook = getFacebook();
-        $this->fbuid = $this->facebook->require_login();
-
-        $this->action = $this->trimmed('action');
-
-        $app_props = $this->facebook->api_client->Admin_getAppProperties(
-                array('canvas_name', 'application_name'));
-
-        $this->app_uri = 'http://apps.facebook.com/' . $app_props['canvas_name'];
-        $this->app_name = $app_props['application_name'];
-
-        $this->flink = Foreign_link::getByForeignID($this->fbuid, FACEBOOK_SERVICE);
-
-        return true;
-
-    }
-
-    function showStylesheets()
-    {
-        // Loading CSS via files in Facebook FBML Canvas apps is still busted as of 1/31/11
-        // See: http://bugs.developers.facebook.net/show_bug.cgi?id=10052
-        $this->cssLink('css/display.css', 'base');
-        $this->cssLink('css/display.css', null, 'screen, projection, tv');
-        $this->cssLink('plugins/Facebook/facebookapp.css');
-
-	// Also, Facebook refuses to let me do this... gar!
-/*
-	$baseCss = file_get_contents(INSTALLDIR . '/theme/base/css/display.css');
-	$this->style($baseCss);
-
-        $facebookCss = file_get_contents(INSTALLDIR . '/plugins/Facebook/facebookapp.css');
-        $this->style($facebookCss);
-*/
-    }
-
-    function showScripts()
-    {
-        $this->script('plugins/Facebook/facebookapp.js');
-    }
-
-    /**
-     * Start an Facebook ready HTML document
-     *
-     * For Facebook we don't want to actually output any headers,
-     * DTD info, etc.  Just Stylesheet and JavaScript links.
-     *
-     * @param string $type MIME type to use; default is to do negotation.
-     *
-     * @return void
-     */
-    function startHTML($type=null)
-    {
-        $this->showStylesheets();
-        $this->showScripts();
-
-        $this->elementStart('div', array('class' => 'facebook-page'));
-    }
-
-    /**
-    *  Ends a Facebook ready HTML document
-    *
-    *  @return void
-    */
-    function endHTML()
-    {
-        $this->elementEnd('div');
-        $this->endXML();
-    }
-
-    /**
-     * Show notice form.
-     *
-     * @return nothing
-     */
-    function showNoticeForm()
-    {
-        // don't do it for most of the Facebook pages
-    }
-
-    function showBody()
-    {
-        $this->elementStart('div', array('id' => 'wrap'));
-        $this->showHeader();
-        $this->showCore();
-        $this->showFooter();
-        $this->elementEnd('div');
-    }
-
-    function showHead($error, $success)
-    {
-        if ($error) {
-            $this->element("h1", null, $error);
-        }
-
-        if ($success) {
-            $this->element("h1", null, $success);
-        }
-
-        $this->elementStart('fb:if-section-not-added', array('section' => 'profile'));
-        $this->elementStart('span', array('id' => 'add_to_profile'));
-        $this->element('fb:add-section-button', array('section' => 'profile'));
-        $this->elementEnd('span');
-        $this->elementEnd('fb:if-section-not-added');
-
-    }
-
-    // Make this into a widget later
-    function showLocalNav()
-    {
-        $this->elementStart('ul', array('class' => 'nav'));
-
-        $this->elementStart('li', array('class' =>
-            ($this->action == 'facebookhome') ? 'current' : 'facebook_home'));
-        $this->element('a',
-            // TRANS: Link description for 'Home' link that leads to a start page.
-            array('href' => 'index.php', 'title' => _m('MENU','Home')),
-            // TRANS: Tooltip for 'Home' link that leads to a start page.
-            _m('Home'));
-        $this->elementEnd('li');
-
-        if (common_config('invite', 'enabled')) {
-            $this->elementStart('li',
-                array('class' =>
-                    ($this->action == 'facebookinvite') ? 'current' : 'facebook_invite'));
-            $this->element('a',
-                // TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-                array('href' => 'invite.php', 'title' => _m('MENU','Invite')),
-                // TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-                _m('Invite'));
-            $this->elementEnd('li');
-        }
-
-        $this->elementStart('li',
-            array('class' =>
-                ($this->action == 'facebooksettings') ? 'current' : 'facebook_settings'));
-        $this->element('a',
-            array('href' => 'settings.php',
-                // TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-                'title' => _m('MENU','Settings')),
-                // TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-                _m('Settings'));
-        $this->elementEnd('li');
-
-        $this->elementEnd('ul');
-    }
-
-    /**
-     * Show header of the page.
-     *
-     * @return nothing
-     */
-    function showHeader()
-    {
-        $this->elementStart('div', array('id' => 'header'));
-        $this->showLogo();
-        $this->showNoticeForm();
-        $this->elementEnd('div');
-    }
-
-    /**
-     * Show page, a template method.
-     *
-     * @return nothing
-     */
-    function showPage($error = null, $success = null)
-    {
-        $this->startHTML();
-        $this->showHead($error, $success);
-        $this->showBody();
-        $this->endHTML();
-    }
-
-    function showInstructions()
-    {
-        $this->elementStart('div', array('class' => 'facebook_guide'));
-
-        $this->elementStart('dl', array('class' => 'system_notice'));
-        $this->element('dt', null, 'Page Notice');
-
-        $loginmsg_part1 = _m('To use the %s Facebook Application you need to login ' .
-            'with your username and password. Don\'t have a username yet?');
-        $loginmsg_part2 = _m(' a new account.');
-
-        $this->elementStart('dd');
-        $this->elementStart('p');
-        $this->text(sprintf($loginmsg_part1, common_config('site', 'name')));
-        // @todo FIXME: Bad i18n. Patchwork message in two parts.
-        $this->element('a',
-            array('href' => common_local_url('register')), _m('Register'));
-        $this->text( " " . $loginmsg_part2);
-        $this->elementEnd('p');
-        $this->elementEnd('dd');
-
-        $this->elementEnd('dl');
-        $this->elementEnd('div');
-    }
-
-    function showLoginForm($msg = null)
-    {
-
-        $this->elementStart('div', array('id' => 'content'));
-        $this->element('h1', null, _m('Login'));
-
-        if ($msg) {
-             $this->element('fb:error', array('message' => $msg));
-        }
-
-        $this->showInstructions();
-
-        $this->elementStart('div', array('id' => 'content_inner'));
-
-        $this->elementStart('form', array('method' => 'post',
-                                               'class' => 'form_settings',
-                                               'id' => 'login',
-                                               'action' => 'index.php'));
-
-        $this->elementStart('fieldset');
-
-        $this->elementStart('ul', array('class' => 'form_datas'));
-        $this->elementStart('li');
-        $this->input('nickname', _m('Nickname'));
-        $this->elementEnd('li');
-        $this->elementStart('li');
-        $this->password('password', _m('Password'));
-        $this->elementEnd('li');
-        $this->elementEnd('ul');
-
-        // TRANS: Login button.
-        $this->submit('submit', _m('BUTTON','Login'));
-        $this->elementEnd('fieldset');
-        $this->elementEnd('form');
-
-        $this->elementStart('p');
-        $this->element('a', array('href' => common_local_url('recoverpassword')),
-                       _m('Lost or forgotten password?'));
-        $this->elementEnd('p');
-
-        $this->elementEnd('div');
-        $this->elementEnd('div');
-    }
-
-    /**
-     * Generate pagination links
-     *
-     * @param boolean $have_before is there something before?
-     * @param boolean $have_after  is there something after?
-     * @param integer $page        current page
-     * @param string  $action      current action
-     * @param array   $args        rest of query arguments
-     *
-     * @return nothing
-     */
-    function pagination($have_before, $have_after, $page, $action, $args=null)
-    {
-        // Does a little before-after block for next/prev page
-        if ($have_before || $have_after) {
-            $this->elementStart('dl', 'pagination');
-            $this->element('dt', null, _m('Pagination'));
-            $this->elementStart('dd', null);
-            $this->elementStart('ul', array('class' => 'nav'));
-        }
-        if ($have_before) {
-            $pargs   = array('page' => $page-1);
-            $newargs = $args ? array_merge($args, $pargs) : $pargs;
-            $this->elementStart('li', array('class' => 'nav_prev'));
-            $this->element('a', array('href' => "$this->app_uri/$action?page=$newargs[page]", 'rel' => 'prev'),
-                           _m('After'));
-            $this->elementEnd('li');
-        }
-        if ($have_after) {
-            $pargs   = array('page' => $page+1);
-            $newargs = $args ? array_merge($args, $pargs) : $pargs;
-            $this->elementStart('li', array('class' => 'nav_next'));
-            $this->element('a', array('href' => "$this->app_uri/$action?page=$newargs[page]", 'rel' => 'next'),
-                           _m('Before'));
-            $this->elementEnd('li');
-        }
-        if ($have_before || $have_after) {
-            $this->elementEnd('ul');
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
-        }
-    }
-
-    function saveNewNotice()
-    {
-        $user = $this->flink->getUser();
-
-        $content = $this->trimmed('status_textarea');
-
-        if (!$content) {
-            $this->showPage(_m('No notice content!'));
-            return;
-        } else {
-            $content_shortened = $user->shortenLinks($content);
-
-            if (Notice::contentTooLong($content_shortened)) {
-                // @todo FIXME: i18n: Needs plural.
-                $this->showPage(sprintf(_m('That\'s too long. Max notice size is %d chars.'),
-                                        Notice::maxContent()));
-                return;
-            }
-        }
-
-        $inter = new CommandInterpreter();
-
-        $cmd = $inter->handle_command($user, $content_shortened);
-
-        if ($cmd) {
-            // XXX fix this
-            $cmd->execute(new WebChannel());
-            return;
-        }
-
-        $replyto = $this->trimmed('inreplyto');
-
-        try {
-            $notice = Notice::saveNew($user->id, $content, 'web',
-                                      array('reply_to' => ($replyto == 'false') ? null : $replyto));
-
-        } catch (Exception $e) {
-            $this->showPage($e->getMessage());
-            return;
-        }
-
-    }
-}
-
-class FacebookNoticeList extends NoticeList
-{
-    /**
-     * constructor
-     *
-     * @param Notice $notice stream of notices from DB_DataObject
-     */
-
-    function __construct($notice, $out=null)
-    {
-        parent::__construct($notice, $out);
-    }
-
-    /**
-     * 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, _m('Notices'));
-        $this->out->elementStart('ul', array('class' => 'notices'));
-
-        $cnt = 0;
-
-        while ($this->notice->fetch() && $cnt <= NOTICES_PER_PAGE) {
-            $cnt++;
-
-            if ($cnt > NOTICES_PER_PAGE) {
-                break;
-            }
-
-            $item = $this->newListItem($this->notice);
-            $item->show();
-        }
-
-        $this->out->elementEnd('ul');
-        $this->out->elementEnd('div');
-
-        return $cnt;
-    }
-
-    /**
-     * returns a new list item for the current notice
-     *
-     * Overridden to return a Facebook specific list item.
-     *
-     * @param Notice $notice the current notice
-     *
-     * @return FacebookNoticeListItem a list item for displaying the notice
-     * formatted for display in the Facebook App.
-     */
-    function newListItem($notice)
-    {
-        return new FacebookNoticeListItem($notice, $this);
-    }
-}
-
-class FacebookNoticeListItem extends NoticeListItem
-{
-    /**
-     * constructor
-     *
-     * Also initializes the profile attribute.
-     *
-     * @param Notice $notice The notice we'll display
-     */
-    function __construct($notice, $out=null)
-    {
-        parent::__construct($notice, $out);
-    }
-
-    /**
-     * recipe function for displaying a single notice in the Facebook App.
-     *
-     * Overridden to strip out some of the controls that we don't
-     * want to be available.
-     *
-     * @return void
-     */
-    function show()
-    {
-        $this->showStart();
-        $this->showNotice();
-        $this->showNoticeInfo();
-
-        // XXX: Need to update to show attachements and controls
-
-        $this->showEnd();
-    }
-}
-
-class FacebookProfileBoxNotice extends FacebookNoticeListItem
-{
-    /**
-     * constructor
-     *
-     * Also initializes the profile attribute.
-     *
-     * @param Notice $notice The notice we'll display
-     */
-    function __construct($notice, $out=null)
-    {
-        parent::__construct($notice, $out);
-    }
-
-    /**
-     * Recipe function for displaying a single notice in the
-     * Facebook App profile notice box
-     *
-     * @return void
-     */
-    function show()
-    {
-        $this->showNotice();
-        $this->showNoticeInfo();
-        $this->showAppLink();
-    }
-
-    function showAppLink()
-    {
-        $this->facebook = getFacebook();
-
-        $app_props = $this->facebook->api_client->Admin_getAppProperties(
-                array('canvas_name', 'application_name'));
-
-        $this->app_uri = 'http://apps.facebook.com/' . $app_props['canvas_name'];
-        $this->app_name = $app_props['application_name'];
-
-        $this->out->elementStart('a', array('id' => 'facebook_statusnet_app',
-                                            'href' => $this->app_uri));
-        $this->out->text($this->app_name);
-        $this->out->elementEnd('a');
-    }
-}
diff --git a/plugins/Facebook/facebookadminpanel.php b/plugins/Facebook/facebookadminpanel.php
deleted file mode 100644
index ae26c7d3e8..0000000000
--- a/plugins/Facebook/facebookadminpanel.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Facebook integration 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    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);
-}
-
-/**
- * Administer global Facebook integration settings
- *
- * @category Admin
- * @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 FacebookadminpanelAction extends AdminPanelAction
-{
-    /**
-     * Returns the page title
-     *
-     * @return string page title
-     */
-    function title()
-    {
-        return _m('Facebook');
-    }
-
-    /**
-     * Instructions for using this form.
-     *
-     * @return string instructions
-     */
-    function getInstructions()
-    {
-        return _m('Facebook integration settings');
-    }
-
-    /**
-     * Show the Facebook admin panel form
-     *
-     * @return void
-     */
-    function showForm()
-    {
-        $form = new FacebookAdminPanelForm($this);
-        $form->show();
-        return;
-    }
-
-    /**
-     * Save settings from the form
-     *
-     * @return void
-     */
-    function saveSettings()
-    {
-        static $settings = array(
-            'facebook'     => array('apikey', 'secret'),
-        );
-
-        $values = array();
-
-        foreach ($settings as $section => $parts) {
-            foreach ($parts as $setting) {
-                $values[$section][$setting]
-                    = $this->trimmed($setting);
-            }
-        }
-
-        // This throws an exception on validation errors
-        $this->validate($values);
-
-        // assert(all values are valid);
-
-        $config = new Config();
-
-        $config->query('BEGIN');
-
-        foreach ($settings as $section => $parts) {
-            foreach ($parts as $setting) {
-                Config::save($section, $setting, $values[$section][$setting]);
-            }
-        }
-
-        $config->query('COMMIT');
-
-        return;
-    }
-
-    function validate(&$values)
-    {
-        // Validate consumer key and secret (can't be too long)
-
-        if (mb_strlen($values['facebook']['apikey']) > 255) {
-            $this->clientError(
-                _m("Invalid Facebook API key. Max length is 255 characters.")
-            );
-        }
-
-        if (mb_strlen($values['facebook']['secret']) > 255) {
-            $this->clientError(
-                _m("Invalid Facebook API secret. Max length is 255 characters.")
-            );
-        }
-    }
-}
-
-class FacebookAdminPanelForm extends AdminForm
-{
-    /**
-     * ID of the form
-     *
-     * @return int ID of the form
-     */
-    function id()
-    {
-        return 'facebookadminpanel';
-    }
-
-    /**
-     * 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('facebookadminpanel');
-    }
-
-    /**
-     * Data elements of the form
-     *
-     * @return void
-     */
-    function formData()
-    {
-        $this->out->elementStart(
-            'fieldset',
-            array('id' => 'settings_facebook-application')
-        );
-        $this->out->element('legend', null, _m('Facebook application settings'));
-        $this->out->elementStart('ul', 'form_data');
-
-        $this->li();
-        $this->input(
-            'apikey',
-            _m('API key'),
-            _m('API key provided by Facebook'),
-            'facebook'
-        );
-        $this->unli();
-
-        $this->li();
-        $this->input(
-            'secret',
-             _m('Secret'),
-            _m('API secret provided by Facebook'),
-            'facebook'
-        );
-        $this->unli();
-
-        $this->out->elementEnd('ul');
-        $this->out->elementEnd('fieldset');
-    }
-
-    /**
-     * Action elements
-     *
-     * @return void
-     */
-    function formActions()
-    {
-        $this->out->submit('submit', _m('Save'), 'submit', null, _m('Save Facebook settings'));
-    }
-}
diff --git a/plugins/Facebook/facebookapp.css b/plugins/Facebook/facebookapp.css
deleted file mode 100644
index 8cd06f78a8..0000000000
--- a/plugins/Facebook/facebookapp.css
+++ /dev/null
@@ -1,115 +0,0 @@
-* {
-font-size:14px;
-font-family:"Lucida Sans Unicode", "Lucida Grande", sans-serif;
-}
-
-#wrap {
-background-color:#F0F2F5;
-padding-left:1.795%;
-padding-right:1.795%;
-width:auto;
-}
-
-p,label,
-h1,h2,h3,h4,h5,h6 {
-color:#000;
-}
-
-#header {
-width:131%;
-}
-
-#content {
-width:92.7%;
-}
-
-#aside_primary {
-display:none;
-}
-
-#site_nav_local_views a {
-background-color:#D0DFE7;
-}
-#site_nav_local_views a:hover {
-background-color:#FAFBFC;
-}
-
-#form_notice .form_note + label,
-#form_notice #notice_data-attach {
-display:none;
-}
-
-#form_notice #notice_action-submit {
-height:47px !important;
-}
-
-
-span.facebook-button {
-border: 2px solid #aaa;
-padding: 3px;
-display: block;
-float: left;
-margin-right: 20px;
--moz-border-radius: 4px; 
-border-radius:4px; 
--webkit-border-radius:4px;
-font-weight: bold;
-background-color:#A9BF4F;
-color:#fff;
-font-size:1.2em
-}
-
-span.facebook-button a { color:#fff }
-
-.facebook_guide {
-margin-bottom:18px;
-}
-.facebook_guide p {
-font-weight:bold;
-}
-
-
-input {
-height:auto !important;
-}
-
-#facebook-friends {
-float:left;
-width:100%;
-}
-
-#facebook-friends li {
-float:left;
-margin-right:2%;
-margin-bottom:11px;
-width:18%;
-height:115px;
-}
-#facebook-friends li a {
-float:left;
-}
-
-#add_to_profile {
-position:absolute;
-right:18px;
-top:10px;
-z-index:2;
-}
-
-.notice div.entry-content dl,
-.notice div.entry-content dt, 
-.notice div.entry-content dd {
-margin-right:5px;
-}
-
-#content_inner p {
-margin-bottom:18px;
-}
-
-#content_inner ul {
-list-style-type:none;
-}
-
-.form_settings label {
-margin-right:18px;
-}
diff --git a/plugins/Facebook/facebookapp.js b/plugins/Facebook/facebookapp.js
deleted file mode 100644
index 5deb6e42b3..0000000000
--- a/plugins/Facebook/facebookapp.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-* StatusNet - a distributed open-source microblogging tool
-* Copyright (C) 2008, 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/>.
-*/
-
-var max = 140;
-var noticeBox = document.getElementById('notice_data-text'); 
-
-if (noticeBox) {
-    noticeBox.addEventListener('keyup', keypress);
-    noticeBox.addEventListener('keydown', keypress);
-    noticeBox.addEventListener('keypress', keypress);
-    noticeBox.addEventListener('change', keypress);
-}
-
-// Do our the countdown
-function keypress(evt) {  
-    document.getElementById('notice_text-count').setTextValue(
-        max - noticeBox.getValue().length);      
-}
diff --git a/plugins/Facebook/facebookhome.php b/plugins/Facebook/facebookhome.php
deleted file mode 100644
index 9b18a695bf..0000000000
--- a/plugins/Facebook/facebookhome.php
+++ /dev/null
@@ -1,246 +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);
-}
-
-require_once INSTALLDIR . '/plugins/Facebook/facebookaction.php';
-
-class FacebookhomeAction extends FacebookAction
-{
-    var $page = null;
-
-    function prepare($argarray)
-    {
-        parent::prepare($argarray);
-
-        $this->page = $this->trimmed('page');
-
-        if (!$this->page) {
-            $this->page = 1;
-        }
-
-        return true;
-    }
-
-    function handle($args)
-    {
-        parent::handle($args);
-
-        if (!empty($this->flink)) {
-            $this->user = $this->flink->getUser();
-
-            // If this is the first time the user has started the app
-            // prompt for Facebook status update permission
-            if (!$this->facebook->api_client->users_hasAppPermission('publish_stream')) {
-                $this->getUpdatePermission();
-		return;
-            }
-
-             if ($this->arg('status_submit') == 'Send') {
-                $this->saveNewNotice();
-             }
-
-            // User is authenticated and has already been prompted once for
-            // Facebook status update permission? Then show the main page
-            // of the app
-            $this->showPage();
-        } else {
-            // User hasn't authenticated yet, prompt for creds
-            $this->login();
-        }
-    }
-
-    function login()
-    {
-        $this->showStylesheets();
-
-        $nickname = common_canonical_nickname($this->trimmed('nickname'));
-        $password = $this->arg('password');
-
-        $msg = null;
-
-        if ($nickname) {
-            if (common_check_user($nickname, $password)) {
-                $user = User::staticGet('nickname', $nickname);
-
-                if (!$user) {
-                    $this->showLoginForm(_m("Server error: Couldn't get user!"));
-                }
-
-                $flink = DB_DataObject::factory('foreign_link');
-                $flink->user_id = $user->id;
-                $flink->foreign_id = $this->fbuid;
-                $flink->service = FACEBOOK_SERVICE;
-                $flink->created = common_sql_now();
-                $flink->set_flags(true, false, false, false);
-
-                $flink_id = $flink->insert();
-
-                // XXX: Do some error handling here
-
-                $this->getUpdatePermission();
-                return;
-            } else {
-                $msg = _m('Incorrect username or password.');
-            }
-        }
-
-        $this->showLoginForm($msg);
-        $this->showFooter();
-    }
-
-    function showNoticeForm()
-    {
-        $post_action = "$this->app_uri/index.php";
-
-        $notice_form = new FacebookNoticeForm($this, $post_action, null,
-            $post_action, $this->user);
-        $notice_form->show();
-    }
-
-    function title()
-    {
-        if ($this->page > 1) {
-            // @todo FIXME: Core should have methods to get "Full name (nickname)" in a localised form
-            // so that this can be used consistenly throughout StatusNet without having to implement it
-	    // over and over..
-            // TRANS: Page title.
-            // TRANS: %1$s is a user nickname, %2$s is a page number.
-            return sprintf(_m('%1$s and friends, page %2$d'), $this->user->nickname, $this->page);
-        } else {
-            // TRANS: Page title.
-            // TRANS: %s is a user nickname
-            return sprintf(_m("%s and friends"), $this->user->nickname);
-        }
-    }
-
-    function showContent()
-    {
-        $notice = $this->user->noticeInbox(($this->page-1) * NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
-
-        $nl = new NoticeList($notice, $this);
-
-        $cnt = $nl->show();
-
-        $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
-                          $this->page, 'index.php', array('nickname' => $this->user->nickname));
-    }
-
-    function showNoticeList($notice)
-    {
-        $nl = new NoticeList($notice, $this);
-        return $nl->show();
-    }
-
-    function getUpdatePermission() {
-        $this->showStylesheets();
-
-        $this->elementStart('div', array('class' => 'facebook_guide'));
-
-        // TRANS: Instructions. %s is the application name.
-        $instructions = sprintf(_m('If you would like the %s app to automatically update ' .
-            'your Facebook status with your latest notice, you need ' .
-            'to give it permission.'), $this->app_name);
-
-        $this->elementStart('p');
-        $this->element('span', array('id' => 'permissions_notice'), $instructions);
-        $this->elementEnd('p');
-
-        $this->elementStart('form', array('method' => 'post',
-                                           'action' => "index.php",
-                                           'id' => 'facebook-skip-permissions'));
-
-        $this->elementStart('ul', array('id' => 'fb-permissions-list'));
-        $this->elementStart('li', array('id' => 'fb-permissions-item'));
-
-        $next = urlencode("$this->app_uri/index.php");
-        $api_key = common_config('facebook', 'apikey');
-
-        $auth_url = 'http://www.facebook.com/authorize.php?api_key=' .
-            $api_key . '&v=1.0&ext_perm=publish_stream&next=' . $next .
-            '&next_cancel=' . $next . '&submit=skip';
-
-        $this->elementStart('span', array('class' => 'facebook-button'));
-        // @todo FIXME: sprintf not needed here?
-        $this->element('a', array('href' => $auth_url),
-            sprintf(_m('Okay, do it!'), $this->app_name));
-        $this->elementEnd('span');
-
-        $this->elementEnd('li');
-
-        $this->elementStart('li', array('id' => 'fb-permissions-item'));
-        // TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-        $this->submit('skip', _m('BUTTON','Skip'));
-        $this->elementEnd('li');
-        $this->elementEnd('ul');
-
-        $this->elementEnd('form');
-        $this->elementEnd('div');
-    }
-
-    /**
-     * Generate pagination links
-     *
-     * @param boolean $have_before is there something before?
-     * @param boolean $have_after  is there something after?
-     * @param integer $page        current page
-     * @param string  $action      current action
-     * @param array   $args        rest of query arguments
-     *
-     * @return nothing
-     */
-    function pagination($have_before, $have_after, $page, $action, $args=null)
-    {
-        // Does a little before-after block for next/prev page
-
-        // XXX: Fix so this uses common_local_url() if possible.
-
-        if ($have_before || $have_after) {
-            $this->elementStart('dl', 'pagination');
-            $this->element('dt', null, _m('Pagination'));
-            $this->elementStart('dd', null);
-            $this->elementStart('ul', array('class' => 'nav'));
-        }
-        if ($have_before) {
-            $pargs   = array('page' => $page-1);
-            $newargs = $args ? array_merge($args, $pargs) : $pargs;
-            $this->elementStart('li', array('class' => 'nav_prev'));
-            $this->element('a', array('href' => "$action?page=$newargs[page]", 'rel' => 'prev'),
-                           // TRANS: Pagination link.
-                           _m('After'));
-            $this->elementEnd('li');
-        }
-        if ($have_after) {
-            $pargs   = array('page' => $page+1);
-            $newargs = $args ? array_merge($args, $pargs) : $pargs;
-            $this->elementStart('li', array('class' => 'nav_next'));
-            $this->element('a', array('href' => "$action?page=$newargs[page]", 'rel' => 'next'),
-                           // TRANS: Pagination link.
-                           _m('Before'));
-            $this->elementEnd('li');
-        }
-        if ($have_before || $have_after) {
-            $this->elementEnd('ul');
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
-        }
-    }
-}
diff --git a/plugins/Facebook/facebookinvite.php b/plugins/Facebook/facebookinvite.php
deleted file mode 100644
index a50eace12f..0000000000
--- a/plugins/Facebook/facebookinvite.php
+++ /dev/null
@@ -1,145 +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);
-}
-
-require_once INSTALLDIR . '/plugins/Facebook/facebookaction.php';
-
-class FacebookinviteAction extends FacebookAction
-{
-    function handle($args)
-    {
-        parent::handle($args);
-        $this->showForm();
-    }
-
-    /**
-     * Wrapper for showing a page
-     *
-     * Stores an error and shows the page
-     *
-     * @param string $error Error, if any
-     *
-     * @return void
-     */
-    function showForm($error=null)
-    {
-        $this->error = $error;
-        $this->showPage();
-    }
-
-    /**
-     * Show the page content
-     *
-     * Either shows the registration form or, if registration was successful,
-     * instructions for using the site.
-     *
-     * @return void
-     */
-    function showContent()
-    {
-        if ($this->arg('ids')) {
-            $this->showSuccessContent();
-        } else {
-            $this->showFormContent();
-        }
-    }
-
-    function showSuccessContent()
-    {
-        // TRANS: %s is the name of the site.
-        $this->element('h2', null, sprintf(_m('Thanks for inviting your friends to use %s.'),
-            common_config('site', 'name')));
-        // TRANS: Followed by an unordered list with invited friends.
-        $this->element('p', null, _m('Invitations have been sent to the following users:'));
-
-        $friend_ids = $_POST['ids']; // XXX: Hmm... is this the best way to access the list?
-
-        $this->elementStart('ul', array('id' => 'facebook-friends'));
-
-        foreach ($friend_ids as $friend) {
-            $this->elementStart('li');
-            $this->element('fb:profile-pic', array('uid' => $friend, 'size' => 'square'));
-            $this->element('fb:name', array('uid' => $friend,
-                                            'capitalize' => 'true'));
-            $this->elementEnd('li');
-        }
-
-        $this->elementEnd('ul');
-    }
-
-    function showFormContent()
-    {
-        $content = sprintf(_m('You have been invited to %s'), common_config('site', 'name')) .
-            htmlentities('<fb:req-choice url="' . $this->app_uri . '" label="Add"/>');
-
-        $this->elementStart('fb:request-form', array('action' => 'invite.php',
-                                                      'method' => 'post',
-                                                      'invite' => 'true',
-                                                      'type' => common_config('site', 'name'),
-                                                      'content' => $content));
-        $this->hidden('invite', 'true');
-        // TRANS: %s is the name of the site.
-        $actiontext = sprintf(_m('Invite your friends to use %s'), common_config('site', 'name'));
-
-        $multi_params = array('showborder' => 'false');
-        $multi_params['actiontext'] = $actiontext;
-        $multi_params['bypass'] = 'cancel';
-        $multi_params['cols'] = 4;
-
-        // Get a list of users who are already using the app for exclusion
-        $exclude_ids = $this->facebook->api_client->friends_getAppUsers();
-        $exclude_ids_csv = null;
-
-        // fbml needs these as a csv string, not an array
-        if ($exclude_ids) {
-            $exclude_ids_csv = implode(',', $exclude_ids);
-            $multi_params['exclude_ids'] = $exclude_ids_csv;
-        }
-
-        $this->element('fb:multi-friend-selector', $multi_params);
-        $this->elementEnd('fb:request-form');
-
-        if ($exclude_ids) {
-
-            // TRANS: %s is the name of the site.
-            $this->element('h2', null, sprintf(_m('Friends already using %s:'),
-                common_config('site', 'name')));
-            $this->elementStart('ul', array('id' => 'facebook-friends'));
-
-            foreach ($exclude_ids as $friend) {
-                $this->elementStart('li');
-                $this->element('fb:profile-pic', array('uid' => $friend, 'size' => 'square'));
-                $this->element('fb:name', array('uid' => $friend,
-                                                'capitalize' => 'true'));
-                $this->elementEnd('li');
-            }
-
-            $this->elementEnd("ul");
-        }
-    }
-
-    function title()
-    {
-        // TRANS: Page title.
-        return sprintf(_m('Send invitations'));
-    }
-}
diff --git a/plugins/Facebook/facebooklogin.php b/plugins/Facebook/facebooklogin.php
deleted file mode 100644
index 1961be57b6..0000000000
--- a/plugins/Facebook/facebooklogin.php
+++ /dev/null
@@ -1,97 +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);
-}
-
-require_once INSTALLDIR . '/plugins/Facebook/facebookaction.php';
-
-class FacebookinviteAction extends FacebookAction
-{
-    function handle($args)
-    {
-        parent::handle($args);
-
-        $this->error = $error;
-
-        if ($this->flink) {
-            if (!$this->facebook->api_client->users_hasAppPermission('publish_stream') &&
-                $this->facebook->api_client->data_getUserPreference(
-                     FACEBOOK_PROMPTED_UPDATE_PREF) == 'true') {
-
-                // @todo FIXME: Missing i18n?
-                echo '<h1>REDIRECT TO HOME</h1>';
-            }
-        } else {
-            $this->showPage();
-        }
-    }
-
-    function showContent()
-    {
-        // If the user has opted not to initially allow the app to have
-        // Facebook status update permission, store that preference. Only
-        // promt the user the first time she uses the app
-        if ($this->arg('skip')) {
-            $this->facebook->api_client->data_setUserPreference(
-                FACEBOOK_PROMPTED_UPDATE_PREF, 'true');
-        }
-
-        if ($this->flink) {
-            $this->user = $this->flink->getUser();
-
-            // If this is the first time the user has started the app
-             // prompt for Facebook status update permission
-             if (!$this->facebook->api_client->users_hasAppPermission('publish_stream')) {
-
-                 if ($this->facebook->api_client->data_getUserPreference(
-                         FACEBOOK_PROMPTED_UPDATE_PREF) != 'true') {
-                     $this->getUpdatePermission();
-                     return;
-                 }
-             }
-        } else {
-            $this->showLoginForm();
-        }
-
-    }
-
-    function showSuccessContent()
-    {
-
-    }
-
-    function showFormContent()
-    {
-
-    }
-
-    function title()
-    {
-        // @todo FIXME: Give a more precise description? Suggestion: "Login with Facebook Connect"
-        // TRANS: Page title.
-        return sprintf(_m('Login'));
-    }
-
-    function redirectHome()
-    {
-
-    }
-}
diff --git a/plugins/Facebook/facebooknoticeform.php b/plugins/Facebook/facebooknoticeform.php
deleted file mode 100644
index d52222c933..0000000000
--- a/plugins/Facebook/facebooknoticeform.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Form for posting a notice from within the Facebook App.
- *
- * This is a stripped down version of the normal NoticeForm (sans
- * location stuff and media upload stuff). I'm not sure we can share the
- * location (from FB) and they don't allow posting multipart form data
- * to Facebook canvas pages, so that won't work anyway. --Zach
- *
- * 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>
- * @author    Zach Copley <zach@status.net>
- * @copyright 2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR . '/lib/form.php';
-
-/**
- * Form for posting a notice from within the Facebook app
- *
- * @category Form
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @author   Sarven Capadisli <csarven@status.net>
- * @author   Zach Copey <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 FacebookNoticeForm 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;
-
-    /**
-     * Constructor
-     *
-     * @param HTMLOutputter $out     output channel
-     * @param string        $action  action to return to, if any
-     * @param string        $content content to pre-fill
-     */
-    function __construct($out=null, $action=null, $content=null, $post_action=null, $user=null, $inreplyto=null)
-    {
-        parent::__construct($out);
-
-        $this->action  = $action;
-        $this->post_action = $post_action;
-        $this->content = $content;
-        $this->inreplyto = $inreplyto;
-
-        if ($user) {
-            $this->user = $user;
-        } else {
-            $this->user = common_current_user();
-        }
-
-        // Note: Facebook doesn't allow multipart/form-data posting to
-        // canvas pages, so don't try to set it--no file uploads, at
-        // least not this way.  It can be done using multiple servers
-        // and iFrames, but it's a pretty hacky process.
-    }
-
-    /**
-     * ID of the form
-     *
-     * @return string ID of the form
-     */
-    function id()
-    {
-        return 'form_notice';
-    }
-
-   /**
-     * Class of the form
-     *
-     * @return string class of the form
-     */
-    function formClass()
-    {
-        return 'form_notice';
-    }
-
-    /**
-     * Action of the form
-     *
-     * @return string URL of the action
-     */
-    function action()
-    {
-        return $this->post_action;
-    }
-
-    /**
-     * Legend of the Form
-     *
-     * @return void
-     */
-    function formLegend()
-    {
-        // TRANS: Legend.
-        $this->out->element('legend', null, _m('Send a notice'));
-    }
-
-    /**
-     * Data elements
-     *
-     * @return void
-     */
-    function formData()
-    {
-        if (Event::handle('StartShowNoticeFormData', array($this))) {
-            $this->out->element('label', array('for' => 'notice_data-text'),
-                                // TRANS: Field label.
-                                sprintf(_m('What\'s up, %s?'), $this->user->nickname));
-            // XXX: vary by defined max size
-            $this->out->element('textarea', array('id' => 'notice_data-text',
-                                                  'cols' => 35,
-                                                  'rows' => 4,
-                                                  'name' => 'status_textarea'),
-                                ($this->content) ? $this->content : '');
-
-            $contentLimit = Notice::maxContent();
-
-            if ($contentLimit > 0) {
-                $this->out->elementStart('dl', 'form_note');
-                $this->out->element('dt', null, _m('Available characters'));
-                $this->out->element('dd', array('id' => 'notice_text-count'),
-                                    $contentLimit);
-                $this->out->elementEnd('dl');
-            }
-
-            if ($this->action) {
-                $this->out->hidden('notice_return-to', $this->action, 'returnto');
-            }
-            $this->out->hidden('notice_in-reply-to', $this->inreplyto, 'inreplyto');
-
-            Event::handle('StartShowNoticeFormData', array($this));
-        }
-    }
-
-    /**
-     * Action elements
-     *
-     * @return void
-     */
-    function formActions()
-    {
-        $this->out->element('input', array('id' => 'notice_action-submit',
-                                           'class' => 'submit',
-                                           'name' => 'status_submit',
-                                           'type' => 'submit',
-                                           // TRANS: Button text.
-                                           'value' => _m('BUTTON','Send')));
-    }
-}
diff --git a/plugins/Facebook/facebookqueuehandler.php b/plugins/Facebook/facebookqueuehandler.php
deleted file mode 100644
index 524af7bc45..0000000000
--- a/plugins/Facebook/facebookqueuehandler.php
+++ /dev/null
@@ -1,51 +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); }
-
-require_once INSTALLDIR . '/plugins/Facebook/facebookutil.php';
-
-class FacebookQueueHandler extends QueueHandler
-{
-    function transport()
-    {
-        return 'facebook';
-    }
-
-    function handle($notice)
-    {
-        if ($this->_isLocal($notice)) {
-            return facebookBroadcastNotice($notice);
-        }
-        return true;
-    }
-
-    /**
-     * Determine whether the notice was locally created
-     *
-     * @param Notice $notice the notice
-     *
-     * @return boolean locality
-     */
-    function _isLocal($notice)
-    {
-        return ($notice->is_local == Notice::LOCAL_PUBLIC ||
-                $notice->is_local == Notice::LOCAL_NONPUBLIC);
-    }
-}
diff --git a/plugins/Facebook/facebookremove.php b/plugins/Facebook/facebookremove.php
deleted file mode 100644
index bc76daaef6..0000000000
--- a/plugins/Facebook/facebookremove.php
+++ /dev/null
@@ -1,73 +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);
-}
-
-require_once INSTALLDIR . '/plugins/Facebook/facebookaction.php';
-
-class FacebookremoveAction extends FacebookAction
-{
-    function handle($args)
-    {
-        parent::handle($args);
-
-        $secret = common_config('facebook', 'secret');
-
-        $sig = '';
-
-        ksort($_POST);
-
-        foreach ($_POST as $key => $val) {
-            if (substr($key, 0, 7) == 'fb_sig_') {
-                $sig .= substr($key, 7) . '=' . $val;
-            }
-         }
-
-        $sig .= $secret;
-        $verify = md5($sig);
-
-        if ($verify == $this->arg('fb_sig')) {
-
-            $flink = Foreign_link::getByForeignID($this->arg('fb_sig_user'), 2);
-
-            if (!$flink) {
-                common_log(LOG_ERR, "Tried to delete missing foreign_link entry with Facebook ID " . $this->arg('fb_sig_user'));
-                $this->serverError(_m('Couldn\'t remove Facebook user: already deleted.'));
-                return;
-            }
-
-            common_debug("Removing foreign link to Facebook - local user ID: $flink->user_id, Facebook ID: $flink->foreign_id");
-
-            $result = $flink->delete();
-
-            if (!$result) {
-                common_log_db_error($flink, 'DELETE', __FILE__);
-                $this->serverError(_m('Couldn\'t remove Facebook user.'));
-                return;
-            }
-
-        } else {
-            # Someone bad tried to remove facebook link?
-            common_log(LOG_ERR, "Someone from $_SERVER[REMOTE_ADDR] " .
-                'unsuccessfully tried to remove a foreign link to Facebook!');
-        }
-    }
-}
diff --git a/plugins/Facebook/facebooksettings.php b/plugins/Facebook/facebooksettings.php
deleted file mode 100644
index 1379b9a9cc..0000000000
--- a/plugins/Facebook/facebooksettings.php
+++ /dev/null
@@ -1,136 +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);
-}
-
-require_once INSTALLDIR . '/plugins/Facebook/facebookaction.php';
-
-class FacebooksettingsAction extends FacebookAction
-{
-    function handle($args)
-    {
-        parent::handle($args);
-        $this->showPage();
-    }
-
-    /**
-     * Show the page content
-     *
-     * Either shows the registration form or, if registration was successful,
-     * instructions for using the site.
-     *
-     * @return void
-     */
-    function showContent()
-    {
-        if ($this->arg('save')) {
-            $this->saveSettings();
-        } else {
-            $this->showForm();
-        }
-    }
-
-    function saveSettings() {
-
-        $noticesync = $this->boolean('noticesync');
-        $replysync  = $this->boolean('replysync');
-
-        $original = clone($this->flink);
-        $this->flink->set_flags($noticesync, false, $replysync, false);
-        $result = $this->flink->update($original);
-
-        if ($result === false) {
-            $this->showForm(_m('There was a problem saving your sync preferences!'));
-        } else {
-            // TRANS: Confirmation that synchronisation settings have been saved into the system.
-            $this->showForm(_m('Sync preferences saved.'), true);
-        }
-    }
-
-    function showForm($msg = null, $success = false) {
-
-        if ($msg) {
-            if ($success) {
-                $this->element('fb:success', array('message' => $msg));
-            } else {
-                $this->element('fb:error', array('message' => $msg));
-            }
-        }
-
-        if ($this->facebook->api_client->users_hasAppPermission('publish_stream')) {
-
-            $this->elementStart('form', array('method' => 'post',
-                                               'id' => 'facebook_settings'));
-
-            $this->elementStart('ul', 'form_data');
-
-            $this->elementStart('li');
-
-            $this->checkbox('noticesync', _m('Automatically update my Facebook status with my notices.'),
-                                ($this->flink) ? ($this->flink->noticesync & FOREIGN_NOTICE_SEND) : true);
-
-            $this->elementEnd('li');
-
-            $this->elementStart('li');
-
-            $this->checkbox('replysync', _m('Send "@" replies to Facebook.'),
-                             ($this->flink) ? ($this->flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) : true);
-
-            $this->elementEnd('li');
-
-            $this->elementStart('li');
-
-            // TRANS: Submit button to save synchronisation settings.
-            $this->submit('save', _m('BUTTON','Save'));
-
-            $this->elementEnd('li');
-
-            $this->elementEnd('ul');
-
-            $this->elementEnd('form');
-        } else {
-            // TRANS: %s is the application name.
-            $instructions = sprintf(_m('If you would like %s to automatically update ' .
-                'your Facebook status with your latest notice, you need ' .
-                'to give it permission.'), $this->app_name);
-
-            $this->elementStart('p');
-            $this->element('span', array('id' => 'permissions_notice'), $instructions);
-            $this->elementEnd('p');
-
-            $this->elementStart('ul', array('id' => 'fb-permissions-list'));
-            $this->elementStart('li', array('id' => 'fb-permissions-item'));
-            $this->elementStart('fb:prompt-permission', array('perms' => 'publish_stream',
-                'next_fbjs' => 'document.setLocation(\'' . "$this->app_uri/settings.php" . '\')'));
-            $this->element('span', array('class' => 'facebook-button'),
-                sprintf(_m('Allow %s to update my Facebook status'), common_config('site', 'name')));
-            $this->elementEnd('fb:prompt-permission');
-            $this->elementEnd('li');
-            $this->elementEnd('ul');
-        }
-    }
-
-    function title()
-    {
-        // TRANS: Page title for synchronisation settings.
-        return _m('Sync preferences');
-    }
-}
diff --git a/plugins/Facebook/facebookutil.php b/plugins/Facebook/facebookutil.php
deleted file mode 100644
index 3996459a63..0000000000
--- a/plugins/Facebook/facebookutil.php
+++ /dev/null
@@ -1,409 +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')) {
-    exit(1);
-}
-
-require_once INSTALLDIR . '/plugins/Facebook/facebook/facebook.php';
-require_once INSTALLDIR . '/plugins/Facebook/facebookaction.php';
-require_once INSTALLDIR . '/lib/noticelist.php';
-
-define("FACEBOOK_SERVICE", 2); // Facebook is foreign_service ID 2
-define("FACEBOOK_NOTICE_PREFIX", 1);
-define("FACEBOOK_PROMPTED_UPDATE_PREF", 2);
-
-function getFacebook()
-{
-    static $facebook = null;
-
-    $apikey = common_config('facebook', 'apikey');
-    $secret = common_config('facebook', 'secret');
-
-    if ($facebook === null) {
-        $facebook = new Facebook($apikey, $secret);
-    }
-
-    if (empty($facebook)) {
-        common_log(LOG_ERR, 'Could not make new Facebook client obj!',
-            __FILE__);
-    }
-
-    return $facebook;
-}
-
-function isFacebookBound($notice, $flink) {
-    if (empty($flink)) {
-	common_debug("QQQQQ empty flink");
-        return false;
-    }
-
-    // Avoid a loop
-    if ($notice->source == 'Facebook') {
-        common_log(LOG_INFO, "Skipping notice $notice->id because its " .
-                   'source is Facebook.');
-        return false;
-    }
-
-    // If the user does not want to broadcast to Facebook, move along
-    if (!($flink->noticesync & FOREIGN_NOTICE_SEND == FOREIGN_NOTICE_SEND)) {
-        common_log(LOG_INFO, "Skipping notice $notice->id " .
-            'because user has FOREIGN_NOTICE_SEND bit off.');
-        return false;
-    }
-
-    // If it's not a reply, or if the user WANTS to send @-replies,
-    // then, yeah, it can go to Facebook.
-    if (!preg_match('/@[a-zA-Z0-9_]{1,15}\b/u', $notice->content) ||
-        ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY)) {
-        return true;
-    }
-
-    return false;
-}
-
-function facebookBroadcastNotice($notice)
-{
-    $facebook = getFacebook();
-    $flink = Foreign_link::getByUserID(
-        $notice->profile_id,
-        FACEBOOK_SERVICE
-    );
-
-    if (isFacebookBound($notice, $flink)) {
-        // Okay, we're good to go, update the FB status
-        $fbuid = $flink->foreign_id;
-        $user = $flink->getUser();
-
-        try {
-            // Check permissions
-            common_debug(
-                'FacebookPlugin - checking for publish_stream permission for user '
-                . "$user->nickname ($user->id), Facebook UID: $fbuid"
-            );
-
-            // NOTE: $facebook->api_client->users_hasAppPermission('publish_stream', $fbuid)
-            // has been returning bogus results, so we're using FQL to check for
-            // publish_stream permission now
-            $fql = "SELECT publish_stream FROM permissions WHERE uid = $fbuid";
-            $result = $facebook->api_client->fql_query($fql);
-
-            $canPublish = 0;
-
-            if (!empty($result)) {
-                $canPublish = $result[0]['publish_stream'];
-            }
-
-            if ($canPublish == 1) {
-                common_debug(
-                    "FacebookPlugin - $user->nickname ($user->id), Facebook UID: $fbuid "
-                    . 'has publish_stream permission.'
-                );
-            } else {
-                common_debug(
-                    "FacebookPlugin - $user->nickname ($user->id), Facebook UID: $fbuid "
-                    . 'does NOT have publish_stream permission. Facebook '
-                    . 'returned: ' . var_export($result, true)
-                );
-            }
-
-            common_debug(
-                'FacebookPlugin - checking for status_update permission for user '
-                . "$user->nickname ($user->id), Facebook UID: $fbuid. "
-            );
-
-            $canUpdate = $facebook->api_client->users_hasAppPermission(
-                'status_update',
-                $fbuid
-            );
-
-            if ($canUpdate == 1) {
-                common_debug(
-                    "FacebookPlugin - $user->nickname ($user->id), Facebook UID: $fbuid "
-                    . 'has status_update permission.'
-                );
-            } else {
-                common_debug(
-                    "FacebookPlugin - $user->nickname ($user->id), Facebook UID: $fbuid "
-                    .'does NOT have status_update permission. Facebook '
-                    . 'returned: ' . var_export($canPublish, true)
-                );
-            }
-
-            // Post to Facebook
-            if ($notice->hasAttachments() && $canPublish == 1) {
-                publishStream($notice, $user, $fbuid);
-            } elseif ($canUpdate == 1 || $canPublish == 1) {
-                statusUpdate($notice, $user, $fbuid);
-            } else {
-                $msg = "FacebookPlugin - Not sending notice $notice->id to Facebook " .
-                  "because user $user->nickname has not given the " .
-                  'Facebook app \'status_update\' or \'publish_stream\' permission.';
-                common_log(LOG_WARNING, $msg);
-            }
-
-        } catch (FacebookRestClientException $e) {
-            return handleFacebookError($e, $notice, $flink);
-        }
-    }
-
-    return true;
-}
-
-function handleFacebookError($e, $notice, $flink)
-{
-    $fbuid  = $flink->foreign_id;
-    $user   = $flink->getUser();
-    $code   = $e->getCode();
-    $errmsg = $e->getMessage();
-
-    // XXX: Check for any others?
-    switch($code) {
-     case 100: // Invalid parameter
-        $msg = "FacebookPlugin - Facebook claims notice %d was posted with an invalid parameter (error code 100):"
-            . "\"%s\" (Notice details: nickname=%s, user ID=%d, Facebook ID=%d, notice content=\"%s\"). "
-            . "Removing notice from the Facebook queue for safety.";
-        common_log(
-            LOG_ERR, sprintf(
-                $msg,
-                $notice->id,
-                $errmsg,
-                $user->nickname,
-                $user->id,
-                $fbuid,
-                $notice->content
-            )
-        );
-        return true;
-        break;
-     case 200: // Permissions error
-     case 250: // Updating status requires the extended permission status_update
-        remove_facebook_app($flink);
-        return true; // dequeue
-        break;
-     case 341: // Feed action request limit reached
-            $msg = "FacebookPlugin - User %s (User ID=%d, Facebook ID=%d) has exceeded "
-                   . "his/her limit for posting notices to Facebook today. Dequeuing "
-                   . "notice %d.";
-            common_log(
-                LOG_INFO, sprintf(
-                    $msg,
-                    $user->nickname,
-                    $user->id,
-                    $fbuid,
-                    $notice->id
-                )
-            );
-	// @fixme: We want to rety at a later time when the throttling has expired
-	// instead of just giving up.
-        return true;
-        break;
-     default:
-        $msg = "FacebookPlugin - Facebook returned an error we don't know how to deal with while trying to "
-            . "post notice %d. Error code: %d, error message: \"%s\". (Notice details: "
-            . "nickname=%s, user ID=%d, Facebook ID=%d, notice content=\"%s\"). Removing notice "
-	    . "from the Facebook queue for safety.";
-        common_log(
-            LOG_ERR, sprintf(
-                $msg,
-                $notice->id,
-                $code,
-                $errmsg,
-                $user->nickname,
-                $user->id,
-                $fbuid,
-                $notice->content
-            )
-        );
-        return true; // dequeue
-        break;
-    }
-}
-
-function statusUpdate($notice, $user, $fbuid)
-{
-    common_debug(
-        "FacebookPlugin - Attempting to post notice $notice->id "
-        . "as a status update for $user->nickname ($user->id), "
-        . "Facebook UID: $fbuid"
-    );
-
-    $facebook = getFacebook();
-    $result = $facebook->api_client->users_setStatus(
-         $notice->content,
-         $fbuid,
-         false,
-         true
-    );
-
-    common_debug('Facebook returned: ' . var_export($result, true));
-
-    common_log(
-        LOG_INFO,
-        "FacebookPlugin - Posted notice $notice->id as a status "
-        . "update for $user->nickname ($user->id), "
-        . "Facebook UID: $fbuid"
-    );
-}
-
-function publishStream($notice, $user, $fbuid)
-{
-    common_debug(
-        "FacebookPlugin - Attempting to post notice $notice->id "
-        . "as stream item with attachment for $user->nickname ($user->id), "
-        . "Facebook UID: $fbuid"
-    );
-
-    $fbattachment = format_attachments($notice->attachments());
-
-    $facebook = getFacebook();
-    $facebook->api_client->stream_publish(
-        $notice->content,
-        $fbattachment,
-        null,
-        null,
-        $fbuid
-    );
-
-    common_log(
-        LOG_INFO,
-        "FacebookPlugin - Posted notice $notice->id as a stream "
-        . "item with attachment for $user->nickname ($user->id), "
-        . "Facebook UID: $fbuid"
-    );
-}
-
-function format_attachments($attachments)
-{
-    $fbattachment          = array();
-    $fbattachment['media'] = array();
-
-    foreach($attachments as $attachment)
-    {
-        if($enclosure = $attachment->getEnclosure()){
-            $fbmedia = get_fbmedia_for_attachment($enclosure);
-        }else{
-            $fbmedia = get_fbmedia_for_attachment($attachment);
-        }
-        if($fbmedia){
-            $fbattachment['media'][]=$fbmedia;
-        }else{
-            $fbattachment['name'] = ($attachment->title ?
-                                  $attachment->title : $attachment->url);
-            $fbattachment['href'] = $attachment->url;
-        }
-    }
-    if(count($fbattachment['media'])>0){
-        unset($fbattachment['name']);
-        unset($fbattachment['href']);
-    }
-    return $fbattachment;
-}
-
-/**
-* given an File objects, returns an associative array suitable for Facebook media
-*/
-function get_fbmedia_for_attachment($attachment)
-{
-    $fbmedia    = array();
-
-    if (strncmp($attachment->mimetype, 'image/', strlen('image/')) == 0) {
-        $fbmedia['type']         = 'image';
-        $fbmedia['src']          = $attachment->url;
-        $fbmedia['href']         = $attachment->url;
-    } else if ($attachment->mimetype == 'audio/mpeg') {
-        $fbmedia['type']         = 'mp3';
-        $fbmedia['src']          = $attachment->url;
-    }else if ($attachment->mimetype == 'application/x-shockwave-flash') {
-        $fbmedia['type']         = 'flash';
-
-        // http://wiki.developers.facebook.com/index.php/Attachment_%28Streams%29
-        // says that imgsrc is required... but we have no value to put in it
-        // $fbmedia['imgsrc']='';
-
-        $fbmedia['swfsrc']       = $attachment->url;
-    }else{
-        return false;
-    }
-    return $fbmedia;
-}
-
-function remove_facebook_app($flink)
-{
-
-    $user = $flink->getUser();
-
-    common_log(LOG_INFO, 'Removing Facebook App Foreign link for ' .
-        "user $user->nickname (user id: $user->id).");
-
-    $result = $flink->delete();
-
-    if (empty($result)) {
-        common_log(LOG_ERR, 'Could not remove Facebook App ' .
-            "Foreign_link for $user->nickname (user id: $user->id)!");
-        common_log_db_error($flink, 'DELETE', __FILE__);
-    }
-
-    // Notify the user that we are removing their FB app access
-
-    $result = mail_facebook_app_removed($user);
-
-    if (!$result) {
-
-        $msg = 'Unable to send email to notify ' .
-            "$user->nickname (user id: $user->id) " .
-            'that their Facebook app link was ' .
-            'removed!';
-
-        common_log(LOG_WARNING, $msg);
-    }
-}
-
-/**
- * Send a mail message to notify a user that her Facebook Application
- * access has been removed.
- *
- * @param User $user   user whose Facebook app link has been removed
- *
- * @return boolean success flag
- */
-function mail_facebook_app_removed($user)
-{
-    $profile = $user->getProfile();
-
-    $site_name = common_config('site', 'name');
-
-    common_switch_locale($user->language);
-
-    $subject = sprintf(
-        _m('Your %1$s Facebook application access has been disabled.',
-            $site_name));
-
-    $body = sprintf(_m("Hi, %1\$s. We're sorry to inform you that we are " .
-        'unable to update your Facebook status from %2$s, and have disabled ' .
-        'the Facebook application for your account. This may be because ' .
-        'you have removed the Facebook application\'s authorization, or ' .
-        'have deleted your Facebook account.  You can re-enable the ' .
-        'Facebook application and automatic status updating by ' .
-        "re-installing the %2\$s Facebook application.\n\nRegards,\n\n%2\$s"),
-        $user->nickname, $site_name);
-
-    common_switch_locale();
-    return mail_to_user($user, $subject, $body);
-}
diff --git a/plugins/Facebook/fbfavicon.ico b/plugins/Facebook/fbfavicon.ico
deleted file mode 100644
index c57c0342fa643996277f32384d4d64decf1def26..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1150
zcmZQzU<5(|0R}M0U}0bo1F|%L7$l?s#Ef8)fx!VNM+>l~GV%Y6NNbWXNDs^{^O9Wu
zZ)wTJiT^_ZvKo*cYUwBBc9{L>>R|Sxi=*=gO8=L4um6KE48Zs>_YrbGOdmQ;tbUj}
zn0^=^Mia6hrjAnm$YB673uZ2{_OGr;KnX`u^~2Po(=huf%|9@6$f5uLpS`Dnk%566
I{2!PD0Wn1VCIA2c

diff --git a/plugins/Facebook/locale/Facebook.pot b/plugins/Facebook/locale/Facebook.pot
deleted file mode 100644
index b70a0f8ec8..0000000000
--- a/plugins/Facebook/locale/Facebook.pot
+++ /dev/null
@@ -1,535 +0,0 @@
-# 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-01-29 21:45+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"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr ""
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr ""
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: FBConnectAuth.php:96
-msgid "You can't register if you don't agree to the license."
-msgstr ""
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr ""
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr ""
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr ""
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr ""
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr ""
-
-#: FBConnectAuth.php:197
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr ""
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr ""
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr ""
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr ""
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-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'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr ""
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr ""
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr ""
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr ""
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr ""
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr ""
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr ""
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr ""
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr ""
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr ""
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr ""
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr ""
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr ""
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr ""
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr ""
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr ""
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr ""
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr ""
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr ""
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr ""
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr ""
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr ""
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr ""
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr ""
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr ""
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr ""
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr ""
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr ""
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr ""
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr ""
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr ""
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr ""
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr ""
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr ""
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr ""
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr ""
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr ""
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr ""
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr ""
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr ""
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr ""
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr ""
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr ""
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr ""
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr ""
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr ""
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr ""
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr ""
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr ""
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr ""
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr ""
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr ""
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr ""
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr ""
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr ""
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr ""
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr ""
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr ""
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr ""
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr ""
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr ""
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr ""
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr ""
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr ""
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr ""
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr ""
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr ""
diff --git a/plugins/Facebook/locale/be-tarask/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/be-tarask/LC_MESSAGES/Facebook.po
deleted file mode 100644
index cef809c7c6..0000000000
--- a/plugins/Facebook/locale/be-tarask/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,562 +0,0 @@
-# Translation of StatusNet - Facebook to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
-# Exported from translatewiki.net
-#
-# Author: EugeneZelenko
-# Author: Jim-by
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:42+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-22 19:30:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: be-tarask\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-"Вітаем, %1$s!\n"
-"\n"
-"На жаль, мы вымушаныя паведаміць Вам, што ня можам абнавіць Ваш статус у "
-"Facebook з %2$s, і выключаем дастасаваньне Facebook для Вашага рахунку. Гэта "
-"магло здарыцца, таму што Вы выдалілі аўтарызацыю для дастасаваньня Facebook, "
-"ці выдалілі Ваш рахунак на Facebook. Вы можаце зноў уключыць дастасаваньне "
-"Facebook і аўтаматычнае абнаўленьне статусу пасьля паўторнага ўсталяваньня "
-"дастасаваньне Facebook  %2$s.\n"
-"\n"
-"З павагай,\n"
-"%2$s"
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr "Вам неабходна ўвайсьці ў Facebook для выкарыстаньня Facebook Connect."
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr "Ужо існуе лякальны карыстальнік злучаны з гэтым рахункам Facebook."
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Узьнікла праблема з ключом Вашай сэсіі. Калі ласка, паспрабуйце зноў."
-
-#: FBConnectAuth.php:96
-msgid "You can't register if you don't agree to the license."
-msgstr "Вы ня можаце зарэгістравацца, калі Вы ня згодны з умовамі ліцэнзіі."
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "Узьнікла невядомая памылка."
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-"Вы ўпершыню ўвайшлі ў %s, таму мы павінны злучыць Ваш рахунак на Facebook з "
-"лякальным рахункам. Вы можаце стварыць новы рахунак, ці злучыць з ўжо "
-"існуючым Вашым рахункам, калі Вы яго маеце."
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr "Устаноўка рахунку на Facebook"
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "Устаноўкі злучэньня"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, 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-адрас, і нумар тэлефона."
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Стварыць новы рахунак"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Стварыць новага карыстальніка з гэтай мянушкай."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Новая мянушка"
-
-#: FBConnectAuth.php:197
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 малых літараў ці лічбаў, ніякай пунктуацыі ці прагалаў"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Стварыць"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr "Далучыць існуючы рахунак"
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-"Калі Вы ўжо маеце рахунак, увайдзіце з Вашым імем карыстальніка і паролем, "
-"каб далучыць яго да рахунку на Facebook."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr "Існуючая мянушка"
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Пароль"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-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'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "Рэгістрацыя не дазволеная."
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "Няслушны код запрашэньня."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "Мянушка забароненая."
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "Мянушка ўжо выкарыстоўваецца. Паспрабуйце іншую."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr "Памылка далучэньня карыстальніка да Facebook."
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "Няслушнае імя карыстальніка ці пароль."
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Увайсьці"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "Даслаць паведамленьне"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "Як справы, %s?"
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Даступныя сымбалі"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Даслаць"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr "Памылка сэрвэра: немагчыма атрымаць карыстальніка!"
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "Няслушнае імя карыстальніка ці пароль."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s і сябры, старонка %2$d"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s і сябры"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-"Калі Вы жадаеце, каб дастасаваньне %s аўтаматычна абнаўляла Ваш статус у "
-"Facebook з апошнімі паведамленьнямі, Вы павінны даць дазвол."
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr "Так, зрабіць гэта!"
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Прапусьціць"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "Нумарацыя старонак"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Пасьля"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Перад"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "Дзякуем за запрашэньне Вашых сяброў карыстацца %s."
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Запрашэньні былі дасланыя наступным карыстальнікам:"
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Вы былі запрошаныя ў %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Запрасіць Вашых сяброў карыстацца %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Сябры, якія ўжо карыстаюцца %s:"
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Даслаць запрашэньні"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr "Налады інтэграцыі Facebook"
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr "Карыстальнік злучэньня Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr "Увайсьці ці зарэгістравацца з выкарыстаньнем Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr ""
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr ""
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr ""
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr ""
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr ""
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr ""
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr ""
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr ""
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr ""
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr ""
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr ""
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr ""
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr ""
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr ""
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr ""
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr ""
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr ""
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr ""
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr ""
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr ""
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr ""
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr ""
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr ""
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr ""
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr ""
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr ""
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr ""
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr ""
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr ""
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr ""
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr ""
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr ""
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr ""
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr ""
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr ""
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr ""
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr ""
diff --git a/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po
deleted file mode 100644
index 282f8fbea6..0000000000
--- a/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,544 +0,0 @@
-# Translation of StatusNet - Facebook to Breton (Brezhoneg)
-# Exported from translatewiki.net
-#
-# Author: Fulup
-# Author: Y-M D
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49: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"
-"X-POT-Import-Date: 2011-01-22 19:30:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: br\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr ""
-"Rankout a rit bezañ kevreet war Facebook evit implijout Facebook Connect."
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr "Un implijer lec'hel liammet d'ar gont Facebook-se a zo dija."
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-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."
-
-#: FBConnectAuth.php:96
-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."
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "Ur gudenn dizanv a zo bet."
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr "Kefluniadur ar gont Facebook"
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "Dibarzhioù kevreañ"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Krouiñ ur gont nevez"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Krouiñ un implijer nevez gant al lesanv-se."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Lesanv nevez"
-
-#: FBConnectAuth.php:197
-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.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Krouiñ"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr "Kevreañ d'ur gont a zo dioutañ"
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr "Lesanv a zo dioutañ"
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Ger-tremen"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-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'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "N'eo ket aotreet krouiñ kontoù."
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "N'eo ket reizh ar c'hod pedadenn."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "Lesanv nann-aotreet."
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr ""
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "Anv implijer pe ger-tremen direizh."
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Kevreañ"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "Kas un ali"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "Penaos 'mañ kont, %s ?"
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Arouezennoù a chom"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Kas"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr ""
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "Anv implijer pe ger-tremen direizh."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s hag e vignoned, pajenn %2$d"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s hag e vignoned"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr "Ok, en ober !"
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Mont hebiou"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "Pajennadur"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "War-lerc'h"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "A-raok"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "Trugarez da bediñ ho mignoned da implijout %s."
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Pedadennoù a zo bet kaset d'an implijerien da-heul :"
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Pedet oc'h bet da %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Pedit ho mignoned da implijout %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Mignoned hag a implij dija %s :"
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Kas pedadennoù"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr ""
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr "Implijer Facebook Connect"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr "Kevreañ pe en em enskrivañ dre Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr "Arventennoù evit Facebook Connect"
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr "Kevreet oc'h dija."
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr "Kevreit gant ho kont Facebook"
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr "Kevreadenn Facebook"
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr ""
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr "Dibosupl eo dilemel an implijer Facebook."
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "Degemer"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "Degemer"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Pediñ"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "Pediñ"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Arventennoù"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Penndibaboù"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr "ur gont nevez."
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "En em enskrivañ"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr "Lesanv"
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Kevreañ"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr "Ha kollet ho peus ho ker-tremen ?"
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr "Danvez ebet en ali !"
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Re hir eo ! Ment hirañ an ali a zo a %d arouezenn."
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr "Alioù"
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr "Facebook"
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr "Arventennoù enframmañ Facebook"
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr "Arventennoù poellad Facebook"
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr "Alc'hwez API"
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr "Alc'hwez API pourchaset gant Facebook"
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr "Kuzh"
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr "Alc'hwez API kuzh pourchaset gant Facebook"
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Enrollañ"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Enrollañ arventennoù Facebook"
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr "Merañ an doare ma kevre ho kont ouzh Facebook"
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr ""
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr "Implijer Facebook kevreet"
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr "Digevreañ ma c'hont deus Facebook"
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr "Termeniñ ur ger-tremen"
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr "da gentañ."
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Digevrañ"
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr "N'eus ket bet gallet diverkañ al liamm war-du Facebook."
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr "N'omp ket sur eus ar pezh emaoc'h o klask ober aze."
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr ""
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr "Kas respontoù \"@\" da Facebook."
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Enrollañ"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr ""
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr "Penndibaboù ar c'hempredañ"
diff --git a/plugins/Facebook/locale/ca/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/ca/LC_MESSAGES/Facebook.po
deleted file mode 100644
index 8628e7e777..0000000000
--- a/plugins/Facebook/locale/ca/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,575 +0,0 @@
-# Translation of StatusNet - Facebook to Catalan (Català)
-# Exported from translatewiki.net
-#
-# Author: Toniher
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:53: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-29 22:24:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: ca\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-"Hola, %1$s. lamentem informar-vos que no podem actualitzar l'estat del "
-"vostre Facebook des de %2$s, i hem inhabilitat l'aplicació del Facebook del "
-"vostre compte. Això pot ser perquè hagiu eliminat l'autorització de "
-"l'aplicació al Facebook, o perquè hàgiu eliminat el vostre compte del "
-"Facebook. Podeu tornar a habilitar l'aplicació del Facebook i "
-"l'actualització automàtica d'estat reinstal·lant l'aplicació de Facebook de %"
-"2$s.\n"
-"\n"
-"Atentament,\n"
-"\n"
-"%2$s"
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr ""
-"Heu d'iniciar una sessió al Facebook per fer servir el Facebook Connect."
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr "Ja hi ha un usuari local enllaçat amb aquest compte del Facebook."
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-"S'ha produït un problema amb el testimoni de la vostre sessió. Torneu-ho a "
-"provar."
-
-#: FBConnectAuth.php:96
-msgid "You can't register if you don't agree to the license."
-msgstr "No us podeu registrar si no accepteu la llicència."
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "S'ha produït un error desconegut."
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-"És la primera vegada que inicieu una sessió a %s, per tant hem de connectar "
-"el vostre Facebook a un compte local. Podeu crear un compte nou, o bé "
-"connectar-vos amb un ja existent si ja en teniu un."
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr "Configuració del compte del Facebook"
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "Opcions de connexió"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, 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 sota %s, excepte les dades "
-"privades següents: contrasenya, adreça electrònica, adreça de MI i número de "
-"telèfon."
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Crea un compte nou"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Crea un compte nou amb aquest sobrenom."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Nou sobrenom"
-
-#: FBConnectAuth.php:197
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-"1-64 lletres en minúscules o nombres, sense signes de puntuació o espais"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Crea"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr "Connecta un compte existent"
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-"Si ja teniu un compte, inicieu una sessió amb el nom d'usuari i contrasenya "
-"per connectar-lo al vostre Facebook."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr "Sobrenom ja existent"
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Contrasenya"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-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'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "No es permet el registre"
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "No és un codi d'invitació vàlid."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "No es permet el sobrenom."
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "El sobrenom ja és en ús. Proveu-ne un altre."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr "S'ha produït un error en connectar l'usuari al Facebook."
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "Nom d'usuari o contrasenya no vàlids."
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Inici de sessió"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "Envia un avís"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "Com va, %s?"
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Caràcters disponibles"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Envia"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr "Error del servidor: no es pot obtenir l'usuari!"
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "Usuari o contrasenya incorrectes."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s i amics, pàgina %2$d"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s i amics"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-"Si voleu que l'aplicació %s actualitzi automàticament el vostre estat del "
-"Facebook amb el darrer avís, cal que li doneu permisos."
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr "Endavant, fes-ho!"
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Omet"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "Paginació"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Després"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Abans"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "Gràcies per convidar els vostres amics perquè facin servir el %s."
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "S'han enviat invitacions als usuaris següents:"
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Us han convidat a %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Convideu els vostres amics a fer servir %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Amics que ja fan servir %s:"
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Envia invitacions"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr "Configuració d'integració del Facebook"
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr "Usuari de connexió del Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr "Inicieu una sessió o registreu-vos fent servir el Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr "Paràmetres de connexió del Facebook"
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-"El connector del Facebook permet integrar instàncies de l'StatusNet amb el "
-"<a href=\"http://facebook.com/\">Facebook</a> i el Facebook Connect."
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr "Ja heu iniciat una sessió."
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr "Inicieu una sessió amb el compte del Facebook"
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr "Inici de sessió del Facebook"
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr "No s'ha pogut eliminar l'usuari del Facebook: ja s'ha eliminat."
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr "No s'ha pogut eliminar l'usuari del Facebook."
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "Inici"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "Inici"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Convida"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "Convida"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Paràmetres"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Paràmetres"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-"Per fer servir l'aplicació del Facebook %s cal que inicieu una sessió amb el "
-"vostre usuari i contrasenya. No teniu cap nom d'usuari encara?"
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr " un compte nou."
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "Registre"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr "Sobrenom"
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Inici de sessió"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr "Heu perdut o oblidat la contrasenya?"
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr "No hi ha contingut a l'avís!"
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "És massa llarg. La mida màxima d'un avís són %d caràcters."
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr "Avisos"
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr "Facebook"
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr "Paràmetres d'integració del Facebook"
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr "Clau API del Facebook no vàlida. La longitud màxima són 255 caràcters."
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-"Clau secreta API del Facebook no vàlida. La longitud màxima són 255 "
-"caràcters."
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr "Paràmetres d'aplicació del Facebook"
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr "Clau API"
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr "Clau API proporcionada pel Facebook"
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr "Clau secreta"
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr "Clau secreta API proporcionada pel Facebook"
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Desa"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Desa els paràmetres del Facebook"
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr "Gestiona com el vostre compte es connecta al Facebook"
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr "No hi ha cap usuari del Facebook connectat a aquest compte."
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr "Usuari del Facebook connectat"
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr "Desconnecta el meu compte del Facebook"
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-"Si desconnecteu el vostre Facebook, serà impossible iniciar una sessió!"
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr "definiu una contrasenya"
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr " abans de res."
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Desconnecta"
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr "No s'ha pogut eliminar l'enllaç al Facebook."
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr "Us heu desconnectat del Facebook."
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr "No estic segur del que proveu de fer."
-
-#: facebooksettings.php:61
-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.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr "S'han desat les preferències de sincronització."
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-"Actualitza automàticament el meu estat del Facebook amb els meus avisos."
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr "Envia respostes «@» al Facebook."
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Desa"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-"Si voleu que %s actualitzi automàticament el vostre estat del Facebook amb "
-"el darrer avís, cal que li doneu permís."
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Permet que %s actualitzi el meu estat del Facebook"
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr "Preferències de sincronització"
diff --git a/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po
deleted file mode 100644
index f28334bffc..0000000000
--- a/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,578 +0,0 @@
-# Translation of StatusNet - Facebook to German (Deutsch)
-# Exported from translatewiki.net
-#
-# Author: Michael
-# Author: The Evil IP address
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:43+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:30:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: de\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-"Hallo %1$s. Wir konnten leider nicht deinen Facebook-Status von %2$s aus "
-"aktualisieren und haben daher das Facebook-Programm für dein Benutzerkonto "
-"deaktiviert. Dies könnte daran liegen, dass du die Erlaubnis des Facebook-"
-"Programms entfernt hast oder dein Facebook-Benutzerkonto gelöscht hast. Du "
-"kannst das Facebook-Programm und die automatische Aktualisierung des Status, "
-"indem du das %2$s-Facebook-Programm neu installierst.\n"
-"\n"
-"Mit freundlichen Grüßen,\n"
-"\n"
-"%2$s"
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr ""
-"Du musst auf Facebook eingeloggt sein, um Facebook Connect benutzen zu "
-"können."
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr ""
-"Es gibt bereits einen lokalen Benutzer, der mit diesem Facebook-"
-"Benutzerkonto verknüpft ist."
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
-
-#: FBConnectAuth.php:96
-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."
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "Ein unbekannter Fehler ist aufgetreten."
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-"Dies ist das erste Mal, dass du dich auf %s anmeldest, sodass wir dein "
-"Facebook-Benutzerkonto mit einem lokalen Benutzerkonto verbinden müssen. Du "
-"kannst entweder ein neues Benutzerkonto erstellen oder dich mit deinem "
-"existierendem Benutzerkonto verbinden."
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "Verbindungsoptionen"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-"Abgesehen von den folgenden Daten: Passwort, E-Mail-Adresse, IM-Adresse und "
-"Telefonnummer, sind all meine Texte und Dateien unter %s verfügbar."
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Neues Benutzerkonto erstellen"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Neues Benutzerkonto mit diesem Benutzernamen erstellen."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Neuer Benutzername"
-
-#: FBConnectAuth.php:197
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Erstellen"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr "Bestehendes Benutzerkonto verbinden"
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-"Wenn du bereits ein Benutzerkonto hast, melde dich mit deinem Benutzernamen "
-"und Passwort an, um ihn mit Facebook zu verbinden."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr "Bestehender Benutzername"
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Passwort"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-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'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "Registrierung nicht erlaubt."
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "Kein gültiger Einladungscode."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "Benutzername nicht erlaubt."
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr "Fehler beim Verbinden des Benutzers mit Facebook."
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "Benutzername oder Passwort falsch."
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Anmelden"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "Nachricht senden"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "Was geht, %s?"
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Verfügbare Zeichen"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Senden"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr "Server-Fehler: Konnte Benutzer nicht kriegen!"
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "Falscher Benutzername oder Passwort."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s und Freunde, Seite %2$d"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s und Freunde"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-"Wenn du möchtest, dass das %s-Programm automatisch deinen Facebook-Status "
-"mit deiner neuesten Nachricht aktualisiert, musst du ihm die Erlaubnis dazu "
-"geben."
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr "Okay, mach es!"
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Überspringen"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr ""
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Nach"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Vor"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "Danke für das Einladen deiner Freunde auf %s."
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Einladungen wurden an die folgenden Benutzer gesendet:"
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Du wurdest auf %s eingeladen"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Lade deine Freunde auf %s ein"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Auf %s bereits angemeldete Freunde"
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Einladungen senden"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr ""
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr ""
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr "Mit Facebook anmelden oder registrieren"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr ""
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-"Das Facebook-Plugin integriert StatusNet mit <a href=\"http://facebook.com/"
-"\">Facebook</a> und Facebook Connect."
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr "Bereits angemeldet."
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr "Logge dich mit deinem Facebook-Benutzerkonto ein"
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr "Facebook Login"
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr "Konnte Facebook-Benutzer nicht entfernen: bereits gelöscht."
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr "Konnte Facebook-Benutzer nicht entfernen."
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "Startseite"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "Startseite"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Einladen"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "Einladen"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Einstellungen"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Einstellungen"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-"Um das %s-Facebook-Programm zu benutzen, musst du dich mit deinem "
-"Benutzernamen und Passwort einloggen. Hast du noch keinen Benutzernamen?"
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr ""
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "Registrieren"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr "Benutzername"
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Anmelden"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr "Passwort vergessen?"
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr "Kein Nachrichten-Inhalt!"
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-"Das war zu lang. Die Länge einer Nachricht ist auf %d Zeichen beschränkt."
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr "Nachrichten"
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr "Facebook"
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr ""
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr ""
-"Ungültiger Facebook-API-Schlüssel. Die maximale Länge liegt bei 255 Zeichen."
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr ""
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr "API-Schlüssel"
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr "Von Facebook bereitgestellter API-Schlüssel"
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr "Geheim"
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Speichern"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Facebook-Einstellungen speichern"
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr "Verwalte, wie dein Benutzerkonto sich mit Facebook verbindet"
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr ""
-"Es gibt keinen Facebook-Benutzer, der mit diesem Benutzerkonto verbunden ist."
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr "Verbundener Facebook-Benutzer"
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr ""
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr "Passwort vergeben"
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr ""
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Abmelden"
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr "Link zu Facebook konnte nicht gelöscht werden."
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr "Sie sind bei Facebook abgemeldet."
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr "Prozess konnte nicht verarbeitet werden."
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
-"Es gab ein Problem beim Speichern deiner Synchronisierungs-Einstellungen!"
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr "Synchronisierungs-Einstellungen gespeichert."
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-"Meinen Facebook-Status automatisch mit meinen Nachrichten aktualisieren."
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr "@-Antworten an Facebook versenden."
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Speichern"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-"Wenn du möchtest, dass %s automatisch deinen Facebook-Status mit deiner "
-"neuesten Nachricht aktualisiert, musst du ihm die Erlaubnis dazu geben."
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "%s erlauben, meinen Facebook-Status zu aktualisieren"
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr "Synchronisierungs-Einstellungen"
diff --git a/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po
deleted file mode 100644
index 39381fe624..0000000000
--- a/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,563 +0,0 @@
-# Translation of StatusNet - Facebook to Spanish (Español)
-# Exported from translatewiki.net
-#
-# Author: Locos epraix
-# Author: Peter17
-# Author: Translationista
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:43+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:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: es\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: facebookutil.php:429
-#, fuzzy, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-"Hola, %$1s: Lamentamos informarte que no podemos actualizar tu estado de "
-"Facebook desde %$2s y hemos inhabilitado la aplicación de Facebook en tu "
-"cuenta. Esto puede deberse a que has eliminado la autorización de Facebook o "
-"porque hax borrado tu cuenta de Facebook. Puedes volver a habilitar la "
-"aplicación de Facebook y la actualización automática de estados mediante la "
-"reinstalación de la aplicación de Facebook %2$s."
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr ""
-"Debes haber iniciado sesión en Facebook para poder utilizar Facebook Connect."
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr "Ya hay un usuario local vinculado a esta cuenta de Facebook."
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-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."
-
-#: FBConnectAuth.php:96
-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."
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "Ha ocurrido un error desconocido."
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-"Esta es la primera vez que inicias sesión en %s, así que debemos conectar "
-"Facebook a una cuenta local. Puedes crear una cuenta nueva o conectarte con "
-"tu cuenta, de tenerla."
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr "Configuración de cuenta de Facebook"
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "Opciones de conexión"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, 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 y archivos están disponibles en %s, salvo estos datos privados: "
-"contraseña, dirección de correo electrónico, dirección de mensajería "
-"instantánea y número de teléfono."
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Crear cuenta nueva"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Crear un nuevo usuario con este nombre de usuario."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Nuevo nombre de usuario"
-
-#: FBConnectAuth.php:197
-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: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Crear"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr "Conectar cuenta existente"
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-"Si ya tienes una cuenta, ingresa con tu nombre de usuario y contraseña para "
-"conectarte a tu Facebook."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr "El nombre de usuario ya existe"
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Contraseña"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-msgctxt "BUTTON"
-msgid "Connect"
-msgstr "Conectar"
-
-#. TRANS: Client error trying to register with registrations not allowed.
-#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "Registro de usuario no permitido."
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "No es un código de invitación válido."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "Nombre de usuario no autorizado."
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "El nombre de usuario ya existe. Prueba con otro."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr "Error de conexión del usuario a Facebook."
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "Nombre de usuario o contraseña inválidos."
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Iniciar sesión"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "Enviar un mensaje"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "¿Qué tal, %s?"
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Caracteres disponibles"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Enviar"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr "Error de servidor: ¡No se pudo obtener el usuario!"
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr ""
-"Nombre de usuario o contraseña incorrectos\n"
-"."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, fuzzy, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%s y sus amistades"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s y sus amistades"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-"Si desesa que la aplicación %s actualice automáticamente tu estado de "
-"Facebook con tu último mensaje, tienes que darle permiso."
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr "Ok, ¡hazlo!"
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Omitir"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "Paginación"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Después"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Antes"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "Gracias por invitar a tus amistades a usar %s."
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Se ha enviado invitaciones a los siguientes usuarios:"
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Te han invitado a %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Invita a tus amistades a usar %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Amistades que ya usan %s:"
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Enviar invitaciones"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr "Configuración de integración de Facebook"
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr ""
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr ""
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr ""
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr ""
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr ""
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr ""
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr ""
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr ""
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "Pagina principal"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "Pagina principal"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Invitar"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "Invitar"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Preferencias"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Preferencias"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr ""
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "Registrarse"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr "Nickname"
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Iniciar sesión"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr ""
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr ""
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr "Avisos"
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr "Facebook"
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr "Configuración de integración de Facebook"
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr ""
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr ""
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr "Secreto"
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Guardar"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr ""
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr ""
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr ""
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr ""
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr "establecer una contraseña"
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr ""
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr ""
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr ""
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr ""
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr ""
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Guardar"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr ""
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr ""
diff --git a/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po
deleted file mode 100644
index eb9f440878..0000000000
--- a/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,581 +0,0 @@
-# Translation of StatusNet - Facebook to French (Français)
-# Exported from translatewiki.net
-#
-# Author: Peter17
-# Author: Verdy p
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:43+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:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: fr\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-"Salut, %1$s. Nous sommes désolés de vous informer que nous ne sommes pas en "
-"mesure de mettre à jour votre statut Facebook depuis %2$s et que nous avons "
-"désactivé l’application Facebook sur votre compte. C’est peut-être parce que "
-"vous avez retiré l’autorisation de l’application Facebook, ou avez supprimé "
-"votre compte Facebook. Vous pouvez réactiver l’application Facebook et la "
-"mise à jour d’état automatique en réinstallant l’application %2$s pour "
-"Facebook.\n"
-"\n"
-"Cordialement,\n"
-"\n"
-"%2$s"
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr "Vous devez être identifié sur Facebook pour utiliser Facebook Connect."
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr "Il existe déjà un utilisateur local lié à ce compte Facebook."
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-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."
-
-#: FBConnectAuth.php:96
-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."
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "Une erreur inconnue s’est produite."
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook 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 Facebook, il nous "
-"faut donc lier votre compte Facebook à un compte local. Vous pouvez soit "
-"créer un nouveau compte, soit vous connecter avec votre compte local "
-"existant si vous en avez un."
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr "Configuration du compte Facebook"
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "Options de connexion"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, 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."
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Créer un nouveau compte"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Créer un nouvel utilisateur avec ce pseudonyme."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Nouveau pseudonyme"
-
-#: FBConnectAuth.php:197
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Créer"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr "Se connecter à un compte existant"
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-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 Facebook."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr "Pseudonyme existant"
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Mot de passe"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-msgctxt "BUTTON"
-msgid "Connect"
-msgstr "Connexion"
-
-#. TRANS: Client error trying to register with registrations not allowed.
-#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "Inscription non autorisée."
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "Le code d’invitation n’est pas valide."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "Pseudonyme non autorisé."
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "Pseudonyme déjà utilisé. Essayez-en un autre."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr "Erreur de connexion de l’utilisateur à Facebook."
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "Nom d’utilisateur ou mot de passe incorrect."
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Connexion"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "Envoyer un avis"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "Quoi de neuf, %s ?"
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Caractères restants"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Envoyer"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr "Erreur de serveur : impossible d’obtenir l’utilisateur !"
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "Nom d’utilisateur ou mot de passe incorrect."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s et ses amis, page %2$d"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s et ses amis"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-"Si vous souhaitez que l’application %s mette à jour automatiquement votre "
-"statut Facebook avec votre dernier avis, vous devez lui en donner "
-"l’autorisation."
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr "Ok, le faire !"
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Sauter cette étape"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "Pagination"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Après"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Avant"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "Merci d’inviter vos amis à utiliser %s."
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Des invitations ont été envoyées aux utilisateurs suivants :"
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Vous avez été invité à %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Invitez vos amis à utiliser %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Amis utilisant déjà %s :"
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Envoyer des invitations"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr "Configuration de l’intégration Facebook"
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr "Utilisateur de Facebook Connect"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr "Se connecter ou s’inscrire via Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr "Paramètres pour Facebook Connect"
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-"Le greffon Facebook permet d’intégrer des instances StatusNet avec <a href="
-"\"http://facebook.com/\">Facebook</a> et Facebook Connect."
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr "Déjà connecté."
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr "Connectez-vous avec votre compte Facebook"
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr "Connexion Facebook"
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr "Impossible de supprimer l’utilisateur Facebook : déjà supprimé."
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr "Impossible de supprimer l’utilisateur Facebook."
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "Accueil"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "Accueil"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Inviter"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "Inviter"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Paramètres"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Préférences de l’utilisateur"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-"Pour utiliser l’application %s pour Facebook, vous devez vous identifier "
-"avec votre nom d’utilisateur et mot de passe. Vous n’avez pas encore un nom "
-"d’utilisateur ?"
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr "un nouveau compte."
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "S’inscrire"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr "Pseudonyme"
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Connexion"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr "Mot de passe perdu ou oublié ?"
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr "Aucun contenu dans l’avis !"
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "C’est trop long ! La taille maximale de l’avis est de %d caractères."
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr "Avis publiés"
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr "Facebook"
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr "Paramètres d’intégration Facebook"
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr ""
-"Clé invalide pour l’API Facebook. La longueur maximum est de 255 caractères."
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-"Code secret invalide pour l’API Facebook. La longueur maximum est de 255 "
-"caractères."
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr "Paramètres de l’application Facebook"
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr "Clé API"
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr "Clé API fournie par Facebook"
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr "Code secret"
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr "Code secret pour l’API fourni par Facebook"
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Sauvegarder"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Sauvegarder les paramètres Facebook"
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr "Gérez la façon dont votre compte se connecte à Facebook"
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr "Il n’y a pas d’utilisateur Facebook connecté à ce compte."
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr "Utilisateur Facebook connecté"
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr "Déconnecter mon compte de Facebook"
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-"La déconnexion de votre compte Facebook ne vous permettrait plus de vous "
-"connecter ! S’il vous plaît "
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr "définissez un mot de passe"
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr " tout d’abord."
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Déconnecter"
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr "Impossible de supprimer le lien vers Facebook."
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr "Vous avez été déconnecté de Facebook."
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr "Pas certain de ce que vous essayez de faire."
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
-"Il y a eu un problème lors de la sauvegarde de vos préférences de "
-"synchronisation !"
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr "Préférences de synchronisation enregistrées."
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr "Mettre à jour automatiquement mon statut Facebook avec mes avis."
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr "Envoyez des réponses « @ » à Facebook."
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Sauvegarder"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-"Si vous souhaitez que l’application %s mette à jour automatiquement votre "
-"statut Facebook avec votre dernier avis, vous devez lui en donner "
-"l’autorisation."
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Autoriser %s à mettre à jour mon statut Facebook"
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr "Préférences de synchronisation"
diff --git a/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po
deleted file mode 100644
index 8392821035..0000000000
--- a/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,545 +0,0 @@
-# Translation of StatusNet - Facebook to Galician (Galego)
-# Exported from translatewiki.net
-#
-# Author: Toliño
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:43+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:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: gl\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr ""
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr ""
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Houbo un erro co seu pase. Inténteo de novo."
-
-#: FBConnectAuth.php:96
-msgid "You can't register if you don't agree to the license."
-msgstr "Non pode rexistrarse se non acepta a licenza."
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "Houbo un erro descoñecido."
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "Opcións de conexión"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-"Os meus textos e ficheiros están dispoñibles baixo %s, salvo os seguintes "
-"datos privados: contrasinais, enderezos de correo electrónico e mensaxería "
-"instantánea e números de teléfono."
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Crear unha conta nova"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Crear un novo usuario con este alcume."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Novo alcume"
-
-#: FBConnectAuth.php:197
-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"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Crear"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr ""
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr ""
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Contrasinal"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-msgctxt "BUTTON"
-msgid "Connect"
-msgstr "Conectar"
-
-#. TRANS: Client error trying to register with registrations not allowed.
-#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "Non se permite o rexistro."
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "O código da invitación é incorrecto."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr ""
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "Ese alcume xa está en uso. Probe con outro."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr ""
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "O nome de usuario ou contrasinal non son correctos."
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Rexistro"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "Enviar unha nota"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "Que hai de novo, %s?"
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Caracteres dispoñibles"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Enviar"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr ""
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "Nome de usuario ou contrasinal incorrectos."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s e amigos, páxina %2$d"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s e amigos"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr "De acordo, facédeo!"
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Saltar"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "Paxinación"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Despois"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Antes"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr ""
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr ""
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr ""
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr ""
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr ""
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Enviar as invitacións"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr "Configuración de integración do Facebook"
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr "Usuario do Facebook Connect"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr ""
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr ""
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr "Xa se identificou."
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr ""
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr ""
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr ""
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr ""
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "Inicio"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "Inicio"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Convidar"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "Convidar"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Parámetros"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Configuracións"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr " unha nova conta."
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "Rexistrarse"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr "Alcume"
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Rexistro"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr "Esqueceu ou perdeu o contrasinal?"
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr ""
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr "Avisos"
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr "Facebook"
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr ""
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr ""
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr "Clave API"
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr "Clave API proporcionada polo Facebook"
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr ""
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Gardar"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr ""
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr ""
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr ""
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr ""
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr ""
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr " primeiro."
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Desconectarse"
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr ""
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr ""
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr ""
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Gardar"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr ""
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr ""
diff --git a/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po
deleted file mode 100644
index 59e4457f7b..0000000000
--- a/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,572 +0,0 @@
-# Translation of StatusNet - Facebook 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 - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49: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-01-22 19:30:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: ia\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-"Salute, %1$s. Nos regretta informar te que nos es incapace de actualisar tu "
-"stato de Facebook ab %2$s, e que nos ha disactivate le application Facebook "
-"pro tu conto. Isto pote esser proque tu ha removite le autorisation del "
-"application Facebook, o ha delite tu conto de Facebook. Tu pote reactivar le "
-"application Facebook e le actualisation automatic de tu stato per "
-"reinstallar le application Facebook %2$s.\n"
-"\n"
-"Attentemente,\n"
-"\n"
-"%2$s"
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr "Tu debe aperir un session a Facebook pro usar Facebook Connect."
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr "Il ha jam un usator local ligate a iste conto de Facebook."
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-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."
-
-#: FBConnectAuth.php:96
-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."
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "Un error incognite ha occurrite."
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook 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 Facebook a un conto local. Tu pote crear un nove conto, o "
-"connecter con tu conto existente si tu ha un."
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr "Configuration de conto Facebook"
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "Optiones de connexion"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, 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."
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Crear nove conto"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Crear un nove usator con iste pseudonymo."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Nove pseudonymo"
-
-#: FBConnectAuth.php:197
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 minusculas o numeros, sin punctuation o spatios"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Crear"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr "Connecter conto existente"
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-"Si tu ha jam un conto, aperi session con tu nomine de usator e contrasigno "
-"pro connecter lo a tu Facebook."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr "Pseudonymo existente"
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Contrasigno"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-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'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "Creation de conto non permittite."
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "Le codice de invitation es invalide."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "Pseudonymo non permittite."
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "Pseudonymo ja in uso. Proba un altere."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr "Error durante le connexion del usator a Facebook."
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "Nomine de usator o contrasigno invalide."
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Aperir session"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "Inviar un nota"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "Como sta, %s?"
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Characteres disponibile"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Inviar"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr "Error de servitor: Non poteva obtener le usator!"
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "Nomine de usator o contrasigno incorrecte."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s e amicos, pagina %2$d"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s e amicos"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-"Si tu vole que le application %s actualisa automaticamente tu stato de "
-"Facebook con tu ultim enota, tu debe dar permission a illo."
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr "OK, face lo!"
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Saltar"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "Pagination"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Post"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Ante"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "Gratias pro invitar tu amicos a usar %s."
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Invitationes ha essite inviate al sequente usatores:"
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Tu ha essite invitate a %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Invita tu amicos a usar %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Amicos que jam usa %s:"
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Inviar invitationes"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr "Configuration del integration de Facebook"
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr "Usator de Facebook Connect"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr "Aperir session o crear conto usante Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr "Configurationes de connexion a Facebook"
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-"Le plug-in de Facebook permitte integrar installationes de StatusNet con <a "
-"href=\"http://facebook.com/\">Facebook</a> e Facebook Connect."
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr "Tu es jam authenticate."
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr "Aperir session con tu conto de Facebook"
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr "Authentication con Facebook"
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr "Non poteva remover usator de Facebook: jam delite."
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr "Non poteva remover le usator de Facebook."
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "Initio"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "Initio"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Invitar"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "Invitar"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Configurationes"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Configurationes"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-"Pro usar le application Facebook %s tu debe aperir un session con tu nomine "
-"de usator e contrasigno. Tu non ha ancora un nomine de usator?"
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr " un nove conto."
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "Crear conto"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr "Pseudonymo"
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Aperir session"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr "Contrasigno perdite o oblidate?"
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr "Le nota non ha contento!"
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-"Isto es troppo longe. Le longitude maximal del notas es %d characteres."
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr "Notas"
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr "Facebook"
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr "Configurationes de integration de Facebook"
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr "Clave API de Facebook invalide. Longitude maximal es 255 characteres."
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-"Secreto API de Facebook invalide. Longitude maximal es 255 characteres."
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr "Configurationes del application de Facebook"
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr "Clave API"
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr "Clave API providite per Facebook"
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr "Secreto"
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr "Secreto API providite per Facebook"
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Salveguardar"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Salveguardar configuration Facebook"
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr "Configura como tu conto se connecte a Facebook"
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr "Il non ha un usator de Facebook connectite a iste conto."
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr "Usator de Facebook connectite"
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr "Disconnecter mi conto ab Facebook"
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-"Le disconnexion de tu Facebook renderea le authentication impossibile! Per "
-"favor "
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr "defini un contrasigno"
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr " primo."
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Disconnecter"
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr "Non poteva deler le ligamine a Facebook."
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr "Tu te ha disconnectite de Facebook."
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr "Non es clar lo que tu tenta facer."
-
-#: facebooksettings.php:61
-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.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr "Preferentias de synchronisation salveguardate."
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr "Actualisar automaticamente mi stato de Facebook con mi notas."
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr "Inviar responsas \"@\" a Facebook."
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Salveguardar"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-"Si tu vole que %s actualisa automaticamente tu stato de Facebook con tu "
-"ultime nota, tu debe dar permission a illo."
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Permitter a %s de actualisar mi stato de Facebook"
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr "Preferentias de synchronisation"
diff --git a/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po
deleted file mode 100644
index 09dedf13ae..0000000000
--- a/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,568 +0,0 @@
-# Translation of StatusNet - Facebook 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 - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49: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-01-22 19:30:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: mk\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-"Здраво, %1$s. Нажалост, не можеме да го смениме Вашиот статус на Facebook од "
-"%2$s, и го имаме оневозможено програмчето за Facebook на Вашата сметка. Ова "
-"можеби се должи на тоа што сте го отстраниле овластувањето на програмчето за "
-"Facebook, или пак сте ја избришале самата сметка на Facebook. Можете "
-"повторно да го овозможите програмчето за Facebook и автоматското менување на "
-"статус со преинсталирање на програмчето %2$s - Facebook.\n"
-"\n"
-"Поздрав,\n"
-"\n"
-"%2$s"
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr ""
-"Мора да сте најавени на Facebook за да можете да користите Facebook Connect."
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr "Веќе постои локален корисник поврзан со оваа сметка на Facebook."
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Се појави проблем со жетонот на Вашата сесија. Обидете се повторно."
-
-#: FBConnectAuth.php:96
-msgid "You can't register if you don't agree to the license."
-msgstr "Не можете да се регистрирате ако не се согласувате со лиценцата."
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "Се појави непозната грешка."
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-"Ова е прв пат како се најавувате на %s, па затоа мораме да го поврземе "
-"Вашиот профил на Facebook со локална сметка. Можете да создадете нова "
-"сметка, или пак да се поврзете со Вашата постоечка сметка (ако ја имате)."
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr "Поставки за сметка на Facebook"
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "Нагодувања за врска"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, 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-адреса, и телефонскиот број."
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Создај нова сметка"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Создај нов корисник со овој прекар."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Нов прекар"
-
-#: FBConnectAuth.php:197
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 мали букви или бројки, без интерпункциски знаци и празни места"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Создај"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr "Поврзи постоечка сметка"
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-"Ако веќе имате сметка, најавете се со корисничкото име и лозинката за да ја "
-"поврзете со профилот на Facebook."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr "Постоечки прекар"
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Лозинка"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-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'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "Регистрацијата не е дозволена."
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "Ова не е важечки код за покана."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "Прекарот не е дозволен."
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "Прекарот е зафатен. Одберете друг."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr "Грешка при поврзувањето на корисникот со Facebook."
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "Неважечко корисничко име или лозинка."
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Најава"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "Испрати забелешка"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "Како е, %s?"
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Расположиви знаци"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Испрати"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr "Грешка во опслужувачот: Не можев да го добијам корисникот!"
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "Погрешно корисничко име или лозинка."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s и пријателите, страница %2$d"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s и пријателите"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-"Доколку сакате %s автоматски да Ви го менува Вашиот статус на Facebook "
-"(прикажувајќи ја најновата забелешка), ќе морате да дадете дозвола."
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr "Во ред, ајде!"
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Прескокни"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "Прелом на страници"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Потоа"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Претходно"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "Ви благодариме што ги поканивте пријателите да користат %s."
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Испратени се покани до следениве корисници:"
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Поканети сте на %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Поканете ги пријателите да користат %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Пријатели што веќе користат %s:"
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Испрати покани"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr "Поставки за обединување со Facebook"
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr "Поврзување на корисник со Facebook Connect"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr "Најава или регистрација со Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr "Нагодувања за поврзување со Facebook"
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-"Приклучокот за Facebook овозможува соединување на примероци на StatusNet со "
-"<a href=\"http://mk-mk.facebook.com/\">Facebook</a> и Facebook Connect."
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr "Веќе сте најавени."
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr "Најавете се со Вашата сметка на Facebook"
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr "Најава со Facebook"
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr "Не можев да го отстранам корисникот на Facebook: веќе е избришан."
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr "Не можев да го отстранам корисниот на Facebook."
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "Почетна"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "Почетна"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Покани"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "Покани"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Нагодувања"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Нагодувања"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-"За да го користите програмчето %s - Facebook ќе мора да сте најавени со "
-"Вашето корисничко име и лозинка. Сè уште немате корисничко име?"
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr " нова сметка."
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "Регистрација"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr "Прекар"
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Најава"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr "Ја загубивте/заборавивте лозинката?"
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr "Нема содржина за забелешката!"
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Ова е предолго. Забелешката може да содржи највеќе %d знаци."
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr "Забелешки"
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr "Facebook"
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr "Поставки за обединување со Facebook"
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr "Неважечки API-клуч за Facebook. Дозволени се највеќе 255 знаци."
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr "Неважечки API-тајна за Facebook. Дозволени се највеќе 255 знаци."
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr "Нагодувања за прог. Facebook"
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr "API-клуч"
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr "API-клучот е обезбеден од Facebook"
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr "Тајна"
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr "API-тајната е обезбедена од Facebook"
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Зачувај"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Зачувај нагодувања за Facebook"
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr "Раководење со начинот на поврзување на Вашата сметка со Facebook"
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr "Нема корисник на Facebook поврзан со оваа сметка."
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr "Поврзан корисник на Facebook"
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr "Исклучи ја мојата сметка од Facebook"
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-"Ако ја исклучите врската со Facebook нема да можете да се најавите! Затоа, "
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr "ставете лозинка"
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr " пред да продолжите."
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Прекини"
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr "Не можев да ја избришам врската до Facebook."
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr "Сега е исклучена врската со Facebook."
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr "Не ми е јасно што сакате да направите."
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
-"Се појави проблем при зачувувањето на Вашите поставки за услогласување!"
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr "Поставките за усогласување се зачувани."
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr "Автоматски заменувај ми го статусот на Facebook со моите забелешки."
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr "Испрати „@“ одговори на Facebook."
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Зачувај"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-"Ако сакате %s автоматски да го заменува Вашиот статус на Facebook со Вашата "
-"најновата забелешка, ќе треба да дадете дозвола."
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Дозволи %s да го менува мојот статус на Facebook"
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr "Услогласи нагодувања"
diff --git a/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po
deleted file mode 100644
index 5a22e47527..0000000000
--- a/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,540 +0,0 @@
-# Translation of StatusNet - Facebook to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Exported from translatewiki.net
-#
-# Author: Nghtwlkr
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:44+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:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr ""
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr ""
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: FBConnectAuth.php:96
-msgid "You can't register if you don't agree to the license."
-msgstr ""
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr ""
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr ""
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Opprett ny konto"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Opprett en ny bruker med dette kallenavnet."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Nytt kallenavn"
-
-#: FBConnectAuth.php:197
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 små bokstaver eller tall, ingen punktum eller mellomrom"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Opprett"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr ""
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr "Eksisterende kallenavn"
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Passord"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-msgctxt "BUTTON"
-msgid "Connect"
-msgstr "Koble til"
-
-#. TRANS: Client error trying to register with registrations not allowed.
-#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "Registrering ikke tillatt."
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "Ikke en gyldig invitasjonskode."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "Kallenavn er ikke tillatt."
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "Kallenavnet er allerede i bruk. Prøv et annet."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr ""
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "Ugyldig brukernavn eller passord."
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Logg inn"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "Send en notis"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "Hva skjer %s?"
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Tilgjengelige tegn"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Send"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr "Tjenerfeil: Kunne ikke hente bruker!"
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "Feil brukernavn eller passord."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s og venner, side %2$d"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s og venner"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr ""
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Hopp over"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "Paginering"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Etter"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Før"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "Takk for at du inviterte vennene dine til å bruke %s."
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Invitasjoner har blitt sendt til følgende brukere:"
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Du har blitt invitert til å %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Inviter vennene dine til å bruke %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr ""
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Send invitasjoner"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr ""
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr ""
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr ""
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr ""
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr "Allerede innlogget."
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr ""
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr ""
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr ""
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr ""
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "Hjem"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "Hjem"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Inviter"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "Inviter"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Innstillinger"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Innstillinger"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr " en ny konto."
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "Registrer"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr "Kallenavn"
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Logg inn"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr "Mistet eller glemt passordet?"
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr ""
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr ""
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr "Facebook"
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr ""
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr ""
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr ""
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr ""
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Lagre"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr ""
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr ""
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr ""
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr ""
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr "angi et passord"
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr " først."
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr ""
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr ""
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr ""
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr "Send «@»-svar til Facebook."
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Lagre"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Tillat %s å oppdatere min Facebook-status"
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr ""
diff --git a/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
deleted file mode 100644
index fda8b1054d..0000000000
--- a/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,578 +0,0 @@
-# Translation of StatusNet - Facebook 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 - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49: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-01-22 19:30:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: nl\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-"Hallo %1$s.\n"
-"\n"
-"Het spijt ons u te moeten meedelen dat het niet mogelijk is uw "
-"Facebookstatus bij te werken vanuit %2$s. De Facebookapplicatie is "
-"uitgeschakeld voor uw gebruiker. Dit kan komen doordat u de toegangsrechten "
-"voor de Facebookapplicatie hebt ingetrokken of omdat u uw Facebookgebruiker "
-"hebt verwijderd. U kunt deze Facebookapplicatie opnieuw inschakelen en "
-"automatisch uw status laten bijwerken door de Facebookapplicatie van %2$s "
-"opnieuw te installeren.\n"
-"\n"
-"\n"
-"Met vriendelijke groet,\n"
-"\n"
-"%2$s"
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr "U moet zijn aangemeld bij Facebook om Facebook Connect te gebruiken."
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr "Er is al een lokale gebruiker verbonden met deze Facebookgebruiker"
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-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."
-
-#: FBConnectAuth.php:96
-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."
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "Er is een onbekende fout opgetreden."
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook 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 "
-"Facebookgebruiker koppelen met uw lokale gebruiker. U kunt een nieuwe "
-"gebruiker aanmaken of koppelen met een bestaande gebruiker als u die al hebt."
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr "Facebookgebruiker instellen"
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "Verbindingsinstellingen"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, 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."
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Nieuwe gebruiker aanmaken"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Nieuwe gebruiker aanmaken met deze gebruikersnaam."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Nieuwe gebruikersnaam"
-
-#: FBConnectAuth.php:197
-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.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Aanmaken"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr "Verbinden met een bestaande gebruiker"
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-"Als u al een gebruiker hebt, meld dan aan met uw gebruikersnaam en "
-"wachtwoord om deze daarna te koppelen met uw Facebookgebruiker."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr "Bestaande gebruikersnaam"
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Wachtwoord"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-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'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "Registratie is niet toegestaan."
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "De uitnodigingscode is ongeldig."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "Gebruikersnaam niet toegestaan."
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr ""
-"De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr "Fout bij het verbinden van de gebruiker met Facebook."
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "Ongeldige gebruikersnaam of wachtwoord."
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Aanmelden"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "Mededeling verzenden"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "Hallo, %s."
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Beschikbare tekens"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Verzenden"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr "Serverfout: de gebruiker kon niet geladen worden."
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "De gebruikersnaam of wachtwoord is onjuist."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s en vrienden, pagina %2$d"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s en vrienden"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-"Als u wilt dat het programma %s automatisch uw Facebookstatus bijwerkt met "
-"uw laatste bericht, dan moet u daarvoor toestemming geven."
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr "Toestemming geven"
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Overslaan"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "Paginering"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Later"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Eerder"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "Dank u wel voor het uitnodigen van uw vrienden om %s te gebruiken."
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Er is een uitnodiging verstuurd naar de volgende gebruikers:"
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "U bent uitgenodigd bij %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Vrienden uitnodigen om %s te gebruiken"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Vrienden die %s al gebruiken:"
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Uitnodigingen verzenden"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr "Instellingen voor Facebookintegratie"
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr "Facebook Connectgebruiker"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr "Aanmelden of registreren via Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr "Instellingen voor Facebook Connect"
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-"Via de de Facebookplug-in is het mogelijk StatusNet-installaties te koppelen "
-"met <a href=\"http://facebook.com/\">Facebook</a> en Facebook Connect."
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr "U bent al aangemeld."
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr "Aanmelden met uw Facebookgebruiker"
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr "Aanmelden via Facebook"
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr ""
-"Het was niet mogelijk om de Facebookgebruiker te verwijderen: gebruiker is "
-"al verwijderd."
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr "Het was niet mogelijk de Facebookgebruiker te verwijderen."
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "Hoofdmenu"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "Hoofdmenu"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Uitnodigen"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "Uitnodigen"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Instellingen"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Instellingen"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-"Om het Facebookprograma %s te gebruiken moet u aanmelden met uw "
-"gebruikersnaam en wachtwoord. Hebt u nog geen gebruiker?"
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr " een nieuwe gebruiker."
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "Registreren"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr "Gebruikersnaam"
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Aanmelden"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr "Wachtwoord kwijt of vergeten?"
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr "Geen berichtinhoud!"
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "De mededeling is te lang. Gebruik maximaal %d tekens."
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr "Mededelingen"
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr "Facebook"
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr "Instellingen voor Facebookkoppeling"
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr "Ongeldige Facebook API-sleutel. De maximale lengte is 255 tekens."
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr "Ongeldig Facebook API-geheim. De maximale lengte is 255 tekens."
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr "Applicatieinstellingen voor Facebook"
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr "API-sleutel"
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr "API-sleutel die door Facebook is uitgeven"
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr "Geheim"
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr "API-geheim dat door Facebook is uitgeven"
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Opslaan"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Facebookinstellingen opslaan"
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr "Beheren hoe uw gebruiker is gekoppeld met Facebook"
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr "Er is geen Facebookgebruiker gekoppeld met deze gebruiker."
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr "Gekoppelde Facebookgebruiker"
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr "Mijn gebruiker loskoppelen van Facebook"
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-"Loskoppelen van uw Facebookgebruiker zou ervoor zorgen dat u niet langer "
-"kunt aanmelden. U moet eerst "
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr "een wachtwoord instellen"
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr " voordat u verder kunt met deze handeling."
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Loskoppelen"
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr "Het was niet mogelijk de verwijzing naar Facebook te verwijderen."
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr "U bent losgekoppeld van Facebook."
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr "Het is niet duidelijk wat u wilt bereiken."
-
-#: facebooksettings.php:61
-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.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr "Uw synchronisatievoorkeuren zijn opgeslagen."
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr "Mijn Facebookstatus automatisch bijwerken met mijn mededelingen."
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr "Antwoorden met \"@\" naar Facebook verzenden."
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Opslaan"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-"Als u wilt dat %s automatisch uw Facebookstatus bijwerkt met uw laatste "
-"mededeling, dat moet u daar toestemming voor geven."
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "%s toestaan mijn Facebookstatus bij te werken"
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr "Synchronisatievooreuren"
diff --git a/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po
deleted file mode 100644
index 6a6dcff9c0..0000000000
--- a/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,544 +0,0 @@
-# Translation of StatusNet - Facebook to Brazilian Portuguese (Português do Brasil)
-# Exported from translatewiki.net
-#
-# Author: Giro720
-# Author: Luckas Blade
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:44+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-22 19:30:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: pt-br\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr ""
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr ""
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: FBConnectAuth.php:96
-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."
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "Ocorreu um erro desconhecido."
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "Opções de conexão"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Criar nova conta"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Criar um novo usuário com este apelido."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Novo apelido"
-
-#: FBConnectAuth.php:197
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Criar"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr ""
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr ""
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Senha"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-msgctxt "BUTTON"
-msgid "Connect"
-msgstr "Conectar"
-
-#. TRANS: Client error trying to register with registrations not allowed.
-#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "Não é permitido o registro."
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "O código de convite é inválido."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "Apelido não permitido."
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "Este apelido já está em uso. Tente outro."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr "Erro ao conectar o usuário ao Facebook."
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr ""
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Entrar"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr ""
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr ""
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Caracteres disponíveis"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Enviar"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr ""
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "Nome de usuário e/ou senha incorreto(s)."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s e amigos, pág. %2$d"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s e amigos"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-"Se você deseja que o %s aplicativo atualize automaticamente seu estado no "
-"Facebook com seus último anúncio, você deve autorizá-lo para isso."
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr ""
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Avançar"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "Paginação"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Depois"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Antes"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "Obrigado por convidar seus amigos a usar %s"
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr ""
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Você foi convidado para %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Convidar seus amigos a usar %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Amigos já usando %s:"
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Enviar convites"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr ""
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr ""
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr "Entrar ou se registrar usando o Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr ""
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr "Já está autenticado."
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr ""
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr ""
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr ""
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr ""
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr ""
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr ""
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Convidar"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "Convidar"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Configurações"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Configurações"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr ""
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "Registrar-se"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr "Apelido"
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Entrar"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr "Perdeu ou esqueceu sua senha?"
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr ""
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr ""
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr ""
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr ""
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr ""
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr ""
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Salvar"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Salvar configurações do Facebook"
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr ""
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr ""
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr "Desconectar minha conta do Facebook"
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr ""
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr ""
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Desconectar"
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr ""
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr ""
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr ""
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Salvar"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr ""
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr ""
diff --git a/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po
deleted file mode 100644
index aa791f367f..0000000000
--- a/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,583 +0,0 @@
-# Translation of StatusNet - Facebook to Tagalog (Tagalog)
-# Exported from translatewiki.net
-#
-# Author: AnakngAraw
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:44+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:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: tl\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-"Kumusta, %1$s. May pagpapaumanhin naming ipinababatid sa iyo na hindi namin "
-"naisapanahon ang iyong katayuan ng Facebook mula %2$s, at hindi namin "
-"pinagana ang aplikasyon ng Facebook para sa iyong akawnt.  Maaaring dahil "
-"ito sa inalis mo ang pahintulot sa aplikasyon ng Facebook, o pagbura ng "
-"iyong akawnt sa Facebook.  Maaari mong muling buhayin ang aplikasyon ng "
-"Facebook at kusang pagsasapanahon ng kalagayan sa pamamagitan ng muling "
-"pagtatalaga ng aplikasyon ng Facebook na %2$s.\n"
-"\n"
-"Nagpapahalaga,\n"
-"\n"
-"%2$s"
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr "Dapat na nakalagda ka sa Facebook upang magamit ang Ugnay sa Facebook."
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr ""
-"Mayroon nang isang katutubong tagagamit na nakakawing sa ganitong akawnt ng "
-"Facebook."
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-msgid "There was a problem with your session token. Try again, please."
-msgstr "May isang suliranin sa iyong token ng sesyon. Paki subukan uli."
-
-#: FBConnectAuth.php:96
-msgid "You can't register if you don't agree to the license."
-msgstr "Hindi ka makapagpapatala kung hindi ka sumasang-ayon sa lisensiya."
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "Isang hindi nalalamang kamalian ang naganap."
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-"Ito ang iyong unang pagkakataong lumagda sa %s kaya't kailangan naming "
-"iugnay ang iyong Facebook sa isang katutubong akawnt.  Maaari kang lumikha "
-"ng isang bagong akawnt, o umugnay sa pamamagitan ng iyong umiiral na akawnt, "
-"kung mayroon ka."
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr "Pagtatakda ng Akawnt ng Facebook"
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "Mga pagpipilian na pang-ugnay"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-"Ang aking teksto at mga talaksan ay makukuha sa ilalim ng %s maliban sa "
-"pribadong dato na ito: hudyat, tirahan ng e-liham, tirahan ng IM, at bilang "
-"na pangtelepono."
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Lumikha ng bagong akawnt"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Lumikha ng isang bagong tagagamit na may ganitong palayaw."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Bagong palayaw"
-
-#: FBConnectAuth.php:197
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-"1 hanggang 64 na maliliit na mga titik o mga bilang, walang bantas o mga "
-"patlang"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Likhain"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr "Umugnay sa umiiral na akawnt"
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-"Kung mayroon ka nang akawnt, lumagda sa pamamagitan ng iyong pangalan ng "
-"tagagamit at hudyat upang iugnay ito sa iyong Facebook."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr "Umiiral na palayaw"
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Hudyat"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-msgctxt "BUTTON"
-msgid "Connect"
-msgstr "Umugnay"
-
-#. TRANS: Client error trying to register with registrations not allowed.
-#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "Hindi pinapahintulutan ang pagpapatala."
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "Hindi isang tanggap na kodigo ng paanyaya."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "Hindi pinapahintulutan ang palayaw."
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "Ginagamit na ang palayaw. Subukan ang iba."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr "May kamalian sa pag-ugnay ng tagagamit sa Facebook."
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "Hindi tanggap na pangalan ng tagagamit o hudyat."
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Lumagda"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "Magpadala ng pabatid"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "Anong balita, %s?"
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Makukuhang mga panitik"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Ipadala"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr "Kamalian ng tapaghain: Hindi makuha ang tagagamit!"
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "Hindi tamang pangalan ng tagagamit o hudyat."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s at mga kaibigan, pahina %2$d"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s at mga kaibigan"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-"Kung nais mong kusang isapanahon ng aplikasyong %s ang iyong katayuan ng "
-"Facebook na may pinakabagong pabatid, kailangan mong bigyan ito ng "
-"pahintulot."
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr "Sige, gawin iyan!"
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Lagtawan"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "Pagbilang ng pahina"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Pagkalipas ng"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Bago ang"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "Salamat sa pag-anyaya sa iyong mga kaibigan na gamitin ang %s."
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Ipinadala na ang mga paanyaya sa sumusunod ng mga tagagamit:"
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Inaanyayahan ka sa %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Anyayahan ang iyong mga kaibigan na gamitin ang %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Mga kaibigang gumagamit na ng %s:"
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Ipadala ang mga paanyaya"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr "Pagkakaayos ng integrasyon ng Facebook"
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr "Tagagamit ng Ugnay sa Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr "Lumagda o magpatalang ginagamit ang Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr "Mga Pagtatakda sa Ugnay sa Facebook"
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-"Ang pamasak na Facebook ay nagpapahintulot ng integrasyon ng mga pagkakataon "
-"sa StatusNet sa pamamagitan ng <a href=\"http://facebook.com/\">Facebook</a> "
-"at Ugnay sa Facebook."
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr "Nakalagda na."
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr "Lumagda sa pamamagitan ng iyong Akawnt sa Facebook"
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr "Paglagda sa Facebook"
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr ""
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr "Hindi matanggal ang tagagamit ng Facebook."
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "Tahanan"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "Tahanan"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Anyayahan"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "Anyayahan"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Mga pagtatakda"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Mga pagtatakda"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-"Upang magamit ang Aplikasyon ng Facebook na %s kailangan mong lumagda sa "
-"pamamagitan ng iyong pangalan ng tagagamit at hudyat.  Wala ka pa bang "
-"bansag?"
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr "isang bagong akawnt."
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "Magpatala"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr "Palayaw"
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Lumagda"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr "Hudyat na nawala o nakalimutan?"
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr "Walang laman ang pabatid!"
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-"Napakahaba niyan. Ang pinakamataas na sukat ng pabatid ay %d mga panitik."
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr "Mga pabatid"
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr "Facebook"
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr "Mga pagtatakda sa integrasyon ng Facebook"
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr ""
-"Hindi tanggap na susi sa API ng Facebook. Ang pinakamataas na haba ay 255 "
-"mga panitik."
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-"Hindi tanggap na lihim sa API ng Facebook. Ang pinakamataas na haba ay 255 "
-"mga panitik."
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr "Mga pagtatakda sa aplikasyon ng Facebook"
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr "Susi ng API"
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr "Ang susi ng API ay ibinigay ng Facebook"
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr "Lihim"
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr "Ang lihim ng API ay ibinigay ng Facebook"
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Sagipin"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Sagipin ang mga katakdaan ng Facebook"
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr "Pamahalaan kung paano umuugnay ang iyong akawnt sa Facebook"
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr "Walang tagagamit ng Facebook na nakaugnay sa akawnt na ito."
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr "Nakaugnay na tagagamit ng Facebook"
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr "Huwag iugnay ang aking akawnt mula sa Facebook"
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-"Ang pagtatanggal ng ugnay sa Facebook ay magsasanhi ng hindi mangyayaring "
-"paglagda! Paki "
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr "magtakda ng isang hudyat"
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr "muna."
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Huwag umugnay"
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr "Hindi maalis ang pagkabit sa Facebook."
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr "Hindi ka na nakaugnay sa Facebook."
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr "Hindi sigurado kung ano ang sinusubok mong gawin."
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr "May isang suliranin sa pagsagip ng iyong mga nais sa pagsabay!"
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr "Nasagip ang mga nais sa pagsabay."
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-"Kusang isapanahon ang aking katayuan ng Facebook na may mga pabatid ko."
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr "Ipadala ang mga tugong \"@\" sa Facebook."
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Sagipin"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-"Kung nais mong kusang isapanahon ng %s ang iyong katayuan ng Facebook na may "
-"pinakabagong mga pabatid mo, kailangan mo itong bigyan ng pahintulot."
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Pahintulutan si %s na isapanahon ang aking katayuan ng Facebook"
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr "Mga nais sa pagsabay"
diff --git a/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po
deleted file mode 100644
index 2bbe18f092..0000000000
--- a/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,573 +0,0 @@
-# Translation of StatusNet - Facebook 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 - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:44+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:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: uk\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\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"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-"Вітаємо, %1$s. Нам дуже прикро про це повідомляти, але ми не в змозі "
-"оновлювати ваш статус у Facebook з %2$s і відключаємо додаток Facebook для "
-"вашого акаунту. Таке могло статися тому, що ви, можливо, скасували "
-"авторизацію для додатку Facebook або видалили ваш акаунт Facebook. Ви маєте "
-"можливість перезапустити додаток для Facebook і автоматичний імпорт ваших "
-"статусів з %2$s до Facebook буде поновлено.\n"
-"\n"
-"З повагою,\n"
-"\n"
-"%2$s"
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr "Ви повинні увійти до Facebook або використати Facebook Connect."
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr ""
-"На даному сайті вже є користувач, котрий підключив цей акаунт Facebook."
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Виникли певні проблеми з токеном сесії. Спробуйте знов, будь ласка."
-
-#: FBConnectAuth.php:96
-msgid "You can't register if you don't agree to the license."
-msgstr "Ви не зможете зареєструватись, якщо не погодитесь з умовами ліцензії."
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "Виникла якась незрозуміла помилка."
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-"Ви вперше увійшли до сайту %s, отже ми мусимо приєднати ваш акаунт Facebook "
-"до акаунту на даному сайті. Ви маєте можливість створити новий акаунт або "
-"використати такий, що вже існує."
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr "Налаштування акаунту Facebook"
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "Опції з’єднання"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, 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, телефонний номер."
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Створити новий акаунт"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Створити нового користувача з цим нікнеймом."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Новий нікнейм"
-
-#: FBConnectAuth.php:197
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-"1-64 літери нижнього регістру і цифри, ніякої пунктуації або інтервалів"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Створити"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr "Приєднати акаунт, який вже існує"
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-"Якщо ви вже маєте акаунт, увійдіть з вашим ім’ям користувача та паролем, аби "
-"приєднати їх до Facebook."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr "Нікнейм, який вже існує"
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Пароль"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-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'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "Реєстрацію не дозволено."
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "Це не дійсний код запрошення."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "Нікнейм не допускається."
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "Цей нікнейм вже використовується. Спробуйте інший."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr "Помилка при підключенні до Facebook."
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "Невірне ім’я або пароль."
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Увійти"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "Надіслати допис"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "Що нового, %s?"
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Лишилось знаків"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Так"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr "Помилка сервера: не вдалося отримати користувача!"
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "Неточне ім’я або пароль."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s з друзями, сторінка %2$d"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s з друзями"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-"Якщо ви бажаєте, щоб додаток %s автоматично оновлював ваш статус у Facebook "
-"останнім повідомленням, ви повинні надати дозвіл."
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr "Так, зробіть це!"
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Проскочити"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "Нумерація сторінок"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Вперед"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Назад"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "Дякуємо, що запросили своїх друзів на %s."
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Запрошення було надіслано таким користувачам:"
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Вас було запрошено до %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Запросіть своїх друзів до %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Деякі друзі вже користуються %s:"
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Розсилка запрошень"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr "Налаштування інтеграції з Facebook"
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr "Facebook Connect"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr "Увійти або зареєструватись з Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr "Налаштування Facebook Connect"
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-"Додаток Facebook дозволяє інтегрувати StatusNet-сумісні сервіси з <a href="
-"\"http://facebook.com/\">Facebook</a> та Facebook Connect."
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr "Тепер ви увійшли."
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr "Увійти з акаунтом Facebook"
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr "Вхід Facebook"
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr "Не вдалося видалити користувача Facebook: вже видалений."
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr "Не вдалося видалити користувача Facebook."
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "Дім"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "Дім"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Запросити"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "Запросити"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Налаштування"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Налаштування"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-"Щоб використовувати додаток %s для Facebook, ви мусите увійти, "
-"використовуючи своє ім’я користувача та пароль. Ще не маєте імені "
-"користувача?"
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr " новий акаунт."
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "Зареєструвати"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr "Нікнейм"
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Увійти"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr "Загубили або забули пароль?"
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr "Повідомлення порожнє!"
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Надто довго. Максимальний розмір допису — %d знаків."
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr "Дописи"
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr "Facebook"
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr "Налаштування інтеграції з Facebook"
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr ""
-"Помилковий ключ Facebook API. Максимальна довжина ключа — 255 символів."
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-"Помилковий секретний код Facebook API. Максимальна довжина — 255 символів."
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr "Налаштування додатку для Facebook"
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr "API-ключ"
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr "API-ключ, що був наданий Facebook"
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr "Секретний код"
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr "Секретний код API, що був наданий Facebook"
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Зберегти"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Зберегти налаштування Facebook"
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr "Зазначте, яким чином ваш акаунт буде під’єднано до Facebook"
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr "Наразі жоден користувач Facebook не під’єднаний до цього акаунту."
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr "Під’єднаний користувач Facebook"
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr "Від’єднати мій акаунт від Facebook"
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-"Якщо ви від’єднаєте свій Facebook, то це унеможливить вхід до системи у "
-"майбутньому! Будь ласка, "
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr "встановіть пароль"
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr " спочатку."
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Від’єднати"
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr "Не можу видалити посилання на Facebook."
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr "Ви від’єдналися від Facebook."
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr "Хто зна, що ви намагаєтеся зробити."
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr "Виникла проблема при збереженні параметрів синхронізації!"
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr "Параметри синхронізації збережено."
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr "Автоматично оновлювати статус у Facebook моїми дописами."
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr "Надсилати «@» відповіді до Facebook."
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Зберегти"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-"Якщо ви бажаєте, щоб додаток %s автоматично оновлював ваш статус у Facebook "
-"останнім повідомленням, ви повинні надати дозвіл."
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Дозволити додатку %s оновлювати мій статус у Facebook"
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr "Параметри синхронізації"
diff --git a/plugins/Facebook/locale/vi/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/vi/LC_MESSAGES/Facebook.po
deleted file mode 100644
index 15c861e90e..0000000000
--- a/plugins/Facebook/locale/vi/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,540 +0,0 @@
-# Translation of StatusNet - Facebook to Vietnamese (Tiếng Việt)
-# Expored from translatewiki.net
-#
-# Author: Minh Nguyen
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:07+0000\n"
-"Language-Team: Vietnamese <http://translatewiki.net/wiki/Portal:vi>\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: vi\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr ""
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr ""
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: FBConnectAuth.php:96
-msgid "You can't register if you don't agree to the license."
-msgstr ""
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr ""
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr "Thiết lập Tài khoản Facebook"
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr ""
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr ""
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr ""
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr ""
-
-#: FBConnectAuth.php:197
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Tạo"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr ""
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr ""
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Mật khẩu"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-msgctxt "BUTTON"
-msgid "Connect"
-msgstr "Kết nối"
-
-#. TRANS: Client error trying to register with registrations not allowed.
-#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
-msgid "Registration not allowed."
-msgstr ""
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
-msgid "Not a valid invitation code."
-msgstr ""
-
-#: FBConnectAuth.php:267
-msgid "Nickname not allowed."
-msgstr ""
-
-#: FBConnectAuth.php:272
-msgid "Nickname already in use. Try another one."
-msgstr ""
-
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
-msgid "Error connecting user to Facebook."
-msgstr ""
-
-#: FBConnectAuth.php:310
-msgid "Invalid username or password."
-msgstr ""
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Đăng nhập"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr ""
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr ""
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr ""
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Gửi"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr ""
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr ""
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr ""
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s và bạn bè"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr ""
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Bỏ qua"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr ""
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Sau"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Trước"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr ""
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr ""
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr ""
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr ""
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr ""
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr ""
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr ""
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr "Người dùng Kết nối Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr ""
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr "Thiết lập Kết nối Facebook"
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr ""
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr ""
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr "Đăng nhập vào Facebook"
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr ""
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr ""
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "Trang chủ"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "Trang chủ"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr ""
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr ""
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Thiết lập"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Thiết lập"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr ""
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "Đăng ký"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr ""
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Đăng nhập"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr ""
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr ""
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr ""
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr "Facebook"
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr ""
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr "Thiết lập ứng dụng Facebook"
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr ""
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr ""
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Lưu"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Lưu các thiết lập Facebook"
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr ""
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr ""
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr "Người dùng Facebook kết nối"
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr ""
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr ""
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr ""
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Ngắt kết nối"
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr ""
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr ""
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr ""
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Lưu"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr ""
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr ""
diff --git a/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po
deleted file mode 100644
index 7bb44631be..0000000000
--- a/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,556 +0,0 @@
-# Translation of StatusNet - Facebook to Simplified Chinese (‪中文(简体)‬)
-# Exported from translatewiki.net
-#
-# Author: Chenxiaoqino
-# Author: Hydra
-# Author: ZhengYiFeng
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:44+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-22 19:30:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: zh-hans\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-"你好，%1$s。我们很抱歉的通知你我们无法从%2$s更新你的Facebook状态，并已禁用你"
-"帐户的Facebook应用。这可能是因为你取消了Facebook应用的授权，或者你删除了你的"
-"Facebook帐户。通过重新安装Facebook应用你可以重新启用你的Facebook应用的自动状"
-"态更新。\n"
-"\n"
-"祝好，\n"
-"\n"
-"%2$s"
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr "你必须使用Facebook Connect来登入Facebook帐号。"
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr "这里已经有一个用户连接了此Facebook帐号。"
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-msgid "There was a problem with your session token. Try again, please."
-msgstr "你的session token出错了。请重试。"
-
-#: FBConnectAuth.php:96
-msgid "You can't register if you don't agree to the license."
-msgstr "你必须同意许可协议才能注册。"
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "发生未知错误。"
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-" 这是你第一次登录到 %s，我们需要将你的Facebook帐号与一个本地的帐号关联。你可"
-"以新建一个帐号，或者使用你在本站已有的帐号。"
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr "Facebook帐号设置"
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "连接选项"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, 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 地址和电"
-"话号码。"
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "创建新帐户"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "以此昵称创建新帐户"
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "新昵称"
-
-#: FBConnectAuth.php:197
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1 到 64 个小写字母或数字，不包含标点或空格"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "创建"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr "连接现有帐号"
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr "如果你已有帐号，请输入用户名和密码登录并连接至Facebook。"
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr "已存在的昵称"
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "密码"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-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'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "不允许注册。"
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "对不起，无效的邀请码。"
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "昵称不被允许。"
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "昵称已被使用，换一个吧。"
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr "连接用户至Facebook时发生错误。"
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "用户名或密码不正确。"
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "登录"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "发送一个通知"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "%s，最近怎么样？"
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "可用的字符"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "发送"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr "服务器错误：无法获取用户。"
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "用户名或密码不正确。"
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s 和页 %2$d 的朋友"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s 和好友们"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-"如果你希望 %s 应用自动更新你最新的状态到Facebook状态上，你需要给它设置权限。"
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr "好的！"
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "跳过"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "分页"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "之后"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "之前"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "谢谢你邀请你的朋友们来使用 %s。"
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "邀请已发给一些的用户："
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "你被邀请来到 %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "邀请你的朋友们来使用 %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr "已经使用 %s 的好友们："
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "发送邀请"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr "Facebook整合设置"
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr "Facebook Connect 用户"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr "使用 Facebook 登陆或注册"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr "Facebook Connect 设置"
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr "已登录。"
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr "使用你的 Facebook 帐号登录"
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr ""
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr ""
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr ""
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "首页"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "首页"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "邀请"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "邀请"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "设置"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "设置"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr ""
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr ""
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr ""
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr ""
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr ""
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr ""
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr ""
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr ""
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr ""
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr ""
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr ""
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr ""
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr ""
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr ""
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr ""
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr ""
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr ""
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr ""
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr ""
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr ""
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr ""
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr ""
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr ""
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr ""
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr ""

From 317d22f56505152148fc205731ee43236930217c Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 31 Jan 2011 23:50:22 +0000
Subject: [PATCH 163/314] Remove old Facebook Plugin (use FacebookBridge now)

---
 plugins/Facebook/FBC_XDReceiver.php           |   66 -
 plugins/Facebook/FBConnect.css                |   36 -
 plugins/Facebook/FBConnectAuth.php            |  486 ---
 plugins/Facebook/FBConnectLogin.php           |   74 -
 plugins/Facebook/FBConnectSettings.php        |  203 -
 plugins/Facebook/FacebookPlugin.php           |  599 ---
 plugins/Facebook/README                       |  163 -
 plugins/Facebook/facebook/facebook.php        |  609 ---
 .../Facebook/facebook/facebook_desktop.php    |  104 -
 plugins/Facebook/facebook/facebook_mobile.php |  260 --
 .../facebook/facebookapi_php5_restlib.php     | 3702 -----------------
 .../facebook/jsonwrapper/JSON/JSON.php        |  806 ----
 .../facebook/jsonwrapper/JSON/LICENSE         |   21 -
 .../facebook/jsonwrapper/jsonwrapper.php      |    6 -
 .../jsonwrapper/jsonwrapper_inner.php         |   23 -
 plugins/Facebook/facebookaction.php           |  531 ---
 plugins/Facebook/facebookadminpanel.php       |  212 -
 plugins/Facebook/facebookapp.css              |  115 -
 plugins/Facebook/facebookapp.js               |   33 -
 plugins/Facebook/facebookhome.php             |  246 --
 plugins/Facebook/facebookinvite.php           |  145 -
 plugins/Facebook/facebooklogin.php            |   97 -
 plugins/Facebook/facebooknoticeform.php       |  198 -
 plugins/Facebook/facebookqueuehandler.php     |   51 -
 plugins/Facebook/facebookremove.php           |   73 -
 plugins/Facebook/facebooksettings.php         |  136 -
 plugins/Facebook/facebookutil.php             |  409 --
 plugins/Facebook/fbfavicon.ico                |  Bin 1150 -> 0 bytes
 plugins/Facebook/locale/Facebook.pot          |  535 ---
 .../locale/be-tarask/LC_MESSAGES/Facebook.po  |  562 ---
 .../locale/br/LC_MESSAGES/Facebook.po         |  544 ---
 .../locale/ca/LC_MESSAGES/Facebook.po         |  575 ---
 .../locale/de/LC_MESSAGES/Facebook.po         |  578 ---
 .../locale/es/LC_MESSAGES/Facebook.po         |  563 ---
 .../locale/fr/LC_MESSAGES/Facebook.po         |  581 ---
 .../locale/gl/LC_MESSAGES/Facebook.po         |  545 ---
 .../locale/ia/LC_MESSAGES/Facebook.po         |  572 ---
 .../locale/mk/LC_MESSAGES/Facebook.po         |  568 ---
 .../locale/nb/LC_MESSAGES/Facebook.po         |  540 ---
 .../locale/nl/LC_MESSAGES/Facebook.po         |  578 ---
 .../locale/pt_BR/LC_MESSAGES/Facebook.po      |  544 ---
 .../locale/tl/LC_MESSAGES/Facebook.po         |  583 ---
 .../locale/uk/LC_MESSAGES/Facebook.po         |  573 ---
 .../locale/vi/LC_MESSAGES/Facebook.po         |  540 ---
 .../locale/zh_CN/LC_MESSAGES/Facebook.po      |  556 ---
 45 files changed, 18941 deletions(-)
 delete mode 100644 plugins/Facebook/FBC_XDReceiver.php
 delete mode 100644 plugins/Facebook/FBConnect.css
 delete mode 100644 plugins/Facebook/FBConnectAuth.php
 delete mode 100644 plugins/Facebook/FBConnectLogin.php
 delete mode 100644 plugins/Facebook/FBConnectSettings.php
 delete mode 100644 plugins/Facebook/FacebookPlugin.php
 delete mode 100644 plugins/Facebook/README
 delete mode 100644 plugins/Facebook/facebook/facebook.php
 delete mode 100644 plugins/Facebook/facebook/facebook_desktop.php
 delete mode 100644 plugins/Facebook/facebook/facebook_mobile.php
 delete mode 100755 plugins/Facebook/facebook/facebookapi_php5_restlib.php
 delete mode 100644 plugins/Facebook/facebook/jsonwrapper/JSON/JSON.php
 delete mode 100644 plugins/Facebook/facebook/jsonwrapper/JSON/LICENSE
 delete mode 100644 plugins/Facebook/facebook/jsonwrapper/jsonwrapper.php
 delete mode 100644 plugins/Facebook/facebook/jsonwrapper/jsonwrapper_inner.php
 delete mode 100644 plugins/Facebook/facebookaction.php
 delete mode 100644 plugins/Facebook/facebookadminpanel.php
 delete mode 100644 plugins/Facebook/facebookapp.css
 delete mode 100644 plugins/Facebook/facebookapp.js
 delete mode 100644 plugins/Facebook/facebookhome.php
 delete mode 100644 plugins/Facebook/facebookinvite.php
 delete mode 100644 plugins/Facebook/facebooklogin.php
 delete mode 100644 plugins/Facebook/facebooknoticeform.php
 delete mode 100644 plugins/Facebook/facebookqueuehandler.php
 delete mode 100644 plugins/Facebook/facebookremove.php
 delete mode 100644 plugins/Facebook/facebooksettings.php
 delete mode 100644 plugins/Facebook/facebookutil.php
 delete mode 100644 plugins/Facebook/fbfavicon.ico
 delete mode 100644 plugins/Facebook/locale/Facebook.pot
 delete mode 100644 plugins/Facebook/locale/be-tarask/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/ca/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/vi/LC_MESSAGES/Facebook.po
 delete mode 100644 plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po

diff --git a/plugins/Facebook/FBC_XDReceiver.php b/plugins/Facebook/FBC_XDReceiver.php
deleted file mode 100644
index bf4b59bba1..0000000000
--- a/plugins/Facebook/FBC_XDReceiver.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * @todo Add header and documentation
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-/*
- * Generates the cross domain communication channel file
- * (xd_receiver.html). By generating it we can add some caching
- * instructions.
- *
- * See: http://wiki.developers.facebook.com/index.php/Cross_Domain_Communication_Channel
- */
-class FBC_XDReceiverAction extends Action
-{
-    /**
-     * Do we need to write to the database?
-     *
-     * @return boolean true
-     */
-    function isReadonly()
-    {
-        return true;
-    }
-
-    /**
-     * Handle a request
-     *
-     * @param array $args Arguments from $_REQUEST
-     *
-     * @return void
-     */
-    function handle($args)
-    {
-        // Parent handling, including cache check
-        parent::handle($args);
-        $this->showPage();
-    }
-
-    function showPage()
-    {
-        // cache the xd_receiver
-        header('Cache-Control: max-age=225065900');
-        header('Expires:');
-        header('Pragma:');
-
-        $this->startXML('html');
-
-        $language = $this->getLanguage();
-
-        $this->elementStart('html', array('xmlns' => 'http://www.w3.org/1999/xhtml',
-                                          'xml:lang' => $language,
-                                          'lang' => $language));
-        $this->elementStart('head');
-        $this->element('title', null, 'cross domain receiver page');
-        $this->script('http://static.ak.connect.facebook.com/js/api_lib/v0.4/XdCommReceiver.debug.js');
-        $this->elementEnd('head');
-        $this->elementStart('body');
-        $this->elementEnd('body');
-
-        $this->elementEnd('html');
-    }
-}
diff --git a/plugins/Facebook/FBConnect.css b/plugins/Facebook/FBConnect.css
deleted file mode 100644
index 49217bf13f..0000000000
--- a/plugins/Facebook/FBConnect.css
+++ /dev/null
@@ -1,36 +0,0 @@
-/** Styles for Facebook logo and Facebook user profile avatar.
- *
- * @package   StatusNet
- * @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/
- */
-
-#site_nav_global_primary #nav_fb {
-position:relative;
-margin-left:18px;
-}
-
-#nav_fb #fbc_profile-pic {
-position:absolute;
-top:-3px;
-left:-18px;
-display:inline;
-border:1px solid #3B5998;
-padding:1px;
-}
-
-#nav_fb #fb_favicon {
-position:absolute;
-top:-13px;
-left:-25px;
-display:inline;
-}
-
-#settings_facebook_connect_options legend {
-display:none;
-}
-#form_settings_facebook_connect fieldset fieldset legend {
-display:block;
-}
diff --git a/plugins/Facebook/FBConnectAuth.php b/plugins/Facebook/FBConnectAuth.php
deleted file mode 100644
index 937db56e56..0000000000
--- a/plugins/Facebook/FBConnectAuth.php
+++ /dev/null
@@ -1,486 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Plugin to enable Facebook Connect
- *
- * PHP version 5
- *
- * LICENCE: This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @category  Plugin
- * @package   StatusNet
- * @author    Zach Copley <zach@status.net>
- * @copyright 2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-require_once INSTALLDIR . '/plugins/Facebook/FacebookPlugin.php';
-
-class FBConnectauthAction extends Action
-{
-    var $fbuid      = null;
-    var $fb_fields  = null;
-
-    function prepare($args) {
-        parent::prepare($args);
-
-        $this->fbuid = getFacebook()->get_loggedin_user();
-
-        if ($this->fbuid > 0) {
-            $this->fb_fields = $this->getFacebookFields($this->fbuid,
-                                                        array('first_name', 'last_name', 'name'));
-        } else {
-            list($proxy, $ip) = common_client_ip();
-
-            common_log(LOG_WARNING, 'Facebook Connect Plugin - ' .
-                       "Failed auth attempt, proxy = $proxy, ip = $ip.");
-
-            $this->clientError(_m('You must be logged into Facebook to ' .
-                                  'use Facebook Connect.'));
-        }
-
-        return true;
-    }
-
-    function handle($args)
-    {
-        parent::handle($args);
-
-        if (common_is_real_login()) {
-            // User is already logged in.  Does she already have a linked Facebook acct?
-            $flink = Foreign_link::getByForeignID($this->fbuid, FACEBOOK_CONNECT_SERVICE);
-
-            if (!empty($flink)) {
-                // User already has a linked Facebook account and shouldn't be here
-                common_debug('Facebook Connect Plugin - ' .
-                             'There is already a local user (' . $flink->user_id .
-                             ') linked with this Facebook (' . $this->fbuid . ').');
-
-                // We don't want these cookies
-                getFacebook()->clear_cookie_state();
-
-                $this->clientError(_m('There is already a local user linked with this Facebook account.'));
-            } else {
-
-                // User came from the Facebook connect settings tab, and
-                // probably just wants to link/relink their Facebook account
-                $this->connectUser();
-            }
-
-        } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-
-            $token = $this->trimmed('token');
-            if (!$token || $token != common_session_token()) {
-                $this->showForm(_m('There was a problem with your session token. Try again, please.'));
-                return;
-            }
-            if ($this->arg('create')) {
-                if (!$this->boolean('license')) {
-                    $this->showForm(_m('You can\'t register if you don\'t agree to the license.'),
-                                    $this->trimmed('newname'));
-                    return;
-                }
-                $this->createNewUser();
-            } else if ($this->arg('connect')) {
-                $this->connectNewUser();
-            } else {
-                common_debug('Facebook Connect Plugin - ' .
-                             print_r($this->args, true));
-                $this->showForm(_m('An unknown error has occured.'),
-                                $this->trimmed('newname'));
-            }
-        } else {
-            $this->tryLogin();
-        }
-    }
-
-    function showPageNotice()
-    {
-        if ($this->error) {
-            $this->element('div', array('class' => 'error'), $this->error);
-        } else {
-            $this->element('div', 'instructions',
-                           // TRANS: %s is the site name.
-                           sprintf(_m('This is the first time you\'ve logged into %s so we must connect your Facebook to a local account. You can either create a new account, or connect with your existing account, if you have one.'), common_config('site', 'name')));
-        }
-    }
-
-    function title()
-    {
-        // TRANS: Page title.
-        return _m('Facebook Account Setup');
-    }
-
-    function showForm($error=null, $username=null)
-    {
-        $this->error = $error;
-        $this->username = $username;
-
-        $this->showPage();
-    }
-
-    function showPage()
-    {
-        parent::showPage();
-    }
-
-    /**
-     * @fixme much of this duplicates core code, which is very fragile.
-     * Should probably be replaced with an extensible mini version of
-     * the core registration form.
-     */
-    function showContent()
-    {
-        if (!empty($this->message_text)) {
-            $this->element('p', null, $this->message);
-            return;
-        }
-
-        $this->elementStart('form', array('method' => 'post',
-                                          'id' => 'form_settings_facebook_connect',
-                                          'class' => 'form_settings',
-                                          'action' => common_local_url('FBConnectAuth')));
-        $this->elementStart('fieldset', array('id' => 'settings_facebook_connect_options'));
-        // TRANS: Legend.
-        $this->element('legend', null, _m('Connection options'));
-        $this->elementStart('ul', 'form_data');
-        $this->elementStart('li');
-        $this->element('input', array('type' => 'checkbox',
-                                      'id' => 'license',
-                                      'class' => 'checkbox',
-                                      'name' => 'license',
-                                      'value' => 'true'));
-        $this->elementStart('label', array('class' => 'checkbox', 'for' => 'license'));
-        // TRANS: %s is the name of the license used by the user for their status updates.
-        $message = _m('My text and files are available under %s ' .
-                     'except this private data: password, ' .
-                     'email address, IM address, and phone number.');
-        $link = '<a href="' .
-                htmlspecialchars(common_config('license', 'url')) .
-                '">' .
-                htmlspecialchars(common_config('license', 'title')) .
-                '</a>';
-        $this->raw(sprintf(htmlspecialchars($message), $link));
-        $this->elementEnd('label');
-        $this->elementEnd('li');
-        $this->elementEnd('ul');
-
-        $this->elementStart('fieldset');
-        $this->hidden('token', common_session_token());
-        $this->element('legend', null,
-                       // TRANS: Legend.
-                       _m('Create new account'));
-        $this->element('p', null,
-                       _m('Create a new user with this nickname.'));
-        $this->elementStart('ul', 'form_data');
-        $this->elementStart('li');
-        // TRANS: Field label.
-        $this->input('newname', _m('New nickname'),
-                     ($this->username) ? $this->username : '',
-                     _m('1-64 lowercase letters or numbers, no punctuation or spaces'));
-        $this->elementEnd('li');
-        $this->elementEnd('ul');
-        // TRANS: Submit button.
-        $this->submit('create', _m('BUTTON','Create'));
-        $this->elementEnd('fieldset');
-
-        $this->elementStart('fieldset');
-        // TRANS: Legend.
-        $this->element('legend', null,
-                       _m('Connect existing account'));
-        $this->element('p', null,
-                       _m('If you already have an account, login with your username and password to connect it to your Facebook.'));
-        $this->elementStart('ul', 'form_data');
-        $this->elementStart('li');
-        // TRANS: Field label.
-        $this->input('nickname', _m('Existing nickname'));
-        $this->elementEnd('li');
-        $this->elementStart('li');
-        $this->password('password', _m('Password'));
-        $this->elementEnd('li');
-        $this->elementEnd('ul');
-        // TRANS: Submit button.
-        $this->submit('connect', _m('BUTTON','Connect'));
-        $this->elementEnd('fieldset');
-
-        $this->elementEnd('fieldset');
-        $this->elementEnd('form');
-    }
-
-    function message($msg)
-    {
-        $this->message_text = $msg;
-        $this->showPage();
-    }
-
-    function createNewUser()
-    {
-        if (!Event::handle('StartRegistrationTry', array($this))) {
-            return;
-        }
-
-        if (common_config('site', 'closed')) {
-            // TRANS: Client error trying to register with registrations not allowed.
-            $this->clientError(_m('Registration not allowed.'));
-            return;
-        }
-
-        $invite = null;
-
-        if (common_config('site', 'inviteonly')) {
-            $code = $_SESSION['invitecode'];
-            if (empty($code)) {
-                // TRANS: Client error trying to register with registrations 'invite only'.
-                $this->clientError(_m('Registration not allowed.'));
-                return;
-            }
-
-            $invite = Invitation::staticGet($code);
-
-            if (empty($invite)) {
-                // TRANS: Client error trying to register with an invalid invitation code.
-                $this->clientError(_m('Not a valid invitation code.'));
-                return;
-            }
-        }
-
-        try {
-            $nickname = Nickname::normalize($this->trimmed('newname'));
-        } catch (NicknameException $e) {
-            $this->showForm($e->getMessage());
-        }
-
-        if (!User::allowed_nickname($nickname)) {
-            $this->showForm(_m('Nickname not allowed.'));
-            return;
-        }
-
-        if (User::staticGet('nickname', $nickname)) {
-            $this->showForm(_m('Nickname already in use. Try another one.'));
-            return;
-        }
-
-        $fullname = trim($this->fb_fields['firstname'] .
-            ' ' . $this->fb_fields['lastname']);
-
-        $args = array('nickname' => $nickname, 'fullname' => $fullname);
-
-        if (!empty($invite)) {
-            $args['code'] = $invite->code;
-        }
-
-        $user = User::register($args);
-
-        $result = $this->flinkUser($user->id, $this->fbuid);
-
-        if (!$result) {
-            $this->serverError(_m('Error connecting user to Facebook.'));
-            return;
-        }
-
-        common_set_user($user);
-        common_real_login(true);
-
-        common_debug('Facebook Connect Plugin - ' .
-                     "Registered new user $user->id from Facebook user $this->fbuid");
-
-        Event::handle('EndRegistrationTry', array($this));
-
-        common_redirect(common_local_url('showstream', array('nickname' => $user->nickname)),
-                        303);
-    }
-
-    function connectNewUser()
-    {
-        $nickname = $this->trimmed('nickname');
-        $password = $this->trimmed('password');
-
-        if (!common_check_user($nickname, $password)) {
-            $this->showForm(_m('Invalid username or password.'));
-            return;
-        }
-
-        $user = User::staticGet('nickname', $nickname);
-
-        if (!empty($user)) {
-            common_debug('Facebook Connect Plugin - ' .
-                         "Legit user to connect to Facebook: $nickname");
-        }
-
-        $result = $this->flinkUser($user->id, $this->fbuid);
-
-        if (!$result) {
-            $this->serverError(_m('Error connecting user to Facebook.'));
-            return;
-        }
-
-        common_debug('Facebook Connnect Plugin - ' .
-                     "Connected Facebook user $this->fbuid to local user $user->id");
-
-        common_set_user($user);
-        common_real_login(true);
-
-        $this->goHome($user->nickname);
-    }
-
-    function connectUser()
-    {
-        $user = common_current_user();
-
-        $result = $this->flinkUser($user->id, $this->fbuid);
-
-        if (empty($result)) {
-            $this->serverError(_m('Error connecting user to Facebook.'));
-            return;
-        }
-
-        common_debug('Facebook Connect Plugin - ' .
-                     "Connected Facebook user $this->fbuid to local user $user->id");
-
-        // Return to Facebook connection settings tab
-        common_redirect(common_local_url('FBConnectSettings'), 303);
-    }
-
-    function tryLogin()
-    {
-        common_debug('Facebook Connect Plugin - ' .
-                     "Trying login for Facebook user $this->fbuid.");
-
-        $flink = Foreign_link::getByForeignID($this->fbuid, FACEBOOK_CONNECT_SERVICE);
-
-        if (!empty($flink)) {
-            $user = $flink->getUser();
-
-            if (!empty($user)) {
-
-                common_debug('Facebook Connect Plugin - ' .
-                             "Logged in Facebook user $flink->foreign_id as user $user->id ($user->nickname)");
-
-                common_set_user($user);
-                common_real_login(true);
-                $this->goHome($user->nickname);
-            }
-
-        } else {
-
-            common_debug('Facebook Connect Plugin - ' .
-                         "No flink found for fbuid: $this->fbuid - new user");
-
-            $this->showForm(null, $this->bestNewNickname());
-        }
-    }
-
-    function goHome($nickname)
-    {
-        $url = common_get_returnto();
-        if ($url) {
-            // We don't have to return to it again
-            common_set_returnto(null);
-        } else {
-            $url = common_local_url('all',
-                                    array('nickname' =>
-                                          $nickname));
-        }
-
-        common_redirect($url, 303);
-    }
-
-    function flinkUser($user_id, $fbuid)
-    {
-        $flink = new Foreign_link();
-        $flink->user_id = $user_id;
-        $flink->foreign_id = $fbuid;
-        $flink->service = FACEBOOK_CONNECT_SERVICE;
-        $flink->created = common_sql_now();
-
-        $flink_id = $flink->insert();
-
-        return $flink_id;
-    }
-
-    function bestNewNickname()
-    {
-        if (!empty($this->fb_fields['name'])) {
-            $nickname = $this->nicknamize($this->fb_fields['name']);
-            if ($this->isNewNickname($nickname)) {
-                return $nickname;
-            }
-        }
-
-        // Try the full name
-
-        $fullname = trim($this->fb_fields['firstname'] .
-            ' ' . $this->fb_fields['lastname']);
-
-        if (!empty($fullname)) {
-            $fullname = $this->nicknamize($fullname);
-            if ($this->isNewNickname($fullname)) {
-                return $fullname;
-            }
-        }
-
-        return null;
-    }
-
-     /**
-      * Given a string, try to make it work as a nickname
-      */
-     function nicknamize($str)
-     {
-         $str = preg_replace('/\W/', '', $str);
-         return strtolower($str);
-     }
-
-    function isNewNickname($str)
-    {
-        if (!Nickname::isValid($str)) {
-            return false;
-        }
-        if (!User::allowed_nickname($str)) {
-            return false;
-        }
-        if (User::staticGet('nickname', $str)) {
-            return false;
-        }
-        return true;
-    }
-
-    // XXX: Consider moving this to lib/facebookutil.php
-    function getFacebookFields($fb_uid, $fields) {
-        try {
-
-            $facebook = getFacebook();
-
-            $infos = $facebook->api_client->users_getInfo($fb_uid, $fields);
-
-            if (empty($infos)) {
-                return null;
-            }
-            return reset($infos);
-
-        } catch (Exception $e) {
-            common_log(LOG_WARNING, 'Facebook Connect Plugin - ' .
-                       "Facebook client failure when requesting " .
-                join(",", $fields) . " on uid " . $fb_uid .
-                    " : ". $e->getMessage());
-            return null;
-        }
-    }
-}
diff --git a/plugins/Facebook/FBConnectLogin.php b/plugins/Facebook/FBConnectLogin.php
deleted file mode 100644
index 8345532dbd..0000000000
--- a/plugins/Facebook/FBConnectLogin.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/*
- * StatusNet - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR . '/plugins/Facebook/FacebookPlugin.php';
-
-class FBConnectLoginAction extends Action
-{
-    function handle($args)
-    {
-        parent::handle($args);
-
-        if (common_is_real_login()) {
-            $this->clientError(_m('Already logged in.'));
-        }
-
-        $this->showPage();
-    }
-
-    function getInstructions()
-    {
-        // TRANS: Instructions.
-        return _m('Login with your Facebook Account');
-    }
-
-    function showPageNotice()
-    {
-        $instr = $this->getInstructions();
-        $output = common_markup_to_html($instr);
-        $this->elementStart('div', 'instructions');
-        $this->raw($output);
-        $this->elementEnd('div');
-    }
-
-    function title()
-    {
-        // TRANS: Page title.
-        return _m('Facebook Login');
-    }
-
-    function showContent() {
-
-        $this->elementStart('fieldset');
-        $this->element('fb:login-button', array('onlogin' => 'goto_login()',
-            'length' => 'long'));
-
-        $this->elementEnd('fieldset');
-    }
-
-    function showLocalNav()
-    {
-        $nav = new LoginGroupNav($this);
-        $nav->show();
-    }
-}
diff --git a/plugins/Facebook/FBConnectSettings.php b/plugins/Facebook/FBConnectSettings.php
deleted file mode 100644
index 701994d0d0..0000000000
--- a/plugins/Facebook/FBConnectSettings.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Facebook Connect settings
- *
- * 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    Zach Copley <zach@status.net>
- * @copyright 2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR.'/lib/connectsettingsaction.php';
-
-/**
- * Facebook Connect settings action
- *
- * @category Settings
- * @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 FBConnectSettingsAction extends ConnectSettingsAction
-{
-    /**
-     * Title of the page
-     *
-     * @return string Title of the page
-     */
-    function title()
-    {
-        // TRANS: Page title.
-        return _m('Facebook Connect Settings');
-    }
-
-    /**
-     * Instructions for use
-     *
-     * @return instructions for use
-     */
-    function getInstructions()
-    {
-    	// TRANS: Instructions.
-        return _m('Manage how your account connects to Facebook');
-    }
-
-    /**
-     * Content area of the page
-     *
-     * Shows a form for uploading an avatar.
-     *
-     * @return void
-     */
-    function showContent()
-    {
-        $user = common_current_user();
-        $flink = Foreign_link::getByUserID($user->id, FACEBOOK_CONNECT_SERVICE);
-
-        $this->elementStart('form', array('method' => 'post',
-                                          'id' => 'form_settings_facebook',
-                                          'class' => 'form_settings',
-                                          'action' =>
-                                          common_local_url('FBConnectSettings')));
-
-        if (!$flink) {
-
-            $this->element('p', 'instructions',
-                _m('There is no Facebook user connected to this account.'));
-
-            $this->element('fb:login-button', array('onlogin' => 'goto_login()',
-                'length' => 'long'));
-
-        } else {
-
-            $this->element('p', 'form_note',
-                           _m('Connected Facebook user'));
-
-            $this->elementStart('p', array('class' => 'facebook-user-display'));
-            $this->elementStart('fb:profile-pic',
-                array('uid' => $flink->foreign_id,
-                      'size' => 'small',
-                      'linked' => 'true',
-                      'facebook-logo' => 'true'));
-            $this->elementEnd('fb:profile-pic');
-
-            $this->elementStart('fb:name', array('uid' => $flink->foreign_id,
-                                                 'useyou' => 'false'));
-            $this->elementEnd('fb:name');
-            $this->elementEnd('p');
-
-            $this->hidden('token', common_session_token());
-
-            $this->elementStart('fieldset');
-
-            // TRANS: Legend.
-            $this->element('legend', null, _m('Disconnect my account from Facebook'));
-
-            if (!$user->password) {
-
-                $this->elementStart('p', array('class' => 'form_guide'));
-                // @todo FIXME: Bad i18n. Patchwork message in three parts.
-                // TRANS: Followed by a link containing text "set a password".
-                $this->text(_m('Disconnecting your Faceboook ' .
-                               'would make it impossible to log in! Please '));
-                $this->element('a',
-                    array('href' => common_local_url('passwordsettings')),
-                        // TRANS: Preceded by "Please " and followed by " first."
-                        _m('set a password'));
-                // TRANS: Preceded by "Please set a password".
-                $this->text(_m(' first.'));
-                $this->elementEnd('p');
-            } else {
-
-                $note = 'Keep your %s account but disconnect from Facebook. ' .
-                    'You\'ll use your %s password to log in.';
-
-                $site = common_config('site', 'name');
-
-                $this->element('p', 'instructions',
-                    sprintf($note, $site, $site));
-
-                // TRANS: Submit button.
-                $this->submit('disconnect', _m('BUTTON','Disconnect'));
-            }
-
-            $this->elementEnd('fieldset');
-        }
-
-        $this->elementEnd('form');
-    }
-
-    /**
-     * Handle post
-     *
-     * Disconnects the current Facebook user from the current user's account
-     *
-     * @return void
-     */
-    function handlePost()
-    {
-        // CSRF protection
-        $token = $this->trimmed('token');
-        if (!$token || $token != common_session_token()) {
-            $this->showForm(_m('There was a problem with your session token. '.
-                               'Try again, please.'));
-            return;
-        }
-
-        if ($this->arg('disconnect')) {
-
-            $user = common_current_user();
-
-            $flink = Foreign_link::getByUserID($user->id, FACEBOOK_CONNECT_SERVICE);
-            $result = $flink->delete();
-
-            if ($result === false) {
-                common_log_db_error($user, 'DELETE', __FILE__);
-                $this->serverError(_m('Couldn\'t delete link to Facebook.'));
-                return;
-            }
-
-            try {
-
-                // Clear FB Connect cookies out
-                $facebook = getFacebook();
-                $facebook->clear_cookie_state();
-
-            } catch (Exception $e) {
-                common_log(LOG_WARNING, 'Facebook Connect Plugin - ' .
-                           'Couldn\'t clear Facebook cookies: ' .
-                           $e->getMessage());
-            }
-
-            $this->showForm(_m('You have disconnected from Facebook.'), true);
-
-        } else {
-            $this->showForm(_m('Not sure what you\'re trying to do.'));
-            return;
-        }
-    }
-}
diff --git a/plugins/Facebook/FacebookPlugin.php b/plugins/Facebook/FacebookPlugin.php
deleted file mode 100644
index e877d300b6..0000000000
--- a/plugins/Facebook/FacebookPlugin.php
+++ /dev/null
@@ -1,599 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Plugin to add a StatusNet Facebook application
- *
- * PHP version 5
- *
- * LICENCE: This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @category  Plugin
- * @package   StatusNet
- * @author    Zach Copley <zach@status.net>
- * @copyright 2009-2010 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-define("FACEBOOK_CONNECT_SERVICE", 3);
-
-require_once INSTALLDIR . '/plugins/Facebook/facebookutil.php';
-
-/**
- * Facebook plugin to add a StatusNet Facebook canvas application
- * and allow registration and authentication via Facebook Connect
- *
- * @category Plugin
- * @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 FacebookPlugin extends Plugin
-{
-    const VERSION = STATUSNET_VERSION;
-
-    /**
-     * Initializer for the plugin.
-     */
-
-    function initialize()
-    {
-        // Allow the key and secret to be passed in
-        // Control panel will override
-        if (isset($this->apikey)) {
-            $key = common_config('facebook', 'apikey');
-            if (empty($key)) {
-                Config::save('facebook', 'apikey', $this->apikey);
-            }
-        }
-
-        if (isset($this->secret)) {
-            $secret = common_config('facebook', 'secret');
-            if (empty($secret)) {
-                Config::save(
-                    'facebook',
-                    'secret',
-                    $this->secret
-                );
-            }
-        }
-    }
-
-    /**
-     * Check to see if there is an API key and secret defined
-     * for Facebook integration.
-     *
-     * @return boolean result
-     */
-    static function hasKeys()
-    {
-        $apiKey    = common_config('facebook', 'apikey');
-        $apiSecret = common_config('facebook', 'secret');
-
-        if (!empty($apiKey) && !empty($apiSecret)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Add Facebook app actions to the router table
-     *
-     * Hook for RouterInitialized event.
-     *
-     * @param Net_URL_Mapper &$m path-to-action mapper
-     *
-     * @return boolean hook return
-     */
-    function onStartInitializeRouter($m)
-    {
-        $m->connect('admin/facebook', array('action' => 'facebookadminpanel'));
-
-        if (self::hasKeys()) {
-            // Facebook App stuff
-
-            $m->connect('facebook/app', array('action' => 'facebookhome'));
-            $m->connect('facebook/app/index.php', array('action' => 'facebookhome'));
-            $m->connect('facebook/app/settings.php',
-                        array('action' => 'facebooksettings'));
-            $m->connect('facebook/app/invite.php', array('action' => 'facebookinvite'));
-            $m->connect('facebook/app/remove', array('action' => 'facebookremove'));
-
-            // Facebook Connect stuff
-
-            $m->connect('main/facebookconnect', array('action' => 'FBConnectAuth'));
-            $m->connect('main/facebooklogin', array('action' => 'FBConnectLogin'));
-            $m->connect('settings/facebook', array('action' => 'FBConnectSettings'));
-            $m->connect('xd_receiver.html', array('action' => 'FBC_XDReceiver'));
-        }
-
-        return true;
-    }
-
-    /**
-     * Automatically load the actions and libraries used by the Facebook app
-     *
-     * @param Class $cls the class
-     *
-     * @return boolean hook return
-     *
-     */
-    function onAutoload($cls)
-    {
-        switch ($cls) {
-        case 'FacebookAction':
-        case 'FacebookhomeAction':
-        case 'FacebookinviteAction':
-        case 'FacebookremoveAction':
-        case 'FacebooksettingsAction':
-        case 'FacebookadminpanelAction':
-            include_once INSTALLDIR . '/plugins/Facebook/' .
-              strtolower(mb_substr($cls, 0, -6)) . '.php';
-            return false;
-        case 'FBConnectAuthAction':
-        case 'FBConnectLoginAction':
-        case 'FBConnectSettingsAction':
-        case 'FBC_XDReceiverAction':
-            include_once INSTALLDIR . '/plugins/Facebook/' .
-              mb_substr($cls, 0, -6) . '.php';
-            return false;
-        case 'FBCLoginGroupNav':
-            include_once INSTALLDIR . '/plugins/Facebook/FBCLoginGroupNav.php';
-            return false;
-        case 'FBCSettingsNav':
-            include_once INSTALLDIR . '/plugins/Facebook/FBCSettingsNav.php';
-            return false;
-        case 'FacebookQueueHandler':
-            include_once INSTALLDIR . '/plugins/Facebook/facebookqueuehandler.php';
-            return false;
-        default:
-            return true;
-        }
-    }
-
-    /**
-     * Add a Facebook tab to the admin panels
-     *
-     * @param Widget $nav Admin panel nav
-     *
-     * @return boolean hook value
-     */
-    function onEndAdminPanelNav($nav)
-    {
-        if (AdminPanelAction::canAdmin('facebook')) {
-
-            $action_name = $nav->action->trimmed('action');
-
-            $nav->out->menuItem(
-                common_local_url('facebookadminpanel'),
-                // TRANS: Menu item.
-                _m('MENU','Facebook'),
-                // TRANS: Tooltip for menu item "Facebook".
-                _m('Facebook integration configuration'),
-                $action_name == 'facebookadminpanel',
-                'nav_facebook_admin_panel'
-            );
-        }
-
-        return true;
-    }
-
-    /**
-     * Override normal HTML output to force the content type to
-     * text/html and add in xmlns:fb
-     *
-     * @param Action $action the current action
-     *
-     * @return void
-     */
-    function onStartShowHTML($action)
-    {
-        if ($this->reqFbScripts($action)) {
-            // XXX: Horrible hack to make Safari, FF2, and Chrome work with
-            // Facebook Connect. These browser cannot use Facebook's
-            // DOM parsing routines unless the mime type of the page is
-            // text/html even though Facebook Connect uses XHTML.  This is
-            // A bug in Facebook Connect, and this is a temporary solution
-            // until they fix their JavaScript libs.
-
-            header('Content-Type: text/html');
-
-            $action->extraHeaders();
-
-            $action->startXML('html');
-
-            $language = $action->getLanguage();
-
-            $action->elementStart('html',
-                array('xmlns'  => 'http://www.w3.org/1999/xhtml',
-                      'xmlns:fb' => 'http://www.facebook.com/2008/fbml',
-                      'xml:lang' => $language,
-                      'lang'     => $language));
-
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * Add in the Facebook Connect JavaScript stuff
-     *
-     * Note: this script needs to appear in the <body>
-     *
-     * @param Action $action the current action
-     *
-     * @return void
-     *
-     */
-    function onEndShowScripts($action)
-    {
-        if ($this->reqFbScripts($action)) {
-
-            $apikey      = common_config('facebook', 'apikey');
-            $plugin_path = 'plugins/Facebook';
-
-            $login_url  = common_local_url('FBConnectAuth');
-            $logout_url = common_local_url('logout');
-
-            // XXX: Facebook says we don't need this FB_RequireFeatures(),
-            // but we actually do, for IE and Safari. Gar.
-
-            $js .= '    $(document).ready(function () {';
-            $js .= '         FB_RequireFeatures(';
-            $js .= '             ["XFBML"], function() {';
-            $js .= '                 FB.init("%1$s", "../xd_receiver.html");';
-            $js .= '             }';
-            $js .= '         );';
-            $js .= '    });';
-
-            $js .= '    function goto_login() {';
-            $js .= '        window.location = "%2$s";';
-            $js .= '    }';
-
-            // The below function alters the logout link so that it logs the user out
-            // of Facebook Connect as well as the site.  However, for some pages
-            // (FB Connect Settings) we need to output the FB Connect scripts (to
-            // show an existing FB connection even if the user isn't authenticated
-            // with Facebook connect) but NOT alter the logout link. And the only
-            // way to reliably do that is with the FB Connect .js libs.  Crazy.
-
-            $js .= '    FB.ensureInit(function() {';
-            $js .= '        FB.Connect.ifUserConnected(';
-            $js .= '            function() { ';
-            $js .= '                $(\'#nav_logout a\').attr(\'href\', \'#\');';
-            $js .= '                $(\'#nav_logout a\').click(function() {';
-            $js .= '                   FB.Connect.logoutAndRedirect(\'%3$s\');';
-            $js .= '                   return false;';
-            $js .= '                })';
-            $js .= '            },';
-            $js .= '            function() {';
-            $js .= '                return false;';
-            $js .= '            }';
-            $js .= '        );';
-            $js .= '     });';
-
-            $js = sprintf($js, $apikey, $login_url, $logout_url);
-
-            // Compress the bugger down a bit
-            $js = str_replace('  ', '', $js);
-
-            $action->inlineScript($js);
-        }
-    }
-
-    /**
-     * Add in an additional Facebook Connect script that's supposed to
-     * appear as close as possible to </body>
-     *
-     * @param Action $action the current action
-     *
-     * @return void
-     *
-     */
-    function onEndShowFooter($action)
-    {
-        if ($this->reqFbScripts($action)) {
-            $action->script('http://static.ak.connect.facebook.com' .
-                            '/js/api_lib/v0.4/FeatureLoader.js.php');
-        }
-    }
-
-    /**
-     * Output Facebook Connect specific CSS link
-     *
-     * @param Action $action the current action
-     *
-     * @return void
-     *
-     */
-    function onEndShowStatusNetStyles($action)
-    {
-        if ($this->reqFbScripts($action)) {
-            $action->cssLink('plugins/Facebook/FBConnect.css');
-        }
-    }
-
-    /**
-     * Does the Action we're plugged into require the FB Scripts?  We only
-     * want to output FB namespace, scripts, CSS, etc. on the pages that
-     * really need them.
-     *
-     * @param Action $action the current action
-     *
-     * @return boolean true
-     */
-    function reqFbScripts($action)
-    {
-        if (!self::hasKeys()) {
-            return false;
-        }
-
-        // If you're logged in w/FB Connect, you always need the FB stuff
-        $fbuid = $this->loggedIn();
-
-        if (!empty($fbuid)) {
-            return true;
-        }
-
-        // List of actions that require FB stuff
-        $needy = array('FBConnectLoginAction',
-                       'FBConnectauthAction',
-                       'FBConnectSettingsAction');
-
-        if (in_array(get_class($action), $needy)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Is the user currently logged in with FB Connect?
-     *
-     * @return mixed $fbuid the Facebook ID of the logged in user, or null
-     */
-    function loggedIn()
-    {
-        $user = common_current_user();
-
-        if (!empty($user)) {
-
-            $flink = Foreign_link::getByUserId($user->id,
-                FACEBOOK_CONNECT_SERVICE);
-            $fbuid = 0;
-
-            if (!empty($flink)) {
-                try {
-                    $facebook = getFacebook();
-                    $fbuid    = $facebook->get_loggedin_user();
-                } catch (Exception $e) {
-                    common_log(LOG_WARNING, 'Facebook Connect Plugin - ' .
-                        'Problem getting Facebook user: ' .
-                            $e->getMessage());
-                }
-
-                if ($fbuid > 0) {
-                    return $fbuid;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Add in a Facebook Connect avatar to the primary nav menu
-     *
-     * @param Action $action the current action
-     *
-     * @return void
-     *
-     */
-    function onStartPrimaryNav($action)
-    {
-        if (self::hasKeys()) {
-            $user = common_current_user();
-            if (!empty($user)) {
-                $fbuid = $this->loggedIn();
-
-                if (!empty($fbuid)) {
-                    /* Default FB silhouette pic for FB users who haven't
-                       uploaded a profile pic yet. */
-
-                    $silhouetteUrl =
-                        'http://static.ak.fbcdn.net/pics/q_silhouette.gif';
-
-                    $url = $this->getProfilePicURL($fbuid);
-
-                    $action->elementStart('li', array('id' => 'nav_fb'));
-
-                    $action->element('img', array('id' => 'fbc_profile-pic',
-                        'src' => (!empty($url)) ? $url : $silhouetteUrl,
-                        'alt' => _m('Facebook Connect User'),
-                        'width' => '16'), '');
-
-                    $iconurl =  common_path('plugins/Facebook/fbfavicon.ico');
-                    $action->element('img', array('id' => 'fb_favicon',
-                        'src' => $iconurl));
-
-                    $action->elementEnd('li');
-                }
-            }
-        }
-
-        return true;
-    }
-
-    /*
-     * Add a login tab for Facebook Connect
-     *
-     * @param Action $action the current action
-     *
-     * @return void
-     */
-    function onEndLoginGroupNav($action)
-    {
-        if (self::hasKeys()) {
-            $action_name = $action->trimmed('action');
-
-            $action->menuItem(common_local_url('FBConnectLogin'),
-                                               // @todo CHECKME: Should be 'Facebook Login'?
-                                               // TRANS: Menu item.
-                                               _m('MENU','Facebook'),
-                                               // TRANS: Tooltip for menu item "Facebook".
-                                               _m('Login or register using Facebook'),
-                                               'FBConnectLogin' === $action_name);
-        }
-
-        return true;
-    }
-
-    /*
-     * Add a tab for managing Facebook Connect settings
-     *
-     * @param Action $action the current action
-     *
-     * @return void
-     */
-    function onEndConnectSettingsNav($action)
-    {
-        if (self::hasKeys()) {
-            $action_name = $action->trimmed('action');
-
-            $action->menuItem(common_local_url('FBConnectSettings'),
-                              // @todo CHECKME: Should be 'Facebook Connect'? 
-                              // TRANS: Menu item tab.
-                              _m('MENU','Facebook'),
-                              // TRANS: Tooltip for menu item "Facebook".
-                              _m('Facebook Connect Settings'),
-                              $action_name === 'FBConnectSettings');
-        }
-
-        return true;
-    }
-
-    /**
-     * Have the logout process do some Facebook Connect cookie cleanup
-     *
-     * @param Action $action the current action
-     *
-     * @return void
-     */
-    function onStartLogout($action)
-    {
-        if (self::hasKeys()) {
-
-            $action->logout();
-            $fbuid = $this->loggedIn();
-
-            if (!empty($fbuid)) {
-                try {
-                    $facebook = getFacebook();
-                    $facebook->expire_session();
-                } catch (Exception $e) {
-                    common_log(LOG_WARNING, 'Facebook Connect Plugin - ' .
-                               'Could\'t logout of Facebook: ' .
-                               $e->getMessage());
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Get the URL of the user's Facebook avatar
-     *
-     * @param int $fbuid the Facebook user ID
-     *
-     * @return string $url the url for the user's Facebook avatar
-     */
-    function getProfilePicURL($fbuid)
-    {
-        $facebook = getFacebook();
-        $url      = null;
-
-        try {
-            $fqry = 'SELECT pic_square FROM user WHERE uid = %s';
-
-            $result = $facebook->api_client->fql_query(sprintf($fqry, $fbuid));
-
-            if (!empty($result)) {
-                $url = $result[0]['pic_square'];
-            }
-
-        } catch (Exception $e) {
-            common_log(LOG_WARNING, 'Facebook Connect Plugin - ' .
-                       "Facebook client failure requesting profile pic!");
-        }
-
-        return $url;
-    }
-
-    /**
-     * Add a Facebook queue item for each notice
-     *
-     * @param Notice $notice      the notice
-     * @param array  &$transports the list of transports (queues)
-     *
-     * @return boolean hook return
-     */
-    function onStartEnqueueNotice($notice, &$transports)
-    {
-        if (self::hasKeys() && $notice->isLocal()) {
-            array_push($transports, 'facebook');
-        }
-        return true;
-    }
-
-    /**
-     * Register Facebook notice queue handler
-     *
-     * @param QueueManager $manager
-     *
-     * @return boolean hook return
-     */
-    function onEndInitializeQueueManager($manager)
-    {
-        if (self::hasKeys()) {
-            $manager->connect('facebook', 'FacebookQueueHandler');
-        }
-        return true;
-    }
-
-    function onPluginVersion(&$versions)
-    {
-        $versions[] = array(
-            'name' => 'Facebook',
-            'version' => self::VERSION,
-            'author' => 'Zach Copley',
-            'homepage' => 'http://status.net/wiki/Plugin:Facebook',
-            // TRANS: Plugin description.
-            'rawdescription' => _m(
-                'The Facebook plugin allows integrating ' .
-                'StatusNet instances with ' .
-                '<a href="http://facebook.com/">Facebook</a> ' .
-                'and Facebook Connect.'
-            )
-        );
-        return true;
-    }
-}
diff --git a/plugins/Facebook/README b/plugins/Facebook/README
deleted file mode 100644
index 454dd44e79..0000000000
--- a/plugins/Facebook/README
+++ /dev/null
@@ -1,163 +0,0 @@
-*** WARNING ***
-This plugin is deprecated as of StatusNet 0.9.7, and will soon be removed
-completely from the StatusNet codebase. Please install or upgrade to the
-new "Facebook Bridge" (plugins/FacebookBridge) plugin ASAP.
-***************
-
-Facebook Plugin
-===============
-
-This plugin allows you to use Facebook Connect with StatusNet, provides
-a Facebook canvas application for your users, and allows them to update
-their Facebook statuses from StatusNet.
-
-Facebook Connect
-----------------
-
-Facebook connect allows users to register and login using nothing but their
-Facebook credentials. With Facebook Connect, your users can:
-
-- Authenticate (register/login/logout -- works similar to OpenID)
-- Associate an existing StatusNet account with a Facebook account
-- Disconnect a Facebook account from a StatusNet account
-
-Built-in Facebook Application
------------------------------
-
-The plugin also installs a StatusNet Facebook canvas application that
-allows your users to automatically update their Facebook status with
-their latest notices, invite their friends to use the app (and thus your
-site), view their notice timelines and post notices -- all from within
-Facebook.  The application is built into the StatusNet Facebook plugin
-and runs on your host.
-
-Quick setup instructions*
--------------------------
-
-Install the Facebook Developer application on Facebook:
-
-    http://www.facebook.com/developers/
-
-Use it to create a new application and generate an API key and secret.
-You will need the key and secret so cut-n-paste them into your text
-editor or write them down.
-
-In Facebook's application editor, specify the following URLs for your app:
-
-- Canvas Callback URL         : http://example.net/mublog/facebook/app/
-- Post-Remove Callback URL    : http://example.net/mublog/facebook/app/remove
-- Post-Authorize Redirect URL : http://apps.facebook.com/yourapp/
-- Canvas Page URL             : http://apps.facebook.com/yourapp/
-- Connect URL                 : http://example.net/mublog/
-
-    *** ATTENTION ***
-    These URLs have changed slightly since StatusNet version 0.8.1,
-    so if you have been using the Facebook app previously, you will
-    need to update your configuration!
-
-Replace "example.net" with your host's URL, "mublog" with the path to your
-StatusNet installation, and 'yourapp' with the name of the Facebook
-application you created. (If you don't have "Fancy URLs" on, you'll need to
-change http://example.net/mublog/ to http://example.net/mublog/index.php/).
-
-Additionally, Choose "Web" for Application type in the Advanced tab. In the
-"Canvas setting" section, choose the "FBML" for Render Method, "Smart Size"
-for IFrame size, and "Full width (760px)" for Canvas Width. Everything else
-can be left with default values.
-
-* NOTE: For more under-the-hood detailed instructions about setting up a
-        Facebook application and getting an API key, check out the
-        following pages on the Facebook wiki:
-
-    http://wiki.developers.facebook.com/index.php/Connect/Setting_Up_Your_Site
-    http://wiki.developers.facebook.com/index.php/Creating_your_first_application
-
-Finally you must activate the plugin by adding it in your config.php
-(this is where you'll need the API key and secret generated earlier):
-
-    addPlugin(
-        'Facebook',
-        array(
-            'apikey' => 'YOUR_APIKEY',
-            'secret' => 'YOUR_SECRET'
-        )
-    );
-
-Administration Panel
---------------------
-
-As of StatusNet 0.9.0 you can alternatively specify the key and secret
-via a Facebook administration panel from within StatusNet, in which case
-you can just add:
-
-    addPlugin('Facebook');
-
-to activate the plugin.
-
-NOTE: To enable the administration panel you'll need to add it to the
-list of active administration panels, e.g.:
-
-    $config['admin']['panels'][] = 'facebook';
-
-and of course you'll need a user with the administrative role to access
-it and input the API key and secret (see: scripts/userrole.php).
-
-Testing It Out
---------------
-
-If the Facebook plugin is enabled and working, there will be a new Facebook
-Connect Settings tab under each user's Connect menu. Users can connect and
-disconnect* to their Facebook accounts from it.
-
-To try out the plugin, fire up your browser and connect to:
-
-    http://example.net/mublog/main/facebooklogin
-
-or, if you do not have fancy URLs turned on:
-
-    http://example.net/mublog/index.php/main/facebooklogin
-
-You should see a page with a blue button that says: "Connect with Facebook"
-and you should be able to login or register.
-
-From within Facebook, you should also be able to get to the Facebook
-application, and run it by hitting the link you specified above when
-configuring it:
-
-    http://apps.facebook.com/yourapp/
-
-That link should be present you with a login screen.  After logging in to
-the app, you are given the option to update their Facebook status via
-StatusNet.
-
-* Note: Before a user can disconnect from Facebook, she must set a normal
-  StatusNet password.  Otherwise, she might not be able to login in to her
-  account in the future.  This is usually only required for users who have
-  used Facebook Connect to register their StatusNet account, and therefore
-  haven't already set a local password.
-
-Offline Queue Handling
-----------------------
-
-For larger sites needing better performance it's possible to enable
-queuing and have users' notices posted to Facebook via a separate
-"offline" process -- FacebookQueueHandler (facebookqueuhandler.php in
-the Facebook plugin directory).  It will run automatically if you have
-enabled StatusNet's offline queueing subsystem.  See the "Queues and
-daemons" section in the StatusNet README for more about queuing.
-
-
-TODO
-----
-
-- Make Facebook Connect work for authentication for multi-site setups
-  (e.g.: *.status.net)
-- Posting to Facebook user streams using only Facebook Connect
-- Invite Facebook friends to use your StatusNet installation via Facebook
-  Connect
-- Auto-subscribe Facebook friends already using StatusNet
-- Share StatusNet favorite notices to your Facebook stream
-- Allow users to update their Facebook statuses once they have authenticated
-  with Facebook Connect (no need for them to use the Facebook app if they
-  don't want to).
-- Import a user's Facebook updates into StatusNet
diff --git a/plugins/Facebook/facebook/facebook.php b/plugins/Facebook/facebook/facebook.php
deleted file mode 100644
index 76696c1d55..0000000000
--- a/plugins/Facebook/facebook/facebook.php
+++ /dev/null
@@ -1,609 +0,0 @@
-<?php
-// Copyright 2004-2009 Facebook. All Rights Reserved.
-//
-// +---------------------------------------------------------------------------+
-// | Facebook Platform PHP5 client                                             |
-// +---------------------------------------------------------------------------+
-// | Copyright (c) 2007 Facebook, Inc.                                         |
-// | All rights reserved.                                                      |
-// |                                                                           |
-// | Redistribution and use in source and binary forms, with or without        |
-// | modification, are permitted provided that the following conditions        |
-// | are met:                                                                  |
-// |                                                                           |
-// | 1. Redistributions of source code must retain the above copyright         |
-// |    notice, this list of conditions and the following disclaimer.          |
-// | 2. 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.   |
-// |                                                                           |
-// | THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.         |
-// +---------------------------------------------------------------------------+
-// | For help with this library, contact developers-help@facebook.com          |
-// +---------------------------------------------------------------------------+
-
-include_once 'facebookapi_php5_restlib.php';
-
-define('FACEBOOK_API_VALIDATION_ERROR', 1);
-class Facebook {
-  public $api_client;
-  public $api_key;
-  public $secret;
-  public $generate_session_secret;
-  public $session_expires;
-
-  public $fb_params;
-  public $user;
-  public $profile_user;
-  public $canvas_user;
-  public $ext_perms = array();
-  protected $base_domain;
-
-  /*
-   * Create a Facebook client like this:
-   *
-   * $fb = new Facebook(API_KEY, SECRET);
-   *
-   * This will automatically pull in any parameters, validate them against the
-   * session signature, and chuck them in the public $fb_params member variable.
-   *
-   * @param api_key                  your Developer API key
-   * @param secret                   your Developer API secret
-   * @param generate_session_secret  whether to automatically generate a session
-   *                                 if the user doesn't have one, but
-   *                                 there is an auth token present in the url,
-   */
-  public function __construct($api_key, $secret, $generate_session_secret=false) {
-    $this->api_key                 = $api_key;
-    $this->secret                  = $secret;
-    $this->generate_session_secret = $generate_session_secret;
-    $this->api_client = new FacebookRestClient($api_key, $secret, null);
-    $this->validate_fb_params();
-
-    // Set the default user id for methods that allow the caller to
-    // pass an explicit uid instead of using a session key.
-    $defaultUser = null;
-    if ($this->user) {
-      $defaultUser = $this->user;
-    } else if ($this->profile_user) {
-      $defaultUser = $this->profile_user;
-    } else if ($this->canvas_user) {
-      $defaultUser = $this->canvas_user;
-    }
-
-    $this->api_client->set_user($defaultUser);
-
-
-    if (isset($this->fb_params['friends'])) {
-      $this->api_client->friends_list =
-        array_filter(explode(',', $this->fb_params['friends']));
-    }
-    if (isset($this->fb_params['added'])) {
-      $this->api_client->added = $this->fb_params['added'];
-    }
-    if (isset($this->fb_params['canvas_user'])) {
-      $this->api_client->canvas_user = $this->fb_params['canvas_user'];
-    }
-  }
-
-  /*
-   * Validates that the parameters passed in were sent from Facebook. It does so
-   * by validating that the signature matches one that could only be generated
-   * by using your application's secret key.
-   *
-   * Facebook-provided parameters will come from $_POST, $_GET, or $_COOKIE,
-   * in that order. $_POST and $_GET are always more up-to-date than cookies,
-   * so we prefer those if they are available.
-   *
-   * For nitty-gritty details of when each of these is used, check out
-   * http://wiki.developers.facebook.com/index.php/Verifying_The_Signature
-   */
-  public function validate_fb_params() {
-    $this->fb_params = $this->get_valid_fb_params($_POST, 48 * 3600, 'fb_sig');
-
-    // note that with preload FQL, it's possible to receive POST params in
-    // addition to GET, so use a different prefix to differentiate them
-    if (!$this->fb_params) {
-      $fb_params = $this->get_valid_fb_params($_GET, 48 * 3600, 'fb_sig');
-      $fb_post_params = $this->get_valid_fb_params($_POST,
-                                                   48 * 3600, // 48 hours
-                                                   'fb_post_sig');
-      $this->fb_params = array_merge($fb_params, $fb_post_params);
-    }
-
-    // Okay, something came in via POST or GET
-    if ($this->fb_params) {
-      $user               = isset($this->fb_params['user']) ?
-                            $this->fb_params['user'] : null;
-      $this->profile_user = isset($this->fb_params['profile_user']) ?
-                            $this->fb_params['profile_user'] : null;
-      $this->canvas_user  = isset($this->fb_params['canvas_user']) ?
-                            $this->fb_params['canvas_user'] : null;
-      $this->base_domain  = isset($this->fb_params['base_domain']) ?
-                            $this->fb_params['base_domain'] : null;
-      $this->ext_perms    = isset($this->fb_params['ext_perms']) ?
-                            explode(',', $this->fb_params['ext_perms'])
-                            : array();
-
-      if (isset($this->fb_params['session_key'])) {
-        $session_key =  $this->fb_params['session_key'];
-      } else if (isset($this->fb_params['profile_session_key'])) {
-        $session_key =  $this->fb_params['profile_session_key'];
-      } else {
-        $session_key = null;
-      }
-      $expires     = isset($this->fb_params['expires']) ?
-                     $this->fb_params['expires'] : null;
-      $this->set_user($user,
-                      $session_key,
-                      $expires);
-    } else if ($cookies =
-               $this->get_valid_fb_params($_COOKIE, null, $this->api_key)) {
-      // if no Facebook parameters were found in the GET or POST variables,
-      // then fall back to cookies, which may have cached user information
-      // Cookies are also used to receive session data via the Javascript API
-      $base_domain_cookie = 'base_domain_' . $this->api_key;
-      if (isset($_COOKIE[$base_domain_cookie])) {
-        $this->base_domain = $_COOKIE[$base_domain_cookie];
-      }
-
-      // use $api_key . '_' as a prefix for the cookies in case there are
-      // multiple facebook clients on the same domain.
-      $expires = isset($cookies['expires']) ? $cookies['expires'] : null;
-      $this->set_user($cookies['user'],
-                      $cookies['session_key'],
-                      $expires);
-    }
-
-    return !empty($this->fb_params);
-  }
-
-  // Store a temporary session secret for the current session
-  // for use with the JS client library
-  public function promote_session() {
-    try {
-      $session_secret = $this->api_client->auth_promoteSession();
-      if (!$this->in_fb_canvas()) {
-        $this->set_cookies($this->user, $this->api_client->session_key, $this->session_expires, $session_secret);
-      }
-      return $session_secret;
-    } catch (FacebookRestClientException $e) {
-      // API_EC_PARAM means we don't have a logged in user, otherwise who
-      // knows what it means, so just throw it.
-      if ($e->getCode() != FacebookAPIErrorCodes::API_EC_PARAM) {
-        throw $e;
-      }
-    }
-  }
-
-  public function do_get_session($auth_token) {
-    try {
-      return $this->api_client->auth_getSession($auth_token, $this->generate_session_secret);
-    } catch (FacebookRestClientException $e) {
-      // API_EC_PARAM means we don't have a logged in user, otherwise who
-      // knows what it means, so just throw it.
-      if ($e->getCode() != FacebookAPIErrorCodes::API_EC_PARAM) {
-        throw $e;
-      }
-    }
-  }
-
-  // Invalidate the session currently being used, and clear any state associated
-  // with it. Note that the user will still remain logged into Facebook.
-  public function expire_session() {
-    try {
-      if ($this->api_client->auth_expireSession()) {
-        $this->clear_cookie_state();
-        return true;
-      } else {
-        return false;
-      }
-    } catch (Exception $e) {
-      $this->clear_cookie_state();
-    }
-  }
-
-  /** Logs the user out of all temporary application sessions as well as their
-   * Facebook session.  Note this will only work if the user has a valid current
-   * session with the application.
-   *
-   * @param string  $next  URL to redirect to upon logging out
-   *
-   */
-   public function logout($next) {
-    $logout_url = $this->get_logout_url($next);
-
-    // Clear any stored state
-    $this->clear_cookie_state();
-
-    $this->redirect($logout_url);
-  }
-
-  /**
-   *  Clears any persistent state stored about the user, including
-   *  cookies and information related to the current session in the
-   *  client.
-   *
-   */
-  public function clear_cookie_state() {
-    if (!$this->in_fb_canvas() && isset($_COOKIE[$this->api_key . '_user'])) {
-       $cookies = array('user', 'session_key', 'expires', 'ss');
-       foreach ($cookies as $name) {
-         setcookie($this->api_key . '_' . $name,
-                   false,
-                   time() - 3600,
-                   '',
-                   $this->base_domain);
-         unset($_COOKIE[$this->api_key . '_' . $name]);
-       }
-       setcookie($this->api_key, false, time() - 3600, '', $this->base_domain);
-       unset($_COOKIE[$this->api_key]);
-     }
-
-     // now, clear the rest of the stored state
-     $this->user = 0;
-     $this->api_client->session_key = 0;
-  }
-
-  public function redirect($url) {
-    if ($this->in_fb_canvas()) {
-      echo '<fb:redirect url="' . $url . '"/>';
-    } else if (preg_match('/^https?:\/\/([^\/]*\.)?facebook\.com(:\d+)?/i', $url)) {
-      // make sure facebook.com url's load in the full frame so that we don't
-      // get a frame within a frame.
-      echo "<script type=\"text/javascript\">\ntop.location.href = \"$url\";\n</script>";
-    } else {
-      header('Location: ' . $url);
-    }
-    exit;
-  }
-
-  public function in_frame() {
-    return isset($this->fb_params['in_canvas'])
-        || isset($this->fb_params['in_iframe']);
-  }
-  public function in_fb_canvas() {
-    return isset($this->fb_params['in_canvas']);
-  }
-
-  public function get_loggedin_user() {
-    return $this->user;
-  }
-
-  public function get_canvas_user() {
-    return $this->canvas_user;
-  }
-
-  public function get_profile_user() {
-    return $this->profile_user;
-  }
-
-  public static function current_url() {
-    return 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
-  }
-
-  // require_add and require_install have been removed.
-  // see http://developer.facebook.com/news.php?blog=1&story=116 for more details
-  public function require_login($required_permissions = '') {
-    $user = $this->get_loggedin_user();
-    $has_permissions = true;
-
-    if ($required_permissions) {
-      $this->require_frame();
-      $permissions = array_map('trim', explode(',', $required_permissions));
-      foreach ($permissions as $permission) {
-        if (!in_array($permission, $this->ext_perms)) {
-          $has_permissions = false;
-          break;
-        }
-      }
-    }
-
-    if ($user && $has_permissions) {
-      return $user;
-    }
-
-    $this->redirect(
-      $this->get_login_url(self::current_url(), $this->in_frame(),
-                           $required_permissions));
-  }
-
-  public function require_frame() {
-    if (!$this->in_frame()) {
-      $this->redirect($this->get_login_url(self::current_url(), true));
-    }
-  }
-
-  public static function get_facebook_url($subdomain='www') {
-    return 'http://' . $subdomain . '.facebook.com';
-  }
-
-  public function get_install_url($next=null) {
-    // this was renamed, keeping for compatibility's sake
-    return $this->get_add_url($next);
-  }
-
-  public function get_add_url($next=null) {
-    $page = self::get_facebook_url().'/add.php';
-    $params = array('api_key' => $this->api_key);
-
-    if ($next) {
-      $params['next'] = $next;
-    }
-
-    return $page . '?' . http_build_query($params);
-  }
-
-  public function get_login_url($next, $canvas, $req_perms = '') {
-    $page = self::get_facebook_url().'/login.php';
-    $params = array('api_key'   => $this->api_key,
-                    'v'         => '1.0',
-                    'req_perms' => $req_perms);
-
-    if ($next) {
-      $params['next'] = $next;
-    }
-    if ($canvas) {
-      $params['canvas'] = '1';
-    }
-
-    return $page . '?' . http_build_query($params);
-  }
-
-  public function get_logout_url($next) {
-    $page = self::get_facebook_url().'/logout.php';
-    $params = array('app_key'     => $this->api_key,
-                    'session_key' => $this->api_client->session_key);
-
-    if ($next) {
-      $params['connect_next'] = 1;
-      $params['next'] = $next;
-    }
-
-    return $page . '?' . http_build_query($params);
-  }
-
-  public function set_user($user, $session_key, $expires=null, $session_secret=null) {
-    if (!$this->in_fb_canvas() && (!isset($_COOKIE[$this->api_key . '_user'])
-                                   || $_COOKIE[$this->api_key . '_user'] != $user)) {
-      $this->set_cookies($user, $session_key, $expires, $session_secret);
-    }
-    $this->user = $user;
-    $this->api_client->session_key = $session_key;
-    $this->session_expires = $expires;
-  }
-
-  public function set_cookies($user, $session_key, $expires=null, $session_secret=null) {
-    $cookies = array();
-    $cookies['user'] = $user;
-    $cookies['session_key'] = $session_key;
-    if ($expires != null) {
-      $cookies['expires'] = $expires;
-    }
-    if ($session_secret != null) {
-      $cookies['ss'] = $session_secret;
-    }
-
-    foreach ($cookies as $name => $val) {
-      setcookie($this->api_key . '_' . $name, $val, (int)$expires, '', $this->base_domain);
-      $_COOKIE[$this->api_key . '_' . $name] = $val;
-    }
-    $sig = self::generate_sig($cookies, $this->secret);
-    setcookie($this->api_key, $sig, (int)$expires, '', $this->base_domain);
-    $_COOKIE[$this->api_key] = $sig;
-
-    if ($this->base_domain != null) {
-      $base_domain_cookie = 'base_domain_' . $this->api_key;
-      setcookie($base_domain_cookie, $this->base_domain, (int)$expires, '', $this->base_domain);
-      $_COOKIE[$base_domain_cookie] = $this->base_domain;
-    }
-  }
-
-  /**
-   * Tries to undo the badness of magic quotes as best we can
-   * @param     string   $val   Should come directly from $_GET, $_POST, etc.
-   * @return    string   val without added slashes
-   */
-  public static function no_magic_quotes($val) {
-    if (get_magic_quotes_gpc()) {
-      return stripslashes($val);
-    } else {
-      return $val;
-    }
-  }
-
-  /*
-   * Get the signed parameters that were sent from Facebook. Validates the set
-   * of parameters against the included signature.
-   *
-   * Since Facebook sends data to your callback URL via unsecured means, the
-   * signature is the only way to make sure that the data actually came from
-   * Facebook. So if an app receives a request at the callback URL, it should
-   * always verify the signature that comes with against your own secret key.
-   * Otherwise, it's possible for someone to spoof a request by
-   * pretending to be someone else, i.e.:
-   *      www.your-callback-url.com/?fb_user=10101
-   *
-   * This is done automatically by verify_fb_params.
-   *
-   * @param  assoc  $params     a full array of external parameters.
-   *                            presumed $_GET, $_POST, or $_COOKIE
-   * @param  int    $timeout    number of seconds that the args are good for.
-   *                            Specifically good for forcing cookies to expire.
-   * @param  string $namespace  prefix string for the set of parameters we want
-   *                            to verify. i.e., fb_sig or fb_post_sig
-   *
-   * @return  assoc the subset of parameters containing the given prefix,
-   *                and also matching the signature associated with them.
-   *          OR    an empty array if the params do not validate
-   */
-  public function get_valid_fb_params($params, $timeout=null, $namespace='fb_sig') {
-    $prefix = $namespace . '_';
-    $prefix_len = strlen($prefix);
-    $fb_params = array();
-    if (empty($params)) {
-      return array();
-    }
-
-    foreach ($params as $name => $val) {
-      // pull out only those parameters that match the prefix
-      // note that the signature itself ($params[$namespace]) is not in the list
-      if (strpos($name, $prefix) === 0) {
-        $fb_params[substr($name, $prefix_len)] = self::no_magic_quotes($val);
-      }
-    }
-
-    // validate that the request hasn't expired. this is most likely
-    // for params that come from $_COOKIE
-    if ($timeout && (!isset($fb_params['time']) || time() - $fb_params['time'] > $timeout)) {
-      return array();
-    }
-
-    // validate that the params match the signature
-    $signature = isset($params[$namespace]) ? $params[$namespace] : null;
-    if (!$signature || (!$this->verify_signature($fb_params, $signature))) {
-      return array();
-    }
-    return $fb_params;
-  }
-
-  /**
-   *  Validates the account that a user was trying to set up an
-   *  independent account through Facebook Connect.
-   *
-   *  @param  user The user attempting to set up an independent account.
-   *  @param  hash The hash passed to the reclamation URL used.
-   *  @return bool True if the user is the one that selected the
-   *               reclamation link.
-   */
-  public function verify_account_reclamation($user, $hash) {
-    return $hash == md5($user . $this->secret);
-  }
-
-  /**
-   * Validates that a given set of parameters match their signature.
-   * Parameters all match a given input prefix, such as "fb_sig".
-   *
-   * @param $fb_params     an array of all Facebook-sent parameters,
-   *                       not including the signature itself
-   * @param $expected_sig  the expected result to check against
-   */
-  public function verify_signature($fb_params, $expected_sig) {
-    return self::generate_sig($fb_params, $this->secret) == $expected_sig;
-  }
-
-  /**
-   * Validate the given signed public session data structure with
-   * public key of the app that
-   * the session proof belongs to.
-   *
-   * @param $signed_data the session info that is passed by another app
-   * @param string $public_key Optional public key of the app. If this
-   *               is not passed, function will make an API call to get it.
-   * return true if the session proof passed verification.
-   */
-  public function verify_signed_public_session_data($signed_data,
-                                                    $public_key = null) {
-
-    // If public key is not already provided, we need to get it through API
-    if (!$public_key) {
-      $public_key = $this->api_client->auth_getAppPublicKey(
-        $signed_data['api_key']);
-    }
-
-    // Create data to verify
-    $data_to_serialize = $signed_data;
-    unset($data_to_serialize['sig']);
-    $serialized_data = implode('_', $data_to_serialize);
-
-    // Decode signature
-    $signature = base64_decode($signed_data['sig']);
-    $result = openssl_verify($serialized_data, $signature, $public_key,
-                             OPENSSL_ALGO_SHA1);
-    return $result == 1;
-  }
-
-  /*
-   * Generate a signature using the application secret key.
-   *
-   * The only two entities that know your secret key are you and Facebook,
-   * according to the Terms of Service. Since nobody else can generate
-   * the signature, you can rely on it to verify that the information
-   * came from Facebook.
-   *
-   * @param $params_array   an array of all Facebook-sent parameters,
-   *                        NOT INCLUDING the signature itself
-   * @param $secret         your app's secret key
-   *
-   * @return a hash to be checked against the signature provided by Facebook
-   */
-  public static function generate_sig($params_array, $secret) {
-    $str = '';
-
-    ksort($params_array);
-    // Note: make sure that the signature parameter is not already included in
-    //       $params_array.
-    foreach ($params_array as $k=>$v) {
-      $str .= "$k=$v";
-    }
-    $str .= $secret;
-
-    return md5($str);
-  }
-
-  public function encode_validationError($summary, $message) {
-    return json_encode(
-               array('errorCode'    => FACEBOOK_API_VALIDATION_ERROR,
-                     'errorTitle'   => $summary,
-                     'errorMessage' => $message));
-  }
-
-  public function encode_multiFeedStory($feed, $next) {
-    return json_encode(
-               array('method'   => 'multiFeedStory',
-                     'content'  =>
-                     array('next' => $next,
-                           'feed' => $feed)));
-  }
-
-  public function encode_feedStory($feed, $next) {
-    return json_encode(
-               array('method'   => 'feedStory',
-                     'content'  =>
-                     array('next' => $next,
-                           'feed' => $feed)));
-  }
-
-  public function create_templatizedFeedStory($title_template, $title_data=array(),
-                                    $body_template='', $body_data = array(), $body_general=null,
-                                    $image_1=null, $image_1_link=null,
-                                    $image_2=null, $image_2_link=null,
-                                    $image_3=null, $image_3_link=null,
-                                    $image_4=null, $image_4_link=null) {
-    return array('title_template'=> $title_template,
-                 'title_data'   => $title_data,
-                 'body_template'=> $body_template,
-                 'body_data'    => $body_data,
-                 'body_general' => $body_general,
-                 'image_1'      => $image_1,
-                 'image_1_link' => $image_1_link,
-                 'image_2'      => $image_2,
-                 'image_2_link' => $image_2_link,
-                 'image_3'      => $image_3,
-                 'image_3_link' => $image_3_link,
-                 'image_4'      => $image_4,
-                 'image_4_link' => $image_4_link);
-  }
-
-
-}
-
diff --git a/plugins/Facebook/facebook/facebook_desktop.php b/plugins/Facebook/facebook/facebook_desktop.php
deleted file mode 100644
index ed4762215b..0000000000
--- a/plugins/Facebook/facebook/facebook_desktop.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-// Copyright 2004-2009 Facebook. All Rights Reserved.
-//
-// +---------------------------------------------------------------------------+
-// | Facebook Platform PHP5 client                                             |
-// +---------------------------------------------------------------------------+
-// | Copyright (c) 2007 Facebook, Inc.                                         |
-// | All rights reserved.                                                      |
-// |                                                                           |
-// | Redistribution and use in source and binary forms, with or without        |
-// | modification, are permitted provided that the following conditions        |
-// | are met:                                                                  |
-// |                                                                           |
-// | 1. Redistributions of source code must retain the above copyright         |
-// |    notice, this list of conditions and the following disclaimer.          |
-// | 2. 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.   |
-// |                                                                           |
-// | THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.         |
-// +---------------------------------------------------------------------------+
-// | For help with this library, contact developers-help@facebook.com          |
-// +---------------------------------------------------------------------------+
-//
-
-/**
- *  This class extends and modifies the "Facebook" class to better
- *  suit desktop apps.
- */
-class FacebookDesktop extends Facebook {
-  // the application secret, which differs from the session secret
-  public $app_secret;
-  public $verify_sig;
-
-  public function __construct($api_key, $secret) {
-    $this->app_secret = $secret;
-    $this->verify_sig = false;
-    parent::__construct($api_key, $secret);
-  }
-
-  public function do_get_session($auth_token) {
-    $this->api_client->secret = $this->app_secret;
-    $this->api_client->session_key = null;
-    $session_info = parent::do_get_session($auth_token);
-    if (!empty($session_info['secret'])) {
-      // store the session secret
-      $this->set_session_secret($session_info['secret']);
-    }
-    return $session_info;
-  }
-
-  public function set_session_secret($session_secret) {
-    $this->secret = $session_secret;
-    $this->api_client->use_session_secret($session_secret);
-  }
-
-  public function require_login() {
-    if ($this->get_loggedin_user()) {
-      try {
-        // try a session-based API call to ensure that we have the correct
-        // session secret
-        $user = $this->api_client->users_getLoggedInUser();
-
-        // now that we have a valid session secret, verify the signature
-        $this->verify_sig = true;
-        if ($this->validate_fb_params(false)) {
-          return $user;
-        } else {
-          // validation failed
-          return null;
-        }
-      } catch (FacebookRestClientException $ex) {
-        if (isset($_GET['auth_token'])) {
-          // if we have an auth_token, use it to establish a session
-          $session_info = $this->do_get_session($_GET['auth_token']);
-          if ($session_info) {
-            return $session_info['uid'];
-          }
-        }
-      }
-    }
-    // if we get here, we need to redirect the user to log in
-    $this->redirect($this->get_login_url(self::current_url(), $this->in_fb_canvas()));
-  }
-
-  public function verify_signature($fb_params, $expected_sig) {
-    // we don't want to verify the signature until we have a valid
-    // session secret
-    if ($this->verify_sig) {
-      return parent::verify_signature($fb_params, $expected_sig);
-    } else {
-      return true;
-    }
-  }
-}
diff --git a/plugins/Facebook/facebook/facebook_mobile.php b/plugins/Facebook/facebook/facebook_mobile.php
deleted file mode 100644
index 5ee7f4ed5b..0000000000
--- a/plugins/Facebook/facebook/facebook_mobile.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-// Copyright 2004-2009 Facebook. All Rights Reserved.
-//
-// +---------------------------------------------------------------------------+
-// | Facebook Platform PHP5 client                                             |
-// +---------------------------------------------------------------------------+
-// | Copyright (c) 2007 Facebook, Inc.                                         |
-// | All rights reserved.                                                      |
-// |                                                                           |
-// | Redistribution and use in source and binary forms, with or without        |
-// | modification, are permitted provided that the following conditions        |
-// | are met:                                                                  |
-// |                                                                           |
-// | 1. Redistributions of source code must retain the above copyright         |
-// |    notice, this list of conditions and the following disclaimer.          |
-// | 2. 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.   |
-// |                                                                           |
-// | THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.         |
-// +---------------------------------------------------------------------------+
-// | For help with this library, contact developers-help@facebook.com          |
-// +---------------------------------------------------------------------------+
-//
-/**
- *  This class extends and modifies the "Facebook" class to better suit wap
- *  apps. Since there is no javascript support, we need to use server redirect
- *  to implement Facebook connect functionalities such as authenticate,
- *  authorize, feed form etc.. This library provide many helper functions for
- *  wap developer to locate the right wap url. The url here is targed at
- *  facebook wap site or wap-friendly url.
- */
-class FacebookMobile extends Facebook {
-  // the application secret, which differs from the session secret
-
-  public function __construct($api_key, $secret, $generate_session_secret=false) {
-    parent::__construct($api_key, $secret, $generate_session_secret);
-  }
-
-  public function redirect($url) {
-    header('Location: '. $url);
-  }
-
-  public function get_m_url($action, $params) {
-    $page = parent::get_facebook_url('m'). '/' .$action;
-    foreach($params as $key => $val) {
-      if (!$val) {
-        unset($params[$key]);
-      }
-    }
-    return $page . '?' . http_build_query($params);
-  }
-
-  public function get_www_url($action, $params) {
-    $page = parent::get_facebook_url('www'). '/' .$action;
-    foreach($params as $key => $val) {
-      if (!$val) {
-        unset($params[$key]);
-      }
-    }
-    return $page . '?' . http_build_query($params);
-  }
-
-  public function get_add_url($next=null) {
-
-    return $this->get_m_url('add.php', array('api_key' => $this->api_key,
-                                             'next'    => $next));
-  }
-
-  public function get_tos_url($next=null, $cancel = null, $canvas=null) {
-    return $this->get_m_url('tos.php', array('api_key' => $this->api_key,
-                                             'v'       => '1.0',
-                                             'next'    => $next,
-                                             'canvas'  => $canvas,
-                                             'cancel'   => $cancel));
-  }
-
-  public function get_logout_url($next=null) {
-    $params = array('api_key'     => $this->api_key,
-                    'session_key' => $this->api_client->session_key,
-                   );
-
-    if ($next) {
-      $params['connect_next'] = 1;
-      $params['next'] = $next;
-    }
-
-    return $this->get_m_url('logout.php', $params);
-  }
-  public function get_register_url($next=null, $cancel_url=null) {
-    return $this->get_m_url('r.php',
-      array('fbconnect' => 1,
-            'api_key' => $this->api_key,
-            'next' => $next ? $next : parent::current_url(),
-            'cancel_url' => $cancel_url ? $cancel_url : parent::current_url()));
-  }
-  /**
-   * These set of fbconnect style url redirect back to the application current
-   * page when the action is done. Developer can also use the non fbconnect
-   * style url and provide their own redirect link by giving the right parameter
-   * to $next and/or $cancel_url
-   */
-  public function get_fbconnect_register_url() {
-    return $this->get_register_url(parent::current_url(), parent::current_url());
-  }
-  public function get_fbconnect_tos_url() {
-    return $this->get_tos_url(parent::current_url(), parent::current_url(), $this->in_frame());
-  }
-
-  public function get_fbconnect_logout_url() {
-    return $this->get_logout_url(parent::current_url());
-  }
-
-  public function logout_user() {
-    $this->user = null;
-  }
-
-  public function get_prompt_permissions_url($ext_perm,
-                                             $next=null,
-                                             $cancel_url=null) {
-
-    return $this->get_www_url('connect/prompt_permissions.php',
-      array('api_key' => $this->api_key,
-            'ext_perm' => $ext_perm,
-            'next' => $next ? $next : parent::current_url(),
-            'cancel' => $cancel_url ? $cancel_url : parent::current_url(),
-            'display' => 'wap'));
-
-  }
-
-  /**
-   * support both prompt_permissions.php and authorize.php for now.
-   * authorized.php is to be deprecate though.
-   */
-  public function get_extended_permission_url($ext_perm,
-                                              $next=null,
-                                              $cancel_url=null) {
-    $next = $next ? $next : parent::current_url();
-    $cancel_url = $cancel_url ? $cancel_url : parent::current_url();
-
-    return $this->get_m_url('authorize.php',
-                      array('api_key' => $this->api_key,
-                            'ext_perm' => $ext_perm,
-                            'next' => $next,
-                            'cancel_url' => $cancel_url));
-
-  }
-
-  public function render_prompt_feed_url($action_links=NULL,
-                                         $target_id=NULL,
-                                         $message='',
-                                         $user_message_prompt='',
-                                         $caption=NULL,
-                                         $callback ='',
-                                         $cancel='',
-                                         $attachment=NULL,
-                                         $preview=true) {
-
-    $params = array('api_key'     => $this->api_key,
-                    'session_key' => $this->api_client->session_key,
-                   );
-    if (!empty($attachment)) {
-      $params['attachment'] = urlencode(json_encode($attachment));
-    } else {
-      $attachment = new stdClass();
-      $app_display_info = $this->api_client->admin_getAppProperties(array('application_name',
-                                                                          'callback_url',
-                                                                          'description',
-                                                                          'logo_url'));
-      $app_display_info = $app_display_info;
-      $attachment->name = $app_display_info['application_name'];
-      $attachment->caption = !empty($caption) ? $caption : 'Just see what\'s new!';
-      $attachment->description = $app_display_info['description'];
-      $attachment->href = $app_display_info['callback_url'];
-      if (!empty($app_display_info['logo_url'])) {
-        $logo = new stdClass();
-        $logo->type = 'image';
-        $logo->src = $app_display_info['logo_url'];
-        $logo->href = $app_display_info['callback_url'];
-        $attachment->media = array($logo);
-      }
-      $params['attachment'] = urlencode(json_encode($attachment));
-    }
-    $params['preview'] = $preview;
-    $params['message'] = $message;
-    $params['user_message_prompt'] = $user_message_prompt;
-    if (!empty($callback)) {
-      $params['callback'] = $callback;
-    } else {
-      $params['callback'] = $this->current_url();
-    }
-    if (!empty($cancel)) {
-      $params['cancel'] = $cancel;
-    } else {
-      $params['cancel'] = $this->current_url();
-    }
-
-    if (!empty($target_id)) {
-      $params['target_id'] = $target_id;
-    }
-    if (!empty($action_links)) {
-      $params['action_links'] = urlencode(json_encode($action_links));
-    }
-
-    $params['display'] = 'wap';
-    header('Location: '. $this->get_www_url('connect/prompt_feed.php', $params));
-  }
-
-//use template_id
-  public function render_feed_form_url($template_id=NULL,
-                                       $template_data=NULL,
-                                       $user_message=NULL,
-                                       $body_general=NULL,
-                                       $user_message_prompt=NULL,
-                                       $target_id=NULL,
-                                       $callback=NULL,
-                                       $cancel=NULL,
-                                       $preview=true) {
-
-    $params = array('api_key' => $this->api_key);
-    $params['preview'] = $preview;
-    if (isset($template_id) && $template_id) {
-      $params['template_id'] = $template_id;
-    }
-    $params['message'] = $user_message ? $user_message['value'] : '';
-    if (isset($body_general) && $body_general) {
-      $params['body_general'] = $body_general;
-    }
-    if (isset($user_message_prompt) && $user_message_prompt) {
-      $params['user_message_prompt'] = $user_message_prompt;
-    }
-    if (isset($callback) && $callback) {
-      $params['callback'] = $callback;
-    } else {
-      $params['callback'] = $this->current_url();
-    }
-    if (isset($cancel) && $cancel) {
-      $params['cancel'] = $cancel;
-    } else {
-      $params['cancel'] = $this->current_url();
-    }
-    if (isset($template_data) && $template_data) {
-      $params['template_data'] = $template_data;
-    }
-    if (isset($target_id) && $target_id) {
-      $params['to_ids'] = $target_id;
-    }
-    $params['display'] = 'wap';
-    header('Location: '. $this->get_www_url('connect/prompt_feed.php', $params));
-  }
-}
diff --git a/plugins/Facebook/facebook/facebookapi_php5_restlib.php b/plugins/Facebook/facebook/facebookapi_php5_restlib.php
deleted file mode 100755
index e249a326b2..0000000000
--- a/plugins/Facebook/facebook/facebookapi_php5_restlib.php
+++ /dev/null
@@ -1,3702 +0,0 @@
-<?php
-// Copyright 2004-2009 Facebook. All Rights Reserved.
-//
-// +---------------------------------------------------------------------------+
-// | Facebook Platform PHP5 client                                             |
-// +---------------------------------------------------------------------------+
-// | Copyright (c) 2007-2009 Facebook, Inc.                                    |
-// | All rights reserved.                                                      |
-// |                                                                           |
-// | Redistribution and use in source and binary forms, with or without        |
-// | modification, are permitted provided that the following conditions        |
-// | are met:                                                                  |
-// |                                                                           |
-// | 1. Redistributions of source code must retain the above copyright         |
-// |    notice, this list of conditions and the following disclaimer.          |
-// | 2. 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.   |
-// |                                                                           |
-// | THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.         |
-// +---------------------------------------------------------------------------+
-// | For help with this library, contact developers-help@facebook.com          |
-// +---------------------------------------------------------------------------+
-//
-
-include_once 'jsonwrapper/jsonwrapper.php';
-
-class FacebookRestClient {
-  public $secret;
-  public $session_key;
-  public $api_key;
-  // to save making the friends.get api call, this will get prepopulated on
-  // canvas pages
-  public $friends_list;
-  public $user;
-  // to save making the pages.isAppAdded api call, this will get prepopulated
-  // on canvas pages
-  public $added;
-  public $is_user;
-  // we don't pass friends list to iframes, but we want to make
-  // friends_get really simple in the canvas_user (non-logged in) case.
-  // So we use the canvas_user as default arg to friends_get
-  public $canvas_user;
-  public $batch_mode;
-  private $batch_queue;
-  private $pending_batch;
-  private $call_as_apikey;
-  private $use_curl_if_available;
-  private $format = null;
-  private $using_session_secret = false;
-  private $rawData = null;
-
-  const BATCH_MODE_DEFAULT = 0;
-  const BATCH_MODE_SERVER_PARALLEL = 0;
-  const BATCH_MODE_SERIAL_ONLY = 2;
-
-  /**
-   * Create the client.
-   * @param string $session_key if you haven't gotten a session key yet, leave
-   *                            this as null and then set it later by just
-   *                            directly accessing the $session_key member
-   *                            variable.
-   */
-  public function __construct($api_key, $secret, $session_key=null) {
-    $this->secret       = $secret;
-    $this->session_key  = $session_key;
-    $this->api_key      = $api_key;
-    $this->batch_mode = FacebookRestClient::BATCH_MODE_DEFAULT;
-    $this->last_call_id = 0;
-    $this->call_as_apikey = '';
-    $this->use_curl_if_available = true;
-    $this->server_addr =
-      Facebook::get_facebook_url('api') . '/restserver.php';
-    $this->photo_server_addr =
-      Facebook::get_facebook_url('api-photo') . '/restserver.php';
-
-    if (!empty($GLOBALS['facebook_config']['debug'])) {
-      $this->cur_id = 0;
-      ?>
-<script type="text/javascript">
-var types = ['params', 'xml', 'php', 'sxml'];
-function getStyle(elem, style) {
-  if (elem.getStyle) {
-    return elem.getStyle(style);
-  } else {
-    return elem.style[style];
-  }
-}
-function setStyle(elem, style, value) {
-  if (elem.setStyle) {
-    elem.setStyle(style, value);
-  } else {
-    elem.style[style] = value;
-  }
-}
-function toggleDisplay(id, type) {
-  for (var i = 0; i < types.length; i++) {
-    var t = types[i];
-    var pre = document.getElementById(t + id);
-    if (pre) {
-      if (t != type || getStyle(pre, 'display') == 'block') {
-        setStyle(pre, 'display', 'none');
-      } else {
-        setStyle(pre, 'display', 'block');
-      }
-    }
-  }
-  return false;
-}
-</script>
-<?php
-    }
-  }
-
-  /**
-   * Set the default user id for methods that allow the caller
-   * to pass an uid parameter to identify the target user
-   * instead of a session key. This currently applies to
-   * the user preferences methods.
-   *
-   * @param $uid int the user id
-   */
-  public function set_user($uid) {
-    $this->user = $uid;
-  }
-
-
-  /**
-   * Switch to use the session secret instead of the app secret,
-   * for desktop and unsecured environment
-   */
-  public function use_session_secret($session_secret) {
-    $this->secret = $session_secret;
-    $this->using_session_secret = true;
-  }
-
-  /**
-   * Normally, if the cURL library/PHP extension is available, it is used for
-   * HTTP transactions.  This allows that behavior to be overridden, falling
-   * back to a vanilla-PHP implementation even if cURL is installed.
-   *
-   * @param $use_curl_if_available bool whether or not to use cURL if available
-   */
-  public function set_use_curl_if_available($use_curl_if_available) {
-    $this->use_curl_if_available = $use_curl_if_available;
-  }
-
-  /**
-   * Start a batch operation.
-   */
-  public function begin_batch() {
-    if ($this->pending_batch()) {
-      $code = FacebookAPIErrorCodes::API_EC_BATCH_ALREADY_STARTED;
-      $description = FacebookAPIErrorCodes::$api_error_descriptions[$code];
-      throw new FacebookRestClientException($description, $code);
-    }
-
-    $this->batch_queue = array();
-    $this->pending_batch = true;
-  }
-
-  /*
-   * End current batch operation
-   */
-  public function end_batch() {
-    if (!$this->pending_batch()) {
-      $code = FacebookAPIErrorCodes::API_EC_BATCH_NOT_STARTED;
-      $description = FacebookAPIErrorCodes::$api_error_descriptions[$code];
-      throw new FacebookRestClientException($description, $code);
-    }
-
-    $this->pending_batch = false;
-
-    $this->execute_server_side_batch();
-    $this->batch_queue = null;
-  }
-
-  /**
-   * are we currently queueing up calls for a batch?
-   */
-  public function pending_batch() {
-    return $this->pending_batch;
-  }
-
-  private function execute_server_side_batch() {
-    $item_count = count($this->batch_queue);
-    $method_feed = array();
-    foreach ($this->batch_queue as $batch_item) {
-      $method = $batch_item['m'];
-      $params = $batch_item['p'];
-      list($get, $post) = $this->finalize_params($method, $params);
-      $method_feed[] = $this->create_url_string(array_merge($post, $get));
-    }
-
-    $serial_only =
-      ($this->batch_mode == FacebookRestClient::BATCH_MODE_SERIAL_ONLY);
-
-    $params = array('method_feed' => json_encode($method_feed),
-                    'serial_only' => $serial_only,
-                    'format' => $this->format);
-    $result = $this->call_method('facebook.batch.run', $params);
-
-    if (is_array($result) && isset($result['error_code'])) {
-      throw new FacebookRestClientException($result['error_msg'],
-                                            $result['error_code']);
-    }
-
-    for ($i = 0; $i < $item_count; $i++) {
-      $batch_item = $this->batch_queue[$i];
-      $batch_item['p']['format'] = $this->format;
-      $batch_item_result = $this->convert_result($result[$i],
-                                                 $batch_item['m'],
-                                                 $batch_item['p']);
-
-      if (is_array($batch_item_result) &&
-          isset($batch_item_result['error_code'])) {
-        throw new FacebookRestClientException($batch_item_result['error_msg'],
-                                              $batch_item_result['error_code']);
-      }
-      $batch_item['r'] = $batch_item_result;
-    }
-  }
-
-  public function begin_permissions_mode($permissions_apikey) {
-    $this->call_as_apikey = $permissions_apikey;
-  }
-
-  public function end_permissions_mode() {
-    $this->call_as_apikey = '';
-  }
-
-
-  /*
-   * If a page is loaded via HTTPS, then all images and static
-   * resources need to be printed with HTTPS urls to avoid
-   * mixed content warnings. If your page loads with an HTTPS
-   * url, then call set_use_ssl_resources to retrieve the correct
-   * urls.
-   */
-  public function set_use_ssl_resources($is_ssl = true) {
-    $this->use_ssl_resources = $is_ssl;
-  }
-
-  /**
-   * Returns public information for an application (as shown in the application
-   * directory) by either application ID, API key, or canvas page name.
-   *
-   * @param int $application_id              (Optional) app id
-   * @param string $application_api_key      (Optional) api key
-   * @param string $application_canvas_name  (Optional) canvas name
-   *
-   * Exactly one argument must be specified, otherwise it is an error.
-   *
-   * @return array  An array of public information about the application.
-   */
-  public function application_getPublicInfo($application_id=null,
-                                            $application_api_key=null,
-                                            $application_canvas_name=null) {
-    return $this->call_method('facebook.application.getPublicInfo',
-        array('application_id' => $application_id,
-              'application_api_key' => $application_api_key,
-              'application_canvas_name' => $application_canvas_name));
-  }
-
-  /**
-   * Creates an authentication token to be used as part of the desktop login
-   * flow.  For more information, please see
-   * http://wiki.developers.facebook.com/index.php/Auth.createToken.
-   *
-   * @return string  An authentication token.
-   */
-  public function auth_createToken() {
-    return $this->call_method('facebook.auth.createToken');
-  }
-
-  /**
-   * Returns the session information available after current user logs in.
-   *
-   * @param string $auth_token the token returned by auth_createToken or
-   *               passed back to your callback_url.
-   * @param bool $generate_session_secret whether the session returned should
-   *             include a session secret
-   * @param string $host_url the connect site URL for which the session is
-   *               being generated.  This parameter is optional, unless
-   *               you want Facebook to determine which of several base domains
-   *               to choose from.  If this third argument isn't provided but
-   *               there are several base domains, the first base domain is
-   *               chosen.
-   *
-   * @return array  An assoc array containing session_key, uid
-   */
-  public function auth_getSession($auth_token,
-                                  $generate_session_secret = false,
-                                  $host_url = null) {
-    if (!$this->pending_batch()) {
-      $result = $this->call_method(
-        'facebook.auth.getSession',
-        array('auth_token' => $auth_token,
-              'generate_session_secret' => $generate_session_secret,
-              'host_url' => $host_url));
-      $this->session_key = $result['session_key'];
-
-      if (!empty($result['secret']) && !$generate_session_secret) {
-        // desktop apps have a special secret
-        $this->secret = $result['secret'];
-      }
-
-      return $result;
-    }
-  }
-
-  /**
-   * Generates a session-specific secret. This is for integration with
-   * client-side API calls, such as the JS library.
-   *
-   * @return array  A session secret for the current promoted session
-   *
-   * @error API_EC_PARAM_SESSION_KEY
-   *        API_EC_PARAM_UNKNOWN
-   */
-  public function auth_promoteSession() {
-      return $this->call_method('facebook.auth.promoteSession');
-  }
-
-  /**
-   * Expires the session that is currently being used.  If this call is
-   * successful, no further calls to the API (which require a session) can be
-   * made until a valid session is created.
-   *
-   * @return bool  true if session expiration was successful, false otherwise
-   */
-  public function auth_expireSession() {
-      return $this->call_method('facebook.auth.expireSession');
-  }
-
-  /**
-   *  Revokes the given extended permission that the user granted at some
-   *  prior time (for instance, offline_access or email).  If no user is
-   *  provided, it will be revoked for the user of the current session.
-   *
-   *  @param  string  $perm  The permission to revoke
-   *  @param  int     $uid   The user for whom to revoke the permission.
-   */
-  public function auth_revokeExtendedPermission($perm, $uid=null) {
-    return $this->call_method('facebook.auth.revokeExtendedPermission',
-        array('perm' => $perm, 'uid' => $uid));
-  }
-
-  /**
-   * Revokes the user's agreement to the Facebook Terms of Service for your
-   * application.  If you call this method for one of your users, you will no
-   * longer be able to make API requests on their behalf until they again
-   * authorize your application.  Use with care.  Note that if this method is
-   * called without a user parameter, then it will revoke access for the
-   * current session's user.
-   *
-   * @param int $uid  (Optional) User to revoke
-   *
-   * @return bool  true if revocation succeeds, false otherwise
-   */
-  public function auth_revokeAuthorization($uid=null) {
-      return $this->call_method('facebook.auth.revokeAuthorization',
-          array('uid' => $uid));
-  }
-
-  /**
-   * Get public key that is needed to verify digital signature
-   * an app may pass to other apps. The public key is only used by
-   * other apps for verification purposes.
-   * @param  string  API key of an app
-   * @return string  The public key for the app.
-   */
-  public function auth_getAppPublicKey($target_app_key) {
-    return $this->call_method('facebook.auth.getAppPublicKey',
-          array('target_app_key' => $target_app_key));
-  }
-
-  /**
-   * Get a structure that can be passed to another app
-   * as proof of session. The other app can verify it using public
-   * key of this app.
-   *
-   * @return signed public session data structure.
-   */
-  public function auth_getSignedPublicSessionData() {
-    return $this->call_method('facebook.auth.getSignedPublicSessionData',
-                              array());
-  }
-
-  /**
-   * Returns the number of unconnected friends that exist in this application.
-   * This number is determined based on the accounts registered through
-   * connect.registerUsers() (see below).
-   */
-  public function connect_getUnconnectedFriendsCount() {
-    return $this->call_method('facebook.connect.getUnconnectedFriendsCount',
-        array());
-  }
-
- /**
-  * This method is used to create an association between an external user
-  * account and a Facebook user account, as per Facebook Connect.
-  *
-  * This method takes an array of account data, including a required email_hash
-  * and optional account data. For each connected account, if the user exists,
-  * the information is added to the set of the user's connected accounts.
-  * If the user has already authorized the site, the connected account is added
-  * in the confirmed state. If the user has not yet authorized the site, the
-  * connected account is added in the pending state.
-  *
-  * This is designed to help Facebook Connect recognize when two Facebook
-  * friends are both members of a external site, but perhaps are not aware of
-  * it.  The Connect dialog (see fb:connect-form) is used when friends can be
-  * identified through these email hashes. See the following url for details:
-  *
-  *   http://wiki.developers.facebook.com/index.php/Connect.registerUsers
-  *
-  * @param mixed $accounts A (JSON-encoded) array of arrays, where each array
-  *                        has three properties:
-  *                        'email_hash'  (req) - public email hash of account
-  *                        'account_id'  (opt) - remote account id;
-  *                        'account_url' (opt) - url to remote account;
-  *
-  * @return array  The list of email hashes for the successfully registered
-  *                accounts.
-  */
-  public function connect_registerUsers($accounts) {
-    return $this->call_method('facebook.connect.registerUsers',
-        array('accounts' => $accounts));
-  }
-
- /**
-  * Unregisters a set of accounts registered using connect.registerUsers.
-  *
-  * @param array $email_hashes  The (JSON-encoded) list of email hashes to be
-  *                             unregistered.
-  *
-  * @return array  The list of email hashes which have been successfully
-  *                unregistered.
-  */
-  public function connect_unregisterUsers($email_hashes) {
-    return $this->call_method('facebook.connect.unregisterUsers',
-        array('email_hashes' => $email_hashes));
-  }
-
-  /**
-   * Returns events according to the filters specified.
-   *
-   * @param int $uid            (Optional) User associated with events. A null
-   *                            parameter will default to the session user.
-   * @param array/string $eids  (Optional) Filter by these event
-   *                            ids. A null parameter will get all events for
-   *                            the user. (A csv list will work but is deprecated)
-   * @param int $start_time     (Optional) Filter with this unix time as lower
-   *                            bound.  A null or zero parameter indicates no
-   *                            lower bound.
-   * @param int $end_time       (Optional) Filter with this UTC as upper bound.
-   *                            A null or zero parameter indicates no upper
-   *                            bound.
-   * @param string $rsvp_status (Optional) Only show events where the given uid
-   *                            has this rsvp status.  This only works if you
-   *                            have specified a value for $uid.  Values are as
-   *                            in events.getMembers.  Null indicates to ignore
-   *                            rsvp status when filtering.
-   *
-   * @return array  The events matching the query.
-   */
-  public function &events_get($uid=null,
-                              $eids=null,
-                              $start_time=null,
-                              $end_time=null,
-                              $rsvp_status=null) {
-    return $this->call_method('facebook.events.get',
-        array('uid' => $uid,
-              'eids' => $eids,
-              'start_time' => $start_time,
-              'end_time' => $end_time,
-              'rsvp_status' => $rsvp_status));
-  }
-
-  /**
-   * Returns membership list data associated with an event.
-   *
-   * @param int $eid  event id
-   *
-   * @return array  An assoc array of four membership lists, with keys
-   *                'attending', 'unsure', 'declined', and 'not_replied'
-   */
-  public function &events_getMembers($eid) {
-    return $this->call_method('facebook.events.getMembers',
-      array('eid' => $eid));
-  }
-
-  /**
-   * RSVPs the current user to this event.
-   *
-   * @param int $eid             event id
-   * @param string $rsvp_status  'attending', 'unsure', or 'declined'
-   *
-   * @return bool  true if successful
-   */
-  public function &events_rsvp($eid, $rsvp_status) {
-    return $this->call_method('facebook.events.rsvp',
-        array(
-        'eid' => $eid,
-        'rsvp_status' => $rsvp_status));
-  }
-
-  /**
-   * Cancels an event. Only works for events where application is the admin.
-   *
-   * @param int $eid                event id
-   * @param string $cancel_message  (Optional) message to send to members of
-   *                                the event about why it is cancelled
-   *
-   * @return bool  true if successful
-   */
-  public function &events_cancel($eid, $cancel_message='') {
-    return $this->call_method('facebook.events.cancel',
-        array('eid' => $eid,
-              'cancel_message' => $cancel_message));
-  }
-
-  /**
-   * Creates an event on behalf of the user is there is a session, otherwise on
-   * behalf of app.  Successful creation guarantees app will be admin.
-   *
-   * @param assoc array $event_info  json encoded event information
-   * @param string $file             (Optional) filename of picture to set
-   *
-   * @return int  event id
-   */
-  public function events_create($event_info, $file = null) {
-    if ($file) {
-      return $this->call_upload_method('facebook.events.create',
-        array('event_info' => $event_info),
-        $file,
-        $this->photo_server_addr);
-    } else {
-      return $this->call_method('facebook.events.create',
-        array('event_info' => $event_info));
-    }
-  }
-
-  /**
-   * Invites users to an event. If a session user exists, the session user
-   * must have permissions to invite friends to the event and $uids must contain
-   * a list of friend ids. Otherwise, the event must have been
-   * created by the app and $uids must contain users of the app.
-   * This method requires the 'create_event' extended permission to
-   * invite people on behalf of a user.
-   *
-   * @param $eid   the event id
-   * @param $uids  an array of users to invite
-   * @param $personal_message  a string containing the user's message
-   *                           (text only)
-   *
-   */
-  public function events_invite($eid, $uids, $personal_message) {
-    return $this->call_method('facebook.events.invite',
-                              array('eid' => $eid,
-                                    'uids' => $uids,
-                                    'personal_message' => $personal_message));
-  }
-
-  /**
-   * Edits an existing event. Only works for events where application is admin.
-   *
-   * @param int $eid                 event id
-   * @param assoc array $event_info  json encoded event information
-   * @param string $file             (Optional) filename of new picture to set
-   *
-   * @return bool  true if successful
-   */
-  public function events_edit($eid, $event_info, $file = null) {
-    if ($file) {
-      return $this->call_upload_method('facebook.events.edit',
-        array('eid' => $eid, 'event_info' => $event_info),
-        $file,
-        $this->photo_server_addr);
-    } else {
-      return $this->call_method('facebook.events.edit',
-        array('eid' => $eid,
-        'event_info' => $event_info));
-    }
-  }
-
-  /**
-   * Fetches and re-caches the image stored at the given URL, for use in images
-   * published to non-canvas pages via the API (for example, to user profiles
-   * via profile.setFBML, or to News Feed via feed.publishUserAction).
-   *
-   * @param string $url  The absolute URL from which to refresh the image.
-   *
-   * @return bool  true on success
-   */
-  public function &fbml_refreshImgSrc($url) {
-    return $this->call_method('facebook.fbml.refreshImgSrc',
-        array('url' => $url));
-  }
-
-  /**
-   * Fetches and re-caches the content stored at the given URL, for use in an
-   * fb:ref FBML tag.
-   *
-   * @param string $url  The absolute URL from which to fetch content. This URL
-   *                     should be used in a fb:ref FBML tag.
-   *
-   * @return bool  true on success
-   */
-  public function &fbml_refreshRefUrl($url) {
-    return $this->call_method('facebook.fbml.refreshRefUrl',
-        array('url' => $url));
-  }
-
- /**
-   * Associates a given "handle" with FBML markup so that the handle can be
-   * used within the fb:ref FBML tag. A handle is unique within an application
-   * and allows an application to publish identical FBML to many user profiles
-   * and do subsequent updates without having to republish FBML on behalf of
-   * each user.
-   *
-   * @param string $handle  The handle to associate with the given FBML.
-   * @param string $fbml    The FBML to associate with the given handle.
-   *
-   * @return bool  true on success
-   */
-  public function &fbml_setRefHandle($handle, $fbml) {
-    return $this->call_method('facebook.fbml.setRefHandle',
-        array('handle' => $handle, 'fbml' => $fbml));
-  }
-
-  /**
-   * Register custom tags for the application. Custom tags can be used
-   * to extend the set of tags available to applications in FBML
-   * markup.
-   *
-   * Before you call this function,
-   * make sure you read the full documentation at
-   *
-   * http://wiki.developers.facebook.com/index.php/Fbml.RegisterCustomTags
-   *
-   * IMPORTANT: This function overwrites the values of
-   * existing tags if the names match. Use this function with care because
-   * it may break the FBML of any application that is using the
-   * existing version of the tags.
-   *
-   * @param mixed $tags an array of tag objects (the full description is on the
-   *   wiki page)
-   *
-   * @return int  the number of tags that were registered
-   */
-  public function &fbml_registerCustomTags($tags) {
-    $tags = json_encode($tags);
-    return $this->call_method('facebook.fbml.registerCustomTags',
-                              array('tags' => $tags));
-  }
-
-  /**
-   * Get the custom tags for an application. If $app_id
-   * is not specified, the calling app's tags are returned.
-   * If $app_id is different from the id of the calling app,
-   * only the app's public tags are returned.
-   * The return value is an array of the same type as
-   * the $tags parameter of fbml_registerCustomTags().
-   *
-   * @param int $app_id the application's id (optional)
-   *
-   * @return mixed  an array containing the custom tag  objects
-   */
-  public function &fbml_getCustomTags($app_id = null) {
-    return $this->call_method('facebook.fbml.getCustomTags',
-                              array('app_id' => $app_id));
-  }
-
-
-  /**
-   * Delete custom tags the application has registered. If
-   * $tag_names is null, all the application's custom tags will be
-   * deleted.
-   *
-   * IMPORTANT: If your application has registered public tags
-   * that other applications may be using, don't delete those tags!
-   * Doing so can break the FBML ofapplications that are using them.
-   *
-   * @param array $tag_names the names of the tags to delete (optinal)
-   * @return bool true on success
-   */
-  public function &fbml_deleteCustomTags($tag_names = null) {
-    return $this->call_method('facebook.fbml.deleteCustomTags',
-                              array('tag_names' => json_encode($tag_names)));
-  }
-
-  /**
-   * Gets the best translations for native strings submitted by an application
-   * for translation. If $locale is not specified, only native strings and their
-   * descriptions are returned. If $all is true, then unapproved translations
-   * are returned as well, otherwise only approved translations are returned.
-   *
-   * A mapping of locale codes -> language names is available at
-   * http://wiki.developers.facebook.com/index.php/Facebook_Locales
-   *
-   * @param string $locale the locale to get translations for, or 'all' for all
-   *                       locales, or 'en_US' for native strings
-   * @param bool   $all    whether to return all or only approved translations
-   *
-   * @return array (locale, array(native_strings, array('best translation
-   *                available given enough votes or manual approval', approval
-   *                                                                  status)))
-   * @error API_EC_PARAM
-   * @error API_EC_PARAM_BAD_LOCALE
-   */
-  public function &intl_getTranslations($locale = 'en_US', $all = false) {
-    return $this->call_method('facebook.intl.getTranslations',
-                              array('locale' => $locale,
-                                    'all'    => $all));
-  }
-
-  /**
-   * Lets you insert text strings in their native language into the Facebook
-   * Translations database so they can be translated.
-   *
-   * @param array $native_strings  An array of maps, where each map has a 'text'
-   *                               field and a 'description' field.
-   *
-   * @return int  Number of strings uploaded.
-   */
-  public function &intl_uploadNativeStrings($native_strings) {
-    return $this->call_method('facebook.intl.uploadNativeStrings',
-        array('native_strings' => json_encode($native_strings)));
-  }
-
-  /**
-   * This method is deprecated for calls made on behalf of users. This method
-   * works only for publishing stories on a Facebook Page that has installed
-   * your application. To publish stories to a user's profile, use
-   * feed.publishUserAction instead.
-   *
-   * For more details on this call, please visit the wiki page:
-   *
-   * http://wiki.developers.facebook.com/index.php/Feed.publishTemplatizedAction
-   */
-  public function &feed_publishTemplatizedAction($title_template,
-                                                 $title_data,
-                                                 $body_template,
-                                                 $body_data,
-                                                 $body_general,
-                                                 $image_1=null,
-                                                 $image_1_link=null,
-                                                 $image_2=null,
-                                                 $image_2_link=null,
-                                                 $image_3=null,
-                                                 $image_3_link=null,
-                                                 $image_4=null,
-                                                 $image_4_link=null,
-                                                 $target_ids='',
-                                                 $page_actor_id=null) {
-    return $this->call_method('facebook.feed.publishTemplatizedAction',
-      array('title_template' => $title_template,
-            'title_data' => $title_data,
-            'body_template' => $body_template,
-            'body_data' => $body_data,
-            'body_general' => $body_general,
-            'image_1' => $image_1,
-            'image_1_link' => $image_1_link,
-            'image_2' => $image_2,
-            'image_2_link' => $image_2_link,
-            'image_3' => $image_3,
-            'image_3_link' => $image_3_link,
-            'image_4' => $image_4,
-            'image_4_link' => $image_4_link,
-            'target_ids' => $target_ids,
-            'page_actor_id' => $page_actor_id));
-  }
-
-  /**
-   * Registers a template bundle.  Template bundles are somewhat involved, so
-   * it's recommended you check out the wiki for more details:
-   *
-   *  http://wiki.developers.facebook.com/index.php/Feed.registerTemplateBundle
-   *
-   * @return string  A template bundle id
-   */
-  public function &feed_registerTemplateBundle($one_line_story_templates,
-                                               $short_story_templates = array(),
-                                               $full_story_template = null,
-                                               $action_links = array()) {
-
-    $one_line_story_templates = json_encode($one_line_story_templates);
-
-    if (!empty($short_story_templates)) {
-      $short_story_templates = json_encode($short_story_templates);
-    }
-
-    if (isset($full_story_template)) {
-      $full_story_template = json_encode($full_story_template);
-    }
-
-    if (isset($action_links)) {
-      $action_links = json_encode($action_links);
-    }
-
-    return $this->call_method('facebook.feed.registerTemplateBundle',
-        array('one_line_story_templates' => $one_line_story_templates,
-              'short_story_templates' => $short_story_templates,
-              'full_story_template' => $full_story_template,
-              'action_links' => $action_links));
-  }
-
-  /**
-   * Retrieves the full list of active template bundles registered by the
-   * requesting application.
-   *
-   * @return array  An array of template bundles
-   */
-  public function &feed_getRegisteredTemplateBundles() {
-    return $this->call_method('facebook.feed.getRegisteredTemplateBundles',
-        array());
-  }
-
-  /**
-   * Retrieves information about a specified template bundle previously
-   * registered by the requesting application.
-   *
-   * @param string $template_bundle_id  The template bundle id
-   *
-   * @return array  Template bundle
-   */
-  public function &feed_getRegisteredTemplateBundleByID($template_bundle_id) {
-    return $this->call_method('facebook.feed.getRegisteredTemplateBundleByID',
-        array('template_bundle_id' => $template_bundle_id));
-  }
-
-  /**
-   * Deactivates a previously registered template bundle.
-   *
-   * @param string $template_bundle_id  The template bundle id
-   *
-   * @return bool  true on success
-   */
-  public function &feed_deactivateTemplateBundleByID($template_bundle_id) {
-    return $this->call_method('facebook.feed.deactivateTemplateBundleByID',
-        array('template_bundle_id' => $template_bundle_id));
-  }
-
-  const STORY_SIZE_ONE_LINE = 1;
-  const STORY_SIZE_SHORT = 2;
-  const STORY_SIZE_FULL = 4;
-
-  /**
-   * Publishes a story on behalf of the user owning the session, using the
-   * specified template bundle. This method requires an active session key in
-   * order to be called.
-   *
-   * The parameters to this method ($templata_data in particular) are somewhat
-   * involved.  It's recommended you visit the wiki for details:
-   *
-   *  http://wiki.developers.facebook.com/index.php/Feed.publishUserAction
-   *
-   * @param int $template_bundle_id  A template bundle id previously registered
-   * @param array $template_data     See wiki article for syntax
-   * @param array $target_ids        (Optional) An array of friend uids of the
-   *                                 user who shared in this action.
-   * @param string $body_general     (Optional) Additional markup that extends
-   *                                 the body of a short story.
-   * @param int $story_size          (Optional) A story size (see above)
-   * @param string $user_message     (Optional) A user message for a short
-   *                                 story.
-   *
-   * @return bool  true on success
-   */
-  public function &feed_publishUserAction(
-      $template_bundle_id, $template_data, $target_ids='', $body_general='',
-      $story_size=FacebookRestClient::STORY_SIZE_ONE_LINE,
-      $user_message='') {
-
-    if (is_array($template_data)) {
-      $template_data = json_encode($template_data);
-    } // allow client to either pass in JSON or an assoc that we JSON for them
-
-    if (is_array($target_ids)) {
-      $target_ids = json_encode($target_ids);
-      $target_ids = trim($target_ids, "[]"); // we don't want square brackets
-    }
-
-    return $this->call_method('facebook.feed.publishUserAction',
-        array('template_bundle_id' => $template_bundle_id,
-              'template_data' => $template_data,
-              'target_ids' => $target_ids,
-              'body_general' => $body_general,
-              'story_size' => $story_size,
-              'user_message' => $user_message));
-  }
-
-
-  /**
-   * Publish a post to the user's stream.
-   *
-   * @param $message        the user's message
-   * @param $attachment     the post's attachment (optional)
-   * @param $action links   the post's action links (optional)
-   * @param $target_id      the user on whose wall the post will be posted
-   *                        (optional)
-   * @param $uid            the actor (defaults to session user)
-   * @return string the post id
-   */
-  public function stream_publish(
-    $message, $attachment = null, $action_links = null, $target_id = null,
-    $uid = null) {
-
-    return $this->call_method(
-      'facebook.stream.publish',
-      array('message' => $message,
-            'attachment' => $attachment,
-            'action_links' => $action_links,
-            'target_id' => $target_id,
-            'uid' => $this->get_uid($uid)));
-  }
-
-  /**
-   * Remove a post from the user's stream.
-   * Currently, you may only remove stories you application created.
-   *
-   * @param $post_id  the post id
-   * @param $uid      the actor (defaults to session user)
-   * @return bool
-   */
-  public function stream_remove($post_id, $uid = null) {
-    return $this->call_method(
-      'facebook.stream.remove',
-      array('post_id' => $post_id,
-            'uid' => $this->get_uid($uid)));
-  }
-
-  /**
-   * Add a comment to a stream post
-   *
-   * @param $post_id  the post id
-   * @param $comment  the comment text
-   * @param $uid      the actor (defaults to session user)
-   * @return string the id of the created comment
-   */
-  public function stream_addComment($post_id, $comment, $uid = null) {
-    return $this->call_method(
-      'facebook.stream.addComment',
-      array('post_id' => $post_id,
-            'comment' => $comment,
-            'uid' => $this->get_uid($uid)));
-  }
-
-
-  /**
-   * Remove a comment from a stream post
-   *
-   * @param $comment_id  the comment id
-   * @param $uid      the actor (defaults to session user)
-   * @return bool
-   */
-  public function stream_removeComment($comment_id, $uid = null) {
-    return $this->call_method(
-      'facebook.stream.removeComment',
-      array('comment_id' => $comment_id,
-            'uid' => $this->get_uid($uid)));
-  }
-
-  /**
-   * Add a like to a stream post
-   *
-   * @param $post_id  the post id
-   * @param $uid      the actor (defaults to session user)
-   * @return bool
-   */
-  public function stream_addLike($post_id, $uid = null) {
-    return $this->call_method(
-      'facebook.stream.addLike',
-      array('post_id' => $post_id,
-            'uid' => $this->get_uid($uid)));
-  }
-
-  /**
-   * Remove a like from a stream post
-   *
-   * @param $post_id  the post id
-   * @param $uid      the actor (defaults to session user)
-   * @return bool
-   */
-  public function stream_removeLike($post_id, $uid = null) {
-    return $this->call_method(
-      'facebook.stream.removeLike',
-      array('post_id' => $post_id,
-            'uid' => $this->get_uid($uid)));
-  }
-
-  /**
-   * For the current user, retrieves stories generated by the user's friends
-   * while using this application.  This can be used to easily create a
-   * "News Feed" like experience.
-   *
-   * @return array  An array of feed story objects.
-   */
-  public function &feed_getAppFriendStories() {
-    return $this->call_method('facebook.feed.getAppFriendStories');
-  }
-
-  /**
-   * Makes an FQL query.  This is a generalized way of accessing all the data
-   * in the API, as an alternative to most of the other method calls.  More
-   * info at http://wiki.developers.facebook.com/index.php/FQL
-   *
-   * @param string $query  the query to evaluate
-   *
-   * @return array  generalized array representing the results
-   */
-  public function &fql_query($query) {
-    return $this->call_method('facebook.fql.query',
-      array('query' => $query));
-  }
-
-  /**
-   * Makes a set of FQL queries in parallel.  This method takes a dictionary
-   * of FQL queries where the keys are names for the queries.  Results from
-   * one query can be used within another query to fetch additional data.  More
-   * info about FQL queries at http://wiki.developers.facebook.com/index.php/FQL
-   *
-   * @param string $queries  JSON-encoded dictionary of queries to evaluate
-   *
-   * @return array  generalized array representing the results
-   */
-  public function &fql_multiquery($queries) {
-    return $this->call_method('facebook.fql.multiquery',
-      array('queries' => $queries));
-  }
-
-  /**
-   * Returns whether or not pairs of users are friends.
-   * Note that the Facebook friend relationship is symmetric.
-   *
-   * @param array/string $uids1  list of ids (id_1, id_2,...)
-   *                       of some length X (csv is deprecated)
-   * @param array/string $uids2  list of ids (id_A, id_B,...)
-   *                       of SAME length X (csv is deprecated)
-   *
-   * @return array  An array with uid1, uid2, and bool if friends, e.g.:
-   *   array(0 => array('uid1' => id_1, 'uid2' => id_A, 'are_friends' => 1),
-   *         1 => array('uid1' => id_2, 'uid2' => id_B, 'are_friends' => 0)
-   *         ...)
-   * @error
-   *    API_EC_PARAM_USER_ID_LIST
-   */
-  public function &friends_areFriends($uids1, $uids2) {
-    return $this->call_method('facebook.friends.areFriends',
-                 array('uids1' => $uids1,
-                       'uids2' => $uids2));
-  }
-
-  /**
-   * Returns the friends of the current session user.
-   *
-   * @param int $flid  (Optional) Only return friends on this friend list.
-   * @param int $uid   (Optional) Return friends for this user.
-   *
-   * @return array  An array of friends
-   */
-  public function &friends_get($flid=null, $uid = null) {
-    if (isset($this->friends_list)) {
-      return $this->friends_list;
-    }
-    $params = array();
-    if (!$uid && isset($this->canvas_user)) {
-      $uid = $this->canvas_user;
-    }
-    if ($uid) {
-      $params['uid'] = $uid;
-    }
-    if ($flid) {
-      $params['flid'] = $flid;
-    }
-    return $this->call_method('facebook.friends.get', $params);
-
-  }
-
-  /**
-   * Returns the mutual friends between the target uid and a source uid or
-   * the current session user.
-   *
-   * @param int $target_uid Target uid for which mutual friends will be found.
-   * @param int $source_uid (optional) Source uid for which mutual friends will
-   *                                   be found. If no source_uid is specified,
-   *                                   source_id will default to the session
-   *                                   user.
-   * @return array  An array of friend uids
-   */
-  public function &friends_getMutualFriends($target_uid, $source_uid = null) {
-    return $this->call_method('facebook.friends.getMutualFriends',
-                              array("target_uid" => $target_uid,
-                                    "source_uid" => $source_uid));
-  }
-
-  /**
-   * Returns the set of friend lists for the current session user.
-   *
-   * @return array  An array of friend list objects
-   */
-  public function &friends_getLists() {
-    return $this->call_method('facebook.friends.getLists');
-  }
-
-  /**
-   * Returns the friends of the session user, who are also users
-   * of the calling application.
-   *
-   * @return array  An array of friends also using the app
-   */
-  public function &friends_getAppUsers() {
-    return $this->call_method('facebook.friends.getAppUsers');
-  }
-
-  /**
-   * Returns groups according to the filters specified.
-   *
-   * @param int $uid     (Optional) User associated with groups.  A null
-   *                     parameter will default to the session user.
-   * @param array/string $gids (Optional) Array of group ids to query. A null
-   *                     parameter will get all groups for the user.
-   *                     (csv is deprecated)
-   *
-   * @return array  An array of group objects
-   */
-  public function &groups_get($uid, $gids) {
-    return $this->call_method('facebook.groups.get',
-        array('uid' => $uid,
-              'gids' => $gids));
-  }
-
-  /**
-   * Returns the membership list of a group.
-   *
-   * @param int $gid  Group id
-   *
-   * @return array  An array with four membership lists, with keys 'members',
-   *                'admins', 'officers', and 'not_replied'
-   */
-  public function &groups_getMembers($gid) {
-    return $this->call_method('facebook.groups.getMembers',
-      array('gid' => $gid));
-  }
-
-  /**
-   * Returns cookies according to the filters specified.
-   *
-   * @param int $uid     User for which the cookies are needed.
-   * @param string $name (Optional) A null parameter will get all cookies
-   *                     for the user.
-   *
-   * @return array  Cookies!  Nom nom nom nom nom.
-   */
-  public function data_getCookies($uid, $name) {
-    return $this->call_method('facebook.data.getCookies',
-        array('uid' => $uid,
-              'name' => $name));
-  }
-
-  /**
-   * Sets cookies according to the params specified.
-   *
-   * @param int $uid       User for which the cookies are needed.
-   * @param string $name   Name of the cookie
-   * @param string $value  (Optional) if expires specified and is in the past
-   * @param int $expires   (Optional) Expiry time
-   * @param string $path   (Optional) Url path to associate with (default is /)
-   *
-   * @return bool  true on success
-   */
-  public function data_setCookie($uid, $name, $value, $expires, $path) {
-    return $this->call_method('facebook.data.setCookie',
-        array('uid' => $uid,
-              'name' => $name,
-              'value' => $value,
-              'expires' => $expires,
-              'path' => $path));
-  }
-
-  /**
-   * Retrieves links posted by the given user.
-   *
-   * @param int    $uid      The user whose links you wish to retrieve
-   * @param int    $limit    The maximimum number of links to retrieve
-   * @param array $link_ids (Optional) Array of specific link
-   *                          IDs to retrieve by this user
-   *
-   * @return array  An array of links.
-   */
-  public function &links_get($uid, $limit, $link_ids = null) {
-    return $this->call_method('links.get',
-        array('uid' => $uid,
-              'limit' => $limit,
-              'link_ids' => $link_ids));
-  }
-
-  /**
-   * Posts a link on Facebook.
-   *
-   * @param string $url     URL/link you wish to post
-   * @param string $comment (Optional) A comment about this link
-   * @param int    $uid     (Optional) User ID that is posting this link;
-   *                        defaults to current session user
-   *
-   * @return bool
-   */
-  public function &links_post($url, $comment='', $uid = null) {
-    return $this->call_method('links.post',
-        array('uid' => $uid,
-              'url' => $url,
-              'comment' => $comment));
-  }
-
-  /**
-   * Permissions API
-   */
-
-  /**
-   * Checks API-access granted by self to the specified application.
-   *
-   * @param string $permissions_apikey  Other application key
-   *
-   * @return array  API methods/namespaces which are allowed access
-   */
-  public function permissions_checkGrantedApiAccess($permissions_apikey) {
-    return $this->call_method('facebook.permissions.checkGrantedApiAccess',
-        array('permissions_apikey' => $permissions_apikey));
-  }
-
-  /**
-   * Checks API-access granted to self by the specified application.
-   *
-   * @param string $permissions_apikey  Other application key
-   *
-   * @return array  API methods/namespaces which are allowed access
-   */
-  public function permissions_checkAvailableApiAccess($permissions_apikey) {
-    return $this->call_method('facebook.permissions.checkAvailableApiAccess',
-        array('permissions_apikey' => $permissions_apikey));
-  }
-
-  /**
-   * Grant API-access to the specified methods/namespaces to the specified
-   * application.
-   *
-   * @param string $permissions_apikey  Other application key
-   * @param array(string) $method_arr   (Optional) API methods/namespaces
-   *                                    allowed
-   *
-   * @return array  API methods/namespaces which are allowed access
-   */
-  public function permissions_grantApiAccess($permissions_apikey, $method_arr) {
-    return $this->call_method('facebook.permissions.grantApiAccess',
-        array('permissions_apikey' => $permissions_apikey,
-              'method_arr' => $method_arr));
-  }
-
-  /**
-   * Revoke API-access granted to the specified application.
-   *
-   * @param string $permissions_apikey  Other application key
-   *
-   * @return bool  true on success
-   */
-  public function permissions_revokeApiAccess($permissions_apikey) {
-    return $this->call_method('facebook.permissions.revokeApiAccess',
-        array('permissions_apikey' => $permissions_apikey));
-  }
-
-  /**
-   * Payments Order API
-   */
-
-  /**
-   * Set Payments properties for an app.
-   *
-   * @param  properties  a map from property names to  values
-   * @return             true on success
-   */
-  public function payments_setProperties($properties) {
-    return $this->call_method ('facebook.payments.setProperties',
-        array('properties' => json_encode($properties)));
-  }
-
-  public function payments_getOrderDetails($order_id) {
-    return json_decode($this->call_method(
-        'facebook.payments.getOrderDetails',
-        array('order_id' => $order_id)), true);
-  }
-
-  public function payments_updateOrder($order_id, $status,
-                                         $params) {
-    return $this->call_method('facebook.payments.updateOrder',
-        array('order_id' => $order_id,
-              'status' => $status,
-              'params' => json_encode($params)));
-  }
-
-  public function payments_getOrders($status, $start_time,
-                                       $end_time, $test_mode=false) {
-    return json_decode($this->call_method('facebook.payments.getOrders',
-        array('status' => $status,
-              'start_time' => $start_time,
-              'end_time' => $end_time,
-              'test_mode' => $test_mode)), true);
-  }
-
-  /**
-   * Gifts API
-   */
-
-  /**
-   * Get Gifts associated with an app
-   *
-   * @return             array of gifts
-   */
-  public function gifts_get() {
-    return json_decode(
-        $this->call_method('facebook.gifts.get',
-                           array()),
-        true
-        );
-  }
-
-  /*
-   * Update gifts stored by an app
-   *
-   * @param array containing gift_id => gift_data to be updated
-   * @return array containing gift_id => true/false indicating success
-   *                                     in updating that gift
-   */
-  public function gifts_update($update_array) {
-    return json_decode(
-      $this->call_method('facebook.gifts.update',
-                         array('update_str' => json_encode($update_array))
-                        ),
-      true
-    );
-  }
-
-
-  /**
-   * Creates a note with the specified title and content.
-   *
-   * @param string $title   Title of the note.
-   * @param string $content Content of the note.
-   * @param int    $uid     (Optional) The user for whom you are creating a
-   *                        note; defaults to current session user
-   *
-   * @return int   The ID of the note that was just created.
-   */
-  public function &notes_create($title, $content, $uid = null) {
-    return $this->call_method('notes.create',
-        array('uid' => $uid,
-              'title' => $title,
-              'content' => $content));
-  }
-
-  /**
-   * Deletes the specified note.
-   *
-   * @param int $note_id  ID of the note you wish to delete
-   * @param int $uid      (Optional) Owner of the note you wish to delete;
-   *                      defaults to current session user
-   *
-   * @return bool
-   */
-  public function &notes_delete($note_id, $uid = null) {
-    return $this->call_method('notes.delete',
-        array('uid' => $uid,
-              'note_id' => $note_id));
-  }
-
-  /**
-   * Edits a note, replacing its title and contents with the title
-   * and contents specified.
-   *
-   * @param int    $note_id  ID of the note you wish to edit
-   * @param string $title    Replacement title for the note
-   * @param string $content  Replacement content for the note
-   * @param int    $uid      (Optional) Owner of the note you wish to edit;
-   *                         defaults to current session user
-   *
-   * @return bool
-   */
-  public function &notes_edit($note_id, $title, $content, $uid = null) {
-    return $this->call_method('notes.edit',
-        array('uid' => $uid,
-              'note_id' => $note_id,
-              'title' => $title,
-              'content' => $content));
-  }
-
-  /**
-   * Retrieves all notes by a user. If note_ids are specified,
-   * retrieves only those specific notes by that user.
-   *
-   * @param int    $uid      User whose notes you wish to retrieve
-   * @param array  $note_ids (Optional) List of specific note
-   *                         IDs by this user to retrieve
-   *
-   * @return array A list of all of the given user's notes, or an empty list
-   *               if the viewer lacks permissions or if there are no visible
-   *               notes.
-   */
-  public function &notes_get($uid, $note_ids = null) {
-    return $this->call_method('notes.get',
-        array('uid' => $uid,
-              'note_ids' => $note_ids));
-  }
-
-
-  /**
-   * Returns the outstanding notifications for the session user.
-   *
-   * @return array An assoc array of notification count objects for
-   *               'messages', 'pokes' and 'shares', a uid list of
-   *               'friend_requests', a gid list of 'group_invites',
-   *               and an eid list of 'event_invites'
-   */
-  public function &notifications_get() {
-    return $this->call_method('facebook.notifications.get');
-  }
-
-  /**
-   * Sends a notification to the specified users.
-   *
-   * @return A comma separated list of successful recipients
-   * @error
-   *    API_EC_PARAM_USER_ID_LIST
-   */
-  public function &notifications_send($to_ids, $notification, $type) {
-    return $this->call_method('facebook.notifications.send',
-        array('to_ids' => $to_ids,
-              'notification' => $notification,
-              'type' => $type));
-  }
-
-  /**
-   * Sends an email to the specified user of the application.
-   *
-   * @param array/string $recipients array of ids of the recipients (csv is deprecated)
-   * @param string $subject    subject of the email
-   * @param string $text       (plain text) body of the email
-   * @param string $fbml       fbml markup for an html version of the email
-   *
-   * @return string  A comma separated list of successful recipients
-   * @error
-   *    API_EC_PARAM_USER_ID_LIST
-   */
-  public function &notifications_sendEmail($recipients,
-                                           $subject,
-                                           $text,
-                                           $fbml) {
-    return $this->call_method('facebook.notifications.sendEmail',
-        array('recipients' => $recipients,
-              'subject' => $subject,
-              'text' => $text,
-              'fbml' => $fbml));
-  }
-
-  /**
-   * Returns the requested info fields for the requested set of pages.
-   *
-   * @param array/string $page_ids  an array of page ids (csv is deprecated)
-   * @param array/string  $fields    an array of strings describing the
-   *                           info fields desired (csv is deprecated)
-   * @param int    $uid       (Optional) limit results to pages of which this
-   *                          user is a fan.
-   * @param string type       limits results to a particular type of page.
-   *
-   * @return array  An array of pages
-   */
-  public function &pages_getInfo($page_ids, $fields, $uid, $type) {
-    return $this->call_method('facebook.pages.getInfo',
-        array('page_ids' => $page_ids,
-              'fields' => $fields,
-              'uid' => $uid,
-              'type' => $type));
-  }
-
-  /**
-   * Returns true if the given user is an admin for the passed page.
-   *
-   * @param int $page_id  target page id
-   * @param int $uid      (Optional) user id (defaults to the logged-in user)
-   *
-   * @return bool  true on success
-   */
-  public function &pages_isAdmin($page_id, $uid = null) {
-    return $this->call_method('facebook.pages.isAdmin',
-        array('page_id' => $page_id,
-              'uid' => $uid));
-  }
-
-  /**
-   * Returns whether or not the given page has added the application.
-   *
-   * @param int $page_id  target page id
-   *
-   * @return bool  true on success
-   */
-  public function &pages_isAppAdded($page_id) {
-    return $this->call_method('facebook.pages.isAppAdded',
-        array('page_id' => $page_id));
-  }
-
-  /**
-   * Returns true if logged in user is a fan for the passed page.
-   *
-   * @param int $page_id target page id
-   * @param int $uid user to compare.  If empty, the logged in user.
-   *
-   * @return bool  true on success
-   */
-  public function &pages_isFan($page_id, $uid = null) {
-    return $this->call_method('facebook.pages.isFan',
-        array('page_id' => $page_id,
-              'uid' => $uid));
-  }
-
-  /**
-   * Adds a tag with the given information to a photo. See the wiki for details:
-   *
-   *  http://wiki.developers.facebook.com/index.php/Photos.addTag
-   *
-   * @param int $pid          The ID of the photo to be tagged
-   * @param int $tag_uid      The ID of the user being tagged. You must specify
-   *                          either the $tag_uid or the $tag_text parameter
-   *                          (unless $tags is specified).
-   * @param string $tag_text  Some text identifying the person being tagged.
-   *                          You must specify either the $tag_uid or $tag_text
-   *                          parameter (unless $tags is specified).
-   * @param float $x          The horizontal position of the tag, as a
-   *                          percentage from 0 to 100, from the left of the
-   *                          photo.
-   * @param float $y          The vertical position of the tag, as a percentage
-   *                          from 0 to 100, from the top of the photo.
-   * @param array $tags       (Optional) An array of maps, where each map
-   *                          can contain the tag_uid, tag_text, x, and y
-   *                          parameters defined above.  If specified, the
-   *                          individual arguments are ignored.
-   * @param int $owner_uid    (Optional)  The user ID of the user whose photo
-   *                          you are tagging. If this parameter is not
-   *                          specified, then it defaults to the session user.
-   *
-   * @return bool  true on success
-   */
-  public function &photos_addTag($pid,
-                                 $tag_uid,
-                                 $tag_text,
-                                 $x,
-                                 $y,
-                                 $tags,
-                                 $owner_uid=0) {
-    return $this->call_method('facebook.photos.addTag',
-        array('pid' => $pid,
-              'tag_uid' => $tag_uid,
-              'tag_text' => $tag_text,
-              'x' => $x,
-              'y' => $y,
-              'tags' => (is_array($tags)) ? json_encode($tags) : null,
-              'owner_uid' => $this->get_uid($owner_uid)));
-  }
-
-  /**
-   * Creates and returns a new album owned by the specified user or the current
-   * session user.
-   *
-   * @param string $name         The name of the album.
-   * @param string $description  (Optional) A description of the album.
-   * @param string $location     (Optional) A description of the location.
-   * @param string $visible      (Optional) A privacy setting for the album.
-   *                             One of 'friends', 'friends-of-friends',
-   *                             'networks', or 'everyone'.  Default 'everyone'.
-   * @param int $uid             (Optional) User id for creating the album; if
-   *                             not specified, the session user is used.
-   *
-   * @return array  An album object
-   */
-  public function &photos_createAlbum($name,
-                                      $description='',
-                                      $location='',
-                                      $visible='',
-                                      $uid=0) {
-    return $this->call_method('facebook.photos.createAlbum',
-        array('name' => $name,
-              'description' => $description,
-              'location' => $location,
-              'visible' => $visible,
-              'uid' => $this->get_uid($uid)));
-  }
-
-  /**
-   * Returns photos according to the filters specified.
-   *
-   * @param int $subj_id  (Optional) Filter by uid of user tagged in the photos.
-   * @param int $aid      (Optional) Filter by an album, as returned by
-   *                      photos_getAlbums.
-   * @param array/string $pids   (Optional) Restrict to an array of pids
-   *                             (csv is deprecated)
-   *
-   * Note that at least one of these parameters needs to be specified, or an
-   * error is returned.
-   *
-   * @return array  An array of photo objects.
-   */
-  public function &photos_get($subj_id, $aid, $pids) {
-    return $this->call_method('facebook.photos.get',
-      array('subj_id' => $subj_id, 'aid' => $aid, 'pids' => $pids));
-  }
-
-  /**
-   * Returns the albums created by the given user.
-   *
-   * @param int $uid      (Optional) The uid of the user whose albums you want.
-   *                       A null will return the albums of the session user.
-   * @param string $aids  (Optional) An array of aids to restrict
-   *                       the query. (csv is deprecated)
-   *
-   * Note that at least one of the (uid, aids) parameters must be specified.
-   *
-   * @returns an array of album objects.
-   */
-  public function &photos_getAlbums($uid, $aids) {
-    return $this->call_method('facebook.photos.getAlbums',
-      array('uid' => $uid,
-            'aids' => $aids));
-  }
-
-  /**
-   * Returns the tags on all photos specified.
-   *
-   * @param string $pids  A list of pids to query
-   *
-   * @return array  An array of photo tag objects, which include pid,
-   *                subject uid, and two floating-point numbers (xcoord, ycoord)
-   *                for tag pixel location.
-   */
-  public function &photos_getTags($pids) {
-    return $this->call_method('facebook.photos.getTags',
-      array('pids' => $pids));
-  }
-
-  /**
-   * Uploads a photo.
-   *
-   * @param string $file     The location of the photo on the local filesystem.
-   * @param int $aid         (Optional) The album into which to upload the
-   *                         photo.
-   * @param string $caption  (Optional) A caption for the photo.
-   * @param int uid          (Optional) The user ID of the user whose photo you
-   *                         are uploading
-   *
-   * @return array  An array of user objects
-   */
-  public function photos_upload($file, $aid=null, $caption=null, $uid=null) {
-    return $this->call_upload_method('facebook.photos.upload',
-                                     array('aid' => $aid,
-                                           'caption' => $caption,
-                                           'uid' => $uid),
-                                     $file);
-  }
-
-
-  /**
-   * Uploads a video.
-   *
-   * @param  string $file        The location of the video on the local filesystem.
-   * @param  string $title       (Optional) A title for the video. Titles over 65 characters in length will be truncated.
-   * @param  string $description (Optional) A description for the video.
-   *
-   * @return array  An array with the video's ID, title, description, and a link to view it on Facebook.
-   */
-  public function video_upload($file, $title=null, $description=null) {
-    return $this->call_upload_method('facebook.video.upload',
-                                     array('title' => $title,
-                                           'description' => $description),
-                                     $file,
-                                     Facebook::get_facebook_url('api-video') . '/restserver.php');
-  }
-
-  /**
-   * Returns an array with the video limitations imposed on the current session's
-   * associated user. Maximum length is measured in seconds; maximum size is
-   * measured in bytes.
-   *
-   * @return array  Array with "length" and "size" keys
-   */
-  public function &video_getUploadLimits() {
-    return $this->call_method('facebook.video.getUploadLimits');
-  }
-
-  /**
-   * Returns the requested info fields for the requested set of users.
-   *
-   * @param array/string $uids    An array of user ids (csv is deprecated)
-   * @param array/string $fields  An array of info field names desired (csv is deprecated)
-   *
-   * @return array  An array of user objects
-   */
-  public function &users_getInfo($uids, $fields) {
-    return $this->call_method('facebook.users.getInfo',
-                  array('uids' => $uids,
-                        'fields' => $fields));
-  }
-
-  /**
-   * Returns the requested info fields for the requested set of users. A
-   * session key must not be specified. Only data about users that have
-   * authorized your application will be returned.
-   *
-   * Check the wiki for fields that can be queried through this API call.
-   * Data returned from here should not be used for rendering to application
-   * users, use users.getInfo instead, so that proper privacy rules will be
-   * applied.
-   *
-   * @param array/string $uids    An array of user ids (csv is deprecated)
-   * @param array/string $fields  An array of info field names desired (csv is deprecated)
-   *
-   * @return array  An array of user objects
-   */
-  public function &users_getStandardInfo($uids, $fields) {
-    return $this->call_method('facebook.users.getStandardInfo',
-                              array('uids' => $uids,
-                                    'fields' => $fields));
-  }
-
-  /**
-   * Returns the user corresponding to the current session object.
-   *
-   * @return integer  User id
-   */
-  public function &users_getLoggedInUser() {
-    return $this->call_method('facebook.users.getLoggedInUser');
-  }
-
-  /**
-   * Returns 1 if the user has the specified permission, 0 otherwise.
-   * http://wiki.developers.facebook.com/index.php/Users.hasAppPermission
-   *
-   * @return integer  1 or 0
-   */
-  public function &users_hasAppPermission($ext_perm, $uid=null) {
-    return $this->call_method('facebook.users.hasAppPermission',
-        array('ext_perm' => $ext_perm, 'uid' => $uid));
-  }
-
-  /**
-   * Returns whether or not the user corresponding to the current
-   * session object has the give the app basic authorization.
-   *
-   * @return boolean  true if the user has authorized the app
-   */
-  public function &users_isAppUser($uid=null) {
-    if ($uid === null && isset($this->is_user)) {
-      return $this->is_user;
-    }
-
-    return $this->call_method('facebook.users.isAppUser', array('uid' => $uid));
-  }
-
-  /**
-   * Returns whether or not the user corresponding to the current
-   * session object is verified by Facebook. See the documentation
-   * for Users.isVerified for details.
-   *
-   * @return boolean  true if the user is verified
-   */
-  public function &users_isVerified() {
-    return $this->call_method('facebook.users.isVerified');
-  }
-
-  /**
-   * Sets the users' current status message. Message does NOT contain the
-   * word "is" , so make sure to include a verb.
-   *
-   * Example: setStatus("is loving the API!")
-   * will produce the status "Luke is loving the API!"
-   *
-   * @param string $status                text-only message to set
-   * @param int    $uid                   user to set for (defaults to the
-   *                                      logged-in user)
-   * @param bool   $clear                 whether or not to clear the status,
-   *                                      instead of setting it
-   * @param bool   $status_includes_verb  if true, the word "is" will *not* be
-   *                                      prepended to the status message
-   *
-   * @return boolean
-   */
-  public function &users_setStatus($status,
-                                   $uid = null,
-                                   $clear = false,
-                                   $status_includes_verb = true) {
-    $args = array(
-      'status' => $status,
-      'uid' => $uid,
-      'clear' => $clear,
-      'status_includes_verb' => $status_includes_verb,
-    );
-    return $this->call_method('facebook.users.setStatus', $args);
-  }
-
-  /**
-   * Gets the comments for a particular xid. This is essentially a wrapper
-   * around the comment FQL table.
-   *
-   * @param string $xid external id associated with the comments
-   *
-   * @return array of comment objects
-   */
-  public function &comments_get($xid) {
-    $args = array('xid' => $xid);
-    return $this->call_method('facebook.comments.get', $args);
-  }
-
-  /**
-   * Add a comment to a particular xid on behalf of a user. If called
-   * without an app_secret (with session secret), this will only work
-   * for the session user.
-   *
-   * @param string $xid   external id associated with the comments
-   * @param string $text  text of the comment
-   * @param int    $uid   user adding the comment (def: session user)
-   * @param string $title optional title for the stream story
-   * @param string $url   optional url for the stream story
-   * @param bool   $publish_to_stream publish a feed story about this comment?
-   *                      a link will be generated to title/url in the story
-   *
-   * @return string comment_id associated with the comment
-   */
-  public function &comments_add($xid, $text, $uid=0, $title='', $url='',
-                                $publish_to_stream=false) {
-    $args = array(
-      'xid'               => $xid,
-      'uid'               => $this->get_uid($uid),
-      'text'              => $text,
-      'title'             => $title,
-      'url'               => $url,
-      'publish_to_stream' => $publish_to_stream);
-
-    return $this->call_method('facebook.comments.add', $args);
-  }
-
-  /**
-   * Remove a particular comment.
-   *
-   * @param string $xid        the external id associated with the comments
-   * @param string $comment_id id of the comment to remove (returned by
-   *                           comments.add and comments.get)
-   *
-   * @return boolean
-   */
-  public function &comments_remove($xid, $comment_id) {
-    $args = array(
-      'xid'        => $xid,
-      'comment_id' => $comment_id);
-    return $this->call_method('facebook.comments.remove', $args);
-  }
-
-  /**
-   * Gets the stream on behalf of a user using a set of users. This
-   * call will return the latest $limit queries between $start_time
-   * and $end_time.
-   *
-   * @param int    $viewer_id  user making the call (def: session)
-   * @param array  $source_ids users/pages to look at (def: all connections)
-   * @param int    $start_time start time to look for stories (def: 1 day ago)
-   * @param int    $end_time   end time to look for stories (def: now)
-   * @param int    $limit      number of stories to attempt to fetch (def: 30)
-   * @param string $filter_key key returned by stream.getFilters to fetch
-   * @param array  $metadata   metadata to include with the return, allows
-   *                           requested metadata to be returned, such as
-   *                           profiles, albums, photo_tags
-   *
-   * @return array(
-   *           'posts'      => array of posts,
-   *           // if requested, the following data may be returned
-   *           'profiles'   => array of profile metadata of users/pages in posts
-   *           'albums'     => array of album metadata in posts
-   *           'photo_tags' => array of photo_tags for photos in posts
-   *         )
-   */
-  public function &stream_get($viewer_id = null,
-                              $source_ids = null,
-                              $start_time = 0,
-                              $end_time = 0,
-                              $limit = 30,
-                              $filter_key = '',
-                              $exportable_only = false,
-                              $metadata = null,
-                              $post_ids = null) {
-    $args = array(
-      'viewer_id'  => $viewer_id,
-      'source_ids' => $source_ids,
-      'start_time' => $start_time,
-      'end_time'   => $end_time,
-      'limit'      => $limit,
-      'filter_key' => $filter_key,
-      'exportable_only' => $exportable_only,
-      'metadata' => $metadata,
-      'post_ids' => $post_ids);
-    return $this->call_method('facebook.stream.get', $args);
-  }
-
-  /**
-   * Gets the filters (with relevant filter keys for stream.get) for a
-   * particular user. These filters are typical things like news feed,
-   * friend lists, networks. They can be used to filter the stream
-   * without complex queries to determine which ids belong in which groups.
-   *
-   * @param int $uid user to get filters for
-   *
-   * @return array of stream filter objects
-   */
-  public function &stream_getFilters($uid = null) {
-    $args = array('uid' => $uid);
-    return $this->call_method('facebook.stream.getFilters', $args);
-  }
-
-  /**
-   * Gets the full comments given a post_id from stream.get or the
-   * stream FQL table. Initially, only a set of preview comments are
-   * returned because some posts can have many comments.
-   *
-   * @param string $post_id id of the post to get comments for
-   *
-   * @return array of comment objects
-   */
-  public function &stream_getComments($post_id) {
-    $args = array('post_id' => $post_id);
-    return $this->call_method('facebook.stream.getComments', $args);
-  }
-
-  /**
-   * Sets the FBML for the profile of the user attached to this session.
-   *
-   * @param   string   $markup           The FBML that describes the profile
-   *                                     presence of this app for the user
-   * @param   int      $uid              The user
-   * @param   string   $profile          Profile FBML
-   * @param   string   $profile_action   Profile action FBML (deprecated)
-   * @param   string   $mobile_profile   Mobile profile FBML
-   * @param   string   $profile_main     Main Tab profile FBML
-   *
-   * @return  array  A list of strings describing any compile errors for the
-   *                 submitted FBML
-   */
-  public function profile_setFBML($markup,
-                           $uid=null,
-                           $profile='',
-                           $profile_action='',
-                           $mobile_profile='',
-                           $profile_main='') {
-    return $this->call_method('facebook.profile.setFBML',
-        array('markup' => $markup,
-              'uid' => $uid,
-              'profile' => $profile,
-              'profile_action' => $profile_action,
-              'mobile_profile' => $mobile_profile,
-              'profile_main' => $profile_main));
-  }
-
-  /**
-   * Gets the FBML for the profile box that is currently set for a user's
-   * profile (your application set the FBML previously by calling the
-   * profile.setFBML method).
-   *
-   * @param int $uid   (Optional) User id to lookup; defaults to session.
-   * @param int $type  (Optional) 1 for original style, 2 for profile_main boxes
-   *
-   * @return string  The FBML
-   */
-  public function &profile_getFBML($uid=null, $type=null) {
-    return $this->call_method('facebook.profile.getFBML',
-        array('uid' => $uid,
-              'type' => $type));
-  }
-
-  /**
-   * Returns the specified user's application info section for the calling
-   * application. These info sections have either been set via a previous
-   * profile.setInfo call or by the user editing them directly.
-   *
-   * @param int $uid  (Optional) User id to lookup; defaults to session.
-   *
-   * @return array  Info fields for the current user.  See wiki for structure:
-   *
-   *  http://wiki.developers.facebook.com/index.php/Profile.getInfo
-   *
-   */
-  public function &profile_getInfo($uid=null) {
-    return $this->call_method('facebook.profile.getInfo',
-        array('uid' => $uid));
-  }
-
-  /**
-   * Returns the options associated with the specified info field for an
-   * application info section.
-   *
-   * @param string $field  The title of the field
-   *
-   * @return array  An array of info options.
-   */
-  public function &profile_getInfoOptions($field) {
-    return $this->call_method('facebook.profile.getInfoOptions',
-        array('field' => $field));
-  }
-
-  /**
-   * Configures an application info section that the specified user can install
-   * on the Info tab of her profile.  For details on the structure of an info
-   * field, please see:
-   *
-   *  http://wiki.developers.facebook.com/index.php/Profile.setInfo
-   *
-   * @param string $title       Title / header of the info section
-   * @param int $type           1 for text-only, 5 for thumbnail views
-   * @param array $info_fields  An array of info fields. See wiki for details.
-   * @param int $uid            (Optional)
-   *
-   * @return bool  true on success
-   */
-  public function &profile_setInfo($title, $type, $info_fields, $uid=null) {
-    return $this->call_method('facebook.profile.setInfo',
-        array('uid' => $uid,
-              'type' => $type,
-              'title'   => $title,
-              'info_fields' => json_encode($info_fields)));
-  }
-
-  /**
-   * Specifies the objects for a field for an application info section. These
-   * options populate the typeahead for a thumbnail.
-   *
-   * @param string $field   The title of the field
-   * @param array $options  An array of items for a thumbnail, including
-   *                        'label', 'link', and optionally 'image',
-   *                        'description' and 'sublabel'
-   *
-   * @return bool  true on success
-   */
-  public function profile_setInfoOptions($field, $options) {
-    return $this->call_method('facebook.profile.setInfoOptions',
-        array('field'   => $field,
-              'options' => json_encode($options)));
-  }
-
-  /////////////////////////////////////////////////////////////////////////////
-  // Data Store API
-
-  /**
-   * Set a user preference.
-   *
-   * @param  pref_id    preference identifier (0-200)
-   * @param  value      preferece's value
-   * @param  uid        the user id (defaults to current session user)
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   *    API_EC_PERMISSION_OTHER_USER
-   */
-  public function &data_setUserPreference($pref_id, $value, $uid = null) {
-    return $this->call_method('facebook.data.setUserPreference',
-       array('pref_id' => $pref_id,
-             'value' => $value,
-             'uid' => $this->get_uid($uid)));
-  }
-
-  /**
-   * Set a user's all preferences for this application.
-   *
-   * @param  values     preferece values in an associative arrays
-   * @param  replace    whether to replace all existing preferences or
-   *                    merge into them.
-   * @param  uid        the user id (defaults to current session user)
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   *    API_EC_PERMISSION_OTHER_USER
-   */
-  public function &data_setUserPreferences($values,
-                                           $replace = false,
-                                           $uid = null) {
-    return $this->call_method('facebook.data.setUserPreferences',
-       array('values' => json_encode($values),
-             'replace' => $replace,
-             'uid' => $this->get_uid($uid)));
-  }
-
-  /**
-   * Get a user preference.
-   *
-   * @param  pref_id    preference identifier (0-200)
-   * @param  uid        the user id (defaults to current session user)
-   * @return            preference's value
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   *    API_EC_PERMISSION_OTHER_USER
-   */
-  public function &data_getUserPreference($pref_id, $uid = null) {
-    return $this->call_method('facebook.data.getUserPreference',
-       array('pref_id' => $pref_id,
-             'uid' => $this->get_uid($uid)));
-  }
-
-  /**
-   * Get a user preference.
-   *
-   * @param  uid        the user id (defaults to current session user)
-   * @return            preference values
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   *    API_EC_PERMISSION_OTHER_USER
-   */
-  public function &data_getUserPreferences($uid = null) {
-    return $this->call_method('facebook.data.getUserPreferences',
-       array('uid' => $this->get_uid($uid)));
-  }
-
-  /**
-   * Create a new object type.
-   *
-   * @param  name       object type's name
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_ALREADY_EXISTS
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_createObjectType($name) {
-    return $this->call_method('facebook.data.createObjectType',
-       array('name' => $name));
-  }
-
-  /**
-   * Delete an object type.
-   *
-   * @param  obj_type       object type's name
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_dropObjectType($obj_type) {
-    return $this->call_method('facebook.data.dropObjectType',
-       array('obj_type' => $obj_type));
-  }
-
-  /**
-   * Rename an object type.
-   *
-   * @param  obj_type       object type's name
-   * @param  new_name       new object type's name
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_DATA_OBJECT_ALREADY_EXISTS
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_renameObjectType($obj_type, $new_name) {
-    return $this->call_method('facebook.data.renameObjectType',
-       array('obj_type' => $obj_type,
-             'new_name' => $new_name));
-  }
-
-  /**
-   * Add a new property to an object type.
-   *
-   * @param  obj_type       object type's name
-   * @param  prop_name      name of the property to add
-   * @param  prop_type      1: integer; 2: string; 3: text blob
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_ALREADY_EXISTS
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_defineObjectProperty($obj_type,
-                                             $prop_name,
-                                             $prop_type) {
-    return $this->call_method('facebook.data.defineObjectProperty',
-       array('obj_type' => $obj_type,
-             'prop_name' => $prop_name,
-             'prop_type' => $prop_type));
-  }
-
-  /**
-   * Remove a previously defined property from an object type.
-   *
-   * @param  obj_type      object type's name
-   * @param  prop_name     name of the property to remove
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_undefineObjectProperty($obj_type, $prop_name) {
-    return $this->call_method('facebook.data.undefineObjectProperty',
-       array('obj_type' => $obj_type,
-             'prop_name' => $prop_name));
-  }
-
-  /**
-   * Rename a previously defined property of an object type.
-   *
-   * @param  obj_type      object type's name
-   * @param  prop_name     name of the property to rename
-   * @param  new_name      new name to use
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_DATA_OBJECT_ALREADY_EXISTS
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_renameObjectProperty($obj_type, $prop_name,
-                                            $new_name) {
-    return $this->call_method('facebook.data.renameObjectProperty',
-       array('obj_type' => $obj_type,
-             'prop_name' => $prop_name,
-             'new_name' => $new_name));
-  }
-
-  /**
-   * Retrieve a list of all object types that have defined for the application.
-   *
-   * @return               a list of object type names
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_getObjectTypes() {
-    return $this->call_method('facebook.data.getObjectTypes');
-  }
-
-  /**
-   * Get definitions of all properties of an object type.
-   *
-   * @param obj_type       object type's name
-   * @return               pairs of property name and property types
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_getObjectType($obj_type) {
-    return $this->call_method('facebook.data.getObjectType',
-       array('obj_type' => $obj_type));
-  }
-
-  /**
-   * Create a new object.
-   *
-   * @param  obj_type      object type's name
-   * @param  properties    (optional) properties to set initially
-   * @return               newly created object's id
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_createObject($obj_type, $properties = null) {
-    return $this->call_method('facebook.data.createObject',
-       array('obj_type' => $obj_type,
-             'properties' => json_encode($properties)));
-  }
-
-  /**
-   * Update an existing object.
-   *
-   * @param  obj_id        object's id
-   * @param  properties    new properties
-   * @param  replace       true for replacing existing properties;
-   *                       false for merging
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_updateObject($obj_id, $properties, $replace = false) {
-    return $this->call_method('facebook.data.updateObject',
-       array('obj_id' => $obj_id,
-             'properties' => json_encode($properties),
-             'replace' => $replace));
-  }
-
-  /**
-   * Delete an existing object.
-   *
-   * @param  obj_id        object's id
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_deleteObject($obj_id) {
-    return $this->call_method('facebook.data.deleteObject',
-       array('obj_id' => $obj_id));
-  }
-
-  /**
-   * Delete a list of objects.
-   *
-   * @param  obj_ids       objects to delete
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_deleteObjects($obj_ids) {
-    return $this->call_method('facebook.data.deleteObjects',
-       array('obj_ids' => json_encode($obj_ids)));
-  }
-
-  /**
-   * Get a single property value of an object.
-   *
-   * @param  obj_id        object's id
-   * @param  prop_name     individual property's name
-   * @return               individual property's value
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_getObjectProperty($obj_id, $prop_name) {
-    return $this->call_method('facebook.data.getObjectProperty',
-       array('obj_id' => $obj_id,
-             'prop_name' => $prop_name));
-  }
-
-  /**
-   * Get properties of an object.
-   *
-   * @param  obj_id      object's id
-   * @param  prop_names  (optional) properties to return; null for all.
-   * @return             specified properties of an object
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_getObject($obj_id, $prop_names = null) {
-    return $this->call_method('facebook.data.getObject',
-       array('obj_id' => $obj_id,
-             'prop_names' => json_encode($prop_names)));
-  }
-
-  /**
-   * Get properties of a list of objects.
-   *
-   * @param  obj_ids     object ids
-   * @param  prop_names  (optional) properties to return; null for all.
-   * @return             specified properties of an object
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_getObjects($obj_ids, $prop_names = null) {
-    return $this->call_method('facebook.data.getObjects',
-       array('obj_ids' => json_encode($obj_ids),
-             'prop_names' => json_encode($prop_names)));
-  }
-
-  /**
-   * Set a single property value of an object.
-   *
-   * @param  obj_id        object's id
-   * @param  prop_name     individual property's name
-   * @param  prop_value    new value to set
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_setObjectProperty($obj_id, $prop_name,
-                                         $prop_value) {
-    return $this->call_method('facebook.data.setObjectProperty',
-       array('obj_id' => $obj_id,
-             'prop_name' => $prop_name,
-             'prop_value' => $prop_value));
-  }
-
-  /**
-   * Read hash value by key.
-   *
-   * @param  obj_type      object type's name
-   * @param  key           hash key
-   * @param  prop_name     (optional) individual property's name
-   * @return               hash value
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_getHashValue($obj_type, $key, $prop_name = null) {
-    return $this->call_method('facebook.data.getHashValue',
-       array('obj_type' => $obj_type,
-             'key' => $key,
-             'prop_name' => $prop_name));
-  }
-
-  /**
-   * Write hash value by key.
-   *
-   * @param  obj_type      object type's name
-   * @param  key           hash key
-   * @param  value         hash value
-   * @param  prop_name     (optional) individual property's name
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_setHashValue($obj_type,
-                                     $key,
-                                     $value,
-                                     $prop_name = null) {
-    return $this->call_method('facebook.data.setHashValue',
-       array('obj_type' => $obj_type,
-             'key' => $key,
-             'value' => $value,
-             'prop_name' => $prop_name));
-  }
-
-  /**
-   * Increase a hash value by specified increment atomically.
-   *
-   * @param  obj_type      object type's name
-   * @param  key           hash key
-   * @param  prop_name     individual property's name
-   * @param  increment     (optional) default is 1
-   * @return               incremented hash value
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_incHashValue($obj_type,
-                                     $key,
-                                     $prop_name,
-                                     $increment = 1) {
-    return $this->call_method('facebook.data.incHashValue',
-       array('obj_type' => $obj_type,
-             'key' => $key,
-             'prop_name' => $prop_name,
-             'increment' => $increment));
-  }
-
-  /**
-   * Remove a hash key and its values.
-   *
-   * @param  obj_type    object type's name
-   * @param  key         hash key
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_removeHashKey($obj_type, $key) {
-    return $this->call_method('facebook.data.removeHashKey',
-       array('obj_type' => $obj_type,
-             'key' => $key));
-  }
-
-  /**
-   * Remove hash keys and their values.
-   *
-   * @param  obj_type    object type's name
-   * @param  keys        hash keys
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_removeHashKeys($obj_type, $keys) {
-    return $this->call_method('facebook.data.removeHashKeys',
-       array('obj_type' => $obj_type,
-             'keys' => json_encode($keys)));
-  }
-
-  /**
-   * Define an object association.
-   *
-   * @param  name        name of this association
-   * @param  assoc_type  1: one-way 2: two-way symmetric 3: two-way asymmetric
-   * @param  assoc_info1 needed info about first object type
-   * @param  assoc_info2 needed info about second object type
-   * @param  inverse     (optional) name of reverse association
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_ALREADY_EXISTS
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_defineAssociation($name, $assoc_type, $assoc_info1,
-                                         $assoc_info2, $inverse = null) {
-    return $this->call_method('facebook.data.defineAssociation',
-       array('name' => $name,
-             'assoc_type' => $assoc_type,
-             'assoc_info1' => json_encode($assoc_info1),
-             'assoc_info2' => json_encode($assoc_info2),
-             'inverse' => $inverse));
-  }
-
-  /**
-   * Undefine an object association.
-   *
-   * @param  name        name of this association
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_undefineAssociation($name) {
-    return $this->call_method('facebook.data.undefineAssociation',
-       array('name' => $name));
-  }
-
-  /**
-   * Rename an object association or aliases.
-   *
-   * @param  name        name of this association
-   * @param  new_name    (optional) new name of this association
-   * @param  new_alias1  (optional) new alias for object type 1
-   * @param  new_alias2  (optional) new alias for object type 2
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_ALREADY_EXISTS
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_renameAssociation($name, $new_name, $new_alias1 = null,
-                                         $new_alias2 = null) {
-    return $this->call_method('facebook.data.renameAssociation',
-       array('name' => $name,
-             'new_name' => $new_name,
-             'new_alias1' => $new_alias1,
-             'new_alias2' => $new_alias2));
-  }
-
-  /**
-   * Get definition of an object association.
-   *
-   * @param  name        name of this association
-   * @return             specified association
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_getAssociationDefinition($name) {
-    return $this->call_method('facebook.data.getAssociationDefinition',
-       array('name' => $name));
-  }
-
-  /**
-   * Get definition of all associations.
-   *
-   * @return             all defined associations
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_getAssociationDefinitions() {
-    return $this->call_method('facebook.data.getAssociationDefinitions',
-       array());
-  }
-
-  /**
-   * Create or modify an association between two objects.
-   *
-   * @param  name        name of association
-   * @param  obj_id1     id of first object
-   * @param  obj_id2     id of second object
-   * @param  data        (optional) extra string data to store
-   * @param  assoc_time  (optional) extra time data; default to creation time
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_setAssociation($name, $obj_id1, $obj_id2, $data = null,
-                                      $assoc_time = null) {
-    return $this->call_method('facebook.data.setAssociation',
-       array('name' => $name,
-             'obj_id1' => $obj_id1,
-             'obj_id2' => $obj_id2,
-             'data' => $data,
-             'assoc_time' => $assoc_time));
-  }
-
-  /**
-   * Create or modify associations between objects.
-   *
-   * @param  assocs      associations to set
-   * @param  name        (optional) name of association
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_setAssociations($assocs, $name = null) {
-    return $this->call_method('facebook.data.setAssociations',
-       array('assocs' => json_encode($assocs),
-             'name' => $name));
-  }
-
-  /**
-   * Remove an association between two objects.
-   *
-   * @param  name        name of association
-   * @param  obj_id1     id of first object
-   * @param  obj_id2     id of second object
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_removeAssociation($name, $obj_id1, $obj_id2) {
-    return $this->call_method('facebook.data.removeAssociation',
-       array('name' => $name,
-             'obj_id1' => $obj_id1,
-             'obj_id2' => $obj_id2));
-  }
-
-  /**
-   * Remove associations between objects by specifying pairs of object ids.
-   *
-   * @param  assocs      associations to remove
-   * @param  name        (optional) name of association
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_removeAssociations($assocs, $name = null) {
-    return $this->call_method('facebook.data.removeAssociations',
-       array('assocs' => json_encode($assocs),
-             'name' => $name));
-  }
-
-  /**
-   * Remove associations between objects by specifying one object id.
-   *
-   * @param  name        name of association
-   * @param  obj_id      who's association to remove
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_removeAssociatedObjects($name, $obj_id) {
-    return $this->call_method('facebook.data.removeAssociatedObjects',
-       array('name' => $name,
-             'obj_id' => $obj_id));
-  }
-
-  /**
-   * Retrieve a list of associated objects.
-   *
-   * @param  name        name of association
-   * @param  obj_id      who's association to retrieve
-   * @param  no_data     only return object ids
-   * @return             associated objects
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_getAssociatedObjects($name, $obj_id, $no_data = true) {
-    return $this->call_method('facebook.data.getAssociatedObjects',
-       array('name' => $name,
-             'obj_id' => $obj_id,
-             'no_data' => $no_data));
-  }
-
-  /**
-   * Count associated objects.
-   *
-   * @param  name        name of association
-   * @param  obj_id      who's association to retrieve
-   * @return             associated object's count
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_getAssociatedObjectCount($name, $obj_id) {
-    return $this->call_method('facebook.data.getAssociatedObjectCount',
-       array('name' => $name,
-             'obj_id' => $obj_id));
-  }
-
-  /**
-   * Get a list of associated object counts.
-   *
-   * @param  name        name of association
-   * @param  obj_ids     whose association to retrieve
-   * @return             associated object counts
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_DATA_OBJECT_NOT_FOUND
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_INVALID_OPERATION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_getAssociatedObjectCounts($name, $obj_ids) {
-    return $this->call_method('facebook.data.getAssociatedObjectCounts',
-       array('name' => $name,
-             'obj_ids' => json_encode($obj_ids)));
-  }
-
-  /**
-   * Find all associations between two objects.
-   *
-   * @param  obj_id1     id of first object
-   * @param  obj_id2     id of second object
-   * @param  no_data     only return association names without data
-   * @return             all associations between objects
-   * @error
-   *    API_EC_DATA_DATABASE_ERROR
-   *    API_EC_PARAM
-   *    API_EC_PERMISSION
-   *    API_EC_DATA_QUOTA_EXCEEDED
-   *    API_EC_DATA_UNKNOWN_ERROR
-   */
-  public function &data_getAssociations($obj_id1, $obj_id2, $no_data = true) {
-    return $this->call_method('facebook.data.getAssociations',
-       array('obj_id1' => $obj_id1,
-             'obj_id2' => $obj_id2,
-             'no_data' => $no_data));
-  }
-
-  /**
-   * Get the properties that you have set for an app.
-   *
-   * @param properties  List of properties names to fetch
-   *
-   * @return array  A map from property name to value
-   */
-  public function admin_getAppProperties($properties) {
-    return json_decode(
-        $this->call_method('facebook.admin.getAppProperties',
-            array('properties' => json_encode($properties))), true);
-  }
-
-  /**
-   * Set properties for an app.
-   *
-   * @param properties  A map from property names to values
-   *
-   * @return bool  true on success
-   */
-  public function admin_setAppProperties($properties) {
-    return $this->call_method('facebook.admin.setAppProperties',
-       array('properties' => json_encode($properties)));
-  }
-
-  /**
-   * Sets href and text for a Live Stream Box xid's via link
-   *
-   * @param  string  $xid       xid of the Live Stream
-   * @param  string  $via_href  Href for the via link
-   * @param  string  $via_text  Text for the via link
-   *
-   * @return boolWhether the set was successful
-   */
-  public function admin_setLiveStreamViaLink($xid, $via_href, $via_text) {
-    return $this->call_method('facebook.admin.setLiveStreamViaLink',
-                              array('xid'      => $xid,
-                                    'via_href' => $via_href,
-                                    'via_text' => $via_text));
-  }
-
-  /**
-   * Gets href and text for a Live Stream Box xid's via link
-   *
-   * @param  string  $xid  xid of the Live Stream
-   *
-   * @return Array  Associative array with keys 'via_href' and 'via_text'
-   *                False if there was an error.
-   */
-  public function admin_getLiveStreamViaLink($xid) {
-    return $this->call_method('facebook.admin.getLiveStreamViaLink',
-                              array('xid' => $xid));
-  }
-
-  /**
-   * Returns the allocation limit value for a specified integration point name
-   * Integration point names are defined in lib/api/karma/constants.php in the
-   * limit_map.
-   *
-   * @param string $integration_point_name  Name of an integration point
-   *                                        (see developer wiki for list).
-   * @param int    $uid                     Specific user to check the limit.
-   *
-   * @return int  Integration point allocation value
-   */
-  public function &admin_getAllocation($integration_point_name, $uid=null) {
-    return $this->call_method('facebook.admin.getAllocation',
-        array('integration_point_name' => $integration_point_name,
-              'uid' => $uid));
-  }
-
-  /**
-   * Returns values for the specified metrics for the current application, in
-   * the given time range.  The metrics are collected for fixed-length periods,
-   * and the times represent midnight at the end of each period.
-   *
-   * @param start_time  unix time for the start of the range
-   * @param end_time    unix time for the end of the range
-   * @param period      number of seconds in the desired period
-   * @param metrics     list of metrics to look up
-   *
-   * @return array  A map of the names and values for those metrics
-   */
-  public function &admin_getMetrics($start_time, $end_time, $period, $metrics) {
-    return $this->call_method('admin.getMetrics',
-        array('start_time' => $start_time,
-              'end_time' => $end_time,
-              'period' => $period,
-              'metrics' => json_encode($metrics)));
-  }
-
-  /**
-   * Sets application restriction info.
-   *
-   * Applications can restrict themselves to only a limited user demographic
-   * based on users' age and/or location or based on static predefined types
-   * specified by facebook for specifying diff age restriction for diff
-   * locations.
-   *
-   * @param array $restriction_info  The age restriction settings to set.
-   *
-   * @return bool  true on success
-   */
-  public function admin_setRestrictionInfo($restriction_info = null) {
-    $restriction_str = null;
-    if (!empty($restriction_info)) {
-      $restriction_str = json_encode($restriction_info);
-    }
-    return $this->call_method('admin.setRestrictionInfo',
-        array('restriction_str' => $restriction_str));
-  }
-
-  /**
-   * Gets application restriction info.
-   *
-   * Applications can restrict themselves to only a limited user demographic
-   * based on users' age and/or location or based on static predefined types
-   * specified by facebook for specifying diff age restriction for diff
-   * locations.
-   *
-   * @return array  The age restriction settings for this application.
-   */
-  public function admin_getRestrictionInfo() {
-    return json_decode(
-        $this->call_method('admin.getRestrictionInfo'),
-        true);
-  }
-
-
-  /**
-   * Bans a list of users from the app. Banned users can't
-   * access the app's canvas page and forums.
-   *
-   * @param array $uids an array of user ids
-   * @return bool true on success
-   */
-  public function admin_banUsers($uids) {
-    return $this->call_method(
-      'admin.banUsers', array('uids' => json_encode($uids)));
-  }
-
-  /**
-   * Unban users that have been previously banned with
-   * admin_banUsers().
-   *
-   * @param array $uids an array of user ids
-   * @return bool true on success
-   */
-  public function admin_unbanUsers($uids) {
-    return $this->call_method(
-      'admin.unbanUsers', array('uids' => json_encode($uids)));
-  }
-
-  /**
-   * Gets the list of users that have been banned from the application.
-   * $uids is an optional parameter that filters the result with the list
-   * of provided user ids. If $uids is provided,
-   * only banned user ids that are contained in $uids are returned.
-   *
-   * @param array $uids an array of user ids to filter by
-   * @return bool true on success
-   */
-
-  public function admin_getBannedUsers($uids = null) {
-    return $this->call_method(
-      'admin.getBannedUsers',
-      array('uids' => $uids ? json_encode($uids) : null));
-  }
-
-
-  /* UTILITY FUNCTIONS */
-
-  /**
-   * Calls the specified normal POST method with the specified parameters.
-   *
-   * @param string $method  Name of the Facebook method to invoke
-   * @param array $params   A map of param names => param values
-   *
-   * @return mixed  Result of method call; this returns a reference to support
-   *                'delayed returns' when in a batch context.
-   *     See: http://wiki.developers.facebook.com/index.php/Using_batching_API
-   */
-  public function &call_method($method, $params = array()) {
-    if ($this->format) {
-      $params['format'] = $this->format;
-    }
-    if (!$this->pending_batch()) {
-      if ($this->call_as_apikey) {
-        $params['call_as_apikey'] = $this->call_as_apikey;
-      }
-      $data = $this->post_request($method, $params);
-      $this->rawData = $data;
-      $result = $this->convert_result($data, $method, $params);
-      if (is_array($result) && isset($result['error_code'])) {
-        throw new FacebookRestClientException($result['error_msg'],
-                                              $result['error_code']);
-      }
-    }
-    else {
-      $result = null;
-      $batch_item = array('m' => $method, 'p' => $params, 'r' => & $result);
-      $this->batch_queue[] = $batch_item;
-    }
-
-    return $result;
-  }
-
-  protected function convert_result($data, $method, $params) {
-    $is_xml = (empty($params['format']) ||
-               strtolower($params['format']) != 'json');
-    return ($is_xml) ? $this->convert_xml_to_result($data, $method, $params)
-                     : json_decode($data, true);
-  }
-
-  /**
-   * Change the response format
-   *
-   * @param string $format The response format (json, xml)
-   */
-  public function setFormat($format) {
-    $this->format = $format;
-    return $this;
-  }
-
-  /**
-   * get the current response serialization format
-   *
-   * @return string 'xml', 'json', or null (which means 'xml')
-   */
-  public function getFormat() {
-    return $this->format;
-  }
-
-  /**
-   * Returns the raw JSON or XML output returned by the server in the most
-   * recent API call.
-   *
-   * @return string
-   */
-   public function getRawData() {
-     return $this->rawData;
-   }
-
-  /**
-   * Calls the specified file-upload POST method with the specified parameters
-   *
-   * @param string $method Name of the Facebook method to invoke
-   * @param array  $params A map of param names => param values
-   * @param string $file   A path to the file to upload (required)
-   *
-   * @return array A dictionary representing the response.
-   */
-  public function call_upload_method($method, $params, $file, $server_addr = null) {
-    if (!$this->pending_batch()) {
-      if (!file_exists($file)) {
-        $code =
-          FacebookAPIErrorCodes::API_EC_PARAM;
-        $description = FacebookAPIErrorCodes::$api_error_descriptions[$code];
-        throw new FacebookRestClientException($description, $code);
-      }
-
-      if ($this->format) {
-        $params['format'] = $this->format;
-      }
-      $data = $this->post_upload_request($method,
-                                         $params,
-                                         $file,
-                                         $server_addr);
-      $result = $this->convert_result($data, $method, $params);
-
-      if (is_array($result) && isset($result['error_code'])) {
-        throw new FacebookRestClientException($result['error_msg'],
-                                              $result['error_code']);
-      }
-    }
-    else {
-      $code =
-        FacebookAPIErrorCodes::API_EC_BATCH_METHOD_NOT_ALLOWED_IN_BATCH_MODE;
-      $description = FacebookAPIErrorCodes::$api_error_descriptions[$code];
-      throw new FacebookRestClientException($description, $code);
-    }
-
-    return $result;
-  }
-
-  protected function convert_xml_to_result($xml, $method, $params) {
-    $sxml = simplexml_load_string($xml);
-    $result = self::convert_simplexml_to_array($sxml);
-
-    if (!empty($GLOBALS['facebook_config']['debug'])) {
-      // output the raw xml and its corresponding php object, for debugging:
-      print '<div style="margin: 10px 30px; padding: 5px; border: 2px solid black; background: gray; color: white; font-size: 12px; font-weight: bold;">';
-      $this->cur_id++;
-      print $this->cur_id . ': Called ' . $method . ', show ' .
-            '<a href=# onclick="return toggleDisplay(' . $this->cur_id . ', \'params\');">Params</a> | '.
-            '<a href=# onclick="return toggleDisplay(' . $this->cur_id . ', \'xml\');">XML</a> | '.
-            '<a href=# onclick="return toggleDisplay(' . $this->cur_id . ', \'sxml\');">SXML</a> | '.
-            '<a href=# onclick="return toggleDisplay(' . $this->cur_id . ', \'php\');">PHP</a>';
-      print '<pre id="params'.$this->cur_id.'" style="display: none; overflow: auto;">'.print_r($params, true).'</pre>';
-      print '<pre id="xml'.$this->cur_id.'" style="display: none; overflow: auto;">'.htmlspecialchars($xml).'</pre>';
-      print '<pre id="php'.$this->cur_id.'" style="display: none; overflow: auto;">'.print_r($result, true).'</pre>';
-      print '<pre id="sxml'.$this->cur_id.'" style="display: none; overflow: auto;">'.print_r($sxml, true).'</pre>';
-      print '</div>';
-    }
-    return $result;
-  }
-
-  protected function finalize_params($method, $params) {
-    list($get, $post) = $this->add_standard_params($method, $params);
-    // we need to do this before signing the params
-    $this->convert_array_values_to_json($post);
-    $post['sig'] = Facebook::generate_sig(array_merge($get, $post),
-                                          $this->secret);
-    return array($get, $post);
-  }
-
-  private function convert_array_values_to_json(&$params) {
-    foreach ($params as $key => &$val) {
-      if (is_array($val)) {
-        $val = json_encode($val);
-      }
-    }
-  }
-
-  /**
-   * Add the generally required params to our request.
-   * Params method, api_key, and v should be sent over as get.
-   */
-  private function add_standard_params($method, $params) {
-    $post = $params;
-    $get = array();
-    if ($this->call_as_apikey) {
-      $get['call_as_apikey'] = $this->call_as_apikey;
-    }
-    if ($this->using_session_secret) {
-      $get['ss'] = '1';
-    }
-
-    $get['method'] = $method;
-    $get['session_key'] = $this->session_key;
-    $get['api_key'] = $this->api_key;
-    $post['call_id'] = microtime(true);
-    if ($post['call_id'] <= $this->last_call_id) {
-      $post['call_id'] = $this->last_call_id + 0.001;
-    }
-    $this->last_call_id = $post['call_id'];
-    if (isset($post['v'])) {
-      $get['v'] = $post['v'];
-      unset($post['v']);
-    } else {
-      $get['v'] = '1.0';
-    }
-    if (isset($this->use_ssl_resources)) {
-      $post['return_ssl_resources'] = (bool) $this->use_ssl_resources;
-    }
-    return array($get, $post);
-  }
-
-  private function create_url_string($params) {
-    $post_params = array();
-    foreach ($params as $key => &$val) {
-      $post_params[] = $key.'='.urlencode($val);
-    }
-    return implode('&', $post_params);
-  }
-
-  private function run_multipart_http_transaction($method, $params, $file, $server_addr) {
-
-    // the format of this message is specified in RFC1867/RFC1341.
-    // we add twenty pseudo-random digits to the end of the boundary string.
-    $boundary = '--------------------------FbMuLtIpArT' .
-                sprintf("%010d", mt_rand()) .
-                sprintf("%010d", mt_rand());
-    $content_type = 'multipart/form-data; boundary=' . $boundary;
-    // within the message, we prepend two extra hyphens.
-    $delimiter = '--' . $boundary;
-    $close_delimiter = $delimiter . '--';
-    $content_lines = array();
-    foreach ($params as $key => &$val) {
-      $content_lines[] = $delimiter;
-      $content_lines[] = 'Content-Disposition: form-data; name="' . $key . '"';
-      $content_lines[] = '';
-      $content_lines[] = $val;
-    }
-    // now add the file data
-    $content_lines[] = $delimiter;
-    $content_lines[] =
-      'Content-Disposition: form-data; filename="' . $file . '"';
-    $content_lines[] = 'Content-Type: application/octet-stream';
-    $content_lines[] = '';
-    $content_lines[] = file_get_contents($file);
-    $content_lines[] = $close_delimiter;
-    $content_lines[] = '';
-    $content = implode("\r\n", $content_lines);
-    return $this->run_http_post_transaction($content_type, $content, $server_addr);
-  }
-
-  public function post_request($method, $params) {
-    list($get, $post) = $this->finalize_params($method, $params);
-    $post_string = $this->create_url_string($post);
-    $get_string = $this->create_url_string($get);
-    $url_with_get = $this->server_addr . '?' . $get_string;
-    if ($this->use_curl_if_available && function_exists('curl_init')) {
-      $useragent = 'Facebook API PHP5 Client 1.1 (curl) ' . phpversion();
-      $ch = curl_init();
-      curl_setopt($ch, CURLOPT_URL, $url_with_get);
-      curl_setopt($ch, CURLOPT_POSTFIELDS, $post_string);
-      curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-      curl_setopt($ch, CURLOPT_USERAGENT, $useragent);
-      curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
-      curl_setopt($ch, CURLOPT_TIMEOUT, 30);
-      $result = $this->curl_exec($ch);
-      curl_close($ch);
-    } else {
-      $content_type = 'application/x-www-form-urlencoded';
-      $content = $post_string;
-      $result = $this->run_http_post_transaction($content_type,
-                                                 $content,
-                                                 $url_with_get);
-    }
-    return $result;
-  }
-
-  /**
-   * execute a curl transaction -- this exists mostly so subclasses can add
-   * extra options and/or process the response, if they wish.
-   *
-   * @param resource $ch a curl handle
-   */
-  protected function curl_exec($ch) {
-      $result = curl_exec($ch);
-      return $result;
-  }
-
-  protected function post_upload_request($method, $params, $file, $server_addr = null) {
-    $server_addr = $server_addr ? $server_addr : $this->server_addr;
-    list($get, $post) = $this->finalize_params($method, $params);
-    $get_string = $this->create_url_string($get);
-    $url_with_get = $server_addr . '?' . $get_string;
-    if ($this->use_curl_if_available && function_exists('curl_init')) {
-      // prepending '@' causes cURL to upload the file; the key is ignored.
-      $post['_file'] = '@' . $file;
-      $useragent = 'Facebook API PHP5 Client 1.1 (curl) ' . phpversion();
-      $ch = curl_init();
-      curl_setopt($ch, CURLOPT_URL, $url_with_get);
-      // this has to come before the POSTFIELDS set!
-      curl_setopt($ch, CURLOPT_POST, 1);
-      // passing an array gets curl to use the multipart/form-data content type
-      curl_setopt($ch, CURLOPT_POSTFIELDS, $post);
-      curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-      curl_setopt($ch, CURLOPT_USERAGENT, $useragent);
-      $result = $this->curl_exec($ch);
-      curl_close($ch);
-    } else {
-      $result = $this->run_multipart_http_transaction($method, $post,
-                                                      $file, $url_with_get);
-    }
-    return $result;
-  }
-
-  private function run_http_post_transaction($content_type, $content, $server_addr) {
-
-    $user_agent = 'Facebook API PHP5 Client 1.1 (non-curl) ' . phpversion();
-    $content_length = strlen($content);
-    $context =
-      array('http' =>
-              array('method' => 'POST',
-                    'user_agent' => $user_agent,
-                    'header' => 'Content-Type: ' . $content_type . "\r\n" .
-                                'Content-Length: ' . $content_length,
-                    'content' => $content));
-    $context_id = stream_context_create($context);
-    $sock = fopen($server_addr, 'r', false, $context_id);
-
-    $result = '';
-    if ($sock) {
-      while (!feof($sock)) {
-        $result .= fgets($sock, 4096);
-      }
-      fclose($sock);
-    }
-    return $result;
-  }
-
-  public static function convert_simplexml_to_array($sxml) {
-    $arr = array();
-    if ($sxml) {
-      foreach ($sxml as $k => $v) {
-        if ($sxml['list']) {
-          $arr[] = self::convert_simplexml_to_array($v);
-        } else {
-          $arr[$k] = self::convert_simplexml_to_array($v);
-        }
-      }
-    }
-    if (sizeof($arr) > 0) {
-      return $arr;
-    } else {
-      return (string)$sxml;
-    }
-  }
-
-  protected function get_uid($uid) {
-    return $uid ? $uid : $this->user;
-  }
-}
-
-
-class FacebookRestClientException extends Exception {
-}
-
-// Supporting methods and values------
-
-/**
- * Error codes and descriptions for the Facebook API.
- */
-
-class FacebookAPIErrorCodes {
-
-  const API_EC_SUCCESS = 0;
-
-  /*
-   * GENERAL ERRORS
-   */
-  const API_EC_UNKNOWN = 1;
-  const API_EC_SERVICE = 2;
-  const API_EC_METHOD = 3;
-  const API_EC_TOO_MANY_CALLS = 4;
-  const API_EC_BAD_IP = 5;
-  const API_EC_HOST_API = 6;
-  const API_EC_HOST_UP = 7;
-  const API_EC_SECURE = 8;
-  const API_EC_RATE = 9;
-  const API_EC_PERMISSION_DENIED = 10;
-  const API_EC_DEPRECATED = 11;
-  const API_EC_VERSION = 12;
-  const API_EC_INTERNAL_FQL_ERROR = 13;
-  const API_EC_HOST_PUP = 14;
-  const API_EC_SESSION_SECRET_NOT_ALLOWED = 15;
-  const API_EC_HOST_READONLY = 16;
-
-  /*
-   * PARAMETER ERRORS
-   */
-  const API_EC_PARAM = 100;
-  const API_EC_PARAM_API_KEY = 101;
-  const API_EC_PARAM_SESSION_KEY = 102;
-  const API_EC_PARAM_CALL_ID = 103;
-  const API_EC_PARAM_SIGNATURE = 104;
-  const API_EC_PARAM_TOO_MANY = 105;
-  const API_EC_PARAM_USER_ID = 110;
-  const API_EC_PARAM_USER_FIELD = 111;
-  const API_EC_PARAM_SOCIAL_FIELD = 112;
-  const API_EC_PARAM_EMAIL = 113;
-  const API_EC_PARAM_USER_ID_LIST = 114;
-  const API_EC_PARAM_FIELD_LIST = 115;
-  const API_EC_PARAM_ALBUM_ID = 120;
-  const API_EC_PARAM_PHOTO_ID = 121;
-  const API_EC_PARAM_FEED_PRIORITY = 130;
-  const API_EC_PARAM_CATEGORY = 140;
-  const API_EC_PARAM_SUBCATEGORY = 141;
-  const API_EC_PARAM_TITLE = 142;
-  const API_EC_PARAM_DESCRIPTION = 143;
-  const API_EC_PARAM_BAD_JSON = 144;
-  const API_EC_PARAM_BAD_EID = 150;
-  const API_EC_PARAM_UNKNOWN_CITY = 151;
-  const API_EC_PARAM_BAD_PAGE_TYPE = 152;
-  const API_EC_PARAM_BAD_LOCALE = 170;
-  const API_EC_PARAM_BLOCKED_NOTIFICATION = 180;
-
-  /*
-   * USER PERMISSIONS ERRORS
-   */
-  const API_EC_PERMISSION = 200;
-  const API_EC_PERMISSION_USER = 210;
-  const API_EC_PERMISSION_NO_DEVELOPERS = 211;
-  const API_EC_PERMISSION_OFFLINE_ACCESS = 212;
-  const API_EC_PERMISSION_ALBUM = 220;
-  const API_EC_PERMISSION_PHOTO = 221;
-  const API_EC_PERMISSION_MESSAGE = 230;
-  const API_EC_PERMISSION_OTHER_USER = 240;
-  const API_EC_PERMISSION_STATUS_UPDATE = 250;
-  const API_EC_PERMISSION_PHOTO_UPLOAD = 260;
-  const API_EC_PERMISSION_VIDEO_UPLOAD = 261;
-  const API_EC_PERMISSION_SMS = 270;
-  const API_EC_PERMISSION_CREATE_LISTING = 280;
-  const API_EC_PERMISSION_CREATE_NOTE = 281;
-  const API_EC_PERMISSION_SHARE_ITEM = 282;
-  const API_EC_PERMISSION_EVENT = 290;
-  const API_EC_PERMISSION_LARGE_FBML_TEMPLATE = 291;
-  const API_EC_PERMISSION_LIVEMESSAGE = 292;
-  const API_EC_PERMISSION_CREATE_EVENT = 296;
-  const API_EC_PERMISSION_RSVP_EVENT = 299;
-
-  /*
-   * DATA EDIT ERRORS
-   */
-  const API_EC_EDIT = 300;
-  const API_EC_EDIT_USER_DATA = 310;
-  const API_EC_EDIT_PHOTO = 320;
-  const API_EC_EDIT_ALBUM_SIZE = 321;
-  const API_EC_EDIT_PHOTO_TAG_SUBJECT = 322;
-  const API_EC_EDIT_PHOTO_TAG_PHOTO = 323;
-  const API_EC_EDIT_PHOTO_FILE = 324;
-  const API_EC_EDIT_PHOTO_PENDING_LIMIT = 325;
-  const API_EC_EDIT_PHOTO_TAG_LIMIT = 326;
-  const API_EC_EDIT_ALBUM_REORDER_PHOTO_NOT_IN_ALBUM = 327;
-  const API_EC_EDIT_ALBUM_REORDER_TOO_FEW_PHOTOS = 328;
-
-  const API_EC_MALFORMED_MARKUP = 329;
-  const API_EC_EDIT_MARKUP = 330;
-
-  const API_EC_EDIT_FEED_TOO_MANY_USER_CALLS = 340;
-  const API_EC_EDIT_FEED_TOO_MANY_USER_ACTION_CALLS = 341;
-  const API_EC_EDIT_FEED_TITLE_LINK = 342;
-  const API_EC_EDIT_FEED_TITLE_LENGTH = 343;
-  const API_EC_EDIT_FEED_TITLE_NAME = 344;
-  const API_EC_EDIT_FEED_TITLE_BLANK = 345;
-  const API_EC_EDIT_FEED_BODY_LENGTH = 346;
-  const API_EC_EDIT_FEED_PHOTO_SRC = 347;
-  const API_EC_EDIT_FEED_PHOTO_LINK = 348;
-
-  const API_EC_EDIT_VIDEO_SIZE = 350;
-  const API_EC_EDIT_VIDEO_INVALID_FILE = 351;
-  const API_EC_EDIT_VIDEO_INVALID_TYPE = 352;
-  const API_EC_EDIT_VIDEO_FILE = 353;
-
-  const API_EC_EDIT_FEED_TITLE_ARRAY = 360;
-  const API_EC_EDIT_FEED_TITLE_PARAMS = 361;
-  const API_EC_EDIT_FEED_BODY_ARRAY = 362;
-  const API_EC_EDIT_FEED_BODY_PARAMS = 363;
-  const API_EC_EDIT_FEED_PHOTO = 364;
-  const API_EC_EDIT_FEED_TEMPLATE = 365;
-  const API_EC_EDIT_FEED_TARGET = 366;
-  const API_EC_EDIT_FEED_MARKUP = 367;
-
-  /**
-   * SESSION ERRORS
-   */
-  const API_EC_SESSION_TIMED_OUT = 450;
-  const API_EC_SESSION_METHOD = 451;
-  const API_EC_SESSION_INVALID = 452;
-  const API_EC_SESSION_REQUIRED = 453;
-  const API_EC_SESSION_REQUIRED_FOR_SECRET = 454;
-  const API_EC_SESSION_CANNOT_USE_SESSION_SECRET = 455;
-
-
-  /**
-   * FQL ERRORS
-   */
-  const FQL_EC_UNKNOWN_ERROR = 600;
-  const FQL_EC_PARSER = 601; // backwards compatibility
-  const FQL_EC_PARSER_ERROR = 601;
-  const FQL_EC_UNKNOWN_FIELD = 602;
-  const FQL_EC_UNKNOWN_TABLE = 603;
-  const FQL_EC_NOT_INDEXABLE = 604; // backwards compatibility
-  const FQL_EC_NO_INDEX = 604;
-  const FQL_EC_UNKNOWN_FUNCTION = 605;
-  const FQL_EC_INVALID_PARAM = 606;
-  const FQL_EC_INVALID_FIELD = 607;
-  const FQL_EC_INVALID_SESSION = 608;
-  const FQL_EC_UNSUPPORTED_APP_TYPE = 609;
-  const FQL_EC_SESSION_SECRET_NOT_ALLOWED = 610;
-  const FQL_EC_DEPRECATED_TABLE = 611;
-  const FQL_EC_EXTENDED_PERMISSION = 612;
-  const FQL_EC_RATE_LIMIT_EXCEEDED = 613;
-  const FQL_EC_UNRESOLVED_DEPENDENCY = 614;
-  const FQL_EC_INVALID_SEARCH = 615;
-  const FQL_EC_CONTAINS_ERROR = 616;
-
-  const API_EC_REF_SET_FAILED = 700;
-
-  /**
-   * DATA STORE API ERRORS
-   */
-  const API_EC_DATA_UNKNOWN_ERROR = 800;
-  const API_EC_DATA_INVALID_OPERATION = 801;
-  const API_EC_DATA_QUOTA_EXCEEDED = 802;
-  const API_EC_DATA_OBJECT_NOT_FOUND = 803;
-  const API_EC_DATA_OBJECT_ALREADY_EXISTS = 804;
-  const API_EC_DATA_DATABASE_ERROR = 805;
-  const API_EC_DATA_CREATE_TEMPLATE_ERROR = 806;
-  const API_EC_DATA_TEMPLATE_EXISTS_ERROR = 807;
-  const API_EC_DATA_TEMPLATE_HANDLE_TOO_LONG = 808;
-  const API_EC_DATA_TEMPLATE_HANDLE_ALREADY_IN_USE = 809;
-  const API_EC_DATA_TOO_MANY_TEMPLATE_BUNDLES = 810;
-  const API_EC_DATA_MALFORMED_ACTION_LINK = 811;
-  const API_EC_DATA_TEMPLATE_USES_RESERVED_TOKEN = 812;
-
-  /*
-   * APPLICATION INFO ERRORS
-   */
-  const API_EC_NO_SUCH_APP = 900;
-
-  /*
-   * BATCH ERRORS
-   */
-  const API_EC_BATCH_TOO_MANY_ITEMS = 950;
-  const API_EC_BATCH_ALREADY_STARTED = 951;
-  const API_EC_BATCH_NOT_STARTED = 952;
-  const API_EC_BATCH_METHOD_NOT_ALLOWED_IN_BATCH_MODE = 953;
-
-  /*
-   * EVENT API ERRORS
-   */
-  const API_EC_EVENT_INVALID_TIME = 1000;
-  const API_EC_EVENT_NAME_LOCKED  = 1001;
-
-  /*
-   * INFO BOX ERRORS
-   */
-  const API_EC_INFO_NO_INFORMATION = 1050;
-  const API_EC_INFO_SET_FAILED = 1051;
-
-  /*
-   * LIVEMESSAGE API ERRORS
-   */
-  const API_EC_LIVEMESSAGE_SEND_FAILED = 1100;
-  const API_EC_LIVEMESSAGE_EVENT_NAME_TOO_LONG = 1101;
-  const API_EC_LIVEMESSAGE_MESSAGE_TOO_LONG = 1102;
-
-  /*
-   * PAYMENTS API ERRORS
-   */
-  const API_EC_PAYMENTS_UNKNOWN = 1150;
-  const API_EC_PAYMENTS_APP_INVALID = 1151;
-  const API_EC_PAYMENTS_DATABASE = 1152;
-  const API_EC_PAYMENTS_PERMISSION_DENIED = 1153;
-  const API_EC_PAYMENTS_APP_NO_RESPONSE = 1154;
-  const API_EC_PAYMENTS_APP_ERROR_RESPONSE = 1155;
-  const API_EC_PAYMENTS_INVALID_ORDER = 1156;
-  const API_EC_PAYMENTS_INVALID_PARAM = 1157;
-  const API_EC_PAYMENTS_INVALID_OPERATION = 1158;
-  const API_EC_PAYMENTS_PAYMENT_FAILED = 1159;
-  const API_EC_PAYMENTS_DISABLED = 1160;
-
-  /*
-   * CONNECT SESSION ERRORS
-   */
-  const API_EC_CONNECT_FEED_DISABLED = 1300;
-
-  /*
-   * Platform tag bundles errors
-   */
-  const API_EC_TAG_BUNDLE_QUOTA = 1400;
-
-  /*
-   * SHARE
-   */
-  const API_EC_SHARE_BAD_URL = 1500;
-
-  /*
-   * NOTES
-   */
-  const API_EC_NOTE_CANNOT_MODIFY = 1600;
-
-  /*
-   * COMMENTS
-   */
-  const API_EC_COMMENTS_UNKNOWN = 1700;
-  const API_EC_COMMENTS_POST_TOO_LONG = 1701;
-  const API_EC_COMMENTS_DB_DOWN = 1702;
-  const API_EC_COMMENTS_INVALID_XID = 1703;
-  const API_EC_COMMENTS_INVALID_UID = 1704;
-  const API_EC_COMMENTS_INVALID_POST = 1705;
-  const API_EC_COMMENTS_INVALID_REMOVE = 1706;
-
-  /*
-   * GIFTS
-   */
-  const API_EC_GIFTS_UNKNOWN = 1900;
-
-  /*
-   * APPLICATION MORATORIUM ERRORS
-   */
-  const API_EC_DISABLED_ALL = 2000;
-  const API_EC_DISABLED_STATUS = 2001;
-  const API_EC_DISABLED_FEED_STORIES = 2002;
-  const API_EC_DISABLED_NOTIFICATIONS = 2003;
-  const API_EC_DISABLED_REQUESTS = 2004;
-  const API_EC_DISABLED_EMAIL = 2005;
-
-  /**
-   * This array is no longer maintained; to view the description of an error
-   * code, please look at the message element of the API response or visit
-   * the developer wiki at http://wiki.developers.facebook.com/.
-   */
-  public static $api_error_descriptions = array(
-      self::API_EC_SUCCESS           => 'Success',
-      self::API_EC_UNKNOWN           => 'An unknown error occurred',
-      self::API_EC_SERVICE           => 'Service temporarily unavailable',
-      self::API_EC_METHOD            => 'Unknown method',
-      self::API_EC_TOO_MANY_CALLS    => 'Application request limit reached',
-      self::API_EC_BAD_IP            => 'Unauthorized source IP address',
-      self::API_EC_PARAM             => 'Invalid parameter',
-      self::API_EC_PARAM_API_KEY     => 'Invalid API key',
-      self::API_EC_PARAM_SESSION_KEY => 'Session key invalid or no longer valid',
-      self::API_EC_PARAM_CALL_ID     => 'Call_id must be greater than previous',
-      self::API_EC_PARAM_SIGNATURE   => 'Incorrect signature',
-      self::API_EC_PARAM_USER_ID     => 'Invalid user id',
-      self::API_EC_PARAM_USER_FIELD  => 'Invalid user info field',
-      self::API_EC_PARAM_SOCIAL_FIELD => 'Invalid user field',
-      self::API_EC_PARAM_USER_ID_LIST => 'Invalid user id list',
-      self::API_EC_PARAM_FIELD_LIST => 'Invalid field list',
-      self::API_EC_PARAM_ALBUM_ID    => 'Invalid album id',
-      self::API_EC_PARAM_BAD_EID     => 'Invalid eid',
-      self::API_EC_PARAM_UNKNOWN_CITY => 'Unknown city',
-      self::API_EC_PERMISSION        => 'Permissions error',
-      self::API_EC_PERMISSION_USER   => 'User not visible',
-      self::API_EC_PERMISSION_NO_DEVELOPERS  => 'Application has no developers',
-      self::API_EC_PERMISSION_ALBUM  => 'Album not visible',
-      self::API_EC_PERMISSION_PHOTO  => 'Photo not visible',
-      self::API_EC_PERMISSION_EVENT  => 'Creating and modifying events required the extended permission create_event',
-      self::API_EC_PERMISSION_RSVP_EVENT => 'RSVPing to events required the extended permission rsvp_event',
-      self::API_EC_EDIT_ALBUM_SIZE   => 'Album is full',
-      self::FQL_EC_PARSER            => 'FQL: Parser Error',
-      self::FQL_EC_UNKNOWN_FIELD     => 'FQL: Unknown Field',
-      self::FQL_EC_UNKNOWN_TABLE     => 'FQL: Unknown Table',
-      self::FQL_EC_NOT_INDEXABLE     => 'FQL: Statement not indexable',
-      self::FQL_EC_UNKNOWN_FUNCTION  => 'FQL: Attempted to call unknown function',
-      self::FQL_EC_INVALID_PARAM     => 'FQL: Invalid parameter passed in',
-      self::API_EC_DATA_UNKNOWN_ERROR => 'Unknown data store API error',
-      self::API_EC_DATA_INVALID_OPERATION => 'Invalid operation',
-      self::API_EC_DATA_QUOTA_EXCEEDED => 'Data store allowable quota was exceeded',
-      self::API_EC_DATA_OBJECT_NOT_FOUND => 'Specified object cannot be found',
-      self::API_EC_DATA_OBJECT_ALREADY_EXISTS => 'Specified object already exists',
-      self::API_EC_DATA_DATABASE_ERROR => 'A database error occurred. Please try again',
-      self::API_EC_BATCH_ALREADY_STARTED => 'begin_batch already called, please make sure to call end_batch first',
-      self::API_EC_BATCH_NOT_STARTED => 'end_batch called before begin_batch',
-      self::API_EC_BATCH_METHOD_NOT_ALLOWED_IN_BATCH_MODE => 'This method is not allowed in batch mode'
-  );
-}
diff --git a/plugins/Facebook/facebook/jsonwrapper/JSON/JSON.php b/plugins/Facebook/facebook/jsonwrapper/JSON/JSON.php
deleted file mode 100644
index 0cddbddb41..0000000000
--- a/plugins/Facebook/facebook/jsonwrapper/JSON/JSON.php
+++ /dev/null
@@ -1,806 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Converts to and from JSON format.
- *
- * JSON (JavaScript Object Notation) is a lightweight data-interchange
- * format. It is easy for humans to read and write. It is easy for machines
- * to parse and generate. It is based on a subset of the JavaScript
- * Programming Language, Standard ECMA-262 3rd Edition - December 1999.
- * This feature can also be found in  Python. JSON is a text format that is
- * completely language independent but uses conventions that are familiar
- * to programmers of the C-family of languages, including C, C++, C#, Java,
- * JavaScript, Perl, TCL, and many others. These properties make JSON an
- * ideal data-interchange language.
- *
- * This package provides a simple encoder and decoder for JSON notation. It
- * is intended for use with client-side Javascript applications that make
- * use of HTTPRequest to perform server communication functions - data can
- * be encoded into JSON notation for use in a client-side javascript, or
- * decoded from incoming Javascript requests. JSON format is native to
- * Javascript, and can be directly eval()'ed with no further parsing
- * overhead
- *
- * All strings should be in ASCII or UTF-8 format!
- *
- * LICENSE: 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.
- *
- * THIS SOFTWARE IS PROVIDED ``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 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
- * @package     Services_JSON
- * @author      Michal Migurski <mike-json@teczno.com>
- * @author      Matt Knapp <mdknapp[at]gmail[dot]com>
- * @author      Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
- * @copyright   2005 Michal Migurski
- * @version     CVS: $Id: JSON.php,v 1.31 2006/06/28 05:54:17 migurski Exp $
- * @license     http://www.opensource.org/licenses/bsd-license.php
- * @link        http://pear.php.net/pepr/pepr-proposal-show.php?id=198
- */
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_SLICE',   1);
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_IN_STR',  2);
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_IN_ARR',  3);
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_IN_OBJ',  4);
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_IN_CMT', 5);
-
-/**
- * Behavior switch for Services_JSON::decode()
- */
-define('SERVICES_JSON_LOOSE_TYPE', 16);
-
-/**
- * Behavior switch for Services_JSON::decode()
- */
-define('SERVICES_JSON_SUPPRESS_ERRORS', 32);
-
-/**
- * Converts to and from JSON format.
- *
- * Brief example of use:
- *
- * <code>
- * // create a new instance of Services_JSON
- * $json = new Services_JSON();
- *
- * // convert a complexe value to JSON notation, and send it to the browser
- * $value = array('foo', 'bar', array(1, 2, 'baz'), array(3, array(4)));
- * $output = $json->encode($value);
- *
- * print($output);
- * // prints: ["foo","bar",[1,2,"baz"],[3,[4]]]
- *
- * // accept incoming POST data, assumed to be in JSON notation
- * $input = file_get_contents('php://input', 1000000);
- * $value = $json->decode($input);
- * </code>
- */
-class Services_JSON
-{
-   /**
-    * constructs a new JSON instance
-    *
-    * @param    int     $use    object behavior flags; combine with boolean-OR
-    *
-    *                           possible values:
-    *                           - SERVICES_JSON_LOOSE_TYPE:  loose typing.
-    *                                   "{...}" syntax creates associative arrays
-    *                                   instead of objects in decode().
-    *                           - SERVICES_JSON_SUPPRESS_ERRORS:  error suppression.
-    *                                   Values which can't be encoded (e.g. resources)
-    *                                   appear as NULL instead of throwing errors.
-    *                                   By default, a deeply-nested resource will
-    *                                   bubble up with an error, so all return values
-    *                                   from encode() should be checked with isError()
-    */
-    function Services_JSON($use = 0)
-    {
-        $this->use = $use;
-    }
-
-   /**
-    * convert a string from one UTF-16 char to one UTF-8 char
-    *
-    * Normally should be handled by mb_convert_encoding, but
-    * provides a slower PHP-only method for installations
-    * that lack the multibye string extension.
-    *
-    * @param    string  $utf16  UTF-16 character
-    * @return   string  UTF-8 character
-    * @access   private
-    */
-    function utf162utf8($utf16)
-    {
-        // oh please oh please oh please oh please oh please
-        if(function_exists('mb_convert_encoding')) {
-            return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
-        }
-
-        $bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
-
-        switch(true) {
-            case ((0x7F & $bytes) == $bytes):
-                // this case should never be reached, because we are in ASCII range
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x7F & $bytes);
-
-            case (0x07FF & $bytes) == $bytes:
-                // return a 2-byte UTF-8 character
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xC0 | (($bytes >> 6) & 0x1F))
-                     . chr(0x80 | ($bytes & 0x3F));
-
-            case (0xFFFF & $bytes) == $bytes:
-                // return a 3-byte UTF-8 character
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xE0 | (($bytes >> 12) & 0x0F))
-                     . chr(0x80 | (($bytes >> 6) & 0x3F))
-                     . chr(0x80 | ($bytes & 0x3F));
-        }
-
-        // ignoring UTF-32 for now, sorry
-        return '';
-    }
-
-   /**
-    * convert a string from one UTF-8 char to one UTF-16 char
-    *
-    * Normally should be handled by mb_convert_encoding, but
-    * provides a slower PHP-only method for installations
-    * that lack the multibye string extension.
-    *
-    * @param    string  $utf8   UTF-8 character
-    * @return   string  UTF-16 character
-    * @access   private
-    */
-    function utf82utf16($utf8)
-    {
-        // oh please oh please oh please oh please oh please
-        if(function_exists('mb_convert_encoding')) {
-            return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
-        }
-
-        switch(strlen($utf8)) {
-            case 1:
-                // this case should never be reached, because we are in ASCII range
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return $utf8;
-
-            case 2:
-                // return a UTF-16 character from a 2-byte UTF-8 char
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x07 & (ord($utf8{0}) >> 2))
-                     . chr((0xC0 & (ord($utf8{0}) << 6))
-                         | (0x3F & ord($utf8{1})));
-
-            case 3:
-                // return a UTF-16 character from a 3-byte UTF-8 char
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr((0xF0 & (ord($utf8{0}) << 4))
-                         | (0x0F & (ord($utf8{1}) >> 2)))
-                     . chr((0xC0 & (ord($utf8{1}) << 6))
-                         | (0x7F & ord($utf8{2})));
-        }
-
-        // ignoring UTF-32 for now, sorry
-        return '';
-    }
-
-   /**
-    * encodes an arbitrary variable into JSON format
-    *
-    * @param    mixed   $var    any number, boolean, string, array, or object to be encoded.
-    *                           see argument 1 to Services_JSON() above for array-parsing behavior.
-    *                           if var is a strng, note that encode() always expects it
-    *                           to be in ASCII or UTF-8 format!
-    *
-    * @return   mixed   JSON string representation of input var or an error if a problem occurs
-    * @access   public
-    */
-    function encode($var)
-    {
-        switch (gettype($var)) {
-            case 'boolean':
-                return $var ? 'true' : 'false';
-
-            case 'NULL':
-                return 'null';
-
-            case 'integer':
-                return (int) $var;
-
-            case 'double':
-            case 'float':
-                return (float) $var;
-
-            case 'string':
-                // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
-                $ascii = '';
-                $strlen_var = strlen($var);
-
-               /*
-                * Iterate over every character in the string,
-                * escaping with a slash or encoding to UTF-8 where necessary
-                */
-                for ($c = 0; $c < $strlen_var; ++$c) {
-
-                    $ord_var_c = ord($var{$c});
-
-                    switch (true) {
-                        case $ord_var_c == 0x08:
-                            $ascii .= '\b';
-                            break;
-                        case $ord_var_c == 0x09:
-                            $ascii .= '\t';
-                            break;
-                        case $ord_var_c == 0x0A:
-                            $ascii .= '\n';
-                            break;
-                        case $ord_var_c == 0x0C:
-                            $ascii .= '\f';
-                            break;
-                        case $ord_var_c == 0x0D:
-                            $ascii .= '\r';
-                            break;
-
-                        case $ord_var_c == 0x22:
-                        case $ord_var_c == 0x2F:
-                        case $ord_var_c == 0x5C:
-                            // double quote, slash, slosh
-                            $ascii .= '\\'.$var{$c};
-                            break;
-
-                        case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
-                            // characters U-00000000 - U-0000007F (same as ASCII)
-                            $ascii .= $var{$c};
-                            break;
-
-                        case (($ord_var_c & 0xE0) == 0xC0):
-                            // characters U-00000080 - U-000007FF, mask 110XXXXX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c, ord($var{$c + 1}));
-                            $c += 1;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xF0) == 0xE0):
-                            // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}));
-                            $c += 2;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xF8) == 0xF0):
-                            // characters U-00010000 - U-001FFFFF, mask 11110XXX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}));
-                            $c += 3;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xFC) == 0xF8):
-                            // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}),
-                                         ord($var{$c + 4}));
-                            $c += 4;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xFE) == 0xFC):
-                            // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}),
-                                         ord($var{$c + 4}),
-                                         ord($var{$c + 5}));
-                            $c += 5;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-                    }
-                }
-
-                return '"'.$ascii.'"';
-
-            case 'array':
-               /*
-                * As per JSON spec if any array key is not an integer
-                * we must treat the the whole array as an object. We
-                * also try to catch a sparsely populated associative
-                * array with numeric keys here because some JS engines
-                * will create an array with empty indexes up to
-                * max_index which can cause memory issues and because
-                * the keys, which may be relevant, will be remapped
-                * otherwise.
-                *
-                * As per the ECMA and JSON specification an object may
-                * have any string as a property. Unfortunately due to
-                * a hole in the ECMA specification if the key is a
-                * ECMA reserved word or starts with a digit the
-                * parameter is only accessible using ECMAScript's
-                * bracket notation.
-                */
-
-                // treat as a JSON object
-                if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
-                    $properties = array_map(array($this, 'name_value'),
-                                            array_keys($var),
-                                            array_values($var));
-
-                    foreach($properties as $property) {
-                        if(Services_JSON::isError($property)) {
-                            return $property;
-                        }
-                    }
-
-                    return '{' . join(',', $properties) . '}';
-                }
-
-                // treat it like a regular array
-                $elements = array_map(array($this, 'encode'), $var);
-
-                foreach($elements as $element) {
-                    if(Services_JSON::isError($element)) {
-                        return $element;
-                    }
-                }
-
-                return '[' . join(',', $elements) . ']';
-
-            case 'object':
-                $vars = get_object_vars($var);
-
-                $properties = array_map(array($this, 'name_value'),
-                                        array_keys($vars),
-                                        array_values($vars));
-
-                foreach($properties as $property) {
-                    if(Services_JSON::isError($property)) {
-                        return $property;
-                    }
-                }
-
-                return '{' . join(',', $properties) . '}';
-
-            default:
-                return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS)
-                    ? 'null'
-                    : new Services_JSON_Error(gettype($var)." can not be encoded as JSON string");
-        }
-    }
-
-   /**
-    * array-walking function for use in generating JSON-formatted name-value pairs
-    *
-    * @param    string  $name   name of key to use
-    * @param    mixed   $value  reference to an array element to be encoded
-    *
-    * @return   string  JSON-formatted name-value pair, like '"name":value'
-    * @access   private
-    */
-    function name_value($name, $value)
-    {
-        $encoded_value = $this->encode($value);
-
-        if(Services_JSON::isError($encoded_value)) {
-            return $encoded_value;
-        }
-
-        return $this->encode(strval($name)) . ':' . $encoded_value;
-    }
-
-   /**
-    * reduce a string by removing leading and trailing comments and whitespace
-    *
-    * @param    $str    string      string value to strip of comments and whitespace
-    *
-    * @return   string  string value stripped of comments and whitespace
-    * @access   private
-    */
-    function reduce_string($str)
-    {
-        $str = preg_replace(array(
-
-                // eliminate single line comments in '// ...' form
-                '#^\s*//(.+)$#m',
-
-                // eliminate multi-line comments in '/* ... */' form, at start of string
-                '#^\s*/\*(.+)\*/#Us',
-
-                // eliminate multi-line comments in '/* ... */' form, at end of string
-                '#/\*(.+)\*/\s*$#Us'
-
-            ), '', $str);
-
-        // eliminate extraneous space
-        return trim($str);
-    }
-
-   /**
-    * decodes a JSON string into appropriate variable
-    *
-    * @param    string  $str    JSON-formatted string
-    *
-    * @return   mixed   number, boolean, string, array, or object
-    *                   corresponding to given JSON input string.
-    *                   See argument 1 to Services_JSON() above for object-output behavior.
-    *                   Note that decode() always returns strings
-    *                   in ASCII or UTF-8 format!
-    * @access   public
-    */
-    function decode($str)
-    {
-        $str = $this->reduce_string($str);
-
-        switch (strtolower($str)) {
-            case 'true':
-                return true;
-
-            case 'false':
-                return false;
-
-            case 'null':
-                return null;
-
-            default:
-                $m = array();
-
-                if (is_numeric($str)) {
-                    // Lookie-loo, it's a number
-
-                    // This would work on its own, but I'm trying to be
-                    // good about returning integers where appropriate:
-                    // return (float)$str;
-
-                    // Return float or int, as appropriate
-                    return ((float)$str == (integer)$str)
-                        ? (integer)$str
-                        : (float)$str;
-
-                } elseif (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
-                    // STRINGS RETURNED IN UTF-8 FORMAT
-                    $delim = substr($str, 0, 1);
-                    $chrs = substr($str, 1, -1);
-                    $utf8 = '';
-                    $strlen_chrs = strlen($chrs);
-
-                    for ($c = 0; $c < $strlen_chrs; ++$c) {
-
-                        $substr_chrs_c_2 = substr($chrs, $c, 2);
-                        $ord_chrs_c = ord($chrs{$c});
-
-                        switch (true) {
-                            case $substr_chrs_c_2 == '\b':
-                                $utf8 .= chr(0x08);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\t':
-                                $utf8 .= chr(0x09);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\n':
-                                $utf8 .= chr(0x0A);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\f':
-                                $utf8 .= chr(0x0C);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\r':
-                                $utf8 .= chr(0x0D);
-                                ++$c;
-                                break;
-
-                            case $substr_chrs_c_2 == '\\"':
-                            case $substr_chrs_c_2 == '\\\'':
-                            case $substr_chrs_c_2 == '\\\\':
-                            case $substr_chrs_c_2 == '\\/':
-                                if (($delim == '"' && $substr_chrs_c_2 != '\\\'') ||
-                                   ($delim == "'" && $substr_chrs_c_2 != '\\"')) {
-                                    $utf8 .= $chrs{++$c};
-                                }
-                                break;
-
-                            case preg_match('/\\\u[0-9A-F]{4}/i', substr($chrs, $c, 6)):
-                                // single, escaped unicode character
-                                $utf16 = chr(hexdec(substr($chrs, ($c + 2), 2)))
-                                       . chr(hexdec(substr($chrs, ($c + 4), 2)));
-                                $utf8 .= $this->utf162utf8($utf16);
-                                $c += 5;
-                                break;
-
-                            case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
-                                $utf8 .= $chrs{$c};
-                                break;
-
-                            case ($ord_chrs_c & 0xE0) == 0xC0:
-                                // characters U-00000080 - U-000007FF, mask 110XXXXX
-                                //see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 2);
-                                ++$c;
-                                break;
-
-                            case ($ord_chrs_c & 0xF0) == 0xE0:
-                                // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 3);
-                                $c += 2;
-                                break;
-
-                            case ($ord_chrs_c & 0xF8) == 0xF0:
-                                // characters U-00010000 - U-001FFFFF, mask 11110XXX
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 4);
-                                $c += 3;
-                                break;
-
-                            case ($ord_chrs_c & 0xFC) == 0xF8:
-                                // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 5);
-                                $c += 4;
-                                break;
-
-                            case ($ord_chrs_c & 0xFE) == 0xFC:
-                                // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 6);
-                                $c += 5;
-                                break;
-
-                        }
-
-                    }
-
-                    return $utf8;
-
-                } elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
-                    // array, or object notation
-
-                    if ($str{0} == '[') {
-                        $stk = array(SERVICES_JSON_IN_ARR);
-                        $arr = array();
-                    } else {
-                        if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                            $stk = array(SERVICES_JSON_IN_OBJ);
-                            $obj = array();
-                        } else {
-                            $stk = array(SERVICES_JSON_IN_OBJ);
-                            $obj = new stdClass();
-                        }
-                    }
-
-                    array_push($stk, array('what'  => SERVICES_JSON_SLICE,
-                                           'where' => 0,
-                                           'delim' => false));
-
-                    $chrs = substr($str, 1, -1);
-                    $chrs = $this->reduce_string($chrs);
-
-                    if ($chrs == '') {
-                        if (reset($stk) == SERVICES_JSON_IN_ARR) {
-                            return $arr;
-
-                        } else {
-                            return $obj;
-
-                        }
-                    }
-
-                    //print("\nparsing {$chrs}\n");
-
-                    $strlen_chrs = strlen($chrs);
-
-                    for ($c = 0; $c <= $strlen_chrs; ++$c) {
-
-                        $top = end($stk);
-                        $substr_chrs_c_2 = substr($chrs, $c, 2);
-
-                        if (($c == $strlen_chrs) || (($chrs{$c} == ',') && ($top['what'] == SERVICES_JSON_SLICE))) {
-                            // found a comma that is not inside a string, array, etc.,
-                            // OR we've reached the end of the character list
-                            $slice = substr($chrs, $top['where'], ($c - $top['where']));
-                            array_push($stk, array('what' => SERVICES_JSON_SLICE, 'where' => ($c + 1), 'delim' => false));
-                            //print("Found split at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                            if (reset($stk) == SERVICES_JSON_IN_ARR) {
-                                // we are in an array, so just push an element onto the stack
-                                array_push($arr, $this->decode($slice));
-
-                            } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
-                                // we are in an object, so figure
-                                // out the property name and set an
-                                // element in an associative array,
-                                // for now
-                                $parts = array();
-                                
-                                if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
-                                    // "name":value pair
-                                    $key = $this->decode($parts[1]);
-                                    $val = $this->decode($parts[2]);
-
-                                    if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                                        $obj[$key] = $val;
-                                    } else {
-                                        $obj->$key = $val;
-                                    }
-                                } elseif (preg_match('/^\s*(\w+)\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
-                                    // name:value pair, where name is unquoted
-                                    $key = $parts[1];
-                                    $val = $this->decode($parts[2]);
-
-                                    if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                                        $obj[$key] = $val;
-                                    } else {
-                                        $obj->$key = $val;
-                                    }
-                                }
-
-                            }
-
-                        } elseif ((($chrs{$c} == '"') || ($chrs{$c} == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) {
-                            // found a quote, and we are not inside a string
-                            array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs{$c}));
-                            //print("Found start of string at {$c}\n");
-
-                        } elseif (($chrs{$c} == $top['delim']) &&
-                                 ($top['what'] == SERVICES_JSON_IN_STR) &&
-                                 ((strlen(substr($chrs, 0, $c)) - strlen(rtrim(substr($chrs, 0, $c), '\\'))) % 2 != 1)) {
-                            // found a quote, we're in a string, and it's not escaped
-                            // we know that it's not escaped becase there is _not_ an
-                            // odd number of backslashes at the end of the string so far
-                            array_pop($stk);
-                            //print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
-
-                        } elseif (($chrs{$c} == '[') &&
-                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
-                            // found a left-bracket, and we are in an array, object, or slice
-                            array_push($stk, array('what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false));
-                            //print("Found start of array at {$c}\n");
-
-                        } elseif (($chrs{$c} == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
-                            // found a right-bracket, and we're in an array
-                            array_pop($stk);
-                            //print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                        } elseif (($chrs{$c} == '{') &&
-                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
-                            // found a left-brace, and we are in an array, object, or slice
-                            array_push($stk, array('what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false));
-                            //print("Found start of object at {$c}\n");
-
-                        } elseif (($chrs{$c} == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
-                            // found a right-brace, and we're in an object
-                            array_pop($stk);
-                            //print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                        } elseif (($substr_chrs_c_2 == '/*') &&
-                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
-                            // found a comment start, and we are in an array, object, or slice
-                            array_push($stk, array('what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false));
-                            $c++;
-                            //print("Found start of comment at {$c}\n");
-
-                        } elseif (($substr_chrs_c_2 == '*/') && ($top['what'] == SERVICES_JSON_IN_CMT)) {
-                            // found a comment end, and we're in one now
-                            array_pop($stk);
-                            $c++;
-
-                            for ($i = $top['where']; $i <= $c; ++$i)
-                                $chrs = substr_replace($chrs, ' ', $i, 1);
-
-                            //print("Found end of comment at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                        }
-
-                    }
-
-                    if (reset($stk) == SERVICES_JSON_IN_ARR) {
-                        return $arr;
-
-                    } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
-                        return $obj;
-
-                    }
-
-                }
-        }
-    }
-
-    /**
-     * @todo Ultimately, this should just call PEAR::isError()
-     */
-    function isError($data, $code = null)
-    {
-        if (class_exists('pear')) {
-            return PEAR::isError($data, $code);
-        } elseif (is_object($data) && (get_class($data) == 'services_json_error' ||
-                                 is_subclass_of($data, 'services_json_error'))) {
-            return true;
-        }
-
-        return false;
-    }
-}
-
-if (class_exists('PEAR_Error')) {
-
-    class Services_JSON_Error extends PEAR_Error
-    {
-        function Services_JSON_Error($message = 'unknown error', $code = null,
-                                     $mode = null, $options = null, $userinfo = null)
-        {
-            parent::PEAR_Error($message, $code, $mode, $options, $userinfo);
-        }
-    }
-
-} else {
-
-    /**
-     * @todo Ultimately, this class shall be descended from PEAR_Error
-     */
-    class Services_JSON_Error
-    {
-        function Services_JSON_Error($message = 'unknown error', $code = null,
-                                     $mode = null, $options = null, $userinfo = null)
-        {
-
-        }
-    }
-
-}
-    
-?>
diff --git a/plugins/Facebook/facebook/jsonwrapper/JSON/LICENSE b/plugins/Facebook/facebook/jsonwrapper/JSON/LICENSE
deleted file mode 100644
index 4ae6bef55d..0000000000
--- a/plugins/Facebook/facebook/jsonwrapper/JSON/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-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.
-
-THIS SOFTWARE IS PROVIDED ``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 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/Facebook/facebook/jsonwrapper/jsonwrapper.php b/plugins/Facebook/facebook/jsonwrapper/jsonwrapper.php
deleted file mode 100644
index 29509debad..0000000000
--- a/plugins/Facebook/facebook/jsonwrapper/jsonwrapper.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-# In PHP 5.2 or higher we don't need to bring this in
-if (!function_exists('json_encode')) {
-	require_once 'jsonwrapper_inner.php';
-} 
-?>
diff --git a/plugins/Facebook/facebook/jsonwrapper/jsonwrapper_inner.php b/plugins/Facebook/facebook/jsonwrapper/jsonwrapper_inner.php
deleted file mode 100644
index 36a3f28635..0000000000
--- a/plugins/Facebook/facebook/jsonwrapper/jsonwrapper_inner.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-require_once 'JSON/JSON.php';
-
-function json_encode($arg)
-{
-	global $services_json;
-	if (!isset($services_json)) {
-		$services_json = new Services_JSON();
-	}
-	return $services_json->encode($arg);
-}
-
-function json_decode($arg)
-{
-	global $services_json;
-	if (!isset($services_json)) {
-		$services_json = new Services_JSON();
-	}
-	return $services_json->decode($arg);
-}
-
-?>
diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php
deleted file mode 100644
index 003bf8cd7e..0000000000
--- a/plugins/Facebook/facebookaction.php
+++ /dev/null
@@ -1,531 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Base Facebook Action
- *
- * 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  Faceboook
- * @package   StatusNet
- * @author    Zach Copley <zach@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 . '/plugins/Facebook/facebookutil.php';
-require_once INSTALLDIR . '/plugins/Facebook/facebooknoticeform.php';
-
-class FacebookAction extends Action
-{
-    var $facebook = null;
-    var $fbuid    = null;
-    var $flink    = null;
-    var $action   = null;
-    var $app_uri  = null;
-    var $app_name = null;
-
-    function __construct($output='php://output', $indent=null, $facebook=null, $flink=null)
-    {
-        parent::__construct($output, $indent);
-
-        $this->facebook = $facebook;
-        $this->flink = $flink;
-
-        if ($this->flink) {
-            $this->fbuid = $flink->foreign_id;
-            $this->user = $flink->getUser();
-        }
-
-        $this->args = array();
-    }
-
-    function prepare($argarray)
-    {
-        parent::prepare($argarray);
-
-        $this->facebook = getFacebook();
-        $this->fbuid = $this->facebook->require_login();
-
-        $this->action = $this->trimmed('action');
-
-        $app_props = $this->facebook->api_client->Admin_getAppProperties(
-                array('canvas_name', 'application_name'));
-
-        $this->app_uri = 'http://apps.facebook.com/' . $app_props['canvas_name'];
-        $this->app_name = $app_props['application_name'];
-
-        $this->flink = Foreign_link::getByForeignID($this->fbuid, FACEBOOK_SERVICE);
-
-        return true;
-
-    }
-
-    function showStylesheets()
-    {
-        // Loading CSS via files in Facebook FBML Canvas apps is still busted as of 1/31/11
-        // See: http://bugs.developers.facebook.net/show_bug.cgi?id=10052
-        $this->cssLink('css/display.css', 'base');
-        $this->cssLink('css/display.css', null, 'screen, projection, tv');
-        $this->cssLink('plugins/Facebook/facebookapp.css');
-
-	// Also, Facebook refuses to let me do this... gar!
-/*
-	$baseCss = file_get_contents(INSTALLDIR . '/theme/base/css/display.css');
-	$this->style($baseCss);
-
-        $facebookCss = file_get_contents(INSTALLDIR . '/plugins/Facebook/facebookapp.css');
-        $this->style($facebookCss);
-*/
-    }
-
-    function showScripts()
-    {
-        $this->script('plugins/Facebook/facebookapp.js');
-    }
-
-    /**
-     * Start an Facebook ready HTML document
-     *
-     * For Facebook we don't want to actually output any headers,
-     * DTD info, etc.  Just Stylesheet and JavaScript links.
-     *
-     * @param string $type MIME type to use; default is to do negotation.
-     *
-     * @return void
-     */
-    function startHTML($type=null)
-    {
-        $this->showStylesheets();
-        $this->showScripts();
-
-        $this->elementStart('div', array('class' => 'facebook-page'));
-    }
-
-    /**
-    *  Ends a Facebook ready HTML document
-    *
-    *  @return void
-    */
-    function endHTML()
-    {
-        $this->elementEnd('div');
-        $this->endXML();
-    }
-
-    /**
-     * Show notice form.
-     *
-     * @return nothing
-     */
-    function showNoticeForm()
-    {
-        // don't do it for most of the Facebook pages
-    }
-
-    function showBody()
-    {
-        $this->elementStart('div', array('id' => 'wrap'));
-        $this->showHeader();
-        $this->showCore();
-        $this->showFooter();
-        $this->elementEnd('div');
-    }
-
-    function showHead($error, $success)
-    {
-        if ($error) {
-            $this->element("h1", null, $error);
-        }
-
-        if ($success) {
-            $this->element("h1", null, $success);
-        }
-
-        $this->elementStart('fb:if-section-not-added', array('section' => 'profile'));
-        $this->elementStart('span', array('id' => 'add_to_profile'));
-        $this->element('fb:add-section-button', array('section' => 'profile'));
-        $this->elementEnd('span');
-        $this->elementEnd('fb:if-section-not-added');
-
-    }
-
-    // Make this into a widget later
-    function showLocalNav()
-    {
-        $this->elementStart('ul', array('class' => 'nav'));
-
-        $this->elementStart('li', array('class' =>
-            ($this->action == 'facebookhome') ? 'current' : 'facebook_home'));
-        $this->element('a',
-            // TRANS: Link description for 'Home' link that leads to a start page.
-            array('href' => 'index.php', 'title' => _m('MENU','Home')),
-            // TRANS: Tooltip for 'Home' link that leads to a start page.
-            _m('Home'));
-        $this->elementEnd('li');
-
-        if (common_config('invite', 'enabled')) {
-            $this->elementStart('li',
-                array('class' =>
-                    ($this->action == 'facebookinvite') ? 'current' : 'facebook_invite'));
-            $this->element('a',
-                // TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-                array('href' => 'invite.php', 'title' => _m('MENU','Invite')),
-                // TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-                _m('Invite'));
-            $this->elementEnd('li');
-        }
-
-        $this->elementStart('li',
-            array('class' =>
-                ($this->action == 'facebooksettings') ? 'current' : 'facebook_settings'));
-        $this->element('a',
-            array('href' => 'settings.php',
-                // TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-                'title' => _m('MENU','Settings')),
-                // TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-                _m('Settings'));
-        $this->elementEnd('li');
-
-        $this->elementEnd('ul');
-    }
-
-    /**
-     * Show header of the page.
-     *
-     * @return nothing
-     */
-    function showHeader()
-    {
-        $this->elementStart('div', array('id' => 'header'));
-        $this->showLogo();
-        $this->showNoticeForm();
-        $this->elementEnd('div');
-    }
-
-    /**
-     * Show page, a template method.
-     *
-     * @return nothing
-     */
-    function showPage($error = null, $success = null)
-    {
-        $this->startHTML();
-        $this->showHead($error, $success);
-        $this->showBody();
-        $this->endHTML();
-    }
-
-    function showInstructions()
-    {
-        $this->elementStart('div', array('class' => 'facebook_guide'));
-
-        $this->elementStart('dl', array('class' => 'system_notice'));
-        $this->element('dt', null, 'Page Notice');
-
-        $loginmsg_part1 = _m('To use the %s Facebook Application you need to login ' .
-            'with your username and password. Don\'t have a username yet?');
-        $loginmsg_part2 = _m(' a new account.');
-
-        $this->elementStart('dd');
-        $this->elementStart('p');
-        $this->text(sprintf($loginmsg_part1, common_config('site', 'name')));
-        // @todo FIXME: Bad i18n. Patchwork message in two parts.
-        $this->element('a',
-            array('href' => common_local_url('register')), _m('Register'));
-        $this->text( " " . $loginmsg_part2);
-        $this->elementEnd('p');
-        $this->elementEnd('dd');
-
-        $this->elementEnd('dl');
-        $this->elementEnd('div');
-    }
-
-    function showLoginForm($msg = null)
-    {
-
-        $this->elementStart('div', array('id' => 'content'));
-        $this->element('h1', null, _m('Login'));
-
-        if ($msg) {
-             $this->element('fb:error', array('message' => $msg));
-        }
-
-        $this->showInstructions();
-
-        $this->elementStart('div', array('id' => 'content_inner'));
-
-        $this->elementStart('form', array('method' => 'post',
-                                               'class' => 'form_settings',
-                                               'id' => 'login',
-                                               'action' => 'index.php'));
-
-        $this->elementStart('fieldset');
-
-        $this->elementStart('ul', array('class' => 'form_datas'));
-        $this->elementStart('li');
-        $this->input('nickname', _m('Nickname'));
-        $this->elementEnd('li');
-        $this->elementStart('li');
-        $this->password('password', _m('Password'));
-        $this->elementEnd('li');
-        $this->elementEnd('ul');
-
-        // TRANS: Login button.
-        $this->submit('submit', _m('BUTTON','Login'));
-        $this->elementEnd('fieldset');
-        $this->elementEnd('form');
-
-        $this->elementStart('p');
-        $this->element('a', array('href' => common_local_url('recoverpassword')),
-                       _m('Lost or forgotten password?'));
-        $this->elementEnd('p');
-
-        $this->elementEnd('div');
-        $this->elementEnd('div');
-    }
-
-    /**
-     * Generate pagination links
-     *
-     * @param boolean $have_before is there something before?
-     * @param boolean $have_after  is there something after?
-     * @param integer $page        current page
-     * @param string  $action      current action
-     * @param array   $args        rest of query arguments
-     *
-     * @return nothing
-     */
-    function pagination($have_before, $have_after, $page, $action, $args=null)
-    {
-        // Does a little before-after block for next/prev page
-        if ($have_before || $have_after) {
-            $this->elementStart('dl', 'pagination');
-            $this->element('dt', null, _m('Pagination'));
-            $this->elementStart('dd', null);
-            $this->elementStart('ul', array('class' => 'nav'));
-        }
-        if ($have_before) {
-            $pargs   = array('page' => $page-1);
-            $newargs = $args ? array_merge($args, $pargs) : $pargs;
-            $this->elementStart('li', array('class' => 'nav_prev'));
-            $this->element('a', array('href' => "$this->app_uri/$action?page=$newargs[page]", 'rel' => 'prev'),
-                           _m('After'));
-            $this->elementEnd('li');
-        }
-        if ($have_after) {
-            $pargs   = array('page' => $page+1);
-            $newargs = $args ? array_merge($args, $pargs) : $pargs;
-            $this->elementStart('li', array('class' => 'nav_next'));
-            $this->element('a', array('href' => "$this->app_uri/$action?page=$newargs[page]", 'rel' => 'next'),
-                           _m('Before'));
-            $this->elementEnd('li');
-        }
-        if ($have_before || $have_after) {
-            $this->elementEnd('ul');
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
-        }
-    }
-
-    function saveNewNotice()
-    {
-        $user = $this->flink->getUser();
-
-        $content = $this->trimmed('status_textarea');
-
-        if (!$content) {
-            $this->showPage(_m('No notice content!'));
-            return;
-        } else {
-            $content_shortened = $user->shortenLinks($content);
-
-            if (Notice::contentTooLong($content_shortened)) {
-                // @todo FIXME: i18n: Needs plural.
-                $this->showPage(sprintf(_m('That\'s too long. Max notice size is %d chars.'),
-                                        Notice::maxContent()));
-                return;
-            }
-        }
-
-        $inter = new CommandInterpreter();
-
-        $cmd = $inter->handle_command($user, $content_shortened);
-
-        if ($cmd) {
-            // XXX fix this
-            $cmd->execute(new WebChannel());
-            return;
-        }
-
-        $replyto = $this->trimmed('inreplyto');
-
-        try {
-            $notice = Notice::saveNew($user->id, $content, 'web',
-                                      array('reply_to' => ($replyto == 'false') ? null : $replyto));
-
-        } catch (Exception $e) {
-            $this->showPage($e->getMessage());
-            return;
-        }
-
-    }
-}
-
-class FacebookNoticeList extends NoticeList
-{
-    /**
-     * constructor
-     *
-     * @param Notice $notice stream of notices from DB_DataObject
-     */
-
-    function __construct($notice, $out=null)
-    {
-        parent::__construct($notice, $out);
-    }
-
-    /**
-     * 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, _m('Notices'));
-        $this->out->elementStart('ul', array('class' => 'notices'));
-
-        $cnt = 0;
-
-        while ($this->notice->fetch() && $cnt <= NOTICES_PER_PAGE) {
-            $cnt++;
-
-            if ($cnt > NOTICES_PER_PAGE) {
-                break;
-            }
-
-            $item = $this->newListItem($this->notice);
-            $item->show();
-        }
-
-        $this->out->elementEnd('ul');
-        $this->out->elementEnd('div');
-
-        return $cnt;
-    }
-
-    /**
-     * returns a new list item for the current notice
-     *
-     * Overridden to return a Facebook specific list item.
-     *
-     * @param Notice $notice the current notice
-     *
-     * @return FacebookNoticeListItem a list item for displaying the notice
-     * formatted for display in the Facebook App.
-     */
-    function newListItem($notice)
-    {
-        return new FacebookNoticeListItem($notice, $this);
-    }
-}
-
-class FacebookNoticeListItem extends NoticeListItem
-{
-    /**
-     * constructor
-     *
-     * Also initializes the profile attribute.
-     *
-     * @param Notice $notice The notice we'll display
-     */
-    function __construct($notice, $out=null)
-    {
-        parent::__construct($notice, $out);
-    }
-
-    /**
-     * recipe function for displaying a single notice in the Facebook App.
-     *
-     * Overridden to strip out some of the controls that we don't
-     * want to be available.
-     *
-     * @return void
-     */
-    function show()
-    {
-        $this->showStart();
-        $this->showNotice();
-        $this->showNoticeInfo();
-
-        // XXX: Need to update to show attachements and controls
-
-        $this->showEnd();
-    }
-}
-
-class FacebookProfileBoxNotice extends FacebookNoticeListItem
-{
-    /**
-     * constructor
-     *
-     * Also initializes the profile attribute.
-     *
-     * @param Notice $notice The notice we'll display
-     */
-    function __construct($notice, $out=null)
-    {
-        parent::__construct($notice, $out);
-    }
-
-    /**
-     * Recipe function for displaying a single notice in the
-     * Facebook App profile notice box
-     *
-     * @return void
-     */
-    function show()
-    {
-        $this->showNotice();
-        $this->showNoticeInfo();
-        $this->showAppLink();
-    }
-
-    function showAppLink()
-    {
-        $this->facebook = getFacebook();
-
-        $app_props = $this->facebook->api_client->Admin_getAppProperties(
-                array('canvas_name', 'application_name'));
-
-        $this->app_uri = 'http://apps.facebook.com/' . $app_props['canvas_name'];
-        $this->app_name = $app_props['application_name'];
-
-        $this->out->elementStart('a', array('id' => 'facebook_statusnet_app',
-                                            'href' => $this->app_uri));
-        $this->out->text($this->app_name);
-        $this->out->elementEnd('a');
-    }
-}
diff --git a/plugins/Facebook/facebookadminpanel.php b/plugins/Facebook/facebookadminpanel.php
deleted file mode 100644
index ae26c7d3e8..0000000000
--- a/plugins/Facebook/facebookadminpanel.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Facebook integration 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    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);
-}
-
-/**
- * Administer global Facebook integration settings
- *
- * @category Admin
- * @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 FacebookadminpanelAction extends AdminPanelAction
-{
-    /**
-     * Returns the page title
-     *
-     * @return string page title
-     */
-    function title()
-    {
-        return _m('Facebook');
-    }
-
-    /**
-     * Instructions for using this form.
-     *
-     * @return string instructions
-     */
-    function getInstructions()
-    {
-        return _m('Facebook integration settings');
-    }
-
-    /**
-     * Show the Facebook admin panel form
-     *
-     * @return void
-     */
-    function showForm()
-    {
-        $form = new FacebookAdminPanelForm($this);
-        $form->show();
-        return;
-    }
-
-    /**
-     * Save settings from the form
-     *
-     * @return void
-     */
-    function saveSettings()
-    {
-        static $settings = array(
-            'facebook'     => array('apikey', 'secret'),
-        );
-
-        $values = array();
-
-        foreach ($settings as $section => $parts) {
-            foreach ($parts as $setting) {
-                $values[$section][$setting]
-                    = $this->trimmed($setting);
-            }
-        }
-
-        // This throws an exception on validation errors
-        $this->validate($values);
-
-        // assert(all values are valid);
-
-        $config = new Config();
-
-        $config->query('BEGIN');
-
-        foreach ($settings as $section => $parts) {
-            foreach ($parts as $setting) {
-                Config::save($section, $setting, $values[$section][$setting]);
-            }
-        }
-
-        $config->query('COMMIT');
-
-        return;
-    }
-
-    function validate(&$values)
-    {
-        // Validate consumer key and secret (can't be too long)
-
-        if (mb_strlen($values['facebook']['apikey']) > 255) {
-            $this->clientError(
-                _m("Invalid Facebook API key. Max length is 255 characters.")
-            );
-        }
-
-        if (mb_strlen($values['facebook']['secret']) > 255) {
-            $this->clientError(
-                _m("Invalid Facebook API secret. Max length is 255 characters.")
-            );
-        }
-    }
-}
-
-class FacebookAdminPanelForm extends AdminForm
-{
-    /**
-     * ID of the form
-     *
-     * @return int ID of the form
-     */
-    function id()
-    {
-        return 'facebookadminpanel';
-    }
-
-    /**
-     * 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('facebookadminpanel');
-    }
-
-    /**
-     * Data elements of the form
-     *
-     * @return void
-     */
-    function formData()
-    {
-        $this->out->elementStart(
-            'fieldset',
-            array('id' => 'settings_facebook-application')
-        );
-        $this->out->element('legend', null, _m('Facebook application settings'));
-        $this->out->elementStart('ul', 'form_data');
-
-        $this->li();
-        $this->input(
-            'apikey',
-            _m('API key'),
-            _m('API key provided by Facebook'),
-            'facebook'
-        );
-        $this->unli();
-
-        $this->li();
-        $this->input(
-            'secret',
-             _m('Secret'),
-            _m('API secret provided by Facebook'),
-            'facebook'
-        );
-        $this->unli();
-
-        $this->out->elementEnd('ul');
-        $this->out->elementEnd('fieldset');
-    }
-
-    /**
-     * Action elements
-     *
-     * @return void
-     */
-    function formActions()
-    {
-        $this->out->submit('submit', _m('Save'), 'submit', null, _m('Save Facebook settings'));
-    }
-}
diff --git a/plugins/Facebook/facebookapp.css b/plugins/Facebook/facebookapp.css
deleted file mode 100644
index 8cd06f78a8..0000000000
--- a/plugins/Facebook/facebookapp.css
+++ /dev/null
@@ -1,115 +0,0 @@
-* {
-font-size:14px;
-font-family:"Lucida Sans Unicode", "Lucida Grande", sans-serif;
-}
-
-#wrap {
-background-color:#F0F2F5;
-padding-left:1.795%;
-padding-right:1.795%;
-width:auto;
-}
-
-p,label,
-h1,h2,h3,h4,h5,h6 {
-color:#000;
-}
-
-#header {
-width:131%;
-}
-
-#content {
-width:92.7%;
-}
-
-#aside_primary {
-display:none;
-}
-
-#site_nav_local_views a {
-background-color:#D0DFE7;
-}
-#site_nav_local_views a:hover {
-background-color:#FAFBFC;
-}
-
-#form_notice .form_note + label,
-#form_notice #notice_data-attach {
-display:none;
-}
-
-#form_notice #notice_action-submit {
-height:47px !important;
-}
-
-
-span.facebook-button {
-border: 2px solid #aaa;
-padding: 3px;
-display: block;
-float: left;
-margin-right: 20px;
--moz-border-radius: 4px; 
-border-radius:4px; 
--webkit-border-radius:4px;
-font-weight: bold;
-background-color:#A9BF4F;
-color:#fff;
-font-size:1.2em
-}
-
-span.facebook-button a { color:#fff }
-
-.facebook_guide {
-margin-bottom:18px;
-}
-.facebook_guide p {
-font-weight:bold;
-}
-
-
-input {
-height:auto !important;
-}
-
-#facebook-friends {
-float:left;
-width:100%;
-}
-
-#facebook-friends li {
-float:left;
-margin-right:2%;
-margin-bottom:11px;
-width:18%;
-height:115px;
-}
-#facebook-friends li a {
-float:left;
-}
-
-#add_to_profile {
-position:absolute;
-right:18px;
-top:10px;
-z-index:2;
-}
-
-.notice div.entry-content dl,
-.notice div.entry-content dt, 
-.notice div.entry-content dd {
-margin-right:5px;
-}
-
-#content_inner p {
-margin-bottom:18px;
-}
-
-#content_inner ul {
-list-style-type:none;
-}
-
-.form_settings label {
-margin-right:18px;
-}
diff --git a/plugins/Facebook/facebookapp.js b/plugins/Facebook/facebookapp.js
deleted file mode 100644
index 5deb6e42b3..0000000000
--- a/plugins/Facebook/facebookapp.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-* StatusNet - a distributed open-source microblogging tool
-* Copyright (C) 2008, 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/>.
-*/
-
-var max = 140;
-var noticeBox = document.getElementById('notice_data-text'); 
-
-if (noticeBox) {
-    noticeBox.addEventListener('keyup', keypress);
-    noticeBox.addEventListener('keydown', keypress);
-    noticeBox.addEventListener('keypress', keypress);
-    noticeBox.addEventListener('change', keypress);
-}
-
-// Do our the countdown
-function keypress(evt) {  
-    document.getElementById('notice_text-count').setTextValue(
-        max - noticeBox.getValue().length);      
-}
diff --git a/plugins/Facebook/facebookhome.php b/plugins/Facebook/facebookhome.php
deleted file mode 100644
index 9b18a695bf..0000000000
--- a/plugins/Facebook/facebookhome.php
+++ /dev/null
@@ -1,246 +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);
-}
-
-require_once INSTALLDIR . '/plugins/Facebook/facebookaction.php';
-
-class FacebookhomeAction extends FacebookAction
-{
-    var $page = null;
-
-    function prepare($argarray)
-    {
-        parent::prepare($argarray);
-
-        $this->page = $this->trimmed('page');
-
-        if (!$this->page) {
-            $this->page = 1;
-        }
-
-        return true;
-    }
-
-    function handle($args)
-    {
-        parent::handle($args);
-
-        if (!empty($this->flink)) {
-            $this->user = $this->flink->getUser();
-
-            // If this is the first time the user has started the app
-            // prompt for Facebook status update permission
-            if (!$this->facebook->api_client->users_hasAppPermission('publish_stream')) {
-                $this->getUpdatePermission();
-		return;
-            }
-
-             if ($this->arg('status_submit') == 'Send') {
-                $this->saveNewNotice();
-             }
-
-            // User is authenticated and has already been prompted once for
-            // Facebook status update permission? Then show the main page
-            // of the app
-            $this->showPage();
-        } else {
-            // User hasn't authenticated yet, prompt for creds
-            $this->login();
-        }
-    }
-
-    function login()
-    {
-        $this->showStylesheets();
-
-        $nickname = common_canonical_nickname($this->trimmed('nickname'));
-        $password = $this->arg('password');
-
-        $msg = null;
-
-        if ($nickname) {
-            if (common_check_user($nickname, $password)) {
-                $user = User::staticGet('nickname', $nickname);
-
-                if (!$user) {
-                    $this->showLoginForm(_m("Server error: Couldn't get user!"));
-                }
-
-                $flink = DB_DataObject::factory('foreign_link');
-                $flink->user_id = $user->id;
-                $flink->foreign_id = $this->fbuid;
-                $flink->service = FACEBOOK_SERVICE;
-                $flink->created = common_sql_now();
-                $flink->set_flags(true, false, false, false);
-
-                $flink_id = $flink->insert();
-
-                // XXX: Do some error handling here
-
-                $this->getUpdatePermission();
-                return;
-            } else {
-                $msg = _m('Incorrect username or password.');
-            }
-        }
-
-        $this->showLoginForm($msg);
-        $this->showFooter();
-    }
-
-    function showNoticeForm()
-    {
-        $post_action = "$this->app_uri/index.php";
-
-        $notice_form = new FacebookNoticeForm($this, $post_action, null,
-            $post_action, $this->user);
-        $notice_form->show();
-    }
-
-    function title()
-    {
-        if ($this->page > 1) {
-            // @todo FIXME: Core should have methods to get "Full name (nickname)" in a localised form
-            // so that this can be used consistenly throughout StatusNet without having to implement it
-	    // over and over..
-            // TRANS: Page title.
-            // TRANS: %1$s is a user nickname, %2$s is a page number.
-            return sprintf(_m('%1$s and friends, page %2$d'), $this->user->nickname, $this->page);
-        } else {
-            // TRANS: Page title.
-            // TRANS: %s is a user nickname
-            return sprintf(_m("%s and friends"), $this->user->nickname);
-        }
-    }
-
-    function showContent()
-    {
-        $notice = $this->user->noticeInbox(($this->page-1) * NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
-
-        $nl = new NoticeList($notice, $this);
-
-        $cnt = $nl->show();
-
-        $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
-                          $this->page, 'index.php', array('nickname' => $this->user->nickname));
-    }
-
-    function showNoticeList($notice)
-    {
-        $nl = new NoticeList($notice, $this);
-        return $nl->show();
-    }
-
-    function getUpdatePermission() {
-        $this->showStylesheets();
-
-        $this->elementStart('div', array('class' => 'facebook_guide'));
-
-        // TRANS: Instructions. %s is the application name.
-        $instructions = sprintf(_m('If you would like the %s app to automatically update ' .
-            'your Facebook status with your latest notice, you need ' .
-            'to give it permission.'), $this->app_name);
-
-        $this->elementStart('p');
-        $this->element('span', array('id' => 'permissions_notice'), $instructions);
-        $this->elementEnd('p');
-
-        $this->elementStart('form', array('method' => 'post',
-                                           'action' => "index.php",
-                                           'id' => 'facebook-skip-permissions'));
-
-        $this->elementStart('ul', array('id' => 'fb-permissions-list'));
-        $this->elementStart('li', array('id' => 'fb-permissions-item'));
-
-        $next = urlencode("$this->app_uri/index.php");
-        $api_key = common_config('facebook', 'apikey');
-
-        $auth_url = 'http://www.facebook.com/authorize.php?api_key=' .
-            $api_key . '&v=1.0&ext_perm=publish_stream&next=' . $next .
-            '&next_cancel=' . $next . '&submit=skip';
-
-        $this->elementStart('span', array('class' => 'facebook-button'));
-        // @todo FIXME: sprintf not needed here?
-        $this->element('a', array('href' => $auth_url),
-            sprintf(_m('Okay, do it!'), $this->app_name));
-        $this->elementEnd('span');
-
-        $this->elementEnd('li');
-
-        $this->elementStart('li', array('id' => 'fb-permissions-item'));
-        // TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-        $this->submit('skip', _m('BUTTON','Skip'));
-        $this->elementEnd('li');
-        $this->elementEnd('ul');
-
-        $this->elementEnd('form');
-        $this->elementEnd('div');
-    }
-
-    /**
-     * Generate pagination links
-     *
-     * @param boolean $have_before is there something before?
-     * @param boolean $have_after  is there something after?
-     * @param integer $page        current page
-     * @param string  $action      current action
-     * @param array   $args        rest of query arguments
-     *
-     * @return nothing
-     */
-    function pagination($have_before, $have_after, $page, $action, $args=null)
-    {
-        // Does a little before-after block for next/prev page
-
-        // XXX: Fix so this uses common_local_url() if possible.
-
-        if ($have_before || $have_after) {
-            $this->elementStart('dl', 'pagination');
-            $this->element('dt', null, _m('Pagination'));
-            $this->elementStart('dd', null);
-            $this->elementStart('ul', array('class' => 'nav'));
-        }
-        if ($have_before) {
-            $pargs   = array('page' => $page-1);
-            $newargs = $args ? array_merge($args, $pargs) : $pargs;
-            $this->elementStart('li', array('class' => 'nav_prev'));
-            $this->element('a', array('href' => "$action?page=$newargs[page]", 'rel' => 'prev'),
-                           // TRANS: Pagination link.
-                           _m('After'));
-            $this->elementEnd('li');
-        }
-        if ($have_after) {
-            $pargs   = array('page' => $page+1);
-            $newargs = $args ? array_merge($args, $pargs) : $pargs;
-            $this->elementStart('li', array('class' => 'nav_next'));
-            $this->element('a', array('href' => "$action?page=$newargs[page]", 'rel' => 'next'),
-                           // TRANS: Pagination link.
-                           _m('Before'));
-            $this->elementEnd('li');
-        }
-        if ($have_before || $have_after) {
-            $this->elementEnd('ul');
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
-        }
-    }
-}
diff --git a/plugins/Facebook/facebookinvite.php b/plugins/Facebook/facebookinvite.php
deleted file mode 100644
index a50eace12f..0000000000
--- a/plugins/Facebook/facebookinvite.php
+++ /dev/null
@@ -1,145 +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);
-}
-
-require_once INSTALLDIR . '/plugins/Facebook/facebookaction.php';
-
-class FacebookinviteAction extends FacebookAction
-{
-    function handle($args)
-    {
-        parent::handle($args);
-        $this->showForm();
-    }
-
-    /**
-     * Wrapper for showing a page
-     *
-     * Stores an error and shows the page
-     *
-     * @param string $error Error, if any
-     *
-     * @return void
-     */
-    function showForm($error=null)
-    {
-        $this->error = $error;
-        $this->showPage();
-    }
-
-    /**
-     * Show the page content
-     *
-     * Either shows the registration form or, if registration was successful,
-     * instructions for using the site.
-     *
-     * @return void
-     */
-    function showContent()
-    {
-        if ($this->arg('ids')) {
-            $this->showSuccessContent();
-        } else {
-            $this->showFormContent();
-        }
-    }
-
-    function showSuccessContent()
-    {
-        // TRANS: %s is the name of the site.
-        $this->element('h2', null, sprintf(_m('Thanks for inviting your friends to use %s.'),
-            common_config('site', 'name')));
-        // TRANS: Followed by an unordered list with invited friends.
-        $this->element('p', null, _m('Invitations have been sent to the following users:'));
-
-        $friend_ids = $_POST['ids']; // XXX: Hmm... is this the best way to access the list?
-
-        $this->elementStart('ul', array('id' => 'facebook-friends'));
-
-        foreach ($friend_ids as $friend) {
-            $this->elementStart('li');
-            $this->element('fb:profile-pic', array('uid' => $friend, 'size' => 'square'));
-            $this->element('fb:name', array('uid' => $friend,
-                                            'capitalize' => 'true'));
-            $this->elementEnd('li');
-        }
-
-        $this->elementEnd('ul');
-    }
-
-    function showFormContent()
-    {
-        $content = sprintf(_m('You have been invited to %s'), common_config('site', 'name')) .
-            htmlentities('<fb:req-choice url="' . $this->app_uri . '" label="Add"/>');
-
-        $this->elementStart('fb:request-form', array('action' => 'invite.php',
-                                                      'method' => 'post',
-                                                      'invite' => 'true',
-                                                      'type' => common_config('site', 'name'),
-                                                      'content' => $content));
-        $this->hidden('invite', 'true');
-        // TRANS: %s is the name of the site.
-        $actiontext = sprintf(_m('Invite your friends to use %s'), common_config('site', 'name'));
-
-        $multi_params = array('showborder' => 'false');
-        $multi_params['actiontext'] = $actiontext;
-        $multi_params['bypass'] = 'cancel';
-        $multi_params['cols'] = 4;
-
-        // Get a list of users who are already using the app for exclusion
-        $exclude_ids = $this->facebook->api_client->friends_getAppUsers();
-        $exclude_ids_csv = null;
-
-        // fbml needs these as a csv string, not an array
-        if ($exclude_ids) {
-            $exclude_ids_csv = implode(',', $exclude_ids);
-            $multi_params['exclude_ids'] = $exclude_ids_csv;
-        }
-
-        $this->element('fb:multi-friend-selector', $multi_params);
-        $this->elementEnd('fb:request-form');
-
-        if ($exclude_ids) {
-
-            // TRANS: %s is the name of the site.
-            $this->element('h2', null, sprintf(_m('Friends already using %s:'),
-                common_config('site', 'name')));
-            $this->elementStart('ul', array('id' => 'facebook-friends'));
-
-            foreach ($exclude_ids as $friend) {
-                $this->elementStart('li');
-                $this->element('fb:profile-pic', array('uid' => $friend, 'size' => 'square'));
-                $this->element('fb:name', array('uid' => $friend,
-                                                'capitalize' => 'true'));
-                $this->elementEnd('li');
-            }
-
-            $this->elementEnd("ul");
-        }
-    }
-
-    function title()
-    {
-        // TRANS: Page title.
-        return sprintf(_m('Send invitations'));
-    }
-}
diff --git a/plugins/Facebook/facebooklogin.php b/plugins/Facebook/facebooklogin.php
deleted file mode 100644
index 1961be57b6..0000000000
--- a/plugins/Facebook/facebooklogin.php
+++ /dev/null
@@ -1,97 +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);
-}
-
-require_once INSTALLDIR . '/plugins/Facebook/facebookaction.php';
-
-class FacebookinviteAction extends FacebookAction
-{
-    function handle($args)
-    {
-        parent::handle($args);
-
-        $this->error = $error;
-
-        if ($this->flink) {
-            if (!$this->facebook->api_client->users_hasAppPermission('publish_stream') &&
-                $this->facebook->api_client->data_getUserPreference(
-                     FACEBOOK_PROMPTED_UPDATE_PREF) == 'true') {
-
-                // @todo FIXME: Missing i18n?
-                echo '<h1>REDIRECT TO HOME</h1>';
-            }
-        } else {
-            $this->showPage();
-        }
-    }
-
-    function showContent()
-    {
-        // If the user has opted not to initially allow the app to have
-        // Facebook status update permission, store that preference. Only
-        // promt the user the first time she uses the app
-        if ($this->arg('skip')) {
-            $this->facebook->api_client->data_setUserPreference(
-                FACEBOOK_PROMPTED_UPDATE_PREF, 'true');
-        }
-
-        if ($this->flink) {
-            $this->user = $this->flink->getUser();
-
-            // If this is the first time the user has started the app
-             // prompt for Facebook status update permission
-             if (!$this->facebook->api_client->users_hasAppPermission('publish_stream')) {
-
-                 if ($this->facebook->api_client->data_getUserPreference(
-                         FACEBOOK_PROMPTED_UPDATE_PREF) != 'true') {
-                     $this->getUpdatePermission();
-                     return;
-                 }
-             }
-        } else {
-            $this->showLoginForm();
-        }
-
-    }
-
-    function showSuccessContent()
-    {
-
-    }
-
-    function showFormContent()
-    {
-
-    }
-
-    function title()
-    {
-        // @todo FIXME: Give a more precise description? Suggestion: "Login with Facebook Connect"
-        // TRANS: Page title.
-        return sprintf(_m('Login'));
-    }
-
-    function redirectHome()
-    {
-
-    }
-}
diff --git a/plugins/Facebook/facebooknoticeform.php b/plugins/Facebook/facebooknoticeform.php
deleted file mode 100644
index d52222c933..0000000000
--- a/plugins/Facebook/facebooknoticeform.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/**
- * StatusNet, the distributed open-source microblogging tool
- *
- * Form for posting a notice from within the Facebook App.
- *
- * This is a stripped down version of the normal NoticeForm (sans
- * location stuff and media upload stuff). I'm not sure we can share the
- * location (from FB) and they don't allow posting multipart form data
- * to Facebook canvas pages, so that won't work anyway. --Zach
- *
- * 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>
- * @author    Zach Copley <zach@status.net>
- * @copyright 2009 StatusNet, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://status.net/
- */
-
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR . '/lib/form.php';
-
-/**
- * Form for posting a notice from within the Facebook app
- *
- * @category Form
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @author   Sarven Capadisli <csarven@status.net>
- * @author   Zach Copey <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 FacebookNoticeForm 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;
-
-    /**
-     * Constructor
-     *
-     * @param HTMLOutputter $out     output channel
-     * @param string        $action  action to return to, if any
-     * @param string        $content content to pre-fill
-     */
-    function __construct($out=null, $action=null, $content=null, $post_action=null, $user=null, $inreplyto=null)
-    {
-        parent::__construct($out);
-
-        $this->action  = $action;
-        $this->post_action = $post_action;
-        $this->content = $content;
-        $this->inreplyto = $inreplyto;
-
-        if ($user) {
-            $this->user = $user;
-        } else {
-            $this->user = common_current_user();
-        }
-
-        // Note: Facebook doesn't allow multipart/form-data posting to
-        // canvas pages, so don't try to set it--no file uploads, at
-        // least not this way.  It can be done using multiple servers
-        // and iFrames, but it's a pretty hacky process.
-    }
-
-    /**
-     * ID of the form
-     *
-     * @return string ID of the form
-     */
-    function id()
-    {
-        return 'form_notice';
-    }
-
-   /**
-     * Class of the form
-     *
-     * @return string class of the form
-     */
-    function formClass()
-    {
-        return 'form_notice';
-    }
-
-    /**
-     * Action of the form
-     *
-     * @return string URL of the action
-     */
-    function action()
-    {
-        return $this->post_action;
-    }
-
-    /**
-     * Legend of the Form
-     *
-     * @return void
-     */
-    function formLegend()
-    {
-        // TRANS: Legend.
-        $this->out->element('legend', null, _m('Send a notice'));
-    }
-
-    /**
-     * Data elements
-     *
-     * @return void
-     */
-    function formData()
-    {
-        if (Event::handle('StartShowNoticeFormData', array($this))) {
-            $this->out->element('label', array('for' => 'notice_data-text'),
-                                // TRANS: Field label.
-                                sprintf(_m('What\'s up, %s?'), $this->user->nickname));
-            // XXX: vary by defined max size
-            $this->out->element('textarea', array('id' => 'notice_data-text',
-                                                  'cols' => 35,
-                                                  'rows' => 4,
-                                                  'name' => 'status_textarea'),
-                                ($this->content) ? $this->content : '');
-
-            $contentLimit = Notice::maxContent();
-
-            if ($contentLimit > 0) {
-                $this->out->elementStart('dl', 'form_note');
-                $this->out->element('dt', null, _m('Available characters'));
-                $this->out->element('dd', array('id' => 'notice_text-count'),
-                                    $contentLimit);
-                $this->out->elementEnd('dl');
-            }
-
-            if ($this->action) {
-                $this->out->hidden('notice_return-to', $this->action, 'returnto');
-            }
-            $this->out->hidden('notice_in-reply-to', $this->inreplyto, 'inreplyto');
-
-            Event::handle('StartShowNoticeFormData', array($this));
-        }
-    }
-
-    /**
-     * Action elements
-     *
-     * @return void
-     */
-    function formActions()
-    {
-        $this->out->element('input', array('id' => 'notice_action-submit',
-                                           'class' => 'submit',
-                                           'name' => 'status_submit',
-                                           'type' => 'submit',
-                                           // TRANS: Button text.
-                                           'value' => _m('BUTTON','Send')));
-    }
-}
diff --git a/plugins/Facebook/facebookqueuehandler.php b/plugins/Facebook/facebookqueuehandler.php
deleted file mode 100644
index 524af7bc45..0000000000
--- a/plugins/Facebook/facebookqueuehandler.php
+++ /dev/null
@@ -1,51 +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); }
-
-require_once INSTALLDIR . '/plugins/Facebook/facebookutil.php';
-
-class FacebookQueueHandler extends QueueHandler
-{
-    function transport()
-    {
-        return 'facebook';
-    }
-
-    function handle($notice)
-    {
-        if ($this->_isLocal($notice)) {
-            return facebookBroadcastNotice($notice);
-        }
-        return true;
-    }
-
-    /**
-     * Determine whether the notice was locally created
-     *
-     * @param Notice $notice the notice
-     *
-     * @return boolean locality
-     */
-    function _isLocal($notice)
-    {
-        return ($notice->is_local == Notice::LOCAL_PUBLIC ||
-                $notice->is_local == Notice::LOCAL_NONPUBLIC);
-    }
-}
diff --git a/plugins/Facebook/facebookremove.php b/plugins/Facebook/facebookremove.php
deleted file mode 100644
index bc76daaef6..0000000000
--- a/plugins/Facebook/facebookremove.php
+++ /dev/null
@@ -1,73 +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);
-}
-
-require_once INSTALLDIR . '/plugins/Facebook/facebookaction.php';
-
-class FacebookremoveAction extends FacebookAction
-{
-    function handle($args)
-    {
-        parent::handle($args);
-
-        $secret = common_config('facebook', 'secret');
-
-        $sig = '';
-
-        ksort($_POST);
-
-        foreach ($_POST as $key => $val) {
-            if (substr($key, 0, 7) == 'fb_sig_') {
-                $sig .= substr($key, 7) . '=' . $val;
-            }
-         }
-
-        $sig .= $secret;
-        $verify = md5($sig);
-
-        if ($verify == $this->arg('fb_sig')) {
-
-            $flink = Foreign_link::getByForeignID($this->arg('fb_sig_user'), 2);
-
-            if (!$flink) {
-                common_log(LOG_ERR, "Tried to delete missing foreign_link entry with Facebook ID " . $this->arg('fb_sig_user'));
-                $this->serverError(_m('Couldn\'t remove Facebook user: already deleted.'));
-                return;
-            }
-
-            common_debug("Removing foreign link to Facebook - local user ID: $flink->user_id, Facebook ID: $flink->foreign_id");
-
-            $result = $flink->delete();
-
-            if (!$result) {
-                common_log_db_error($flink, 'DELETE', __FILE__);
-                $this->serverError(_m('Couldn\'t remove Facebook user.'));
-                return;
-            }
-
-        } else {
-            # Someone bad tried to remove facebook link?
-            common_log(LOG_ERR, "Someone from $_SERVER[REMOTE_ADDR] " .
-                'unsuccessfully tried to remove a foreign link to Facebook!');
-        }
-    }
-}
diff --git a/plugins/Facebook/facebooksettings.php b/plugins/Facebook/facebooksettings.php
deleted file mode 100644
index 1379b9a9cc..0000000000
--- a/plugins/Facebook/facebooksettings.php
+++ /dev/null
@@ -1,136 +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);
-}
-
-require_once INSTALLDIR . '/plugins/Facebook/facebookaction.php';
-
-class FacebooksettingsAction extends FacebookAction
-{
-    function handle($args)
-    {
-        parent::handle($args);
-        $this->showPage();
-    }
-
-    /**
-     * Show the page content
-     *
-     * Either shows the registration form or, if registration was successful,
-     * instructions for using the site.
-     *
-     * @return void
-     */
-    function showContent()
-    {
-        if ($this->arg('save')) {
-            $this->saveSettings();
-        } else {
-            $this->showForm();
-        }
-    }
-
-    function saveSettings() {
-
-        $noticesync = $this->boolean('noticesync');
-        $replysync  = $this->boolean('replysync');
-
-        $original = clone($this->flink);
-        $this->flink->set_flags($noticesync, false, $replysync, false);
-        $result = $this->flink->update($original);
-
-        if ($result === false) {
-            $this->showForm(_m('There was a problem saving your sync preferences!'));
-        } else {
-            // TRANS: Confirmation that synchronisation settings have been saved into the system.
-            $this->showForm(_m('Sync preferences saved.'), true);
-        }
-    }
-
-    function showForm($msg = null, $success = false) {
-
-        if ($msg) {
-            if ($success) {
-                $this->element('fb:success', array('message' => $msg));
-            } else {
-                $this->element('fb:error', array('message' => $msg));
-            }
-        }
-
-        if ($this->facebook->api_client->users_hasAppPermission('publish_stream')) {
-
-            $this->elementStart('form', array('method' => 'post',
-                                               'id' => 'facebook_settings'));
-
-            $this->elementStart('ul', 'form_data');
-
-            $this->elementStart('li');
-
-            $this->checkbox('noticesync', _m('Automatically update my Facebook status with my notices.'),
-                                ($this->flink) ? ($this->flink->noticesync & FOREIGN_NOTICE_SEND) : true);
-
-            $this->elementEnd('li');
-
-            $this->elementStart('li');
-
-            $this->checkbox('replysync', _m('Send "@" replies to Facebook.'),
-                             ($this->flink) ? ($this->flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) : true);
-
-            $this->elementEnd('li');
-
-            $this->elementStart('li');
-
-            // TRANS: Submit button to save synchronisation settings.
-            $this->submit('save', _m('BUTTON','Save'));
-
-            $this->elementEnd('li');
-
-            $this->elementEnd('ul');
-
-            $this->elementEnd('form');
-        } else {
-            // TRANS: %s is the application name.
-            $instructions = sprintf(_m('If you would like %s to automatically update ' .
-                'your Facebook status with your latest notice, you need ' .
-                'to give it permission.'), $this->app_name);
-
-            $this->elementStart('p');
-            $this->element('span', array('id' => 'permissions_notice'), $instructions);
-            $this->elementEnd('p');
-
-            $this->elementStart('ul', array('id' => 'fb-permissions-list'));
-            $this->elementStart('li', array('id' => 'fb-permissions-item'));
-            $this->elementStart('fb:prompt-permission', array('perms' => 'publish_stream',
-                'next_fbjs' => 'document.setLocation(\'' . "$this->app_uri/settings.php" . '\')'));
-            $this->element('span', array('class' => 'facebook-button'),
-                sprintf(_m('Allow %s to update my Facebook status'), common_config('site', 'name')));
-            $this->elementEnd('fb:prompt-permission');
-            $this->elementEnd('li');
-            $this->elementEnd('ul');
-        }
-    }
-
-    function title()
-    {
-        // TRANS: Page title for synchronisation settings.
-        return _m('Sync preferences');
-    }
-}
diff --git a/plugins/Facebook/facebookutil.php b/plugins/Facebook/facebookutil.php
deleted file mode 100644
index 3996459a63..0000000000
--- a/plugins/Facebook/facebookutil.php
+++ /dev/null
@@ -1,409 +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')) {
-    exit(1);
-}
-
-require_once INSTALLDIR . '/plugins/Facebook/facebook/facebook.php';
-require_once INSTALLDIR . '/plugins/Facebook/facebookaction.php';
-require_once INSTALLDIR . '/lib/noticelist.php';
-
-define("FACEBOOK_SERVICE", 2); // Facebook is foreign_service ID 2
-define("FACEBOOK_NOTICE_PREFIX", 1);
-define("FACEBOOK_PROMPTED_UPDATE_PREF", 2);
-
-function getFacebook()
-{
-    static $facebook = null;
-
-    $apikey = common_config('facebook', 'apikey');
-    $secret = common_config('facebook', 'secret');
-
-    if ($facebook === null) {
-        $facebook = new Facebook($apikey, $secret);
-    }
-
-    if (empty($facebook)) {
-        common_log(LOG_ERR, 'Could not make new Facebook client obj!',
-            __FILE__);
-    }
-
-    return $facebook;
-}
-
-function isFacebookBound($notice, $flink) {
-    if (empty($flink)) {
-	common_debug("QQQQQ empty flink");
-        return false;
-    }
-
-    // Avoid a loop
-    if ($notice->source == 'Facebook') {
-        common_log(LOG_INFO, "Skipping notice $notice->id because its " .
-                   'source is Facebook.');
-        return false;
-    }
-
-    // If the user does not want to broadcast to Facebook, move along
-    if (!($flink->noticesync & FOREIGN_NOTICE_SEND == FOREIGN_NOTICE_SEND)) {
-        common_log(LOG_INFO, "Skipping notice $notice->id " .
-            'because user has FOREIGN_NOTICE_SEND bit off.');
-        return false;
-    }
-
-    // If it's not a reply, or if the user WANTS to send @-replies,
-    // then, yeah, it can go to Facebook.
-    if (!preg_match('/@[a-zA-Z0-9_]{1,15}\b/u', $notice->content) ||
-        ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY)) {
-        return true;
-    }
-
-    return false;
-}
-
-function facebookBroadcastNotice($notice)
-{
-    $facebook = getFacebook();
-    $flink = Foreign_link::getByUserID(
-        $notice->profile_id,
-        FACEBOOK_SERVICE
-    );
-
-    if (isFacebookBound($notice, $flink)) {
-        // Okay, we're good to go, update the FB status
-        $fbuid = $flink->foreign_id;
-        $user = $flink->getUser();
-
-        try {
-            // Check permissions
-            common_debug(
-                'FacebookPlugin - checking for publish_stream permission for user '
-                . "$user->nickname ($user->id), Facebook UID: $fbuid"
-            );
-
-            // NOTE: $facebook->api_client->users_hasAppPermission('publish_stream', $fbuid)
-            // has been returning bogus results, so we're using FQL to check for
-            // publish_stream permission now
-            $fql = "SELECT publish_stream FROM permissions WHERE uid = $fbuid";
-            $result = $facebook->api_client->fql_query($fql);
-
-            $canPublish = 0;
-
-            if (!empty($result)) {
-                $canPublish = $result[0]['publish_stream'];
-            }
-
-            if ($canPublish == 1) {
-                common_debug(
-                    "FacebookPlugin - $user->nickname ($user->id), Facebook UID: $fbuid "
-                    . 'has publish_stream permission.'
-                );
-            } else {
-                common_debug(
-                    "FacebookPlugin - $user->nickname ($user->id), Facebook UID: $fbuid "
-                    . 'does NOT have publish_stream permission. Facebook '
-                    . 'returned: ' . var_export($result, true)
-                );
-            }
-
-            common_debug(
-                'FacebookPlugin - checking for status_update permission for user '
-                . "$user->nickname ($user->id), Facebook UID: $fbuid. "
-            );
-
-            $canUpdate = $facebook->api_client->users_hasAppPermission(
-                'status_update',
-                $fbuid
-            );
-
-            if ($canUpdate == 1) {
-                common_debug(
-                    "FacebookPlugin - $user->nickname ($user->id), Facebook UID: $fbuid "
-                    . 'has status_update permission.'
-                );
-            } else {
-                common_debug(
-                    "FacebookPlugin - $user->nickname ($user->id), Facebook UID: $fbuid "
-                    .'does NOT have status_update permission. Facebook '
-                    . 'returned: ' . var_export($canPublish, true)
-                );
-            }
-
-            // Post to Facebook
-            if ($notice->hasAttachments() && $canPublish == 1) {
-                publishStream($notice, $user, $fbuid);
-            } elseif ($canUpdate == 1 || $canPublish == 1) {
-                statusUpdate($notice, $user, $fbuid);
-            } else {
-                $msg = "FacebookPlugin - Not sending notice $notice->id to Facebook " .
-                  "because user $user->nickname has not given the " .
-                  'Facebook app \'status_update\' or \'publish_stream\' permission.';
-                common_log(LOG_WARNING, $msg);
-            }
-
-        } catch (FacebookRestClientException $e) {
-            return handleFacebookError($e, $notice, $flink);
-        }
-    }
-
-    return true;
-}
-
-function handleFacebookError($e, $notice, $flink)
-{
-    $fbuid  = $flink->foreign_id;
-    $user   = $flink->getUser();
-    $code   = $e->getCode();
-    $errmsg = $e->getMessage();
-
-    // XXX: Check for any others?
-    switch($code) {
-     case 100: // Invalid parameter
-        $msg = "FacebookPlugin - Facebook claims notice %d was posted with an invalid parameter (error code 100):"
-            . "\"%s\" (Notice details: nickname=%s, user ID=%d, Facebook ID=%d, notice content=\"%s\"). "
-            . "Removing notice from the Facebook queue for safety.";
-        common_log(
-            LOG_ERR, sprintf(
-                $msg,
-                $notice->id,
-                $errmsg,
-                $user->nickname,
-                $user->id,
-                $fbuid,
-                $notice->content
-            )
-        );
-        return true;
-        break;
-     case 200: // Permissions error
-     case 250: // Updating status requires the extended permission status_update
-        remove_facebook_app($flink);
-        return true; // dequeue
-        break;
-     case 341: // Feed action request limit reached
-            $msg = "FacebookPlugin - User %s (User ID=%d, Facebook ID=%d) has exceeded "
-                   . "his/her limit for posting notices to Facebook today. Dequeuing "
-                   . "notice %d.";
-            common_log(
-                LOG_INFO, sprintf(
-                    $msg,
-                    $user->nickname,
-                    $user->id,
-                    $fbuid,
-                    $notice->id
-                )
-            );
-	// @fixme: We want to rety at a later time when the throttling has expired
-	// instead of just giving up.
-        return true;
-        break;
-     default:
-        $msg = "FacebookPlugin - Facebook returned an error we don't know how to deal with while trying to "
-            . "post notice %d. Error code: %d, error message: \"%s\". (Notice details: "
-            . "nickname=%s, user ID=%d, Facebook ID=%d, notice content=\"%s\"). Removing notice "
-	    . "from the Facebook queue for safety.";
-        common_log(
-            LOG_ERR, sprintf(
-                $msg,
-                $notice->id,
-                $code,
-                $errmsg,
-                $user->nickname,
-                $user->id,
-                $fbuid,
-                $notice->content
-            )
-        );
-        return true; // dequeue
-        break;
-    }
-}
-
-function statusUpdate($notice, $user, $fbuid)
-{
-    common_debug(
-        "FacebookPlugin - Attempting to post notice $notice->id "
-        . "as a status update for $user->nickname ($user->id), "
-        . "Facebook UID: $fbuid"
-    );
-
-    $facebook = getFacebook();
-    $result = $facebook->api_client->users_setStatus(
-         $notice->content,
-         $fbuid,
-         false,
-         true
-    );
-
-    common_debug('Facebook returned: ' . var_export($result, true));
-
-    common_log(
-        LOG_INFO,
-        "FacebookPlugin - Posted notice $notice->id as a status "
-        . "update for $user->nickname ($user->id), "
-        . "Facebook UID: $fbuid"
-    );
-}
-
-function publishStream($notice, $user, $fbuid)
-{
-    common_debug(
-        "FacebookPlugin - Attempting to post notice $notice->id "
-        . "as stream item with attachment for $user->nickname ($user->id), "
-        . "Facebook UID: $fbuid"
-    );
-
-    $fbattachment = format_attachments($notice->attachments());
-
-    $facebook = getFacebook();
-    $facebook->api_client->stream_publish(
-        $notice->content,
-        $fbattachment,
-        null,
-        null,
-        $fbuid
-    );
-
-    common_log(
-        LOG_INFO,
-        "FacebookPlugin - Posted notice $notice->id as a stream "
-        . "item with attachment for $user->nickname ($user->id), "
-        . "Facebook UID: $fbuid"
-    );
-}
-
-function format_attachments($attachments)
-{
-    $fbattachment          = array();
-    $fbattachment['media'] = array();
-
-    foreach($attachments as $attachment)
-    {
-        if($enclosure = $attachment->getEnclosure()){
-            $fbmedia = get_fbmedia_for_attachment($enclosure);
-        }else{
-            $fbmedia = get_fbmedia_for_attachment($attachment);
-        }
-        if($fbmedia){
-            $fbattachment['media'][]=$fbmedia;
-        }else{
-            $fbattachment['name'] = ($attachment->title ?
-                                  $attachment->title : $attachment->url);
-            $fbattachment['href'] = $attachment->url;
-        }
-    }
-    if(count($fbattachment['media'])>0){
-        unset($fbattachment['name']);
-        unset($fbattachment['href']);
-    }
-    return $fbattachment;
-}
-
-/**
-* given an File objects, returns an associative array suitable for Facebook media
-*/
-function get_fbmedia_for_attachment($attachment)
-{
-    $fbmedia    = array();
-
-    if (strncmp($attachment->mimetype, 'image/', strlen('image/')) == 0) {
-        $fbmedia['type']         = 'image';
-        $fbmedia['src']          = $attachment->url;
-        $fbmedia['href']         = $attachment->url;
-    } else if ($attachment->mimetype == 'audio/mpeg') {
-        $fbmedia['type']         = 'mp3';
-        $fbmedia['src']          = $attachment->url;
-    }else if ($attachment->mimetype == 'application/x-shockwave-flash') {
-        $fbmedia['type']         = 'flash';
-
-        // http://wiki.developers.facebook.com/index.php/Attachment_%28Streams%29
-        // says that imgsrc is required... but we have no value to put in it
-        // $fbmedia['imgsrc']='';
-
-        $fbmedia['swfsrc']       = $attachment->url;
-    }else{
-        return false;
-    }
-    return $fbmedia;
-}
-
-function remove_facebook_app($flink)
-{
-
-    $user = $flink->getUser();
-
-    common_log(LOG_INFO, 'Removing Facebook App Foreign link for ' .
-        "user $user->nickname (user id: $user->id).");
-
-    $result = $flink->delete();
-
-    if (empty($result)) {
-        common_log(LOG_ERR, 'Could not remove Facebook App ' .
-            "Foreign_link for $user->nickname (user id: $user->id)!");
-        common_log_db_error($flink, 'DELETE', __FILE__);
-    }
-
-    // Notify the user that we are removing their FB app access
-
-    $result = mail_facebook_app_removed($user);
-
-    if (!$result) {
-
-        $msg = 'Unable to send email to notify ' .
-            "$user->nickname (user id: $user->id) " .
-            'that their Facebook app link was ' .
-            'removed!';
-
-        common_log(LOG_WARNING, $msg);
-    }
-}
-
-/**
- * Send a mail message to notify a user that her Facebook Application
- * access has been removed.
- *
- * @param User $user   user whose Facebook app link has been removed
- *
- * @return boolean success flag
- */
-function mail_facebook_app_removed($user)
-{
-    $profile = $user->getProfile();
-
-    $site_name = common_config('site', 'name');
-
-    common_switch_locale($user->language);
-
-    $subject = sprintf(
-        _m('Your %1$s Facebook application access has been disabled.',
-            $site_name));
-
-    $body = sprintf(_m("Hi, %1\$s. We're sorry to inform you that we are " .
-        'unable to update your Facebook status from %2$s, and have disabled ' .
-        'the Facebook application for your account. This may be because ' .
-        'you have removed the Facebook application\'s authorization, or ' .
-        'have deleted your Facebook account.  You can re-enable the ' .
-        'Facebook application and automatic status updating by ' .
-        "re-installing the %2\$s Facebook application.\n\nRegards,\n\n%2\$s"),
-        $user->nickname, $site_name);
-
-    common_switch_locale();
-    return mail_to_user($user, $subject, $body);
-}
diff --git a/plugins/Facebook/fbfavicon.ico b/plugins/Facebook/fbfavicon.ico
deleted file mode 100644
index c57c0342fa643996277f32384d4d64decf1def26..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1150
zcmZQzU<5(|0R}M0U}0bo1F|%L7$l?s#Ef8)fx!VNM+>l~GV%Y6NNbWXNDs^{^O9Wu
zZ)wTJiT^_ZvKo*cYUwBBc9{L>>R|Sxi=*=gO8=L4um6KE48Zs>_YrbGOdmQ;tbUj}
zn0^=^Mia6hrjAnm$YB673uZ2{_OGr;KnX`u^~2Po(=huf%|9@6$f5uLpS`Dnk%566
I{2!PD0Wn1VCIA2c

diff --git a/plugins/Facebook/locale/Facebook.pot b/plugins/Facebook/locale/Facebook.pot
deleted file mode 100644
index b70a0f8ec8..0000000000
--- a/plugins/Facebook/locale/Facebook.pot
+++ /dev/null
@@ -1,535 +0,0 @@
-# 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-01-29 21:45+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"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr ""
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr ""
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: FBConnectAuth.php:96
-msgid "You can't register if you don't agree to the license."
-msgstr ""
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr ""
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr ""
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr ""
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr ""
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr ""
-
-#: FBConnectAuth.php:197
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr ""
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr ""
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr ""
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr ""
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-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'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr ""
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr ""
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr ""
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr ""
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr ""
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr ""
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr ""
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr ""
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr ""
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr ""
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr ""
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr ""
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr ""
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr ""
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr ""
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr ""
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr ""
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr ""
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr ""
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr ""
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr ""
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr ""
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr ""
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr ""
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr ""
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr ""
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr ""
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr ""
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr ""
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr ""
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr ""
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr ""
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr ""
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr ""
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr ""
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr ""
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr ""
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr ""
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr ""
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr ""
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr ""
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr ""
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr ""
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr ""
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr ""
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr ""
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr ""
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr ""
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr ""
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr ""
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr ""
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr ""
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr ""
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr ""
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr ""
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr ""
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr ""
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr ""
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr ""
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr ""
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr ""
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr ""
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr ""
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr ""
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr ""
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr ""
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr ""
diff --git a/plugins/Facebook/locale/be-tarask/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/be-tarask/LC_MESSAGES/Facebook.po
deleted file mode 100644
index cef809c7c6..0000000000
--- a/plugins/Facebook/locale/be-tarask/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,562 +0,0 @@
-# Translation of StatusNet - Facebook to Belarusian (Taraškievica orthography) (‪Беларуская (тарашкевіца)‬)
-# Exported from translatewiki.net
-#
-# Author: EugeneZelenko
-# Author: Jim-by
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:42+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-22 19:30:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: be-tarask\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-"Вітаем, %1$s!\n"
-"\n"
-"На жаль, мы вымушаныя паведаміць Вам, што ня можам абнавіць Ваш статус у "
-"Facebook з %2$s, і выключаем дастасаваньне Facebook для Вашага рахунку. Гэта "
-"магло здарыцца, таму што Вы выдалілі аўтарызацыю для дастасаваньня Facebook, "
-"ці выдалілі Ваш рахунак на Facebook. Вы можаце зноў уключыць дастасаваньне "
-"Facebook і аўтаматычнае абнаўленьне статусу пасьля паўторнага ўсталяваньня "
-"дастасаваньне Facebook  %2$s.\n"
-"\n"
-"З павагай,\n"
-"%2$s"
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr "Вам неабходна ўвайсьці ў Facebook для выкарыстаньня Facebook Connect."
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr "Ужо існуе лякальны карыстальнік злучаны з гэтым рахункам Facebook."
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Узьнікла праблема з ключом Вашай сэсіі. Калі ласка, паспрабуйце зноў."
-
-#: FBConnectAuth.php:96
-msgid "You can't register if you don't agree to the license."
-msgstr "Вы ня можаце зарэгістравацца, калі Вы ня згодны з умовамі ліцэнзіі."
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "Узьнікла невядомая памылка."
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-"Вы ўпершыню ўвайшлі ў %s, таму мы павінны злучыць Ваш рахунак на Facebook з "
-"лякальным рахункам. Вы можаце стварыць новы рахунак, ці злучыць з ўжо "
-"існуючым Вашым рахункам, калі Вы яго маеце."
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr "Устаноўка рахунку на Facebook"
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "Устаноўкі злучэньня"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, 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-адрас, і нумар тэлефона."
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Стварыць новы рахунак"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Стварыць новага карыстальніка з гэтай мянушкай."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Новая мянушка"
-
-#: FBConnectAuth.php:197
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 малых літараў ці лічбаў, ніякай пунктуацыі ці прагалаў"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Стварыць"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr "Далучыць існуючы рахунак"
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-"Калі Вы ўжо маеце рахунак, увайдзіце з Вашым імем карыстальніка і паролем, "
-"каб далучыць яго да рахунку на Facebook."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr "Існуючая мянушка"
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Пароль"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-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'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "Рэгістрацыя не дазволеная."
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "Няслушны код запрашэньня."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "Мянушка забароненая."
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "Мянушка ўжо выкарыстоўваецца. Паспрабуйце іншую."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr "Памылка далучэньня карыстальніка да Facebook."
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "Няслушнае імя карыстальніка ці пароль."
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Увайсьці"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "Даслаць паведамленьне"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "Як справы, %s?"
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Даступныя сымбалі"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Даслаць"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr "Памылка сэрвэра: немагчыма атрымаць карыстальніка!"
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "Няслушнае імя карыстальніка ці пароль."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s і сябры, старонка %2$d"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s і сябры"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-"Калі Вы жадаеце, каб дастасаваньне %s аўтаматычна абнаўляла Ваш статус у "
-"Facebook з апошнімі паведамленьнямі, Вы павінны даць дазвол."
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr "Так, зрабіць гэта!"
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Прапусьціць"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "Нумарацыя старонак"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Пасьля"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Перад"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "Дзякуем за запрашэньне Вашых сяброў карыстацца %s."
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Запрашэньні былі дасланыя наступным карыстальнікам:"
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Вы былі запрошаныя ў %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Запрасіць Вашых сяброў карыстацца %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Сябры, якія ўжо карыстаюцца %s:"
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Даслаць запрашэньні"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr "Налады інтэграцыі Facebook"
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr "Карыстальнік злучэньня Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr "Увайсьці ці зарэгістравацца з выкарыстаньнем Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr ""
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr ""
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr ""
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr ""
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr ""
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr ""
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr ""
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr ""
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr ""
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr ""
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr ""
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr ""
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr ""
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr ""
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr ""
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr ""
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr ""
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr ""
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr ""
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr ""
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr ""
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr ""
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr ""
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr ""
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr ""
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr ""
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr ""
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr ""
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr ""
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr ""
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr ""
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr ""
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr ""
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr ""
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr ""
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr ""
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr ""
diff --git a/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po
deleted file mode 100644
index 282f8fbea6..0000000000
--- a/plugins/Facebook/locale/br/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,544 +0,0 @@
-# Translation of StatusNet - Facebook to Breton (Brezhoneg)
-# Exported from translatewiki.net
-#
-# Author: Fulup
-# Author: Y-M D
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49: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"
-"X-POT-Import-Date: 2011-01-22 19:30:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: br\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr ""
-"Rankout a rit bezañ kevreet war Facebook evit implijout Facebook Connect."
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr "Un implijer lec'hel liammet d'ar gont Facebook-se a zo dija."
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-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."
-
-#: FBConnectAuth.php:96
-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."
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "Ur gudenn dizanv a zo bet."
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr "Kefluniadur ar gont Facebook"
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "Dibarzhioù kevreañ"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Krouiñ ur gont nevez"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Krouiñ un implijer nevez gant al lesanv-se."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Lesanv nevez"
-
-#: FBConnectAuth.php:197
-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.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Krouiñ"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr "Kevreañ d'ur gont a zo dioutañ"
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr "Lesanv a zo dioutañ"
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Ger-tremen"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-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'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "N'eo ket aotreet krouiñ kontoù."
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "N'eo ket reizh ar c'hod pedadenn."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "Lesanv nann-aotreet."
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr ""
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "Anv implijer pe ger-tremen direizh."
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Kevreañ"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "Kas un ali"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "Penaos 'mañ kont, %s ?"
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Arouezennoù a chom"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Kas"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr ""
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "Anv implijer pe ger-tremen direizh."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s hag e vignoned, pajenn %2$d"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s hag e vignoned"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr "Ok, en ober !"
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Mont hebiou"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "Pajennadur"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "War-lerc'h"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "A-raok"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "Trugarez da bediñ ho mignoned da implijout %s."
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Pedadennoù a zo bet kaset d'an implijerien da-heul :"
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Pedet oc'h bet da %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Pedit ho mignoned da implijout %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Mignoned hag a implij dija %s :"
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Kas pedadennoù"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr ""
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr "Implijer Facebook Connect"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr "Kevreañ pe en em enskrivañ dre Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr "Arventennoù evit Facebook Connect"
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr "Kevreet oc'h dija."
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr "Kevreit gant ho kont Facebook"
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr "Kevreadenn Facebook"
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr ""
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr "Dibosupl eo dilemel an implijer Facebook."
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "Degemer"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "Degemer"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Pediñ"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "Pediñ"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Arventennoù"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Penndibaboù"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr "ur gont nevez."
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "En em enskrivañ"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr "Lesanv"
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Kevreañ"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr "Ha kollet ho peus ho ker-tremen ?"
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr "Danvez ebet en ali !"
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Re hir eo ! Ment hirañ an ali a zo a %d arouezenn."
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr "Alioù"
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr "Facebook"
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr "Arventennoù enframmañ Facebook"
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr "Arventennoù poellad Facebook"
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr "Alc'hwez API"
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr "Alc'hwez API pourchaset gant Facebook"
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr "Kuzh"
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr "Alc'hwez API kuzh pourchaset gant Facebook"
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Enrollañ"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Enrollañ arventennoù Facebook"
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr "Merañ an doare ma kevre ho kont ouzh Facebook"
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr ""
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr "Implijer Facebook kevreet"
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr "Digevreañ ma c'hont deus Facebook"
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr "Termeniñ ur ger-tremen"
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr "da gentañ."
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Digevrañ"
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr "N'eus ket bet gallet diverkañ al liamm war-du Facebook."
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr "N'omp ket sur eus ar pezh emaoc'h o klask ober aze."
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr ""
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr "Kas respontoù \"@\" da Facebook."
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Enrollañ"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr ""
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr "Penndibaboù ar c'hempredañ"
diff --git a/plugins/Facebook/locale/ca/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/ca/LC_MESSAGES/Facebook.po
deleted file mode 100644
index 8628e7e777..0000000000
--- a/plugins/Facebook/locale/ca/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,575 +0,0 @@
-# Translation of StatusNet - Facebook to Catalan (Català)
-# Exported from translatewiki.net
-#
-# Author: Toniher
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:53: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-29 22:24:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: ca\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-"Hola, %1$s. lamentem informar-vos que no podem actualitzar l'estat del "
-"vostre Facebook des de %2$s, i hem inhabilitat l'aplicació del Facebook del "
-"vostre compte. Això pot ser perquè hagiu eliminat l'autorització de "
-"l'aplicació al Facebook, o perquè hàgiu eliminat el vostre compte del "
-"Facebook. Podeu tornar a habilitar l'aplicació del Facebook i "
-"l'actualització automàtica d'estat reinstal·lant l'aplicació de Facebook de %"
-"2$s.\n"
-"\n"
-"Atentament,\n"
-"\n"
-"%2$s"
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr ""
-"Heu d'iniciar una sessió al Facebook per fer servir el Facebook Connect."
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr "Ja hi ha un usuari local enllaçat amb aquest compte del Facebook."
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-"S'ha produït un problema amb el testimoni de la vostre sessió. Torneu-ho a "
-"provar."
-
-#: FBConnectAuth.php:96
-msgid "You can't register if you don't agree to the license."
-msgstr "No us podeu registrar si no accepteu la llicència."
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "S'ha produït un error desconegut."
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-"És la primera vegada que inicieu una sessió a %s, per tant hem de connectar "
-"el vostre Facebook a un compte local. Podeu crear un compte nou, o bé "
-"connectar-vos amb un ja existent si ja en teniu un."
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr "Configuració del compte del Facebook"
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "Opcions de connexió"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, 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 sota %s, excepte les dades "
-"privades següents: contrasenya, adreça electrònica, adreça de MI i número de "
-"telèfon."
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Crea un compte nou"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Crea un compte nou amb aquest sobrenom."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Nou sobrenom"
-
-#: FBConnectAuth.php:197
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-"1-64 lletres en minúscules o nombres, sense signes de puntuació o espais"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Crea"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr "Connecta un compte existent"
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-"Si ja teniu un compte, inicieu una sessió amb el nom d'usuari i contrasenya "
-"per connectar-lo al vostre Facebook."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr "Sobrenom ja existent"
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Contrasenya"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-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'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "No es permet el registre"
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "No és un codi d'invitació vàlid."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "No es permet el sobrenom."
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "El sobrenom ja és en ús. Proveu-ne un altre."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr "S'ha produït un error en connectar l'usuari al Facebook."
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "Nom d'usuari o contrasenya no vàlids."
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Inici de sessió"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "Envia un avís"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "Com va, %s?"
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Caràcters disponibles"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Envia"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr "Error del servidor: no es pot obtenir l'usuari!"
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "Usuari o contrasenya incorrectes."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s i amics, pàgina %2$d"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s i amics"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-"Si voleu que l'aplicació %s actualitzi automàticament el vostre estat del "
-"Facebook amb el darrer avís, cal que li doneu permisos."
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr "Endavant, fes-ho!"
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Omet"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "Paginació"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Després"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Abans"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "Gràcies per convidar els vostres amics perquè facin servir el %s."
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "S'han enviat invitacions als usuaris següents:"
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Us han convidat a %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Convideu els vostres amics a fer servir %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Amics que ja fan servir %s:"
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Envia invitacions"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr "Configuració d'integració del Facebook"
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr "Usuari de connexió del Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr "Inicieu una sessió o registreu-vos fent servir el Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr "Paràmetres de connexió del Facebook"
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-"El connector del Facebook permet integrar instàncies de l'StatusNet amb el "
-"<a href=\"http://facebook.com/\">Facebook</a> i el Facebook Connect."
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr "Ja heu iniciat una sessió."
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr "Inicieu una sessió amb el compte del Facebook"
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr "Inici de sessió del Facebook"
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr "No s'ha pogut eliminar l'usuari del Facebook: ja s'ha eliminat."
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr "No s'ha pogut eliminar l'usuari del Facebook."
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "Inici"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "Inici"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Convida"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "Convida"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Paràmetres"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Paràmetres"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-"Per fer servir l'aplicació del Facebook %s cal que inicieu una sessió amb el "
-"vostre usuari i contrasenya. No teniu cap nom d'usuari encara?"
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr " un compte nou."
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "Registre"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr "Sobrenom"
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Inici de sessió"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr "Heu perdut o oblidat la contrasenya?"
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr "No hi ha contingut a l'avís!"
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "És massa llarg. La mida màxima d'un avís són %d caràcters."
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr "Avisos"
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr "Facebook"
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr "Paràmetres d'integració del Facebook"
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr "Clau API del Facebook no vàlida. La longitud màxima són 255 caràcters."
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-"Clau secreta API del Facebook no vàlida. La longitud màxima són 255 "
-"caràcters."
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr "Paràmetres d'aplicació del Facebook"
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr "Clau API"
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr "Clau API proporcionada pel Facebook"
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr "Clau secreta"
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr "Clau secreta API proporcionada pel Facebook"
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Desa"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Desa els paràmetres del Facebook"
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr "Gestiona com el vostre compte es connecta al Facebook"
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr "No hi ha cap usuari del Facebook connectat a aquest compte."
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr "Usuari del Facebook connectat"
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr "Desconnecta el meu compte del Facebook"
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-"Si desconnecteu el vostre Facebook, serà impossible iniciar una sessió!"
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr "definiu una contrasenya"
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr " abans de res."
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Desconnecta"
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr "No s'ha pogut eliminar l'enllaç al Facebook."
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr "Us heu desconnectat del Facebook."
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr "No estic segur del que proveu de fer."
-
-#: facebooksettings.php:61
-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.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr "S'han desat les preferències de sincronització."
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-"Actualitza automàticament el meu estat del Facebook amb els meus avisos."
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr "Envia respostes «@» al Facebook."
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Desa"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-"Si voleu que %s actualitzi automàticament el vostre estat del Facebook amb "
-"el darrer avís, cal que li doneu permís."
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Permet que %s actualitzi el meu estat del Facebook"
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr "Preferències de sincronització"
diff --git a/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po
deleted file mode 100644
index f28334bffc..0000000000
--- a/plugins/Facebook/locale/de/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,578 +0,0 @@
-# Translation of StatusNet - Facebook to German (Deutsch)
-# Exported from translatewiki.net
-#
-# Author: Michael
-# Author: The Evil IP address
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:43+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:30:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: de\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-"Hallo %1$s. Wir konnten leider nicht deinen Facebook-Status von %2$s aus "
-"aktualisieren und haben daher das Facebook-Programm für dein Benutzerkonto "
-"deaktiviert. Dies könnte daran liegen, dass du die Erlaubnis des Facebook-"
-"Programms entfernt hast oder dein Facebook-Benutzerkonto gelöscht hast. Du "
-"kannst das Facebook-Programm und die automatische Aktualisierung des Status, "
-"indem du das %2$s-Facebook-Programm neu installierst.\n"
-"\n"
-"Mit freundlichen Grüßen,\n"
-"\n"
-"%2$s"
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr ""
-"Du musst auf Facebook eingeloggt sein, um Facebook Connect benutzen zu "
-"können."
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr ""
-"Es gibt bereits einen lokalen Benutzer, der mit diesem Facebook-"
-"Benutzerkonto verknüpft ist."
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Es gab ein Problem mit deinem Sitzungstoken. Bitte versuche es erneut."
-
-#: FBConnectAuth.php:96
-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."
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "Ein unbekannter Fehler ist aufgetreten."
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-"Dies ist das erste Mal, dass du dich auf %s anmeldest, sodass wir dein "
-"Facebook-Benutzerkonto mit einem lokalen Benutzerkonto verbinden müssen. Du "
-"kannst entweder ein neues Benutzerkonto erstellen oder dich mit deinem "
-"existierendem Benutzerkonto verbinden."
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "Verbindungsoptionen"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-"Abgesehen von den folgenden Daten: Passwort, E-Mail-Adresse, IM-Adresse und "
-"Telefonnummer, sind all meine Texte und Dateien unter %s verfügbar."
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Neues Benutzerkonto erstellen"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Neues Benutzerkonto mit diesem Benutzernamen erstellen."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Neuer Benutzername"
-
-#: FBConnectAuth.php:197
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Erstellen"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr "Bestehendes Benutzerkonto verbinden"
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-"Wenn du bereits ein Benutzerkonto hast, melde dich mit deinem Benutzernamen "
-"und Passwort an, um ihn mit Facebook zu verbinden."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr "Bestehender Benutzername"
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Passwort"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-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'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "Registrierung nicht erlaubt."
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "Kein gültiger Einladungscode."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "Benutzername nicht erlaubt."
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr "Fehler beim Verbinden des Benutzers mit Facebook."
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "Benutzername oder Passwort falsch."
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Anmelden"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "Nachricht senden"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "Was geht, %s?"
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Verfügbare Zeichen"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Senden"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr "Server-Fehler: Konnte Benutzer nicht kriegen!"
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "Falscher Benutzername oder Passwort."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s und Freunde, Seite %2$d"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s und Freunde"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-"Wenn du möchtest, dass das %s-Programm automatisch deinen Facebook-Status "
-"mit deiner neuesten Nachricht aktualisiert, musst du ihm die Erlaubnis dazu "
-"geben."
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr "Okay, mach es!"
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Überspringen"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr ""
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Nach"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Vor"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "Danke für das Einladen deiner Freunde auf %s."
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Einladungen wurden an die folgenden Benutzer gesendet:"
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Du wurdest auf %s eingeladen"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Lade deine Freunde auf %s ein"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Auf %s bereits angemeldete Freunde"
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Einladungen senden"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr ""
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr ""
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr "Mit Facebook anmelden oder registrieren"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr ""
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-"Das Facebook-Plugin integriert StatusNet mit <a href=\"http://facebook.com/"
-"\">Facebook</a> und Facebook Connect."
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr "Bereits angemeldet."
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr "Logge dich mit deinem Facebook-Benutzerkonto ein"
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr "Facebook Login"
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr "Konnte Facebook-Benutzer nicht entfernen: bereits gelöscht."
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr "Konnte Facebook-Benutzer nicht entfernen."
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "Startseite"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "Startseite"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Einladen"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "Einladen"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Einstellungen"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Einstellungen"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-"Um das %s-Facebook-Programm zu benutzen, musst du dich mit deinem "
-"Benutzernamen und Passwort einloggen. Hast du noch keinen Benutzernamen?"
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr ""
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "Registrieren"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr "Benutzername"
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Anmelden"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr "Passwort vergessen?"
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr "Kein Nachrichten-Inhalt!"
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-"Das war zu lang. Die Länge einer Nachricht ist auf %d Zeichen beschränkt."
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr "Nachrichten"
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr "Facebook"
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr ""
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr ""
-"Ungültiger Facebook-API-Schlüssel. Die maximale Länge liegt bei 255 Zeichen."
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr ""
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr "API-Schlüssel"
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr "Von Facebook bereitgestellter API-Schlüssel"
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr "Geheim"
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Speichern"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Facebook-Einstellungen speichern"
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr "Verwalte, wie dein Benutzerkonto sich mit Facebook verbindet"
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr ""
-"Es gibt keinen Facebook-Benutzer, der mit diesem Benutzerkonto verbunden ist."
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr "Verbundener Facebook-Benutzer"
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr ""
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr "Passwort vergeben"
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr ""
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Abmelden"
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr "Link zu Facebook konnte nicht gelöscht werden."
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr "Sie sind bei Facebook abgemeldet."
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr "Prozess konnte nicht verarbeitet werden."
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
-"Es gab ein Problem beim Speichern deiner Synchronisierungs-Einstellungen!"
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr "Synchronisierungs-Einstellungen gespeichert."
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-"Meinen Facebook-Status automatisch mit meinen Nachrichten aktualisieren."
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr "@-Antworten an Facebook versenden."
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Speichern"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-"Wenn du möchtest, dass %s automatisch deinen Facebook-Status mit deiner "
-"neuesten Nachricht aktualisiert, musst du ihm die Erlaubnis dazu geben."
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "%s erlauben, meinen Facebook-Status zu aktualisieren"
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr "Synchronisierungs-Einstellungen"
diff --git a/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po
deleted file mode 100644
index 39381fe624..0000000000
--- a/plugins/Facebook/locale/es/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,563 +0,0 @@
-# Translation of StatusNet - Facebook to Spanish (Español)
-# Exported from translatewiki.net
-#
-# Author: Locos epraix
-# Author: Peter17
-# Author: Translationista
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:43+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:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: es\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: facebookutil.php:429
-#, fuzzy, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-"Hola, %$1s: Lamentamos informarte que no podemos actualizar tu estado de "
-"Facebook desde %$2s y hemos inhabilitado la aplicación de Facebook en tu "
-"cuenta. Esto puede deberse a que has eliminado la autorización de Facebook o "
-"porque hax borrado tu cuenta de Facebook. Puedes volver a habilitar la "
-"aplicación de Facebook y la actualización automática de estados mediante la "
-"reinstalación de la aplicación de Facebook %2$s."
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr ""
-"Debes haber iniciado sesión en Facebook para poder utilizar Facebook Connect."
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr "Ya hay un usuario local vinculado a esta cuenta de Facebook."
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-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."
-
-#: FBConnectAuth.php:96
-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."
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "Ha ocurrido un error desconocido."
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-"Esta es la primera vez que inicias sesión en %s, así que debemos conectar "
-"Facebook a una cuenta local. Puedes crear una cuenta nueva o conectarte con "
-"tu cuenta, de tenerla."
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr "Configuración de cuenta de Facebook"
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "Opciones de conexión"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, 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 y archivos están disponibles en %s, salvo estos datos privados: "
-"contraseña, dirección de correo electrónico, dirección de mensajería "
-"instantánea y número de teléfono."
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Crear cuenta nueva"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Crear un nuevo usuario con este nombre de usuario."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Nuevo nombre de usuario"
-
-#: FBConnectAuth.php:197
-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: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Crear"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr "Conectar cuenta existente"
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-"Si ya tienes una cuenta, ingresa con tu nombre de usuario y contraseña para "
-"conectarte a tu Facebook."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr "El nombre de usuario ya existe"
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Contraseña"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-msgctxt "BUTTON"
-msgid "Connect"
-msgstr "Conectar"
-
-#. TRANS: Client error trying to register with registrations not allowed.
-#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "Registro de usuario no permitido."
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "No es un código de invitación válido."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "Nombre de usuario no autorizado."
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "El nombre de usuario ya existe. Prueba con otro."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr "Error de conexión del usuario a Facebook."
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "Nombre de usuario o contraseña inválidos."
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Iniciar sesión"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "Enviar un mensaje"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "¿Qué tal, %s?"
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Caracteres disponibles"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Enviar"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr "Error de servidor: ¡No se pudo obtener el usuario!"
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr ""
-"Nombre de usuario o contraseña incorrectos\n"
-"."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, fuzzy, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%s y sus amistades"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s y sus amistades"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-"Si desesa que la aplicación %s actualice automáticamente tu estado de "
-"Facebook con tu último mensaje, tienes que darle permiso."
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr "Ok, ¡hazlo!"
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Omitir"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "Paginación"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Después"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Antes"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "Gracias por invitar a tus amistades a usar %s."
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Se ha enviado invitaciones a los siguientes usuarios:"
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Te han invitado a %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Invita a tus amistades a usar %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Amistades que ya usan %s:"
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Enviar invitaciones"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr "Configuración de integración de Facebook"
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr ""
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr ""
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr ""
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr ""
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr ""
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr ""
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr ""
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr ""
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "Pagina principal"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "Pagina principal"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Invitar"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "Invitar"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Preferencias"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Preferencias"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr ""
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "Registrarse"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr "Nickname"
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Iniciar sesión"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr ""
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr ""
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr "Avisos"
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr "Facebook"
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr "Configuración de integración de Facebook"
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr ""
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr ""
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr "Secreto"
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Guardar"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr ""
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr ""
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr ""
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr ""
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr "establecer una contraseña"
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr ""
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr ""
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr ""
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr ""
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr ""
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Guardar"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr ""
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr ""
diff --git a/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po
deleted file mode 100644
index eb9f440878..0000000000
--- a/plugins/Facebook/locale/fr/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,581 +0,0 @@
-# Translation of StatusNet - Facebook to French (Français)
-# Exported from translatewiki.net
-#
-# Author: Peter17
-# Author: Verdy p
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:43+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:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: fr\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-"Salut, %1$s. Nous sommes désolés de vous informer que nous ne sommes pas en "
-"mesure de mettre à jour votre statut Facebook depuis %2$s et que nous avons "
-"désactivé l’application Facebook sur votre compte. C’est peut-être parce que "
-"vous avez retiré l’autorisation de l’application Facebook, ou avez supprimé "
-"votre compte Facebook. Vous pouvez réactiver l’application Facebook et la "
-"mise à jour d’état automatique en réinstallant l’application %2$s pour "
-"Facebook.\n"
-"\n"
-"Cordialement,\n"
-"\n"
-"%2$s"
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr "Vous devez être identifié sur Facebook pour utiliser Facebook Connect."
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr "Il existe déjà un utilisateur local lié à ce compte Facebook."
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-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."
-
-#: FBConnectAuth.php:96
-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."
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "Une erreur inconnue s’est produite."
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook 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 Facebook, il nous "
-"faut donc lier votre compte Facebook à un compte local. Vous pouvez soit "
-"créer un nouveau compte, soit vous connecter avec votre compte local "
-"existant si vous en avez un."
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr "Configuration du compte Facebook"
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "Options de connexion"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, 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."
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Créer un nouveau compte"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Créer un nouvel utilisateur avec ce pseudonyme."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Nouveau pseudonyme"
-
-#: FBConnectAuth.php:197
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Créer"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr "Se connecter à un compte existant"
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-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 Facebook."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr "Pseudonyme existant"
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Mot de passe"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-msgctxt "BUTTON"
-msgid "Connect"
-msgstr "Connexion"
-
-#. TRANS: Client error trying to register with registrations not allowed.
-#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "Inscription non autorisée."
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "Le code d’invitation n’est pas valide."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "Pseudonyme non autorisé."
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "Pseudonyme déjà utilisé. Essayez-en un autre."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr "Erreur de connexion de l’utilisateur à Facebook."
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "Nom d’utilisateur ou mot de passe incorrect."
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Connexion"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "Envoyer un avis"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "Quoi de neuf, %s ?"
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Caractères restants"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Envoyer"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr "Erreur de serveur : impossible d’obtenir l’utilisateur !"
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "Nom d’utilisateur ou mot de passe incorrect."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s et ses amis, page %2$d"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s et ses amis"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-"Si vous souhaitez que l’application %s mette à jour automatiquement votre "
-"statut Facebook avec votre dernier avis, vous devez lui en donner "
-"l’autorisation."
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr "Ok, le faire !"
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Sauter cette étape"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "Pagination"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Après"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Avant"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "Merci d’inviter vos amis à utiliser %s."
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Des invitations ont été envoyées aux utilisateurs suivants :"
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Vous avez été invité à %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Invitez vos amis à utiliser %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Amis utilisant déjà %s :"
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Envoyer des invitations"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr "Configuration de l’intégration Facebook"
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr "Utilisateur de Facebook Connect"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr "Se connecter ou s’inscrire via Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr "Paramètres pour Facebook Connect"
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-"Le greffon Facebook permet d’intégrer des instances StatusNet avec <a href="
-"\"http://facebook.com/\">Facebook</a> et Facebook Connect."
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr "Déjà connecté."
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr "Connectez-vous avec votre compte Facebook"
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr "Connexion Facebook"
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr "Impossible de supprimer l’utilisateur Facebook : déjà supprimé."
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr "Impossible de supprimer l’utilisateur Facebook."
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "Accueil"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "Accueil"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Inviter"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "Inviter"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Paramètres"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Préférences de l’utilisateur"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-"Pour utiliser l’application %s pour Facebook, vous devez vous identifier "
-"avec votre nom d’utilisateur et mot de passe. Vous n’avez pas encore un nom "
-"d’utilisateur ?"
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr "un nouveau compte."
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "S’inscrire"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr "Pseudonyme"
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Connexion"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr "Mot de passe perdu ou oublié ?"
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr "Aucun contenu dans l’avis !"
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "C’est trop long ! La taille maximale de l’avis est de %d caractères."
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr "Avis publiés"
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr "Facebook"
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr "Paramètres d’intégration Facebook"
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr ""
-"Clé invalide pour l’API Facebook. La longueur maximum est de 255 caractères."
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-"Code secret invalide pour l’API Facebook. La longueur maximum est de 255 "
-"caractères."
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr "Paramètres de l’application Facebook"
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr "Clé API"
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr "Clé API fournie par Facebook"
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr "Code secret"
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr "Code secret pour l’API fourni par Facebook"
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Sauvegarder"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Sauvegarder les paramètres Facebook"
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr "Gérez la façon dont votre compte se connecte à Facebook"
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr "Il n’y a pas d’utilisateur Facebook connecté à ce compte."
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr "Utilisateur Facebook connecté"
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr "Déconnecter mon compte de Facebook"
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-"La déconnexion de votre compte Facebook ne vous permettrait plus de vous "
-"connecter ! S’il vous plaît "
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr "définissez un mot de passe"
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr " tout d’abord."
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Déconnecter"
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr "Impossible de supprimer le lien vers Facebook."
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr "Vous avez été déconnecté de Facebook."
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr "Pas certain de ce que vous essayez de faire."
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
-"Il y a eu un problème lors de la sauvegarde de vos préférences de "
-"synchronisation !"
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr "Préférences de synchronisation enregistrées."
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr "Mettre à jour automatiquement mon statut Facebook avec mes avis."
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr "Envoyez des réponses « @ » à Facebook."
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Sauvegarder"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-"Si vous souhaitez que l’application %s mette à jour automatiquement votre "
-"statut Facebook avec votre dernier avis, vous devez lui en donner "
-"l’autorisation."
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Autoriser %s à mettre à jour mon statut Facebook"
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr "Préférences de synchronisation"
diff --git a/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po
deleted file mode 100644
index 8392821035..0000000000
--- a/plugins/Facebook/locale/gl/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,545 +0,0 @@
-# Translation of StatusNet - Facebook to Galician (Galego)
-# Exported from translatewiki.net
-#
-# Author: Toliño
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:43+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:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: gl\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr ""
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr ""
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Houbo un erro co seu pase. Inténteo de novo."
-
-#: FBConnectAuth.php:96
-msgid "You can't register if you don't agree to the license."
-msgstr "Non pode rexistrarse se non acepta a licenza."
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "Houbo un erro descoñecido."
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "Opcións de conexión"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-"Os meus textos e ficheiros están dispoñibles baixo %s, salvo os seguintes "
-"datos privados: contrasinais, enderezos de correo electrónico e mensaxería "
-"instantánea e números de teléfono."
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Crear unha conta nova"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Crear un novo usuario con este alcume."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Novo alcume"
-
-#: FBConnectAuth.php:197
-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"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Crear"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr ""
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr ""
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Contrasinal"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-msgctxt "BUTTON"
-msgid "Connect"
-msgstr "Conectar"
-
-#. TRANS: Client error trying to register with registrations not allowed.
-#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "Non se permite o rexistro."
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "O código da invitación é incorrecto."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr ""
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "Ese alcume xa está en uso. Probe con outro."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr ""
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "O nome de usuario ou contrasinal non son correctos."
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Rexistro"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "Enviar unha nota"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "Que hai de novo, %s?"
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Caracteres dispoñibles"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Enviar"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr ""
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "Nome de usuario ou contrasinal incorrectos."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s e amigos, páxina %2$d"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s e amigos"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr "De acordo, facédeo!"
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Saltar"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "Paxinación"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Despois"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Antes"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr ""
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr ""
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr ""
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr ""
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr ""
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Enviar as invitacións"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr "Configuración de integración do Facebook"
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr "Usuario do Facebook Connect"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr ""
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr ""
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr "Xa se identificou."
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr ""
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr ""
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr ""
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr ""
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "Inicio"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "Inicio"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Convidar"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "Convidar"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Parámetros"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Configuracións"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr " unha nova conta."
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "Rexistrarse"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr "Alcume"
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Rexistro"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr "Esqueceu ou perdeu o contrasinal?"
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr ""
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr "Avisos"
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr "Facebook"
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr ""
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr ""
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr "Clave API"
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr "Clave API proporcionada polo Facebook"
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr ""
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Gardar"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr ""
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr ""
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr ""
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr ""
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr ""
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr " primeiro."
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Desconectarse"
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr ""
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr ""
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr ""
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Gardar"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr ""
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr ""
diff --git a/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po
deleted file mode 100644
index 59e4457f7b..0000000000
--- a/plugins/Facebook/locale/ia/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,572 +0,0 @@
-# Translation of StatusNet - Facebook 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 - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49: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-01-22 19:30:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: ia\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-"Salute, %1$s. Nos regretta informar te que nos es incapace de actualisar tu "
-"stato de Facebook ab %2$s, e que nos ha disactivate le application Facebook "
-"pro tu conto. Isto pote esser proque tu ha removite le autorisation del "
-"application Facebook, o ha delite tu conto de Facebook. Tu pote reactivar le "
-"application Facebook e le actualisation automatic de tu stato per "
-"reinstallar le application Facebook %2$s.\n"
-"\n"
-"Attentemente,\n"
-"\n"
-"%2$s"
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr "Tu debe aperir un session a Facebook pro usar Facebook Connect."
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr "Il ha jam un usator local ligate a iste conto de Facebook."
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-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."
-
-#: FBConnectAuth.php:96
-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."
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "Un error incognite ha occurrite."
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook 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 Facebook a un conto local. Tu pote crear un nove conto, o "
-"connecter con tu conto existente si tu ha un."
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr "Configuration de conto Facebook"
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "Optiones de connexion"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, 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."
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Crear nove conto"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Crear un nove usator con iste pseudonymo."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Nove pseudonymo"
-
-#: FBConnectAuth.php:197
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 minusculas o numeros, sin punctuation o spatios"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Crear"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr "Connecter conto existente"
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-"Si tu ha jam un conto, aperi session con tu nomine de usator e contrasigno "
-"pro connecter lo a tu Facebook."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr "Pseudonymo existente"
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Contrasigno"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-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'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "Creation de conto non permittite."
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "Le codice de invitation es invalide."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "Pseudonymo non permittite."
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "Pseudonymo ja in uso. Proba un altere."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr "Error durante le connexion del usator a Facebook."
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "Nomine de usator o contrasigno invalide."
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Aperir session"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "Inviar un nota"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "Como sta, %s?"
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Characteres disponibile"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Inviar"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr "Error de servitor: Non poteva obtener le usator!"
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "Nomine de usator o contrasigno incorrecte."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s e amicos, pagina %2$d"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s e amicos"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-"Si tu vole que le application %s actualisa automaticamente tu stato de "
-"Facebook con tu ultim enota, tu debe dar permission a illo."
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr "OK, face lo!"
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Saltar"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "Pagination"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Post"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Ante"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "Gratias pro invitar tu amicos a usar %s."
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Invitationes ha essite inviate al sequente usatores:"
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Tu ha essite invitate a %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Invita tu amicos a usar %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Amicos que jam usa %s:"
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Inviar invitationes"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr "Configuration del integration de Facebook"
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr "Usator de Facebook Connect"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr "Aperir session o crear conto usante Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr "Configurationes de connexion a Facebook"
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-"Le plug-in de Facebook permitte integrar installationes de StatusNet con <a "
-"href=\"http://facebook.com/\">Facebook</a> e Facebook Connect."
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr "Tu es jam authenticate."
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr "Aperir session con tu conto de Facebook"
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr "Authentication con Facebook"
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr "Non poteva remover usator de Facebook: jam delite."
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr "Non poteva remover le usator de Facebook."
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "Initio"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "Initio"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Invitar"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "Invitar"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Configurationes"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Configurationes"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-"Pro usar le application Facebook %s tu debe aperir un session con tu nomine "
-"de usator e contrasigno. Tu non ha ancora un nomine de usator?"
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr " un nove conto."
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "Crear conto"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr "Pseudonymo"
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Aperir session"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr "Contrasigno perdite o oblidate?"
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr "Le nota non ha contento!"
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-"Isto es troppo longe. Le longitude maximal del notas es %d characteres."
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr "Notas"
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr "Facebook"
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr "Configurationes de integration de Facebook"
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr "Clave API de Facebook invalide. Longitude maximal es 255 characteres."
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-"Secreto API de Facebook invalide. Longitude maximal es 255 characteres."
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr "Configurationes del application de Facebook"
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr "Clave API"
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr "Clave API providite per Facebook"
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr "Secreto"
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr "Secreto API providite per Facebook"
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Salveguardar"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Salveguardar configuration Facebook"
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr "Configura como tu conto se connecte a Facebook"
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr "Il non ha un usator de Facebook connectite a iste conto."
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr "Usator de Facebook connectite"
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr "Disconnecter mi conto ab Facebook"
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-"Le disconnexion de tu Facebook renderea le authentication impossibile! Per "
-"favor "
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr "defini un contrasigno"
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr " primo."
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Disconnecter"
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr "Non poteva deler le ligamine a Facebook."
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr "Tu te ha disconnectite de Facebook."
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr "Non es clar lo que tu tenta facer."
-
-#: facebooksettings.php:61
-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.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr "Preferentias de synchronisation salveguardate."
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr "Actualisar automaticamente mi stato de Facebook con mi notas."
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr "Inviar responsas \"@\" a Facebook."
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Salveguardar"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-"Si tu vole que %s actualisa automaticamente tu stato de Facebook con tu "
-"ultime nota, tu debe dar permission a illo."
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Permitter a %s de actualisar mi stato de Facebook"
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr "Preferentias de synchronisation"
diff --git a/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po
deleted file mode 100644
index 09dedf13ae..0000000000
--- a/plugins/Facebook/locale/mk/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,568 +0,0 @@
-# Translation of StatusNet - Facebook 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 - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49: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-01-22 19:30:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: mk\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-"Здраво, %1$s. Нажалост, не можеме да го смениме Вашиот статус на Facebook од "
-"%2$s, и го имаме оневозможено програмчето за Facebook на Вашата сметка. Ова "
-"можеби се должи на тоа што сте го отстраниле овластувањето на програмчето за "
-"Facebook, или пак сте ја избришале самата сметка на Facebook. Можете "
-"повторно да го овозможите програмчето за Facebook и автоматското менување на "
-"статус со преинсталирање на програмчето %2$s - Facebook.\n"
-"\n"
-"Поздрав,\n"
-"\n"
-"%2$s"
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr ""
-"Мора да сте најавени на Facebook за да можете да користите Facebook Connect."
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr "Веќе постои локален корисник поврзан со оваа сметка на Facebook."
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Се појави проблем со жетонот на Вашата сесија. Обидете се повторно."
-
-#: FBConnectAuth.php:96
-msgid "You can't register if you don't agree to the license."
-msgstr "Не можете да се регистрирате ако не се согласувате со лиценцата."
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "Се појави непозната грешка."
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-"Ова е прв пат како се најавувате на %s, па затоа мораме да го поврземе "
-"Вашиот профил на Facebook со локална сметка. Можете да создадете нова "
-"сметка, или пак да се поврзете со Вашата постоечка сметка (ако ја имате)."
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr "Поставки за сметка на Facebook"
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "Нагодувања за врска"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, 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-адреса, и телефонскиот број."
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Создај нова сметка"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Создај нов корисник со овој прекар."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Нов прекар"
-
-#: FBConnectAuth.php:197
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 мали букви или бројки, без интерпункциски знаци и празни места"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Создај"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr "Поврзи постоечка сметка"
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-"Ако веќе имате сметка, најавете се со корисничкото име и лозинката за да ја "
-"поврзете со профилот на Facebook."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr "Постоечки прекар"
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Лозинка"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-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'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "Регистрацијата не е дозволена."
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "Ова не е важечки код за покана."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "Прекарот не е дозволен."
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "Прекарот е зафатен. Одберете друг."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr "Грешка при поврзувањето на корисникот со Facebook."
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "Неважечко корисничко име или лозинка."
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Најава"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "Испрати забелешка"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "Како е, %s?"
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Расположиви знаци"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Испрати"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr "Грешка во опслужувачот: Не можев да го добијам корисникот!"
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "Погрешно корисничко име или лозинка."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s и пријателите, страница %2$d"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s и пријателите"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-"Доколку сакате %s автоматски да Ви го менува Вашиот статус на Facebook "
-"(прикажувајќи ја најновата забелешка), ќе морате да дадете дозвола."
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr "Во ред, ајде!"
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Прескокни"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "Прелом на страници"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Потоа"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Претходно"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "Ви благодариме што ги поканивте пријателите да користат %s."
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Испратени се покани до следениве корисници:"
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Поканети сте на %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Поканете ги пријателите да користат %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Пријатели што веќе користат %s:"
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Испрати покани"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr "Поставки за обединување со Facebook"
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr "Поврзување на корисник со Facebook Connect"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr "Најава или регистрација со Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr "Нагодувања за поврзување со Facebook"
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-"Приклучокот за Facebook овозможува соединување на примероци на StatusNet со "
-"<a href=\"http://mk-mk.facebook.com/\">Facebook</a> и Facebook Connect."
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr "Веќе сте најавени."
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr "Најавете се со Вашата сметка на Facebook"
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr "Најава со Facebook"
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr "Не можев да го отстранам корисникот на Facebook: веќе е избришан."
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr "Не можев да го отстранам корисниот на Facebook."
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "Почетна"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "Почетна"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Покани"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "Покани"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Нагодувања"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Нагодувања"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-"За да го користите програмчето %s - Facebook ќе мора да сте најавени со "
-"Вашето корисничко име и лозинка. Сè уште немате корисничко име?"
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr " нова сметка."
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "Регистрација"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr "Прекар"
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Најава"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr "Ја загубивте/заборавивте лозинката?"
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr "Нема содржина за забелешката!"
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Ова е предолго. Забелешката може да содржи највеќе %d знаци."
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr "Забелешки"
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr "Facebook"
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr "Поставки за обединување со Facebook"
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr "Неважечки API-клуч за Facebook. Дозволени се највеќе 255 знаци."
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr "Неважечки API-тајна за Facebook. Дозволени се највеќе 255 знаци."
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr "Нагодувања за прог. Facebook"
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr "API-клуч"
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr "API-клучот е обезбеден од Facebook"
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr "Тајна"
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr "API-тајната е обезбедена од Facebook"
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Зачувај"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Зачувај нагодувања за Facebook"
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr "Раководење со начинот на поврзување на Вашата сметка со Facebook"
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr "Нема корисник на Facebook поврзан со оваа сметка."
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr "Поврзан корисник на Facebook"
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr "Исклучи ја мојата сметка од Facebook"
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-"Ако ја исклучите врската со Facebook нема да можете да се најавите! Затоа, "
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr "ставете лозинка"
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr " пред да продолжите."
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Прекини"
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr "Не можев да ја избришам врската до Facebook."
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr "Сега е исклучена врската со Facebook."
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr "Не ми е јасно што сакате да направите."
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
-"Се појави проблем при зачувувањето на Вашите поставки за услогласување!"
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr "Поставките за усогласување се зачувани."
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr "Автоматски заменувај ми го статусот на Facebook со моите забелешки."
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr "Испрати „@“ одговори на Facebook."
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Зачувај"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-"Ако сакате %s автоматски да го заменува Вашиот статус на Facebook со Вашата "
-"најновата забелешка, ќе треба да дадете дозвола."
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Дозволи %s да го менува мојот статус на Facebook"
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr "Услогласи нагодувања"
diff --git a/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po
deleted file mode 100644
index 5a22e47527..0000000000
--- a/plugins/Facebook/locale/nb/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,540 +0,0 @@
-# Translation of StatusNet - Facebook to Norwegian (bokmål)‬ (‪Norsk (bokmål)‬)
-# Exported from translatewiki.net
-#
-# Author: Nghtwlkr
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:44+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:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: no\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr ""
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr ""
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: FBConnectAuth.php:96
-msgid "You can't register if you don't agree to the license."
-msgstr ""
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr ""
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr ""
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Opprett ny konto"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Opprett en ny bruker med dette kallenavnet."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Nytt kallenavn"
-
-#: FBConnectAuth.php:197
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 små bokstaver eller tall, ingen punktum eller mellomrom"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Opprett"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr ""
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr "Eksisterende kallenavn"
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Passord"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-msgctxt "BUTTON"
-msgid "Connect"
-msgstr "Koble til"
-
-#. TRANS: Client error trying to register with registrations not allowed.
-#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "Registrering ikke tillatt."
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "Ikke en gyldig invitasjonskode."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "Kallenavn er ikke tillatt."
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "Kallenavnet er allerede i bruk. Prøv et annet."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr ""
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "Ugyldig brukernavn eller passord."
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Logg inn"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "Send en notis"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "Hva skjer %s?"
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Tilgjengelige tegn"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Send"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr "Tjenerfeil: Kunne ikke hente bruker!"
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "Feil brukernavn eller passord."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s og venner, side %2$d"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s og venner"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr ""
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Hopp over"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "Paginering"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Etter"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Før"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "Takk for at du inviterte vennene dine til å bruke %s."
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Invitasjoner har blitt sendt til følgende brukere:"
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Du har blitt invitert til å %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Inviter vennene dine til å bruke %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr ""
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Send invitasjoner"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr ""
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr ""
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr ""
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr ""
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr "Allerede innlogget."
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr ""
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr ""
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr ""
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr ""
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "Hjem"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "Hjem"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Inviter"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "Inviter"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Innstillinger"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Innstillinger"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr " en ny konto."
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "Registrer"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr "Kallenavn"
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Logg inn"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr "Mistet eller glemt passordet?"
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr ""
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr ""
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr "Facebook"
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr ""
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr ""
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr ""
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr ""
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Lagre"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr ""
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr ""
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr ""
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr ""
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr "angi et passord"
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr " først."
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr ""
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr ""
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr ""
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr "Send «@»-svar til Facebook."
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Lagre"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Tillat %s å oppdatere min Facebook-status"
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr ""
diff --git a/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
deleted file mode 100644
index fda8b1054d..0000000000
--- a/plugins/Facebook/locale/nl/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,578 +0,0 @@
-# Translation of StatusNet - Facebook 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 - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49: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-01-22 19:30:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: nl\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-"Hallo %1$s.\n"
-"\n"
-"Het spijt ons u te moeten meedelen dat het niet mogelijk is uw "
-"Facebookstatus bij te werken vanuit %2$s. De Facebookapplicatie is "
-"uitgeschakeld voor uw gebruiker. Dit kan komen doordat u de toegangsrechten "
-"voor de Facebookapplicatie hebt ingetrokken of omdat u uw Facebookgebruiker "
-"hebt verwijderd. U kunt deze Facebookapplicatie opnieuw inschakelen en "
-"automatisch uw status laten bijwerken door de Facebookapplicatie van %2$s "
-"opnieuw te installeren.\n"
-"\n"
-"\n"
-"Met vriendelijke groet,\n"
-"\n"
-"%2$s"
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr "U moet zijn aangemeld bij Facebook om Facebook Connect te gebruiken."
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr "Er is al een lokale gebruiker verbonden met deze Facebookgebruiker"
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-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."
-
-#: FBConnectAuth.php:96
-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."
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "Er is een onbekende fout opgetreden."
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook 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 "
-"Facebookgebruiker koppelen met uw lokale gebruiker. U kunt een nieuwe "
-"gebruiker aanmaken of koppelen met een bestaande gebruiker als u die al hebt."
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr "Facebookgebruiker instellen"
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "Verbindingsinstellingen"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, 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."
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Nieuwe gebruiker aanmaken"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Nieuwe gebruiker aanmaken met deze gebruikersnaam."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Nieuwe gebruikersnaam"
-
-#: FBConnectAuth.php:197
-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.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Aanmaken"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr "Verbinden met een bestaande gebruiker"
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-"Als u al een gebruiker hebt, meld dan aan met uw gebruikersnaam en "
-"wachtwoord om deze daarna te koppelen met uw Facebookgebruiker."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr "Bestaande gebruikersnaam"
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Wachtwoord"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-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'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "Registratie is niet toegestaan."
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "De uitnodigingscode is ongeldig."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "Gebruikersnaam niet toegestaan."
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr ""
-"De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr "Fout bij het verbinden van de gebruiker met Facebook."
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "Ongeldige gebruikersnaam of wachtwoord."
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Aanmelden"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "Mededeling verzenden"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "Hallo, %s."
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Beschikbare tekens"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Verzenden"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr "Serverfout: de gebruiker kon niet geladen worden."
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "De gebruikersnaam of wachtwoord is onjuist."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s en vrienden, pagina %2$d"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s en vrienden"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-"Als u wilt dat het programma %s automatisch uw Facebookstatus bijwerkt met "
-"uw laatste bericht, dan moet u daarvoor toestemming geven."
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr "Toestemming geven"
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Overslaan"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "Paginering"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Later"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Eerder"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "Dank u wel voor het uitnodigen van uw vrienden om %s te gebruiken."
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Er is een uitnodiging verstuurd naar de volgende gebruikers:"
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "U bent uitgenodigd bij %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Vrienden uitnodigen om %s te gebruiken"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Vrienden die %s al gebruiken:"
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Uitnodigingen verzenden"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr "Instellingen voor Facebookintegratie"
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr "Facebook Connectgebruiker"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr "Aanmelden of registreren via Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr "Instellingen voor Facebook Connect"
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-"Via de de Facebookplug-in is het mogelijk StatusNet-installaties te koppelen "
-"met <a href=\"http://facebook.com/\">Facebook</a> en Facebook Connect."
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr "U bent al aangemeld."
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr "Aanmelden met uw Facebookgebruiker"
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr "Aanmelden via Facebook"
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr ""
-"Het was niet mogelijk om de Facebookgebruiker te verwijderen: gebruiker is "
-"al verwijderd."
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr "Het was niet mogelijk de Facebookgebruiker te verwijderen."
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "Hoofdmenu"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "Hoofdmenu"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Uitnodigen"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "Uitnodigen"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Instellingen"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Instellingen"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-"Om het Facebookprograma %s te gebruiken moet u aanmelden met uw "
-"gebruikersnaam en wachtwoord. Hebt u nog geen gebruiker?"
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr " een nieuwe gebruiker."
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "Registreren"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr "Gebruikersnaam"
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Aanmelden"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr "Wachtwoord kwijt of vergeten?"
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr "Geen berichtinhoud!"
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "De mededeling is te lang. Gebruik maximaal %d tekens."
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr "Mededelingen"
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr "Facebook"
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr "Instellingen voor Facebookkoppeling"
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr "Ongeldige Facebook API-sleutel. De maximale lengte is 255 tekens."
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr "Ongeldig Facebook API-geheim. De maximale lengte is 255 tekens."
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr "Applicatieinstellingen voor Facebook"
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr "API-sleutel"
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr "API-sleutel die door Facebook is uitgeven"
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr "Geheim"
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr "API-geheim dat door Facebook is uitgeven"
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Opslaan"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Facebookinstellingen opslaan"
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr "Beheren hoe uw gebruiker is gekoppeld met Facebook"
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr "Er is geen Facebookgebruiker gekoppeld met deze gebruiker."
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr "Gekoppelde Facebookgebruiker"
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr "Mijn gebruiker loskoppelen van Facebook"
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-"Loskoppelen van uw Facebookgebruiker zou ervoor zorgen dat u niet langer "
-"kunt aanmelden. U moet eerst "
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr "een wachtwoord instellen"
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr " voordat u verder kunt met deze handeling."
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Loskoppelen"
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr "Het was niet mogelijk de verwijzing naar Facebook te verwijderen."
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr "U bent losgekoppeld van Facebook."
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr "Het is niet duidelijk wat u wilt bereiken."
-
-#: facebooksettings.php:61
-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.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr "Uw synchronisatievoorkeuren zijn opgeslagen."
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr "Mijn Facebookstatus automatisch bijwerken met mijn mededelingen."
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr "Antwoorden met \"@\" naar Facebook verzenden."
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Opslaan"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-"Als u wilt dat %s automatisch uw Facebookstatus bijwerkt met uw laatste "
-"mededeling, dat moet u daar toestemming voor geven."
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "%s toestaan mijn Facebookstatus bij te werken"
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr "Synchronisatievooreuren"
diff --git a/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po
deleted file mode 100644
index 6a6dcff9c0..0000000000
--- a/plugins/Facebook/locale/pt_BR/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,544 +0,0 @@
-# Translation of StatusNet - Facebook to Brazilian Portuguese (Português do Brasil)
-# Exported from translatewiki.net
-#
-# Author: Giro720
-# Author: Luckas Blade
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:44+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-22 19:30:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: pt-br\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr ""
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr ""
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: FBConnectAuth.php:96
-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."
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "Ocorreu um erro desconhecido."
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "Opções de conexão"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Criar nova conta"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Criar um novo usuário com este apelido."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Novo apelido"
-
-#: FBConnectAuth.php:197
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Criar"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr ""
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr ""
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Senha"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-msgctxt "BUTTON"
-msgid "Connect"
-msgstr "Conectar"
-
-#. TRANS: Client error trying to register with registrations not allowed.
-#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "Não é permitido o registro."
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "O código de convite é inválido."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "Apelido não permitido."
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "Este apelido já está em uso. Tente outro."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr "Erro ao conectar o usuário ao Facebook."
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr ""
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Entrar"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr ""
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr ""
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Caracteres disponíveis"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Enviar"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr ""
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "Nome de usuário e/ou senha incorreto(s)."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s e amigos, pág. %2$d"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s e amigos"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-"Se você deseja que o %s aplicativo atualize automaticamente seu estado no "
-"Facebook com seus último anúncio, você deve autorizá-lo para isso."
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr ""
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Avançar"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "Paginação"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Depois"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Antes"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "Obrigado por convidar seus amigos a usar %s"
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr ""
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Você foi convidado para %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Convidar seus amigos a usar %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Amigos já usando %s:"
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Enviar convites"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr ""
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr ""
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr "Entrar ou se registrar usando o Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr ""
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr "Já está autenticado."
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr ""
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr ""
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr ""
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr ""
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr ""
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr ""
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Convidar"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "Convidar"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Configurações"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Configurações"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr ""
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "Registrar-se"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr "Apelido"
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Entrar"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr "Perdeu ou esqueceu sua senha?"
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr ""
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr ""
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr ""
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr ""
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr ""
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr ""
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Salvar"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Salvar configurações do Facebook"
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr ""
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr ""
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr "Desconectar minha conta do Facebook"
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr ""
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr ""
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Desconectar"
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr ""
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr ""
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr ""
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Salvar"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr ""
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr ""
diff --git a/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po
deleted file mode 100644
index aa791f367f..0000000000
--- a/plugins/Facebook/locale/tl/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,583 +0,0 @@
-# Translation of StatusNet - Facebook to Tagalog (Tagalog)
-# Exported from translatewiki.net
-#
-# Author: AnakngAraw
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:44+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:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: tl\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-"Kumusta, %1$s. May pagpapaumanhin naming ipinababatid sa iyo na hindi namin "
-"naisapanahon ang iyong katayuan ng Facebook mula %2$s, at hindi namin "
-"pinagana ang aplikasyon ng Facebook para sa iyong akawnt.  Maaaring dahil "
-"ito sa inalis mo ang pahintulot sa aplikasyon ng Facebook, o pagbura ng "
-"iyong akawnt sa Facebook.  Maaari mong muling buhayin ang aplikasyon ng "
-"Facebook at kusang pagsasapanahon ng kalagayan sa pamamagitan ng muling "
-"pagtatalaga ng aplikasyon ng Facebook na %2$s.\n"
-"\n"
-"Nagpapahalaga,\n"
-"\n"
-"%2$s"
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr "Dapat na nakalagda ka sa Facebook upang magamit ang Ugnay sa Facebook."
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr ""
-"Mayroon nang isang katutubong tagagamit na nakakawing sa ganitong akawnt ng "
-"Facebook."
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-msgid "There was a problem with your session token. Try again, please."
-msgstr "May isang suliranin sa iyong token ng sesyon. Paki subukan uli."
-
-#: FBConnectAuth.php:96
-msgid "You can't register if you don't agree to the license."
-msgstr "Hindi ka makapagpapatala kung hindi ka sumasang-ayon sa lisensiya."
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "Isang hindi nalalamang kamalian ang naganap."
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-"Ito ang iyong unang pagkakataong lumagda sa %s kaya't kailangan naming "
-"iugnay ang iyong Facebook sa isang katutubong akawnt.  Maaari kang lumikha "
-"ng isang bagong akawnt, o umugnay sa pamamagitan ng iyong umiiral na akawnt, "
-"kung mayroon ka."
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr "Pagtatakda ng Akawnt ng Facebook"
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "Mga pagpipilian na pang-ugnay"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-"Ang aking teksto at mga talaksan ay makukuha sa ilalim ng %s maliban sa "
-"pribadong dato na ito: hudyat, tirahan ng e-liham, tirahan ng IM, at bilang "
-"na pangtelepono."
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Lumikha ng bagong akawnt"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Lumikha ng isang bagong tagagamit na may ganitong palayaw."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Bagong palayaw"
-
-#: FBConnectAuth.php:197
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-"1 hanggang 64 na maliliit na mga titik o mga bilang, walang bantas o mga "
-"patlang"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Likhain"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr "Umugnay sa umiiral na akawnt"
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-"Kung mayroon ka nang akawnt, lumagda sa pamamagitan ng iyong pangalan ng "
-"tagagamit at hudyat upang iugnay ito sa iyong Facebook."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr "Umiiral na palayaw"
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Hudyat"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-msgctxt "BUTTON"
-msgid "Connect"
-msgstr "Umugnay"
-
-#. TRANS: Client error trying to register with registrations not allowed.
-#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "Hindi pinapahintulutan ang pagpapatala."
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "Hindi isang tanggap na kodigo ng paanyaya."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "Hindi pinapahintulutan ang palayaw."
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "Ginagamit na ang palayaw. Subukan ang iba."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr "May kamalian sa pag-ugnay ng tagagamit sa Facebook."
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "Hindi tanggap na pangalan ng tagagamit o hudyat."
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Lumagda"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "Magpadala ng pabatid"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "Anong balita, %s?"
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Makukuhang mga panitik"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Ipadala"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr "Kamalian ng tapaghain: Hindi makuha ang tagagamit!"
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "Hindi tamang pangalan ng tagagamit o hudyat."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s at mga kaibigan, pahina %2$d"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s at mga kaibigan"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-"Kung nais mong kusang isapanahon ng aplikasyong %s ang iyong katayuan ng "
-"Facebook na may pinakabagong pabatid, kailangan mong bigyan ito ng "
-"pahintulot."
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr "Sige, gawin iyan!"
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Lagtawan"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "Pagbilang ng pahina"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Pagkalipas ng"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Bago ang"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "Salamat sa pag-anyaya sa iyong mga kaibigan na gamitin ang %s."
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Ipinadala na ang mga paanyaya sa sumusunod ng mga tagagamit:"
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Inaanyayahan ka sa %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Anyayahan ang iyong mga kaibigan na gamitin ang %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Mga kaibigang gumagamit na ng %s:"
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Ipadala ang mga paanyaya"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr "Pagkakaayos ng integrasyon ng Facebook"
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr "Tagagamit ng Ugnay sa Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr "Lumagda o magpatalang ginagamit ang Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr "Mga Pagtatakda sa Ugnay sa Facebook"
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-"Ang pamasak na Facebook ay nagpapahintulot ng integrasyon ng mga pagkakataon "
-"sa StatusNet sa pamamagitan ng <a href=\"http://facebook.com/\">Facebook</a> "
-"at Ugnay sa Facebook."
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr "Nakalagda na."
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr "Lumagda sa pamamagitan ng iyong Akawnt sa Facebook"
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr "Paglagda sa Facebook"
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr ""
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr "Hindi matanggal ang tagagamit ng Facebook."
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "Tahanan"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "Tahanan"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Anyayahan"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "Anyayahan"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Mga pagtatakda"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Mga pagtatakda"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-"Upang magamit ang Aplikasyon ng Facebook na %s kailangan mong lumagda sa "
-"pamamagitan ng iyong pangalan ng tagagamit at hudyat.  Wala ka pa bang "
-"bansag?"
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr "isang bagong akawnt."
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "Magpatala"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr "Palayaw"
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Lumagda"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr "Hudyat na nawala o nakalimutan?"
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr "Walang laman ang pabatid!"
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-"Napakahaba niyan. Ang pinakamataas na sukat ng pabatid ay %d mga panitik."
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr "Mga pabatid"
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr "Facebook"
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr "Mga pagtatakda sa integrasyon ng Facebook"
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr ""
-"Hindi tanggap na susi sa API ng Facebook. Ang pinakamataas na haba ay 255 "
-"mga panitik."
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-"Hindi tanggap na lihim sa API ng Facebook. Ang pinakamataas na haba ay 255 "
-"mga panitik."
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr "Mga pagtatakda sa aplikasyon ng Facebook"
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr "Susi ng API"
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr "Ang susi ng API ay ibinigay ng Facebook"
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr "Lihim"
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr "Ang lihim ng API ay ibinigay ng Facebook"
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Sagipin"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Sagipin ang mga katakdaan ng Facebook"
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr "Pamahalaan kung paano umuugnay ang iyong akawnt sa Facebook"
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr "Walang tagagamit ng Facebook na nakaugnay sa akawnt na ito."
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr "Nakaugnay na tagagamit ng Facebook"
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr "Huwag iugnay ang aking akawnt mula sa Facebook"
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-"Ang pagtatanggal ng ugnay sa Facebook ay magsasanhi ng hindi mangyayaring "
-"paglagda! Paki "
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr "magtakda ng isang hudyat"
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr "muna."
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Huwag umugnay"
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr "Hindi maalis ang pagkabit sa Facebook."
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr "Hindi ka na nakaugnay sa Facebook."
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr "Hindi sigurado kung ano ang sinusubok mong gawin."
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr "May isang suliranin sa pagsagip ng iyong mga nais sa pagsabay!"
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr "Nasagip ang mga nais sa pagsabay."
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-"Kusang isapanahon ang aking katayuan ng Facebook na may mga pabatid ko."
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr "Ipadala ang mga tugong \"@\" sa Facebook."
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Sagipin"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-"Kung nais mong kusang isapanahon ng %s ang iyong katayuan ng Facebook na may "
-"pinakabagong mga pabatid mo, kailangan mo itong bigyan ng pahintulot."
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Pahintulutan si %s na isapanahon ang aking katayuan ng Facebook"
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr "Mga nais sa pagsabay"
diff --git a/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po
deleted file mode 100644
index 2bbe18f092..0000000000
--- a/plugins/Facebook/locale/uk/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,573 +0,0 @@
-# Translation of StatusNet - Facebook 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 - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:44+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:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: uk\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\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"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-"Вітаємо, %1$s. Нам дуже прикро про це повідомляти, але ми не в змозі "
-"оновлювати ваш статус у Facebook з %2$s і відключаємо додаток Facebook для "
-"вашого акаунту. Таке могло статися тому, що ви, можливо, скасували "
-"авторизацію для додатку Facebook або видалили ваш акаунт Facebook. Ви маєте "
-"можливість перезапустити додаток для Facebook і автоматичний імпорт ваших "
-"статусів з %2$s до Facebook буде поновлено.\n"
-"\n"
-"З повагою,\n"
-"\n"
-"%2$s"
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr "Ви повинні увійти до Facebook або використати Facebook Connect."
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr ""
-"На даному сайті вже є користувач, котрий підключив цей акаунт Facebook."
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-msgid "There was a problem with your session token. Try again, please."
-msgstr "Виникли певні проблеми з токеном сесії. Спробуйте знов, будь ласка."
-
-#: FBConnectAuth.php:96
-msgid "You can't register if you don't agree to the license."
-msgstr "Ви не зможете зареєструватись, якщо не погодитесь з умовами ліцензії."
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "Виникла якась незрозуміла помилка."
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-"Ви вперше увійшли до сайту %s, отже ми мусимо приєднати ваш акаунт Facebook "
-"до акаунту на даному сайті. Ви маєте можливість створити новий акаунт або "
-"використати такий, що вже існує."
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr "Налаштування акаунту Facebook"
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "Опції з’єднання"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, 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, телефонний номер."
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "Створити новий акаунт"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "Створити нового користувача з цим нікнеймом."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "Новий нікнейм"
-
-#: FBConnectAuth.php:197
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-"1-64 літери нижнього регістру і цифри, ніякої пунктуації або інтервалів"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Створити"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr "Приєднати акаунт, який вже існує"
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-"Якщо ви вже маєте акаунт, увійдіть з вашим ім’ям користувача та паролем, аби "
-"приєднати їх до Facebook."
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr "Нікнейм, який вже існує"
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Пароль"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-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'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "Реєстрацію не дозволено."
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "Це не дійсний код запрошення."
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "Нікнейм не допускається."
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "Цей нікнейм вже використовується. Спробуйте інший."
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr "Помилка при підключенні до Facebook."
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "Невірне ім’я або пароль."
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Увійти"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "Надіслати допис"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "Що нового, %s?"
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "Лишилось знаків"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Так"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr "Помилка сервера: не вдалося отримати користувача!"
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "Неточне ім’я або пароль."
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s з друзями, сторінка %2$d"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s з друзями"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-"Якщо ви бажаєте, щоб додаток %s автоматично оновлював ваш статус у Facebook "
-"останнім повідомленням, ви повинні надати дозвіл."
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr "Так, зробіть це!"
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Проскочити"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "Нумерація сторінок"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Вперед"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Назад"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "Дякуємо, що запросили своїх друзів на %s."
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "Запрошення було надіслано таким користувачам:"
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "Вас було запрошено до %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "Запросіть своїх друзів до %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr "Деякі друзі вже користуються %s:"
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "Розсилка запрошень"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr "Налаштування інтеграції з Facebook"
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr "Facebook Connect"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr "Увійти або зареєструватись з Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr "Налаштування Facebook Connect"
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-"Додаток Facebook дозволяє інтегрувати StatusNet-сумісні сервіси з <a href="
-"\"http://facebook.com/\">Facebook</a> та Facebook Connect."
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr "Тепер ви увійшли."
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr "Увійти з акаунтом Facebook"
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr "Вхід Facebook"
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr "Не вдалося видалити користувача Facebook: вже видалений."
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr "Не вдалося видалити користувача Facebook."
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "Дім"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "Дім"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Запросити"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "Запросити"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Налаштування"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Налаштування"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-"Щоб використовувати додаток %s для Facebook, ви мусите увійти, "
-"використовуючи своє ім’я користувача та пароль. Ще не маєте імені "
-"користувача?"
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr " новий акаунт."
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "Зареєструвати"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr "Нікнейм"
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Увійти"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr "Загубили або забули пароль?"
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr "Повідомлення порожнє!"
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Надто довго. Максимальний розмір допису — %d знаків."
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr "Дописи"
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr "Facebook"
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr "Налаштування інтеграції з Facebook"
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr ""
-"Помилковий ключ Facebook API. Максимальна довжина ключа — 255 символів."
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-"Помилковий секретний код Facebook API. Максимальна довжина — 255 символів."
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr "Налаштування додатку для Facebook"
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr "API-ключ"
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr "API-ключ, що був наданий Facebook"
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr "Секретний код"
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr "Секретний код API, що був наданий Facebook"
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Зберегти"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Зберегти налаштування Facebook"
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr "Зазначте, яким чином ваш акаунт буде під’єднано до Facebook"
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr "Наразі жоден користувач Facebook не під’єднаний до цього акаунту."
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr "Під’єднаний користувач Facebook"
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr "Від’єднати мій акаунт від Facebook"
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-"Якщо ви від’єднаєте свій Facebook, то це унеможливить вхід до системи у "
-"майбутньому! Будь ласка, "
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr "встановіть пароль"
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr " спочатку."
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Від’єднати"
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr "Не можу видалити посилання на Facebook."
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr "Ви від’єдналися від Facebook."
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr "Хто зна, що ви намагаєтеся зробити."
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr "Виникла проблема при збереженні параметрів синхронізації!"
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr "Параметри синхронізації збережено."
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr "Автоматично оновлювати статус у Facebook моїми дописами."
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr "Надсилати «@» відповіді до Facebook."
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Зберегти"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-"Якщо ви бажаєте, щоб додаток %s автоматично оновлював ваш статус у Facebook "
-"останнім повідомленням, ви повинні надати дозвіл."
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "Дозволити додатку %s оновлювати мій статус у Facebook"
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr "Параметри синхронізації"
diff --git a/plugins/Facebook/locale/vi/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/vi/LC_MESSAGES/Facebook.po
deleted file mode 100644
index 15c861e90e..0000000000
--- a/plugins/Facebook/locale/vi/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,540 +0,0 @@
-# Translation of StatusNet - Facebook to Vietnamese (Tiếng Việt)
-# Expored from translatewiki.net
-#
-# Author: Minh Nguyen
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:07+0000\n"
-"Language-Team: Vietnamese <http://translatewiki.net/wiki/Portal:vi>\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-01-10 18:26:00+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: vi\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr ""
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr ""
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-msgid "There was a problem with your session token. Try again, please."
-msgstr ""
-
-#: FBConnectAuth.php:96
-msgid "You can't register if you don't agree to the license."
-msgstr ""
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr ""
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr "Thiết lập Tài khoản Facebook"
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr ""
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, php-format
-msgid ""
-"My text and files are available under %s except this private data: password, "
-"email address, IM address, and phone number."
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr ""
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr ""
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr ""
-
-#: FBConnectAuth.php:197
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "Tạo"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr ""
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr ""
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr ""
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "Mật khẩu"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-msgctxt "BUTTON"
-msgid "Connect"
-msgstr "Kết nối"
-
-#. TRANS: Client error trying to register with registrations not allowed.
-#. TRANS: Client error trying to register with registrations 'invite only'.
-#: FBConnectAuth.php:237 FBConnectAuth.php:247
-msgid "Registration not allowed."
-msgstr ""
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:255
-msgid "Not a valid invitation code."
-msgstr ""
-
-#: FBConnectAuth.php:267
-msgid "Nickname not allowed."
-msgstr ""
-
-#: FBConnectAuth.php:272
-msgid "Nickname already in use. Try another one."
-msgstr ""
-
-#: FBConnectAuth.php:290 FBConnectAuth.php:324 FBConnectAuth.php:344
-msgid "Error connecting user to Facebook."
-msgstr ""
-
-#: FBConnectAuth.php:310
-msgid "Invalid username or password."
-msgstr ""
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "Đăng nhập"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr ""
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr ""
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr ""
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "Gửi"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr ""
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr ""
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr ""
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s và bạn bè"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr ""
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "Bỏ qua"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr ""
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "Sau"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "Trước"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr ""
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr ""
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr ""
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr ""
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr ""
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr ""
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr ""
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr "Người dùng Kết nối Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr ""
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr "Thiết lập Kết nối Facebook"
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr ""
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr ""
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr "Đăng nhập vào Facebook"
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr ""
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr ""
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "Trang chủ"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "Trang chủ"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr ""
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr ""
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "Thiết lập"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "Thiết lập"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr ""
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr "Đăng ký"
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr ""
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr "Đăng nhập"
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr ""
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr ""
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr ""
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr "Facebook"
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr ""
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr "Thiết lập ứng dụng Facebook"
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr ""
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr ""
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr "Lưu"
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr "Lưu các thiết lập Facebook"
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr ""
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr ""
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr "Người dùng Facebook kết nối"
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr ""
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr ""
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr ""
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr "Ngắt kết nối"
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr ""
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr ""
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr ""
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Lưu"
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr ""
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr ""
diff --git a/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po b/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po
deleted file mode 100644
index 7bb44631be..0000000000
--- a/plugins/Facebook/locale/zh_CN/LC_MESSAGES/Facebook.po
+++ /dev/null
@@ -1,556 +0,0 @@
-# Translation of StatusNet - Facebook to Simplified Chinese (‪中文(简体)‬)
-# Exported from translatewiki.net
-#
-# Author: Chenxiaoqino
-# Author: Hydra
-# Author: ZhengYiFeng
-# --
-# This file is distributed under the same license as the StatusNet package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: StatusNet - Facebook\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:44+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-22 19:30:29+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-Language-Code: zh-hans\n"
-"X-Message-Group: #out-statusnet-plugin-facebook\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: facebookutil.php:429
-#, php-format
-msgid ""
-"Hi, %1$s. We're sorry to inform you that we are unable to update your "
-"Facebook status from %2$s, and have disabled the Facebook application for "
-"your account. This may be because you have removed the Facebook "
-"application's authorization, or have deleted your Facebook account.  You can "
-"re-enable the Facebook application and automatic status updating by re-"
-"installing the %2$s Facebook application.\n"
-"\n"
-"Regards,\n"
-"\n"
-"%2$s"
-msgstr ""
-"你好，%1$s。我们很抱歉的通知你我们无法从%2$s更新你的Facebook状态，并已禁用你"
-"帐户的Facebook应用。这可能是因为你取消了Facebook应用的授权，或者你删除了你的"
-"Facebook帐户。通过重新安装Facebook应用你可以重新启用你的Facebook应用的自动状"
-"态更新。\n"
-"\n"
-"祝好，\n"
-"\n"
-"%2$s"
-
-#: FBConnectAuth.php:55
-msgid "You must be logged into Facebook to use Facebook Connect."
-msgstr "你必须使用Facebook Connect来登入Facebook帐号。"
-
-#: FBConnectAuth.php:79
-msgid "There is already a local user linked with this Facebook account."
-msgstr "这里已经有一个用户连接了此Facebook帐号。"
-
-#: FBConnectAuth.php:91 FBConnectSettings.php:166
-msgid "There was a problem with your session token. Try again, please."
-msgstr "你的session token出错了。请重试。"
-
-#: FBConnectAuth.php:96
-msgid "You can't register if you don't agree to the license."
-msgstr "你必须同意许可协议才能注册。"
-
-#: FBConnectAuth.php:106
-msgid "An unknown error has occured."
-msgstr "发生未知错误。"
-
-#. TRANS: %s is the site name.
-#: FBConnectAuth.php:121
-#, php-format
-msgid ""
-"This is the first time you've logged into %s so we must connect your "
-"Facebook to a local account. You can either create a new account, or connect "
-"with your existing account, if you have one."
-msgstr ""
-" 这是你第一次登录到 %s，我们需要将你的Facebook帐号与一个本地的帐号关联。你可"
-"以新建一个帐号，或者使用你在本站已有的帐号。"
-
-#. TRANS: Page title.
-#: FBConnectAuth.php:128
-msgid "Facebook Account Setup"
-msgstr "Facebook帐号设置"
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:162
-msgid "Connection options"
-msgstr "连接选项"
-
-#. TRANS: %s is the name of the license used by the user for their status updates.
-#: FBConnectAuth.php:172
-#, 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 地址和电"
-"话号码。"
-
-#. TRANS: Legend.
-#: FBConnectAuth.php:189
-msgid "Create new account"
-msgstr "创建新帐户"
-
-#: FBConnectAuth.php:191
-msgid "Create a new user with this nickname."
-msgstr "以此昵称创建新帐户"
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:195
-msgid "New nickname"
-msgstr "新昵称"
-
-#: FBConnectAuth.php:197
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1 到 64 个小写字母或数字，不包含标点或空格"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:201
-msgctxt "BUTTON"
-msgid "Create"
-msgstr "创建"
-
-#: FBConnectAuth.php:207
-msgid "Connect existing account"
-msgstr "连接现有帐号"
-
-#: FBConnectAuth.php:209
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your Facebook."
-msgstr "如果你已有帐号，请输入用户名和密码登录并连接至Facebook。"
-
-#. TRANS: Field label.
-#: FBConnectAuth.php:213
-msgid "Existing nickname"
-msgstr "已存在的昵称"
-
-#: FBConnectAuth.php:216 facebookaction.php:277
-msgid "Password"
-msgstr "密码"
-
-#. TRANS: Submit button.
-#: FBConnectAuth.php:220
-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'.
-#: FBConnectAuth.php:241 FBConnectAuth.php:251
-msgid "Registration not allowed."
-msgstr "不允许注册。"
-
-#. TRANS: Client error trying to register with an invalid invitation code.
-#: FBConnectAuth.php:259
-msgid "Not a valid invitation code."
-msgstr "对不起，无效的邀请码。"
-
-#: FBConnectAuth.php:271
-msgid "Nickname not allowed."
-msgstr "昵称不被允许。"
-
-#: FBConnectAuth.php:276
-msgid "Nickname already in use. Try another one."
-msgstr "昵称已被使用，换一个吧。"
-
-#: FBConnectAuth.php:294 FBConnectAuth.php:330 FBConnectAuth.php:350
-msgid "Error connecting user to Facebook."
-msgstr "连接用户至Facebook时发生错误。"
-
-#: FBConnectAuth.php:316
-msgid "Invalid username or password."
-msgstr "用户名或密码不正确。"
-
-#. TRANS: Page title.
-#: facebooklogin.php:90 facebookaction.php:255
-msgid "Login"
-msgstr "登录"
-
-#. TRANS: Legend.
-#: facebooknoticeform.php:144
-msgid "Send a notice"
-msgstr "发送一个通知"
-
-#. TRANS: Field label.
-#: facebooknoticeform.php:157
-#, php-format
-msgid "What's up, %s?"
-msgstr "%s，最近怎么样？"
-
-#: facebooknoticeform.php:169
-msgid "Available characters"
-msgstr "可用的字符"
-
-#. TRANS: Button text.
-#: facebooknoticeform.php:196
-msgctxt "BUTTON"
-msgid "Send"
-msgstr "发送"
-
-#: facebookhome.php:103
-msgid "Server error: Couldn't get user!"
-msgstr "服务器错误：无法获取用户。"
-
-#: facebookhome.php:122
-msgid "Incorrect username or password."
-msgstr "用户名或密码不正确。"
-
-#. TRANS: Page title.
-#. TRANS: %1$s is a user nickname, %2$s is a page number.
-#: facebookhome.php:153
-#, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%1$s 和页 %2$d 的朋友"
-
-#. TRANS: Page title.
-#. TRANS: %s is a user nickname
-#: facebookhome.php:157
-#, php-format
-msgid "%s and friends"
-msgstr "%s 和好友们"
-
-#. TRANS: Instructions. %s is the application name.
-#: facebookhome.php:185
-#, php-format
-msgid ""
-"If you would like the %s app to automatically update your Facebook status "
-"with your latest notice, you need to give it permission."
-msgstr ""
-"如果你希望 %s 应用自动更新你最新的状态到Facebook状态上，你需要给它设置权限。"
-
-#: facebookhome.php:210
-msgid "Okay, do it!"
-msgstr "好的！"
-
-#. TRANS: Button text. Clicking the button will skip updating Facebook permissions.
-#: facebookhome.php:217
-msgctxt "BUTTON"
-msgid "Skip"
-msgstr "跳过"
-
-#: facebookhome.php:244 facebookaction.php:336
-msgid "Pagination"
-msgstr "分页"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:254 facebookaction.php:345
-msgid "After"
-msgstr "之后"
-
-#. TRANS: Pagination link.
-#: facebookhome.php:263 facebookaction.php:353
-msgid "Before"
-msgstr "之前"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:69
-#, php-format
-msgid "Thanks for inviting your friends to use %s."
-msgstr "谢谢你邀请你的朋友们来使用 %s。"
-
-#. TRANS: Followed by an unordered list with invited friends.
-#: facebookinvite.php:72
-msgid "Invitations have been sent to the following users:"
-msgstr "邀请已发给一些的用户："
-
-#: facebookinvite.php:91
-#, php-format
-msgid "You have been invited to %s"
-msgstr "你被邀请来到 %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:101
-#, php-format
-msgid "Invite your friends to use %s"
-msgstr "邀请你的朋友们来使用 %s"
-
-#. TRANS: %s is the name of the site.
-#: facebookinvite.php:124
-#, php-format
-msgid "Friends already using %s:"
-msgstr "已经使用 %s 的好友们："
-
-#. TRANS: Page title.
-#: facebookinvite.php:143
-msgid "Send invitations"
-msgstr "发送邀请"
-
-#. TRANS: Menu item.
-#. TRANS: Menu item tab.
-#: FacebookPlugin.php:188 FacebookPlugin.php:461 FacebookPlugin.php:485
-msgctxt "MENU"
-msgid "Facebook"
-msgstr "Facebook"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:190
-msgid "Facebook integration configuration"
-msgstr "Facebook整合设置"
-
-#: FacebookPlugin.php:431
-msgid "Facebook Connect User"
-msgstr "Facebook Connect 用户"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#: FacebookPlugin.php:463
-msgid "Login or register using Facebook"
-msgstr "使用 Facebook 登陆或注册"
-
-#. TRANS: Tooltip for menu item "Facebook".
-#. TRANS: Page title.
-#: FacebookPlugin.php:487 FBConnectSettings.php:55
-msgid "Facebook Connect Settings"
-msgstr "Facebook Connect 设置"
-
-#: FacebookPlugin.php:591
-msgid ""
-"The Facebook plugin allows integrating StatusNet instances with <a href="
-"\"http://facebook.com/\">Facebook</a> and Facebook Connect."
-msgstr ""
-
-#: FBConnectLogin.php:33
-msgid "Already logged in."
-msgstr "已登录。"
-
-#. TRANS: Instructions.
-#: FBConnectLogin.php:42
-msgid "Login with your Facebook Account"
-msgstr "使用你的 Facebook 帐号登录"
-
-#. TRANS: Page title.
-#: FBConnectLogin.php:57
-msgid "Facebook Login"
-msgstr ""
-
-#: facebookremove.php:53
-msgid "Couldn't remove Facebook user: already deleted."
-msgstr ""
-
-#: facebookremove.php:63
-msgid "Couldn't remove Facebook user."
-msgstr ""
-
-#. TRANS: Link description for 'Home' link that leads to a start page.
-#: facebookaction.php:169
-msgctxt "MENU"
-msgid "Home"
-msgstr "首页"
-
-#. TRANS: Tooltip for 'Home' link that leads to a start page.
-#: facebookaction.php:171
-msgid "Home"
-msgstr "首页"
-
-#. TRANS: Link description for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:180
-msgctxt "MENU"
-msgid "Invite"
-msgstr "邀请"
-
-#. TRANS: Tooltip for 'Invite' link that leads to a page where friends can be invited.
-#: facebookaction.php:182
-msgid "Invite"
-msgstr "邀请"
-
-#. TRANS: Link description for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:192
-msgctxt "MENU"
-msgid "Settings"
-msgstr "设置"
-
-#. TRANS: Tooltip for 'Settings' link that leads to a page user preferences can be set.
-#: facebookaction.php:194
-msgid "Settings"
-msgstr "设置"
-
-#: facebookaction.php:233
-#, php-format
-msgid ""
-"To use the %s Facebook Application you need to login with your username and "
-"password. Don't have a username yet?"
-msgstr ""
-
-#: facebookaction.php:235
-msgid " a new account."
-msgstr ""
-
-#: facebookaction.php:242
-msgid "Register"
-msgstr ""
-
-#: facebookaction.php:274
-msgid "Nickname"
-msgstr ""
-
-#. TRANS: Login button.
-#: facebookaction.php:282
-msgctxt "BUTTON"
-msgid "Login"
-msgstr ""
-
-#: facebookaction.php:288
-msgid "Lost or forgotten password?"
-msgstr ""
-
-#: facebookaction.php:370
-msgid "No notice content!"
-msgstr ""
-
-#: facebookaction.php:377
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-
-#: facebookaction.php:431
-msgid "Notices"
-msgstr ""
-
-#: facebookadminpanel.php:52
-msgid "Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:62
-msgid "Facebook integration settings"
-msgstr ""
-
-#: facebookadminpanel.php:123
-msgid "Invalid Facebook API key. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:129
-msgid "Invalid Facebook API secret. Max length is 255 characters."
-msgstr ""
-
-#: facebookadminpanel.php:178
-msgid "Facebook application settings"
-msgstr ""
-
-#: facebookadminpanel.php:184
-msgid "API key"
-msgstr ""
-
-#: facebookadminpanel.php:185
-msgid "API key provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:193
-msgid "Secret"
-msgstr ""
-
-#: facebookadminpanel.php:194
-msgid "API secret provided by Facebook"
-msgstr ""
-
-#: facebookadminpanel.php:210
-msgid "Save"
-msgstr ""
-
-#: facebookadminpanel.php:210
-msgid "Save Facebook settings"
-msgstr ""
-
-#. TRANS: Instructions.
-#: FBConnectSettings.php:66
-msgid "Manage how your account connects to Facebook"
-msgstr ""
-
-#: FBConnectSettings.php:90
-msgid "There is no Facebook user connected to this account."
-msgstr ""
-
-#: FBConnectSettings.php:98
-msgid "Connected Facebook user"
-msgstr ""
-
-#. TRANS: Legend.
-#: FBConnectSettings.php:118
-msgid "Disconnect my account from Facebook"
-msgstr ""
-
-#. TRANS: Followed by a link containing text "set a password".
-#: FBConnectSettings.php:125
-msgid ""
-"Disconnecting your Faceboook would make it impossible to log in! Please "
-msgstr ""
-
-#. TRANS: Preceded by "Please " and followed by " first."
-#: FBConnectSettings.php:130
-msgid "set a password"
-msgstr ""
-
-#. TRANS: Preceded by "Please set a password".
-#: FBConnectSettings.php:132
-msgid " first."
-msgstr ""
-
-#. TRANS: Submit button.
-#: FBConnectSettings.php:145
-msgctxt "BUTTON"
-msgid "Disconnect"
-msgstr ""
-
-#: FBConnectSettings.php:180
-msgid "Couldn't delete link to Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:196
-msgid "You have disconnected from Facebook."
-msgstr ""
-
-#: FBConnectSettings.php:199
-msgid "Not sure what you're trying to do."
-msgstr ""
-
-#: facebooksettings.php:61
-msgid "There was a problem saving your sync preferences!"
-msgstr ""
-
-#. TRANS: Confirmation that synchronisation settings have been saved into the system.
-#: facebooksettings.php:64
-msgid "Sync preferences saved."
-msgstr ""
-
-#: facebooksettings.php:87
-msgid "Automatically update my Facebook status with my notices."
-msgstr ""
-
-#: facebooksettings.php:94
-msgid "Send \"@\" replies to Facebook."
-msgstr ""
-
-#. TRANS: Submit button to save synchronisation settings.
-#: facebooksettings.php:102
-msgctxt "BUTTON"
-msgid "Save"
-msgstr ""
-
-#. TRANS: %s is the application name.
-#: facebooksettings.php:111
-#, php-format
-msgid ""
-"If you would like %s to automatically update your Facebook status with your "
-"latest notice, you need to give it permission."
-msgstr ""
-
-#: facebooksettings.php:124
-#, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr ""
-
-#. TRANS: Page title for synchronisation settings.
-#: facebooksettings.php:134
-msgid "Sync preferences"
-msgstr ""

From e029eef9c26bc35f0452e657b1f58dd531de7509 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 31 Jan 2011 18:57:19 -0800
Subject: [PATCH 164/314] API - Return integers instead of strings for group
 IDs and DM sender/recipients in JSON output

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

diff --git a/lib/apiaction.php b/lib/apiaction.php
index dcce18ef27..0b539bb397 100644
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -412,7 +412,7 @@ class ApiAction extends Action
     {
         $twitter_group = array();
 
-        $twitter_group['id'] = $group->id;
+        $twitter_group['id'] = intval($group->id);
         $twitter_group['url'] = $group->permalink();
         $twitter_group['nickname'] = $group->nickname;
         $twitter_group['fullname'] = $group->fullname;
@@ -561,7 +561,7 @@ class ApiAction extends Action
 
         $details['notifications_enabled'] = $notifications;
         $details['blocking'] = $source->hasBlocked($target);
-        $details['id'] = $source->id;
+        $details['id'] = intval($source->id);
 
         return $details;
     }
@@ -945,10 +945,10 @@ class ApiAction extends Action
         $from_profile = $message->getFrom();
         $to_profile = $message->getTo();
 
-        $dmsg['id'] = $message->id;
-        $dmsg['sender_id'] = $message->from_profile;
+        $dmsg['id'] = intval($message->id);
+        $dmsg['sender_id'] = intval($from_profile);
         $dmsg['text'] = trim($message->content);
-        $dmsg['recipient_id'] = $message->to_profile;
+        $dmsg['recipient_id'] = intval($to_profile);
         $dmsg['created_at'] = $this->dateTwitter($message->created);
         $dmsg['sender_screen_name'] = $from_profile->nickname;
         $dmsg['recipient_screen_name'] = $to_profile->nickname;

From b595c3f0d5781c96c4976005ac40fddb9ae63131 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 31 Jan 2011 18:57:19 -0800
Subject: [PATCH 165/314] API - Return integers instead of strings for group
 IDs and DM sender/recipients in JSON output

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

diff --git a/lib/apiaction.php b/lib/apiaction.php
index dcce18ef27..0b539bb397 100644
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -412,7 +412,7 @@ class ApiAction extends Action
     {
         $twitter_group = array();
 
-        $twitter_group['id'] = $group->id;
+        $twitter_group['id'] = intval($group->id);
         $twitter_group['url'] = $group->permalink();
         $twitter_group['nickname'] = $group->nickname;
         $twitter_group['fullname'] = $group->fullname;
@@ -561,7 +561,7 @@ class ApiAction extends Action
 
         $details['notifications_enabled'] = $notifications;
         $details['blocking'] = $source->hasBlocked($target);
-        $details['id'] = $source->id;
+        $details['id'] = intval($source->id);
 
         return $details;
     }
@@ -945,10 +945,10 @@ class ApiAction extends Action
         $from_profile = $message->getFrom();
         $to_profile = $message->getTo();
 
-        $dmsg['id'] = $message->id;
-        $dmsg['sender_id'] = $message->from_profile;
+        $dmsg['id'] = intval($message->id);
+        $dmsg['sender_id'] = intval($from_profile);
         $dmsg['text'] = trim($message->content);
-        $dmsg['recipient_id'] = $message->to_profile;
+        $dmsg['recipient_id'] = intval($to_profile);
         $dmsg['created_at'] = $this->dateTwitter($message->created);
         $dmsg['sender_screen_name'] = $from_profile->nickname;
         $dmsg['recipient_screen_name'] = $to_profile->nickname;

From 7977454456fd65b31859089a14bfca0d4a453138 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 1 Feb 2011 14:35:42 -0800
Subject: [PATCH 166/314] Ticket #3022: fix formatting output for
 ApiAction::clientError and ApiAction::serverError when caller doesn't
 explicitly pass the format. Format's already available as a member variable,
 so use it!

Fixes some error reponses in api/statusnet/groups/leave.json which were coming through as XML.
May fix some others as well.
---
 lib/apiaction.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/apiaction.php b/lib/apiaction.php
index dcce18ef27..6caf468bf2 100644
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -1236,9 +1236,12 @@ class ApiAction extends Action
         return;
     }
 
-    function clientError($msg, $code = 400, $format = 'xml')
+    function clientError($msg, $code = 400, $format = null)
     {
         $action = $this->trimmed('action');
+        if ($format === null) {
+            $format = $this->format;
+        }
 
         common_debug("User error '$code' on '$action': $msg", __FILE__);
 
@@ -1278,9 +1281,12 @@ class ApiAction extends Action
         }
     }
 
-    function serverError($msg, $code = 500, $content_type = 'xml')
+    function serverError($msg, $code = 500, $content_type = null)
     {
         $action = $this->trimmed('action');
+        if ($content_type === null) {
+            $content_type = $this->format;
+        }
 
         common_debug("Server error '$code' on '$action': $msg", __FILE__);
 

From 7a97243abfb64838b2108124b91e72a43b08bf3b Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 2 Feb 2011 16:23:24 -0800
Subject: [PATCH 167/314] ExtendedProfile plugin initial checkin: stub mockup
 page

---
 .../ExtendedProfile/ExtendedProfilePlugin.php |  98 ++++++++++++++
 plugins/ExtendedProfile/extendedprofile.php   | 120 ++++++++++++++++++
 .../ExtendedProfile/extendedprofilewidget.php |  72 +++++++++++
 plugins/ExtendedProfile/profiledetail.css     |  22 ++++
 .../ExtendedProfile/profiledetailaction.php   |  71 +++++++++++
 .../profiledetailsettingsaction.php           |  63 +++++++++
 6 files changed, 446 insertions(+)
 create mode 100644 plugins/ExtendedProfile/ExtendedProfilePlugin.php
 create mode 100644 plugins/ExtendedProfile/extendedprofile.php
 create mode 100644 plugins/ExtendedProfile/extendedprofilewidget.php
 create mode 100644 plugins/ExtendedProfile/profiledetail.css
 create mode 100644 plugins/ExtendedProfile/profiledetailaction.php
 create mode 100644 plugins/ExtendedProfile/profiledetailsettingsaction.php

diff --git a/plugins/ExtendedProfile/ExtendedProfilePlugin.php b/plugins/ExtendedProfile/ExtendedProfilePlugin.php
new file mode 100644
index 0000000000..36c8eaa232
--- /dev/null
+++ b/plugins/ExtendedProfile/ExtendedProfilePlugin.php
@@ -0,0 +1,98 @@
+<?php
+/*
+ * 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);
+}
+
+/**
+ * Extra profile bio-like fields
+ *
+ * @package ExtendedProfilePlugin
+ * @maintainer Brion Vibber <brion@status.net>
+ */
+class ExtendedProfilePlugin extends Plugin
+{
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'ExtendedProfile',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Brion Vibber',
+                            'homepage' => 'http://status.net/wiki/Plugin:ExtendedProfile',
+                            'rawdescription' =>
+                            _m('UI extensions for additional profile fields.'));
+
+        return true;
+    }
+
+    /**
+     * Autoloader
+     *
+     * Loads our classes if they're requested.
+     *
+     * @param string $cls Class requested
+     *
+     * @return boolean hook return
+     */
+    function onAutoload($cls)
+    {
+        $lower = strtolower($cls);
+        switch ($lower)
+        {
+        case 'extendedprofile':
+        case 'extendedprofilewidget':
+        case 'profiledetailaction':
+        case 'profiledetailsettingsaction':
+            require_once dirname(__FILE__) . '/' . $lower . '.php';
+            return false;
+        default:
+            return true;
+        }
+    }
+
+    /**
+     * Add paths to the router table
+     *
+     * Hook for RouterInitialized event.
+     *
+     * @param Net_URL_Mapper $m URL mapper
+     *
+     * @return boolean hook return
+     */
+    function onStartInitializeRouter($m)
+    {
+        $m->connect(':nickname/detail',
+                array('action' => 'profiledetail'),
+                array('nickname' => Nickname::DISPLAY_FMT));
+        $m->connect('settings/profile/detail',
+                array('action' => 'profiledetailsettings'));
+
+        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;
+    }
+}
diff --git a/plugins/ExtendedProfile/extendedprofile.php b/plugins/ExtendedProfile/extendedprofile.php
new file mode 100644
index 0000000000..18fef20331
--- /dev/null
+++ b/plugins/ExtendedProfile/extendedprofile.php
@@ -0,0 +1,120 @@
+<?php
+/*
+ * 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);
+}
+
+class ExtendedProfile
+{
+    function getSections()
+    {
+        return array(
+            'basic' => array(
+                'label' => _m('Personal'),
+                'fields' => array(
+                    'fullname' => array(
+                        'label' => _m('Full name'),
+                        'profile' => 'fullname',
+                        'vcard' => 'fn',
+                    ),
+                    'title' => array(
+                        'label' => _m('Title'),
+                        'vcard' => 'title',
+                    ),
+                    'manager' => array(
+                        'label' => _m('Manager'),
+                        'type' => 'person',
+                        'vcard' => 'x-manager',
+                    ),
+                    'location' => array(
+                        'label' => _m('Location'),
+                        'profile' => 'location'
+                    ),
+                    'bio' => array(
+                        'label' => _m('Bio'),
+                        'type' => 'textarea',
+                        'profile' => 'bio',
+                    ),
+                    'tags' => array(
+                        'label' => _m('Tags'),
+                        'type' => 'tags',
+                        'profile' => 'tags',
+                    ),
+                ),
+            ),
+            'contact' => array(
+                'label' => _m('Contact'),
+                'fields' => array(
+                    'phone' => array(
+                        'label' => _m('Phone'),
+                        'type' => 'phone',
+                        'multi' => true,
+                        'vcard' => 'tel',
+                    ),
+                    'im' => array(
+                        'label' => _m('IM'),
+                        'type' => 'im',
+                        'multi' => true,
+                    ),
+                    'website' => array(
+                        'label' => _m('Websites'),
+                        'type' => 'website',
+                        'multi' => true,
+                    ),
+                ),
+            ),
+            'personal' => array(
+                'label' => _m('Personal'),
+                'fields' => array(
+                    'birthday' => array(
+                        'label' => _m('Birthday'),
+                        'type' => 'date',
+                        'vcard' => 'bday',
+                    ),
+                    'spouse' => array(
+                        'label' => _m('Spouse\'s name'),
+                        'vcard' => 'x-spouse',
+                    ),
+                    'kids' => array(
+                        'label' => _m('Kids\' names')
+                    ),
+                ),
+            ),
+            'experience' => array(
+                'label' => _m('Work experience'),
+                'fields' => array(
+                    'experience' => array(
+                        'type' => 'experience',
+                        'label' => _m('Employer'),
+                    ),
+                ),
+            ),
+            'education' => array(
+                'label' => _m('Education'),
+                'fields' => array(
+                    'education' => array(
+                        'type' => 'education',
+                        'label' => _m('Institution'),
+                    ),
+                ),
+            ),
+        );
+    }
+}
diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
new file mode 100644
index 0000000000..2ec99b1992
--- /dev/null
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -0,0 +1,72 @@
+<?php
+/*
+ * 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);
+}
+
+class ExtendedProfileWidget extends Widget
+{
+    const EDITABLE=true;
+
+    protected $profile;
+    protected $ext;
+
+    public function __construct(XMLOutputter $out=null, Profile $profile=null, $editable=false)
+    {
+        parent::__construct($out);
+
+        $this->profile = $profile;
+        $this->ext = new ExtendedProfile($this->profile);
+
+        $this->editable = $editable;
+    }
+
+    public function show()
+    {
+        $sections = $this->ext->getSections();
+        foreach ($sections as $name => $section) {
+            $this->showExtendedProfileSection($name, $section);
+        }
+    }
+
+    protected function showExtendedProfileSection($name, $section)
+    {
+        $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);
+        }
+        $this->out->elementEnd('table');
+    }
+
+    protected function showExtendedProfileField($name, $field)
+    {
+        $this->out->elementStart('tr');
+
+        $this->out->element('th', null, $field['label']);
+
+        $this->out->elementStart('td');
+        // @fixme field value
+        $this->out->text($name);
+        $this->out->elementEnd('td');
+
+        $this->out->elementEnd('tr');
+    }
+}
diff --git a/plugins/ExtendedProfile/profiledetail.css b/plugins/ExtendedProfile/profiledetail.css
new file mode 100644
index 0000000000..836b647a10
--- /dev/null
+++ b/plugins/ExtendedProfile/profiledetail.css
@@ -0,0 +1,22 @@
+/* Note the #content is only needed to override weird crap in default styles */
+
+#content table.extended-profile {
+    width: 100%;
+    border-collapse: separate;
+    border-spacing: 8px;
+}
+#content table.extended-profile th {
+    color: #777;
+    background-color: #eee;
+    width: 150px;
+
+    padding-top: 0; /* override bizarre theme defaults */
+
+    text-align: right;
+    padding-right: 8px;
+}
+#content table.extended-profile td {
+    padding: 0; /* override bizarre theme defaults */
+
+    padding-left: 8px;
+}
\ No newline at end of file
diff --git a/plugins/ExtendedProfile/profiledetailaction.php b/plugins/ExtendedProfile/profiledetailaction.php
new file mode 100644
index 0000000000..8c907eec2a
--- /dev/null
+++ b/plugins/ExtendedProfile/profiledetailaction.php
@@ -0,0 +1,71 @@
+<?php
+/*
+ * 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);
+}
+
+class ProfileDetailAction extends ProfileAction
+{
+    function isReadOnly($args)
+    {
+        return true;
+    }
+
+    function title()
+    {
+        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();
+        if ($cur && $cur->id == $this->profile->id) { // your own page
+            $this->elementStart('div', 'entity_actions');
+            $this->elementStart('li', 'entity_edit');
+            $this->element('a', array('href' => common_local_url('profiledetailsettings'),
+                                      // TRANS: Link title for link on user profile.
+                                      'title' => _m('Edit extended profile settings')),
+                           // TRANS: Link text for link on user profile.
+                           _m('Edit'));
+            $this->elementEnd('li');
+            $this->elementEnd('div');
+        }
+
+        $widget = new ExtendedProfileWidget($this, $this->profile, ExtendedProfileWidget::EDITABLE);
+        $widget->show();
+    }
+}
diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/profiledetailsettingsaction.php
new file mode 100644
index 0000000000..77d755c0b0
--- /dev/null
+++ b/plugins/ExtendedProfile/profiledetailsettingsaction.php
@@ -0,0 +1,63 @@
+<?php
+/*
+ * 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);
+}
+
+class ProfileDetailSettingsAction extends AccountSettingsAction
+{
+
+    function title()
+    {
+        return _m('Extended profile settings');
+    }
+
+    /**
+     * Instructions for use
+     *
+     * @return instructions for use
+     */
+    function getInstructions()
+    {
+        // TRANS: Usage instructions for profile settings.
+        return _('You can update your personal profile info here '.
+                 'so people know more about you.');
+    }
+
+    function showStylesheets() {
+        parent::showStylesheets();
+        $this->cssLink('plugins/ExtendedProfile/profiledetail.css');
+        return true;
+    }
+
+    function handle($args)
+    {
+        $this->showPage();
+    }
+
+    function showContent()
+    {
+        $cur = common_current_user();
+        $profile = $cur->getProfile();
+
+        $widget = new ExtendedProfileWidget($this, $profile, ExtendedProfileWidget::EDITABLE);
+        $widget->show();
+    }
+}

From 308e615a3f8deb5e053b2e2c7a1f81f8af4b5a8d Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Thu, 3 Feb 2011 01:31:31 +0100
Subject: [PATCH 168/314] Localisation updates from http://translatewiki.net.

---
 locale/ar/LC_MESSAGES/statusnet.po            | 570 +++++++++-------
 locale/arz/LC_MESSAGES/statusnet.po           | 570 +++++++++-------
 locale/bg/LC_MESSAGES/statusnet.po            | 580 ++++++++++-------
 locale/br/LC_MESSAGES/statusnet.po            | 574 ++++++++++-------
 locale/ca/LC_MESSAGES/statusnet.po            | 607 ++++++++++-------
 locale/cs/LC_MESSAGES/statusnet.po            | 584 ++++++++++-------
 locale/de/LC_MESSAGES/statusnet.po            | 584 ++++++++++-------
 locale/en_GB/LC_MESSAGES/statusnet.po         | 584 ++++++++++-------
 locale/eo/LC_MESSAGES/statusnet.po            | 608 +++++++++++-------
 locale/es/LC_MESSAGES/statusnet.po            | 584 ++++++++++-------
 locale/fa/LC_MESSAGES/statusnet.po            | 584 ++++++++++-------
 locale/fi/LC_MESSAGES/statusnet.po            | 580 ++++++++++-------
 locale/fr/LC_MESSAGES/statusnet.po            | 584 ++++++++++-------
 locale/gl/LC_MESSAGES/statusnet.po            | 584 ++++++++++-------
 locale/hsb/LC_MESSAGES/statusnet.po           | 592 ++++++++++-------
 locale/hu/LC_MESSAGES/statusnet.po            | 582 ++++++++++-------
 locale/ia/LC_MESSAGES/statusnet.po            | 601 ++++++++++-------
 locale/is/LC_MESSAGES/statusnet.po            | 580 ++++++++++-------
 locale/it/LC_MESSAGES/statusnet.po            | 584 ++++++++++-------
 locale/ja/LC_MESSAGES/statusnet.po            | 584 ++++++++++-------
 locale/ka/LC_MESSAGES/statusnet.po            | 584 ++++++++++-------
 locale/ko/LC_MESSAGES/statusnet.po            | 580 ++++++++++-------
 locale/mk/LC_MESSAGES/statusnet.po            | 601 ++++++++++-------
 locale/ml/LC_MESSAGES/statusnet.po            | 587 ++++++++++-------
 locale/nb/LC_MESSAGES/statusnet.po            | 584 ++++++++++-------
 locale/nl/LC_MESSAGES/statusnet.po            | 603 ++++++++++-------
 locale/nn/LC_MESSAGES/statusnet.po            | 580 ++++++++++-------
 locale/pl/LC_MESSAGES/statusnet.po            | 584 ++++++++++-------
 locale/pt/LC_MESSAGES/statusnet.po            | 584 ++++++++++-------
 locale/pt_BR/LC_MESSAGES/statusnet.po         | 584 ++++++++++-------
 locale/ru/LC_MESSAGES/statusnet.po            | 584 ++++++++++-------
 locale/statusnet.pot                          | 553 +++++++++-------
 locale/sv/LC_MESSAGES/statusnet.po            | 584 ++++++++++-------
 locale/te/LC_MESSAGES/statusnet.po            | 573 ++++++++++-------
 locale/tr/LC_MESSAGES/statusnet.po            | 579 ++++++++++-------
 locale/uk/LC_MESSAGES/statusnet.po            | 584 ++++++++++-------
 locale/zh_CN/LC_MESSAGES/statusnet.po         | 584 ++++++++++-------
 .../locale/ca/LC_MESSAGES/GroupFavorited.po   |  55 ++
 .../locale/te/LC_MESSAGES/Mapstraction.po     |  14 +-
 .../locale/bg/LC_MESSAGES/MobileProfile.po    |  12 +-
 .../locale/br/LC_MESSAGES/MobileProfile.po    |  12 +-
 .../locale/ce/LC_MESSAGES/MobileProfile.po    |  12 +-
 .../locale/fr/LC_MESSAGES/MobileProfile.po    |  12 +-
 .../locale/gl/LC_MESSAGES/MobileProfile.po    |  12 +-
 .../locale/ia/LC_MESSAGES/MobileProfile.po    |  12 +-
 .../locale/mk/LC_MESSAGES/MobileProfile.po    |  12 +-
 .../locale/nb/LC_MESSAGES/MobileProfile.po    |  12 +-
 .../locale/nl/LC_MESSAGES/MobileProfile.po    |  12 +-
 .../locale/ru/LC_MESSAGES/MobileProfile.po    |  12 +-
 .../locale/ta/LC_MESSAGES/MobileProfile.po    |  12 +-
 .../locale/te/LC_MESSAGES/MobileProfile.po    |  12 +-
 .../locale/tl/LC_MESSAGES/MobileProfile.po    |  12 +-
 .../locale/uk/LC_MESSAGES/MobileProfile.po    |  12 +-
 .../locale/zh_CN/LC_MESSAGES/MobileProfile.po |  12 +-
 .../NewMenu/locale/te/LC_MESSAGES/NewMenu.po  |  98 +++
 plugins/OStatus/locale/OStatus.pot            |  27 +-
 .../OStatus/locale/fr/LC_MESSAGES/OStatus.po  |  35 +-
 .../OStatus/locale/ia/LC_MESSAGES/OStatus.po  |  35 +-
 .../OStatus/locale/mk/LC_MESSAGES/OStatus.po  |  35 +-
 .../OStatus/locale/nl/LC_MESSAGES/OStatus.po  |  35 +-
 .../OStatus/locale/uk/LC_MESSAGES/OStatus.po  |  35 +-
 .../OpenID/locale/ca/LC_MESSAGES/OpenID.po    |  63 +-
 62 files changed, 13445 insertions(+), 8779 deletions(-)
 create mode 100644 plugins/GroupFavorited/locale/ca/LC_MESSAGES/GroupFavorited.po
 create mode 100644 plugins/NewMenu/locale/te/LC_MESSAGES/NewMenu.po

diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index acc2a41ee3..a93de4874e 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:00+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:33:45+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 (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -81,7 +81,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -133,6 +133,9 @@ msgstr "لا صفحة كهذه."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -150,7 +153,7 @@ msgstr "لا صفحة كهذه."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -318,8 +321,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -339,13 +342,15 @@ msgstr "تعذّر تحديث المستخدم."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -384,11 +389,12 @@ msgstr[5] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -398,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "تعذّر تحديث تصميمك."
 
@@ -412,7 +418,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -822,9 +828,9 @@ msgstr "لا تملك تصريحًا."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -854,7 +860,7 @@ msgstr "خطأ في قاعدة البيانات أثناء حذف مستخدم 
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -862,7 +868,7 @@ 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:335
+#: 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
@@ -928,7 +934,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1274,6 +1280,13 @@ msgstr "لم يُعثرعلى المستخدم."
 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
@@ -1312,6 +1325,13 @@ msgstr "أضف إلى المفضلات"
 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
@@ -1360,7 +1380,17 @@ msgstr "تعذّر حذف المفضلة."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1373,12 +1403,12 @@ msgstr "تعذّر حذف المفضلة."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1420,6 +1450,13 @@ msgstr "لست مُشتركًا بأي أحد."
 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."
@@ -1452,12 +1489,15 @@ msgstr "لا مرفق كهذا."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "لا اسم مستعار."
 
@@ -1489,7 +1529,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "المستخدم بدون ملف مطابق."
@@ -1498,7 +1538,7 @@ msgstr "المستخدم بدون ملف مطابق."
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "إعدادات الأفتار"
 
@@ -1507,7 +1547,7 @@ msgstr "إعدادات الأفتار"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "الأصل"
 
@@ -1516,7 +1556,7 @@ msgstr "الأصل"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "معاينة"
 
@@ -1555,7 +1595,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr ""
 
@@ -1620,7 +1660,8 @@ msgstr "لقد منعتَ هذا المستخدم مسبقًا."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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 "امنع المستخدم"
 
@@ -1642,7 +1683,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "لا"
@@ -1660,7 +1701,7 @@ msgstr "لا تمنع هذا المستخدم"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "نعم"
@@ -1871,7 +1912,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:118
-#: lib/action.php:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1964,12 +2005,13 @@ 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.
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2126,13 +2168,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "الخلفية"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2349,14 +2391,15 @@ 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:70 actions/newgroup.php:65
+#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 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:107 actions/grouplogo.php:112
+#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "يجب أن تكون إداريا لتعدل المجموعة."
 
@@ -2414,7 +2457,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2441,7 +2484,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2554,7 +2597,7 @@ 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 IM 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
@@ -2570,7 +2613,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2740,64 +2783,79 @@ msgstr "لا مرفقات."
 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 "لم أتوقع هذا الرد!"
 
-#: actions/finishremotesubscribe.php:80
+#. 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 "المستخدم الذي تستمع إليه غير موجود."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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 "تستطيع استخدام الاشتراك المحلي!"
 
-#: actions/finishremotesubscribe.php:99
+#. 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 "لقد منعك المستخدم."
 
-#: actions/finishremotesubscribe.php:110
+#. 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 "لا تملك تصريحًا."
 
-#: actions/finishremotesubscribe.php:113
+#. 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 ""
 
-#: actions/finishremotesubscribe.php:118
+#. 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 ""
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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 "خطأ أثناء تحديث الملف الشخصي البعيد."
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "لا ملف كهذا."
 
-#: actions/getfile.php:83
+#. TRANS: Client error displayed when requesting a file without having read access to it.
+#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "تعذّرت قراءة الملف."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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 ""
 
-#: actions/grantrole.php:75
+#. 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 "لا يمكنك سحب أدوار المستخدمين على هذا الموقع."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2807,38 +2865,48 @@ msgstr "لدى المستخدم هذا الدور من قبل."
 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 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:76 actions/groupunblock.php:77
+#: 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 "لا ملف شخصي بهذه الهوية."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "لا مجموعة مُحدّدة."
 
-#: actions/groupblock.php:91
+#. 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 ""
 
-#: actions/groupblock.php:95
+#. 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 "المستخدم ليس ممنوعًا من المجموعة."
 
-#: actions/groupblock.php:100
+#. 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 "المستخدم ليس عضوًا في المجموعة."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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 "امنع المستخدم من المجموعة"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2847,169 +2915,192 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "امنع هذا المستخدم من هذه المجموعة"
 
-#: actions/groupblock.php:206
+#. 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 "خطأ في قاعدة البيانات أثناء منع المستخدم من المجموعة."
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "لا هوية."
 
-#: actions/groupdesignsettings.php:68
+#. 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 "يجب أن تلج لتُعدّل المجموعات."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "تصميم المجموعة"
 
-#: actions/groupdesignsettings.php:155
+#. 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 "
 "palette of your choice."
 msgstr "خصّص أسلوب عرض ملفك بصورة خلفية ومخطط ألوان من اختيارك."
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 msgid "Design preferences saved."
 msgstr "حُفظت تفضيلات التصميم."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: 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:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "ارفع"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 #, fuzzy
 msgid "Crop"
 msgstr "مجموعات"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "حُدّث الشعار."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s أعضاء المجموعة, الصفحة %2$d"
 
-#: actions/groupmembers.php:122
+#. TRANS: Page notice for group members page.
+#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "قائمة بمستخدمي هذه المجموعة."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "إداري"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "امنع"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "امنع هذا المستخدم"
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "اجعله إداريًا"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: actions/grouprss.php:141
 #, fuzzy, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "الإشعارات التي فضلها %1$s في %2$s!"
 
-#. TRANS: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "مجموعات"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "المجموعات، صفحة %d"
 
-#: actions/groups.php:90
-#, php-format
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 "تتيح لك مجموعات %%%%site.name%%%% إيجاد أشخاص ذوي اهتمامات مشتركة والتحدث "
 "معهم. تستطيع إرسال رسائل إلى جميع أعضاء المجموعة الآخرين بعد الانضمام إليها "
 "عبر الصياغة \"!اسم_المجموعة\". ألا ترى مجموعة تعجبك؟ جرّب [البحث عن مجموعة](%%"
 "%%action.groupsearch%%%%) أو [ابدأ مجموعتك!](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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 "أنشئ مجموعة جديدة"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -3018,23 +3109,29 @@ msgstr ""
 "ابحث عن مجموعات على %%site.name%% بدلالة الاسم أو الموقع أو الوصف. افصل "
 "عبارات البحث بمسافات؛ ويجب أن تتكون تلك العبارات من 3 أحرف أو أكثر."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "بحث في المجموعات"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "لا نتائج."
 
-#: actions/groupsearch.php:82
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3042,21 +3139,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "خطأ أثناء منع الحجب."
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "إعدادات المراسلة الفورية"
@@ -3067,108 +3164,111 @@ msgstr "إعدادات المراسلة الفورية"
 #: actions/imsettings.php:71
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "المراسلة الفورية غير متوفرة."
 
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "عنوان جابر أو محادثة غوغل المعتمد حاليًا."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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 GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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 IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "تفضيلات المحادثة الفورية"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
 #, fuzzy
-msgid "Send me notices through Jabber/GTalk."
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "أرسل لي إشعارات بالاشتراكات الجديدة عبر البريد الإلكتروني."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr ""
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgid ""
+"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
 msgstr ""
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/GTalk address."
+msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "انشر هوية مصغّرة لعنوان بريدي الإلكتروني."
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "حُفِظت التفضيلات."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. TRANS: Message given saving Instant Messaging address without having provided one.
 #: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "لا هوية جابر."
 
-#. TRANS: Message given saving IM address that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
 #, fuzzy
-msgid "Cannot normalize that Jabber ID"
+msgid "Cannot normalize that Jabber ID."
 msgstr "ليست هوية جابر صالحة"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "ليست هوية جابر صالحة"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "هذا البريد الإلكتروني ملك مستخدم آخر بالفعل."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3176,74 +3276,79 @@ msgid ""
 "s for sending messages to you."
 msgstr ""
 
-#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "هذا عنوان محادثة فورية خاطئ."
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 #, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "تعذّر حذف تأكيد البريد المراسلة الفورية."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "أُلغي تأكيد المراسلة الفورية."
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging address that is not
 #. TRANS: registered for the active user.
 #: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "هذه ليست هويتك في جابر."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 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:40
+#: 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:44
+#: 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:77
+#: 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:116
+#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "أُرسلت الدعوة"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "دعوة مستخدمين جدد"
 
@@ -3251,7 +3356,7 @@ 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:139
+#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3264,7 +3369,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3273,7 +3378,7 @@ 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:153
+#: 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:"
@@ -3287,7 +3392,7 @@ 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:167
+#: actions/invite.php:168
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] ""
@@ -3299,40 +3404,40 @@ msgstr[5] ""
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:177
+#: 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:190
+#: 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:217
+#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "عناوين البريد الإلكتروني"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: actions/invite.php:225
 msgid "Personal message"
 msgstr "رسالة شخصية"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:227
+#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "أرسل"
@@ -3340,7 +3445,7 @@ 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:263
+#: actions/invite.php:264
 #, fuzzy, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s يستمع الآن إلى إشعاراتك على %2$s."
@@ -3350,7 +3455,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5192,7 +5297,7 @@ msgid "Application profile"
 msgstr "معلومات التطبيق"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "أيقونة"
 
@@ -6494,7 +6599,7 @@ msgid "Plugins"
 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:898
 msgid "Version"
 msgstr "النسخة"
 
@@ -6629,7 +6734,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6896,216 +7001,216 @@ msgid "Other"
 msgstr "أخرى"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "صفحة غير مُعنونة"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 #, fuzzy
 msgid "Primary site navigation"
 msgstr "ضبط الموقع الأساسي"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 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:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "الصفحة الشخصية"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "الحساب"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: 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:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "اتصل"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: 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:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "إداري"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: lib/action.php:573
 #, 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:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "ادعُ"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: 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:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "اخرج"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "سجّل"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "لُج"
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: lib/action.php:602
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "ساعدني!"
 
 #. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "مساعدة"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: 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:620 lib/adminpanelaction.php:387
+#: 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:687
+#: lib/action.php:700
 msgid "Local views"
 msgstr "المشاهدات المحلية"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:757
+#: lib/action.php:770
 msgid "Page notice"
 msgstr "إشعار الصفحة"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:858
+#: lib/action.php:871
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "ضبط الموقع الأساسي"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "مساعدة"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "عن"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "الأسئلة المكررة"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "الشروط"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "خصوصية"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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:902
 msgid "Contact"
 msgstr "اتصل"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "الجسر"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "رخصة برنامج StatusNet"
 
@@ -7113,7 +7218,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:928
+#: lib/action.php:941
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7123,7 +7228,7 @@ msgstr ""
 "broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -7132,7 +7237,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7144,51 +7249,51 @@ msgstr ""
 "agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 #, 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "قبل"
 
@@ -7236,6 +7341,13 @@ msgstr ""
 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."
@@ -7442,7 +7554,7 @@ msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "أيقونة لهذا التطبيق"
 
@@ -8087,12 +8199,12 @@ 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "ارفع ملفًا"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr "تستطيع رفع صورتك الشخصية. أقصى حجم للملف هو 2 م.ب."
@@ -8866,11 +8978,11 @@ msgstr "أرسل إشعارًا"
 msgid "What's up, %s?"
 msgstr "ما الأخبار يا %s؟"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "أرفق"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "أرفق ملفًا"
 
@@ -9063,6 +9175,13 @@ msgstr "هوية المستخدم"
 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:98
+msgid "Groups"
+msgstr "مجموعات"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9507,6 +9626,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "Personal"
-#~ msgstr "شخصية"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index 952b5a7399..60379142b5 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:04+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:33:49+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 (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -83,7 +83,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -136,6 +136,9 @@ msgstr "لا وسم كهذا."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -153,7 +156,7 @@ msgstr "لا وسم كهذا."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -321,8 +324,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -342,13 +345,15 @@ msgstr "تعذّر تحديث المستخدم."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -387,11 +392,12 @@ msgstr[5] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 #, fuzzy
@@ -402,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "تعذّر تحديث تصميمك."
 
@@ -416,7 +422,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -832,9 +838,9 @@ msgstr "لا تملك تصريحًا."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -864,7 +870,7 @@ msgstr "خطأ قاعده البيانات أثناء إدخال المستخد
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -872,7 +878,7 @@ 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:335
+#: 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
@@ -939,7 +945,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1290,6 +1296,13 @@ msgstr "الـ API method مش موجوده."
 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
@@ -1328,6 +1341,13 @@ msgstr "أضف إلى المفضلات"
 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
@@ -1376,7 +1396,17 @@ msgstr "تعذّر حذف المفضله."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1389,12 +1419,12 @@ msgstr "تعذّر حذف المفضله."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1436,6 +1466,13 @@ msgstr "لست مُشتركًا بأى أحد."
 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."
@@ -1468,12 +1505,15 @@ msgstr "لا مرفق كهذا."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "لا اسم مستعار."
 
@@ -1505,7 +1545,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "يوزر من-غير پروفايل زيّه."
@@ -1514,7 +1554,7 @@ msgstr "يوزر من-غير پروفايل زيّه."
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "إعدادات الأفتار"
 
@@ -1523,7 +1563,7 @@ msgstr "إعدادات الأفتار"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "الأصلي"
 
@@ -1532,7 +1572,7 @@ msgstr "الأصلي"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "عاين"
 
@@ -1572,7 +1612,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr ""
 
@@ -1637,7 +1677,8 @@ msgstr "لقد منعت مسبقا هذا المستخدم."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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 "امنع المستخدم"
 
@@ -1657,7 +1698,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "ملاحظة"
@@ -1675,7 +1716,7 @@ msgstr "لا تمنع هذا المستخدم"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1889,7 +1930,7 @@ 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:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1984,12 +2025,13 @@ 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.
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2147,13 +2189,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "الخلفية"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, fuzzy, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2372,14 +2414,15 @@ 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:70 actions/newgroup.php:65
+#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 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:107 actions/grouplogo.php:112
+#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "لازم تكون ادارى علشان تعدّل الجروپ."
 
@@ -2437,7 +2480,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2464,7 +2507,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2582,7 +2625,7 @@ 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 IM 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
@@ -2598,7 +2641,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2770,68 +2813,83 @@ msgstr "لا مرفقات."
 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 "لم أتوقع هذا الرد!"
 
-#: actions/finishremotesubscribe.php:80
+#. 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 "المستخدم الذى تستمع إليه غير موجود."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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 "تعذّر حفظ الاشتراك."
 
-#: actions/finishremotesubscribe.php:99
+#. 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 "لقد منعك المستخدم."
 
-#: actions/finishremotesubscribe.php:110
+#. 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 "لا تملك تصريحًا."
 
-#: actions/finishremotesubscribe.php:113
+#. 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 ""
 
-#: actions/finishremotesubscribe.php:118
+#. 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 ""
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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 "خطأ أثناء تحديث الملف الشخصى البعيد"
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "لا ملف كهذا."
 
-#: actions/getfile.php:83
+#. TRANS: Client error displayed when requesting a file without having read access to it.
+#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "تعذّرت قراءه الملف."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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 ""
 
-#: actions/grantrole.php:75
+#. 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 "لا يمكنك إسكات المستخدمين على هذا الموقع."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2841,38 +2899,48 @@ msgstr "المستخدم مسكت من قبل."
 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 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:76 actions/groupunblock.php:77
+#: 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 "لا ملف شخصى بهذه الهويه."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "لا مجموعه مُحدّده."
 
-#: actions/groupblock.php:91
+#. 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 ""
 
-#: actions/groupblock.php:95
+#. 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 "المستخدم ليس ممنوعًا من المجموعه."
 
-#: actions/groupblock.php:100
+#. 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 "المستخدم ليس عضوًا فى المجموعه."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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 "امنع المستخدم من المجموعة"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2881,189 +2949,218 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "امنع هذا المستخدم من هذه المجموعة"
 
-#: actions/groupblock.php:206
+#. 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 "خطأ فى قاعده البيانات أثناء منع المستخدم من المجموعه."
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "لا هويه."
 
-#: actions/groupdesignsettings.php:68
+#. 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 "يجب أن تلج لتُعدّل المجموعات."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "تصميم المجموعة"
 
-#: actions/groupdesignsettings.php:155
+#. 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 ""
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 #, fuzzy
 msgid "Design preferences saved."
 msgstr "حُفِظت التفضيلات."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: 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:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "ارفع"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 #, fuzzy
 msgid "Crop"
 msgstr "مجموعات"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "حُدّث الشعار."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s اعضاء الجروپ, صفحه %2$d"
 
-#: actions/groupmembers.php:122
+#. TRANS: Page notice for group members page.
+#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "قائمه بمستخدمى هذه المجموعه."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "إداري"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr ""
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr ""
 
-#. TRANS: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "مجموعات"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "المجموعات، صفحه %d"
 
-#: actions/groups.php:90
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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 "أنشئ مجموعه جديدة"
 
-#: actions/groupsearch.php:52
+#. 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. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "بحث فى المجموعات"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "لا نتائج."
 
-#: actions/groupsearch.php:82
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3071,21 +3168,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "خطأ أثناء منع الحجب."
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "تظبيطات بعت الرسايل الفوريه"
@@ -3096,108 +3193,111 @@ msgstr "تظبيطات بعت الرسايل الفوريه"
 #: actions/imsettings.php:71
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "المراسله الفوريه غير متوفره."
 
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
 #, fuzzy
-msgid "Current confirmed Jabber/GTalk address."
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "عنوان البريد الإلكترونى المُؤكد الحالى."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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 GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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 IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "حُفِظت التفضيلات."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
 #, fuzzy
-msgid "Send me notices through Jabber/GTalk."
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "أرسل لى إشعارات بالاشتراكات الجديده عبر البريد الإلكترونى."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr ""
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgid ""
+"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
 msgstr ""
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/Google Talk address."
+msgstr "هذا ليس عنوان بريدك الإلكترونى."
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "حُفِظت التفضيلات."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. TRANS: Message given saving Instant Messaging address without having provided one.
 #: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "لا هويه جابر."
 
-#. TRANS: Message given saving IM address that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
 #, fuzzy
-msgid "Cannot normalize that Jabber ID"
+msgid "Cannot normalize that Jabber ID."
 msgstr "ليست هويه جابر صالحة"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "ليست هويه جابر صالحة"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "هذا البريد الإلكترونى ملك مستخدم آخر بالفعل."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3205,76 +3305,81 @@ msgid ""
 "s for sending messages to you."
 msgstr ""
 
-#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "هذا عنوان محادثه فوريه خاطئ."
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 #, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "تعذّر حذف تأكيد البريد الإلكترونى."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "لا رمز تأكيد."
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging address that is not
 #. TRANS: registered for the active user.
 #: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "هذه ليست هويتك فى جابر."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 #, 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 ""
 
-#: actions/inbox.php:62
+#. 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:115
 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:40
+#: 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:44
+#: 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:77
+#: 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:116
+#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "أُرسلت الدعوة"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "دعوه مستخدمين جدد"
 
@@ -3282,7 +3387,7 @@ 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:139
+#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3295,7 +3400,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3304,7 +3409,7 @@ 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:153
+#: 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:"
@@ -3318,7 +3423,7 @@ 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:167
+#: actions/invite.php:168
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] ""
@@ -3330,40 +3435,40 @@ msgstr[5] ""
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:177
+#: 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:190
+#: 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:217
+#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "عناوين البريد الإلكتروني"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: actions/invite.php:225
 msgid "Personal message"
 msgstr "رساله شخصية"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:227
+#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:231
+#: actions/invite.php:232
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Send"
@@ -3372,7 +3477,7 @@ 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:263
+#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
@@ -3382,7 +3487,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5224,7 +5329,7 @@ msgid "Application profile"
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr ""
 
@@ -6524,7 +6629,7 @@ msgid "Plugins"
 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:898
 msgid "Version"
 msgstr "النسخه"
 
@@ -6660,7 +6765,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6927,30 +7032,30 @@ msgid "Other"
 msgstr "أخرى"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "صفحه غير مُعنونة"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 #, fuzzy
 msgid "Primary site navigation"
 msgstr "ضبط الموقع الأساسي"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
@@ -6958,92 +7063,92 @@ 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:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 #, fuzzy
 msgctxt "MENU"
 msgid "Personal"
 msgstr "شخصية"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "الحساب"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: 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:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "اتصل"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: 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:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 #, fuzzy
 msgctxt "MENU"
 msgid "Admin"
 msgstr "إداري"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: lib/action.php:573
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:563
+#: lib/action.php:576
 #, fuzzy
 msgctxt "MENU"
 msgid "Invite"
 msgstr "ادعُ"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: 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:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "الشعار"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 #, fuzzy
 msgctxt "MENU"
 msgid "Register"
 msgstr "سجّل"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site"
@@ -7051,34 +7156,34 @@ 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 #, fuzzy
 msgctxt "MENU"
 msgid "Login"
 msgstr "لُج"
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: lib/action.php:602
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "مساعدة"
 
 #. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:592
+#: lib/action.php:605
 #, fuzzy
 msgctxt "MENU"
 msgid "Help"
 msgstr "مساعدة"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: lib/action.php:611
 #, fuzzy
 msgctxt "MENU"
 msgid "Search"
@@ -7086,70 +7191,70 @@ msgstr "ابحث"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:620 lib/adminpanelaction.php:387
+#: 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:687
+#: lib/action.php:700
 msgid "Local views"
 msgstr "المشاهدات المحلية"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:757
+#: lib/action.php:770
 msgid "Page notice"
 msgstr "إشعار الصفحة"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:858
+#: lib/action.php:871
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "ضبط الموقع الأساسي"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "مساعدة"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "عن"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "الأسئله المكررة"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "الشروط"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "خصوصية"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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:902
 msgid "Contact"
 msgstr "اتصل"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 #, fuzzy
 msgid "Badge"
 msgstr "نبّه"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 #, fuzzy
 msgid "StatusNet software license"
 msgstr "رخصه محتوى الموقع"
@@ -7158,7 +7263,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:928
+#: lib/action.php:941
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7168,7 +7273,7 @@ msgstr ""
 "broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -7177,7 +7282,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7189,51 +7294,51 @@ msgstr ""
 "agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 #, 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "قبل"
 
@@ -7281,6 +7386,13 @@ msgstr ""
 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."
@@ -7494,7 +7606,7 @@ msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 #, fuzzy
 msgid "Icon for this application"
 msgstr "ما فيش application زى كده."
@@ -8105,12 +8217,12 @@ 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "ارفع ملفًا"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr "تستطيع رفع صورتك الشخصيه. أقصى حجم للملف هو 2 م.ب."
@@ -8863,11 +8975,11 @@ msgstr "أرسل إشعارًا"
 msgid "What's up, %s?"
 msgstr "ما الأخبار يا %s؟"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "أرفق"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "أرفق ملفًا"
 
@@ -9060,6 +9172,13 @@ msgstr "هويه المستخدم"
 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:98
+msgid "Groups"
+msgstr "مجموعات"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9507,6 +9626,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "Personal"
-#~ msgstr "شخصية"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index abff8da476..5ab15444c6 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:08+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:33:51+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 (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -77,7 +77,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -129,6 +129,9 @@ msgstr "Няма такака страница."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -146,7 +149,7 @@ msgstr "Няма такака страница."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -312,8 +315,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -333,13 +336,15 @@ msgstr "Грешка при обновяване на потребителя."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -374,11 +379,12 @@ msgstr[1] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 #, fuzzy
@@ -389,7 +395,7 @@ msgstr "Грешка при записване настройките за Twitt
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 #, fuzzy
 msgid "Could not update your design."
 msgstr "Грешка при обновяване на потребителя."
@@ -404,7 +410,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -808,9 +814,9 @@ msgstr "Не сте абонирани за никого."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -840,7 +846,7 @@ msgstr "Грешка в базата от данни — отговор при 
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -848,7 +854,7 @@ 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:335
+#: 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
@@ -915,7 +921,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1251,6 +1257,13 @@ msgstr "Не е открит методът в API."
 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
@@ -1289,6 +1302,13 @@ msgstr "Добавяне към любимите"
 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
@@ -1337,7 +1357,17 @@ msgstr "Грешка при изтриване на любима бележка.
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1350,12 +1380,12 @@ msgstr "Грешка при изтриване на любима бележка.
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1397,6 +1427,13 @@ msgstr "Не сте абонирани за този профил"
 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."
@@ -1429,12 +1466,15 @@ msgstr "Няма прикачени файлове."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Няма псевдоним."
 
@@ -1467,7 +1507,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Потребителят няма профил."
@@ -1476,7 +1516,7 @@ msgstr "Потребителят няма профил."
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Настройки за аватар"
 
@@ -1485,7 +1525,7 @@ msgstr "Настройки за аватар"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Оригинал"
 
@@ -1494,7 +1534,7 @@ msgstr "Оригинал"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Преглед"
 
@@ -1533,7 +1573,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr ""
 
@@ -1598,7 +1638,8 @@ msgstr "Вече сте блокирали този потребител."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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 "Блокиране на потребителя"
 
@@ -1618,7 +1659,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Не"
@@ -1636,7 +1677,7 @@ msgstr "Да не се блокира този потребител"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Да"
@@ -1847,7 +1888,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:118
-#: lib/action.php:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Имаше проблем със сесията ви в сайта."
 
@@ -1940,12 +1981,13 @@ 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.
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2107,13 +2149,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Фон"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2337,14 +2379,15 @@ 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:70 actions/newgroup.php:65
+#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 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:107 actions/grouplogo.php:112
+#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "За да редактирате група, трябва да сте влезли."
 
@@ -2404,7 +2447,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2433,7 +2476,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2548,7 +2591,7 @@ 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 IM 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
@@ -2567,7 +2610,7 @@ msgstr ""
 "му."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2735,68 +2778,83 @@ msgstr "Няма прикачени файлове."
 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 "Неочакван отговор."
 
-#: actions/finishremotesubscribe.php:80
+#. 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 "Потребителят, когото проследявате, не съществува. "
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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 "Можете да ползвате локален абонамент!"
 
-#: actions/finishremotesubscribe.php:99
+#. 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 "Потребителят е забранил да се абонирате за него."
 
-#: actions/finishremotesubscribe.php:110
+#. 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 "Не сте абонирани за никого."
 
-#: actions/finishremotesubscribe.php:113
+#. 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 за достъп."
 
-#: actions/finishremotesubscribe.php:118
+#. 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."
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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 "Грешка при обновяване на отдалечен профил"
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Няма такъв файл."
 
-#: actions/getfile.php:83
+#. TRANS: Client error displayed when requesting a file without having read access to it.
+#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "Грешка при четене на файла."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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 ""
 
-#: actions/grantrole.php:75
+#. 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 "Не можете да заглушавате потребители на този сайт."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2806,37 +2864,47 @@ msgstr "Потребителят вече е заглушен."
 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 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:76 actions/groupunblock.php:77
+#: 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 "Не е открит профил с такъв идентификатор."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "Не е указана група."
 
-#: actions/groupblock.php:91
+#. 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 "Само администратор може да блокира членове от групата."
 
-#: actions/groupblock.php:95
+#. 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 "Потребителят вече е блокиран за групата."
 
-#: actions/groupblock.php:100
+#. 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 "Потребителят не членува в групата."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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 "Разблокиране на потребителя от групата"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2845,52 +2913,64 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "Разблокиране на потребителя от групата"
 
-#: actions/groupblock.php:206
+#. 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 "Разблокиране на потребителя от групата"
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Липсва ID."
 
-#: actions/groupdesignsettings.php:68
+#. 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 "За да редактирате група, трябва да сте влезли."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 #, fuzzy
 msgid "Group design"
 msgstr "Групи"
 
-#: actions/groupdesignsettings.php:155
+#. 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 ""
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 msgid "Design preferences saved."
 msgstr "Настройките на е-поща са запазени."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2898,115 +2978,126 @@ msgstr ""
 "Можете да качите личен аватар тук. Максималната големина на файла е %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Качване"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Изрязване"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Лотого е обновено."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Абонати на %1$s, страница %2$d"
 
-#: actions/groupmembers.php:122
+#. TRANS: Page notice for group members page.
+#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "Списък с потребителите в тази група."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "Настройки"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Блокиране"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Блокиране на този потребител"
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: actions/grouprss.php:141
 #, fuzzy, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Бележки от %1$s в %2$s."
 
-#. TRANS: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "Групи"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "Групи, страница %d"
 
-#: actions/groups.php:90
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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 "Създаване на нова група"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -3015,23 +3106,29 @@ msgstr ""
 "Търсене на хора в %%site.name%% по техните име, място или интереси. "
 "Отделяйте фразите за "
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Търсене на групи"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "Няма резултати."
 
-#: actions/groupsearch.php:82
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3039,22 +3136,22 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Грешка при повтаряне на бележката."
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "Настройки за SMS"
@@ -3063,112 +3160,120 @@ msgstr "Настройки за SMS"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 "Можете да получавате съобщения по Jabber/GTalk [instant messages](%%doc.im%"
 "%). Въведете адреса си в настройките по-долу."
 
-#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:90
 #, fuzzy
 msgid "IM is not available."
 msgstr "Страницата не е достъпна във вида медия, който приемате"
 
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "Текущ потвърден Jabber/GTalk адрес."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 ""
 "Oчаква се потвърждение на този адрес. Проверете акаунта си в Jabber/GTalk за "
 "съобщение с инструкции. (Добавихте ли %s в списъка си там?)"
 
-#. TRANS: IM address input field instructions in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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 клиента си."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Настройки на е-поща"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Изпращане на бележките по Jabber/GTalk."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "Публикуване промяната на състоянието ми в Jabber/GTalk."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, fuzzy
+msgid ""
+"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
 msgstr "Изпращане по Jabber/GTalk на отговори от хора, "
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Публикуване на MicroID за адреса в Jabber/GTalk."
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Настройките са запазени."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "Грешка при нормализация на този Jabber ID"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "Неправилен Jabber ID"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "Този Jabber ID принадлежи на друг потребител."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3178,74 +3283,79 @@ msgstr ""
 "На месинджъра ви е изпратен код за потвърждение. За да получавате съобщения "
 "от %s, трябва да го одобрите."
 
-#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "Грешен IM адрес."
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 #, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "Грешка при изтриване потвърждението по е-поща."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "Няма код за потвърждение."
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging address that is not
 #. TRANS: registered for the active user.
 #: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Това не е вашият Jabber ID."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 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:40
+#: 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:44
+#: 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:77
+#: 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:116
+#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "Поканите са изпратени."
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Покани за нови потребители"
 
@@ -3253,7 +3363,7 @@ 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:139
+#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3262,7 +3372,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3271,7 +3381,7 @@ 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:153
+#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3282,7 +3392,7 @@ 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:167
+#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3291,7 +3401,7 @@ msgstr[1] "Изпратени са покани до следните хора:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:177
+#: 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!"
@@ -3300,7 +3410,7 @@ msgstr ""
 "увеличаването на общността тук!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3308,27 +3418,28 @@ msgstr ""
 "услугата на сайта."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:217
+#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "Адреси на е-поща"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Лично съобщение"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:227
+#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Може да добавите и лично съобщение към поканата."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:231
+#: actions/invite.php:232
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Send"
@@ -3337,7 +3448,7 @@ 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:263
+#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s ви кани да ползвате заедно %2$s"
@@ -3347,7 +3458,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5231,7 +5342,7 @@ msgid "Application profile"
 msgstr "Профил на приложението"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Икона"
 
@@ -6522,7 +6633,7 @@ msgid "Plugins"
 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:898
 msgid "Version"
 msgstr "Версия"
 
@@ -6649,7 +6760,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6924,220 +7035,220 @@ msgid "Other"
 msgstr "Друго"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Неозаглавена страница"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 #, fuzzy
 msgid "Primary site navigation"
 msgstr "Основна настройка на сайта"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 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:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Лично"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "Сметка"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: 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:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "Свързване"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: 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:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 #, fuzzy
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Настройки"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: lib/action.php:573
 #, 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:563
+#: lib/action.php:576
 #, fuzzy
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Покани"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: 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:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Изход"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Регистриране"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Вход"
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: lib/action.php:602
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Помощ"
 
 #. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "Помощ"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: 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:620 lib/adminpanelaction.php:387
+#: lib/action.php:633 lib/adminpanelaction.php:387
 #, fuzzy
 msgid "Site notice"
 msgstr "Нова бележка"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:687
+#: lib/action.php:700
 msgid "Local views"
 msgstr ""
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:757
+#: 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:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "Основна настройка на сайта"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "Помощ"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "Относно"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "Въпроси"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "Условия"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "Поверителност"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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:902
 msgid "Contact"
 msgstr "Контакт"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "Табелка"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "Лиценз на програмата StatusNet"
 
@@ -7145,7 +7256,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:928
+#: lib/action.php:941
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7155,7 +7266,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** е услуга за микроблогване."
@@ -7164,7 +7275,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7176,50 +7287,50 @@ msgstr ""
 "licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "Преди"
 
@@ -7267,6 +7378,13 @@ msgstr ""
 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."
@@ -7480,7 +7598,7 @@ msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 #, fuzzy
 msgid "Icon for this application"
 msgstr "Да не се изтрива приложението"
@@ -8074,12 +8192,12 @@ 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "Качване на файл"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
@@ -8817,11 +8935,11 @@ msgstr "Изпращане на бележка"
 msgid "What's up, %s?"
 msgstr "Какво става, %s?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "Прикрепяне"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "Прикрепяне на файл"
 
@@ -9015,6 +9133,13 @@ msgstr "Потребител"
 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:98
+msgid "Groups"
+msgstr "Групи"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9443,6 +9568,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "Personal"
-#~ msgstr "Лично"
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index e3bf6299e8..8487725cd3 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:09+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:33: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-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -80,7 +80,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -132,6 +132,9 @@ msgstr "N'eus ket eus ar bajenn-se."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -149,7 +152,7 @@ msgstr "N'eus ket eus ar bajenn-se."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -321,8 +324,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -342,13 +345,15 @@ msgstr "Dibosupl eo hizivaat an implijer."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -383,11 +388,12 @@ msgstr[1] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -397,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Dibosupl eo hizivaat ho design."
 
@@ -411,7 +417,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -808,9 +814,9 @@ msgstr "Aotreet eo bet ar jedouer reked dija."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -840,7 +846,7 @@ msgstr "Ur fazi 'zo bet en ur ensoc'hañ an avatar"
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -848,7 +854,7 @@ msgstr "Ur fazi 'zo bet en ur ensoc'hañ an avatar"
 #. 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:335
+#: 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
@@ -914,7 +920,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1249,6 +1255,13 @@ msgstr "N'eo ket bet kavet an implijer."
 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
@@ -1284,6 +1297,13 @@ msgstr "Er pennroll dija."
 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
@@ -1329,7 +1349,17 @@ msgstr "Diposupl eo dilemel pennroll un den all."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1342,12 +1372,12 @@ msgstr "Diposupl eo dilemel pennroll un den all."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1387,6 +1417,13 @@ msgstr "Ar profil %1$d n'eo ket koumanantet d'ar profil %2$d."
 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."
@@ -1419,12 +1456,15 @@ msgstr "N'eo ket bet kavet ar restr stag."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Lesanv ebet."
 
@@ -1457,7 +1497,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Implijer hep profil klotus."
@@ -1466,7 +1506,7 @@ msgstr "Implijer hep profil klotus."
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Arventennoù an avatar"
 
@@ -1475,7 +1515,7 @@ msgstr "Arventennoù an avatar"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Orin"
 
@@ -1484,7 +1524,7 @@ msgstr "Orin"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Rakwelet"
 
@@ -1520,7 +1560,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Kollet eo bet roadennoù."
 
@@ -1583,7 +1623,8 @@ msgstr "Stanket ho peus dija an implijer-mañ."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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ñ"
 
@@ -1603,7 +1644,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Ket"
@@ -1621,7 +1662,7 @@ msgstr "Arabat stankañ an implijer-mañ"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ya"
@@ -1825,7 +1866,7 @@ 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:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h."
 
@@ -1912,12 +1953,13 @@ msgstr "Dilemel ar strollad-mañ"
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2070,13 +2112,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Background"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2289,14 +2331,15 @@ 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:70 actions/newgroup.php:65
+#: 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: 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:107 actions/grouplogo.php:112
+#: 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."
 
@@ -2354,7 +2397,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2381,7 +2424,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2497,7 +2540,7 @@ 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 IM 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
@@ -2513,7 +2556,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2684,64 +2727,79 @@ msgstr "N'eus restr stag ebet."
 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ñ !"
 
-#: actions/finishremotesubscribe.php:80
+#. 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 ""
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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."
 
-#: actions/finishremotesubscribe.php:99
+#. 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ñ."
 
-#: actions/finishremotesubscribe.php:110
+#. 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."
 
-#: actions/finishremotesubscribe.php:113
+#. 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."
 
-#: actions/finishremotesubscribe.php:118
+#. 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 ""
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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."
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Restr ezvezant."
 
-#: actions/getfile.php:83
+#. 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."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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 ""
 
-#: actions/grantrole.php:75
+#. 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ñ."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2751,37 +2809,47 @@ msgstr "An implijer-mañ en deus dija ar roll-mañ."
 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 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:76 actions/groupunblock.php:77
+#: 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ñ."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "N'eo bet resisaet strollad ebet"
 
-#: actions/groupblock.php:91
+#. 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."
 
-#: actions/groupblock.php:95
+#. 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."
 
-#: actions/groupblock.php:100
+#. 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."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2790,166 +2858,189 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: actions/groupblock.php:191
 msgid "Do not block this user from this group"
 msgstr "Arabat stankañ an implijer-mañ eus ar strollad."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "Stankañ an implijer-mañ eus ar strollad-se"
 
-#: actions/groupblock.php:206
+#. 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"
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "ID ebet"
 
-#: actions/groupdesignsettings.php:68
+#. 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."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Design ar strollad"
 
-#: actions/groupdesignsettings.php:155
+#. 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 ""
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 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:145 actions/grouplogo.php:200
+#: 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:157
+#: 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:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Enporzhiañ"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Adframmañ"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logo hizivaet."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Izili ar strollad %1$s, pajenn %2$d"
 
-#: actions/groupmembers.php:122
+#. 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ñ."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "Merañ"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Stankañ"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Stankañ an implijer-mañ"
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Lakaat ur merour"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: 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: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "Strolladoù"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "Strollad, pajenn %d"
 
-#: actions/groups.php:90
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -2959,25 +3050,31 @@ msgstr ""
 "Dispartiañ termenoù ar c'hlask gant esaouennoù. Ret eo e vefe da nebeutañ 3 "
 "arouezenn."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Klask strolladoù"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "Disoc'h ebet."
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 "Ma ne gavoc'h ket ar strollad emaoc'h o klask, neuze e c'helloc'h [krouiñ "
 "anezhañ](%%action.newgroup%%)."
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -2987,21 +3084,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: 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 instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "Arventennoù ar bostelerezh prim"
@@ -3012,105 +3109,111 @@ msgstr "Arventennoù ar bostelerezh prim"
 #: actions/imsettings.php:71
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP 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 IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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 "Chomlec'h postelerezh prim"
 
 #: actions/imsettings.php:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "Chomlec'h Jabber/GTalk kadarnaet er mare-mañ."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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 GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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 IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Penndibaboù ar bostelerezh prim"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Kas din an alioù dre Jabber/GTalk."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
 #, fuzzy
-msgid "Post a notice when my Jabber/GTalk status changes."
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "Embann ur MicroID evit ma chomlec'h Jabber/GTalk."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
 #, fuzzy
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+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 IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+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 IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Penndibaboù enrollet"
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 IM address that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "Dibosupl eo implijout an ID Jabber-mañ"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "N'eo ket un ID Jabber reizh."
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "Implijet eo an Jabber ID-mañ gant un implijer all."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3118,73 +3221,78 @@ msgid ""
 "s for sending messages to you."
 msgstr ""
 
-#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 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.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 #, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "Diposubl eo dilemel ar postel kadarnadur."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 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: Message given trying to remove an Instant Messaging 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."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 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:40
+#: 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:44
+#: 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:77
+#: 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:116
+#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "Pedadennoù kaset"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Pediñ implijerien nevez"
 
@@ -3192,7 +3300,7 @@ 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:139
+#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3201,7 +3309,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3210,7 +3318,7 @@ 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:153
+#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3225,7 +3333,7 @@ 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:167
+#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3234,41 +3342,42 @@ 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:177
+#: 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:190
+#: 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:217
+#: 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:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: 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:227
+#: 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:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Kas"
@@ -3276,7 +3385,7 @@ 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:263
+#: 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"
@@ -3286,7 +3395,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5146,7 +5255,7 @@ msgid "Application profile"
 msgstr "Profil ar poellad"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Arlun"
 
@@ -6438,7 +6547,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:885
+#: actions/version.php:198 lib/action.php:898
 msgid "Version"
 msgstr "Stumm"
 
@@ -6562,7 +6671,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6826,216 +6935,216 @@ msgid "Other"
 msgstr "All"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Pajenn hep anv"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 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:531
+#: lib/action.php:544
 #, fuzzy
 msgid "Primary site navigation"
 msgstr "Arventennoù diazez al lec'hienn"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 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:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personel"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "Kont"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: lib/action.php:560
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Liammañ d'ar servijoù"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "Kevreañ"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: lib/action.php:566
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Kemmañ arventennoù al lec'hienn"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Merañ"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: 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"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Pediñ"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: lib/action.php:582
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Digevreañ diouzh al lec'hienn"
 
 #. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Digevreañ"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Krouiñ ur gont"
 
 #. 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:580 lib/logingroupnav.php:85
+#: 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:583
+#: lib/action.php:596
 msgctxt "TOOLTIP"
 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Kevreañ"
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: 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:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "Skoazell"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: lib/action.php:611
 msgctxt "MENU"
 msgid "Search"
 msgstr "Klask"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:620 lib/adminpanelaction.php:387
+#: 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:687
+#: 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:757
+#: 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:858
+#: lib/action.php:871
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "Arventennoù diazez al lec'hienn"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "Skoazell"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "Diwar-benn"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "FAG"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "AIH"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "Prevezded"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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
+#: lib/action.php:902
 msgid "Contact"
 msgstr "Darempred"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "Badj"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "Aotre-implijout ar meziant StatusNet"
 
@@ -7043,7 +7152,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7051,7 +7160,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** a zo ur servij microblogging."
@@ -7060,7 +7169,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7069,50 +7178,50 @@ msgid ""
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "Kent"
 
@@ -7160,6 +7269,13 @@ msgstr ""
 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."
@@ -7364,7 +7480,7 @@ msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Arlun evit ar poellad-mañ"
 
@@ -7956,12 +8072,12 @@ msgstr "Fazi bank roadennoù"
 
 #. 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "Enporzhiañ ar restr"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
@@ -8696,11 +8812,11 @@ msgstr "Kas un ali"
 msgid "What's up, %s?"
 msgstr "Penaos 'mañ kont, %s ?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "Stagañ"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "Stagañ ur restr"
 
@@ -8893,6 +9009,13 @@ msgstr "ID an implijer"
 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:98
+msgid "Groups"
+msgstr "Strolladoù"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9322,6 +9445,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "Personal"
-#~ msgstr "Hiniennel"
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index 6648e3060c..8867e63d56 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:10+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:33: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 (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -85,7 +85,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -137,6 +137,9 @@ msgstr "No existeix la pàgina."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -154,7 +157,7 @@ msgstr "No existeix la pàgina."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -330,8 +333,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -351,13 +354,15 @@ msgstr "No s'ha pogut actualitzar l'usuari."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -396,11 +401,12 @@ msgstr[1] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -410,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "No s'ha pogut actualitzar el vostre disseny."
 
@@ -424,7 +430,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -817,9 +823,9 @@ msgstr "El testimoni de sol·licitud ja està autoritzat."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -850,7 +856,7 @@ msgstr "Error de la base de dades en inserir l'oauth_token_association."
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -858,7 +864,7 @@ 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:335
+#: 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
@@ -930,7 +936,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1263,6 +1269,13 @@ msgstr "No s'ha trobat el mètode API!"
 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
+#, fuzzy, php-format
+msgid "Notices %1$s has favorited on %2$s"
+msgstr "Actualitzacions de %1$s i amics 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
@@ -1296,6 +1309,13 @@ msgstr "Ja és una preferit."
 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
+#, fuzzy, php-format
+msgid "Groups %1$s is a member of on %2$s"
+msgstr "%s grups són membres de"
+
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
 #: actions/atompubmembershipfeed.php:219
 msgid "Cannot add someone else's membership."
@@ -1338,7 +1358,17 @@ msgstr "No es pot eliminar què ha preferit algú altre."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1351,12 +1381,12 @@ msgstr "No es pot eliminar què ha preferit algú altre."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1395,6 +1425,13 @@ msgstr "El perfil %1$d no està subscrit al perfil %2$d."
 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
+#, fuzzy, php-format
+msgid "People %1$s has subscribed to on %2$s"
+msgstr "Gent subscrita a %s"
+
 #. TRANS: Client error displayed when not using the follow verb.
 #: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
@@ -1427,12 +1464,15 @@ msgstr "No existeix l'adjunció."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Cap sobrenom."
 
@@ -1465,7 +1505,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "L'usuari que no coincideix amb cap perfil"
@@ -1474,7 +1514,7 @@ msgstr "L'usuari que no coincideix amb cap perfil"
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Configuració de l'avatar"
 
@@ -1483,7 +1523,7 @@ msgstr "Configuració de l'avatar"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Original"
 
@@ -1492,7 +1532,7 @@ msgstr "Original"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Vista prèvia"
 
@@ -1530,7 +1570,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "S'ha perdut el nostre fitxer de dades."
 
@@ -1601,7 +1641,8 @@ msgstr "Ja heu blocat l'usuari."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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"
 
@@ -1624,7 +1665,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "No"
@@ -1642,7 +1683,7 @@ msgstr "No bloquis l'usuari"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Sí"
@@ -1849,7 +1890,7 @@ 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:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "S'ha produït un problema amb el testimoni de la vostra sessió."
 
@@ -1942,12 +1983,13 @@ msgstr "Elimina aquest 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2104,13 +2146,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Fons"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2320,14 +2362,15 @@ 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:70 actions/newgroup.php:65
+#: 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: 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:107 actions/grouplogo.php:112
+#: 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."
 
@@ -2385,7 +2428,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2414,7 +2457,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2510,7 +2553,6 @@ msgstr "No hi ha cap adreça electrònica."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
 #: actions/emailsettings.php:388
-#, fuzzy
 msgid "Cannot normalize that email address."
 msgstr "No es pot normalitzar l'adreça electrònica."
 
@@ -2531,7 +2573,7 @@ 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 IM 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
@@ -2549,7 +2591,7 @@ msgstr ""
 "codi i les instruccions per utilitzar-lo."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2695,9 +2737,9 @@ msgstr "Usuaris destacats, pàgina %d"
 
 #. TRANS: Description on page displaying featured users.
 #: actions/featured.php:102
-#, fuzzy, php-format
+#, php-format
 msgid "A selection of some great users on %s."
-msgstr "Una selecció d'alguns dels millors usuaris a %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
@@ -2720,62 +2762,77 @@ msgstr "Cap adjunció."
 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!"
 
-#: actions/finishremotesubscribe.php:80
+#. 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."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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!"
 
-#: actions/finishremotesubscribe.php:99
+#. 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."
 
-#: actions/finishremotesubscribe.php:110
+#. 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."
 
-#: actions/finishremotesubscribe.php:113
+#. 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."
 
-#: actions/finishremotesubscribe.php:118
+#. 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."
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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."
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "No existeix el fitxer."
 
-#: actions/getfile.php:83
+#. 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."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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."
 
-#: actions/grantrole.php:75
+#. 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."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2785,37 +2842,47 @@ msgstr "L'usuari ja té aquest rol."
 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 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:76 actions/groupunblock.php:77
+#: 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."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "No s'ha especificat cap grup."
 
-#: actions/groupblock.php:91
+#. 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."
 
-#: actions/groupblock.php:95
+#. 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."
 
-#: actions/groupblock.php:100
+#. 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."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2826,32 +2893,37 @@ 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:182
+#: 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "Bloca l'usuari del grup"
 
-#: actions/groupblock.php:206
+#. 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."
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Sense ID."
 
-#: actions/groupdesignsettings.php:68
+#. 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."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Disseny de grup"
 
-#: actions/groupdesignsettings.php:155
+#. 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."
@@ -2859,19 +2931,26 @@ msgstr ""
 "Personalitzeu l'aspecte del vostre grup amb una imatge de fons i una paleta "
 "de colors de la vostra elecció."
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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 s'han pogut desar els paràmetres de disseny."
+
+#. TRANS: Form text to confirm saved group design settings.
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
 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:145 actions/grouplogo.php:200
+#: 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:157
+#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2880,106 +2959,115 @@ msgstr ""
 "fitxer és %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Puja"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Retalla"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logo actualitzat."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s membres del grup, pàgina %2$d"
 
-#: actions/groupmembers.php:122
+#. 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."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Bloca"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Bloca aquest usuari"
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Fes-lo administrador"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: 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: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "Grups"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "Grups, pàgina %d"
 
-#: actions/groups.php:90
-#, php-format
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 "Els grups de %%%%site.name%%%% us permeten trobar-vos i parlar amb gent "
 "d'interessos semblants. Després d'unir-vos a un grup, podeu enviar missatges "
@@ -2987,11 +3075,13 @@ msgstr ""
 "agradi? Proveu de [cercar-ne un](%%%%action.groupsearch%%%%) o [comenceu-ne "
 "un de propi!](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -3000,25 +3090,31 @@ msgstr ""
 "Cerca grups a %%site.name%% per nom, ubicació o descripció. Separeu els "
 "termes de cerca amb espais; han de contenir com a mínim 3 caràcters."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Cerca de grups"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "Cap resultat."
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 "Si no podeu trobar el grup que cerqueu, podeu provar de [crear-lo](%%action."
 "newgroup%%) també."
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3028,21 +3124,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: 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 instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "Paràmetres de missatgeria instantània"
@@ -3051,115 +3147,123 @@ msgstr "Paràmetres de missatgeria instantània"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address 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 IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP 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 IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "Adreça actual Jabber/Gtalk confirmada."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 ""
 "A l'espera d'una confirmació per a aquesta adreça. Busca al teu compte "
 "Jabber/GTalk un missatge amb més instruccions. (Has afegit a %s a la teva "
 "llista d'amics?)"
 
-#. TRANS: IM address input field instructions in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Preferències de MI"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Envia'm avisos per Jabber/GTalk."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "Envia'm un avís quan el meu estat Jabber/GTalk canvii."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, fuzzy
+msgid ""
+"Send me replies through Jabber/Google Talk 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 IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Publica una MicroID per al meu compte de Jabber/GTalk."
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "S'han desat les preferències."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "Impossible normalitzar aquest Jabber ID"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "Jabber ID no vàlid"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "Aquest Jabber ID ja està sent utilitzat per un altre usuari."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3169,42 +3273,47 @@ 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 IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 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.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 msgid "Could not delete IM confirmation."
 msgstr "No s'ha pogut eliminar la confirmació de MI."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 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: Message given trying to remove an Instant Messaging 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."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
@@ -3212,13 +3321,13 @@ msgstr ""
 "privats."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:40
+#: 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:44
+#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr ""
@@ -3226,18 +3335,18 @@ 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:77
+#: 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:116
+#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "S'han enviat les invitacions"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Convida nous usuaris"
 
@@ -3245,7 +3354,7 @@ 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:139
+#: 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:"
@@ -3253,7 +3362,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3262,7 +3371,7 @@ 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:153
+#: 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:"
@@ -3273,7 +3382,7 @@ 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:167
+#: 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:"
@@ -3281,7 +3390,7 @@ 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:177
+#: 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!"
@@ -3290,35 +3399,36 @@ msgstr ""
 "registrin al lloc. Gràcies per fer créixer la comunitat!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
-"Utilitza aquest formulari per convidar els teus amics i col·legues perquè "
-"utilitzin aquest servei."
+"Feu servir aquest formulari per convidar els vostres amics i col·legues a "
+"utilitzar aquest servei."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:217
+#: 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:220
-msgid "Addresses of friends to invite (one per line)"
+#: actions/invite.php:221
+#, fuzzy
+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:224
+#: 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:227
+#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
-msgstr "Opcionalment pots afegir un missatge a la invitació."
+msgstr "Opcionalment podeu afegir un missatge a la invitació."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Envia"
@@ -3326,7 +3436,7 @@ 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:263
+#: 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"
@@ -3336,7 +3446,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5230,7 +5340,7 @@ msgid "Application profile"
 msgstr "Perfil de l'aplicació"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icona"
 
@@ -5963,9 +6073,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-#, fuzzy
 msgid "No code entered."
-msgstr "No s'ha introduït cap codi"
+msgstr "No s'ha introduït cap codi."
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
@@ -6565,7 +6674,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:885
+#: actions/version.php:198 lib/action.php:898
 msgid "Version"
 msgstr "Versió"
 
@@ -6695,7 +6804,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr "No s'ha trobat el nom de la base de dades o el DSN enlloc."
 
@@ -6964,214 +7073,214 @@ msgid "Other"
 msgstr "Altres"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: 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:312
+#: lib/action.php:325
 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:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "Navegació primària del lloc"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Perfil personal i línia temporal dels amics"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
 #. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personal"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "Compte"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: lib/action.php:560
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Connecta als serveis"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "Connexió"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: lib/action.php:566
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Canvia la configuració del lloc"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrador"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: 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"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Convida"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: lib/action.php:582
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Finalitza la sessió del lloc"
 
 #. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Finalitza la sessió"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Crea un compte"
 
 #. 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registre"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 msgctxt "TOOLTIP"
 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:586 lib/logingroupnav.php:77
+#: 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:589
+#: 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:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: lib/action.php:611
 msgctxt "MENU"
 msgid "Search"
 msgstr "Cerca"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:620 lib/adminpanelaction.php:387
+#: 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:687
+#: 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:757
+#: 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:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "Navegació del lloc secundària"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "Quant a"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "Preguntes més freqüents"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "Termes del servei"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "Privadesa"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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
+#: lib/action.php:902
 msgid "Contact"
 msgstr "Contacte"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "Insígnia"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "Llicència del programari StatusNet"
 
@@ -7179,7 +7288,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7189,7 +7298,7 @@ msgstr ""
 "site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** és un servei de microblogging."
@@ -7198,7 +7307,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7210,27 +7319,27 @@ msgstr ""
 "org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 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 "
@@ -7238,7 +7347,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:1004
+#: lib/action.php:1017
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -7246,19 +7355,19 @@ msgstr ""
 "llicència %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "Anteriors"
 
@@ -7306,6 +7415,13 @@ msgstr "El perfil remot no és un grup!"
 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 ""
+
 #. 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."
@@ -7511,7 +7627,7 @@ msgid "Failed to delete revoked token."
 msgstr "No s'ha pogut suprimir el testimoni revocat."
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Icona de l'aplicació"
 
@@ -8124,12 +8240,12 @@ msgstr "Error de la base de dades"
 
 #. 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "Puja un fitxer"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
@@ -8183,7 +8299,6 @@ 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
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Fes que deixi de ser preferit"
@@ -8196,7 +8311,6 @@ msgstr "Fes preferit aquest avís"
 
 #. TRANS: Button text for adding the favourite status to a notice.
 #: lib/favorform.php:135
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Preferit"
@@ -8959,11 +9073,11 @@ msgstr "Envia un avís"
 msgid "What's up, %s?"
 msgstr "Què tal, %s?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "Adjunta"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "Adjunta un fitxer"
 
@@ -9026,7 +9140,7 @@ msgstr "Repetit per"
 
 #: lib/noticelist.php:646
 msgid "Reply to this notice"
-msgstr "respondre a aquesta nota"
+msgstr "Respon a aquest avís"
 
 #: lib/noticelist.php:647
 msgid "Reply"
@@ -9071,28 +9185,24 @@ 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
-#, fuzzy
 msgctxt "MENU"
 msgid "Replies"
 msgstr "Respostes"
 
 #. TRANS: Personal group navigation menu option when logged in for seeing own profile.
 #: lib/personalgroupnav.php:114
-#, 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 "Preferits"
 
 #. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
 #: lib/personalgroupnav.php:133
-#, fuzzy
 msgctxt "MENU"
 msgid "Inbox"
 msgstr "Safata d'entrada"
@@ -9104,7 +9214,6 @@ msgstr "Els teus missatges rebuts"
 
 #. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
 #: lib/personalgroupnav.php:140
-#, fuzzy
 msgctxt "MENU"
 msgid "Outbox"
 msgstr "Safata de sortida"
@@ -9157,6 +9266,13 @@ msgstr "ID de l'usuari"
 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:98
+msgid "Groups"
+msgstr "Grups"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9577,6 +9693,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 "Personal"
-#~ msgstr "Personal"
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 439f7c599b..97e265eddf 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:12+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:34:00+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 (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -79,7 +79,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -131,6 +131,9 @@ msgstr "Tady žádná taková stránka není."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -148,7 +151,7 @@ msgstr "Tady žádná taková stránka není."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -323,8 +326,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -344,13 +347,15 @@ msgstr "Nepodařilo se aktualizovat nastavení uživatele"
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -392,11 +397,12 @@ msgstr[2] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -406,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Nelze uložit design."
 
@@ -420,7 +426,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -821,9 +827,9 @@ msgstr "Nejste autorizován."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -853,7 +859,7 @@ msgstr "Chyba databáze při vkládání uživatele aplikace OAuth."
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -861,7 +867,7 @@ 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:335
+#: 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
@@ -934,7 +940,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1274,6 +1280,13 @@ msgstr " API metoda nebyla nalezena."
 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
@@ -1312,6 +1325,13 @@ msgstr "Přidat do oblíbených"
 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
@@ -1360,7 +1380,17 @@ msgstr "Nelze smazat oblíbenou položku."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1373,12 +1403,12 @@ msgstr "Nelze smazat oblíbenou položku."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1420,6 +1450,13 @@ msgstr "Nejste přihlášen k tomuto profilu."
 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."
@@ -1452,12 +1489,15 @@ msgstr "Žádná taková příloha."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Žádná přezdívka."
 
@@ -1489,7 +1529,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Uživatel bez odpovídajícího profilu."
@@ -1498,7 +1538,7 @@ msgstr "Uživatel bez odpovídajícího profilu."
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Nastavené Profilu"
 
@@ -1507,7 +1547,7 @@ msgstr "Nastavené Profilu"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Originál"
 
@@ -1516,7 +1556,7 @@ msgstr "Originál"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Náhled"
 
@@ -1555,7 +1595,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Ztratili jsme údaje souboru."
 
@@ -1620,7 +1660,8 @@ msgstr "Jabber ID již patří jinému uživateli"
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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"
 
@@ -1643,7 +1684,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Poznámka"
@@ -1661,7 +1702,7 @@ msgstr "Zablokovat tohoto uživatele"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ano"
@@ -1871,7 +1912,7 @@ 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:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Nastal problém s vaším session tokenem."
 
@@ -1968,12 +2009,13 @@ msgstr "Odstranit tohoto uživatele"
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2134,13 +2176,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Pozadí"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2354,14 +2396,15 @@ 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:70 actions/newgroup.php:65
+#: 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: 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:107 actions/grouplogo.php:112
+#: 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."
 
@@ -2419,7 +2462,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2448,7 +2491,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2561,7 +2604,7 @@ 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 IM 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
@@ -2580,7 +2623,7 @@ msgstr ""
 "jej použít."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2753,62 +2796,77 @@ msgstr "Bez příloh."
 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ěď!"
 
-#: actions/finishremotesubscribe.php:80
+#. 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."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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í."
 
-#: actions/finishremotesubscribe.php:99
+#. 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."
 
-#: actions/finishremotesubscribe.php:110
+#. 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."
 
-#: actions/finishremotesubscribe.php:113
+#. 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."
 
-#: actions/finishremotesubscribe.php:118
+#. 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."
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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."
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Žádný takový soubor."
 
-#: actions/getfile.php:83
+#. 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."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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."
 
-#: actions/grantrole.php:75
+#. 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."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2818,37 +2876,47 @@ msgstr "Uživatel již tuto roli má."
 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 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:76 actions/groupunblock.php:77
+#: 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."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "Nebyla vybrána skupina."
 
-#: actions/groupblock.php:91
+#. 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."
 
-#: actions/groupblock.php:95
+#. 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."
 
-#: actions/groupblock.php:100
+#. 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."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2859,32 +2927,37 @@ 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:182
+#: actions/groupblock.php:191
 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "Blokovat tohoto uživatele z této skupiny"
 
-#: actions/groupblock.php:206
+#. 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."
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Chybí ID."
 
-#: actions/groupdesignsettings.php:68
+#. 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."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Vzhled skupiny"
 
-#: actions/groupdesignsettings.php:155
+#. 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."
@@ -2892,19 +2965,26 @@ msgstr ""
 "Přizpůsobit vzhled skupiny obrázkem na pozadí a barevnou paletou vašeho "
 "výběru."
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 msgid "Design preferences saved."
 msgstr "Nastavení vzhledu uloženo."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2913,106 +2993,115 @@ msgstr ""
 "s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Upload"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Oříznout"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: 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:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "členové skupiny %1$s, strana %2$d"
 
-#: actions/groupmembers.php:122
+#. 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ě."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr ""
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: 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: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "Skupiny"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "Skupiny, strana %d"
 
-#: actions/groups.php:90
-#, php-format
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 "skupiny na %%%%Site.name%%%% vám umožní najít a mluvit s lidmi podobných "
 "zájmů. Po připojení skupiny můžete posílat zprávy všem ostatním členům "
@@ -3020,11 +3109,13 @@ msgstr ""
 "Zkuste ji [vyhledat](%%%%action.groupsearch%%%%) nebo [založit!](%%%%action."
 "newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -3033,25 +3124,31 @@ msgstr ""
 "Hledejte skupiny na %%site.name%% podle jejich názvu, místa, nebo popisu. "
 "Oddělte slova mezerami;  musí být nejméně 3 znaky dlouhá."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Hledání skupin"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "Žádné výsledky."
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 "Pokud nemůžete najít skupinu, kterou hledáte, můžete ji [vytvořit](%%action."
 "newgroup%%) sami."
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3061,21 +3158,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Chyba při odstraňování bloku."
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "Nastavení IM"
@@ -3084,113 +3181,121 @@ msgstr "Nastavení IM"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address 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 IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM není k dispozici."
 
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "Aktuální potvrzená Jabber / GTalk adresa."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 ""
 "Č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 IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Nastavení IM"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Zasílat oznámení pomocí Jabber/GTalk"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "Poslat oznámení, když se změní můj Jabber/Gtalk status."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, fuzzy
+msgid ""
+"Send me replies through Jabber/Google Talk 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.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Publikovat MicroID pro mou Jabber / GTalk adresu."
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Nastavení uloženo"
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 IM address that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "Nelze normalizovat tento JabberID"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "Není platným Jabber ID"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "Jabber ID již patří jinému uživateli"
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3200,74 +3305,79 @@ 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 IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "Toto je špatná IM adresa"
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 #, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "Nelze smazat potvrzení IM"
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "IM potvrzení zrušeno."
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging 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"
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 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:40
+#: 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:44
+#: 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:77
+#: 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:116
+#: 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:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Pozvat nové uživatele"
 
@@ -3275,7 +3385,7 @@ 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:139
+#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3285,7 +3395,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3294,7 +3404,7 @@ 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:153
+#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3306,7 +3416,7 @@ 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:167
+#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3316,7 +3426,7 @@ 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:177
+#: 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!"
@@ -3325,7 +3435,7 @@ msgstr ""
 "na tomto webu. Díky za zvetšení komunity!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3333,27 +3443,28 @@ msgstr ""
 "služby."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:217
+#: 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:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: 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:227
+#: 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:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Odeslat"
@@ -3361,7 +3472,7 @@ 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:263
+#: 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"
@@ -3371,7 +3482,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5280,7 +5391,7 @@ msgid "Application profile"
 msgstr "Profil aplikace"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ikona"
 
@@ -6609,7 +6720,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:885
+#: actions/version.php:198 lib/action.php:898
 msgid "Version"
 msgstr "Verze"
 
@@ -6740,7 +6851,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr "Nenalezeno jméno databáze ani DSN."
 
@@ -7007,214 +7118,214 @@ msgid "Other"
 msgstr "Jiné"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: 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:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "Primární navigace na webu"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Osobní profil a časová osa přátel"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
 #. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Osobní"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "Účet"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: lib/action.php:560
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Připojení ke službám"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "Připojit"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: lib/action.php:566
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Změna konfigurace webu"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: 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"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Pozvat"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: lib/action.php:582
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Odhlášení z webu"
 
 #. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Odhlásit se"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Zaregistrujte se"
 
 #. 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrovat"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Přihlásit se na stránky"
 
 #. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:586 lib/logingroupnav.php:77
+#: 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:589
+#: 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:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "Nápověda"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: lib/action.php:611
 msgctxt "MENU"
 msgid "Search"
 msgstr "Hledat"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:620 lib/adminpanelaction.php:387
+#: 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:687
+#: 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:757
+#: 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:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "Sekundární navigace na webu"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "Nápověda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "O nás"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "TOS (pravidla použití služby)"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "Soukromí"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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
+#: lib/action.php:902
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "Odznak"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "Licence softwaru StatusNet"
 
@@ -7222,7 +7333,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7232,7 +7343,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** je služba mikroblogů."
@@ -7241,7 +7352,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7253,50 +7364,50 @@ msgstr ""
 "licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "Před"
 
@@ -7344,6 +7455,13 @@ msgstr ""
 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."
@@ -7549,7 +7667,7 @@ msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Ikona pro tuto aplikaci"
 
@@ -8170,12 +8288,12 @@ msgstr "Chyba databáze"
 
 #. 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "Nahrát soubor"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
@@ -9010,11 +9128,11 @@ msgstr "Poslat oznámení"
 msgid "What's up, %s?"
 msgstr "Co se děje, %s?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "Připojit"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "Přiložit soubor"
 
@@ -9208,6 +9326,13 @@ msgstr "ID uživatele"
 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:98
+msgid "Groups"
+msgstr "Skupiny"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9637,6 +9762,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "Personal"
-#~ msgstr "Osobní"
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 9011907a63..1b9ebd4457 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -19,17 +19,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:13+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:34: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-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -87,7 +87,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -139,6 +139,9 @@ msgstr "Seite nicht vorhanden"
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -156,7 +159,7 @@ msgstr "Seite nicht vorhanden"
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -332,8 +335,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -353,13 +356,15 @@ msgstr "Konnte Benutzerdaten nicht aktualisieren."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -398,11 +403,12 @@ msgstr[1] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -412,7 +418,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Konnte Benutzerdesign nicht aktualisieren."
 
@@ -426,7 +432,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -824,9 +830,9 @@ msgstr "Anfrage-Token bereits autorisiert."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -855,7 +861,7 @@ msgstr "Datenbankfehler beim Einfügen von oauth_token_association."
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -863,7 +869,7 @@ 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:335
+#: 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
@@ -935,7 +941,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1275,6 +1281,13 @@ msgstr "API-Methode nicht gefunden."
 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
@@ -1311,6 +1324,13 @@ msgstr "Bereits ein Favorit."
 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
@@ -1356,7 +1376,17 @@ msgstr "Konnte Favoriten nicht löschen."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1369,12 +1399,12 @@ msgstr "Konnte Favoriten nicht löschen."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1415,6 +1445,13 @@ msgstr "Du hast dieses Profil nicht abonniert."
 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."
@@ -1447,12 +1484,15 @@ msgstr "Kein solcher Anhang."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Kein Benutzername."
 
@@ -1485,7 +1525,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Benutzer ohne passendes Profil"
@@ -1494,7 +1534,7 @@ msgstr "Benutzer ohne passendes Profil"
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Avatar-Einstellungen"
 
@@ -1503,7 +1543,7 @@ msgstr "Avatar-Einstellungen"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Original"
 
@@ -1512,7 +1552,7 @@ msgstr "Original"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Vorschau"
 
@@ -1549,7 +1589,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Daten verloren."
 
@@ -1613,7 +1653,8 @@ msgstr "Du hast diesen Benutzer bereits blockiert."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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"
 
@@ -1636,7 +1677,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Nein"
@@ -1654,7 +1695,7 @@ msgstr "Diesen Benutzer freigeben"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ja"
@@ -1859,7 +1900,7 @@ 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:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Es gab ein Problem mit deinem Sessiontoken."
 
@@ -1951,12 +1992,13 @@ msgstr "Diese Gruppe löschen"
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2113,13 +2155,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Hintergrund"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2332,14 +2374,15 @@ 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:70 actions/newgroup.php:65
+#: 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: 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:107 actions/grouplogo.php:112
+#: 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"
 
@@ -2397,7 +2440,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2426,7 +2469,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2543,7 +2586,7 @@ 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 IM 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
@@ -2562,7 +2605,7 @@ msgstr ""
 "Anweisungen, wie dieser benutzt wird."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2735,62 +2778,77 @@ msgstr "Keine Anhänge vorhanden"
 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!"
 
-#: actions/finishremotesubscribe.php:80
+#. 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."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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!"
 
-#: actions/finishremotesubscribe.php:99
+#. 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."
 
-#: actions/finishremotesubscribe.php:110
+#. 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."
 
-#: actions/finishremotesubscribe.php:113
+#. 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."
 
-#: actions/finishremotesubscribe.php:118
+#. 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."
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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."
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Datei nicht gefunden."
 
-#: actions/getfile.php:83
+#. 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."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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"
 
-#: actions/grantrole.php:75
+#. 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."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2800,37 +2858,47 @@ msgstr "Benutzer hat bereits diese Aufgabe"
 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 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:76 actions/groupunblock.php:77
+#: 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."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "Keine Gruppe angegeben"
 
-#: actions/groupblock.php:91
+#. 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."
 
-#: actions/groupblock.php:95
+#. 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"
 
-#: actions/groupblock.php:100
+#. 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."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2842,33 +2910,38 @@ 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:182
+#: actions/groupblock.php:191
 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "Diesen Benutzer von der Gruppe blockieren"
 
-#: actions/groupblock.php:206
+#. 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."
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Keine ID"
 
-#: actions/groupdesignsettings.php:68
+#. 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."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Gruppen-Design"
 
-#: actions/groupdesignsettings.php:155
+#. 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."
@@ -2876,19 +2949,26 @@ msgstr ""
 "Stelle ein wie die Gruppenseite aussehen soll. Hintergrundbild und "
 "Farbpalette frei wählbar."
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 msgid "Design preferences saved."
 msgstr "Design-Einstellungen gespeichert."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2897,106 +2977,115 @@ msgstr ""
 "s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Hochladen"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Zuschneiden"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logo aktualisiert."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s Gruppen-Mitglieder, Seite %2$d"
 
-#: actions/groupmembers.php:122
+#. 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."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Blockieren"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Diesen Benutzer blockieren"
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Zum Admin ernennen"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: 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: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "Gruppen"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "Gruppen, Seite %d"
 
-#: actions/groups.php:90
-#, php-format
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 "Finde und rede mit Gleichgesinnten in %%%%site.name%%%%-Gruppen. Nachdem du "
 "einer Gruppe beigetreten bist kannst du mit „!Gruppenname“ eine Nachricht an "
@@ -3004,11 +3093,13 @@ msgstr ""
 "action.groupsearch%%%%) oder deine eigene [Gruppe aufmachen!](%%%%action."
 "newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -3018,25 +3109,31 @@ msgstr ""
 "Trenne mehrere Suchbegriffe durch Leerzeichen. Ein Suchbegriff muss aus "
 "mindestens 3 Zeichen bestehen."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Gruppen-Suche"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "Keine Ergebnisse."
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 "Wenn du die Gruppe die dich interessiert nicht finden kannst, dann [erstelle "
 "sie](%%action.newgroup%%) doch einfach."
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3046,21 +3143,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Fehler beim Freigeben des Benutzers."
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "IM-Einstellungen"
@@ -3069,115 +3166,123 @@ msgstr "IM-Einstellungen"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address 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 IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP 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 IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "Aktuelle bestätigte Jabber/GTalk-Adresse"
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 ""
 "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 IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "IM-Einstellungen"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Schicke mir Nachrichten mittels Jabber/GTalk."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "Schicke eine Nachricht, wenn sich mein Jabber/GTalk-Status verändert."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, fuzzy
+msgid ""
+"Send me replies through Jabber/Google Talk 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 IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+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 IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Einstellungen gesichert."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 IM address that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "Konnte diese Jabber-ID nicht normalisieren"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "Ungültige Jabber-ID"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "Diese Jabber-ID wird bereits von einem anderen Benutzer verwendet."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3187,43 +3292,48 @@ 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 IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 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.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 #, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "Konnte die IM-Bestätigung nicht löschen."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "IM-Bestätigung abgebrochen."
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging 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."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
@@ -3231,31 +3341,31 @@ msgstr ""
 "enthält."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:40
+#: 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:44
+#: 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:77
+#: 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:116
+#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "Einladung(en) verschickt"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Lade neue Leute ein"
 
@@ -3263,7 +3373,7 @@ 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:139
+#: 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:"
@@ -3271,7 +3381,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3280,7 +3390,7 @@ 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:153
+#: 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:"
@@ -3294,7 +3404,7 @@ 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:167
+#: 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:"
@@ -3302,7 +3412,7 @@ 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:177
+#: 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!"
@@ -3312,37 +3422,38 @@ msgstr ""
 "wachsen!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: 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:217
+#: 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:220
-msgid "Addresses of friends to invite (one per line)"
+#: actions/invite.php:221
+#, fuzzy
+msgid "Addresses of friends to invite (one per line)."
 msgstr ""
 "Adressen von Freunden, die du einladen möchtest. (Jeweils eine Adresse pro "
 "Zeile)"
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:224
+#: 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:227
+#: 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:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Senden"
@@ -3350,7 +3461,7 @@ 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:263
+#: 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."
@@ -3360,7 +3471,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5265,7 +5376,7 @@ msgid "Application profile"
 msgstr "Anwendungsprofil"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Symbol"
 
@@ -6598,7 +6709,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:885
+#: actions/version.php:198 lib/action.php:898
 msgid "Version"
 msgstr "Version"
 
@@ -6730,7 +6841,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr "Nirgendwo einen Datenbanknamen oder DSN gefunden."
 
@@ -7003,214 +7114,214 @@ msgid "Other"
 msgstr "Sonstige"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Seite ohne Titel"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Mehr anzeigen"
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "Hauptnavigation"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Persönliches Profil und Freundes-Zeitleiste"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
 #. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Eigene"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "Profil"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: lib/action.php:560
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Zum Dienst verbinden"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "Verbinden"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: lib/action.php:566
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Seiteneinstellung ändern"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: 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"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Einladen"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: lib/action.php:582
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Von der Seite abmelden"
 
 #. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Abmelden"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Neues Benutzerkonto erstellen"
 
 #. 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrieren"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 msgctxt "TOOLTIP"
 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Anmelden"
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: 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:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "Hilfe"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: lib/action.php:611
 msgctxt "MENU"
 msgid "Search"
 msgstr "Suchen"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:620 lib/adminpanelaction.php:387
+#: 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:687
+#: 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:757
+#: 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:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "Unternavigation"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "Hilfe"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "Über"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "AGB"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "Privatsphäre"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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
+#: lib/action.php:902
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "Plakette"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "StatusNet-Software-Lizenz"
 
@@ -7218,7 +7329,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7228,7 +7339,7 @@ msgstr ""
 "site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** ist ein Mikrobloggingdienst."
@@ -7237,7 +7348,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7249,20 +7360,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:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7270,7 +7381,7 @@ msgstr ""
 "vorbehalten."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:972
+#: lib/action.php:985
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Urheberrecht von Inhalt und Daten liegt bei den Beteiligten. Alle Rechte "
@@ -7278,25 +7389,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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "Vorher"
 
@@ -7344,6 +7455,13 @@ msgstr ""
 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."
@@ -7545,7 +7663,7 @@ msgid "Failed to delete revoked token."
 msgstr "Konnte ungültig gemachtes Token nicht löschen."
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Programmsymbol"
 
@@ -8159,12 +8277,12 @@ msgstr "Datenbankfehler."
 
 #. 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "Datei hochladen"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
@@ -8995,11 +9113,11 @@ msgstr "Nachricht senden"
 msgid "What's up, %s?"
 msgstr "Was geht, %s?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "Anhängen"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "Datei anhängen"
 
@@ -9193,6 +9311,13 @@ msgstr "Benutzer-ID"
 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:98
+msgid "Groups"
+msgstr "Gruppen"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9618,6 +9743,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Hole Backup von der Datei „%s“."
-
-#~ msgid "Personal"
-#~ msgstr "Meine Zeitleiste"
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index f22f1b9ec2..aefcc542de 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:14+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:34: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 (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -80,7 +80,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -132,6 +132,9 @@ msgstr "No such page."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -149,7 +152,7 @@ msgstr "No such page."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -324,8 +327,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -345,13 +348,15 @@ msgstr "Could not update user."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -390,11 +395,12 @@ msgstr[1] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -404,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Could not update your design."
 
@@ -418,7 +424,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -814,9 +820,9 @@ msgstr "You are not authorised."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -846,7 +852,7 @@ msgstr "Database error inserting OAuth application user."
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -854,7 +860,7 @@ 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:335
+#: 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
@@ -927,7 +933,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1262,6 +1268,13 @@ msgstr "API method not found."
 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
@@ -1300,6 +1313,13 @@ msgstr "Add to favourites"
 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
@@ -1348,7 +1368,17 @@ msgstr "Could not delete favourite."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1361,12 +1391,12 @@ msgstr "Could not delete favourite."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1408,6 +1438,13 @@ msgstr "You are not subscribed to that profile."
 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."
@@ -1440,12 +1477,15 @@ msgstr "No such attachment."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "No nickname."
 
@@ -1477,7 +1517,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "User without matching profile."
@@ -1486,7 +1526,7 @@ msgstr "User without matching profile."
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Avatar settings"
 
@@ -1495,7 +1535,7 @@ msgstr "Avatar settings"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Original"
 
@@ -1504,7 +1544,7 @@ msgstr "Original"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Preview"
 
@@ -1543,7 +1583,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Lost our file data."
 
@@ -1608,7 +1648,8 @@ msgstr "You already blocked that user."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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"
 
@@ -1631,7 +1672,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "No"
@@ -1649,7 +1690,7 @@ msgstr "Do not block this user"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Yes"
@@ -1859,7 +1900,7 @@ 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:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "There was a problem with your session token."
 
@@ -1952,12 +1993,13 @@ msgstr "Delete this group"
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2116,13 +2158,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Background"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2337,14 +2379,15 @@ 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:70 actions/newgroup.php:65
+#: 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: 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:107 actions/grouplogo.php:112
+#: 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."
 
@@ -2402,7 +2445,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2431,7 +2474,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2544,7 +2587,7 @@ 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 IM 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
@@ -2562,7 +2605,7 @@ msgstr ""
 "inbox (and spam box!) for the code and instructions on how to use it."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2734,62 +2777,77 @@ msgstr "No attachments."
 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!"
 
-#: actions/finishremotesubscribe.php:80
+#. 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."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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!"
 
-#: actions/finishremotesubscribe.php:99
+#. 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."
 
-#: actions/finishremotesubscribe.php:110
+#. 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."
 
-#: actions/finishremotesubscribe.php:113
+#. 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."
 
-#: actions/finishremotesubscribe.php:118
+#. 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."
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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."
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "No such file."
 
-#: actions/getfile.php:83
+#. 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."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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."
 
-#: actions/grantrole.php:75
+#. 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."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2799,37 +2857,47 @@ msgstr "User already has this role."
 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 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:76 actions/groupunblock.php:77
+#: 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."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "No group specified."
 
-#: actions/groupblock.php:91
+#. 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."
 
-#: actions/groupblock.php:95
+#. 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."
 
-#: actions/groupblock.php:100
+#. 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."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2841,32 +2909,37 @@ msgstr ""
 "the group in the future."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: actions/groupblock.php:191
 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "Block this user from this group"
 
-#: actions/groupblock.php:206
+#. 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."
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "No ID."
 
-#: actions/groupdesignsettings.php:68
+#. 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."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Group design"
 
-#: actions/groupdesignsettings.php:155
+#. 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."
@@ -2874,19 +2947,26 @@ msgstr ""
 "Customise the way your group looks with a background image and a colour "
 "palette of your choice."
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 msgid "Design preferences saved."
 msgstr "Design preferences saved."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2894,106 +2974,115 @@ 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:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Upload"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Crop"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logo updated."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s group members, page %2$d"
 
-#: actions/groupmembers.php:122
+#. 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."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr ""
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: 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: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "Groups"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "Groups, page %d"
 
-#: actions/groups.php:90
-#, php-format
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 "%%%%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 "
@@ -3001,11 +3090,13 @@ msgstr ""
 "for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
 "%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -3014,25 +3105,31 @@ msgstr ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 "Separate the terms by spaces; they must be 3 characters or more."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Group search"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "No results."
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 "If you can't find the group you're looking for, you can [create it](%%action."
 "newgroup%%) yourself."
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3042,21 +3139,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Error removing the block."
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "IM settings"
@@ -3065,112 +3162,120 @@ msgstr "IM settings"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address 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 IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM is not available."
 
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "Current confirmed Jabber/GTalk address."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 ""
 "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 IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "IM preferences"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Send me notices through Jabber/GTalk."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "Post a notice when my Jabber/GTalk status changes."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, fuzzy
+msgid ""
+"Send me replies through Jabber/Google Talk 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.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Publish a MicroID for my Jabber/GTalk address."
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Preferences saved."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 IM address that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "Cannot normalize that Jabber ID"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "Not a valid Jabber ID"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "Jabber ID already belongs to another user."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3180,74 +3285,79 @@ 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 IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 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.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 #, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "Couldn't delete IM confirmation."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "IM confirmation cancelled."
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging 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."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 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:40
+#: 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:44
+#: 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:77
+#: 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:116
+#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "Invitation(s) sent"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Invite new users"
 
@@ -3255,7 +3365,7 @@ 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:139
+#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3264,7 +3374,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3273,7 +3383,7 @@ 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:153
+#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3286,7 +3396,7 @@ 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:167
+#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3295,7 +3405,7 @@ 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:177
+#: 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!"
@@ -3304,34 +3414,35 @@ msgstr ""
 "on the site. Thanks for growing the community!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: 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:217
+#: 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:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: 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:227
+#: 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:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Send"
@@ -3339,7 +3450,7 @@ 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:263
+#: 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"
@@ -3349,7 +3460,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5236,7 +5347,7 @@ msgid "Application profile"
 msgstr "Application profile"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr ""
 
@@ -6546,7 +6657,7 @@ msgid "Plugins"
 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:898
 msgid "Version"
 msgstr "Version"
 
@@ -6668,7 +6779,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6933,214 +7044,214 @@ msgid "Other"
 msgstr "Other"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Untitled page"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "Primary site navigation"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Personal profile and friends timeline"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
 #. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personal"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "Account"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: lib/action.php:560
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Connect to services"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "Connect"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: lib/action.php:566
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Change site configuration"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: 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"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Invite"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: lib/action.php:582
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Logout from the site"
 
 #. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Logout"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Create an account"
 
 #. 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Register"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 msgctxt "TOOLTIP"
 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Login"
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: 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:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "Help"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: lib/action.php:611
 msgctxt "MENU"
 msgid "Search"
 msgstr "Search"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:620 lib/adminpanelaction.php:387
+#: 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:687
+#: 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:757
+#: 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:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "Secondary site navigation"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "Help"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "About"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "F.A.Q."
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "Privacy"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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
+#: lib/action.php:902
 msgid "Contact"
 msgstr "Contact"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "Badge"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "StatusNet software licence"
 
@@ -7148,7 +7259,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7158,7 +7269,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** is a microblogging service."
@@ -7167,7 +7278,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7179,50 +7290,50 @@ msgstr ""
 "org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "Before"
 
@@ -7270,6 +7381,13 @@ msgstr ""
 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."
@@ -7473,7 +7591,7 @@ msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Icon for this application"
 
@@ -8077,12 +8195,12 @@ 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "Upload file"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
@@ -8823,11 +8941,11 @@ msgstr "Send a notice"
 msgid "What's up, %s?"
 msgstr "What's up, %s?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr ""
 
@@ -9019,6 +9137,13 @@ msgstr "User ID"
 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:98
+msgid "Groups"
+msgstr "Groups"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9437,6 +9562,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "Personal"
-#~ msgstr "Personal"
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index d26915da1d..22894c6e13 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:15+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:34:10+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 (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -84,7 +84,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -136,6 +136,9 @@ msgstr "Ne estas tiu paĝo."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -153,7 +156,7 @@ msgstr "Ne estas tiu paĝo."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -328,8 +331,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -349,13 +352,15 @@ msgstr "Malsukcesis ĝisdatigi uzanton"
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -394,11 +399,12 @@ msgstr[1] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -408,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Malsukcesis ĝisdatigi vian desegnon."
 
@@ -423,7 +429,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -814,9 +820,9 @@ msgstr ""
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -846,7 +852,7 @@ msgstr "Datumbaza eraro enigi la uzanton de *OAuth-aplikaĵo."
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -854,7 +860,7 @@ 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:335
+#: 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
@@ -926,7 +932,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1266,12 +1272,19 @@ msgstr "Metodo de API ne troviĝas."
 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 "Eraris enmeti novan abonon."
+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
@@ -1283,7 +1296,7 @@ msgstr "Serĉi enhavon ĉe la retejo"
 #: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
 #, fuzzy
 msgid "Can only fave notices."
-msgstr "Serĉi enhavon ĉe la retejo"
+msgstr "Nur avizoj estas ŝatmarkeblaj."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
 #: actions/atompubfavoritefeed.php:259
@@ -1295,7 +1308,7 @@ msgstr "Nekonata"
 #: actions/atompubfavoritefeed.php:267
 #, fuzzy
 msgid "Already a favorite."
-msgstr "Aldoni al ŝatolisto"
+msgstr "Jam en la ŝatolisto."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
@@ -1304,11 +1317,18 @@ msgstr "Aldoni al ŝatolisto"
 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 "Eraris enmeti novan abonon."
+msgstr "Estas neeble aldoni anecon de aliulo."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
@@ -1321,7 +1341,7 @@ msgstr "Serĉi enhavon ĉe la retejo"
 #: actions/atompubmembershipfeed.php:259
 #, fuzzy
 msgid "Unknown group."
-msgstr "Nekonata"
+msgstr "Nekonata grupo."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
 #: actions/atompubmembershipfeed.php:267
@@ -1338,7 +1358,7 @@ msgstr ""
 #: actions/atompubshowfavorite.php:90
 #, fuzzy
 msgid "No such favorite."
-msgstr "Ne ekzistas tia dosiero."
+msgstr "Ne ekzistas tia ŝatataĵo."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
 #: actions/atompubshowfavorite.php:151
@@ -1352,7 +1372,17 @@ msgstr "Malsukcesis forigi ŝataton."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1365,12 +1395,12 @@ msgstr "Malsukcesis forigi ŝataton."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1382,7 +1412,7 @@ msgstr "Ne estas tiu grupo."
 #: actions/atompubshowmembership.php:91
 #, fuzzy
 msgid "Not a member."
-msgstr "Ĉiuj grupanoj"
+msgstr "Ne estas ano."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:151
@@ -1397,7 +1427,7 @@ msgstr "Ne eblas forigi abonon al vi mem."
 #: actions/atompubsubscriptionfeed.php:74
 #, fuzzy, php-format
 msgid "No such profile id: %d."
-msgstr "Ne ekzistas tia profilo."
+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.
@@ -1410,7 +1440,14 @@ msgstr "Vi ne abonis tiun profilon."
 #: actions/atompubshowsubscription.php:157
 #, fuzzy
 msgid "Cannot delete someone else's subscription."
-msgstr "Ne eblas forigi abonon al vi mem."
+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
@@ -1427,7 +1464,7 @@ msgstr ""
 #: actions/atompubsubscriptionfeed.php:267
 #, fuzzy, php-format
 msgid "Unknown profile %s."
-msgstr "Nekonata dosiertipo"
+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.
@@ -1444,12 +1481,15 @@ msgstr "Ne estas tiu aldonaĵo."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Neniu kromnomo."
 
@@ -1481,7 +1521,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Uzanto sen egala profilo."
@@ -1490,7 +1530,7 @@ msgstr "Uzanto sen egala profilo."
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Vizaĝbilda agordo"
 
@@ -1499,7 +1539,7 @@ msgstr "Vizaĝbilda agordo"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Originala"
 
@@ -1508,7 +1548,7 @@ msgstr "Originala"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Antaŭrigardo"
 
@@ -1547,7 +1587,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Perdiĝis nia dosiera datumo."
 
@@ -1612,7 +1652,8 @@ msgstr "Vi jam blokis la uzanton."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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"
 
@@ -1634,7 +1675,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Ne"
@@ -1652,7 +1693,7 @@ msgstr "Ne bloki la uzanton"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Jes"
@@ -1862,7 +1903,7 @@ 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:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Problemo okazas pri via seancĵetono."
 
@@ -1896,7 +1937,7 @@ msgstr "Viŝi ĉi tiun aplikon"
 #: actions/deletegroup.php:64
 #, fuzzy
 msgid "You must be logged in to delete a group."
-msgstr "Ensalutu por eksaniĝi."
+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.
@@ -1931,7 +1972,7 @@ msgstr "%1$s eksaniĝis de grupo %2$s"
 #: actions/deletegroup.php:176 actions/deletegroup.php:202
 #, fuzzy
 msgid "Delete group"
-msgstr "Forigi uzanton"
+msgstr "Forigi grupon"
 
 #. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
@@ -1959,12 +2000,13 @@ msgstr "Forigi la uzanton"
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2124,13 +2166,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Fono"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2343,14 +2385,15 @@ 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:70 actions/newgroup.php:65
+#: 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: 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:107 actions/grouplogo.php:112
+#: 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."
 
@@ -2408,7 +2451,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2437,7 +2480,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2550,7 +2593,7 @@ 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 IM 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
@@ -2568,7 +2611,7 @@ msgstr ""
 "alvenkeston (kaj spamkeston!) pri la kodo kaj instrukcio pri kiel uzi ĝin."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2739,62 +2782,77 @@ msgstr "Ne estas aldonaĵo."
 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!"
 
-#: actions/finishremotesubscribe.php:80
+#. 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."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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!"
 
-#: actions/finishremotesubscribe.php:99
+#. 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."
 
-#: actions/finishremotesubscribe.php:110
+#. 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."
 
-#: actions/finishremotesubscribe.php:113
+#. 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."
 
-#: actions/finishremotesubscribe.php:118
+#. 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."
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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."
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Ne ekzistas tia dosiero."
 
-#: actions/getfile.php:83
+#. 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."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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."
 
-#: actions/grantrole.php:75
+#. 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."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2804,37 +2862,47 @@ msgstr "Uzanto jam havas la rolon."
 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 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:76 actions/groupunblock.php:77
+#: 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."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "Neniu grupo elektita."
 
-#: actions/groupblock.php:91
+#. 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."
 
-#: actions/groupblock.php:95
+#. 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."
 
-#: actions/groupblock.php:100
+#. 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."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2845,50 +2913,62 @@ 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:182
+#: actions/groupblock.php:191
 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "Bloki la uzanton de la grupo"
 
-#: actions/groupblock.php:206
+#. 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."
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Neniu ID."
 
-#: actions/groupdesignsettings.php:68
+#. 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."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Grupa desegno"
 
-#: actions/groupdesignsettings.php:155
+#. 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."
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 msgid "Design preferences saved."
 msgstr "Desegna agordo konservita."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2896,106 +2976,115 @@ 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:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Alŝuti"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Tranĉi"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Emblemo ĝisdatigita."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Grupanoj de %1$s, paĝo %2$d"
 
-#: actions/groupmembers.php:122
+#. 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"
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "Administranto"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Bloki"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Bloki ĉi tiun uzanton"
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Estrigi"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: 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: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "Grupoj"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "Grupoj, paĝo %d"
 
-#: actions/groups.php:90
-#, php-format
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 "En %%%%site.name%%%% grupoj povas vi babili kun personoj kun similaj "
 "interesoj. Post kiam vi aliĝas al grupo vi povos sendi mesaĝon per sintakso"
@@ -3003,11 +3092,13 @@ msgstr ""
 "(%%%%action.groupsearch%%%%) aŭ [kreu vian propran grupon!](%%%%action."
 "newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -3016,25 +3107,31 @@ msgstr ""
 "Serĉi grupon ĉe %%site.name%% per ĝia nomo, loko, aŭ priskribo. Dividu "
 "serĉvortojn per spaco; ili estu almenaŭ 3 literojn longaj."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Grup-serĉo"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "Neniu rezulto."
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"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%%)."
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3044,21 +3141,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Eraro ĉe provo malbloki."
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "Tujmesaĝila agordo."
@@ -3067,112 +3164,120 @@ msgstr "Tujmesaĝila agordo."
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address 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 IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP 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 IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "Nuna konfirmita Jabber/GTalk-adreso."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 ""
 "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 IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Tujmesaĝilaj preferoj"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Sendu al mi avizojn per Jabber/GTalk."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "Afiŝu avizon tiam, kiam mia Jabber/GTalk-stato ŝanĝiĝas."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, fuzzy
+msgid ""
+"Send me replies through Jabber/Google Talk 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.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Publikigu MikroID por mia Jabber/GTalk-adreso."
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Prefero konservita."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 IM address that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "Malsukcesis normigi la Jabber-ID"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "Tio ne estas valida Jabber-ID"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "Jabber-ID jam apartenas al alia uzanto."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3182,75 +3287,80 @@ msgstr ""
 "Konfirmo-kodo senditas al la tujmesaĝila adreso aldonita. Vi devas permesi "
 "al %s sendi mesaĝojn al vi."
 
-#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 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.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 #, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "Malsukcesis forigi tujmesaĝila agordo."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "Tujmesaĝila konfirmo nuligita."
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging 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."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 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:40
+#: 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:44
+#: 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:77
+#: 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:116
+#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "Invito(j) senditas"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Inviti novajn uzantojn"
 
@@ -3258,7 +3368,7 @@ 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:139
+#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3267,7 +3377,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3276,7 +3386,7 @@ 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:153
+#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3287,7 +3397,7 @@ 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:167
+#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3296,7 +3406,7 @@ 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:177
+#: 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!"
@@ -3305,34 +3415,35 @@ msgstr ""
 "retejo. Dankon por kreskigi la komunumon!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: 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:217
+#: 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:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: 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:227
+#: 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:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Sendi"
@@ -3340,7 +3451,7 @@ 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:263
+#: 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"
@@ -3350,7 +3461,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5232,7 +5343,7 @@ msgid "Application profile"
 msgstr "Aplikaĵa profilo"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Bildsimbolo"
 
@@ -6543,7 +6654,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:885
+#: actions/version.php:198 lib/action.php:898
 msgid "Version"
 msgstr "Versio"
 
@@ -6669,7 +6780,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr "Ne troviĝas datumbaza nomo aŭ DSN ie ajn."
 
@@ -6934,214 +7045,214 @@ msgid "Other"
 msgstr "Alia"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Sentitola paĝo"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "Unua reteja navigado"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Tempstrio pri vi kaj amikoj"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
 #. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Persona"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "Konto"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: lib/action.php:560
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Konekti al servoj"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "Konekti"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: lib/action.php:566
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Ŝanĝi agordojn de la retejo"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administri"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: 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"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Inviti"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: lib/action.php:582
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Elsaluti el la retejo"
 
 #. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr " Elsaluti"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Krei konton"
 
 #. 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:580 lib/logingroupnav.php:85
+#: 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:583
+#: lib/action.php:596
 msgctxt "TOOLTIP"
 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Ensaluti"
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: 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:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "Helpo"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: lib/action.php:611
 msgctxt "MENU"
 msgid "Search"
 msgstr "Serĉi"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:620 lib/adminpanelaction.php:387
+#: 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:687
+#: 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:757
+#: 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:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "Dua reteja navigado"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "Helpo"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "Enkonduko"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "Oftaj demandoj"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "Serva Kondiĉo"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "Privateco"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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
+#: lib/action.php:902
 msgid "Contact"
 msgstr "Kontakto"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "Insigno"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "Permesilo de la programaro StatusNet"
 
@@ -7149,7 +7260,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7159,7 +7270,7 @@ msgstr ""
 "site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** estas mikrobloga servo."
@@ -7168,7 +7279,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7180,27 +7291,27 @@ msgstr ""
 "licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Enhava kaj datuma aŭtorrajto apartenas al kontribuintoj. Ĉiuj rajtoj "
@@ -7208,25 +7319,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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "Antaŭe"
 
@@ -7274,6 +7385,13 @@ msgstr ""
 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."
@@ -7477,7 +7595,7 @@ msgid "Failed to delete revoked token."
 msgstr "Malsukcesis forigi revokitan ĵetonon."
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Emblemo por tiu ĉi aplikaĵo"
 
@@ -8096,12 +8214,12 @@ msgstr "Datumbaza eraro"
 
 #. 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "Alŝuti dosieron"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
@@ -8931,11 +9049,11 @@ msgstr "Sendi avizon"
 msgid "What's up, %s?"
 msgstr "Kio novas, %s?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "Aldoni"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "Aldoni dosieron"
 
@@ -9129,6 +9247,13 @@ msgstr "ID de uzanto"
 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:98
+msgid "Groups"
+msgstr "Grupoj"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9552,6 +9677,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "Personal"
-#~ msgstr "Persona"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 6f0735ba07..14100befac 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:16+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:34: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-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -84,7 +84,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -136,6 +136,9 @@ msgstr "No existe tal página."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -153,7 +156,7 @@ msgstr "No existe tal página."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -329,8 +332,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -350,13 +353,15 @@ msgstr "No se pudo actualizar el usuario."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -395,11 +400,12 @@ msgstr[1] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -409,7 +415,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "No se pudo actualizar tu diseño."
 
@@ -423,7 +429,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -821,9 +827,9 @@ msgstr "No estás autorizado."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -854,7 +860,7 @@ msgstr "Error de base de datos al insertar usuario de la aplicación OAuth."
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -862,7 +868,7 @@ 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:335
+#: 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
@@ -934,7 +940,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1273,6 +1279,13 @@ msgstr "Método de API no encontrado."
 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
+#, fuzzy, php-format
+msgid "Notices %1$s has favorited on %2$s"
+msgstr "¡Actualizaciones de %1$s y sus amistades 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
@@ -1311,6 +1324,13 @@ msgstr "Agregar a favoritos"
 msgid "%s group memberships"
 msgstr "Miembros del 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 "%s es miembro de los grupos"
+
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
 #: actions/atompubmembershipfeed.php:219
 #, fuzzy
@@ -1359,7 +1379,17 @@ msgstr "No se pudo borrar favorito."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1372,12 +1402,12 @@ msgstr "No se pudo borrar favorito."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1419,6 +1449,13 @@ msgstr "No te has suscrito a ese perfil."
 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."
@@ -1451,12 +1488,15 @@ msgstr "No existe tal archivo adjunto."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: 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."
 
@@ -1488,7 +1528,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Usuario sin perfil coincidente."
@@ -1497,7 +1537,7 @@ msgstr "Usuario sin perfil coincidente."
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Configuración de imagen"
 
@@ -1506,7 +1546,7 @@ msgstr "Configuración de imagen"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Original"
 
@@ -1515,7 +1555,7 @@ msgstr "Original"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Vista previa"
 
@@ -1552,7 +1592,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Se perdió nuestros datos de archivo."
 
@@ -1617,7 +1657,8 @@ msgstr "Ya has bloqueado a este usuario."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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."
 
@@ -1640,7 +1681,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "No"
@@ -1658,7 +1699,7 @@ msgstr "No bloquear a este usuario"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Sí"
@@ -1869,7 +1910,7 @@ 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:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Hubo problemas con tu clave de sesión."
 
@@ -1964,12 +2005,13 @@ msgstr "Borrar 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.
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2130,13 +2172,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Fondo"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2351,14 +2393,15 @@ 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:70 actions/newgroup.php:65
+#: 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: 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:107 actions/grouplogo.php:112
+#: 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."
 
@@ -2416,7 +2459,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2445,7 +2488,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2561,7 +2604,7 @@ 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 IM 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
@@ -2580,7 +2623,7 @@ msgstr ""
 "instrucciones sobre cómo usarlo."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2753,62 +2796,77 @@ msgstr "Sin archivo adjunto"
 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!"
 
-#: actions/finishremotesubscribe.php:80
+#. 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."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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!"
 
-#: actions/finishremotesubscribe.php:99
+#. 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."
 
-#: actions/finishremotesubscribe.php:110
+#. 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."
 
-#: actions/finishremotesubscribe.php:113
+#. 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."
 
-#: actions/finishremotesubscribe.php:118
+#. 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."
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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."
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "No existe tal archivo."
 
-#: actions/getfile.php:83
+#. 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."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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."
 
-#: actions/grantrole.php:75
+#. 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."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2818,37 +2876,47 @@ msgstr "El usuario ya tiene esta función."
 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 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:76 actions/groupunblock.php:77
+#: 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"
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "Grupo no especificado."
 
-#: actions/groupblock.php:91
+#. 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."
 
-#: actions/groupblock.php:95
+#. 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."
 
-#: actions/groupblock.php:100
+#. 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"
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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"
 
-#: actions/groupblock.php:160
+#. 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,34 +2928,39 @@ msgstr ""
 "sucesivo."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: actions/groupblock.php:191
 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "Bloquear este usuario de este grupo"
 
-#: actions/groupblock.php:206
+#. 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 "
 "grupo."
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Sin ID."
 
-#: actions/groupdesignsettings.php:68
+#. 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."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Diseño de grupo"
 
-#: actions/groupdesignsettings.php:155
+#. 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."
@@ -2895,19 +2968,26 @@ msgstr ""
 "Personaliza el aspecto de tu grupo con una imagen de fondo y la paleta de "
 "colores que prefieras."
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 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:145 actions/grouplogo.php:200
+#: 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:157
+#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2916,106 +2996,115 @@ msgstr ""
 "debe ser %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Subir"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Cortar"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logo actualizado."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s miembros de grupo, página %2$d"
 
-#: actions/groupmembers.php:122
+#. 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."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Bloquear"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr ""
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Convertir en administrador"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: 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: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "Grupos"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "Grupos, página %d"
 
-#: actions/groups.php:90
-#, php-format
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 "Grupos %%%%site.name%%%% te permiten encontrar gente de intereses afines a "
 "los tuyo y hablar con ellos. Después de unirte al grupo, podrás enviarle "
@@ -3023,11 +3112,13 @@ msgstr ""
 "encuentras un grupo que te guste? ¡Intenta [buscar otro](%%%%action."
 "groupsearch%%%%) o [crea tú uno!](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -3036,25 +3127,31 @@ msgstr ""
 "Busca grupos en %%site.name%% por su nombre, ubicación o descripción. Separa "
 "los términos con espacios. Los términos tienen que ser de 3 o más caracteres."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Búsqueda en grupos"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "No se obtuvo resultados."
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"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."
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3064,21 +3161,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: 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 instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "Configuración de mensajería instantánea"
@@ -3087,114 +3184,122 @@ msgstr "Configuración de mensajería instantánea"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address 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 IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP 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 IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "Dirección actual Jabber/Gtalk confirmada."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 ""
 "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 IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Preferencias de mensajería instantánea"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Enviarme mensajes por Jabber/GTalk"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "Publicar un mensaje cuando el estado de mi Jabber/GTalk cambie."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, fuzzy
+msgid ""
+"Send me replies through Jabber/Google Talk 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.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Publicar un MicroID para mi cuenta Jabber/GTalk."
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Preferencias guardadas."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 IM address that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "No se puede normalizar este Jabber ID"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "Jabber ID no válido"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "El Jabber ID ya pertenece a otro usuario."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3205,75 +3310,80 @@ msgstr ""
 "instantánea que agregaste. Debes aprobar a %s para que pueda enviarte "
 "mensajes."
 
-#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 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.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 #, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "No se pudo eliminar la confirmación de mensajería instantánea."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 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: Message given trying to remove an Instant Messaging 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."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 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:40
+#: 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:44
+#: 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:77
+#: 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:116
+#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "Invitacion(es) enviada(s)"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Invitar nuevos usuarios:"
 
@@ -3281,7 +3391,7 @@ 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:139
+#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3290,7 +3400,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3299,7 +3409,7 @@ 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:153
+#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3312,7 +3422,7 @@ 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:167
+#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3321,7 +3431,7 @@ 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:177
+#: 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!"
@@ -3330,34 +3440,35 @@ msgstr ""
 "registren en el sitio. ¡Gracias por extender la comunidad! "
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: 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:217
+#: 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:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: 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:227
+#: 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:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Enviar"
@@ -3365,7 +3476,7 @@ 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:263
+#: 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"
@@ -3375,7 +3486,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5306,7 +5417,7 @@ msgid "Application profile"
 msgstr "Perfil de la aplicación"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icono"
 
@@ -6645,7 +6756,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:885
+#: actions/version.php:198 lib/action.php:898
 msgid "Version"
 msgstr "Versión"
 
@@ -6775,7 +6886,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr "Ningún nombre de base de datos o DSN encontrado."
 
@@ -7044,214 +7155,214 @@ msgid "Other"
 msgstr "Otro"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: 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:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "Navegación de sitio primario"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Perfil personal y línea temporal de amistades"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
 #. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personal"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "Cuenta"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: lib/action.php:560
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Conectar a los servicios"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "Conectarse"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: lib/action.php:566
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Cambiar la configuración del sitio"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: 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"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Invitar"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: lib/action.php:582
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Cerrar sesión en el sitio"
 
 #. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Cerrar sesión"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Crear una cuenta"
 
 #. 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrarse"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Iniciar sesión en el sitio"
 
 #. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:586 lib/logingroupnav.php:77
+#: 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:589
+#: 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:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "Ayuda"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: lib/action.php:611
 msgctxt "MENU"
 msgid "Search"
 msgstr "Buscar"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:620 lib/adminpanelaction.php:387
+#: 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:687
+#: 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:757
+#: 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:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "Navegación de sitio secundario"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "Ayuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "Acerca de"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "Preguntas Frecuentes"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "TOS"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "Privacidad"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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
+#: lib/action.php:902
 msgid "Contact"
 msgstr "Ponerse en contacto"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "Insignia"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "Licencia de software de StatusNet"
 
@@ -7259,7 +7370,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7269,7 +7380,7 @@ msgstr ""
 "[%%site.broughtby%%**](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** es un servicio de microblogueo."
@@ -7278,7 +7389,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7290,27 +7401,27 @@ msgstr ""
 "licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Derechos de autor de contenido y datos por los colaboradores. Todos los "
@@ -7318,7 +7429,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:1004
+#: lib/action.php:1017
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -7326,19 +7437,19 @@ msgstr ""
 "$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "Antes"
 
@@ -7388,6 +7499,13 @@ msgstr ""
 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."
@@ -7593,7 +7711,7 @@ msgid "Failed to delete revoked token."
 msgstr "No se pudo eliminar el token revocado."
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Icono para esta aplicación"
 
@@ -8214,12 +8332,12 @@ msgstr "Error de la base de datos"
 
 #. 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "Subir archivo"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
@@ -9058,11 +9176,11 @@ msgstr "Enviar un mensaje"
 msgid "What's up, %s?"
 msgstr "¿Qué tal, %s?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "Adjuntar un archivo"
 
@@ -9256,6 +9374,13 @@ msgstr "ID de usuario"
 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:98
+msgid "Groups"
+msgstr "Grupos"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9680,6 +9805,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "Personal"
-#~ msgstr "Personal"
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index 49a8ecc3ef..0170e30010 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:17+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:34: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,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 (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -84,7 +84,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -136,6 +136,9 @@ msgstr "چنین صفحه‌ای وجود ندارد."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -153,7 +156,7 @@ msgstr "چنین صفحه‌ای وجود ندارد."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -326,8 +329,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -347,13 +350,15 @@ msgstr "نمی‌توان کاربر را به‌هنگام‌سازی کرد."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -388,11 +393,12 @@ msgstr[0] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -402,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "نمی‌توان طرح‌تان به‌هنگام‌سازی کرد."
 
@@ -417,7 +423,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -812,9 +818,9 @@ msgstr "شما شناسایی نشده اید."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -844,7 +850,7 @@ msgstr "هنگام افزودن کاربر برنامهٔ OAuth در پایگا
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -852,7 +858,7 @@ 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:335
+#: 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
@@ -927,7 +933,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1263,6 +1269,13 @@ msgstr "رابط مورد نظر پیدا نشد."
 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
@@ -1301,6 +1314,13 @@ msgstr "افزودن به برگزیده‌ها"
 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
@@ -1349,7 +1369,17 @@ msgstr "نمی‌توان پیام برگزیده را حذف کرد."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1362,12 +1392,12 @@ msgstr "نمی‌توان پیام برگزیده را حذف کرد."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1409,6 +1439,13 @@ msgstr "شما مشترک آن نمایه نیستید."
 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."
@@ -1441,12 +1478,15 @@ msgstr "چنین پیوستی وجود ندارد."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "لقبی وجود ندارد."
 
@@ -1479,7 +1519,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "کاربر نمایهٔ تطبیق ندارد."
@@ -1488,7 +1528,7 @@ msgstr "کاربر نمایهٔ تطبیق ندارد."
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "تنظیمات چهره"
 
@@ -1497,7 +1537,7 @@ msgstr "تنظیمات چهره"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "اصلی"
 
@@ -1506,7 +1546,7 @@ msgstr "اصلی"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "پیش‌نمایش"
 
@@ -1546,7 +1586,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "فایل اطلاعات خود را گم کرده ایم."
 
@@ -1611,7 +1651,8 @@ msgstr "شما هم اکنون آن کاربر را مسدود کرده اید."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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 "مسدود کردن کاربر"
 
@@ -1635,7 +1676,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "خیر"
@@ -1653,7 +1694,7 @@ msgstr "کاربر را مسدود نکن"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "بله"
@@ -1863,7 +1904,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:118
-#: lib/action.php:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "یک مشکل با رمز نشست شما وجود داشت."
 
@@ -1961,12 +2002,13 @@ 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.
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2129,13 +2171,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "پیش‌زمینه"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2352,14 +2394,15 @@ 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:70 actions/newgroup.php:65
+#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 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:107 actions/grouplogo.php:112
+#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "برای ویرایش گروه باید یک مدیر باشید."
 
@@ -2417,7 +2460,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2446,7 +2489,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2562,7 +2605,7 @@ 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 IM 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
@@ -2580,7 +2623,7 @@ msgstr ""
 "کد و راهنمای استفادهٔ آن بررسی کنید."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2753,62 +2796,77 @@ msgstr "هیچ پیوستی وجود ندارد."
 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 "انتظار چنین واکنشی وجود نداشت!"
 
-#: actions/finishremotesubscribe.php:80
+#. 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 "کاربری که دنبالش هستید وجود ندارد."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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 "شما می‌توانید از دنبال کردن محلی استفاده کنید!"
 
-#: actions/finishremotesubscribe.php:99
+#. 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 "این کاربر شما را از دنبال کردن خودش منع کرده است."
 
-#: actions/finishremotesubscribe.php:110
+#. 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 "شما شناسایی نشده اید."
 
-#: actions/finishremotesubscribe.php:113
+#. 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 "نمی‌توان نشانهٔ درخواست شما را به نشانهٔ دسترسی تبدیل کرد."
 
-#: actions/finishremotesubscribe.php:118
+#. 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 استفاده می‌کند."
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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 "خطا هنگام به‌هنگام‌سازی نمایهٔ از راه دور."
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "چنین پرونده‌ای وجود ندارد."
 
-#: actions/getfile.php:83
+#. TRANS: Client error displayed when requesting a file without having read access to it.
+#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "نمی‌توان پرونده را خواند."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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 "این نقش از قبل تعیین شده است و نمی‌تواند کارگذاشته شود."
 
-#: actions/grantrole.php:75
+#. 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 "شما نمی‌توانید در این وب‌گاه نقش‌های کاربری را اهدا کنید."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2818,37 +2876,47 @@ msgstr "کاربر از قبل این وظیفه را داشته است."
 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 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:76 actions/groupunblock.php:77
+#: 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 "کاربری با چنین شناسه‌ای وجود ندارد."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "گروهی مشخص نشده است."
 
-#: actions/groupblock.php:91
+#. 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 "فقط یک مدیر می‌تواند اعضای یک گروه را مسدود کند."
 
-#: actions/groupblock.php:95
+#. 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 "هم اکنون دسترسی کاربر به گروه مسدود شده است."
 
-#: actions/groupblock.php:100
+#. 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 "کاربر عضو گروه نیست."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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 "دسترسی کاربر به گروه مسدود شود"
 
-#: actions/groupblock.php:160
+#. 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,156 +2928,177 @@ msgstr ""
 "مشترک گروه شوند."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "دسترسی کاربر به گروه مسدود شود"
 
-#: actions/groupblock.php:206
+#. 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 "اشکال پایگاه داده در مسدود کردن کاربر"
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "هیچ ID وجود ندارد."
 
-#: actions/groupdesignsettings.php:68
+#. 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 "برای ویرایش گروه باید وارد شوید."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "ظاهر گروه"
 
-#: actions/groupdesignsettings.php:155
+#. 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 "ظاهر گروه را تغییر دهید تا شما را راضی کند."
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 msgid "Design preferences saved."
 msgstr "ترجیحات طرح ذخیره شد."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: 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:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "پایین‌گذاری"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "برش"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "نشان به‌هنگام‌سازی شد."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "اعضای گروه %1$s، صفحهٔ %2$d"
 
-#: actions/groupmembers.php:122
+#. TRANS: Page notice for group members page.
+#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "یک فهرست از کاربران در این گروه"
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "مدیر"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "بستن کاربر"
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "به روز رسانی کابران %1$s در %2$s"
 
-#. TRANS: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "گروه‌ها"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "گروه‌ها، صفحهٔ %d"
 
-#: actions/groups.php:90
-#, php-format
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 "گروه‌های %%%site.name%%% به شما اجازه می‌دهد با کسانی که همانند شما "
 "علاقه‌مندی‌های خاصی دارد صحبت کنید. بعد از پیوستن به یک گروه می‌توانید به شکل !"
@@ -3017,11 +3106,13 @@ msgstr ""
 "نمی‌بینید؟ می‌توانید برای یافتن آن [بگردید](%%%action.groupsearch%%%) !یا [آن "
 "را خودتان بسازید](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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 "یک گروه جدید بساز"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -3030,25 +3121,31 @@ msgstr ""
 "برای جست‌وجوی گروه‌ها در %%site.name%% از نام، مکان یا توصیف‌شان استفاده کنید. "
 "عبارت‌ها را با فاصله جدا کنید؛ آن‌ها باید ۳ نویسه یا بیش‌تر باشند."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "جست‌وجوی گروه"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "نتیجه‌ای وجود ندارد."
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 "اگر نمی‌توانید گروه مورد نظر را پیدا کنید خودتان می‌توانید آن را [ایجاد](%%"
 "action.newgroup%%) کنید."
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3058,21 +3155,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "اشکال در پاکسازی"
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "تنظیمات پیام‌رسان فوری"
@@ -3081,111 +3178,119 @@ msgstr "تنظیمات پیام‌رسان فوری"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 "شما می‌توانید پیام‌های خود را با استفاده از [پیام‌رسان‌های](%%doc.im%%) Jabber "
 "یا Gtalk ارسال/دریافت کنید. نشانی خود را در این قسمت تنظیم کنید"
 
-#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "پیام‌رسان فوری در دسترس نیست."
 
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "نشانی Jabber/GTalk تایید شده کنونی"
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 را به فهرست خود اضافه کرده اید؟) "
 
-#. TRANS: IM address input field instructions in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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 مطمئن شوید."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "ترجیحات پیام‌رسان فوری"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "پیام‌ها را از راه Jabber/GTalk برای من بفرست."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "هر وقت که وضعیت Jabber/Gtalk من تغییر کرد، یک پیام بفرست."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, fuzzy
+msgid ""
+"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
 msgstr "پاسخ کسانی که من آن‌ها را دنبال نمی‌کنم را با Jabber/Gtalk برایم بفرست."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "یک شناسهٔ کوچک برای Jabber/Gtalk من منتشر کن."
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "تنظیمات ذخیره شد."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 IM address that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "نمی‌توان شناسهٔ Jabber را تایید کرد"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "شناسهٔ Jabber درست نیست"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "شناسهٔ Jabber به یک کاربر دیگر مربوط است."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3195,74 +3300,79 @@ msgstr ""
 "یک کد تایید به نشانی پیام‌رسانی که اضافه کرده‌اید، فرستاده شد. شما باید %s را "
 "برای فرستادن پیام به شما، تایید کنید."
 
-#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "نشانی پیام رسان اشتباه است."
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 #, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "نمی‌توان تایید پیام‌رسان فوری را پاک کرد."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "تایید پیام‌رسان فوری لغو شد."
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging address that is not
 #. TRANS: registered for the active user.
 #: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "این شناسهٔ Jabber شما نیست."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 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:40
+#: 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:44
+#: 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:77
+#: 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:116
+#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "دعوت‌نامه(ها) فرستاده‌شد"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "دعوت کردن کاربران تازه"
 
@@ -3270,7 +3380,7 @@ 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:139
+#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3278,7 +3388,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3287,7 +3397,7 @@ 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:153
+#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3297,7 +3407,7 @@ 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:167
+#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3305,7 +3415,7 @@ msgstr[0] "دعوت‌نامه(ها) برای افراد زیر فرستاده 
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:177
+#: 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!"
@@ -3314,34 +3424,35 @@ msgstr ""
 "برای رشد اجتماع کاربران تشکر می‌کنیم!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: 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:217
+#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "نشانی‌های پست الکترونیکی"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: actions/invite.php:225
 msgid "Personal message"
 msgstr "پیام خصوصی"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:227
+#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "در صورت تمایل می‌توانید یک پیام به همراه دعوت نامه بفرستید."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "فرستادن"
@@ -3349,7 +3460,7 @@ 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:263
+#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s شما را دعوت کرده است که در %2$s به آن‌ها بپیوندید."
@@ -3359,7 +3470,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5264,7 +5375,7 @@ msgid "Application profile"
 msgstr "نمایهٔ برنامه"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "شمایل"
 
@@ -6591,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:885
+#: actions/version.php:198 lib/action.php:898
 msgid "Version"
 msgstr "نسخه"
 
@@ -6715,7 +6826,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr "هیچ پایگاه‌داده یا DSN هیچ‌جا پیدا نشد."
 
@@ -6985,214 +7096,214 @@ msgid "Other"
 msgstr "دیگر"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "صفحهٔ بدون عنوان"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "مسیریابی اصلی وب‌گاه"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 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:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "شخصی"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "حساب کاربری"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: 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:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "وصل‌شدن"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: 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:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "مدیر"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: lib/action.php:573
 #, 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:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "دعوت‌کردن"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: 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:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "خروج"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "ثبت‌نام"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "ورود"
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: lib/action.php:602
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "به من کمک کنید!"
 
 #. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "کمک"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: 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:620 lib/adminpanelaction.php:387
+#: 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:687
+#: lib/action.php:700
 msgid "Local views"
 msgstr "دید محلی"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:757
+#: lib/action.php:770
 msgid "Page notice"
 msgstr "پیام صفحه"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "مسیریابی فرعی وب‌گاه"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "کمک"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "دربارهٔ"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "سوال‌های رایج"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "شرایط سرویس"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "خصوصی"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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:902
 msgid "Contact"
 msgstr "تماس"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "نشان"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "StatusNet مجوز نرم افزار"
 
@@ -7200,7 +7311,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7210,7 +7321,7 @@ msgstr ""
 "broughtbyurl%%) برای شما راه‌اندازی شده است."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** یک سرویس میکروبلاگینگ است."
@@ -7219,7 +7330,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7231,50 +7342,50 @@ msgstr ""
 "org/licensing/licenses/agpl-3.0.html) در دسترس است."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "قبل از"
 
@@ -7323,6 +7434,13 @@ msgstr ""
 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."
@@ -7528,7 +7646,7 @@ msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "شمایل این برنامه"
 
@@ -8143,12 +8261,12 @@ 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "بارگذاری پرونده"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
@@ -8970,11 +9088,11 @@ msgstr "فرستادن یک پیام"
 msgid "What's up, %s?"
 msgstr "چه خبر، %s؟"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "پیوست کردن"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "یک فایل پیوست کنید"
 
@@ -9169,6 +9287,13 @@ msgstr "شناسه کاربر"
 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:98
+msgid "Groups"
+msgstr "گروه‌ها"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9589,6 +9714,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "Personal"
-#~ msgstr "شخصی"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index ce2dabb77f..1c3f8bbaa0 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -14,17 +14,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:18+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:34:20+0000\n"
 "Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -87,7 +87,7 @@ msgstr "Profiilikuva-asetukset"
 #. 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -139,6 +139,9 @@ msgstr "Sivua ei ole."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -156,7 +159,7 @@ msgstr "Sivua ei ole."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -328,8 +331,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -349,13 +352,15 @@ msgstr "Käyttäjän päivitys epäonnistui."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -390,11 +395,12 @@ msgstr[1] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -404,7 +410,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 #, fuzzy
 msgid "Could not update your design."
 msgstr "Ei voitu päivittää käyttäjää."
@@ -419,7 +425,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -821,9 +827,9 @@ msgstr "Sinulla ei ole valtuutusta tähän."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -856,7 +862,7 @@ msgstr "Tietokantavirhe tallennettaessa risutagiä: %s"
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -864,7 +870,7 @@ msgstr "Tietokantavirhe tallennettaessa risutagiä: %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:335
+#: 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
@@ -931,7 +937,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1270,6 +1276,13 @@ msgstr "API-metodia ei löytynyt."
 msgid "No such profile."
 msgstr "Tiedostoa ei ole."
 
+#. 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
@@ -1308,6 +1321,13 @@ msgstr "Lisää suosikkeihin"
 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
+#, fuzzy, php-format
+msgid "Groups %1$s is a member of on %2$s"
+msgstr "Ryhmät, joiden jäsen %s on"
+
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
 #: actions/atompubmembershipfeed.php:219
 #, fuzzy
@@ -1356,7 +1376,17 @@ msgstr "Ei voitu poistaa suosikkia."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1369,12 +1399,12 @@ msgstr "Ei voitu poistaa suosikkia."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1416,6 +1446,13 @@ msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
 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."
@@ -1448,12 +1485,15 @@ msgstr "Liitettä ei ole."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Tunnusta ei ole."
 
@@ -1485,7 +1525,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Käyttäjällä ei ole profiilia."
@@ -1494,7 +1534,7 @@ msgstr "Käyttäjällä ei ole profiilia."
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Profiilikuva-asetukset"
 
@@ -1503,7 +1543,7 @@ msgstr "Profiilikuva-asetukset"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Alkuperäinen"
 
@@ -1512,7 +1552,7 @@ msgstr "Alkuperäinen"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Esikatselu"
 
@@ -1551,7 +1591,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Tiedoston data hävisi."
 
@@ -1616,7 +1656,8 @@ msgstr "!!FUZZZY!!Olet jos tilannut seuraavien käyttäjien päivitykset:"
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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ä"
 
@@ -1636,7 +1677,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Ei"
@@ -1654,7 +1695,7 @@ msgstr "Älä estä tätä käyttäjää"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Kyllä"
@@ -1865,7 +1906,7 @@ msgstr "Sinä et kuulu tähän ryhmään."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Istuntoavaimesi kanssa oli ongelma."
 
@@ -1961,12 +2002,13 @@ msgstr "Poista käyttäjä"
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2130,13 +2172,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Tausta"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, fuzzy, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2364,14 +2406,15 @@ 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:70 actions/newgroup.php:65
+#: 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: 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:107 actions/grouplogo.php:112
+#: 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."
@@ -2431,7 +2474,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2461,7 +2504,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2578,7 +2621,7 @@ 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 IM 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
@@ -2597,7 +2640,7 @@ msgstr ""
 "miten sitä käytetään. "
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2765,66 +2808,81 @@ msgstr "Liitettä ei ole."
 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!"
 
-#: actions/finishremotesubscribe.php:80
+#. 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."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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!"
 
-#: actions/finishremotesubscribe.php:99
+#. 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ä."
 
-#: actions/finishremotesubscribe.php:110
+#. 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."
 
-#: actions/finishremotesubscribe.php:113
+#. 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."
 
-#: actions/finishremotesubscribe.php:118
+#. 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 "Tuntematon OMB-protokollan versio."
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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 "Virhe tapahtui etäprofiilin päivittämisessä"
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Tiedostoa ei ole."
 
-#: actions/getfile.php:83
+#. 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."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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 "Koko ei kelpaa."
 
+#. 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 ""
 
-#: actions/grantrole.php:75
+#. 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."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2834,38 +2892,48 @@ msgstr "Käyttäjällä ei ole profiilia."
 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 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:76 actions/groupunblock.php:77
+#: 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 "Ei profiilia tuolle ID:lle."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "Ryhmää ei ole määritelty."
 
-#: actions/groupblock.php:91
+#. 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ä."
 
-#: actions/groupblock.php:95
+#. 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ä."
 
-#: actions/groupblock.php:100
+#. 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."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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ä"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2874,166 +2942,189 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "Estä tätä käyttäjää osallistumassa tähän ryhmään"
 
-#: actions/groupblock.php:206
+#. 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 "Poista käyttäjän esto ryhmästä"
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 #, fuzzy
 msgid "No ID."
 msgstr "Ei Jabber ID -osoitetta"
 
-#: actions/groupdesignsettings.php:68
+#. 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."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Ryhmän ulkoasu"
 
-#: actions/groupdesignsettings.php:155
+#. 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 ""
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 msgid "Design preferences saved."
 msgstr "Ulkoasuasetukset tallennettu."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: actions/grouplogo.php:156
 #, fuzzy, 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:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Lataa"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Rajaa"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: 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:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Ryhmän %s jäsenet"
 
-#: actions/groupmembers.php:122
+#. 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ä."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "Ylläpito"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr ""
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: 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: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "Ryhmät"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "Ryhmät, sivu %d"
 
-#: actions/groups.php:90
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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ä"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -3043,23 +3134,29 @@ msgstr ""
 "kiinnostuksen kohteista. Erota hakutermit välilyönnillä; hakutermien pitää "
 "olla 3 tai useamman merkin pituisia."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Ryhmähaku"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "Ei tuloksia"
 
-#: actions/groupsearch.php:82
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3067,21 +3164,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Tapahtui virhe, kun estoa poistettiin."
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "Profiilikuva-asetukset"
@@ -3090,115 +3187,123 @@ msgstr "Profiilikuva-asetukset"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address 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 IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP 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 IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "Tämän hetken vahvistettu Jabber/GTalk -osoite."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 ""
 "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 IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Asetukset tallennettu."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Lähetä minulle päivityksiä Jabberilla/GTalkilla."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "Lähetä päivitys kun Jabber/GTalk -tilatietoni vaihtuu."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, fuzzy
+msgid ""
+"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
 msgstr ""
 "Lähetä Jabberilla/GTalkilla sellaistenkin ihmisten vastaukset, joita en ole "
 "tilannut. "
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Julkaise MicroID Jabber/GTalk-osoitteelleni."
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Asetukset tallennettu."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 IM address that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "Ei voida normalisoida Jabber ID -tunnusta"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "Tuo ei ole kelvollinen Jabber ID."
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "Jabber ID kuuluu jo toiselle käyttäjälle."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3208,55 +3313,60 @@ msgstr ""
 "Vahvistuskoodi lähetettiin antamaasi pikaviestinosoitteeseen. Sinun täytyy "
 "antaa osoitteelle %s oikeus lähettää viestejä sinulle."
 
-#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 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.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 #, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "Ei voitu poistaa sähköpostivahvistusta."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "Varmistuskoodia ei ole annettu."
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging 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."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 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:40
+#: 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:44
+#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr ""
@@ -3264,19 +3374,19 @@ 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:77
+#: 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:116
+#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "Kutsu(t) lähetettiin"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Kutsu uusia käyttäjiä"
 
@@ -3284,7 +3394,7 @@ 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:139
+#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3293,7 +3403,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3302,7 +3412,7 @@ 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:153
+#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3317,7 +3427,7 @@ 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:167
+#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3326,7 +3436,7 @@ 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:177
+#: 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!"
@@ -3335,7 +3445,7 @@ msgstr ""
 "kutsun ja rekisteröityy palveluun. Kiitoksia yhteisön kasvattamisesta!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3343,27 +3453,28 @@ msgstr ""
 "tätä palvelua."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:217
+#: 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:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: 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:227
+#: 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:231
+#: actions/invite.php:232
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Send"
@@ -3372,7 +3483,7 @@ 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:263
+#: 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"
@@ -3382,7 +3493,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5320,7 +5431,7 @@ msgid "Application profile"
 msgstr "Päivitykselle ei ole profiilia"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr ""
 
@@ -6636,7 +6747,7 @@ msgid "Plugins"
 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:898
 #, fuzzy
 msgid "Version"
 msgstr "Omat"
@@ -6764,7 +6875,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -7039,29 +7150,29 @@ msgid "Other"
 msgstr "Muut"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Nimetön sivu"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "Ensisijainen sivunavigointi"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
@@ -7069,37 +7180,37 @@ msgstr "Henkilökohtainen profiili ja kavereiden aikajana"
 
 #. 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:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 #, fuzzy
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Omat"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "Käyttäjätili"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: lib/action.php:560
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Ei voitu uudelleenohjata palvelimelle: %s"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "Yhdistä"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: lib/action.php:566
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
@@ -7107,86 +7218,86 @@ msgstr "Ensisijainen sivunavigointi"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 #, fuzzy
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Ylläpito"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: 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"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:563
+#: lib/action.php:576
 #, fuzzy
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Kutsu"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: lib/action.php:582
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Kirjaudu sisään"
 
 #. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Kirjaudu ulos"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 #, fuzzy
 msgctxt "MENU"
 msgid "Register"
 msgstr "Rekisteröidy"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 msgctxt "TOOLTIP"
 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 #, fuzzy
 msgctxt "MENU"
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: lib/action.php:602
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Ohjeet"
 
 #. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "Ohje"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: lib/action.php:611
 #, fuzzy
 msgctxt "MENU"
 msgid "Search"
@@ -7194,69 +7305,69 @@ msgstr "Haku"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:620 lib/adminpanelaction.php:387
+#: 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:687
+#: 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:757
+#: 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:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "Toissijainen sivunavigointi"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "Ohjeet"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "Tietoa"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "UKK"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "Yksityisyys"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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
+#: lib/action.php:902
 msgid "Contact"
 msgstr "Ota yhteyttä"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 #, fuzzy
 msgid "Badge"
 msgstr "Tönäise"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "StatusNet-ohjelmiston lisenssi"
 
@@ -7264,7 +7375,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:928
+#: lib/action.php:941
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7274,7 +7385,7 @@ msgstr ""
 "site.broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** on mikroblogipalvelu."
@@ -7283,7 +7394,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7295,51 +7406,51 @@ msgstr ""
 "www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 #, 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "Aiemmin"
 
@@ -7387,6 +7498,13 @@ msgstr ""
 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."
@@ -7606,7 +7724,7 @@ msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr ""
 
@@ -8196,13 +8314,13 @@ msgstr "Tietokantavirhe"
 
 #. 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:104
+#: lib/designsettings.php:108
 #, fuzzy
 msgid "Upload file"
 msgstr "Lataa"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
@@ -8950,11 +9068,11 @@ msgstr "Lähetä päivitys"
 msgid "What's up, %s?"
 msgstr "Mitä teet juuri nyt, %s?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr ""
 
@@ -9154,6 +9272,13 @@ msgstr "Käyttäjä"
 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:98
+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
@@ -9588,6 +9713,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "Personal"
-#~ msgstr "Omat"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 102460b3b6..1803c0c1fd 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:19+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:34:22+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 (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -88,7 +88,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -140,6 +140,9 @@ msgstr "Page non trouvée."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -157,7 +160,7 @@ msgstr "Page non trouvée."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -334,8 +337,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -355,13 +358,15 @@ msgstr "Impossible de mettre à jour l’utilisateur."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -400,11 +405,12 @@ msgstr[1] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -414,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Impossible de mettre à jour votre conception."
 
@@ -429,7 +435,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -824,9 +830,9 @@ msgstr "Le jeton de requête a déjà été autorisé."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -859,7 +865,7 @@ msgstr ""
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -867,7 +873,7 @@ 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:335
+#: 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
@@ -941,7 +947,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1284,6 +1290,13 @@ msgstr "Page non trouvée."
 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
@@ -1322,6 +1335,13 @@ msgstr "Ajouter aux favoris"
 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
@@ -1370,7 +1390,17 @@ msgstr "Impossible de supprimer le favori."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1383,12 +1413,12 @@ msgstr "Impossible de supprimer le favori."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1430,6 +1460,13 @@ msgstr "Vous n’êtes pas abonné(e) à ce profil."
 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
@@ -1463,12 +1500,15 @@ msgstr "Pièce jointe non trouvée."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Aucun pseudo."
 
@@ -1502,7 +1542,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Utilisateur sans profil correspondant."
@@ -1511,7 +1551,7 @@ msgstr "Utilisateur sans profil correspondant."
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Paramètres de l’avatar"
 
@@ -1520,7 +1560,7 @@ msgstr "Paramètres de l’avatar"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Image originale"
 
@@ -1529,7 +1569,7 @@ msgstr "Image originale"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Aperçu"
 
@@ -1565,7 +1605,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Données perdues."
 
@@ -1630,7 +1670,8 @@ msgstr "Vous avez déjà bloqué cet utilisateur."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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"
 
@@ -1653,7 +1694,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Non"
@@ -1671,7 +1712,7 @@ msgstr "Ne pas bloquer cet utilisateur"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Oui"
@@ -1879,7 +1920,7 @@ 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:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Un problème est survenu avec votre jeton de session."
 
@@ -1973,12 +2014,13 @@ msgstr "Supprimer ce groupe"
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2138,13 +2180,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Arrière plan"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2357,14 +2399,15 @@ 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:70 actions/newgroup.php:65
+#: 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: 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:107 actions/grouplogo.php:112
+#: 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."
 
@@ -2422,7 +2465,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2451,7 +2494,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2566,7 +2609,7 @@ 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 IM 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
@@ -2584,7 +2627,7 @@ msgstr ""
 "votre boîte de réception pour récupérer le code et les instructions."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2757,62 +2800,77 @@ msgstr "Aucune pièce jointe."
 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 !"
 
-#: actions/finishremotesubscribe.php:80
+#. 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."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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."
 
-#: actions/finishremotesubscribe.php:99
+#. 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."
 
-#: actions/finishremotesubscribe.php:110
+#. 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é."
 
-#: actions/finishremotesubscribe.php:113
+#. 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."
 
-#: actions/finishremotesubscribe.php:118
+#. 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."
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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."
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Fichier non trouvé."
 
-#: actions/getfile.php:83
+#. 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"
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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."
 
-#: actions/grantrole.php:75
+#. 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."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2822,37 +2880,47 @@ msgstr "L’utilisateur a déjà ce rôle."
 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 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:76 actions/groupunblock.php:77
+#: 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."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "Aucun groupe n’a été spécifié."
 
-#: actions/groupblock.php:91
+#. 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."
 
-#: actions/groupblock.php:95
+#. 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."
 
-#: actions/groupblock.php:100
+#. 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."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2864,33 +2932,38 @@ msgstr ""
 "abonner à l’avenir."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: actions/groupblock.php:191
 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "Bloquer cet utilisateur de de groupe"
 
-#: actions/groupblock.php:206
+#. 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."
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Aucun identifiant."
 
-#: actions/groupdesignsettings.php:68
+#. 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."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Conception du groupe"
 
-#: actions/groupdesignsettings.php:155
+#. 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."
@@ -2898,19 +2971,26 @@ msgstr ""
 "Personnalisez l’apparence de votre groupe avec une image d’arrière plan et "
 "une palette de couleurs de votre choix"
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 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:145 actions/grouplogo.php:200
+#: 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:157
+#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2919,106 +2999,115 @@ msgstr ""
 "est de %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Transfert"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Recadrer"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: 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:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Membres du groupe %1$s - page %2$d"
 
-#: actions/groupmembers.php:122
+#. 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."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "Administrer"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Bloquer"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Bloquer cet utilisateur"
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Rendre administrateur"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: 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: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "Groupes"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "Groupes - page %d"
 
-#: actions/groups.php:90
-#, php-format
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 "Les groupes de %%%%site.name%%%% permettent de trouver et de parler avec des "
 "personnes qui ont des intérêts en commun avec vous. Après avoir rejoint un "
@@ -3027,11 +3116,13 @@ msgstr ""
 "intéresse ? Essayez d’en [rechercher un](%%%%action.groupsearch%%%%) ou de "
 "[créer le vôtre !](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -3041,25 +3132,31 @@ msgstr ""
 "leurs intérêts. Séparez les termes de recherche par des espaces. Ils doivent "
 "contenir au moins 3 caractères."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Rechercher des groupes"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "Aucun résultat."
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 "Si vous ne trouvez pas le groupe que vous recherchez, vous pouvez [le créer]"
 "(%%action.newgroup%%) vous-même."
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3069,21 +3166,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Erreur lors de l’annulation du blocage."
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "Paramètres de messagerie instantanée"
@@ -3092,117 +3189,125 @@ msgstr "Paramètres de messagerie instantanée"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address 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 IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP 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 IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "Adresse Jabber/GTalk actuellement confirmée."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 ""
 "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 IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Préférences de messagerie instantanée"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Envoyez-moi les avis par Jabber/GTalk."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr ""
 "Poster un avis chaque fois que mon statut est modifié dans Jabber/GTalk"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, fuzzy
+msgid ""
+"Send me replies through Jabber/Google Talk 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 IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Publier un MicroID pour mon adresse Jabber/GTalk."
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Préférences enregistrées"
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 IM address that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "Impossible d’utiliser cet identifiant Jabber"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "Identifiant Jabber invalide."
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "Identifiant Jabber déjà utilisé par un autre utilisateur."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3212,43 +3317,48 @@ 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 IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 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.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 #, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "Impossible de supprimer la confirmation de messagerie instantanée."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 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: Message given trying to remove an Instant Messaging 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."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
@@ -3256,13 +3366,13 @@ msgstr ""
 "envoyés."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:40
+#: 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:44
+#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr ""
@@ -3270,18 +3380,18 @@ 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:77
+#: 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:116
+#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "Invitations envoyées"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Inviter de nouveaux utilisateurs"
 
@@ -3289,7 +3399,7 @@ 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:139
+#: 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 :"
@@ -3297,7 +3407,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3306,7 +3416,7 @@ 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:153
+#: 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:"
@@ -3320,7 +3430,7 @@ 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:167
+#: 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 :"
@@ -3328,7 +3438,7 @@ 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:177
+#: 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!"
@@ -3338,7 +3448,7 @@ msgstr ""
 "communauté !"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3346,27 +3456,28 @@ msgstr ""
 "service."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:217
+#: 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:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: 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:227
+#: 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:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Envoyer"
@@ -3374,7 +3485,7 @@ 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:263
+#: 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"
@@ -3384,7 +3495,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5303,7 +5414,7 @@ msgid "Application profile"
 msgstr "Profil de l’application"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icône"
 
@@ -6650,7 +6761,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:885
+#: actions/version.php:198 lib/action.php:898
 msgid "Version"
 msgstr "Version"
 
@@ -6780,7 +6891,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr "Aucun nom de base de données ou DSN trouvé nulle part."
 
@@ -7050,214 +7161,214 @@ msgid "Other"
 msgstr "Autres"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Page sans nom"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Voir davantage"
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "Navigation primaire du site"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Profil personnel et flux des amis"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
 #. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personnel"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "Compte"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: lib/action.php:560
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Se connecter aux services"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "Connexion"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: lib/action.php:566
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Modifier la configuration du site"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrer"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: 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"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Inviter"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: lib/action.php:582
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Fermer la session"
 
 #. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Déconnexion"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Créer un compte"
 
 #. 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:580 lib/logingroupnav.php:85
+#: 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:583
+#: lib/action.php:596
 msgctxt "TOOLTIP"
 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Connexion"
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: 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:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "Aide"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: lib/action.php:611
 msgctxt "MENU"
 msgid "Search"
 msgstr "Rechercher"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:620 lib/adminpanelaction.php:387
+#: 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:687
+#: 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:757
+#: 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:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "Navigation secondaire du site"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "Aide"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "À propos"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "CGU"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "Confidentialité"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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
+#: lib/action.php:902
 msgid "Contact"
 msgstr "Contact"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "Insigne"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "Licence du logiciel StatusNet"
 
@@ -7265,7 +7376,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7275,7 +7386,7 @@ msgstr ""
 "%site.broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** est un service de micro-blogging."
@@ -7284,7 +7395,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7296,20 +7407,20 @@ msgstr ""
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7317,7 +7428,7 @@ msgstr ""
 "réservés."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:972
+#: lib/action.php:985
 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 "
@@ -7325,26 +7436,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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "Avant"
 
@@ -7392,6 +7503,13 @@ msgstr ""
 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."
@@ -7598,7 +7716,7 @@ msgid "Failed to delete revoked token."
 msgstr "Impossible de supprimer un jeton révoqué."
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Icône pour cette application"
 
@@ -8221,12 +8339,12 @@ msgstr "Erreur de la base de données"
 
 #. 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "Importer un fichier"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
@@ -9063,11 +9181,11 @@ msgstr "Envoyer un avis"
 msgid "What's up, %s?"
 msgstr "Quoi de neuf, %s ?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "Attacher"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "Joindre un fichier"
 
@@ -9261,6 +9379,13 @@ msgstr "ID de l’utilisateur"
 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:98
+msgid "Groups"
+msgstr "Groupes"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9691,6 +9816,3 @@ msgstr "XML invalide, racine XRD manquante."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Obtention de la sauvegarde depuis le fichier « %s »."
-
-#~ msgid "Personal"
-#~ msgstr "Personnel"
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index 5e72f4f4f8..db66a6c861 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:21+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:34:25+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 (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -78,7 +78,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -130,6 +130,9 @@ msgstr "Esa páxina non existe."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -147,7 +150,7 @@ msgstr "Esa páxina non existe."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -323,8 +326,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -344,13 +347,15 @@ msgstr "Non se puido actualizar o usuario."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -389,11 +394,12 @@ msgstr[1] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -403,7 +409,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Non se puido actualizar o seu deseño."
 
@@ -417,7 +423,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -817,9 +823,9 @@ msgstr "Non está autorizado."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -851,7 +857,7 @@ msgstr ""
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -859,7 +865,7 @@ 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:335
+#: 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
@@ -931,7 +937,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1270,6 +1276,13 @@ msgstr "Non se atopou o método da API."
 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
@@ -1308,6 +1321,13 @@ msgstr "Engadir aos favoritos"
 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
@@ -1356,7 +1376,17 @@ msgstr "Non se puido eliminar o favorito."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1369,12 +1399,12 @@ msgstr "Non se puido eliminar o favorito."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1416,6 +1446,13 @@ msgstr "Non está subscrito a ese perfil."
 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."
@@ -1448,12 +1485,15 @@ msgstr "Non existe tal dato adxunto."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Sen alcume."
 
@@ -1487,7 +1527,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "O usuario non ten perfil."
@@ -1496,7 +1536,7 @@ msgstr "O usuario non ten perfil."
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Configuración do avatar"
 
@@ -1505,7 +1545,7 @@ msgstr "Configuración do avatar"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Orixinal"
 
@@ -1514,7 +1554,7 @@ msgstr "Orixinal"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Vista previa"
 
@@ -1550,7 +1590,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Perdéronse os datos do ficheiro."
 
@@ -1615,7 +1655,8 @@ msgstr "Xa bloqueou ese usuario."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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"
 
@@ -1638,7 +1679,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Non"
@@ -1656,7 +1697,7 @@ msgstr "Non bloquear este usuario"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Si"
@@ -1865,7 +1906,7 @@ 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:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Houbo un problema co seu pase."
 
@@ -1962,12 +2003,13 @@ msgstr "Borrar o usuario"
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2129,13 +2171,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Fondo"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2350,14 +2392,15 @@ 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:70 actions/newgroup.php:65
+#: 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: 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:107 actions/grouplogo.php:112
+#: 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."
 
@@ -2415,7 +2458,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2444,7 +2487,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2564,7 +2607,7 @@ 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 IM 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
@@ -2583,7 +2626,7 @@ msgstr ""
 "entrada (e na de correo non desexado!)."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2754,62 +2797,77 @@ msgstr "Non hai ningún dato adxunto."
 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!"
 
-#: actions/finishremotesubscribe.php:80
+#. 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."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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!"
 
-#: actions/finishremotesubscribe.php:99
+#. 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."
 
-#: actions/finishremotesubscribe.php:110
+#. 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."
 
-#: actions/finishremotesubscribe.php:113
+#. 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."
 
-#: actions/finishremotesubscribe.php:118
+#. 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."
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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."
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Non existe tal ficheiro."
 
-#: actions/getfile.php:83
+#. 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."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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."
 
-#: actions/grantrole.php:75
+#. 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."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2819,37 +2877,47 @@ msgstr "O usuario xa ten este rol."
 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 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:76 actions/groupunblock.php:77
+#: 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."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "Non se especificou ningún grupo."
 
-#: actions/groupblock.php:91
+#. 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."
 
-#: actions/groupblock.php:95
+#. 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."
 
-#: actions/groupblock.php:100
+#. 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."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2861,32 +2929,37 @@ msgstr ""
 "el no futuro."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: actions/groupblock.php:191
 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "Excluír deste grupo a este usuario"
 
-#: actions/groupblock.php:206
+#. 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."
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Sen ID."
 
-#: actions/groupdesignsettings.php:68
+#. 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."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Deseño do grupo"
 
-#: actions/groupdesignsettings.php:155
+#. 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."
@@ -2894,19 +2967,26 @@ msgstr ""
 "Personaliza o aspecto do grupo cunha imaxe de fondo e unha paleta de cores "
 "da súa escolla."
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 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:145 actions/grouplogo.php:200
+#: 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:157
+#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2915,106 +2995,115 @@ msgstr ""
 "s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Cargar"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Recortar"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: 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:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Membros do grupo %1$s, páxina %2$d"
 
-#: actions/groupmembers.php:122
+#. 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."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "Administrador"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Bloquear"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Bloquear este usuario"
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Converter en administrador"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: 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: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "Grupos"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "Grupos, páxina %d"
 
-#: actions/groups.php:90
-#, php-format
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 "Os grupos de %%%%site.name%%%% permiten atopar e porse en contacto con "
 "persoas de intereses similares aos seus. Tras unirse a un grupo pode enviar "
@@ -3022,11 +3111,13 @@ msgstr ""
 "un grupo que lle guste? Probe a [buscar un](%%%%action.groupsearch%%%%) ou "
 "[crear un pola súa conta!](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -3036,23 +3127,29 @@ msgstr ""
 "termos con espazos en branco. Cada termo ten que estar formado por tres ou "
 "máis caracteres."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Busca de grupos"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "Non houbo resultados."
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr "Se non atopa o grupo que busca, pode [crealo](%%action.newgroup%%)."
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3062,21 +3159,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: 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 instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "Configuración da mensaxería instantánea"
@@ -3085,115 +3182,123 @@ msgstr "Configuración da mensaxería instantánea"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address 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 IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP 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 IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "Enderezo de Jabber/GTalk confirmado actualmente."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 ""
 "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 IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Preferencias de mensaxería instantánea"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Enviádeme as notas mediante Jabber ou GTalk."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "Publicar unha nota cando cambie o meu estado en Jabber ou GTalk."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, fuzzy
+msgid ""
+"Send me replies through Jabber/Google Talk 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 IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+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 IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Gardáronse as preferencias."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 IM address that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "Non se pode normalizar esa ID de Jabber"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "A ID de Jabber non é correcta"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "Esa ID de Jabber xa corresponde a un usuario."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3203,75 +3308,80 @@ 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 IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 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.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 #, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "Non se puido borrar a confirmación por mensaxería instantánea."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 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: Message given trying to remove an Instant Messaging 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."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 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:40
+#: 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:44
+#: 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:77
+#: 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:116
+#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "Enviáronse as invitacións"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Invitar a novos usuarios"
 
@@ -3279,7 +3389,7 @@ 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:139
+#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3288,7 +3398,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3297,7 +3407,7 @@ 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:153
+#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3310,7 +3420,7 @@ 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:167
+#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3319,7 +3429,7 @@ 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:177
+#: 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!"
@@ -3328,7 +3438,7 @@ msgstr ""
 "no sitio. Grazas por ampliar a comunidade!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3336,27 +3446,28 @@ msgstr ""
 "utilizar este servizo."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:217
+#: 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:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: 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:227
+#: 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:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Enviar"
@@ -3364,7 +3475,7 @@ 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:263
+#: 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"
@@ -3374,7 +3485,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5303,7 +5414,7 @@ msgid "Application profile"
 msgstr "Perfil da aplicación"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icona"
 
@@ -6645,7 +6756,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:885
+#: actions/version.php:198 lib/action.php:898
 msgid "Version"
 msgstr "Versión"
 
@@ -6773,7 +6884,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr "Non se atopou por ningures o nome da base de datos ou DSN."
 
@@ -7042,214 +7153,214 @@ msgid "Other"
 msgstr "Outros"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: 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:312
+#: lib/action.php:325
 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:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "Navegación principal do sitio"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Liña do tempo do perfil persoal e os amigos"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
 #. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Persoal"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "Conta"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: lib/action.php:560
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Conectarse aos servizos"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "Conectarse"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: lib/action.php:566
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Cambiar a configuración do sitio"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrador"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: 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"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Convidar"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: lib/action.php:582
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Saír ao anonimato"
 
 #. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Saír"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Crear unha conta"
 
 #. 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Rexistrarse"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 msgctxt "TOOLTIP"
 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Identificarse"
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: lib/action.php:602
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Axuda!"
 
 #. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "Axuda"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: lib/action.php:611
 msgctxt "MENU"
 msgid "Search"
 msgstr "Buscar"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:620 lib/adminpanelaction.php:387
+#: 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:687
+#: 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:757
+#: 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:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "Navegación secundaria do sitio"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "Axuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "Acerca de"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "Preguntas máis frecuentes"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "Condicións do servicio"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "Protección de datos"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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
+#: lib/action.php:902
 msgid "Contact"
 msgstr "Contacto"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "Insignia"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "Licenza do software StatusNet"
 
@@ -7257,7 +7368,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7267,7 +7378,7 @@ msgstr ""
 "site.broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** é un servizo de mensaxes de blogue curtas."
@@ -7276,7 +7387,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7288,20 +7399,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:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7309,7 +7420,7 @@ msgstr ""
 "todos os dereitos."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:972
+#: lib/action.php:985
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Os contidos e datos son propiedade intelectual dos colaboradores. Quedan "
@@ -7317,26 +7428,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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "Anteriores"
 
@@ -7385,6 +7496,13 @@ msgstr ""
 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."
@@ -7594,7 +7712,7 @@ msgid "Failed to delete revoked token."
 msgstr "Erro ao borrar o pase revogado."
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Icona para esta aplicación"
 
@@ -8217,12 +8335,12 @@ msgstr "Houbo un erro na base de datos"
 
 #. 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "Cargar un ficheiro"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
@@ -9060,11 +9178,11 @@ msgstr "Enviar unha nota"
 msgid "What's up, %s?"
 msgstr "Que hai de novo, %s?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "Anexar"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "Anexar un ficheiro"
 
@@ -9258,6 +9376,13 @@ msgstr "ID do usuario"
 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:98
+msgid "Groups"
+msgstr "Grupos"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9686,6 +9811,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "Personal"
-#~ msgstr "Persoal"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index 63ad1132f3..212d8ad7eb 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:22+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:34:28+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 (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -79,7 +79,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -131,6 +131,9 @@ msgstr "Strona njeeksistuje."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -148,7 +151,7 @@ msgstr "Strona njeeksistuje."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -316,8 +319,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -337,13 +340,15 @@ msgstr "Wužiwar njeje so dał aktualizować."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -380,11 +385,12 @@ msgstr[3] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -394,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Design njeda so aktualizować."
 
@@ -408,7 +414,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -807,9 +813,9 @@ msgstr "Naprašowanski token hižo awtorizowany."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -838,7 +844,7 @@ msgstr "Zmylk datoweje banki při zasunjenju oauth_token_association."
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -846,7 +852,7 @@ 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:335
+#: 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
@@ -912,7 +918,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1244,6 +1250,13 @@ msgstr "Wužiwar njenamakany."
 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
+#, fuzzy, php-format
+msgid "Notices %1$s has favorited on %2$s"
+msgstr "Aktualizacije wot %1$s a přećelow 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
@@ -1277,6 +1290,13 @@ msgstr "Je hižo faworit."
 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
+#, fuzzy, php-format
+msgid "Groups %1$s is a member of on %2$s"
+msgstr "Skupiny, w kotrychž %s je čłon"
+
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
 #: actions/atompubmembershipfeed.php:219
 msgid "Cannot add someone else's membership."
@@ -1319,7 +1339,17 @@ msgstr "Faworit druheho njeda so zhašeć."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1332,12 +1362,12 @@ msgstr "Faworit druheho njeda so zhašeć."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1376,6 +1406,13 @@ msgstr "Profil  %1$d njeje profil %2$d abonował."
 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
+#, fuzzy, php-format
+msgid "People %1$s has subscribed to on %2$s"
+msgstr "Ludźo, kotřiž su %s abonowali"
+
 #. TRANS: Client error displayed when not using the follow verb.
 #: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
@@ -1408,12 +1445,15 @@ msgstr "Přiwěšk njeeksistuje."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Žane přimjeno."
 
@@ -1446,7 +1486,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Wužiwar bjez hodźaceho so profila."
@@ -1455,7 +1495,7 @@ msgstr "Wužiwar bjez hodźaceho so profila."
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Nastajenja awatara"
 
@@ -1464,7 +1504,7 @@ msgstr "Nastajenja awatara"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Original"
 
@@ -1473,7 +1513,7 @@ msgstr "Original"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Přehlad"
 
@@ -1509,7 +1549,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Naše datajowe daty su so zhubili."
 
@@ -1572,7 +1612,8 @@ msgstr "Sy tutoho wužiwarja hižo zablokował."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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ć"
 
@@ -1592,7 +1633,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Ně"
@@ -1610,7 +1651,7 @@ msgstr "Tutoho wužiwarja njeblokować"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Haj"
@@ -1813,7 +1854,7 @@ 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:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1900,12 +1941,13 @@ msgstr "Tutu skupinu zhašeć"
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2058,13 +2100,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Pozadk"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2274,14 +2316,15 @@ 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:70 actions/newgroup.php:65
+#: 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: 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:107 actions/grouplogo.php:112
+#: 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ł."
 
@@ -2339,7 +2382,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2366,7 +2409,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2458,9 +2501,8 @@ msgstr "Žana e-mejlowa adresa."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
 #: actions/emailsettings.php:388
-#, fuzzy
 msgid "Cannot normalize that email address."
-msgstr "Tuta e-mejlowa adresa njehodźi so normalizować"
+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
@@ -2479,7 +2521,7 @@ 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 IM 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
@@ -2494,7 +2536,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2634,9 +2676,9 @@ msgstr "Nazhonići wužiwarjo, strona %d"
 
 #. TRANS: Description on page displaying featured users.
 #: actions/featured.php:102
-#, fuzzy, php-format
+#, php-format
 msgid "A selection of some great users on %s."
-msgstr "Wuběr wulkotnych wužiwarjow na %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
@@ -2659,62 +2701,77 @@ msgstr "Žane přiwěški."
 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!"
 
-#: actions/finishremotesubscribe.php:80
+#. 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 ""
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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ć!"
 
-#: actions/finishremotesubscribe.php:99
+#. 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."
 
-#: actions/finishremotesubscribe.php:110
+#. 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."
 
-#: actions/finishremotesubscribe.php:113
+#. 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 ""
 
-#: actions/finishremotesubscribe.php:118
+#. 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 ""
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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."
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Dataja njeeksistuje."
 
-#: actions/getfile.php:83
+#. 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ć."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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ć."
 
-#: actions/grantrole.php:75
+#. 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ć."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2724,37 +2781,47 @@ msgstr "Wužiwar hižo ma tutu rólu."
 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 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:76 actions/groupunblock.php:77
+#: 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."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "Žana skupina podata."
 
-#: actions/groupblock.php:91
+#. 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ć."
 
-#: actions/groupblock.php:95
+#. 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."
 
-#: actions/groupblock.php:100
+#. 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."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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ć"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2763,50 +2830,62 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: actions/groupblock.php:191
 msgid "Do not block this user from this group"
 msgstr "Tutoho wužiwarja za tutu skupinu blokować"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "Tutoho wužiwarja za tutu skupinu blokować"
 
-#: actions/groupblock.php:206
+#. 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."
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Žadyn ID."
 
-#: actions/groupdesignsettings.php:68
+#. 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ł."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Skupinski design"
 
-#: actions/groupdesignsettings.php:155
+#. 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 ""
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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 "Njeje móžno, designowe nastajenja składować."
+
+#. TRANS: Form text to confirm saved group design settings.
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "Designowe nastajenja składowane."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2815,138 +2894,155 @@ msgstr ""
 "s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Nahrać"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Přirězać"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logo zaktualizowane."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s skupinskich čłonow, strona %2$d"
 
-#: actions/groupmembers.php:122
+#. 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."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "Administrator"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Blokować"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Tutoho wužiwarja blokować"
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "K administratorej činić"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: 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: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "Skupiny"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "Skupiny, strona %d"
 
-#: actions/groups.php:90
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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ć"
 
-#: actions/groupsearch.php:52
+#. 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. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Skupinske pytanje"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "Žane wuslědki."
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 "Jeli njemóžeš skupinu namakać, kotruž pytaš, móžeš [ju wutworić](%%action."
 "newgroup%%)."
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -2954,21 +3050,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Zmylk při wotstronjenju blokowanja."
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "IM-nastajenja"
@@ -2979,103 +3075,110 @@ msgstr "IM-nastajenja"
 #: actions/imsettings.php:71
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM k dispoziciji njesteji."
 
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "Aktualna wobkrućena adresa Jabber/GTalk."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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 GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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 IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "IM-nastajenja"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Pósćel mi zdźělenki přez Jabber/GTalk."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "Powěsć pósłac, hdyž so status Jabber/GTalk změni."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgid ""
+"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
 msgstr ""
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "MicroID za moju adresu Jabber/GTalk publikować."
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Nastajenja składowane."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "Tutón Jabber-ID njehodźi so normalizować"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "Njepłaćiwy ID Jabber"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "Jabber-ID hižo druhemu wužiwarjej słuša."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3083,55 +3186,60 @@ msgid ""
 "s for sending messages to you."
 msgstr ""
 
-#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 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.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 msgid "Could not delete IM confirmation."
 msgstr "IM-wobkrućenje njeda so zhašeć."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "IM-wobkrućenje přetorhnjene."
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging 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."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 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:40
+#: 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:44
+#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr ""
@@ -3140,18 +3248,18 @@ 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:77
+#: 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:116
+#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "Přeprošenja pósłane"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Nowych wužiwarjow přeprosyć"
 
@@ -3159,7 +3267,7 @@ 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:139
+#: 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ł:"
@@ -3169,7 +3277,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3178,7 +3286,7 @@ 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:153
+#: 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:"
@@ -3191,7 +3299,7 @@ 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:167
+#: 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:"
@@ -3201,14 +3309,14 @@ 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:177
+#: 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:190
+#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3216,27 +3324,28 @@ msgstr ""
 "tutu słužbu wužiwali."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:217
+#: 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:220
-msgid "Addresses of friends to invite (one per line)"
+#: actions/invite.php:221
+#, fuzzy
+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:224
+#: 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:227
+#: 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:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Pósłać"
@@ -3244,7 +3353,7 @@ 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:263
+#: 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ć"
@@ -3254,7 +3363,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5036,7 +5145,7 @@ msgid "Application profile"
 msgstr "Aplikaciski profil"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Symbol"
 
@@ -5722,9 +5831,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-#, fuzzy
 msgid "No code entered."
-msgstr "Žadyn kod zapodaty"
+msgstr "Žadyn kod zapodaty."
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
@@ -6285,7 +6393,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:885
+#: actions/version.php:198 lib/action.php:898
 msgid "Version"
 msgstr "Wersija"
 
@@ -6413,7 +6521,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr "Žane mjeno datoweje banki namakane abo žadyn DSN namakany."
 
@@ -6675,214 +6783,214 @@ msgid "Other"
 msgstr "Druhe"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Strona bjez titula"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Wjace pokazać"
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "Primarna sydłowa nawigacija"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 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:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Wosobinski"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "Konto"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: lib/action.php:560
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Ze słužbami zwjazać"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "Zwjazać"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: lib/action.php:566
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Sydłowu konfiguraciju změnić"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrator"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: 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ć"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Přeprosyć"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: lib/action.php:582
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Ze sydła wotzjewić"
 
 #. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Wotzjewić"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Konto załožić"
 
 #. 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrować"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 msgctxt "TOOLTIP"
 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:586 lib/logingroupnav.php:77
+#: 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:589
+#: lib/action.php:602
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Pomhaj!"
 
 #. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "Pomoc"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: lib/action.php:611
 msgctxt "MENU"
 msgid "Search"
 msgstr "Pytać"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:620 lib/adminpanelaction.php:387
+#: 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:687
+#: 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:757
+#: 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:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "Sekundarna sydłowa nawigacija"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "Pomoc"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "Wo"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "Huste prašenja"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "Wužiwarske wuměnjenja"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "Priwatnosć"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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
+#: lib/action.php:902
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "Plaketa"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "Softwarowa licenca StatusNet"
 
@@ -6890,7 +6998,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6898,7 +7006,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -6907,7 +7015,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6916,50 +7024,50 @@ msgid ""
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "Před"
 
@@ -7004,6 +7112,13 @@ msgstr "Zdaleny profil skupina njeje!"
 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 ""
+
 #. 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."
@@ -7203,7 +7318,7 @@ msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Symbol za tutu aplikaciju"
 
@@ -7795,12 +7910,12 @@ msgstr "Zmylk w datowej bance"
 
 #. 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "Dataju nahrać"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
@@ -7854,7 +7969,6 @@ msgstr "Tutu zdźělenku z faworitow wotstronić"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
 #: lib/disfavorform.php:136
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Z faworitow wotstronić"
@@ -7867,7 +7981,6 @@ msgstr "Tutu zdźělenku faworitam přidać"
 
 #. TRANS: Button text for adding the favourite status to a notice.
 #: lib/favorform.php:135
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Faworit"
@@ -8540,11 +8653,11 @@ msgstr "Zdźělenku pósłać"
 msgid "What's up, %s?"
 msgstr "Što je, %s?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "Připowěsnyć"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "Dataju připowěsnyć"
 
@@ -8650,28 +8763,24 @@ msgstr "Nowy abonement njeda so zasunyć."
 
 #. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
-#, fuzzy
 msgctxt "MENU"
 msgid "Replies"
 msgstr "Wotmołwy"
 
 #. TRANS: Personal group navigation menu option when logged in for seeing own profile.
 #: lib/personalgroupnav.php:114
-#, 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 "Fawority"
 
 #. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
 #: lib/personalgroupnav.php:133
-#, fuzzy
 msgctxt "MENU"
 msgid "Inbox"
 msgstr "Dochadny póst"
@@ -8683,7 +8792,6 @@ 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
-#, fuzzy
 msgctxt "MENU"
 msgid "Outbox"
 msgstr "Wuchadny póst"
@@ -8736,6 +8844,13 @@ msgstr "Wužiwarski ID"
 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:98
+msgid "Groups"
+msgstr "Skupiny"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9168,6 +9283,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\"-"
-
-#~ msgid "Personal"
-#~ msgstr "Wosobinski"
diff --git a/locale/hu/LC_MESSAGES/statusnet.po b/locale/hu/LC_MESSAGES/statusnet.po
index 6a79f5e478..5e1edb426c 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:23+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:34:34+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-01-29 22:24:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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"
@@ -81,7 +81,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -133,6 +133,9 @@ msgstr "Nincs ilyen lap."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -150,7 +153,7 @@ msgstr "Nincs ilyen lap."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -320,8 +323,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -341,13 +344,15 @@ msgstr "Nem sikerült frissíteni a felhasználót."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -386,11 +391,12 @@ msgstr[1] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -400,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Nem sikerült frissíteni a megjelenítést."
 
@@ -414,7 +420,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -811,9 +817,9 @@ msgstr "Nincs jogosultságod."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -842,7 +848,7 @@ msgstr ""
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -850,7 +856,7 @@ 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:335
+#: 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
@@ -917,7 +923,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1255,6 +1261,13 @@ msgstr "Az API-metódus nem található."
 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
@@ -1293,6 +1306,13 @@ msgstr "Hozzáadás a kedvencekhez"
 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
@@ -1341,7 +1361,17 @@ msgstr "Nem sikerült törölni a kedvencet."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1354,12 +1384,12 @@ msgstr "Nem sikerült törölni a kedvencet."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1401,6 +1431,13 @@ msgstr "Senkinek sem iratkoztál fel a híreire."
 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."
@@ -1433,12 +1470,15 @@ msgstr "Nincs ilyen csatolmány."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Nincs becenév."
 
@@ -1470,7 +1510,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr ""
@@ -1479,7 +1519,7 @@ msgstr ""
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Avatarbeállítások"
 
@@ -1488,7 +1528,7 @@ msgstr "Avatarbeállítások"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Eredeti"
 
@@ -1497,7 +1537,7 @@ msgstr "Eredeti"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Előnézet"
 
@@ -1536,7 +1576,7 @@ msgstr "Válassz ki egy négyzet alakú területet a képből, ami az avatarod l
 
 #. 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Elvesztettük az adatainkat."
 
@@ -1601,7 +1641,8 @@ msgstr "Már blokkoltad azt a felhasználót."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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"
 
@@ -1621,7 +1662,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Nem"
@@ -1639,7 +1680,7 @@ msgstr "Ne blokkoljuk ezt a felhasználót"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Igen"
@@ -1849,7 +1890,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:118
-#: lib/action.php:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1944,12 +1985,13 @@ msgstr "Töröljük ezt a felhasználót"
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2108,13 +2150,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Háttér"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2327,14 +2369,15 @@ 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:70 actions/newgroup.php:65
+#: 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: 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:107 actions/grouplogo.php:112
+#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr ""
 
@@ -2392,7 +2435,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2422,7 +2465,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2537,7 +2580,7 @@ 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 IM 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
@@ -2556,7 +2599,7 @@ msgstr ""
 "további teendőket tartalmazza."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2725,62 +2768,77 @@ msgstr "Nincs melléklet."
 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!"
 
-#: actions/finishremotesubscribe.php:80
+#. 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."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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!"
 
-#: actions/finishremotesubscribe.php:99
+#. 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."
 
-#: actions/finishremotesubscribe.php:110
+#. 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."
 
-#: actions/finishremotesubscribe.php:113
+#. 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 ""
 
-#: actions/finishremotesubscribe.php:118
+#. 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 ""
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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."
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Nincs ilyen fájl."
 
-#: actions/getfile.php:83
+#. 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ó."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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 ""
 
-#: actions/grantrole.php:75
+#. 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 ""
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2790,37 +2848,47 @@ msgstr "A felhasználónak már van ilyen szerepe."
 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 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:76 actions/groupunblock.php:77
+#: 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."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "Nincs csoport megadva."
 
-#: actions/groupblock.php:91
+#. 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."
 
-#: actions/groupblock.php:95
+#. 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."
 
-#: actions/groupblock.php:100
+#. 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."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2832,164 +2900,187 @@ 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:182
+#: actions/groupblock.php:191
 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "Felhasználó blokkolása a csoportból"
 
-#: actions/groupblock.php:206
+#. 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."
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Nincs ID."
 
-#: actions/groupdesignsettings.php:68
+#. 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."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "A csoport megjelenése"
 
-#: actions/groupdesignsettings.php:155
+#. 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 ""
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 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:145 actions/grouplogo.php:200
+#: 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:157
+#: 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:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Feltöltés"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Levágás"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: 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:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr ""
 
-#: actions/groupmembers.php:122
+#. 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."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "Adminisztrátor"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr ""
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr ""
 
-#. TRANS: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "Csoportok"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "Csoportok, %d. oldal"
 
-#: actions/groups.php:90
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -2999,25 +3090,31 @@ msgstr ""
 "alapján. Szóközökkel válaszd el a keresett kifejezéseket; legalább 3 "
 "karaktert adj meg."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Csoport-keresés"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "Nincs találat."
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 "Ha nem találod a csoportot amit keresel, [létrehozhatod](%%action.newgroup%"
 "%) saját magad."
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3025,21 +3122,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: 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 instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "IM beállítások"
@@ -3050,103 +3147,111 @@ msgstr "IM beállítások"
 #: actions/imsettings.php:71
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM nem elérhető."
 
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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
-msgid "Current confirmed Jabber/GTalk address."
-msgstr ""
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk 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.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 ""
+"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 IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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 GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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 IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Azonnali üzenetküldő beállításai"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+msgid "Send me notices through Jabber/Google Talk."
 msgstr ""
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr ""
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgid ""
+"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
 msgstr ""
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
+#, fuzzy
+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 IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Beállítások elmentve."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 IM address that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "Nem lehet normalizálni a Jabber azonosítót"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "Érvénytelen Jabber-azonosító"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 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.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3154,74 +3259,79 @@ msgid ""
 "s for sending messages to you."
 msgstr ""
 
-#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 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.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 #, fuzzy
 msgid "Could not delete IM 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.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr ""
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging address that is not
 #. TRANS: registered for the active user.
 #: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Ez nem a te Jabber-azonosítód."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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 ""
 
-#: actions/inbox.php:62
+#. 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:115
 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:40
+#: 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:44
+#: 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:77
+#: 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:116
+#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "Meghívó(k) elküldve"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Új felhasználó meghívása"
 
@@ -3229,7 +3339,7 @@ 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:139
+#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3238,7 +3348,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3247,7 +3357,7 @@ 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:153
+#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3260,7 +3370,7 @@ 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:167
+#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3269,14 +3379,14 @@ 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:177
+#: 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:190
+#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3284,27 +3394,28 @@ msgstr ""
 "szolgáltatásra."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:217
+#: 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:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: 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:227
+#: 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:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Küldés"
@@ -3312,7 +3423,7 @@ 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:263
+#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
@@ -3322,7 +3433,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5155,7 +5266,7 @@ msgid "Application profile"
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ikon"
 
@@ -6419,7 +6530,7 @@ msgid "Plugins"
 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:898
 msgid "Version"
 msgstr ""
 
@@ -6541,7 +6652,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6803,214 +6914,214 @@ msgid "Other"
 msgstr "Más egyéb"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: 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:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "Elsődleges navigáció"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 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:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "Kontó"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: 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:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "Kapcsolódás"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: 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:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: lib/action.php:573
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: 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:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: lib/action.php:602
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr ""
 
 #. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: 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:620 lib/adminpanelaction.php:387
+#: 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:687
+#: lib/action.php:700
 msgid "Local views"
 msgstr ""
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:757
+#: lib/action.php:770
 msgid "Page notice"
 msgstr ""
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "Másodlagos navigáció"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "Súgó"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "Névjegy"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "GyIK"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "Felhasználási feltételek"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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
+#: lib/action.php:902
 msgid "Contact"
 msgstr "Kapcsolat"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr ""
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "A StatusNet szoftver licence"
 
@@ -7018,7 +7129,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7026,7 +7137,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -7035,7 +7146,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7044,50 +7155,50 @@ msgid ""
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "Előtte"
 
@@ -7135,6 +7246,13 @@ msgstr ""
 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."
@@ -7337,7 +7455,7 @@ msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr ""
 
@@ -7911,12 +8029,12 @@ msgstr "Adatbázishiba"
 
 #. 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "Fájl feltöltése"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
@@ -8711,11 +8829,11 @@ msgstr "Küldjünk egy hírt"
 msgid "What's up, %s?"
 msgstr "Mi hír, %s?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "Csatolás"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "Csatoljunk egy állományt"
 
@@ -8907,6 +9025,13 @@ msgstr "Felhasználói azonosító"
 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:98
+msgid "Groups"
+msgstr "Csoportok"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9325,6 +9450,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "Personal"
-#~ msgstr "Személyes"
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index 258a513994..d552346f42 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:24+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:34: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-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -76,7 +76,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -128,6 +128,9 @@ msgstr "Pagina non existe."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -145,7 +148,7 @@ msgstr "Pagina non existe."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -321,8 +324,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -342,13 +345,15 @@ msgstr "Non poteva actualisar le usator."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -387,11 +392,12 @@ msgstr[1] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -401,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Non poteva actualisar le apparentia."
 
@@ -415,7 +421,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -808,9 +814,9 @@ msgstr "Indicio de requesta jam autorisate."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -840,7 +846,7 @@ msgstr ""
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -848,7 +854,7 @@ 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:335
+#: 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
@@ -920,7 +926,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1257,6 +1263,13 @@ msgstr "Usator non trovate."
 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
+#, fuzzy, php-format
+msgid "Notices %1$s has favorited on %2$s"
+msgstr "Actualisationes de %1$s e su amicos 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
@@ -1290,6 +1303,13 @@ msgstr "Es ja favorite."
 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
+#, fuzzy, php-format
+msgid "Groups %1$s is a member of on %2$s"
+msgstr "Gruppos del quales %s es membro"
+
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
 #: actions/atompubmembershipfeed.php:219
 msgid "Cannot add someone else's membership."
@@ -1332,7 +1352,17 @@ msgstr "Non pote deler le favorite de un altere persona."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1345,12 +1375,12 @@ msgstr "Non pote deler le favorite de un altere persona."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1389,6 +1419,13 @@ msgstr "Le profilo %1$d non es subscribite al profilo %2$d."
 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
+#, fuzzy, php-format
+msgid "People %1$s has subscribed to on %2$s"
+msgstr "Personas qui seque %s"
+
 #. TRANS: Client error displayed when not using the follow verb.
 #: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
@@ -1421,12 +1458,15 @@ msgstr "Annexo non existe."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Nulle pseudonymo."
 
@@ -1459,7 +1499,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Usator sin profilo correspondente"
@@ -1468,7 +1508,7 @@ msgstr "Usator sin profilo correspondente"
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Configuration del avatar"
 
@@ -1477,7 +1517,7 @@ msgstr "Configuration del avatar"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Original"
 
@@ -1486,7 +1526,7 @@ msgstr "Original"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Previsualisation"
 
@@ -1522,7 +1562,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Datos del file perdite."
 
@@ -1591,7 +1631,8 @@ msgstr "Tu ha ja blocate iste usator."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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"
 
@@ -1614,7 +1655,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "No"
@@ -1632,7 +1673,7 @@ msgstr "Non blocar iste usator"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Si"
@@ -1839,7 +1880,7 @@ 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:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Il habeva un problema con tu indicio de session."
 
@@ -1932,12 +1973,13 @@ msgstr "Deler iste gruppo"
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2096,13 +2138,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Fundo"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2313,14 +2355,15 @@ 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:70 actions/newgroup.php:65
+#: 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: 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:107 actions/grouplogo.php:112
+#: 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."
 
@@ -2378,7 +2421,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2407,7 +2450,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2502,9 +2545,8 @@ msgstr "Nulle adresse de e-mail."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
 #: actions/emailsettings.php:388
-#, fuzzy
 msgid "Cannot normalize that email address."
-msgstr "Non pote normalisar iste adresse de e-mail"
+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
@@ -2523,7 +2565,7 @@ 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 IM 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
@@ -2541,7 +2583,7 @@ msgstr ""
 "instructiones pro usar lo."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2686,9 +2728,9 @@ msgstr "Usatores in evidentia, pagina %d"
 
 #. TRANS: Description on page displaying featured users.
 #: actions/featured.php:102
-#, fuzzy, php-format
+#, php-format
 msgid "A selection of some great users on %s."
-msgstr "Un selection de usatores eminente in %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
@@ -2711,62 +2753,77 @@ msgstr "Nulle annexo."
 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!"
 
-#: actions/finishremotesubscribe.php:80
+#. 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."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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!"
 
-#: actions/finishremotesubscribe.php:99
+#. 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."
 
-#: actions/finishremotesubscribe.php:110
+#. 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."
 
-#: actions/finishremotesubscribe.php:113
+#. 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."
 
-#: actions/finishremotesubscribe.php:118
+#. 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."
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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."
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "File non existe."
 
-#: actions/getfile.php:83
+#. 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."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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."
 
-#: actions/grantrole.php:75
+#. 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."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2776,37 +2833,47 @@ msgstr "Le usator ha ja iste rolo."
 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 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:76 actions/groupunblock.php:77
+#: 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."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "Nulle gruppo specificate."
 
-#: actions/groupblock.php:91
+#. 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."
 
-#: actions/groupblock.php:95
+#. 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."
 
-#: actions/groupblock.php:100
+#. 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."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2818,32 +2885,37 @@ msgstr ""
 "subscriber se al gruppo in le futuro."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "Blocar iste usator de iste gruppo"
 
-#: actions/groupblock.php:206
+#. 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."
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Nulle ID."
 
-#: actions/groupdesignsettings.php:68
+#. 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."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Apparentia del gruppo"
 
-#: actions/groupdesignsettings.php:155
+#. 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."
@@ -2851,19 +2923,26 @@ msgstr ""
 "Personalisa le apparentia de tu gruppo con un imagine de fundo e un paletta "
 "de colores de tu preferentia."
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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 salveguardar le configurationes del apparentia."
+
+#. TRANS: Form text to confirm saved group design settings.
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "Preferentias de apparentia salveguardate."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2872,106 +2951,115 @@ msgstr ""
 "maximal del file es %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Incargar"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Taliar"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logotypo actualisate."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Membros del gruppo %1$s, pagina %2$d"
 
-#: actions/groupmembers.php:122
+#. 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."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "Administrator"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Blocar"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Blocar iste usator"
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Facer admin"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: 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: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "Gruppos"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "Gruppos, pagina %d"
 
-#: actions/groups.php:90
-#, php-format
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 "Le gruppos de %%%%site.name%%%% permitte trovar e parlar con personas que ha "
 "interesses similar al tues. Post haber unite se a un gruppo, tu pote inviar "
@@ -2979,11 +3067,13 @@ msgstr ""
 "vide un gruppo que te place? Tenta [cercar un](%%%%action.groupsearch%%%%) o "
 "[crear le tue!](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -2992,25 +3082,31 @@ msgstr ""
 "Cercar gruppos in %%site.name%% per nomine, loco o description. Separa le "
 "terminos con spatios; illos debe haber al minus 3 characteres."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Recerca de gruppos"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "Nulle resultato."
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 "Si tu non trova le gruppo que tu cerca, tu pote [crear lo](%%action.newgroup%"
 "%) tu mesme."
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3020,21 +3116,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Error de remover le blocada."
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "Configuration de messageria instantanee"
@@ -3043,114 +3139,122 @@ msgstr "Configuration de messageria instantanee"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 "Tu pote inviar e reciper notas per [messages instantanee](%%doc.im%%) de "
 "Jabber/GTalk. Configura tu adresse e parametros hic infra."
 
-#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "Messageria instantanee non disponibile."
 
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "Adresse Jabber/GTalk actualmente confirmate."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 ""
 "Attende confirmation de iste adresse. Verifica tu conto Jabber/GTalk pro un "
 "message con ulterior instructiones. (Ha tu addite %s a tu lista de amicos?)"
 
-#. TRANS: IM address input field instructions in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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 GTalk, como \"nomine@example.org\". Primo, assecura te "
 "de adder %s a tu lista de amicos in tu cliente de messageria instantanee o "
 "in GTalk."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Preferentias de messageria instantanee"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Inviar me notas per Jabber/GTalk."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "Publicar un nota quando mi stato de Jabber/GTalk cambia."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, fuzzy
+msgid ""
+"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
 msgstr ""
 "Inviar me responsas per Jabber/GTalk de personas al quales io non es "
 "subscribite."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Publicar un MicroID pro mi adresse Jabber/GTalk."
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Preferentias confirmate."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "Non pote normalisar iste ID de Jabber"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "ID de Jabber non valide"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "Le ID de Jabber pertine ja a un altere usator."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3160,42 +3264,47 @@ 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 IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 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.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 msgid "Could not delete IM confirmation."
 msgstr "Non poteva deler confirmation de messageria instantanee."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "Confirmation de messageria instantanee cancellate."
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging 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."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
@@ -3203,31 +3312,31 @@ msgstr ""
 "recipite."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:40
+#: 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:44
+#: 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:77
+#: 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:116
+#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "Invitationes inviate"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Invitar nove usatores"
 
@@ -3235,7 +3344,7 @@ 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:139
+#: 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:"
@@ -3243,7 +3352,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3252,7 +3361,7 @@ 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:153
+#: 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:"
@@ -3265,7 +3374,7 @@ 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:167
+#: 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:"
@@ -3273,7 +3382,7 @@ 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:177
+#: 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!"
@@ -3282,34 +3391,35 @@ msgstr ""
 "registra in le sito. Gratias pro facer crescer le communitate!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: 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:217
+#: 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:220
-msgid "Addresses of friends to invite (one per line)"
+#: actions/invite.php:221
+#, fuzzy
+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:224
+#: 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:227
+#: 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:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Inviar"
@@ -3317,7 +3427,7 @@ 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:263
+#: 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"
@@ -3327,7 +3437,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5210,7 +5320,7 @@ msgid "Application profile"
 msgstr "Profilo del application"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icone"
 
@@ -5940,9 +6050,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-#, fuzzy
 msgid "No code entered."
-msgstr "Nulle codice entrate"
+msgstr "Nulle codice entrate."
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
@@ -6540,7 +6649,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:885
+#: actions/version.php:198 lib/action.php:898
 msgid "Version"
 msgstr "Version"
 
@@ -6666,7 +6775,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr "Nulle nomine de base de datos o DSN trovate."
 
@@ -6934,214 +7043,214 @@ msgid "Other"
 msgstr "Altere"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Pagina sin titulo"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Monstrar plus"
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "Navigation primari del sito"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Profilo personal e chronologia de amicos"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
 #. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personal"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "Conto"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: lib/action.php:560
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Connecter a servicios"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "Connecter"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: lib/action.php:566
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Modificar le configuration del sito"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: 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"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Invitar"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: lib/action.php:582
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Terminar le session del sito"
 
 #. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Clauder session"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Crear un conto"
 
 #. 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:580 lib/logingroupnav.php:85
+#: 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:583
+#: lib/action.php:596
 msgctxt "TOOLTIP"
 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:586 lib/logingroupnav.php:77
+#: 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:589
+#: 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:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "Adjuta"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: lib/action.php:611
 msgctxt "MENU"
 msgid "Search"
 msgstr "Cercar"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:620 lib/adminpanelaction.php:387
+#: 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:687
+#: 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:757
+#: 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:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "Navigation secundari del sito"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "Adjuta"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "A proposito"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "CdS"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "Confidentialitate"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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
+#: lib/action.php:902
 msgid "Contact"
 msgstr "Contacto"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "Insignia"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "Licentia del software StatusNet"
 
@@ -7149,7 +7258,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7159,7 +7268,7 @@ msgstr ""
 "%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** es un servicio de microblog."
@@ -7168,7 +7277,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7180,51 +7289,51 @@ msgstr ""
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "Ante"
 
@@ -7271,6 +7380,13 @@ msgstr "Le profilo remote non es un gruppo!"
 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 ""
+
 #. 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."
@@ -7480,7 +7596,7 @@ msgid "Failed to delete revoked token."
 msgstr "Falleva de deler le indicio revocate."
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Icone pro iste application"
 
@@ -8090,12 +8206,12 @@ msgstr "Error de base de datos"
 
 #. 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "Incargar file"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
@@ -8149,7 +8265,6 @@ msgstr "Disfavorir iste nota"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
 #: lib/disfavorform.php:136
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Disfavorir favorite"
@@ -8162,7 +8277,6 @@ msgstr "Favorir iste nota"
 
 #. TRANS: Button text for adding the favourite status to a notice.
 #: lib/favorform.php:135
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Favorir"
@@ -8922,11 +9036,11 @@ msgstr "Inviar un nota"
 msgid "What's up, %s?"
 msgstr "Como sta, %s?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "Annexar"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "Annexar un file"
 
@@ -9034,28 +9148,24 @@ msgstr "Non poteva inserer nove subscription."
 
 #. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
-#, fuzzy
 msgctxt "MENU"
 msgid "Replies"
 msgstr "Responsas"
 
 #. TRANS: Personal group navigation menu option when logged in for seeing own profile.
 #: lib/personalgroupnav.php:114
-#, 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 "Favorites"
 
 #. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
 #: lib/personalgroupnav.php:133
-#, fuzzy
 msgctxt "MENU"
 msgid "Inbox"
 msgstr "Cassa de entrata"
@@ -9067,7 +9177,6 @@ msgstr "Tu messages recipite"
 
 #. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
 #: lib/personalgroupnav.php:140
-#, fuzzy
 msgctxt "MENU"
 msgid "Outbox"
 msgstr "Cassa de exito"
@@ -9120,6 +9229,13 @@ msgstr "ID del usator"
 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:98
+msgid "Groups"
+msgstr "Gruppos"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9544,6 +9660,3 @@ msgstr "XML invalide, radice XRD mancante."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Obtene copia de reserva ex file '%s'."
-
-#~ msgid "Personal"
-#~ msgstr "Personal"
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index fc093d7706..417792f498 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:25+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:34:40+0000\n"
 "Language-Team: Icelandic <http://translatewiki.net/wiki/Portal:is>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: is\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -82,7 +82,7 @@ msgstr "Stillingar fyrir mynd"
 #. 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -136,6 +136,9 @@ msgstr "Ekkert þannig merki."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -153,7 +156,7 @@ msgstr "Ekkert þannig merki."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -321,8 +324,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -343,13 +346,15 @@ msgstr "Gat ekki uppfært notanda."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -385,11 +390,12 @@ msgstr[1] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -399,7 +405,7 @@ msgstr ""
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 #, fuzzy
 msgid "Could not update your design."
 msgstr "Gat ekki uppfært hóp."
@@ -414,7 +420,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -826,9 +832,9 @@ msgstr "Þú ert ekki áskrifandi."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -859,7 +865,7 @@ msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s"
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -867,7 +873,7 @@ msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %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:335
+#: 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
@@ -934,7 +940,7 @@ msgstr "Lykilorð"
 #. 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1274,6 +1280,13 @@ msgstr "Aðferð í forritsskilum fannst ekki!"
 msgid "No such profile."
 msgstr "Ekkert svoleiðis babl."
 
+#. 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 "Færslur frá %1$s og vinum á %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
@@ -1312,6 +1325,13 @@ msgstr "Bæta við sem uppáhaldsbabli"
 msgid "%s group memberships"
 msgstr "Hópmeðlimir %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 "Hópar sem %s er meðlimur í"
+
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
 #: actions/atompubmembershipfeed.php:219
 #, fuzzy
@@ -1360,7 +1380,17 @@ msgstr "Gat ekki eytt uppáhaldi."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1373,12 +1403,12 @@ msgstr "Gat ekki eytt uppáhaldi."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1420,6 +1450,13 @@ msgstr "Þú ert ekki áskrifandi."
 msgid "Cannot delete someone else's subscription."
 msgstr "Gat ekki vistað áskrift."
 
+#. 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 "Fólk sem eru áskrifendur að %s"
+
 #. TRANS: Client error displayed when not using the follow verb.
 #: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
@@ -1453,12 +1490,15 @@ msgstr "Ekkert þannig merki."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Ekkert stuttnefni."
 
@@ -1490,7 +1530,7 @@ msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
 #. 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Notandi hefur enga persónulega síðu."
@@ -1499,7 +1539,7 @@ msgstr "Notandi hefur enga persónulega síðu."
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Stillingar fyrir mynd"
 
@@ -1508,7 +1548,7 @@ msgstr "Stillingar fyrir mynd"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Upphafleg mynd"
 
@@ -1517,7 +1557,7 @@ msgstr "Upphafleg mynd"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Forsýn"
 
@@ -1558,7 +1598,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Týndum skráargögnunum okkar"
 
@@ -1623,7 +1663,8 @@ msgstr "Þú ert nú þegar í áskrift að þessum notendum:"
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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 "Loka á notanda"
 
@@ -1643,7 +1684,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Athugasemd"
@@ -1662,7 +1703,7 @@ msgstr "Opna á þennan notanda"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1878,7 +1919,7 @@ msgstr "Þú ert ekki meðlimur í þessum hópi."
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:112 actions/showapplication.php:118
-#: lib/action.php:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Það komu upp vandamál varðandi setutókann þinn."
 
@@ -1973,12 +2014,13 @@ msgstr "Eyða þessu babli"
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2146,13 +2188,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr ""
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, fuzzy, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2375,14 +2417,15 @@ msgstr "Breyta hópnum %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:70 actions/newgroup.php:65
+#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "Þú verður að hafa skráð þig inn til að búa til hóp."
 
 #. 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:107 actions/grouplogo.php:112
+#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "Þú verður að hafa skráð þig inn til að búa til hóp."
 
@@ -2442,7 +2485,7 @@ msgstr "Núverandi staðfesta tölvupóstfangið."
 
 #. 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2471,7 +2514,7 @@ msgid "Email address, like \"UserName@example.org\""
 msgstr "Tölvupóstfang eins og \"notandi@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 an Instant Messaging address in Instant Messaging 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
@@ -2588,7 +2631,7 @@ msgid "That email address already belongs to another user."
 msgstr "Þetta tölvupóstfang tilheyrir öðrum notanda."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
-#. TRANS: Server error thrown on database error adding IM 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
@@ -2607,7 +2650,7 @@ msgstr ""
 "staðfestingarlykillinn að vera og leiðbeingar um hvernig eigi að nota hann. "
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2778,70 +2821,85 @@ msgstr "Ekkert svoleiðis skjal."
 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 "Bjóst ekki við þessu svari!"
 
-#: actions/finishremotesubscribe.php:80
+#. 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 "Notandi sem verið er að hlusta á er ekki til."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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 "Þú getur notað staðbundna áskrift!"
 
-#: actions/finishremotesubscribe.php:99
+#. 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 "Þessi notandi hefur bannað þér að gerast áskrifandi"
 
-#: actions/finishremotesubscribe.php:110
+#. 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 "Þú ert ekki áskrifandi."
 
-#: actions/finishremotesubscribe.php:113
+#. 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 "Gat ekki breytt beiðnistókum í aðgangstóka."
 
-#: actions/finishremotesubscribe.php:118
+#. 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 "Óþekkt útgáfa OMB samskiptamátans."
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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 "Villa kom upp í uppfærslu persónulegrar fjarsíðu"
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 #, fuzzy
 msgid "No such file."
 msgstr "Ekkert svoleiðis babl."
 
-#: actions/getfile.php:83
+#. TRANS: Client error displayed when requesting a file without having read access to it.
+#: actions/getfile.php:82
 #, fuzzy
 msgid "Cannot read file."
 msgstr "Týndum skránni okkar"
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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 "Ótæk stærð."
 
+#. 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 ""
 
-#: actions/grantrole.php:75
+#. 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 "Það hefur verið lagt bann við babli frá þér á þessari síðu."
 
-#: actions/grantrole.php:82
+#. 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 "Notandi hefur enga persónulega síðu."
 
+#. 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 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.
@@ -2851,41 +2909,51 @@ msgstr "Notandi hefur enga persónulega síðu."
 msgid "No profile specified."
 msgstr "Engin persónuleg síða tilgreind"
 
+#. 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 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:76 actions/groupunblock.php:77
+#: 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 "Engin persónulega síða með þessu einkenni"
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 #, fuzzy
 msgid "No group specified."
 msgstr "Engin persónuleg síða tilgreind"
 
-#: actions/groupblock.php:91
+#. 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 ""
 
-#: actions/groupblock.php:95
+#. 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 "Notandinn hefur lokað á þig."
 
-#: actions/groupblock.php:100
+#. 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 "Þú ert ekki meðlimur í þessum hópi."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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 "Loka á notanda"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2894,170 +2962,193 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: actions/groupblock.php:191
 #, fuzzy
 msgid "Do not block this user from this group"
 msgstr "Listi yfir notendur í þessum hóp."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:189
+#: actions/groupblock.php:198
 #, fuzzy
 msgid "Block this user from this group"
 msgstr "Listi yfir notendur í þessum hóp."
 
-#: actions/groupblock.php:206
+#. 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 ""
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Ekkert Jabber-kenni"
 
-#: actions/groupdesignsettings.php:68
+#. 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 "Þú verður að hafa skráð þig inn til að búa til hóp."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 #, fuzzy
 msgid "Group design"
 msgstr "Hópar"
 
-#: actions/groupdesignsettings.php:155
+#. 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 ""
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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 "Gat ekki uppfært hóp."
+
+#. TRANS: Form text to confirm saved group design settings.
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
 #, fuzzy
 msgid "Design preferences saved."
 msgstr "Stillingar vistaðar."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: actions/grouplogo.php:144 actions/grouplogo.php:199
 msgid "Group logo"
 msgstr "Einkennismynd hópsins"
 
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
-#: actions/grouplogo.php:157
+#: actions/grouplogo.php:156
 #, fuzzy, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Hlaða upp"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Skera af"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: actions/grouplogo.php:376
 #, fuzzy
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 "Veldu ferningslaga svæði á upphaflegu myndinni sem einkennismyndina þína"
 
 #. TRANS: Form success message after updating a group logo.
-#: actions/grouplogo.php:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Einkennismynd uppfærð."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: actions/grouplogo.php:414
 msgid "Failed updating logo."
 msgstr "Tókst ekki að uppfæra einkennismynd"
 
 #. TRANS: Title of the page showing group members.
 #. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:102
+#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr "Hópmeðlimir %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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Hópmeðlimir %s"
 
-#: actions/groupmembers.php:122
+#. TRANS: Page notice for group members page.
+#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "Listi yfir notendur í þessum hóp."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "Stjórnandi"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr ""
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: actions/grouprss.php:141
 #, fuzzy, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Færslur frá %1$s á %2$s!"
 
-#. TRANS: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "Hópar"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "Hópar, síða %d"
 
-#: actions/groups.php:90
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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 "Búa til nýjan hóp"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -3066,24 +3157,30 @@ msgstr ""
 "Leita að fólki á %%site.name%% eftir nafni, staðsetningu eða áhugamáli. "
 "Leitarorð eru aðskilin með bili og verða að vera að minnsta kosti 3 tákn."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Hópleit"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 #, fuzzy
 msgid "No results."
 msgstr "Niðurstöður skipunar"
 
-#: actions/groupsearch.php:82
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3091,22 +3188,22 @@ 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:94
+#: 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:99
+#: actions/groupunblock.php:100
 #, fuzzy
 msgid "User is not blocked from group."
 msgstr "Notandinn hefur lokað á þig."
 
 #. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Vill kom upp við að aflétta notendalokun."
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "Stillingar fyrir mynd"
@@ -3115,116 +3212,124 @@ msgstr "Stillingar fyrir mynd"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 "Þú getur sent og tekið á móti babli í gegnum Jabber/GTalk "
 "[snarskilaboðaþjónustuna](%%doc.im%%). Settu upp netfangið þitt hér fyrir "
 "neðan og stilltu notkunina."
 
-#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:90
 #, fuzzy
 msgid "IM is not available."
 msgstr "Þessi síða er ekki aðgengileg í "
 
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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 "Tölvupóstföng"
 
 #: actions/imsettings.php:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "Núverandi staðfesta Jabber/GTalk snarskilaboðafangið."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 ""
 "Býð eftir staðfestingu frá þessu netfangi. Athugaðu Jabber/GTalk aðganginn "
 "þinn. Þar ættu að vera skilaboð með ítarlegri leiðbeiningum. (Hefurðu bætt %"
 "s við í vinalistann þinn?)"
 
-#. TRANS: IM address input field instructions in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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 eða GTalk netfang eins og \"notandi@example.org\". Fyrst skaltu vera "
 "viss um að bæta %s við í vinalistann þinn í snarskilaboðaforritinu þínu eða "
 "á GTalk."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Stillingar vistaðar."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Sendur mér babl í gegnum Jabber/GTalk."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "Senda inn babl þegar Jabber/GTalk staðan breytist."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, fuzzy
+msgid ""
+"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
 msgstr ""
 "Sendu mér svör í gegnum Jabber/GTalk frá fólki sem ég er ekki áskrifandi að."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Birta MicroID fyrir Jabber/GTalk netfangið mitt."
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Stillingar vistaðar."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. TRANS: Message given saving Instant Messaging address without having provided one.
 #: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "Ekkert Jabber-kenni"
 
-#. TRANS: Message given saving IM address that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "Get ekki staðlað þetta Jabber kenni"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "Ekki tækt Jabber-kenni"
 
-#. TRANS: Message given saving IM address that is already set.
+#. TRANS: Message given saving Instant Messaging address that is already set.
 #: actions/imsettings.php:321
 msgid "That is already your Jabber ID."
 msgstr "Þetta er nú þegar Jabber-kennið þitt."
 
-#. TRANS: Message given saving IM address that is already set for another user.
+#. 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."
 msgstr "Jabber-kennið tilheyrir öðrum notanda."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3234,75 +3339,80 @@ msgstr ""
 "Staðfestingarlykill var sendur á snarskilaboðafangið sem þú varst að bæta "
 "við. Þú verður að leyfa %s að senda snarskilaboð til þín."
 
-#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "Þetta er rangt snarskilaboðafang."
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 #, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "Gat ekki eytt tölvupóstsstaðfestingu."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "Enginn staðfestingarlykill."
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging address that is not
 #. TRANS: registered for the active user.
 #: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Þetta er ekki Jabber-kennið þitt."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 msgid "The IM address was removed."
 msgstr "Móttökutölvupóstfang fjarlægt."
 
+#. 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 "Innhólf %s"
 
-#: actions/inbox.php:62
+#. 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 "Innhólf %s"
 
+#. TRANS: Instructions for user inbox page.
 #: actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "Þetta er innhólfið þitt sem sýnir persónuleg skilaboð sem voru send til þín."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:40
+#: 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:44
+#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "Þú verður að hafa skráð þig inn til að bæta þér í hóp."
 
 #. 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:77
+#: actions/invite.php:78
 #, fuzzy, php-format
 msgid "Invalid email address: %s."
 msgstr "Ótækt tölvupóstfang: %s"
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:116
+#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "Boðskort hefur verið sent út"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Bjóða nýjum notendum að vera með"
 
@@ -3310,7 +3420,7 @@ msgstr "Bjóða nýjum notendum að vera með"
 #. 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:139
+#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3319,7 +3429,7 @@ msgstr[1] "Þú ert nú þegar í áskrift að þessum notendum:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#: actions/invite.php:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3328,7 +3438,7 @@ 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:153
+#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3341,7 +3451,7 @@ 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:167
+#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3350,7 +3460,7 @@ msgstr[1] "Boðskort sent á eftirfarandi aðila:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:177
+#: 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!"
@@ -3359,7 +3469,7 @@ msgstr ""
 "skrá sig á síðuna. Takk fyrir að stækka samfélagið!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3367,27 +3477,28 @@ msgstr ""
 "þessa örbloggsþjónustu."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:217
+#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "Tölvupóstföng"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:220
-msgid "Addresses of friends to invite (one per line)"
+#: actions/invite.php:221
+#, fuzzy
+msgid "Addresses of friends to invite (one per line)."
 msgstr "Tölvupóstfang vina sem þú vilt bjóða (eitt póstfang í hverja línu)"
 
 #. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:224
+#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Persónuleg skilaboð"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:227
+#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Bættu persónulegum skilaboðum við boðskortið ef þú vilt."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:231
+#: actions/invite.php:232
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Send"
@@ -3396,7 +3507,7 @@ msgstr "Senda"
 #. 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:263
+#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s hefur boðið þér að slást í hópinn með þeim á %2$s"
@@ -3406,7 +3517,7 @@ msgstr "%1$s hefur boðið þér að slást í hópinn með þeim á %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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5334,7 +5445,7 @@ msgid "Application profile"
 msgstr "Babl hefur enga persónulega síðu"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr ""
 
@@ -6643,7 +6754,7 @@ msgid "Plugins"
 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:898
 #, fuzzy
 msgid "Version"
 msgstr "Persónulegt"
@@ -6771,7 +6882,7 @@ msgid "Could not create login token for %s"
 msgstr "Gat ekki búið til uppáhald."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -7047,29 +7158,29 @@ msgid "Other"
 msgstr "Annað"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Ónafngreind síða"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "Stikl aðalsíðu"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
@@ -7077,37 +7188,37 @@ msgstr "Persónuleg síða og vinarás"
 
 #. 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:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 #, fuzzy
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Persónulegt"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: lib/action.php:555
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Breyta lykilorðinu þínu"
 
 #. TRANS: Main menu option when logged in for access to user settings.
-#: lib/action.php:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "Aðgangur"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: lib/action.php:560
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Gat ekki framsent til vefþjóns: %s"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "Tengjast"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: lib/action.php:566
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
@@ -7115,54 +7226,54 @@ msgstr "Stikl aðalsíðu"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 #, fuzzy
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Stjórnandi"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: lib/action.php:573
 #, fuzzy, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Bjóða vinum og vandamönnum að slást í hópinn á %s"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:563
+#: lib/action.php:576
 #, fuzzy
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Bjóða"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: lib/action.php:582
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Skrá þig inn á síðuna"
 
 #. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Einkennismerki"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Búa til nýjan hóp"
 
 #. TRANS: Main menu option when not logged in to register a new account.
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/action.php:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 #, fuzzy
 msgctxt "MENU"
 msgid "Register"
 msgstr "Nýskrá"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site"
@@ -7170,34 +7281,34 @@ msgstr "Skrá þig inn á síðuna"
 
 #. TRANS: Main menu option when not logged in to log in.
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/action.php:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 #, fuzzy
 msgctxt "MENU"
 msgid "Login"
 msgstr "Innskráning"
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: lib/action.php:602
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Hjálp"
 
 #. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:592
+#: lib/action.php:605
 #, fuzzy
 msgctxt "MENU"
 msgid "Help"
 msgstr "Hjálp"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: lib/action.php:608
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Leita að fólki eða texta"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
-#: lib/action.php:598
+#: lib/action.php:611
 #, fuzzy
 msgctxt "MENU"
 msgid "Search"
@@ -7205,69 +7316,69 @@ msgstr "Leita"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:620 lib/adminpanelaction.php:387
+#: lib/action.php:633 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Babl vefsíðunnar"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:687
+#: lib/action.php:700
 msgid "Local views"
 msgstr "Staðbundin sýn"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:757
+#: lib/action.php:770
 msgid "Page notice"
 msgstr "Babl síðunnar"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "Stikl undirsíðu"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "Hjálp"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "Um"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "Spurt og svarað"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "Friðhelgi"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 msgid "Source"
 msgstr "Frumþula"
 
 #. 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:902
 msgid "Contact"
 msgstr "Tengiliður"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 #, fuzzy
 msgid "Badge"
 msgstr "Pot"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "Hugbúnaðarleyfi StatusNet"
 
@@ -7275,7 +7386,7 @@ msgstr "Hugbúnaðarleyfi StatusNet"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:928
+#: lib/action.php:941
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7285,7 +7396,7 @@ msgstr ""
 "broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** er örbloggsþjónusta."
@@ -7294,7 +7405,7 @@ msgstr "**%%site.name%%** er örbloggsþjónusta."
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7306,51 +7417,51 @@ msgstr ""
 "licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 #, fuzzy
 msgid "Site content license"
 msgstr "Hugbúnaðarleyfi StatusNet"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 msgid "Pagination"
 msgstr "Uppröðun"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1351
+#: lib/action.php:1364
 msgid "After"
 msgstr "Eftir"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "Áður"
 
@@ -7398,6 +7509,13 @@ msgstr ""
 msgid "User is already a member of this group."
 msgstr "Þú ert nú þegar meðlimur í þessum hópi"
 
+#. 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."
@@ -7616,7 +7734,7 @@ msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr ""
 
@@ -8206,13 +8324,13 @@ 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:104
+#: lib/designsettings.php:108
 #, fuzzy
 msgid "Upload file"
 msgstr "Hlaða upp"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
@@ -8948,11 +9066,11 @@ msgstr "Senda babl"
 msgid "What's up, %s?"
 msgstr "Hvað er að frétta %s?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr ""
 
@@ -9152,6 +9270,13 @@ msgstr "Notandi"
 msgid "Member since"
 msgstr "Meðlimur síðan"
 
+#. 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
+msgid "Groups"
+msgstr "Hópar"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9587,6 +9712,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "Personal"
-#~ msgstr "Persónulegt"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 57408f8f09..c84a1816d3 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:26+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:34:43+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 (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -80,7 +80,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -132,6 +132,9 @@ msgstr "Pagina inesistente."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -149,7 +152,7 @@ msgstr "Pagina inesistente."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -323,8 +326,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -344,13 +347,15 @@ msgstr "Impossibile aggiornare l'utente."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -389,11 +394,12 @@ msgstr[1] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -403,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Impossibile aggiornare l'aspetto."
 
@@ -417,7 +423,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -817,9 +823,9 @@ msgstr "Autorizzazione non presente."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -850,7 +856,7 @@ msgstr "Errore nel database nell'inserire l'applicazione utente OAuth."
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -858,7 +864,7 @@ 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:335
+#: 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
@@ -931,7 +937,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1270,6 +1276,13 @@ msgstr "Metodo delle API non trovato."
 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
@@ -1308,6 +1321,13 @@ msgstr "Aggiungi ai preferiti"
 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
@@ -1356,7 +1376,17 @@ msgstr "Impossibile eliminare un preferito."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1369,12 +1399,12 @@ msgstr "Impossibile eliminare un preferito."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1416,6 +1446,13 @@ msgstr "Non hai una abbonamento a quel profilo."
 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."
@@ -1448,12 +1485,15 @@ msgstr "Nessun allegato."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Nessun soprannome."
 
@@ -1486,7 +1526,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Utente senza profilo corrispondente."
@@ -1495,7 +1535,7 @@ msgstr "Utente senza profilo corrispondente."
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Impostazioni immagine"
 
@@ -1504,7 +1544,7 @@ msgstr "Impostazioni immagine"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Originale"
 
@@ -1513,7 +1553,7 @@ msgstr "Originale"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Anteprima"
 
@@ -1552,7 +1592,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Perso il nostro file di dati."
 
@@ -1617,7 +1657,8 @@ msgstr "Hai già bloccato quell'utente."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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"
 
@@ -1640,7 +1681,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "No"
@@ -1658,7 +1699,7 @@ msgstr "Non bloccare questo utente"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Sì"
@@ -1868,7 +1909,7 @@ 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:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Si è verificato un problema con il tuo token di sessione."
 
@@ -1965,12 +2006,13 @@ msgstr "Elimina questo utente"
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2131,13 +2173,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Sfondo"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2352,14 +2394,15 @@ 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:70 actions/newgroup.php:65
+#: 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: 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:107 actions/grouplogo.php:112
+#: 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."
 
@@ -2417,7 +2460,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2447,7 +2490,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2563,7 +2606,7 @@ 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 IM 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
@@ -2582,7 +2625,7 @@ msgstr ""
 "codice e le istruzioni su come usarlo."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2755,62 +2798,77 @@ msgstr "Nessun allegato."
 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!"
 
-#: actions/finishremotesubscribe.php:80
+#. 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."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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!"
 
-#: actions/finishremotesubscribe.php:99
+#. 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."
 
-#: actions/finishremotesubscribe.php:110
+#. 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."
 
-#: actions/finishremotesubscribe.php:113
+#. 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."
 
-#: actions/finishremotesubscribe.php:118
+#. 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."
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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."
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Nessun file."
 
-#: actions/getfile.php:83
+#. 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."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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."
 
-#: actions/grantrole.php:75
+#. 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."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2820,37 +2878,47 @@ msgstr "L'utente ricopre già questo ruolo."
 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 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:76 actions/groupunblock.php:77
+#: 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."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "Nessun gruppo specificato."
 
-#: actions/groupblock.php:91
+#. 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."
 
-#: actions/groupblock.php:95
+#. 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."
 
-#: actions/groupblock.php:100
+#. 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."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2862,32 +2930,37 @@ msgstr ""
 "gruppo."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: actions/groupblock.php:191
 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "Blocca l'utente da questo gruppo"
 
-#: actions/groupblock.php:206
+#. 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."
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Nessun ID."
 
-#: actions/groupdesignsettings.php:68
+#. 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."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Aspetto del gruppo"
 
-#: actions/groupdesignsettings.php:155
+#. 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."
@@ -2895,19 +2968,26 @@ msgstr ""
 "Personalizza l'aspetto del tuo gruppo con un'immagine di sfondo e dei colori "
 "personalizzati."
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 msgid "Design preferences saved."
 msgstr "Preferenze dell'aspetto salvate."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2916,106 +2996,115 @@ msgstr ""
 "del file è di %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Carica"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Ritaglia"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logo aggiornato."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Membri del gruppo %1$s, pagina %2$d"
 
-#: actions/groupmembers.php:122
+#. 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."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "Amministra"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Blocca"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Blocca questo utente"
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Rendi amministratore"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: 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: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "Gruppi"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "Gruppi, pagina %d"
 
-#: actions/groups.php:90
-#, php-format
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 "I gruppi di %%%%site.name%%%% ti consentono di trovare e parlare con persone "
 "che condividono i tuoi stessi interessi. Quando fai parte di un gruppo, puoi "
@@ -3023,11 +3112,13 @@ msgstr ""
 "nomegruppo\". Non trovi un gruppo che ti piace? Prova a [cercarne uno](%%%%"
 "action.groupsearch%%%%) o [crea il tuo!](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -3036,25 +3127,31 @@ msgstr ""
 "Cerca tra i gruppi su %%site.name%% per nome, ubicazione o descrizione. "
 "Separa i termini di ricerca con degli spazi; lunghezza minima 3 caratteri."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Cerca gruppi"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "Nessun risultato."
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 "Se non riesci a trovare il gruppo che cerchi, puoi [crearlo](%%action."
 "newgroup%%) tu."
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3064,21 +3161,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Errore nel rimuovere il blocco."
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "Impostazioni messaggistica istantanea"
@@ -3087,114 +3184,122 @@ msgstr "Impostazioni messaggistica istantanea"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address 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 IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "Messaggistica istantanea non disponibile."
 
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "Indirizzo Jabber/GTalk attualmente confermato."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 ""
 "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 IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Preferenze messaggistica"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Inviami i messaggi via Jabber/GTalk"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "Pubblica un messaggio quando il mio stato Jabber/GTalk cambia"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, 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 IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+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 IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Preferenze salvate."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 IM address that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "Impossibile normalizzare quell'ID Jabber"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "Non è un ID Jabber valido"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "ID Jabber già assegnato a un altro utente."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3204,43 +3309,48 @@ 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 IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 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.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 #, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "Impossibile eliminare la conferma della messaggistica."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "Conferma della messaggistica annullata."
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging 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."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
@@ -3248,32 +3358,32 @@ msgstr ""
 "ricevuti."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:40
+#: 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:44
+#: 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:77
+#: 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:116
+#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "Inviti inviati"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Invita nuovi utenti"
 
@@ -3281,7 +3391,7 @@ 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:139
+#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3290,7 +3400,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3299,7 +3409,7 @@ 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:153
+#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3312,7 +3422,7 @@ 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:167
+#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3321,7 +3431,7 @@ 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:177
+#: 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!"
@@ -3330,7 +3440,7 @@ msgstr ""
 "registreranno sul sito. Grazie per l'aiuto ad accrescere la comunità!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3338,27 +3448,28 @@ msgstr ""
 "servizio."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:217
+#: 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:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: 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:227
+#: 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:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Invia"
@@ -3366,7 +3477,7 @@ 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:263
+#: 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"
@@ -3376,7 +3487,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5292,7 +5403,7 @@ msgid "Application profile"
 msgstr "Profilo applicazione"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icona"
 
@@ -6626,7 +6737,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:885
+#: actions/version.php:198 lib/action.php:898
 msgid "Version"
 msgstr "Versione"
 
@@ -6756,7 +6867,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr "Non è stato trovato un nome di database o DNS."
 
@@ -7026,214 +7137,214 @@ msgid "Other"
 msgstr "Altro"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Pagina senza nome"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "Esplorazione sito primaria"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Profilo personale e attività degli amici"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
 #. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personale"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "Account"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: lib/action.php:560
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Connettiti con altri servizi"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "Connetti"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: lib/action.php:566
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Modifica la configurazione del sito"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Amministra"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: 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"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Invita"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: lib/action.php:582
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Termina la tua sessione sul sito"
 
 #. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Esci"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Crea un account"
 
 #. 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrati"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 msgctxt "TOOLTIP"
 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Accedi"
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: lib/action.php:602
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Aiutami!"
 
 #. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "Aiuto"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: lib/action.php:611
 msgctxt "MENU"
 msgid "Search"
 msgstr "Cerca"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:620 lib/adminpanelaction.php:387
+#: 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:687
+#: 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:757
+#: 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:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "Esplorazione secondaria del sito"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "Aiuto"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "Informazioni"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "TOS"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "Privacy"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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
+#: lib/action.php:902
 msgid "Contact"
 msgstr "Contatti"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "Badge"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "Licenza del software StatusNet"
 
@@ -7241,7 +7352,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7251,7 +7362,7 @@ msgstr ""
 "(%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** è un servizio di microblog."
@@ -7260,7 +7371,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7272,27 +7383,27 @@ msgstr ""
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "I contenuti e i dati sono forniti dai collaboratori. Tutti i diritti "
@@ -7300,7 +7411,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:1004
+#: lib/action.php:1017
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -7308,19 +7419,19 @@ msgstr ""
 "licenza %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "Precedenti"
 
@@ -7368,6 +7479,13 @@ msgstr ""
 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."
@@ -7573,7 +7691,7 @@ msgid "Failed to delete revoked token."
 msgstr "Eliminazione del token revocato non riuscita."
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Icona per questa applicazione"
 
@@ -8196,12 +8314,12 @@ msgstr "Errore del database"
 
 #. 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "Carica file"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
@@ -9037,11 +9155,11 @@ msgstr "Invia un messaggio"
 msgid "What's up, %s?"
 msgstr "Cosa succede, %s?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "Allega"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "Allega un file"
 
@@ -9235,6 +9353,13 @@ msgstr "ID utente"
 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:98
+msgid "Groups"
+msgstr "Gruppi"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9659,6 +9784,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "Personal"
-#~ msgstr "Personale"
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index e11f6adbd1..cbe28f2797 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:27+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:34:47+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 (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -82,7 +82,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -134,6 +134,9 @@ msgstr "そのようなページはありません。"
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -151,7 +154,7 @@ msgstr "そのようなページはありません。"
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -326,8 +329,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -347,13 +350,15 @@ msgstr "ユーザを更新できませんでした。"
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -389,11 +394,12 @@ msgstr[0] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -403,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "デザインを更新できませんでした。"
 
@@ -417,7 +423,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -815,9 +821,9 @@ msgstr "認証されていません。"
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -847,7 +853,7 @@ msgstr "OAuth アプリケーションユーザの追加時ＤＢエラー。"
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -855,7 +861,7 @@ 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:335
+#: 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
@@ -922,7 +928,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1260,6 +1266,13 @@ msgstr "API メソッドが見つかりません。"
 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
@@ -1298,6 +1311,13 @@ msgstr "お気に入りに加える"
 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
@@ -1346,7 +1366,17 @@ msgstr "お気に入りを取り消すことができません。"
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1359,12 +1389,12 @@ msgstr "お気に入りを取り消すことができません。"
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1406,6 +1436,13 @@ msgstr "あなたはそのプロファイルにフォローされていません
 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."
@@ -1438,12 +1475,15 @@ msgstr "そのような添付はありません。"
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "ニックネームがありません。"
 
@@ -1475,7 +1515,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "合っているプロフィールのないユーザ"
@@ -1484,7 +1524,7 @@ msgstr "合っているプロフィールのないユーザ"
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "アバター設定"
 
@@ -1493,7 +1533,7 @@ msgstr "アバター設定"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "オリジナル"
 
@@ -1502,7 +1542,7 @@ msgstr "オリジナル"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "プレビュー"
 
@@ -1542,7 +1582,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "ファイルデータを紛失しました。"
 
@@ -1607,7 +1647,8 @@ msgstr "そのユーザはすでにブロック済みです。"
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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 "ユーザをブロック"
 
@@ -1631,7 +1672,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "ノート"
@@ -1649,7 +1690,7 @@ msgstr "このユーザをアンブロックする"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "はい"
@@ -1859,7 +1900,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:118
-#: lib/action.php:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "あなたのセッショントークンに関する問題がありました。"
 
@@ -1958,12 +1999,13 @@ 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.
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2125,13 +2167,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "バックグラウンド"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2346,14 +2388,15 @@ 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:70 actions/newgroup.php:65
+#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 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:107 actions/grouplogo.php:112
+#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "グループを編集するには管理者である必要があります。"
 
@@ -2411,7 +2454,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2440,7 +2483,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2559,7 +2602,7 @@ 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 IM 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
@@ -2578,7 +2621,7 @@ msgstr ""
 "ださい。"
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2752,67 +2795,82 @@ msgstr "そのような添付はありません。"
 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 "想定外のレスポンスです！"
 
-#: actions/finishremotesubscribe.php:80
+#. 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 "存在しないように聴かれているユーザ。"
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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 "ローカルサブスクリプションを使用可能です！"
 
-#: actions/finishremotesubscribe.php:99
+#. 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 "このユーザはフォローをブロックされています。"
 
-#: actions/finishremotesubscribe.php:110
+#. 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 "認証されていません。"
 
-#: actions/finishremotesubscribe.php:113
+#. 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 "リクエストトークンをアクセストークンに変換できません"
 
-#: actions/finishremotesubscribe.php:118
+#. 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 プロトコルを使用しています。"
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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 "リモートプロファイル更新エラー"
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "そのようなファイルはありません。"
 
-#: actions/getfile.php:83
+#. TRANS: Client error displayed when requesting a file without having read access to it.
+#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "ファイルを読み込めません。"
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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 ""
 
-#: actions/grantrole.php:75
+#. 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 "あなたはこのサイトのサンドボックスユーザができません。"
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2822,37 +2880,47 @@ msgstr "ユーザは既に黙っています。"
 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 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:76 actions/groupunblock.php:77
+#: 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 "そのＩＤのプロファイルがありません。"
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "グループ記述がありません。"
 
-#: actions/groupblock.php:91
+#. 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 "管理者だけがグループメンバーをブロックできます。"
 
-#: actions/groupblock.php:95
+#. 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 "ユーザはすでにグループからブロックされています。"
 
-#: actions/groupblock.php:100
+#. 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 "ユーザはグループのメンバーではありません。"
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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 "グループからユーザをブロック"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2863,32 +2931,37 @@ msgstr ""
 "除される、投稿できない、グループをフォローできなくなります。"
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "このグループからこのユーザをブロック"
 
-#: actions/groupblock.php:206
+#. 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 "グループからのブロックユーザのデータベースエラー"
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "ID がありません。"
 
-#: actions/groupdesignsettings.php:68
+#. 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 "グループを編集するにはログインしていなければなりません。"
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "グループデザイン"
 
-#: actions/groupdesignsettings.php:155
+#. 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."
@@ -2896,19 +2969,26 @@ msgstr ""
 "あなたが選んだパレットの色とバックグラウンドイメージであなたのグループをカス"
 "タマイズしてください。"
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 msgid "Design preferences saved."
 msgstr "デザイン設定が保存されました。"
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2917,106 +2997,115 @@ msgstr ""
 "%s。"
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "アップロード"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "切り取り"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "ロゴが更新されました。"
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s グループメンバー、ページ %2$d"
 
-#: actions/groupmembers.php:122
+#. TRANS: Page notice for group members page.
+#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "このグループのユーザのリスト。"
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "管理者"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr ""
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "%2$s 上の %1$s のメンバーから更新する"
 
-#. TRANS: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "グループ"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "グループ、ページ %d"
 
-#: actions/groups.php:90
-#, php-format
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 "%%%%site.name%%%% グループは、あなたと同様の関心事をもつ人々を見つけて話をす"
 "ることができます。グループに入った後、あなたは他のメンバーに \"!groupname\" "
@@ -3024,11 +3113,13 @@ msgstr ""
 "うか[探してみる](%%%%action.groupsearch%%%%)か、あなた自身で[始めてください!]"
 "(%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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 "新しいグループを作成"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -3037,25 +3128,31 @@ msgstr ""
 "%%site.name%% のグループを、名前、場所、記述から検索。検索語はスペース区切"
 "り。3字以上。"
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "グループの検索"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "結果なし。"
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 "もし、あなたが探しているグループが見つからないとき、あなたは[それを作成](%%"
 "action.newgroup%%)できます。"
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3065,21 +3162,21 @@ msgstr ""
 "%%) しないのか!"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "ブロックの削除エラー"
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "IM設定"
@@ -3088,113 +3185,121 @@ msgstr "IM設定"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 "Jabber/GTalk [instant messages](%%doc.im%%)　経由で通知の送信、受信が可能で"
 "す。下のアドレスを設定して下さい。"
 
-#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "ＩＭ が利用不可。"
 
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "確認された最新の　Jabber/GTakk アドレス"
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 を友人リストに追加しましたか？)"
 
-#. TRANS: IM address input field instructions in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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に追加して下さい。"
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "設定が保存されました。"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Jabber/GTalk で私に通知を送って下さい。"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "Jabber/GTalkのステータスが変更された時に通知を送る。"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, fuzzy
+msgid ""
+"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
 msgstr ""
 "Jabber/GTalkを通して回答を、私がフォローされていない人々から私に送ってくださ"
 "い。"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "私のJabber/GTalkアドレスのためにMicroIDを発行してください。"
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "設定が保存されました。"
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 IM address that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "その Jabbar ID を正規化できません"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "有効な Jabber ID ではありません。"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "Jabber ID ｊは既に別のユーザが使用しています。"
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3204,75 +3309,80 @@ msgstr ""
 "承認コードを入力された IM アドレスに送信しました。あなたにメッセージを送れる"
 "ようにするには%sを承認してください。"
 
-#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "その IM アドレスは不正です。"
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 #, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "メール承認を削除できません"
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "確認コードがありません。"
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging address that is not
 #. TRANS: registered for the active user.
 #: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "その Jabber ID はあなたのものではありません。"
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 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:40
+#: 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:44
+#: 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:77
+#: 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:116
+#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "招待を送りました。"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "新しいユーザを招待"
 
@@ -3280,7 +3390,7 @@ 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:139
+#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3288,7 +3398,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3297,7 +3407,7 @@ 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:153
+#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3309,7 +3419,7 @@ 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:167
+#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3317,7 +3427,7 @@ msgstr[0] "招待を以下の人々に送信しました:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:177
+#: 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!"
@@ -3326,34 +3436,35 @@ msgstr ""
 "しょう。 コミュニティを広げてくださってありがとうございます!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: 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:217
+#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "メールアドレス"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: actions/invite.php:225
 msgid "Personal message"
 msgstr "パーソナルメッセージ"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:227
+#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "任意に招待にパーソナルメッセージを加えてください。"
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:231
+#: actions/invite.php:232
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Send"
@@ -3362,7 +3473,7 @@ 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:263
+#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s があなたを %2$s へ招待しました"
@@ -3372,7 +3483,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5284,7 +5395,7 @@ msgid "Application profile"
 msgstr "アプリケーションプロファイル"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "アイコン"
 
@@ -6622,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:885
+#: actions/version.php:198 lib/action.php:898
 msgid "Version"
 msgstr "バージョン"
 
@@ -6748,7 +6859,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -7015,29 +7126,29 @@ msgid "Other"
 msgstr "その他"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "名称未設定ページ"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "プライマリサイトナビゲーション"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
@@ -7045,90 +7156,90 @@ 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:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 #, fuzzy
 msgctxt "MENU"
 msgid "Personal"
 msgstr "パーソナル"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "アカウント"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: 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:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "接続"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: 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:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 #, fuzzy
 msgctxt "MENU"
 msgid "Admin"
 msgstr "管理者"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: 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:563
+#: lib/action.php:576
 #, fuzzy
 msgctxt "MENU"
 msgid "Invite"
 msgstr "招待"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: 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:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "ロゴ"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 #, fuzzy
 msgctxt "MENU"
 msgid "Register"
 msgstr "登録"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site"
@@ -7136,33 +7247,33 @@ 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 #, fuzzy
 msgctxt "MENU"
 msgid "Login"
 msgstr "ログイン"
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: lib/action.php:602
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "ヘルプ"
 
 #. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:592
+#: lib/action.php:605
 #, fuzzy
 msgctxt "MENU"
 msgid "Help"
 msgstr "ヘルプ"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: lib/action.php:611
 #, fuzzy
 msgctxt "MENU"
 msgid "Search"
@@ -7170,68 +7281,68 @@ msgstr "検索"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:620 lib/adminpanelaction.php:387
+#: 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:687
+#: lib/action.php:700
 msgid "Local views"
 msgstr "ローカルビュー"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:757
+#: lib/action.php:770
 msgid "Page notice"
 msgstr "ページつぶやき"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "セカンダリサイトナビゲーション"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "ヘルプ"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "About"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "よくある質問"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "プライバシー"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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:902
 msgid "Contact"
 msgstr "連絡先"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "バッジ"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "StatusNet ソフトウェアライセンス"
 
@@ -7239,7 +7350,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:928
+#: lib/action.php:941
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7249,7 +7360,7 @@ msgstr ""
 "イクロブログサービスです。 "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** はマイクロブログサービスです。"
@@ -7258,7 +7369,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7270,50 +7381,50 @@ msgstr ""
 "org/licensing/licenses/agpl-3.0.html)。"
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "前>>"
 
@@ -7361,6 +7472,13 @@ msgstr ""
 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."
@@ -7570,7 +7688,7 @@ msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "このアプリケーションのアイコン"
 
@@ -8151,12 +8269,12 @@ 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "ファイルアップロード"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
@@ -8954,11 +9072,11 @@ msgstr "つぶやきを送る"
 msgid "What's up, %s?"
 msgstr "最近どう %s?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "添付"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "ファイル添付"
 
@@ -9156,6 +9274,13 @@ msgstr "ユーザＩＤ"
 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:98
+msgid "Groups"
+msgstr "グループ"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9573,6 +9698,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "Personal"
-#~ msgstr "パーソナル"
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
index 2fc02c3ab9..abe36af0f7 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:28+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:34:49+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 (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -76,7 +76,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -128,6 +128,9 @@ msgstr "ასეთი გვერდი არ არსებობს."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -145,7 +148,7 @@ msgstr "ასეთი გვერდი არ არსებობს."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -319,8 +322,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -340,13 +343,15 @@ msgstr "მომხმარებლის განახლება ვე
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -382,11 +387,12 @@ msgstr[0] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -396,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "დიზაინის განახლება ვერ მოხერხდა."
 
@@ -410,7 +416,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -804,9 +810,9 @@ msgstr "თქვენ არ ხართ ავტორიზირებუ
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -836,7 +842,7 @@ msgstr "ბაზამ დაუშვა შეცდომა OAuth აპლ
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -844,7 +850,7 @@ 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:335
+#: 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
@@ -911,7 +917,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1247,6 +1253,13 @@ msgstr "API მეთოდი ვერ მოიძებნა."
 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
@@ -1285,6 +1298,13 @@ msgstr "რჩეულებში დამატება"
 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
@@ -1332,7 +1352,17 @@ msgstr "ფავორიტის წაშლა ვერ მოხერხ
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1345,12 +1375,12 @@ msgstr "ფავორიტის წაშლა ვერ მოხერხ
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1392,6 +1422,13 @@ msgstr "თქვენ არ გაქვთ გამოწერილი 
 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."
@@ -1424,12 +1461,15 @@ msgstr "ასეთი მიმაგრებული დოკუმენ
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "მეტსახელი უცნობია."
 
@@ -1462,7 +1502,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "მომხმარებელი შესაბამისი პროფილის გარეშე."
@@ -1471,7 +1511,7 @@ msgstr "მომხმარებელი შესაბამისი პ
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "ავატარის პარამეტრები."
 
@@ -1480,7 +1520,7 @@ msgstr "ავატარის პარამეტრები."
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "ორიგინალი"
 
@@ -1489,7 +1529,7 @@ msgstr "ორიგინალი"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "წინასწარი გადახედვა"
 
@@ -1528,7 +1568,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr ""
 
@@ -1593,7 +1633,8 @@ msgstr "თქვენ უკვე დაბლოკეთ ეს მომ
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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 "მომხმარებლის დაბლოკვა"
 
@@ -1613,7 +1654,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "არა"
@@ -1631,7 +1672,7 @@ msgstr "არ დაბლოკო ეს მომხმარებელი
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "დიახ"
@@ -1841,7 +1882,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:118
-#: lib/action.php:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1938,12 +1979,13 @@ 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.
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2103,13 +2145,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "ფონი"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2324,14 +2366,15 @@ 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:70 actions/newgroup.php:65
+#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 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:107 actions/grouplogo.php:112
+#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "ჯგუფის რედაქტირებისათვის საჭიროა ადმინის უფლებები."
 
@@ -2389,7 +2432,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2418,7 +2461,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2533,7 +2576,7 @@ 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 IM 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
@@ -2552,7 +2595,7 @@ msgstr ""
 "დასადასტურებელი კოდი და ინსტრუქცია გამოყენებისთვის."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2724,62 +2767,77 @@ msgstr "მიმაგრებული დოკუმენტი არ ა
 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 "ეს უკუქმედება არ არის მოსალოდნელი."
 
-#: actions/finishremotesubscribe.php:80
+#. 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 "მისადევნებელი მომხმარებელი არ არსებობს."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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 "შეგიძლიათ გამოიყენოთ ადგილობრივი გამოწერა!"
 
-#: actions/finishremotesubscribe.php:99
+#. 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 "ამ მომხმარებელმა აგიკრძალათ მიდევნება."
 
-#: actions/finishremotesubscribe.php:110
+#. 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 "თქვენ არ ხართ ავტორიზირებული."
 
-#: actions/finishremotesubscribe.php:113
+#. 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 ""
 
-#: actions/finishremotesubscribe.php:118
+#. 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 პროტოკოლის უცნობ ვერსიას იყენებს."
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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 "შეცდომა დაშორებული პროფილის განახლებისას."
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "ასეთი ფაილი არ არსებობს."
 
-#: actions/getfile.php:83
+#. TRANS: Client error displayed when requesting a file without having read access to it.
+#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "ფაილის წაკითხვა ვერ ხერხდება."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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 "ეს როლი დარეზერვებულია და გამოყენება შეუძლებელია."
 
-#: actions/grantrole.php:75
+#. 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 "თქვენ არ შეგიძლიათ როლების მინიჭება ამ საიტზე."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2789,37 +2847,47 @@ msgstr "მომხმარებელს უკვე აქვს ეს 
 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 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:76 actions/groupunblock.php:77
+#: 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-ს მქონე პროფილი ვერ მოიძებნა."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "ჯგუფი მითითებული არ არის."
 
-#: actions/groupblock.php:91
+#. 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 "მხოლოდ ადმინს შეუძლია ჯგუფიდან მომხმარებლების გარიცხვა."
 
-#: actions/groupblock.php:95
+#. 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 "მომხმარებელი უკვე გარიცხულია ჯგუფიდან."
 
-#: actions/groupblock.php:100
+#. 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 "მომხმარებელი არ არის ჯგუფის წევრი."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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 "მომხმარებლის გარიცხვა ჯგუფიდან."
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2831,32 +2899,37 @@ msgstr ""
 "მომავალშიც."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "გარიცხე ეს მომხმარებელი ამ ჯგუფიდან"
 
-#: actions/groupblock.php:206
+#. 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 "მომხმარებლის ჯგუფიდან გარიცხვისას მოხდა შეცდომა ბაზაში."
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "ID უცნობია."
 
-#: actions/groupdesignsettings.php:68
+#. 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 "ჯგუფის რედაქტირებისათვის საჭიროა ავტორიზაცია."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "ჯგუფის დიზაინი"
 
-#: actions/groupdesignsettings.php:155
+#. 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."
@@ -2864,19 +2937,26 @@ msgstr ""
 "აირჩიეთ, როგორ გნებავთ გამოიყურებოდეს თქვენი ჯგუფი ფონური სურათისა და ფერთა "
 "პალიტრის შეცვლით."
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 msgid "Design preferences saved."
 msgstr "დიზაინის პარამეტრები შენახულია."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2884,106 +2964,115 @@ msgstr ""
 "თქვენ შეგიძლიათ ატვირთოთ ლოგოს თქვენი ჯგუფისათვის. ფაილის დასაშვები ზომაა %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "ატვირთვა"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "მოჭრა"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "ლოგო განახლდა."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s ჯგუფის წევრი, გვერდი %2$d"
 
-#: actions/groupmembers.php:122
+#. TRANS: Page notice for group members page.
+#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "ამ ჯგუფის წევრების სია."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "ადმინი"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr ""
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "%1$s-ის წევრების განახლებები %2$s-ზე!"
 
-#. TRANS: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "ჯგუფები"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "ჯგუფები, გვერდი $d"
 
-#: actions/groups.php:90
-#, php-format
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 "%%%%site.name%%%%-ის ჯგუფები გაძლევთ საშუალებას მოძებნოთ და ესაუბროთ მსგავსი "
 "ინტერესების მქონე ხალხს. ჯგუფში გაერთიანების შემდეგ, შეძლებთ მიწეროთ "
@@ -2991,11 +3080,13 @@ msgstr ""
 "ხედავთ მოსაწონ ჯგუფს? სცადეთ [ძიება](%%%%action.groupsearch%%%%) ან "
 "[შექმენით საკუთარი!](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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 "შექმენი ახალი ჯგუფი"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -3005,25 +3096,31 @@ msgstr ""
 "მიხედვით. გამოყავით ფრაზები სივრცით; საძიებო ფრაზა 3 სიმბოლოზე მეტი უნდა "
 "იყოს."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "ჯგუფის ძიება"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "უშედეგოდ."
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 "თუ ვერ პოულობთ ჯგუფს რომელსაც ეძებთ, შეგიძლიათ თვითონ [შექმნათ](%%action."
 "newgroup%%)."
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3033,21 +3130,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "შეცდომა ბლოკის მოხსნისას."
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "IM პარამეტრები"
@@ -3056,112 +3153,120 @@ msgstr "IM პარამეტრები"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 "თქვენ შეგიძლიათ მიიღოთ და გააგზავნოთ შეტყობინებები Jabber/GTalk [ჩეთით](%%"
 "doc.im%%). მომართეთ თქვენი მისამართი და პარამეტრები ქვევით."
 
-#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM არ არის ხელმისაწვდომი."
 
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "მიმდინარე დადასტურებული Jabber/GTalk მისამართი."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 მეგობრების სიაში?)"
 
-#. TRANS: IM address input field instructions in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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-ში."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "IM პარამეტრები"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "გამომიგზავნე შეტყობინებები  Jabber/GTalk-ის მეშვეობით."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "დაპოსტე შეტყობინება, როდესაც ჩემი Jabber/GTalk სტატუსი შეიცვლება."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, fuzzy
+msgid ""
+"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
 msgstr ""
 "გამომიგზავნე პასუხები Jabber/GTalk-ით ხალხისგან, რომლთა მიმდევარი არ ვარ."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "გამოაქვეყნე  MicroID ჩემი Jabber/GTalk მისამართისთვის."
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "პარამეტრები შენახულია."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "Jabber ID-ს ნორმალიზაცია ვერ ხერხდება"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "არასწორი Jabber ID"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "Jabber ID უკვე ეკუთვნის სხვა მომხმარებელს."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3171,75 +3276,80 @@ msgstr ""
 "დასტურის კოდი გამოგზავნილია თქვენს IM მისამართზე. თქვენ უნდა მისცეთ უფლება %"
 "s-ს გამოგიგზავნოთ შეტყობინებები."
 
-#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "ეს არასწორი IM მისამართია."
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 #, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "IM დასტურის წაშლა ვერ მოხერხდა."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "IM დასტური გაუქმდა."
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging address that is not
 #. TRANS: registered for the active user.
 #: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "ეს არ არის თქვენი Jabber ID"
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 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:40
+#: 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:44
+#: 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:77
+#: 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:116
+#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "მოწვევა/მოწვევები გაგზავნილია"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "დაპატიჯე ახალი მომხმარებლები"
 
@@ -3247,7 +3357,7 @@ 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:139
+#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3255,7 +3365,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3264,7 +3374,7 @@ 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:153
+#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3276,7 +3386,7 @@ 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:167
+#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3284,7 +3394,7 @@ msgstr[0] "მოწვევა გაიგზავნა შემდეგ
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:177
+#: 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!"
@@ -3294,7 +3404,7 @@ msgstr ""
 "ზრდას!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3302,27 +3412,28 @@ msgstr ""
 "გამოსაყენებლად."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:217
+#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "ელ. ფოსტის მისამართები"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: actions/invite.php:225
 msgid "Personal message"
 msgstr "პირადი შეტყობინება"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:227
+#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "დაუმატეთ პირადი შეტყობინება მოწვევას (არასავალდებულო)."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "გაგზავნა"
@@ -3330,7 +3441,7 @@ 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:263
+#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s-მა დაგპატიჟათ რომ შეუერთდეთ მას %2$s-ზე"
@@ -3340,7 +3451,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5238,7 +5349,7 @@ msgid "Application profile"
 msgstr "აპლიკაციის პროფილი"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr ""
 
@@ -6552,7 +6663,7 @@ msgid "Plugins"
 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:898
 msgid "Version"
 msgstr "ვერსია"
 
@@ -6676,7 +6787,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr "ბაზის სახელი ან DSN ვერსად ვერ მოიძებნა."
 
@@ -6946,214 +7057,214 @@ msgid "Other"
 msgstr "სხვა"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "უსათაურო გვერდი"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "საიტის ძირითადი ნავიგაცია"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 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:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "პირადი"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "ანგარიში"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: 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:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "კავშირი"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: 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:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "ადმინი"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: lib/action.php:573
 #, 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:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "მოწვევა"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: 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:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "გასვლა"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "რეგისტრაცია"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "შესვლა"
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: lib/action.php:602
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "დამეხმარეთ!"
 
 #. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "დახმარება"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: 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:620 lib/adminpanelaction.php:387
+#: 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:687
+#: lib/action.php:700
 msgid "Local views"
 msgstr "ლოკალური ხედები"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:757
+#: lib/action.php:770
 msgid "Page notice"
 msgstr "გვერდის შეტყობინება"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "საიტის მეორადი ნავიგაცია"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "დახმარება"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "საიტის შესახებ"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "ხდკ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "მპ"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "პირადი"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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:902
 msgid "Contact"
 msgstr "კონტაქტი"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "იარლიყი"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "StatusNet კოდის ლიცენზია"
 
@@ -7161,7 +7272,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7171,7 +7282,7 @@ msgstr ""
 "(%%site.broughtbyurl%%)-ს მიერ."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** არის მიკრობლოგინგის სერვისი."
@@ -7180,7 +7291,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7192,51 +7303,51 @@ msgstr ""
 "org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "წინა"
 
@@ -7284,6 +7395,13 @@ msgstr ""
 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."
@@ -7489,7 +7607,7 @@ msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "ამ აპლიკაციის ხატულა"
 
@@ -8066,12 +8184,12 @@ 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "ფაილის ატვირთვა"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
@@ -8875,11 +8993,11 @@ msgstr "შეტყობინების გაგზავნა"
 msgid "What's up, %s?"
 msgstr "რა არის ახალი %s?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "ფაილის მიმაგრება"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "მიამაგრე ფაილი"
 
@@ -9073,6 +9191,13 @@ msgstr "მომხმარებლის იდ"
 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:98
+msgid "Groups"
+msgstr "ჯგუფები"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9492,6 +9617,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "Personal"
-#~ msgstr "პირადი"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 679944b147..1b6fffbcd5 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:29+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:34:53+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 (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -78,7 +78,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -130,6 +130,9 @@ msgstr "해당하는 페이지 없음"
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -147,7 +150,7 @@ msgstr "해당하는 페이지 없음"
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -315,8 +318,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -336,13 +339,15 @@ msgstr "이용자를 업데이트 할 수 없습니다."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -378,11 +383,12 @@ msgstr[0] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -392,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "디자인을 업데이트 할 수 없습니다."
 
@@ -406,7 +412,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -802,9 +808,9 @@ msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -834,7 +840,7 @@ msgstr "OAuth 응용 프로그램 사용자 추가 중 데이터베이스 오류
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -842,7 +848,7 @@ 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:335
+#: 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
@@ -915,7 +921,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1250,6 +1256,13 @@ msgstr "API 메서드 발견 안 됨."
 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
@@ -1288,6 +1301,13 @@ msgstr "좋아하는 게시글로 추가하기"
 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
@@ -1336,7 +1356,17 @@ msgstr "관심소식을 삭제할 수 없습니다."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1349,12 +1379,12 @@ msgstr "관심소식을 삭제할 수 없습니다."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1396,6 +1426,13 @@ msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 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."
@@ -1428,12 +1465,15 @@ msgstr "해당하는 첨부파일이 없습니다."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "별명이 없습니다."
 
@@ -1465,7 +1505,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "이용자가 프로필을 가지고 있지 않습니다."
@@ -1474,7 +1514,7 @@ msgstr "이용자가 프로필을 가지고 있지 않습니다."
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "아바타 설정"
 
@@ -1483,7 +1523,7 @@ msgstr "아바타 설정"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "원래 설정"
 
@@ -1492,7 +1532,7 @@ msgstr "원래 설정"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "미리보기"
 
@@ -1531,7 +1571,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "파일 데이터를 잃어버렸습니다."
 
@@ -1596,7 +1636,8 @@ msgstr "이미 차단된 이용자입니다."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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 "사용자를 차단합니다."
 
@@ -1618,7 +1659,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "아니오"
@@ -1636,7 +1677,7 @@ msgstr "이용자를 차단하지 않는다."
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "예"
@@ -1847,7 +1888,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:118
-#: lib/action.php:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "당신의 세션토큰관련 문제가 있습니다."
 
@@ -1940,12 +1981,13 @@ 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.
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2105,13 +2147,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "배경"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2327,14 +2369,15 @@ 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:70 actions/newgroup.php:65
+#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 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:107 actions/grouplogo.php:112
+#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "관리자만 그룹을 편집할 수 있습니다."
 
@@ -2392,7 +2435,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2421,7 +2464,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2534,7 +2577,7 @@ 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 IM 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
@@ -2552,7 +2595,7 @@ msgstr ""
 "와 사용법을 확인하여 주시기 바랍니다."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2720,67 +2763,82 @@ msgstr "첨부문서 없음"
 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 "예상치 못한 반응 입니다."
 
-#: actions/finishremotesubscribe.php:80
+#. 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 "살펴 보고 있는 사용자가 없습니다."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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 "당신은 로컬 구독을 사용할 수 있습니다."
 
-#: actions/finishremotesubscribe.php:99
+#. 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 "이 사용자는 귀하의 구독을 차단했습니다."
 
-#: actions/finishremotesubscribe.php:110
+#. 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 "당신은 이 프로필에 구독되지 않고있습니다."
 
-#: actions/finishremotesubscribe.php:113
+#. 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 "리퀘스트 토큰을 엑세스 토큰으로 변환 할 수 없습니다."
 
-#: actions/finishremotesubscribe.php:118
+#. 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 프로토콜의 알려지지 않은 버전"
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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 "리모트 프로필 업데이트 오류"
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "해당하는 파일이 없습니다."
 
-#: actions/getfile.php:83
+#. TRANS: Client error displayed when requesting a file without having read access to it.
+#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "파일을 읽을 수 없습니다."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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 ""
 
-#: actions/grantrole.php:75
+#. 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 "이 사이트의 이용자에 대해 권한정지 할 수 없습니다."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2790,38 +2848,48 @@ msgstr "이용자가 프로필을 가지고 있지 않습니다."
 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 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:76 actions/groupunblock.php:77
+#: 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의 프로필이 없습니다."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 #, fuzzy
 msgid "No group specified."
 msgstr "프로필을 지정하지 않았습니다."
 
-#: actions/groupblock.php:91
+#. 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 ""
 
-#: actions/groupblock.php:95
+#. 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 "사용자가 귀하를 차단했습니다."
 
-#: actions/groupblock.php:100
+#. 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 "그룹 이용자는 차단해제"
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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 "그룹 이용자는 차단해제"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2832,52 +2900,64 @@ msgstr ""
 "독할 수 없으며, 차단된 이용자로부터 @-답장의 통보를 받지 않게 됩니다."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "그룹 이용자는 차단해제"
 
-#: actions/groupblock.php:206
+#. 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 "그룹 이용자는 차단해제"
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "ID가 없습니다."
 
-#: actions/groupdesignsettings.php:68
+#. 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 "그룹을 만들기 위해서는 로그인해야 합니다."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "프로필 디자인"
 
-#: actions/groupdesignsettings.php:155
+#. 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 ""
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 msgid "Design preferences saved."
 msgstr "메일 설정이 저장되었습니다."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2885,113 +2965,124 @@ msgstr ""
 "사이트의 배경 이미지를 업로드할 수 있습니다. 최대 파일 크기는 %1$s 입니다."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "올리기"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "자르기"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "로고를 업데이트했습니다."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%s 그룹 회원"
 
-#: actions/groupmembers.php:122
+#. TRANS: Page notice for group members page.
+#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "이 그룹의 회원리스트"
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "관리자"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "차단"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "이 사용자 차단"
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "관리자 만들기"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: actions/grouprss.php:141
 #, fuzzy, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "%2$s에 있는 %1$s의 업데이트!"
 
-#. TRANS: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "그룹"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "그룹, %d 페이지"
 
-#: actions/groups.php:90
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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 "새 그룹을 만듭니다."
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -3000,23 +3091,29 @@ msgstr ""
 "%%site.name%%의 사람을 이름, 장소, 관심 거리로 검색합니다. 검색어는 공백으로 "
 "구분하고, 적어도 3글자 이상 필요합니다."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "그룹 찾기"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "결과 없음"
 
-#: actions/groupsearch.php:82
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3024,21 +3121,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "차단 제거 에러!"
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "메일 설정"
@@ -3047,112 +3144,120 @@ msgstr "메일 설정"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 "당신은 Jabber나 구글토크(%%doc.im%%)를 통해 메시지를 주고받을 수 있습니다. 아"
 "래 당신의 주소와 환경설정을 조정하세요."
 
-#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "인스턴트 메신저를 사용할 수 없습니다."
 
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "확인된 최신의 Jabber/GTalk 계정"
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 항"
 "목을 추가하셨습니까?)"
 
-#. TRANS: IM address input field instructions in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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 주소를 추가하여 주십시오."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "메일 설정"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Jabber/GTalk 로 통지를 보내주세요."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "Jabber/GTalk의 상태가 변경되었을 때 통지를 보냅니다."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, fuzzy
+msgid ""
+"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
 msgstr ""
 "내가 구독하지 않는 사람으로 부터의 답장을  Jabber/GTalk을 통해 보내주세요."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Jabber/GTalk 계정을 위한 MicroID의 생성"
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "설정이 저장되었습니다."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "그 Jabbar ID를 정규화 할 수 없습니다."
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "유효한 Jabber ID가 아닙니다."
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "Jabber ID가 이미 다른 사용자에 의하여 사용되고 있습니다."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3162,74 +3267,79 @@ msgstr ""
 "추가한 메신저 주소로 인증 코드를 보냈습니다. %s 사용자를 허락해야 메시지를 전"
 "달할 수 있습니다."
 
-#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "옳지 않은 메신저 계정 입니다."
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 #, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "메신저 승인을 삭제 할 수 없습니다."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "확인 코드가 없습니다."
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging address that is not
 #. TRANS: registered for the active user.
 #: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "그 Jabber ID는 귀하의 것이 아닙니다."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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 페이지"
 
-#: actions/inbox.php:62
+#. 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:115
 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:40
+#: 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:44
+#: 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:77
+#: 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:116
+#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "초대권을 보냈습니다"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "새 사용자를 초대"
 
@@ -3237,7 +3347,7 @@ 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:139
+#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3245,7 +3355,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3254,7 +3364,7 @@ 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:153
+#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3264,7 +3374,7 @@ 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:167
+#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3272,7 +3382,7 @@ msgstr[0] "다음 사람들에게 초대권을 보냈습니다:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:177
+#: 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!"
@@ -3281,33 +3391,34 @@ msgstr ""
 "다. 커뮤니티를 키워주셔서 대단히 감사합니다. ^^"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: 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:217
+#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "메일 주소"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: actions/invite.php:225
 msgid "Personal message"
 msgstr "개인 메시지"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:227
+#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "초대장에 메시지 첨부하기."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "보내기"
@@ -3315,7 +3426,7 @@ 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:263
+#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s님이 귀하를 %2$s에 초대하였습니다."
@@ -3325,7 +3436,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5199,7 +5310,7 @@ msgid "Application profile"
 msgstr "신규 응용 프로그램"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "아이콘"
 
@@ -6503,7 +6614,7 @@ msgid "Plugins"
 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:898
 msgid "Version"
 msgstr "버전"
 
@@ -6625,7 +6736,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6898,29 +7009,29 @@ msgid "Other"
 msgstr "기타"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "제목없는 페이지"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "주 사이트 네비게이션"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
@@ -6928,185 +7039,185 @@ 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:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "개인"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "계정"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: 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:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "연결"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: 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:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "관리"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: 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:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "초대"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: 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:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "로그아웃"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "등록"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "로그인"
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: lib/action.php:602
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "도움말"
 
 #. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "도움말"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: 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:620 lib/adminpanelaction.php:387
+#: 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:687
+#: lib/action.php:700
 msgid "Local views"
 msgstr "로컬 뷰"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:757
+#: lib/action.php:770
 msgid "Page notice"
 msgstr "페이지 공지"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "보조 사이트 네비게이션"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "도움말"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "정보"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "자주 묻는 질문"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "서비스 약관"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "개인정보 취급방침"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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:902
 msgid "Contact"
 msgstr "연락하기"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "배지"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "StatusNet 소프트웨어 라이선스"
 
@@ -7114,7 +7225,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7124,7 +7235,7 @@ msgstr ""
 "공하는 마이크로블로깅서비스입니다."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** 는 마이크로블로깅서비스입니다."
@@ -7133,7 +7244,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7145,51 +7256,51 @@ msgstr ""
 "fsf.org/licensing/licenses/agpl-3.0.html) 라이선스에 따라 사용할 수 있습니다."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "앞 페이지"
 
@@ -7237,6 +7348,13 @@ msgstr ""
 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."
@@ -7443,7 +7561,7 @@ msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "이 응용프로그램 삭제 않기"
 
@@ -8021,12 +8139,12 @@ 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "실행 실패"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr "개인 아바타를 올릴 수 있습니다. 최대 파일 크기는 2MB입니다."
@@ -8751,11 +8869,11 @@ msgstr "게시글 보내기"
 msgid "What's up, %s?"
 msgstr "뭐하세요 %s님?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "첨부"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr ""
 
@@ -8949,6 +9067,13 @@ msgstr "이용자 ID"
 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:98
+msgid "Groups"
+msgstr "그룹"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9369,6 +9494,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "Personal"
-#~ msgstr "개인"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 73cde5fdbb..366cfd6d52 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:31+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:34: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-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -79,7 +79,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -131,6 +131,9 @@ msgstr "Нема таква страница."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -148,7 +151,7 @@ msgstr "Нема таква страница."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -323,8 +326,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -344,13 +347,15 @@ msgstr "Не можев да го подновам корисникот."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -389,11 +394,12 @@ msgstr[1] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -403,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Не може да се поднови Вашиот изглед."
 
@@ -417,7 +423,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -812,9 +818,9 @@ msgstr "Жетонот за барање е веќе овластен."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -843,7 +849,7 @@ msgstr "Грешка во базата при вметнувањето на auth
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -851,7 +857,7 @@ 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:335
+#: 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
@@ -923,7 +929,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1259,6 +1265,13 @@ msgstr "Корисникот не е пронајден."
 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
@@ -1292,6 +1305,13 @@ msgstr "Веќе е бендисано."
 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."
@@ -1334,7 +1354,17 @@ msgstr "Не можам да избришам туѓo бендисанo."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1347,12 +1377,12 @@ msgstr "Не можам да избришам туѓo бендисанo."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1391,6 +1421,13 @@ msgstr "Профилот %1$d не е претплатен на профилот
 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."
@@ -1423,12 +1460,15 @@ msgstr "Нема таков прилог."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Нема прекар."
 
@@ -1462,7 +1502,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Корисник без соодветен профил."
@@ -1471,7 +1511,7 @@ msgstr "Корисник без соодветен профил."
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Нагодувања на аватарот"
 
@@ -1480,7 +1520,7 @@ msgstr "Нагодувања на аватарот"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Оригинал"
 
@@ -1489,7 +1529,7 @@ msgstr "Оригинал"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Преглед"
 
@@ -1525,7 +1565,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Податоците за податотеката се изгубени."
 
@@ -1593,7 +1633,8 @@ msgstr "Веќе го имате блокирано тој корисник."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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 "Блокирај корисник"
 
@@ -1617,7 +1658,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Не"
@@ -1635,7 +1676,7 @@ msgstr "Не го блокирај корисников"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Да"
@@ -1841,7 +1882,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:118
-#: lib/action.php:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Се појави проблем со Вашиот сесиски жетон."
 
@@ -1934,12 +1975,13 @@ 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.
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2096,13 +2138,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Позадина"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2313,14 +2355,15 @@ 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:70 actions/newgroup.php:65
+#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 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:107 actions/grouplogo.php:112
+#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "Мора да сте администратор за да можете да ја уредите групата."
 
@@ -2378,7 +2421,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2407,7 +2450,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2504,9 +2547,8 @@ msgstr "Нема е-поштенска адреса."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
 #: actions/emailsettings.php:388
-#, fuzzy
 msgid "Cannot normalize that email address."
-msgstr "Неможам да ја нормализирам таа е-поштенска адреса"
+msgstr "Не можам да ја нормализирам таа е-поштенска адреса."
 
 #. TRANS: Message given saving e-mail address that not valid.
 #: actions/emailsettings.php:393 actions/register.php:212
@@ -2525,7 +2567,7 @@ 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 IM 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
@@ -2543,7 +2585,7 @@ msgstr ""
 "напатствијата за негово користење."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2689,9 +2731,9 @@ msgstr "Избрани корисници, стр. %d"
 
 #. TRANS: Description on page displaying featured users.
 #: actions/featured.php:102
-#, fuzzy, php-format
+#, php-format
 msgid "A selection of some great users on %s."
-msgstr "Некои од пославните корисници на %s"
+msgstr "Некои од пославните корисници на %s."
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
 #: actions/file.php:36
@@ -2714,62 +2756,77 @@ msgstr "Нема прилози."
 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 "Овој одговор не беше очекуван!"
 
-#: actions/finishremotesubscribe.php:80
+#. 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 "Следениот корисник не постои."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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 "Може да ја користите локалната претплата."
 
-#: actions/finishremotesubscribe.php:99
+#. 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 "Тој корисник Ве има блокирано од претплаќање."
 
-#: actions/finishremotesubscribe.php:110
+#. 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 "Не сте овластени."
 
-#: actions/finishremotesubscribe.php:113
+#. 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 "Не можев да ги претворам жетоните за барање во жетони за пристап."
 
-#: actions/finishremotesubscribe.php:118
+#. 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 протокол."
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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 "Грешка во подновувањето на далечинскиот профил."
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Нема таква податотека."
 
-#: actions/getfile.php:83
+#. TRANS: Client error displayed when requesting a file without having read access to it.
+#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "Податотеката не може да се прочита."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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 "Оваа улога е резервирана и не може да се зададе."
 
-#: actions/grantrole.php:75
+#. 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 "Не можете да им доделувате улоги на корисниците на ова мрежно место."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2779,37 +2836,47 @@ msgstr "Корисникот веќе ја има таа улога."
 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 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:76 actions/groupunblock.php:77
+#: 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."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "Нема назначено група."
 
-#: actions/groupblock.php:91
+#. 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 "Само администратор може да блокира членови на група."
 
-#: actions/groupblock.php:95
+#. 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 "Корисникот е веќе блокиран од оваа група."
 
-#: actions/groupblock.php:100
+#. 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 "Корисникот не членува во групата."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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 "Блокирај корисник од група"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2821,34 +2888,39 @@ msgstr ""
 "објавува во таа група и да се претплаќа на неа."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "Блокирај го овој корисник од оваа група"
 
-#: actions/groupblock.php:206
+#. 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 ""
 "Се појави грешка во базата наподатоци при блокирањето на корисникот од "
 "групата."
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Нема ID."
 
-#: actions/groupdesignsettings.php:68
+#. 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 "Мора да сте најавени за да можете да уредувате група."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Изглед на групата"
 
-#: actions/groupdesignsettings.php:155
+#. 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."
@@ -2856,19 +2928,26 @@ msgstr ""
 "Прилагодете го изгледот на Вашата група со позадинска слика и палета од бои "
 "по Ваш избор."
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 msgid "Design preferences saved."
 msgstr "Нагодувањата се зачувани."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2877,106 +2956,115 @@ msgstr ""
 "големина на податотеката е %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Подигни"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Отсечи"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Логото е подновено."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Членови на групата %1$s, стр. %2$d"
 
-#: actions/groupmembers.php:122
+#. TRANS: Page notice for group members page.
+#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "Список на корисниците на оваа група."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "Администратор"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Блокирај"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Блокирај го корисников"
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Назначи за администратор"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Подновувања од членови на %1$s на %2$s!"
 
-#. TRANS: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "Групи"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "Групи, стр. %d"
 
-#: actions/groups.php:90
-#, php-format
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 "Групите на %%%%site.name%%%% Ви овоможуваат да пронајдете луѓе со слични "
 "интереси на Вашите и да зборувате со нив. Откако ќе се придружите во група "
@@ -2985,11 +3073,13 @@ msgstr ""
 "[ја пронајдете](%%%%action.groupsearch%%%%) или [започнете своја!](%%%%"
 "action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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 "Создај нова група"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -2998,25 +3088,31 @@ msgstr ""
 "Пребарајте групи на %%site.name%% по име, местоположба или опис. Одделете ги "
 "поимите со празни места; зборовите мора да имаат барем по 3 букви."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Пребарување на групи"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "Нема резултати."
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 "Ако не можете да ја пронајдете групата што ја барате, тогаш [создајте ја](%%"
 "action.newgroup%%) самите."
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3026,21 +3122,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Грешка при отстранување на блокот."
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "Нагодувања за IM"
@@ -3049,113 +3145,121 @@ msgstr "Нагодувања за IM"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 "Можете да примате и праќате забелешки преку Jabber/GTalk [брзи пораки](%%doc."
 "im%%). Подолу "
 
-#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM е недостапно."
 
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "Моментално потврдена Jabber/GTalk адреса."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 на Вашиот список со "
 "пријатели?)"
 
-#. TRANS: IM address input field instructions in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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 адреса како „KorisnickoIme@example.org“. Но прво додајте го "
 "%s во Вашиот контактен список во Вашиот IM клиент или GTalk."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "IM нагодувања"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Испраќај ми забелешки преку Jabber/GTalk."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "Објавувај забелешка кога мојот статус на Jabber/GTalk ќе се промени."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, fuzzy
+msgid ""
+"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
 msgstr ""
 "Испраќај ми одговори преку Jabber/GTalk од луѓе на кои не сум претплатен."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Објави MicroID за мојата адреса на Jabber/GTalk."
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Нагодувањата се зачувани."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "Ова JabberID не може да се нормализира."
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "Неправилен JabberID"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "Ова Jabber ID му припаѓа на друг корисник."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3165,42 +3269,47 @@ msgstr ""
 "Испративме потврден код на IM-адресата што ја додадовте. Ќе мора да му "
 "одобрите на %s да Ви испраќа пораки."
 
-#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "Ова е погрешната IM адреса."
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 msgid "Could not delete IM confirmation."
 msgstr "Не можев да ја избришам потврдата на IM."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "Потврдата на IM е откажана."
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging address that is not
 #. TRANS: registered for the active user.
 #: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Ова не е Вашиот Jabber ID."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
@@ -3208,13 +3317,13 @@ msgstr ""
 "пораки."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:40
+#: 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:44
+#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr ""
@@ -3222,18 +3331,18 @@ 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:77
+#: actions/invite.php:78
 #, php-format
 msgid "Invalid email address: %s."
 msgstr "Неважечка е-поштенска адреса: %s."
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:116
+#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "Поканите се испратени"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Покани нови корисници"
 
@@ -3241,7 +3350,7 @@ 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:139
+#: actions/invite.php:140
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
 msgstr[0] "Веќе сте претплатени на овој корисник:"
@@ -3249,7 +3358,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3258,7 +3367,7 @@ 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:153
+#: 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:"
@@ -3268,7 +3377,7 @@ 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:167
+#: actions/invite.php:168
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] "Испратена е покана до следново лице:"
@@ -3276,7 +3385,7 @@ msgstr[1] "Испратени се покани до следниве лица:"
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:177
+#: 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!"
@@ -3286,7 +3395,7 @@ msgstr ""
 "помагате да ја прошириме заедницата!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3294,27 +3403,28 @@ msgstr ""
 "место."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:217
+#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "Е-поштенски адреси"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Лична порака"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:227
+#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Можете да додадете и лична порака во поканата."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Испрати"
@@ -3322,7 +3432,7 @@ 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:263
+#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s Ве покани да се придружите на %2$s"
@@ -3332,7 +3442,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5228,7 +5338,7 @@ msgid "Application profile"
 msgstr "Профил на програмот"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Икона"
 
@@ -5962,9 +6072,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-#, fuzzy
 msgid "No code entered."
-msgstr "Нема внесено код"
+msgstr "Нема внесено код."
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
@@ -6563,7 +6672,7 @@ msgid "Plugins"
 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:898
 msgid "Version"
 msgstr "Верзија"
 
@@ -6694,7 +6803,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr "Никаде не е пронајдено име на базата или DSN."
 
@@ -6964,214 +7073,214 @@ msgid "Other"
 msgstr "Друго"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Страница без наслов"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Повеќе"
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "Главна навигација"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 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:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Лично"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "Сметка"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: 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:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "Поврзи се"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: 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:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Админ"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: lib/action.php:573
 #, 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:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Покани"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: 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:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Одјава"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Регистрација"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Најава"
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: lib/action.php:602
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Напомош!"
 
 #. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "Помош"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: 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:620 lib/adminpanelaction.php:387
+#: 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:687
+#: lib/action.php:700
 msgid "Local views"
 msgstr "Локални прегледи"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:757
+#: lib/action.php:770
 msgid "Page notice"
 msgstr "Напомена за страницата"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "Споредна навигација"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "Помош"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "За нас"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "ЧПП"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "Услови"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "Приватност"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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:902
 msgid "Contact"
 msgstr "Контакт"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "Значка"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "Лиценца на програмот StatusNet"
 
@@ -7179,7 +7288,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7189,7 +7298,7 @@ msgstr ""
 "%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** е сервис за микроблогирање."
@@ -7198,7 +7307,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7210,20 +7319,20 @@ msgstr ""
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7231,7 +7340,7 @@ msgstr ""
 "права задржани."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:972
+#: lib/action.php:985
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Авторските права на содржината и податоците им припаѓаат на учесниците. Сите "
@@ -7239,25 +7348,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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "Претходно"
 
@@ -7302,6 +7411,13 @@ msgstr "Далечинскиот профил не е група!"
 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."
@@ -7506,7 +7622,7 @@ msgid "Failed to delete revoked token."
 msgstr "Не успеав да го избришам отповиканиот жетон."
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Икона за овој програм"
 
@@ -8118,12 +8234,12 @@ 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "Подигање"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
@@ -8177,7 +8293,6 @@ msgstr "Одбендисај ја забелешкава"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
 #: lib/disfavorform.php:136
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Тргни од бендисани"
@@ -8190,7 +8305,6 @@ msgstr "Бендисај ја забелешкава"
 
 #. TRANS: Button text for adding the favourite status to a notice.
 #: lib/favorform.php:135
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Бендисај"
@@ -8953,11 +9067,11 @@ msgstr "Испрати забелешка"
 msgid "What's up, %s?"
 msgstr "Што има ново, %s?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "Приложи"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "Приложи податотека"
 
@@ -9065,28 +9179,24 @@ msgstr "Не може да се внесе нова претплата."
 
 #. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
-#, fuzzy
 msgctxt "MENU"
 msgid "Replies"
 msgstr "Одговори"
 
 #. TRANS: Personal group navigation menu option when logged in for seeing own profile.
 #: lib/personalgroupnav.php:114
-#, 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
-#, fuzzy
 msgctxt "MENU"
 msgid "Inbox"
 msgstr "Примени"
@@ -9098,7 +9208,6 @@ msgstr "Ваши приемни пораки"
 
 #. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
 #: lib/personalgroupnav.php:140
-#, fuzzy
 msgctxt "MENU"
 msgid "Outbox"
 msgstr "За праќање"
@@ -9151,6 +9260,13 @@ msgstr "Кориснички ID"
 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:98
+msgid "Groups"
+msgstr "Групи"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9573,6 +9689,3 @@ msgstr "Неважечки XML. Нема XRD-корен."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Земам резерва на податотеката „%s“."
-
-#~ msgid "Personal"
-#~ msgstr "Личен"
diff --git a/locale/ml/LC_MESSAGES/statusnet.po b/locale/ml/LC_MESSAGES/statusnet.po
index 2bd222d498..c2b38c2598 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:32+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:35:02+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-01-29 22:24:50+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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"
@@ -76,7 +76,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -128,6 +128,9 @@ msgstr "അത്തരത്തിൽ ഒരു താളില്ല."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -145,7 +148,7 @@ msgstr "അത്തരത്തിൽ ഒരു താളില്ല."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -311,8 +314,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -332,13 +335,15 @@ msgstr "ഉപയോക്തൃ വിവരങ്ങൾ പുതുക്ക
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -373,11 +378,12 @@ msgstr[1] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -387,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "താങ്കളുടെ രൂപകല്പന പുതുക്കാനായില്ല."
 
@@ -401,7 +407,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -792,9 +798,9 @@ msgstr "അഭ്യർത്ഥനാ ചീട്ട് മുമ്പേ ത
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -823,7 +829,7 @@ msgstr ""
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -831,7 +837,7 @@ 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:335
+#: 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
@@ -897,7 +903,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1227,6 +1233,13 @@ msgstr "ഉപയോക്താവിനെ കണ്ടത്താനായ
 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 ""
+
 #. 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
@@ -1262,6 +1275,13 @@ msgstr ""
 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."
@@ -1305,7 +1325,17 @@ msgstr "മറ്റൊരാളുടെ അംഗത്വം മായ്ക
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1318,12 +1348,12 @@ msgstr "മറ്റൊരാളുടെ അംഗത്വം മായ്ക
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1363,6 +1393,13 @@ msgstr ""
 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."
@@ -1395,12 +1432,15 @@ msgstr ""
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "അങ്ങിനെ വിളിപ്പേര് ഇല്ല."
 
@@ -1432,7 +1472,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr ""
@@ -1441,7 +1481,7 @@ msgstr ""
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "അവതാരത്തിന്റെ സജ്ജീകരണം"
 
@@ -1450,7 +1490,7 @@ msgstr "അവതാരത്തിന്റെ സജ്ജീകരണം"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "യഥാർത്ഥം"
 
@@ -1459,7 +1499,7 @@ msgstr "യഥാർത്ഥം"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "എങ്ങനെയുണ്ടെന്നു കാണുക"
 
@@ -1495,7 +1535,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr ""
 
@@ -1560,7 +1600,8 @@ msgstr "താങ്കൾ മുമ്പേ തന്നെ ആ ഉപയോ
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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 "ഉപയോക്താവിനെ തടയുക"
 
@@ -1580,7 +1621,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "അല്ല"
@@ -1598,7 +1639,7 @@ msgstr "ഈ ഉപയോക്താവിനെ തടയരുത്"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "അതെ"
@@ -1802,7 +1843,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:118
-#: lib/action.php:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "താങ്കളുടെ സെഷൻ ചീട്ടിൽ ഒരു പ്രശ്നമുണ്ടായിരുന്നു."
 
@@ -1889,12 +1930,13 @@ 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.
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2053,13 +2095,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "പശ്ചാത്തലം"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2270,14 +2312,15 @@ 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:70 actions/newgroup.php:65
+#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 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:107 actions/grouplogo.php:112
+#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "സംഘത്തിൽ മാറ്റം വരുത്താൻ താങ്കൾ ഒരു കാര്യനിർവ്വാഹകനായിരിക്കണം."
 
@@ -2335,7 +2378,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2364,7 +2407,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2479,7 +2522,7 @@ 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 IM 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
@@ -2497,7 +2540,7 @@ msgstr ""
 "പരിശോധിക്കുക."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2663,62 +2706,77 @@ msgstr ""
 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 "ഈ പ്രതികരണമല്ല പ്രതീക്ഷിച്ചത്!"
 
-#: actions/finishremotesubscribe.php:80
+#. 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 ""
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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 ""
 
-#: actions/finishremotesubscribe.php:99
+#. 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 "വരിക്കാരനാകുന്നതിൽ നിന്നും ആ ഉപയോക്താവ് താങ്കളെ തടഞ്ഞിരിക്കുന്നു."
 
-#: actions/finishremotesubscribe.php:110
+#. 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 "താങ്കൾക്ക് അംഗീകാരം ലഭിച്ചിട്ടില്ല."
 
-#: actions/finishremotesubscribe.php:113
+#. 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 "അഭ്യർത്ഥനാ ചീട്ടിനെ അഭിഗമ്യതാ ചീട്ടാക്കാൻ കഴിയില്ല."
 
-#: actions/finishremotesubscribe.php:118
+#. 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 "വിദൂര സേവനം അപരിചിതമായ ഒ.എം.ബി. പ്രോട്ടോകോൾ ഉപയോഗിക്കുന്നു."
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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 ""
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr ""
 
-#: actions/getfile.php:83
+#. TRANS: Client error displayed when requesting a file without having read access to it.
+#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "പ്രമാണം വായിക്കാനാവില്ല."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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 ""
 
-#: actions/grantrole.php:75
+#. 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 ""
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2728,37 +2786,47 @@ msgstr ""
 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 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:76 actions/groupunblock.php:77
+#: 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 ""
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "സംഘമൊന്നും വ്യക്തമാക്കിയിട്ടില്ല."
 
-#: actions/groupblock.php:91
+#. 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 "സംഘത്തിലെ അംഗങ്ങളെ തടയൻ കാര്യനിർവ്വാഹകനു മാത്രമേ കഴിയൂ."
 
-#: actions/groupblock.php:95
+#. 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 "ഉപയോക്താവ് സംഘത്തിൽ നിന്നും മുമ്പേ തന്നെ തടയപ്പെട്ടിരിക്കുന്നു."
 
-#: actions/groupblock.php:100
+#. 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 "ഉപയോക്താവ് സംഘത്തിലെ അംഗമല്ല."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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 "സംഘത്തിൽ നിന്നും ഉപയോക്താവിനെ തടയുക"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2767,50 +2835,62 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "ഈ സംഘത്തിൽ നിന്നും ഈ ഉപയോക്താവിനെ തടയുക"
 
-#: actions/groupblock.php:206
+#. 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 "സംഘത്തിൽ നിന്നും ഉപയോക്താവിനെ തടയുമ്പോൾ ഡേറ്റാബേസ് പിഴവുണ്ടായി."
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "ഐ.ഡി. ഇല്ല."
 
-#: actions/groupdesignsettings.php:68
+#. 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 "സംഘത്തിൽ മാറ്റങ്ങൾ വരുത്താൻ താങ്കൾ ലോഗിൻ ചെയ്തിരിക്കേണ്ടതാണ്."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "സംഘത്തിന്റെ രൂപകല്പന"
 
-#: actions/groupdesignsettings.php:155
+#. 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 ""
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 msgid "Design preferences saved."
 msgstr "രൂപകല്പനാ ക്രമീകരണങ്ങൾ സേവ് ചെയ്തിരിക്കുന്നു."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2819,106 +2899,115 @@ msgstr ""
 "%s ആയിരിക്കണം."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "അപ്‌ലോഡ്"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "വെട്ടിച്ചെറുതാക്കുക"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "ലോഗോ പുതുക്കി."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s സംഘത്തിലെ അംഗങ്ങൾ, താൾ %2$d"
 
-#: actions/groupmembers.php:122
+#. TRANS: Page notice for group members page.
+#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "ഈ സംഘത്തിലെ ഉപയോക്താക്കളുടെ പട്ടിക."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "കാര്യനിർവാഹകൻ"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "തടയുക"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "ഈ ഉപയോക്താവിനെ തടയുക"
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "കാര്യനിർവ്വാഹകനാക്കുക"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr ""
 
-#. TRANS: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "സംഘങ്ങൾ"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "സംഘങ്ങൾ, താൾ %d"
 
-#: actions/groups.php:90
-#, php-format
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 "സമാന താത്പര്യങ്ങളുള്ള ആൾക്കാരെ കണ്ടെത്താൻ %%%%site.name%%%% സംഘങ്ങൾ സഹായമാവുന്നു. ഒരു "
 "സംഘത്തിൽ ചേർന്നു കഴിഞ്ഞാൽ \"!groupname\" എന്ന് ഉപയോഗിച്ച് സംഘത്തിലെ എല്ലാവർക്കുമായി "
@@ -2926,11 +3015,13 @@ msgstr ""
 "%%action.groupsearch%%%%) അല്ലെങ്കിൽ [താങ്കൾ തന്നെ ഒരെണ്ണം തുടങ്ങുക!](%%%%action."
 "newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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 "പുതിയൊരു സംഘം സൃഷ്ടിക്കുക"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -2940,25 +3031,31 @@ msgstr ""
 "സംഘങ്ങൾ തിരയുക. ഒന്നിലധികം പദങ്ങൾ ഉണ്ടെങ്കിൽ അവയ്ക്കിടയിൽ ഇട നൽകുക; ഓരോ പദത്തിലും മൂന്നോ "
 "അതിലധികമോ അക്ഷരങ്ങൾ ഉണ്ടായിരിക്കണം."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "സംഘത്തിൽ തിരയുക"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "ഫലങ്ങൾ ഒന്നുമില്ല"
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 "താങ്കൾ അന്വേഷിക്കുന്ന സംഘം കണ്ടെത്താനായില്ലെങ്കിൽ, താങ്കൾ തന്നെ [അതുണ്ടാക്കുക](%%action."
 "newgroup%%)."
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -2968,21 +3065,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "തടയൽ നീക്കുന്നതിൽ പിഴവുണ്ടായി."
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "ഐ.എം. സജ്ജീകരണങ്ങൾ"
@@ -2991,112 +3088,119 @@ msgstr "ഐ.എം. സജ്ജീകരണങ്ങൾ"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 "ജാബ്ബർ/ജിറ്റോക്  [തത്സമയ സന്ദേശങ്ങൾ - instant messages] ഉപയോഗിച്ച് താങ്കൾക്ക് അറിയിപ്പുകൾ "
 "അയയ്ക്കാനും സ്വീകരിക്കാനും കഴിയുന്നതാണ് (%%doc.im%%). താങ്കളുടെ വിലാസവും സജ്ജീകരണങ്ങളും "
 "താഴെ ക്രമീകരിക്കുക."
 
-#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "ഐ.എം. ലഭ്യമല്ല."
 
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "ഇപ്പോഴത്തെ സ്ഥിരീകരിക്കപ്പെട്ട ജാബ്ബർ/ജിറ്റോക് വിലാസം"
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 ""
 "ഈ വിലാസം സ്ഥിരീകരണത്തിന് അവശേഷിക്കുന്നു. കൂടുതൽ നിർദ്ദേശങ്ങൾക്ക് താങ്കളുടെ ജാബ്ബർ/ജിറ്റോക് "
 "അംഗത്വത്തിലുള്ള സന്ദേശം പരിശോധിക്കുക. (%s ഒരു സുഹൃത്തായി താങ്കളുടെ പട്ടികയിലുണ്ടോ?)"
 
-#. TRANS: IM address input field instructions in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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 "
 "താങ്കളുടെ ഐ.എം. ക്ലയന്റിലോ ജിറ്റോക്കിലോ സുഹൃത്തുക്കളുടെ പട്ടികയിലുണ്ടെന്നുറപ്പാക്കുക."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "ഐ.എം. ക്രമീകരണങ്ങൾ"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "ജാബ്ബർ/ജിറ്റോക് വഴി എനിക്ക് അറിയിപ്പുകൾ അയയ്ക്കുക."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "എന്റെ ജാബ്ബർ/ജിറ്റോക് സ്ഥിതിവിവരം മാറുമ്പോൾ അറിയിപ്പുകൾ പ്രസിദ്ധീകരിക്കുക."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgid ""
+"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
 msgstr ""
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/Google Talk address."
+msgstr "ഇപ്പോഴത്തെ സ്ഥിരീകരിക്കപ്പെട്ട ജാബ്ബർ/ജിറ്റോക് വിലാസം"
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "ക്രമീകരണങ്ങൾ സേവ് ചെയ്തു."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. TRANS: Message given saving Instant Messaging address without having provided one.
 #: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr "ജാബ്ബർ ഐ.ഡി. അല്ല."
 
-#. TRANS: Message given saving IM address that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
-msgstr ""
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
+msgstr "സാധുവായ ഇമെയിൽ വിലാസം അല്ല."
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "ജാബർ ഐ.ഡി. അസാധുവാണ്"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "ജാബ്ബർ ഐ.ഡി. മുമ്പേ തന്നെ മറ്റൊരു ഉപയോക്താവിന്റേതാണ്."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3106,72 +3210,77 @@ msgstr ""
 "താങ്കൾ ചേർത്തിട്ടുള്ള ഐ.എം. വിലാസത്തിലേയ്ക്ക് ഒരു സ്ഥിരീകരണ കോഡ് അയച്ചിട്ടുണ്ട്. താങ്കൾക്ക് "
 "സന്ദേശങ്ങൾ അയയ്ക്കാൻ താങ്കൾ %s അയയ്ക്കേണ്ടതാണ്."
 
-#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "ഇത് തെറ്റായ ഐ.എം. വിലാസമാണ്."
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 msgid "Could not delete IM confirmation."
 msgstr "ഐ.എം. സ്ഥിരീകരണം നീക്കം ചെയ്യാൻ കഴിഞ്ഞില്ല."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "ഐ.എം. സ്ഥിരീകരണം റദ്ദാക്കി."
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging address that is not
 #. TRANS: registered for the active user.
 #: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "അത് താങ്കളുടെ ജാബ്ബർ ഐ.ഡി. അല്ല."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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 ""
 
-#: actions/inbox.php:62
+#. 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:115
 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:40
+#: 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:44
+#: 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:77
+#: actions/invite.php:78
 #, php-format
 msgid "Invalid email address: %s."
 msgstr "അസാധുവായ ഇമെയിൽ വിലാസം: %s."
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:116
+#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "ക്ഷണങ്ങൾ അയച്ചിരിക്കുന്നു"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "പുതിയ ഉപയോക്താക്കളെ ക്ഷണിക്കുക"
 
@@ -3179,7 +3288,7 @@ 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:139
+#: actions/invite.php:140
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
 msgstr[0] ""
@@ -3187,7 +3296,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3196,7 +3305,7 @@ 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:153
+#: 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:"
@@ -3206,7 +3315,7 @@ 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:167
+#: actions/invite.php:168
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] "താഴെക്കൊടുത്തിരിക്കുന്ന വ്യക്തിയെ ക്ഷണിച്ചിരിക്കുന്നു:"
@@ -3214,7 +3323,7 @@ msgstr[1] "താഴെക്കൊടുത്തിരിക്കുന്ന
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:177
+#: 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!"
@@ -3223,34 +3332,35 @@ msgstr ""
 "വളർത്തുന്നതിനു നന്ദി!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: 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:217
+#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "ഇമെയിൽ വിലാസം"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: actions/invite.php:225
 msgid "Personal message"
 msgstr "സ്വകാര്യ സന്ദേശം"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:227
+#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "ക്ഷണത്തിൽ താങ്കളുടെ സ്വന്തം സന്ദേശം കൂടി വേണമെങ്കിൽ കൂട്ടിച്ചേർക്കുക."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "അയക്കുക"
@@ -3258,7 +3368,7 @@ 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:263
+#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s താങ്കളെ, അവരോടൊപ്പം %2$s സൈറ്റിൽ ചേരാൻ ക്ഷണിച്ചിരിക്കുന്നു"
@@ -3268,7 +3378,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5054,7 +5164,7 @@ msgid "Application profile"
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "ഐകോൺ"
 
@@ -6308,7 +6418,7 @@ msgid "Plugins"
 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:898
 msgid "Version"
 msgstr "പതിപ്പ്"
 
@@ -6430,7 +6540,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6692,214 +6802,214 @@ msgid "Other"
 msgstr "മറ്റുള്ളവ"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "തലക്കെട്ടില്ലാത്ത താൾ"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "കൂടുതൽ പ്രദർശിപ്പിക്കുക"
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 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:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "വ്യക്തിപരം"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "അംഗത്വം"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: 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:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "ബന്ധപ്പെടുക"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: 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:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "കാര്യനിർവാഹക(ൻ)"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: lib/action.php:573
 #, 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:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "ക്ഷണിക്കുക"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: 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:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "ലോഗൗട്ട്"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "രജിസ്റ്റർ"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "പ്രവേശിക്കുക"
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: lib/action.php:602
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "എന്നെ സഹായിക്കൂ!"
 
 #. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "സഹായം"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: 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:620 lib/adminpanelaction.php:387
+#: 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:687
+#: lib/action.php:700
 msgid "Local views"
 msgstr ""
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:757
+#: lib/action.php:770
 msgid "Page notice"
 msgstr "താളിലെ അറിയിപ്പ്"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "സഹായം"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "വിവരണം"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "പതിവുചോദ്യങ്ങൾ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "സ്വകാര്യത"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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:902
 msgid "Contact"
 msgstr "സമ്പർക്കം"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr ""
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "സ്റ്റാറ്റസ്‌നെറ്റ് സോഫ്റ്റ്‌വേർ അനുമതി"
 
@@ -6907,7 +7017,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6915,7 +7025,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -6924,7 +7034,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6933,50 +7043,50 @@ msgid ""
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "മുമ്പ്"
 
@@ -7022,6 +7132,13 @@ msgstr ""
 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."
@@ -7221,7 +7338,7 @@ msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr ""
 
@@ -7784,12 +7901,12 @@ 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "പ്രമാണം അപ്‌ലോഡ് ചെയ്യുക"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
@@ -8509,11 +8626,11 @@ msgstr "അറിയിപ്പ് അയയ്ക്കുക"
 msgid "What's up, %s?"
 msgstr "എന്തൊക്കെയുണ്ട്, %s?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "പ്രമാണം ചേർത്തു വെയ്ക്കുക"
 
@@ -8704,6 +8821,13 @@ msgstr "ഉപയോക്തൃ ഐ.ഡി"
 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:98
+msgid "Groups"
+msgstr "സംഘങ്ങൾ"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9118,6 +9242,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "Personal"
-#~ msgstr "വ്യക്തിപരം"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index ee2ef70953..01415e660a 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:35+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:35: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 (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -78,7 +78,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -130,6 +130,9 @@ msgstr "Ingen slik side."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -147,7 +150,7 @@ msgstr "Ingen slik side."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -319,8 +322,8 @@ msgstr "Du må angi en verdi for parameteren 'device' med en av: sms, im, none."
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -340,13 +343,15 @@ msgstr "Kunne ikke oppdatere bruker."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -385,11 +390,12 @@ msgstr[1] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -399,7 +405,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Kunne ikke oppdatere din profils utseende."
 
@@ -414,7 +420,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -809,9 +815,9 @@ msgstr "Du er ikke autorisert."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -840,7 +846,7 @@ msgstr "Databasefeil ved innsetting av oauth_token_association."
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -848,7 +854,7 @@ 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:335
+#: 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
@@ -920,7 +926,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1253,6 +1259,13 @@ msgstr "Bruker ikke funnet."
 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
@@ -1290,6 +1303,13 @@ msgstr "Legg til i favoritter"
 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
@@ -1338,7 +1358,17 @@ msgstr "Kunne ikke slette favoritt."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1351,12 +1381,12 @@ msgstr "Kunne ikke slette favoritt."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1398,6 +1428,13 @@ msgstr "Ikke autorisert."
 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."
@@ -1430,12 +1467,15 @@ msgstr "Ingen slike vedlegg."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Ingen kallenavn."
 
@@ -1467,7 +1507,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Bruker uten samsvarende profil."
@@ -1476,7 +1516,7 @@ msgstr "Bruker uten samsvarende profil."
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Avatarinnstillinger"
 
@@ -1485,7 +1525,7 @@ msgstr "Avatarinnstillinger"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Opprinnelig"
 
@@ -1494,7 +1534,7 @@ msgstr "Opprinnelig"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Forhåndsvis"
 
@@ -1530,7 +1570,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Mistet våre fildata."
 
@@ -1595,7 +1635,8 @@ msgstr "Du har allerede blokkert den brukeren."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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"
 
@@ -1618,7 +1659,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Nei"
@@ -1636,7 +1677,7 @@ msgstr "Ikke blokker denne brukeren"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ja"
@@ -1844,7 +1885,7 @@ 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:1409
+#: lib/action.php:1422
 #, fuzzy
 msgid "There was a problem with your session token."
 msgstr "Det var et problem med din sesjons-autentisering. Prøv igjen."
@@ -1938,12 +1979,13 @@ msgstr "Slett denne gruppen"
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2102,13 +2144,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Bakgrunn"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2320,14 +2362,15 @@ 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:70 actions/newgroup.php:65
+#: 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: 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:107 actions/grouplogo.php:112
+#: 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."
 
@@ -2385,7 +2428,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2414,7 +2457,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2527,7 +2570,7 @@ 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 IM 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
@@ -2545,7 +2588,7 @@ msgstr ""
 "din (og søppelboksen) for koden, og hvordan du skal bruke den."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2718,62 +2761,77 @@ msgstr "Ingen vedlegg."
 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!"
 
-#: actions/finishremotesubscribe.php:80
+#. 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."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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!"
 
-#: actions/finishremotesubscribe.php:99
+#. 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."
 
-#: actions/finishremotesubscribe.php:110
+#. 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."
 
-#: actions/finishremotesubscribe.php:113
+#. 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 ""
 
-#: actions/finishremotesubscribe.php:118
+#. 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."
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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."
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Ingen slik fil."
 
-#: actions/getfile.php:83
+#. 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."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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."
 
-#: actions/grantrole.php:75
+#. 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."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2783,37 +2841,47 @@ msgstr "Bruker har allerede denne rollen."
 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 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:76 actions/groupunblock.php:77
+#: 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."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "Ingen gruppe oppgitt."
 
-#: actions/groupblock.php:91
+#. 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."
 
-#: actions/groupblock.php:95
+#. 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."
 
-#: actions/groupblock.php:100
+#. 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."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2825,32 +2893,37 @@ msgstr ""
 "fremtiden."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: actions/groupblock.php:191
 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "Blokker denne brukeren fra denne gruppen"
 
-#: actions/groupblock.php:206
+#. 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."
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Ingen ID."
 
-#: actions/groupdesignsettings.php:68
+#. 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."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Gruppeutseende"
 
-#: actions/groupdesignsettings.php:155
+#. 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."
@@ -2858,125 +2931,141 @@ msgstr ""
 "Tilpass hvordan gruppen din ser ut med et bakgrunnsbilde og en fargepalett "
 "av ditt valg."
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 msgid "Design preferences saved."
 msgstr "Utseende lagret."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: 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:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Last opp"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Beskjær"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logo oppdatert."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s gruppemedlemmer, side %2$d"
 
-#: actions/groupmembers.php:122
+#. 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."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "Administrator"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Blokker"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Blokker denne brukeren"
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Gjør til administrator"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: 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: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "Grupper"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "Grupper, side %d"
 
-#: actions/groups.php:90
-#, php-format
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 "%%%%site.name%%%%-grupper lar deg finne og snakke med mennesker med lignende "
 "interesser. Etter at du blir med i en gruppe kan du sende meldinger til alle "
@@ -2984,11 +3073,13 @@ msgstr ""
 "Prøv å [søke etter en](%%%%action.groupsearch%%%%) eller [start din egen.](%%"
 "%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -2997,25 +3088,31 @@ msgstr ""
 "Søk etter grupper på %%site.name%% etter navn, lokasjon eller beskrivelse. "
 "Skill nøkkelord med mellomrom; de må være minst 3 tegn eller lengre."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Gruppesøk"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "Ingen resultat."
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 "Om du ikke finner gruppen du søker etter kan du [opprette den](%%action."
 "newgroup%%) selv."
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3025,21 +3122,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Feil under oppheving av blokkering."
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "Innstillinger for direktemeldinger"
@@ -3048,111 +3145,119 @@ msgstr "Innstillinger for direktemeldinger"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address 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 IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "Direktemeldinger ikke tilgjengelig."
 
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "Nåværende bekreftede Jabber/GTak-adresse."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 ""
 "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 IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Direktemeldingsinnstillinger"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Send meg notiser gjennom Jabber/GTalk."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "Post en notis når min Jabber/Gtalk-status endres."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, 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 IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Publiser en MicroID for min Jabber/Gtalk-adresse."
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Innstillinger lagret."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 IM address that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "Klarer ikke normalisere Jabber-IDen"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "Ugyldig Jabber ID"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "Jabber-ID tilhører allerede en annen bruker."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3162,74 +3267,79 @@ msgstr ""
 "En bekreftelseskode ble sendt til lynmeldingsadressen du la til. Du må "
 "godkjenne %s for å sende meldinger til deg."
 
-#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "Det er feil IM-adresse."
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 #, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "Kunne ikke slette direktemeldingsbekreftelse."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "Direktemeldingsbekreftelse avbrutt."
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging 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."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 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:40
+#: 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:44
+#: 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:77
+#: 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:116
+#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "Invitasjoner sendt"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Inviter nye brukere"
 
@@ -3237,7 +3347,7 @@ 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:139
+#: 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:"
@@ -3245,7 +3355,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3254,7 +3364,7 @@ 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:153
+#: 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:"
@@ -3267,7 +3377,7 @@ 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:167
+#: 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:"
@@ -3275,7 +3385,7 @@ 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:177
+#: 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!"
@@ -3284,7 +3394,7 @@ msgstr ""
 "seg på nettstedet. Takk for at du hjelper oss å vokse!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3292,27 +3402,28 @@ msgstr ""
 "denne tjenesten."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:217
+#: 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:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: 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:227
+#: 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:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Send"
@@ -3320,7 +3431,7 @@ 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:263
+#: 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"
@@ -3330,7 +3441,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5210,7 +5321,7 @@ msgid "Application profile"
 msgstr "Programprofil"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ikon"
 
@@ -6525,7 +6636,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:885
+#: actions/version.php:198 lib/action.php:898
 msgid "Version"
 msgstr "Versjon"
 
@@ -6648,7 +6759,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6916,217 +7027,217 @@ msgid "Other"
 msgstr "Andre"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Side uten tittel"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 #, fuzzy
 msgid "Primary site navigation"
 msgstr "Endre nettstedskonfigurasjon"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 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:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personlig"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "Konto"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: lib/action.php:560
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Koble til tjenester"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "Koble til"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: lib/action.php:566
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Endre nettstedskonfigurasjon"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrator"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: 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"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Inviter"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: lib/action.php:582
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Logg ut fra nettstedet"
 
 #. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Logg ut"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Opprett en konto"
 
 #. 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrer"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 msgctxt "TOOLTIP"
 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:586 lib/logingroupnav.php:77
+#: 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:589
+#: 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:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "Hjelp"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: lib/action.php:611
 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:620 lib/adminpanelaction.php:387
+#: 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:687
+#: 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:757
+#: 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:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "Hjelp"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "Om"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "OSS/FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 #, fuzzy
 msgid "Privacy"
 msgstr "Privat"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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
+#: lib/action.php:902
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 #, fuzzy
 msgid "Badge"
 msgstr "Knuff"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "Programvarelisens for StatusNet"
 
@@ -7134,7 +7245,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7144,7 +7255,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** er en mikrobloggingtjeneste."
@@ -7153,7 +7264,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7162,52 +7273,52 @@ msgid ""
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 #, 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 #, 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "Før"
 
@@ -7255,6 +7366,13 @@ msgstr ""
 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."
@@ -7464,7 +7582,7 @@ msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Ikon for dette programmet"
 
@@ -8051,12 +8169,12 @@ msgstr "Databasefeil"
 
 #. 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "Last opp fil"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
@@ -8886,11 +9004,11 @@ msgstr "Send en notis"
 msgid "What's up, %s?"
 msgstr "Hva skjer %s?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "Legg ved"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
@@ -9086,6 +9204,13 @@ msgstr "Bruker-ID"
 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:98
+msgid "Groups"
+msgstr "Grupper"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9517,6 +9642,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "Personal"
-#~ msgstr "Personlig"
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 579f3af544..c863a5e210 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:33+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:35: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-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -79,7 +79,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -131,6 +131,9 @@ msgstr "Deze pagina bestaat niet."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -148,7 +151,7 @@ msgstr "Deze pagina bestaat niet."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -325,8 +328,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -346,13 +349,15 @@ msgstr "Het was niet mogelijk de gebruiker bij te werken."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -391,11 +396,12 @@ msgstr[1] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -405,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Het was niet mogelijk uw ontwerp bij te werken."
 
@@ -419,7 +425,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -816,9 +822,9 @@ msgstr "Het verzoektoken is al geautoriseerd."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -851,7 +857,7 @@ msgstr ""
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -859,7 +865,7 @@ 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:335
+#: 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
@@ -931,7 +937,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1268,6 +1274,13 @@ msgstr "De pagina is niet aangetroffen."
 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
+#, fuzzy, php-format
+msgid "Notices %1$s has favorited on %2$s"
+msgstr "Updates van %1$s en vrienden op %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
@@ -1303,6 +1316,13 @@ msgstr "Deze mededeling is al een favoriet."
 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
+#, fuzzy, php-format
+msgid "Groups %1$s is a member of on %2$s"
+msgstr "Groepen waar %s lid van is"
+
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
 #: actions/atompubmembershipfeed.php:219
 msgid "Cannot add someone else's membership."
@@ -1347,7 +1367,17 @@ msgstr "Het is niet mogelijk om een favoriet van een ander te verwijderen."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1360,12 +1390,12 @@ msgstr "Het is niet mogelijk om een favoriet van een ander te verwijderen."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1405,6 +1435,13 @@ 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
+#, fuzzy, php-format
+msgid "People %1$s has subscribed to on %2$s"
+msgstr "Gebruikers met een abonnement op %s"
+
 #. TRANS: Client error displayed when not using the follow verb.
 #: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
@@ -1439,12 +1476,15 @@ msgstr "Deze bijlage bestaat niet."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Geen gebruikersnaam."
 
@@ -1477,7 +1517,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Gebruiker zonder bijbehorend profiel."
@@ -1486,7 +1526,7 @@ msgstr "Gebruiker zonder bijbehorend profiel."
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Avatarinstellingen"
 
@@ -1495,7 +1535,7 @@ msgstr "Avatarinstellingen"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Origineel"
 
@@ -1504,7 +1544,7 @@ msgstr "Origineel"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Voorvertoning"
 
@@ -1541,7 +1581,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Ons bestand is verloren gegaan."
 
@@ -1609,7 +1649,8 @@ msgstr "U hebt deze gebruiker reeds geblokkeerd."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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"
 
@@ -1632,7 +1673,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Nee"
@@ -1650,7 +1691,7 @@ msgstr "Gebruiker niet blokkeren"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ja"
@@ -1859,7 +1900,7 @@ 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:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Er is een probleem met uw sessietoken."
 
@@ -1953,12 +1994,13 @@ msgstr "Groep verwijderen"
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2116,13 +2158,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Achtergrond"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2333,14 +2375,15 @@ 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:70 actions/newgroup.php:65
+#: 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: 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:107 actions/grouplogo.php:112
+#: 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."
 
@@ -2398,7 +2441,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2427,7 +2470,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2523,9 +2566,8 @@ msgstr "Geen e-mailadres"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
 #: actions/emailsettings.php:388
-#, fuzzy
 msgid "Cannot normalize that email address."
-msgstr "Kan het emailadres niet normaliseren"
+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
@@ -2544,7 +2586,7 @@ 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 IM 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
@@ -2562,7 +2604,7 @@ msgstr ""
 "hoe het te gebruiken."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2709,9 +2751,9 @@ msgstr "Nieuwe gebruikers, pagina %d"
 
 #. TRANS: Description on page displaying featured users.
 #: actions/featured.php:102
-#, fuzzy, php-format
+#, php-format
 msgid "A selection of some great users on %s."
-msgstr "Een selectie van gewaardeerde gebruikers op %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
@@ -2734,66 +2776,81 @@ msgstr "Geen bijlagen."
 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!"
 
-#: actions/finishremotesubscribe.php:80
+#. 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."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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!"
 
-#: actions/finishremotesubscribe.php:99
+#. 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."
 
-#: actions/finishremotesubscribe.php:110
+#. 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."
 
-#: actions/finishremotesubscribe.php:113
+#. 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."
 
-#: actions/finishremotesubscribe.php:118
+#. 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."
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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."
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Het bestand bestaat niet."
 
-#: actions/getfile.php:83
+#. 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."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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."
 
-#: actions/grantrole.php:75
+#. 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."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2803,37 +2860,47 @@ msgstr "Deze gebruiker heeft deze rol al."
 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 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:76 actions/groupunblock.php:77
+#: 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."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "Er is geen groep aangegeven."
 
-#: actions/groupblock.php:91
+#. 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."
 
-#: actions/groupblock.php:95
+#. 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."
 
-#: actions/groupblock.php:100
+#. 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."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2845,34 +2912,39 @@ 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:182
+#: 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "Deze gebruiker de toegang tot deze groep ontzeggen"
 
-#: actions/groupblock.php:206
+#. 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 "
 "groep."
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Geen ID."
 
-#: actions/groupdesignsettings.php:68
+#. 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."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Groepsontwerp"
 
-#: actions/groupdesignsettings.php:155
+#. 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."
@@ -2880,19 +2952,26 @@ msgstr ""
 "De vormgeving van uw groep aanpassen met een achtergrondafbeelding en een "
 "kleurenpalet van uw keuze."
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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 "Het was niet mogelijk om uw ontwerpinstellingen op te slaan."
+
+#. TRANS: Form text to confirm saved group design settings.
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
 msgid "Design preferences saved."
 msgstr "De ontwerpvoorkeuren zijn opgeslagen."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2901,106 +2980,115 @@ msgstr ""
 "s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Uploaden"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Uitsnijden"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logo geactualiseerd."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s groeps leden, pagina %2$d"
 
-#: actions/groupmembers.php:122
+#. 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"
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "Beheerder"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Blokkeren"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Deze gebruiker blokkeren"
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Beheerder maken"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: 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: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "Groepen"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "Groepen, pagina %d"
 
-#: actions/groups.php:90
-#, php-format
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 "Met groepen van %%%%site.name%%%% kunt u gebruikers vinden met gelijke "
 "interessen en daarmee in contact treden. Nadat u lid bent geworden van een "
@@ -3009,11 +3097,13 @@ msgstr ""
 "[doorzoek dan de groepen](%%%%action.groupsearch%%%%) of [start zelf een "
 "groep!](%%%%action.newgroup%%%%)."
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -3023,25 +3113,31 @@ msgstr ""
 "interesses of beschrijving. Scheid de zoektermen met spaties. Iedere "
 "zoekterm moet uit drie of meer tekens bestaan."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Groepen zoeken"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "Geen resultaten."
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 "Als u de groep waar u naar zoekt niet kunt vinden, dan kunt u deze zelf "
 "[aanmaken](%%action.newgroup%%)."
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3051,21 +3147,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: 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 instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "IM-instellingen"
@@ -3074,114 +3170,122 @@ msgstr "IM-instellingen"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 "U kunt berichten verzenden en ontvangen via Jabber/GTalk [\"onmiddellijke "
 "berichten\"](%%doc.im%%). Maak hieronder uw instellingen."
 
-#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM is niet beschikbaar."
 
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "Huidige bevestigde Jabber/GTalk adres."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 ""
 "Er wordt gewacht op bevestiging van dit adres. Controleer uw Jabber/GTalk-"
 "gebruiker op een bericht met nadere instructies. Hebt u %s aan uw "
 "contactenlijst toegevoegd?"
 
-#. TRANS: IM address input field instructions in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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 GTalk-adres, zoals \"gebruiker@example.org\". Zorg ervoor dat u "
 "%s eerst aan uw contactenlijst in uw IM-programma of in GTalk toevoegt."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "IM-voorkeuren"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Mij berichten sturen via Jabber/GTalk."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "Een mededeling versturen als mijn Jabber/GTalk-status wijzigt."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, fuzzy
+msgid ""
+"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
 msgstr ""
 "Mij antwoorden sturen via Jabber/GTalk van gebruikers op wie ik niet "
 "geabonneerd ben."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Een MicroID voor mijn Jabber/GTalk-adres publiceren."
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Uw voorkeuren zijn opgeslagen."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "Het was niet mogelijk om het Jabber-ID te normaliseren"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "Geen geldige Jabber-ID"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "Het Jabber-ID wordt al gebruikt door een andere gebruiker."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3191,54 +3295,59 @@ 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 IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 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.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 msgid "Could not delete IM confirmation."
 msgstr "De IM-bevestiging kon niet verwijderd worden."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "IM-bevestiging geannuleerd."
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging 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."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 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:40
+#: 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:44
+#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr ""
@@ -3247,18 +3356,18 @@ 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:77
+#: 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:116
+#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "De uitnodigingen zijn verzonden"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Nieuwe gebruikers uitnodigen"
 
@@ -3266,7 +3375,7 @@ 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:139
+#: 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:"
@@ -3274,7 +3383,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3283,7 +3392,7 @@ 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:153
+#: 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:"
@@ -3294,7 +3403,7 @@ 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:167
+#: 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:"
@@ -3302,7 +3411,7 @@ 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:177
+#: 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!"
@@ -3312,7 +3421,7 @@ msgstr ""
 "gemeenschap!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3320,27 +3429,28 @@ msgstr ""
 "te gebruiken."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:217
+#: 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:220
-msgid "Addresses of friends to invite (one per line)"
+#: actions/invite.php:221
+#, fuzzy
+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:224
+#: 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:227
+#: 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:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Verzenden"
@@ -3348,7 +3458,7 @@ 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:263
+#: 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"
@@ -3358,7 +3468,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5256,7 +5366,7 @@ msgid "Application profile"
 msgstr "Applicatieprofiel"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icoon"
 
@@ -5995,9 +6105,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-#, fuzzy
 msgid "No code entered."
-msgstr "Er is geen code ingevoerd"
+msgstr "Er is geen code ingevoerd."
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
@@ -6601,7 +6710,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:885
+#: actions/version.php:198 lib/action.php:898
 msgid "Version"
 msgstr "Versie"
 
@@ -6730,7 +6839,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr "Geen databasenaam of DSN gevonden."
 
@@ -7009,214 +7118,214 @@ msgid "Other"
 msgstr "Overige"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Naamloze pagina"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Meer weergeven"
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "Primaire sitenavigatie"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Persoonlijk profiel en tijdlijn van vrienden"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
 #. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Persoonlijk"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "Gebruiker"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: lib/action.php:560
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Met andere diensten koppelen"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "Koppelen"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: lib/action.php:566
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Websiteinstellingen wijzigen"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Beheer"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: 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"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Uitnodigingen"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: lib/action.php:582
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Gebruiker afmelden"
 
 #. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Afmelden"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Gebruiker aanmaken"
 
 #. 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registreren"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 msgctxt "TOOLTIP"
 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Aanmelden"
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: 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:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "Help"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: lib/action.php:611
 msgctxt "MENU"
 msgid "Search"
 msgstr "Zoeken"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:620 lib/adminpanelaction.php:387
+#: 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:687
+#: 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:757
+#: 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:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "Secundaire sitenavigatie"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "Help"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "Over"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "Veel gestelde vragen"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "Gebruiksvoorwaarden"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "Privacy"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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
+#: lib/action.php:902
 msgid "Contact"
 msgstr "Contact"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "Widget"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "Licentie van de StatusNet-software"
 
@@ -7224,7 +7333,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7234,7 +7343,7 @@ msgstr ""
 "broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** is een microblogdienst."
@@ -7243,7 +7352,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7255,20 +7364,20 @@ msgstr ""
 "www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7276,7 +7385,7 @@ msgstr ""
 "voorbehouden."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:972
+#: lib/action.php:985
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Auteursrechten op inhoud en gegevens rusten bij de respectievelijke "
@@ -7284,26 +7393,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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "Eerder"
 
@@ -7351,6 +7460,13 @@ msgstr "Het profiel op de andere server is geen groep!"
 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 ""
+
 #. 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."
@@ -7560,7 +7676,7 @@ msgid "Failed to delete revoked token."
 msgstr "Het was niet mogelijk een ingetrokken token te verwijderen."
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Icoon voor deze applicatie"
 
@@ -8181,12 +8297,12 @@ msgstr "Databasefout"
 
 #. 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "Bestand uploaden"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
@@ -8240,7 +8356,6 @@ msgstr "Uit de favorietenlijst verwijderen"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
 #: lib/disfavorform.php:136
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Van favorietenlijst verwijderen"
@@ -8253,10 +8368,9 @@ msgstr "Op de favorietenlijst plaatsen"
 
 #. TRANS: Button text for adding the favourite status to a notice.
 #: lib/favorform.php:135
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
-msgstr "Aan favorieten toevoegen"
+msgstr "Aan favorietenlijst toevoegen"
 
 #: lib/feed.php:84
 msgid "RSS 1.0"
@@ -9016,11 +9130,11 @@ msgstr "Mededeling verzenden"
 msgid "What's up, %s?"
 msgstr "Hallo, %s."
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "Toevoegen"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "Bestand toevoegen"
 
@@ -9128,28 +9242,24 @@ msgstr "Kon nieuw abonnement niet toevoegen."
 
 #. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
-#, fuzzy
 msgctxt "MENU"
 msgid "Replies"
 msgstr "Antwoorden"
 
 #. TRANS: Personal group navigation menu option when logged in for seeing own profile.
 #: lib/personalgroupnav.php:114
-#, fuzzy
 msgctxt "MENU"
 msgid "Profile"
 msgstr "Profiel"
 
 #. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
 #: lib/personalgroupnav.php:120
-#, fuzzy
 msgctxt "MENU"
 msgid "Favorites"
 msgstr "Favorieten"
 
 #. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
 #: lib/personalgroupnav.php:133
-#, fuzzy
 msgctxt "MENU"
 msgid "Inbox"
 msgstr "Postvak IN"
@@ -9161,7 +9271,6 @@ msgstr "Uw inkomende berichten"
 
 #. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
 #: lib/personalgroupnav.php:140
-#, fuzzy
 msgctxt "MENU"
 msgid "Outbox"
 msgstr "Postvak UIT"
@@ -9214,6 +9323,13 @@ msgstr "Gebruikers-ID"
 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:98
+msgid "Groups"
+msgstr "Groepen"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9645,6 +9761,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 "Personal"
-#~ msgstr "Persoonlijk"
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index a68fa77d2a..8af4b58618 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:34+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:35: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"
-"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -84,7 +84,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -138,6 +138,9 @@ msgstr "Dette emneord finst ikkje."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -155,7 +158,7 @@ msgstr "Dette emneord finst ikkje."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -322,8 +325,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -343,13 +346,15 @@ msgstr "Kan ikkje oppdatera brukar."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -384,11 +389,12 @@ msgstr[1] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 #, fuzzy
@@ -399,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 #, fuzzy
 msgid "Could not update your design."
 msgstr "Kan ikkje oppdatera brukar."
@@ -414,7 +420,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -821,9 +827,9 @@ msgstr "Du tingar ikkje oppdateringar til den profilen."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -854,7 +860,7 @@ msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s"
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -862,7 +868,7 @@ 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:335
+#: 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
@@ -929,7 +935,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1270,6 +1276,13 @@ msgstr "Fann ikkje API-metode."
 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
@@ -1308,6 +1321,13 @@ msgstr "Legg til i favorittar"
 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
@@ -1356,7 +1376,17 @@ msgstr "Kunne ikkje slette favoritt."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1369,12 +1399,12 @@ msgstr "Kunne ikkje slette favoritt."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1416,6 +1446,13 @@ msgstr "Du tingar ikkje oppdateringar til den profilen."
 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."
@@ -1448,12 +1485,15 @@ msgstr "Dette emneord finst ikkje."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Ingen kallenamn."
 
@@ -1485,7 +1525,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Brukaren har inga profil."
@@ -1494,7 +1534,7 @@ msgstr "Brukaren har inga profil."
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Avatar-innstillingar"
 
@@ -1503,7 +1543,7 @@ msgstr "Avatar-innstillingar"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Original"
 
@@ -1512,7 +1552,7 @@ msgstr "Original"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Forhandsvis"
 
@@ -1552,7 +1592,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Fant ikkje igjen fil data."
 
@@ -1617,7 +1657,8 @@ msgstr "Du tingar allereie oppdatering frå desse brukarane:"
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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"
 
@@ -1637,7 +1678,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Merknad"
@@ -1656,7 +1697,7 @@ msgstr "Lås opp brukaren"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Yes"
@@ -1871,7 +1912,7 @@ 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:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Det var eit problem med sesjons billetten din."
 
@@ -1965,12 +2006,13 @@ msgstr "Slett denne gruppa"
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2139,13 +2181,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr ""
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, fuzzy, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2366,14 +2408,15 @@ 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:70 actions/newgroup.php:65
+#: 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: 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:107 actions/grouplogo.php:112
+#: 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."
 
@@ -2433,7 +2476,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2462,7 +2505,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2579,7 +2622,7 @@ 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 IM 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
@@ -2597,7 +2640,7 @@ msgstr ""
 "søppelpostboksen) for koden og veiledning på korleis du nyttar han."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2767,69 +2810,84 @@ msgstr "Slikt dokument finst ikkje."
 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!"
 
-#: actions/finishremotesubscribe.php:80
+#. 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."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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!"
 
-#: actions/finishremotesubscribe.php:99
+#. 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."
 
-#: actions/finishremotesubscribe.php:110
+#. 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."
 
-#: actions/finishremotesubscribe.php:113
+#. 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."
 
-#: actions/finishremotesubscribe.php:118
+#. 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."
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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"
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 #, fuzzy
 msgid "No such file."
 msgstr "Denne notisen finst ikkje."
 
-#: actions/getfile.php:83
+#. 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."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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 ""
 
-#: actions/grantrole.php:75
+#. 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."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2839,41 +2897,51 @@ msgstr "Brukaren har inga profil."
 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 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:76 actions/groupunblock.php:77
+#: 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."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 #, fuzzy
 msgid "No group specified."
 msgstr "Ingen vald profil."
 
-#: actions/groupblock.php:91
+#. 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 ""
 
-#: actions/groupblock.php:95
+#. 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."
 
-#: actions/groupblock.php:100
+#. 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."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2882,169 +2950,192 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: 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:189
+#: actions/groupblock.php:198
 #, fuzzy
 msgid "Block this user from this group"
 msgstr "Ei liste over brukarane i denne gruppa."
 
-#: actions/groupblock.php:206
+#. 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 ""
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Nei Jabber-ID"
 
-#: actions/groupdesignsettings.php:68
+#. 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."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 #, fuzzy
 msgid "Group design"
 msgstr "Grupper"
 
-#: actions/groupdesignsettings.php:155
+#. 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 ""
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 msgid "Design preferences saved."
 msgstr "Lagra brukarval."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: 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:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Last opp"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Skaler"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logo oppdatert."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%s medlemmar i gruppa"
 
-#: actions/groupmembers.php:122
+#. 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."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "Administrator"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr ""
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: 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: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "Grupper"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "Grupper, side %d"
 
-#: actions/groups.php:90
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -3053,23 +3144,29 @@ 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/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Gruppesøk"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "Resultat frå kommandoen"
 
-#: actions/groupsearch.php:82
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3077,22 +3174,22 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Feil ved fjerning av blokka."
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "Avatar-innstillingar"
@@ -3101,112 +3198,120 @@ msgstr "Avatar-innstillingar"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address 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 IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP 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 IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "Stadfesta Jabber/Gtalk-adresse."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 ""
 "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 IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Lagra brukarval."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Send meg ein notis via Jabber/GTalk."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "Legg til ein notis når min Jabber/GTalk status forandrar seg."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, 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 IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Publiser ein MicroID for Jabber/GTalk addressene mine"
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Lagra brukarval."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 IM address that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "Klarar ikkje normalisera Jabber-IDen"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "Ikkje ein gyldig Jabber-ID"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "Jabber-ID tilhøyrer allereie ein annan brukar."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3216,74 +3321,79 @@ msgstr ""
 "Sendte godkjenningskode til ljonmeldingsadressa du la til. Du må godtaka %s "
 "for å senda meldinger til deg."
 
-#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "Det er feil lynmeldings addresse."
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 #, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "Kan ikkje sletta e-postgodkjenning."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "Ingen stadfestingskode."
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging 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."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 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:40
+#: 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:44
+#: 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:77
+#: 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:116
+#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "Invitasjon(er) sendt"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Invitér nye brukarar"
 
@@ -3291,7 +3401,7 @@ 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:139
+#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3300,7 +3410,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3309,7 +3419,7 @@ 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:153
+#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3322,7 +3432,7 @@ 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:167
+#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3331,7 +3441,7 @@ 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:177
+#: 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!"
@@ -3340,7 +3450,7 @@ msgstr ""
 "har registrert seg på sida. Takk for å bidra til fellesskapet her!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3348,27 +3458,28 @@ msgstr ""
 "tenesta."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:217
+#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "Epostadresser"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: 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:227
+#: 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:231
+#: actions/invite.php:232
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Send"
@@ -3377,7 +3488,7 @@ 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:263
+#: 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"
@@ -3387,7 +3498,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5301,7 +5412,7 @@ msgid "Application profile"
 msgstr "Notisen har ingen profil"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr ""
 
@@ -6609,7 +6720,7 @@ msgid "Plugins"
 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:898
 #, fuzzy
 msgid "Version"
 msgstr "Personleg"
@@ -6737,7 +6848,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -7011,29 +7122,29 @@ msgid "Other"
 msgstr "Anna"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Ingen tittel"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "Navigasjon for hovudsida"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
@@ -7041,37 +7152,37 @@ msgstr "Personleg profil og oversyn over vener"
 
 #. 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:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 #, fuzzy
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personleg"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "Konto"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: lib/action.php:560
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Klarte ikkje å omdirigera til tenaren: %s"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "Kopla til"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: lib/action.php:566
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
@@ -7079,87 +7190,87 @@ msgstr "Navigasjon for hovudsida"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 #, fuzzy
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrator"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: 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"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:563
+#: lib/action.php:576
 #, fuzzy
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Invitér"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: lib/action.php:582
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Logg inn "
 
 #. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Logo"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 #, fuzzy
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrér"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 msgctxt "TOOLTIP"
 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 #, fuzzy
 msgctxt "MENU"
 msgid "Login"
 msgstr "Logg inn"
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: lib/action.php:602
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Hjelp"
 
 #. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "Hjelp"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: lib/action.php:611
 #, fuzzy
 msgctxt "MENU"
 msgid "Search"
@@ -7167,69 +7278,69 @@ msgstr "Søk"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:620 lib/adminpanelaction.php:387
+#: 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:687
+#: 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:757
+#: 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:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "Andrenivås side navigasjon"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "Hjelp"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "Om"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "OSS"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "Personvern"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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
+#: lib/action.php:902
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 #, fuzzy
 msgid "Badge"
 msgstr "Dult"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "StatusNets programvarelisens"
 
@@ -7237,7 +7348,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:928
+#: lib/action.php:941
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7247,7 +7358,7 @@ msgstr ""
 "broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** er ei mikrobloggingteneste."
@@ -7256,7 +7367,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7268,51 +7379,51 @@ msgstr ""
 "org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 #, 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "Før »"
 
@@ -7360,6 +7471,13 @@ msgstr ""
 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."
@@ -7579,7 +7697,7 @@ msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr ""
 
@@ -8164,12 +8282,12 @@ 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "Last opp fil"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: 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."
@@ -8908,11 +9026,11 @@ msgstr "Send ei melding"
 msgid "What's up, %s?"
 msgstr "Kva skjer, %s?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr ""
 
@@ -9112,6 +9230,13 @@ msgstr "Brukar"
 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:98
+msgid "Groups"
+msgstr "Grupper"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9546,6 +9671,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "Personal"
-#~ msgstr "Personleg"
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index e937fa443b..2ea411c561 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:36+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:35:25+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 (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -81,7 +81,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -133,6 +133,9 @@ msgstr "Nie ma takiej strony."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -150,7 +153,7 @@ msgstr "Nie ma takiej strony."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -325,8 +328,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -346,13 +349,15 @@ msgstr "Nie można zaktualizować użytkownika."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -394,11 +399,12 @@ msgstr[2] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -408,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Nie można zaktualizować wyglądu."
 
@@ -422,7 +428,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -819,9 +825,9 @@ msgstr "Token żądania został już upoważniony."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -850,7 +856,7 @@ msgstr "Błąd bazy danych podczas wprowadzania oauth_token_association."
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -858,7 +864,7 @@ 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:335
+#: 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
@@ -930,7 +936,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1267,6 +1273,13 @@ msgstr "Nie odnaleziono strony."
 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
@@ -1300,6 +1313,13 @@ msgstr "Jest już ulubiony."
 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."
@@ -1342,7 +1362,17 @@ msgstr "Nie można usunąć ulubionego wpisu innej osoby."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1355,12 +1385,12 @@ msgstr "Nie można usunąć ulubionego wpisu innej osoby."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1399,6 +1429,13 @@ msgstr "Profil %1$d nie jest subskrybowany do profilu %2$d."
 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."
@@ -1431,12 +1468,15 @@ msgstr "Nie ma takiego załącznika."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Brak pseudonimu."
 
@@ -1468,7 +1508,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Użytkownik bez odpowiadającego profilu."
@@ -1477,7 +1517,7 @@ msgstr "Użytkownik bez odpowiadającego profilu."
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Ustawienia awatara"
 
@@ -1486,7 +1526,7 @@ msgstr "Ustawienia awatara"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Oryginał"
 
@@ -1495,7 +1535,7 @@ msgstr "Oryginał"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Podgląd"
 
@@ -1531,7 +1571,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Utracono dane pliku."
 
@@ -1601,7 +1641,8 @@ msgstr "Użytkownik jest już zablokowany."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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"
 
@@ -1624,7 +1665,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Nie"
@@ -1642,7 +1683,7 @@ msgstr "Nie blokuj tego użytkownika"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Tak"
@@ -1848,7 +1889,7 @@ 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:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Wystąpił problem z tokenem sesji."
 
@@ -1940,12 +1981,13 @@ msgstr "Usuń tę 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2102,13 +2144,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Tło"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2317,14 +2359,15 @@ 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:70 actions/newgroup.php:65
+#: 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: 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:107 actions/grouplogo.php:112
+#: 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ę."
 
@@ -2382,7 +2425,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2412,7 +2455,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2527,7 +2570,7 @@ 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 IM 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
@@ -2545,7 +2588,7 @@ msgstr ""
 "i instrukcje dotyczące jego użycia."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2716,62 +2759,77 @@ msgstr "Brak załączników."
 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ź."
 
-#: actions/finishremotesubscribe.php:80
+#. 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."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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."
 
-#: actions/finishremotesubscribe.php:99
+#. 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."
 
-#: actions/finishremotesubscribe.php:110
+#. 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."
 
-#: actions/finishremotesubscribe.php:113
+#. 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."
 
-#: actions/finishremotesubscribe.php:118
+#. 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."
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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."
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Nie ma takiego pliku."
 
-#: actions/getfile.php:83
+#. 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."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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."
 
-#: actions/grantrole.php:75
+#. 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."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2781,37 +2839,47 @@ msgstr "Użytkownik ma już tę rolę."
 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 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:76 actions/groupunblock.php:77
+#: 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."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "Nie podano grupy."
 
-#: actions/groupblock.php:91
+#. 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."
 
-#: actions/groupblock.php:95
+#. 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."
 
-#: actions/groupblock.php:100
+#. 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."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2823,156 +2891,177 @@ msgstr ""
 "grupy w przyszłości."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: actions/groupblock.php:191
 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "Zablokuj tego użytkownika w tej grupie"
 
-#: actions/groupblock.php:206
+#. 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."
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Brak identyfikatora."
 
-#: actions/groupdesignsettings.php:68
+#. 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ę."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Wygląd grupy"
 
-#: actions/groupdesignsettings.php:155
+#. 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."
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 msgid "Design preferences saved."
 msgstr "Zapisano preferencje wyglądu."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: 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:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Wyślij"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Przytnij"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Zaktualizowano logo."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Członkowie grupy %1$s, strona %2$d"
 
-#: actions/groupmembers.php:122
+#. 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."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "Administrator"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Zablokuj"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Zablokuj tego użytkownika"
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Uczyń administratorem"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: 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: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "Grupy"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "Grupy, strona %d"
 
-#: actions/groups.php:90
-#, php-format
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 "Grupy %%%%site.name%%%% umożliwiają odnalezienie i rozmawianie z osobami o "
 "podobnych zainteresowaniach. Po dołączeniu do grupy można wysyłać wiadomości "
@@ -2980,11 +3069,13 @@ msgstr ""
 "która cię interesuje? Spróbuj ją [znaleźć](%%%%action.groupsearch%%%%) lub "
 "[założyć własną.](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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ę"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -2993,25 +3084,31 @@ msgstr ""
 "Wyszukaj grupy na %%site.name%% według ich nazwy, położenia lub opisu. "
 "Oddziel terminy spacjami; muszą mieć trzy znaki lub więcej."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Wyszukaj grupę"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "Brak wyników."
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 "Jeśli nie można odnaleźć grupy, której szukasz, można samemu [ją utworzyć](%%"
 "action.newgroup%%)."
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3021,21 +3118,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Błąd podczas usuwania blokady."
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "Ustawienia komunikatora"
@@ -3044,113 +3141,121 @@ msgstr "Ustawienia komunikatora"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address 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 IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP 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 IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "Obecnie potwierdzone adresy Jabber/GTalk."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 ""
 "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 IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Preferencje komunikatora"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Wyślij mi wpisy przez Jabber/GTalk."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "Wyślij wpis, kiedy zmieni się mój stan na Jabber/GTalk."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, fuzzy
+msgid ""
+"Send me replies through Jabber/Google Talk 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.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Opublikuj MicroID adresu Jabber/GTalk."
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Zapisano preferencje."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 IM address that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "Nie można znormalizować tego identyfikatora Jabbera"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "To nie jest prawidłowy identyfikator Jabbera"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "Identyfikator Jabbera należy już do innego użytkownika."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3160,55 +3265,60 @@ msgstr ""
 "Kod potwierdzający został wysłany na dodany adres komunikatora. Należy "
 "zaakceptować otrzymywanie wiadomości od %s."
 
-#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 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.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 msgid "Could not delete IM confirmation."
 msgstr "Nie można usunąć potwierdzenia komunikatora."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "Anulowano potwierdzenie komunikatora."
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging 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."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 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:40
+#: 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:44
+#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr ""
@@ -3216,18 +3326,18 @@ 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:77
+#: 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:116
+#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "Wysłano zaproszenia"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Zaproś nowych użytkowników"
 
@@ -3235,7 +3345,7 @@ 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:139
+#: 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:"
@@ -3244,7 +3354,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3253,7 +3363,7 @@ 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:153
+#: 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:"
@@ -3268,7 +3378,7 @@ 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:167
+#: 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:"
@@ -3277,7 +3387,7 @@ 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:177
+#: 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!"
@@ -3286,7 +3396,7 @@ msgstr ""
 "się na witrynie. Dziękujemy za pomoc w zwiększaniu społeczności."
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3294,27 +3404,28 @@ msgstr ""
 "usługi."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:217
+#: 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:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: 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:227
+#: 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:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Wyślij"
@@ -3322,7 +3433,7 @@ 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:263
+#: 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"
@@ -3332,7 +3443,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5213,7 +5324,7 @@ msgid "Application profile"
 msgstr "Profil aplikacji"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ikona"
 
@@ -6545,7 +6656,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:885
+#: actions/version.php:198 lib/action.php:898
 msgid "Version"
 msgstr "Wersja"
 
@@ -6685,7 +6796,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr "Nigdzie nie odnaleziono nazwy lub DSN bazy danych."
 
@@ -6953,214 +7064,214 @@ msgid "Other"
 msgstr "Inne"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Strona bez nazwy"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 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:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "Główna nawigacja witryny"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Profil osobisty i oś czasu przyjaciół"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
 #. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Osobiste"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "Konto"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: lib/action.php:560
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Połącz z serwisami"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "Połącz"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: lib/action.php:566
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Zmień konfigurację witryny"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrator"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: 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"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Zaproś"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: lib/action.php:582
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Wyloguj się z witryny"
 
 #. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Wyloguj się"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Utwórz konto"
 
 #. 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:580 lib/logingroupnav.php:85
+#: 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:583
+#: lib/action.php:596
 msgctxt "TOOLTIP"
 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:586 lib/logingroupnav.php:77
+#: 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:589
+#: 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:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "Pomoc"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: lib/action.php:611
 msgctxt "MENU"
 msgid "Search"
 msgstr "Wyszukaj"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:620 lib/adminpanelaction.php:387
+#: 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:687
+#: 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:757
+#: 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:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "Druga nawigacja witryny"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "Pomoc"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "O usłudze"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "TOS"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "Prywatność"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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
+#: lib/action.php:902
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "Odznaka"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "Licencja oprogramowania StatusNet"
 
@@ -7168,7 +7279,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7178,7 +7289,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** jest usługą mikroblogowania."
@@ -7187,7 +7298,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7199,20 +7310,20 @@ msgstr ""
 "Affero](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7220,7 +7331,7 @@ msgstr ""
 "zastrzeżone."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:972
+#: lib/action.php:985
 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 "
@@ -7228,7 +7339,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:1004
+#: lib/action.php:1017
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -7236,19 +7347,19 @@ msgstr ""
 "$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "Wcześniej"
 
@@ -7293,6 +7404,13 @@ msgstr "Zdalny profil nie jest grupą."
 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."
@@ -7495,7 +7613,7 @@ msgid "Failed to delete revoked token."
 msgstr "Usunięcie unieważnionego tokenu nie powiodło się."
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Ikona tej aplikacji"
 
@@ -8111,12 +8229,12 @@ msgstr "Błąd bazy danych"
 
 #. 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "Wyślij plik"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 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."
@@ -8951,11 +9069,11 @@ msgstr "Wyślij wpis"
 msgid "What's up, %s?"
 msgstr "Co słychać, %s?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "Załącz"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "Załącz plik"
 
@@ -9149,6 +9267,13 @@ msgstr "Identyfikator użytkownika"
 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:98
+msgid "Groups"
+msgstr "Grupy"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9583,6 +9708,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\"."
-
-#~ msgid "Personal"
-#~ msgstr "Osobiste"
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 1b6b69908f..bc75c523a9 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:37+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:35: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-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -82,7 +82,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -134,6 +134,9 @@ msgstr "Página não foi encontrada."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -151,7 +154,7 @@ msgstr "Página não foi encontrada."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -325,8 +328,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -346,13 +349,15 @@ msgstr "Não foi possível actualizar o utilizador."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -391,11 +396,12 @@ msgstr[1] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -405,7 +411,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Não foi possível actualizar o seu estilo."
 
@@ -420,7 +426,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -820,9 +826,9 @@ msgstr "Não tem autorização."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -852,7 +858,7 @@ msgstr "Erro na base de dados ao inserir o utilizador da aplicação OAuth."
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -860,7 +866,7 @@ 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:335
+#: 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
@@ -933,7 +939,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1271,6 +1277,13 @@ msgstr "Método da API não encontrado."
 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
@@ -1309,6 +1322,13 @@ msgstr "Adicionar às favoritas"
 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
@@ -1357,7 +1377,17 @@ msgstr "Não foi possível eliminar o favorito."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1370,12 +1400,12 @@ msgstr "Não foi possível eliminar o favorito."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1417,6 +1447,13 @@ msgstr "Não subscreveu esse perfil."
 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."
@@ -1449,12 +1486,15 @@ msgstr "Anexo não foi encontrado."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: 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."
 
@@ -1486,7 +1526,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Utilizador sem perfil correspondente."
@@ -1495,7 +1535,7 @@ msgstr "Utilizador sem perfil correspondente."
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Configurações do avatar"
 
@@ -1504,7 +1544,7 @@ msgstr "Configurações do avatar"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Original"
 
@@ -1513,7 +1553,7 @@ msgstr "Original"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Antevisão"
 
@@ -1552,7 +1592,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Perdi os dados do nosso ficheiro."
 
@@ -1617,7 +1657,8 @@ msgstr "Já bloqueou esse utilizador."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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"
 
@@ -1640,7 +1681,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Não"
@@ -1658,7 +1699,7 @@ msgstr "Não bloquear este utilizador"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Sim"
@@ -1868,7 +1909,7 @@ 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:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Ocorreu um problema com a sua sessão."
 
@@ -1966,12 +2007,13 @@ msgstr "Apagar este utilizador"
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2134,13 +2176,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Fundo"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2355,14 +2397,15 @@ 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:70 actions/newgroup.php:65
+#: 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: 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:107 actions/grouplogo.php:112
+#: 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."
 
@@ -2420,7 +2463,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2450,7 +2493,7 @@ 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 IM address in IM settings form.
+#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging 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
@@ -2567,7 +2610,7 @@ 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 IM 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
@@ -2586,7 +2629,7 @@ msgstr ""
 "respectivas instruções de utilização."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2758,62 +2801,77 @@ msgstr "Sem anexos."
 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!"
 
-#: actions/finishremotesubscribe.php:80
+#. 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."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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!"
 
-#: actions/finishremotesubscribe.php:99
+#. 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."
 
-#: actions/finishremotesubscribe.php:110
+#. 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."
 
-#: actions/finishremotesubscribe.php:113
+#. 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."
 
-#: actions/finishremotesubscribe.php:118
+#. 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."
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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."
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Ficheiro não foi encontrado."
 
-#: actions/getfile.php:83
+#. 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."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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."
 
-#: actions/grantrole.php:75
+#. 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."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2823,37 +2881,47 @@ msgstr "O utilizador já tem esta função."
 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 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:76 actions/groupunblock.php:77
+#: 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."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "Não foi especificado um grupo."
 
-#: actions/groupblock.php:91
+#. 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."
 
-#: actions/groupblock.php:95
+#. 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."
 
-#: actions/groupblock.php:100
+#. 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."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2865,32 +2933,37 @@ msgstr ""
 "impossibilitado de subscrever o grupo no futuro."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: actions/groupblock.php:191
 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "Bloquear acesso deste utilizador a este grupo"
 
-#: actions/groupblock.php:206
+#. 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."
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Sem ID."
 
-#: actions/groupdesignsettings.php:68
+#. 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."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Estilo do grupo"
 
-#: actions/groupdesignsettings.php:155
+#. 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."
@@ -2898,19 +2971,26 @@ msgstr ""
 "Personalize o aspecto do seu grupo com uma imagem de fundo e uma paleta de "
 "cores à sua escolha."
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 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:145 actions/grouplogo.php:200
+#: 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:157
+#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2919,106 +2999,115 @@ msgstr ""
 "ficheiro é %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Carregar"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Cortar"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logotipo actualizado."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Membros do grupo %1$s, página %2$d"
 
-#: actions/groupmembers.php:122
+#. 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."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "Gestor"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Bloquear"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr ""
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Tornar Gestor"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: 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: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "Grupos"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "Grupos, página %d"
 
-#: actions/groups.php:90
-#, php-format
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 "Os grupos no site %%site.name%% permitem-lhe encontrar e falar com pessoas "
 "que têm interesses semelhantes aos seus. Após juntar-se a um grupo, pode "
@@ -3026,11 +3115,13 @@ msgstr ""
 "encontra nenhum grupo de que gosta? Tente [pesquisar um grupo](%%action."
 "groupsearch%%) ou [crie o seu!](%%action.newgroup%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -3039,25 +3130,31 @@ msgstr ""
 "Procure grupos neste site pesquisando o nome, localização ou descrição. Os "
 "termos de busca devem ter 3 ou mais caracteres e estar separados por espaços."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Pesquisa de grupos"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "Sem resultados."
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 "Se não encontra o grupo que procura, pode [criá-lo](%%action.newgroup%%) "
 "você mesmo."
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3067,21 +3164,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Erro ao remover o bloqueio."
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "Configurações do IM"
@@ -3090,113 +3187,121 @@ msgstr "Configurações do IM"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address 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 IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP 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 IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "Endereço do Jabber/GTalk já confirmado."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 ""
 "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 IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Preferências de MI"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Enviar-me notas via Jabber/GTalk."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "Publicar uma nota quando o meu estado no Jabber/GTalk se altera."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, 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 IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+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 IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Preferências gravadas."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 IM address that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "Não é possível normalizar esse Jabber ID"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "Jabber ID não é válido"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "O Jabber ID introduzido já pertence a outro utilizador."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3206,43 +3311,48 @@ 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 IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 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.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 #, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "Não foi possível apagar a confirmação do mensageiro instantâneo."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 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: Message given trying to remove an Instant Messaging 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."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
@@ -3250,13 +3360,13 @@ msgstr ""
 "recebeu."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:40
+#: 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:44
+#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr ""
@@ -3265,19 +3375,19 @@ 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:77
+#: 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:116
+#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "Convite(s) enviado(s)"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Convidar novos utilizadores"
 
@@ -3285,7 +3395,7 @@ 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:139
+#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3294,7 +3404,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3303,7 +3413,7 @@ 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:153
+#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3316,7 +3426,7 @@ 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:167
+#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3325,7 +3435,7 @@ 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:177
+#: 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!"
@@ -3334,34 +3444,35 @@ msgstr ""
 "registarem no site. Obrigado por aumentar a comunidade!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: 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:217
+#: 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:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: 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:227
+#: 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:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Enviar"
@@ -3369,7 +3480,7 @@ 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:263
+#: 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"
@@ -3379,7 +3490,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5296,7 +5407,7 @@ msgid "Application profile"
 msgstr "Perfil da aplicação"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ícone"
 
@@ -6632,7 +6743,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:885
+#: actions/version.php:198 lib/action.php:898
 msgid "Version"
 msgstr "Versão"
 
@@ -6762,7 +6873,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr "Não foi encontrado nenhum nome de base de dados ou DSN."
 
@@ -7032,214 +7143,214 @@ msgid "Other"
 msgstr "Outras"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: 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:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "Navegação primária deste site"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Perfil pessoal e notas dos amigos"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
 #. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Pessoal"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "Conta"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: lib/action.php:560
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Ligar aos serviços"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "Ligar"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: lib/action.php:566
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Alterar a configuração do site"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Gestor"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: 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"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Convidar"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: lib/action.php:582
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Terminar esta sessão"
 
 #. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Sair"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Criar uma conta"
 
 #. 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registar"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 msgctxt "TOOLTIP"
 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Entrar"
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: 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:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: lib/action.php:611
 msgctxt "MENU"
 msgid "Search"
 msgstr "Pesquisa"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:620 lib/adminpanelaction.php:387
+#: 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:687
+#: 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:757
+#: 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:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "Navegação secundária deste site"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "Sobre"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "Termos"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "Privacidade"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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
+#: lib/action.php:902
 msgid "Contact"
 msgstr "Contacto"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "Emblema"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "Licença de software do StatusNet"
 
@@ -7247,7 +7358,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7257,7 +7368,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** é um serviço de microblogues."
@@ -7266,7 +7377,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7278,20 +7389,20 @@ msgstr ""
 "fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -7299,7 +7410,7 @@ msgstr ""
 "direitos reservados."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:972
+#: lib/action.php:985
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Direitos de autor sobre o conteúdo e dados detidos pelos contribuidores. "
@@ -7307,7 +7418,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:1004
+#: lib/action.php:1017
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
@@ -7315,19 +7426,19 @@ msgstr ""
 "licença %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "Anteriores"
 
@@ -7377,6 +7488,13 @@ msgstr ""
 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."
@@ -7580,7 +7698,7 @@ msgid "Failed to delete revoked token."
 msgstr "Falha ao eliminar código revogado."
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Ícone para esta aplicação"
 
@@ -8195,12 +8313,12 @@ msgstr "Erro de base de dados"
 
 #. 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "Carregar ficheiro"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
@@ -9033,11 +9151,11 @@ msgstr "Enviar uma nota"
 msgid "What's up, %s?"
 msgstr "Novidades, %s?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "Anexar"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "Anexar um ficheiro"
 
@@ -9231,6 +9349,13 @@ msgstr "Número de identificação"
 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:98
+msgid "Groups"
+msgstr "Grupos"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9656,6 +9781,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "Personal"
-#~ msgstr "Pessoal"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 544ab38734..f59c043271 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:38+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:35:33+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 (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -83,7 +83,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -135,6 +135,9 @@ msgstr "Esta página não existe."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -152,7 +155,7 @@ msgstr "Esta página não existe."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -328,8 +331,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -349,13 +352,15 @@ msgstr "Não foi possível atualizar o usuário."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -394,11 +399,12 @@ msgstr[1] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -408,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Não foi possível atualizar a sua aparência."
 
@@ -423,7 +429,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -820,9 +826,9 @@ msgstr "O token solicitado já foi autorizado."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -852,7 +858,7 @@ msgstr "Erro no banco de dados durante a inserção de oauth_token_association."
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -860,7 +866,7 @@ 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:335
+#: 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
@@ -933,7 +939,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1266,6 +1272,13 @@ msgstr "O método da API não foi encontrado!"
 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
+#, fuzzy, php-format
+msgid "Notices %1$s has favorited on %2$s"
+msgstr "Atualizaçõ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
@@ -1301,6 +1314,13 @@ msgstr "Já foi adicionada às Favoritas."
 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
@@ -1346,7 +1366,17 @@ msgstr "Não é possível excluir a Favorita de outra pessoa"
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1359,12 +1389,12 @@ msgstr "Não é possível excluir a Favorita de outra pessoa"
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1406,6 +1436,13 @@ msgstr "O perfil %1$d não assina o perfil %2$d"
 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."
@@ -1438,12 +1475,15 @@ msgstr "Este anexo não existe."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Nenhuma identificação."
 
@@ -1476,7 +1516,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Usuário sem um perfil correspondente"
@@ -1485,7 +1525,7 @@ msgstr "Usuário sem um perfil correspondente"
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Configurações do avatar"
 
@@ -1494,7 +1534,7 @@ msgstr "Configurações do avatar"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Original"
 
@@ -1503,7 +1543,7 @@ msgstr "Original"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Pré-visualizar"
 
@@ -1539,7 +1579,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Os dados do nosso arquivo foram perdidos."
 
@@ -1609,7 +1649,8 @@ msgstr "Você já bloqueou esse usuário."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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"
 
@@ -1633,7 +1674,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Não"
@@ -1651,7 +1692,7 @@ msgstr "Não bloquear este usuário"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Sim"
@@ -1859,7 +1900,7 @@ 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:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Ocorreu um problema com o seu token de sessão."
 
@@ -1952,12 +1993,13 @@ msgstr "Excluir 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.
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2118,13 +2160,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Fundo"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2337,14 +2379,15 @@ 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:70 actions/newgroup.php:65
+#: 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: 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:107 actions/grouplogo.php:112
+#: 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."
 
@@ -2402,7 +2445,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2431,7 +2474,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2548,7 +2591,7 @@ 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 IM 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
@@ -2567,7 +2610,7 @@ msgstr ""
 "instruções sobre como usá-lo."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2741,62 +2784,77 @@ msgstr "Nenhum anexo."
 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!"
 
-#: actions/finishremotesubscribe.php:80
+#. 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."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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!"
 
-#: actions/finishremotesubscribe.php:99
+#. 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."
 
-#: actions/finishremotesubscribe.php:110
+#. 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."
 
-#: actions/finishremotesubscribe.php:113
+#. 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."
 
-#: actions/finishremotesubscribe.php:118
+#. 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."
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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."
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Esse arquivo não existe."
 
-#: actions/getfile.php:83
+#. 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."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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."
 
-#: actions/grantrole.php:75
+#. 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."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2806,37 +2864,47 @@ msgstr "O usuário já possui este papel."
 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 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:76 actions/groupunblock.php:77
+#: 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."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "Não foi especificado nenhum grupo."
 
-#: actions/groupblock.php:91
+#. 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."
 
-#: actions/groupblock.php:95
+#. 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."
 
-#: actions/groupblock.php:100
+#. 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"
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2848,33 +2916,38 @@ msgstr ""
 "futuramente."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: actions/groupblock.php:191
 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "Bloquear este usuário neste grupo"
 
-#: actions/groupblock.php:206
+#. 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."
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Nenhuma ID."
 
-#: actions/groupdesignsettings.php:68
+#. 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."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Aparência do grupo"
 
-#: actions/groupdesignsettings.php:155
+#. 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."
@@ -2882,19 +2955,26 @@ msgstr ""
 "Personalize a aparência do grupo com uma imagem de fundo e uma paleta de "
 "cores à sua escolha."
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 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:145 actions/grouplogo.php:200
+#: 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:157
+#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2903,106 +2983,115 @@ msgstr ""
 "arquivo é %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Enviar"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Cortar"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: 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:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Membros do grupo %1$s, pág. %2$d"
 
-#: actions/groupmembers.php:122
+#. 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."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "Admin"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Bloquear"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Bloquear este usuário"
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Tornar administrador"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: 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: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "Grupos"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "Groupos, pág. %d"
 
-#: actions/groups.php:90
-#, php-format
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 "Os grupos de %%%%site.name%%%% lhe permite encontrar e conversar com pessoas "
 "que tenham interesses similares. Após  associar-se a um grupo, você pode "
@@ -3010,11 +3099,13 @@ msgstr ""
 "\". Não encontrou um grupo que lhe agrade? Experimente [procurar por um](%%%%"
 "action.groupsearch%%%%) ou [criar o seu próprio!](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -3023,25 +3114,31 @@ msgstr ""
 "Procurar grupos no %%site.name%% por seus nomes, localização ou descrição. "
 "Separe os termos com espaços; eles devem ter 3 ou mais caracteres."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Procurar grupos"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "Nenhum resultado."
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 "Caso não encontre o grupo que está procurando, você pode [criá-lo](%%action."
 "newgroup%%)."
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3051,21 +3148,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Erro na remoção do bloqueio."
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "Configurações do MI"
@@ -3074,115 +3171,123 @@ msgstr "Configurações do MI"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address 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 IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP 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 IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "Endereço de Jabber/GTalk já confirmado."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 ""
 "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 IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Preferências do mensageiro instantâneo"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Envie-me mensagens via Jabber/GTalk."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "Publicar uma mensagem quando eu mudar de status no Jabber/GTalk."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, fuzzy
+msgid ""
+"Send me replies through Jabber/Google Talk 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 IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+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 IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "As preferências foram salvas."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 IM address that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "Não foi possível normalizar essa ID do Jabber"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "Não é uma ID de Jabber válida"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "Esta ID do Jabber já pertence à outro usuário."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3192,43 +3297,48 @@ 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 IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 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.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 #, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "Não foi possível excluir a confirmação do mensageiro instantâneo."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 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: Message given trying to remove an Instant Messaging 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."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
@@ -3236,13 +3346,13 @@ msgstr ""
 "particulares que você recebeu."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:40
+#: 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:44
+#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr ""
@@ -3250,18 +3360,18 @@ 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:77
+#: 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:116
+#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "Os convites foram enviados"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Convidar novos usuários"
 
@@ -3269,7 +3379,7 @@ 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:139
+#: 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:"
@@ -3277,7 +3387,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3286,7 +3396,7 @@ 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:153
+#: 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:"
@@ -3296,7 +3406,7 @@ 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:167
+#: 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:"
@@ -3304,7 +3414,7 @@ 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:177
+#: 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!"
@@ -3313,7 +3423,7 @@ msgstr ""
 "registrarem neste site. Obrigado por aumentar a comunidade!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3321,27 +3431,28 @@ msgstr ""
 "serviço."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:217
+#: 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:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: 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:227
+#: 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:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Enviar"
@@ -3349,7 +3460,7 @@ 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:263
+#: 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"
@@ -3359,7 +3470,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5271,7 +5382,7 @@ msgid "Application profile"
 msgstr "Perfil da aplicação"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ícone"
 
@@ -6603,7 +6714,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:885
+#: actions/version.php:198 lib/action.php:898
 msgid "Version"
 msgstr "Versão"
 
@@ -6729,7 +6840,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr "Não foi encontrado nenhum nome de base de dados ou DSN."
 
@@ -6998,214 +7109,214 @@ msgid "Other"
 msgstr "Outras"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: 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:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "Navegação primária no site"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Perfil pessoal e fluxo de mensagens dos amigos"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
 #. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Pessoal"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "Conta"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: lib/action.php:560
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Conecte-se a outros serviços"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "Conectar"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: lib/action.php:566
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Altere as configurações do site"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administrar"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: 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"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Convidar"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: lib/action.php:582
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Sair do site"
 
 #. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Sair"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Criar uma conta"
 
 #. 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:580 lib/logingroupnav.php:85
+#: 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:583
+#: lib/action.php:596
 msgctxt "TOOLTIP"
 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Entrar"
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: 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:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: lib/action.php:611
 msgctxt "MENU"
 msgid "Search"
 msgstr "Pesquisar"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:620 lib/adminpanelaction.php:387
+#: 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:687
+#: 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:757
+#: 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:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "Navegação secundária no site"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "Ajuda"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "Sobre"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "Termos de uso"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "Privacidade"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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
+#: lib/action.php:902
 msgid "Contact"
 msgstr "Contato"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "Mini-aplicativo"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "Licença do software StatusNet"
 
@@ -7213,7 +7324,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7223,7 +7334,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** é um serviço de microblog."
@@ -7232,7 +7343,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7244,26 +7355,26 @@ msgstr ""
 "fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Conteúdo e dados licenciados pelos colaboradores. Todos os direitos "
@@ -7271,25 +7382,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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "Anterior"
 
@@ -7339,6 +7450,13 @@ msgstr ""
 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."
@@ -7546,7 +7664,7 @@ msgid "Failed to delete revoked token."
 msgstr "Falha ao eliminar código revogado."
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Ícone para esta aplicação"
 
@@ -8170,12 +8288,12 @@ msgstr "Erro no banco de dados"
 
 #. 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "Enviar arquivo"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
@@ -9012,11 +9130,11 @@ msgstr "Enviar uma mensagem"
 msgid "What's up, %s?"
 msgstr "E aí, %s?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "Anexo"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "Anexar um arquivo"
 
@@ -9210,6 +9328,13 @@ msgstr "ID do usuário"
 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:98
+msgid "Groups"
+msgstr "Grupos"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9635,6 +9760,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "Personal"
-#~ msgstr "Pessoal"
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 6e421b570b..11c4ee401f 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -17,18 +17,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:39+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:35:39+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 (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -86,7 +86,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -138,6 +138,9 @@ msgstr "Нет такой страницы."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -155,7 +158,7 @@ msgstr "Нет такой страницы."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -329,8 +332,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -350,13 +353,15 @@ msgstr "Не удаётся обновить пользователя."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -398,11 +403,12 @@ msgstr[2] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -412,7 +418,7 @@ msgstr "Не удаётся сохранить ваши настройки оф
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Не удаётся обновить ваше оформление."
 
@@ -426,7 +432,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -824,9 +830,9 @@ msgstr "Ключ запроса уже авторизован."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -855,7 +861,7 @@ msgstr "Ошибка базы данных при вставке oauth_token_ass
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -863,7 +869,7 @@ 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:335
+#: 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
@@ -936,7 +942,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1270,6 +1276,13 @@ msgstr "Метод API не найден."
 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
@@ -1303,6 +1316,13 @@ msgstr "Запись уже в числе любимых."
 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."
@@ -1350,7 +1370,17 @@ msgstr "Не удаётся удалить любимую запись."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1363,12 +1393,12 @@ msgstr "Не удаётся удалить любимую запись."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1410,6 +1440,13 @@ msgstr "Вы не подписаны на этот профиль."
 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
@@ -1443,12 +1480,15 @@ msgstr "Нет такого вложения."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Нет имени."
 
@@ -1481,7 +1521,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Пользователь без соответствующего профиля."
@@ -1490,7 +1530,7 @@ msgstr "Пользователь без соответствующего про
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Настройки аватары"
 
@@ -1499,7 +1539,7 @@ msgstr "Настройки аватары"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Оригинал"
 
@@ -1508,7 +1548,7 @@ msgstr "Оригинал"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Просмотр"
 
@@ -1544,7 +1584,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Потеряна информация о файле."
 
@@ -1609,7 +1649,8 @@ msgstr "Вы уже заблокировали этого пользовател
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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 "Заблокировать пользователя."
 
@@ -1632,7 +1673,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Нет"
@@ -1650,7 +1691,7 @@ msgstr "Не блокировать этого пользователя"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Да"
@@ -1858,7 +1899,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:118
-#: lib/action.php:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Проблема с вашим ключом сессии."
 
@@ -1951,12 +1992,13 @@ 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.
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2115,13 +2157,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Фон"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2334,14 +2376,15 @@ 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:70 actions/newgroup.php:65
+#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 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:107 actions/grouplogo.php:112
+#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "Вы должны быть администратором, чтобы изменять информацию о группе."
 
@@ -2399,7 +2442,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2428,7 +2471,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2551,7 +2594,7 @@ 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 IM 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
@@ -2570,7 +2613,7 @@ msgstr ""
 "инструкции по его использованию."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2743,62 +2786,77 @@ msgstr "Нет вложений."
 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 "Неожиданный ответ!"
 
-#: actions/finishremotesubscribe.php:80
+#. 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 "Указанный пользователь не существует."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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 "Вы можете использовать локальную подписку!"
 
-#: actions/finishremotesubscribe.php:99
+#. 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 "Этот пользователь заблокировал вас на его подписку."
 
-#: actions/finishremotesubscribe.php:110
+#. 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 "Вы не авторизованы."
 
-#: actions/finishremotesubscribe.php:113
+#. 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 "Не удаётся преобразовать ключ запроса в ключ доступа."
 
-#: actions/finishremotesubscribe.php:118
+#. 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."
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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 "Ошибка обновления удалённого профиля."
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Нет такого файла."
 
-#: actions/getfile.php:83
+#. TRANS: Client error displayed when requesting a file without having read access to it.
+#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "Не удалось прочесть файл."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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 "Эта роль зарезервирована и не может быть установлена."
 
-#: actions/grantrole.php:75
+#. 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 "Вы не можете назначать пользователю роли на этом сайте."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2808,37 +2866,47 @@ msgstr "Пользователь уже имеет эту роль."
 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 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:76 actions/groupunblock.php:77
+#: 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."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "Группа не определена."
 
-#: actions/groupblock.php:91
+#. 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 "Только администратор может блокировать участников группы."
 
-#: actions/groupblock.php:95
+#. 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 "Пользователь уже заблокирован из группы."
 
-#: actions/groupblock.php:100
+#. 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 "Пользователь не является членом этой группы."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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 "Заблокировать пользователя из группы."
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2850,32 +2918,37 @@ msgstr ""
 "подписываться на группу в будущем."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "Заблокировать этого пользователя из этой группы"
 
-#: actions/groupblock.php:206
+#. 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 "Ошибка базы данных при блокировании пользователя из группы."
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Нет ID."
 
-#: actions/groupdesignsettings.php:68
+#. 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 "Вы должны авторизоваться, чтобы изменить группу."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Оформление группы"
 
-#: actions/groupdesignsettings.php:155
+#. 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."
@@ -2883,19 +2956,26 @@ msgstr ""
 "Настройте внешний вид группы, установив фоновое изображение и цветовую гамму "
 "на ваш выбор."
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 msgid "Design preferences saved."
 msgstr "Настройки оформления сохранены."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2904,106 +2984,115 @@ msgstr ""
 "составляет %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Загрузить"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Обрезать"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Логотип обновлён."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Участники группы %1$s, страница %2$d"
 
-#: actions/groupmembers.php:122
+#. TRANS: Page notice for group members page.
+#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "Список пользователей, являющихся членами этой группы."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "Настройки"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Заблокировать"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Заблокировать этого пользователя"
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Сделать администратором"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Обновления участников %1$s на %2$s!"
 
-#. TRANS: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "Группы"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "Группы, страница %d"
 
-#: actions/groups.php:90
-#, php-format
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 "Группы на сайте %%%%site.name%%%% позволяют искать и общаться с людьми с "
 "общими интересами. После присоединения к группе и вы сможете отправлять "
@@ -3011,11 +3100,13 @@ msgstr ""
 "группу, которая вас интересует? Попробуйте [найти её](%%%%action.groupsearch%"
 "%%%) или [создайте собственную](%%%%action.newgroup%%%%)!"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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 "Создать новую группу"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -3024,25 +3115,31 @@ msgstr ""
 "Поиск групп на %%site.name%% по имени, месторасположению или интересам. "
 "Разделяйте ключевые слова пробелами. Минимальная длина слова — 3 буквы."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Поиск группы"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "Нет результатов."
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 "Если вы не можете найти группу, которая вас интересует, [создайте её](%% "
 "action.newgroup%%) сами."
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3052,21 +3149,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Ошибка при удалении данного блока."
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "IM-установки"
@@ -3075,114 +3172,122 @@ msgstr "IM-установки"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 "Вы можете отправлять и получать записи через Jabber/GTalk [онлайн-мессенджер]"
 "(%%doc.im%%). Настройте ваш аккаунт и предпочтения ниже."
 
-#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM не доступен."
 
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "Подтверждённый в настоящее время Jabber/Gtalk - адрес."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 в ваш список "
 "контактов?)"
 
-#. TRANS: IM address input field instructions in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Настройки IM"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Посылать мне записи через Jabber/GTalk."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "Публиковать запись, когда мой Jabber/GTalk - статус изменяется."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, fuzzy
+msgid ""
+"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
 msgstr ""
 "Посылать мне реплики через Jabber/GTalk от людей, на которых я не подписан."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Опубликовать MicroID для моего Jabber/GTalk - адреса."
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Предпочтения сохранены."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "Не удаётся стандартизировать этот Jabber ID"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "Неверный код Jabber ID"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "Этот Jabber ID уже используется другим пользователем."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3192,43 +3297,48 @@ msgstr ""
 "Код подтверждения выслан на добавленный вами IM-адрес. Вы должны подтвердить "
 "%s для отправки вам сообщений."
 
-#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "Это неверный IM-адрес."
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 #, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "Не удаётся удалить подверждение IM."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "Подтверждение IM отменено."
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging address that is not
 #. TRANS: registered for the active user.
 #: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Это не Ваш Jabber ID."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
@@ -3236,13 +3346,13 @@ msgstr ""
 "сообщения."
 
 #. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:40
+#: 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:44
+#: actions/invite.php:45
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr ""
@@ -3251,18 +3361,18 @@ 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:77
+#: actions/invite.php:78
 #, php-format
 msgid "Invalid email address: %s."
 msgstr "Неправильный адрес электронной почты: %s."
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:116
+#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "Приглашения отправлены"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Пригласить новых пользователей"
 
@@ -3270,7 +3380,7 @@ 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:139
+#: actions/invite.php:140
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
 msgstr[0] ""
@@ -3279,7 +3389,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3288,7 +3398,7 @@ 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:153
+#: 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:"
@@ -3305,7 +3415,7 @@ 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:167
+#: actions/invite.php:168
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] "Приглашение отправлено следующему адресату:"
@@ -3314,7 +3424,7 @@ msgstr[2] ""
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:177
+#: 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!"
@@ -3323,33 +3433,34 @@ msgstr ""
 "зарегистрируются на сайте. Спасибо за помощь в росте нашего сообщества!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: 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:217
+#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "Почтовый адрес"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Личное сообщение"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:227
+#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Можно добавить к приглашению личное сообщение."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Отправить"
@@ -3357,7 +3468,7 @@ 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:263
+#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s пригласил вас присоединиться к нему на %2$s"
@@ -3367,7 +3478,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5259,7 +5370,7 @@ msgid "Application profile"
 msgstr "Профиль приложения"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Иконка"
 
@@ -6593,7 +6704,7 @@ msgid "Plugins"
 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:898
 msgid "Version"
 msgstr "Версия"
 
@@ -6725,7 +6836,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr "Имя базы данных или DSN не найдено."
 
@@ -6994,214 +7105,214 @@ msgid "Other"
 msgstr "Другое"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Страница без названия"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Показать ещё"
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "Главная навигация"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 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:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Личное"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "Настройки"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: 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:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "Соединить"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: 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:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Настройки"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: lib/action.php:573
 #, 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:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Пригласить"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: 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:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Выход"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Регистрация"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Вход"
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: lib/action.php:602
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Помощь"
 
 #. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "Помощь"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: 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:620 lib/adminpanelaction.php:387
+#: 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:687
+#: lib/action.php:700
 msgid "Local views"
 msgstr "Локальные виды"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:757
+#: lib/action.php:770
 msgid "Page notice"
 msgstr "Новая запись"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "Навигация по подпискам"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "Помощь"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "О проекте"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "ЧаВо"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "TOS"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "Пользовательское соглашение"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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:902
 msgid "Contact"
 msgstr "Контактная информация"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "Бедж"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "StatusNet лицензия"
 
@@ -7209,7 +7320,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7219,7 +7330,7 @@ msgstr ""
 "broughtby%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** — сервис микроблогинга."
@@ -7228,7 +7339,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7241,27 +7352,27 @@ msgstr ""
 "licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Авторские права на содержание и данные принадлежат разработчикам. Все права "
@@ -7269,25 +7380,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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "Туда"
 
@@ -7335,6 +7446,13 @@ msgstr ""
 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."
@@ -7537,7 +7655,7 @@ msgid "Failed to delete revoked token."
 msgstr "Не удаётся удалить аннулированный ключ."
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Иконка для этого приложения"
 
@@ -8159,12 +8277,12 @@ 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "Загрузить файл"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
@@ -9003,11 +9121,11 @@ msgstr "Послать запись"
 msgid "What's up, %s?"
 msgstr "Что нового, %s?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "Прикрепить"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "Прикрепить файл"
 
@@ -9201,6 +9319,13 @@ msgstr "ID пользователя"
 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:98
+msgid "Groups"
+msgstr "Группы"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9636,6 +9761,3 @@ msgstr "Неверный XML, отсутствует корень XRD."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Получение резервной копии из файла «%s»."
-
-#~ msgid "Personal"
-#~ msgstr "Личное"
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 0ecdbf9827..635888d61d 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-01-30 22:50+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+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,7 +72,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -124,6 +124,9 @@ msgstr ""
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -141,7 +144,7 @@ msgstr ""
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -307,8 +310,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -328,13 +331,15 @@ msgstr ""
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -369,11 +374,12 @@ msgstr[1] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -383,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr ""
 
@@ -397,7 +403,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -788,9 +794,9 @@ msgstr ""
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -819,7 +825,7 @@ msgstr ""
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -827,7 +833,7 @@ 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:335
+#: 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
@@ -893,7 +899,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1221,6 +1227,13 @@ msgstr ""
 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 ""
+
 #. 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
@@ -1254,6 +1267,13 @@ msgstr ""
 msgid "%s group memberships"
 msgstr ""
 
+#. 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
 msgid "Cannot add someone else's membership."
@@ -1296,7 +1316,17 @@ msgstr ""
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1309,12 +1339,12 @@ msgstr ""
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1353,6 +1383,13 @@ msgstr ""
 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 ""
+
 #. TRANS: Client error displayed when not using the follow verb.
 #: actions/atompubsubscriptionfeed.php:248
 msgid "Can only handle Follow activities."
@@ -1385,12 +1422,15 @@ msgstr ""
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr ""
 
@@ -1422,7 +1462,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr ""
@@ -1431,7 +1471,7 @@ msgstr ""
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr ""
 
@@ -1440,7 +1480,7 @@ msgstr ""
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr ""
 
@@ -1449,7 +1489,7 @@ msgstr ""
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr ""
 
@@ -1485,7 +1525,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr ""
 
@@ -1548,7 +1588,8 @@ msgstr ""
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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 ""
 
@@ -1568,7 +1609,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr ""
@@ -1586,7 +1627,7 @@ msgstr ""
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr ""
@@ -1789,7 +1830,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:118
-#: lib/action.php:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1876,12 +1917,13 @@ 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.
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2034,13 +2076,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr ""
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2249,14 +2291,15 @@ msgstr ""
 #. 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:70 actions/newgroup.php:65
+#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 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:107 actions/grouplogo.php:112
+#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr ""
 
@@ -2314,7 +2357,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2341,7 +2384,7 @@ 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 IM address in IM settings form.
+#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging 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
@@ -2453,7 +2496,7 @@ 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 IM 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
@@ -2468,7 +2511,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2633,62 +2676,77 @@ msgstr ""
 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 ""
 
-#: actions/finishremotesubscribe.php:80
+#. 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 ""
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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 ""
 
-#: actions/finishremotesubscribe.php:99
+#. 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 ""
 
-#: actions/finishremotesubscribe.php:110
+#. 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 ""
 
-#: actions/finishremotesubscribe.php:113
+#. 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 ""
 
-#: actions/finishremotesubscribe.php:118
+#. 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 ""
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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 ""
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr ""
 
-#: actions/getfile.php:83
+#. TRANS: Client error displayed when requesting a file without having read access to it.
+#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr ""
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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 ""
 
-#: actions/grantrole.php:75
+#. 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 ""
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2698,37 +2756,47 @@ msgstr ""
 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 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:76 actions/groupunblock.php:77
+#: 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 ""
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr ""
 
-#: actions/groupblock.php:91
+#. 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 ""
 
-#: actions/groupblock.php:95
+#. 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 ""
 
-#: actions/groupblock.php:100
+#. 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 ""
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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 ""
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2737,186 +2805,213 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr ""
 
-#: actions/groupblock.php:206
+#. 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 ""
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr ""
 
-#: actions/groupdesignsettings.php:68
+#. 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 ""
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr ""
 
-#: actions/groupdesignsettings.php:155
+#. 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 ""
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 msgid "Design preferences saved."
 msgstr ""
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: 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:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr ""
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr ""
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr ""
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: actions/groupmembers.php:104
 #, php-format
 msgid "%s group members"
 msgstr ""
 
 #. 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr ""
 
-#: actions/groupmembers.php:122
+#. TRANS: Page notice for group members page.
+#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr ""
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr ""
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr ""
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr ""
 
-#. TRANS: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+msgctxt "TITLE"
 msgid "Groups"
 msgstr ""
 
-#: actions/groups.php:64
+#. 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"
 msgstr ""
 
-#: actions/groups.php:90
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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 ""
 
-#: actions/groupsearch.php:52
+#. 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. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr ""
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr ""
 
-#: actions/groupsearch.php:82
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -2924,21 +3019,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr ""
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr ""
@@ -2949,103 +3044,104 @@ msgstr ""
 #: actions/imsettings.php:71
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr ""
 
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr ""
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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 GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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 IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr ""
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+msgid "Send me notices through Jabber/Google Talk."
 msgstr ""
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr ""
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgid ""
+"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
 msgstr ""
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr ""
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr ""
 
-#. TRANS: Message given saving IM address without having provided one.
+#. TRANS: Message given saving Instant Messaging address without having provided one.
 #: actions/imsettings.php:304
 msgid "No Jabber ID."
 msgstr ""
 
-#. TRANS: Message given saving IM address that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+msgid "Cannot normalize that Jabber ID."
 msgstr ""
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+msgid "Not a valid Jabber ID."
 msgstr ""
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr ""
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3053,72 +3149,77 @@ msgid ""
 "s for sending messages to you."
 msgstr ""
 
-#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr ""
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 msgid "Could not delete IM confirmation."
 msgstr ""
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr ""
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging address that is not
 #. TRANS: registered for the active user.
 #: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr ""
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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 ""
 
-#: actions/inbox.php:62
+#. 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:115
 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:40
+#: 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:44
+#: 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:77
+#: actions/invite.php:78
 #, php-format
 msgid "Invalid email address: %s."
 msgstr ""
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:116
+#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr ""
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr ""
 
@@ -3126,7 +3227,7 @@ 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:139
+#: actions/invite.php:140
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
 msgstr[0] ""
@@ -3134,7 +3235,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3143,7 +3244,7 @@ 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:153
+#: 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:"
@@ -3153,7 +3254,7 @@ 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:167
+#: actions/invite.php:168
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] ""
@@ -3161,40 +3262,40 @@ msgstr[1] ""
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:177
+#: 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:190
+#: 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:217
+#: actions/invite.php:218
 msgid "Email addresses"
 msgstr ""
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: actions/invite.php:225
 msgid "Personal message"
 msgstr ""
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:227
+#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr ""
@@ -3202,7 +3303,7 @@ 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:263
+#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
@@ -3212,7 +3313,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -4979,7 +5080,7 @@ msgid "Application profile"
 msgstr ""
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr ""
 
@@ -6224,7 +6325,7 @@ msgid "Plugins"
 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:898
 msgid "Version"
 msgstr ""
 
@@ -6346,7 +6447,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6608,214 +6709,214 @@ msgid "Other"
 msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr ""
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 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:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: 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:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr ""
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: 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:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: lib/action.php:573
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: 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:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: lib/action.php:602
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr ""
 
 #. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: 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:620 lib/adminpanelaction.php:387
+#: 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:687
+#: lib/action.php:700
 msgid "Local views"
 msgstr ""
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:757
+#: lib/action.php:770
 msgid "Page notice"
 msgstr ""
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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:902
 msgid "Contact"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr ""
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr ""
 
@@ -6823,7 +6924,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6831,7 +6932,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -6840,7 +6941,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6849,50 +6950,50 @@ msgid ""
 msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr ""
 
@@ -6937,6 +7038,13 @@ msgstr ""
 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."
@@ -7136,7 +7244,7 @@ msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr ""
 
@@ -7699,12 +7807,12 @@ 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr ""
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
@@ -8416,11 +8524,11 @@ msgstr ""
 msgid "What's up, %s?"
 msgstr ""
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr ""
 
@@ -8607,6 +8715,13 @@ msgstr ""
 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:98
+msgid "Groups"
+msgstr ""
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 5015c37dbe..261a9c178e 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:40+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:35:42+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 (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -80,7 +80,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -132,6 +132,9 @@ msgstr "Ingen sådan sida"
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -149,7 +152,7 @@ msgstr "Ingen sådan sida"
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -321,8 +324,8 @@ msgstr "Du måste ange ett värdet på parametern 'device': sms, im, none"
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -342,13 +345,15 @@ msgstr "Kunde inte uppdatera användare."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -387,11 +392,12 @@ msgstr[1] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -401,7 +407,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Kunde inte uppdatera din profils utseende."
 
@@ -415,7 +421,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -810,9 +816,9 @@ msgstr "Begäran-token är redan auktoriserad."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -842,7 +848,7 @@ msgstr "Databasfel vid infogning av OAuth-applikationsanvändare."
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -850,7 +856,7 @@ 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:335
+#: 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
@@ -922,7 +928,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1257,6 +1263,13 @@ msgstr "API-metod hittades inte."
 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
@@ -1295,6 +1308,13 @@ msgstr "Lägg till i favoriter"
 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
@@ -1343,7 +1363,17 @@ msgstr "Kunde inte ta bort favoriten."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1356,12 +1386,12 @@ msgstr "Kunde inte ta bort favoriten."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1403,6 +1433,13 @@ msgstr "Du är inte prenumerat hos den profilen."
 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."
@@ -1435,12 +1472,15 @@ msgstr "Ingen sådan bilaga."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Inget smeknamn."
 
@@ -1473,7 +1513,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Användare utan matchande profil."
@@ -1482,7 +1522,7 @@ msgstr "Användare utan matchande profil."
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Avatarinställningar"
 
@@ -1491,7 +1531,7 @@ msgstr "Avatarinställningar"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Orginal"
 
@@ -1500,7 +1540,7 @@ msgstr "Orginal"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Förhandsgranska"
 
@@ -1536,7 +1576,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Förlorade vår fildata."
 
@@ -1601,7 +1641,8 @@ msgstr "Du har redan blockerat denna användare."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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"
 
@@ -1624,7 +1665,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Nej"
@@ -1642,7 +1683,7 @@ msgstr "Blockera inte denna användare"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ja"
@@ -1851,7 +1892,7 @@ 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:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Det var ett problem med din sessions-token."
 
@@ -1944,12 +1985,13 @@ msgstr "Ta bort denna grupp"
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2108,13 +2150,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Bakgrund"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2327,14 +2369,15 @@ 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:70 actions/newgroup.php:65
+#: 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: 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:107 actions/grouplogo.php:112
+#: 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."
 
@@ -2392,7 +2435,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2421,7 +2464,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2535,7 +2578,7 @@ 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 IM 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
@@ -2554,7 +2597,7 @@ msgstr ""
 "den."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2727,62 +2770,77 @@ msgstr "Inga bilagor."
 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!"
 
-#: actions/finishremotesubscribe.php:80
+#. 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."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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!"
 
-#: actions/finishremotesubscribe.php:99
+#. 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."
 
-#: actions/finishremotesubscribe.php:110
+#. 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."
 
-#: actions/finishremotesubscribe.php:113
+#. 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."
 
-#: actions/finishremotesubscribe.php:118
+#. 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."
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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."
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Ingen sådan fil."
 
-#: actions/getfile.php:83
+#. 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."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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"
 
-#: actions/grantrole.php:75
+#. 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."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2792,37 +2850,47 @@ msgstr "Användaren har redan denna roll."
 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 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:76 actions/groupunblock.php:77
+#: 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."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "Ingen grupp angiven."
 
-#: actions/groupblock.php:91
+#. 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."
 
-#: actions/groupblock.php:95
+#. 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."
 
-#: actions/groupblock.php:100
+#. 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."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2834,51 +2902,63 @@ msgstr ""
 "kunna prenumerera på gruppen i framtiden."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: actions/groupblock.php:191
 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "Blockera denna användare från denna grupp"
 
-#: actions/groupblock.php:206
+#. 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."
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Ingen ID."
 
-#: actions/groupdesignsettings.php:68
+#. 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."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Gruppens utseende"
 
-#: actions/groupdesignsettings.php:155
+#. 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 ""
 "Anpassa hur din grupp ser ut genom att välja bakgrundbild och färgpalett."
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 msgid "Design preferences saved."
 msgstr "Utseendeinställningar sparade."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2887,106 +2967,115 @@ msgstr ""
 "s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Ladda upp"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Beskär"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Logtyp uppdaterad."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s gruppmedlemmar, sida %2$d"
 
-#: actions/groupmembers.php:122
+#. 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."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "Administratör"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Blockera"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Blockera denna användare"
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Gör till administratör"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: 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: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "Grupper"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "Grupper, sida %d"
 
-#: actions/groups.php:90
-#, php-format
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 "%%%%site.name%%%% grupper låter dig hitta och samtala med personer med "
 "liknande intressen. Efter att ha gått med i en grupp kan du skicka "
@@ -2994,11 +3083,13 @@ msgstr ""
 "inte någon grupp du gillar? Prova att [söka efter en](%%%%action.groupsearch%"
 "%%%) eller [starta din egen!](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -3008,25 +3099,31 @@ msgstr ""
 "beskrivning. Skilj söktermerna åt med mellanslag; de måste vara minst tre "
 "tecken långa."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Gruppsökning"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "Inga resultat."
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 "Om du inte kan hitta gruppen du söker efter kan du [skapa den](%%action."
 "newgroup%%) själv."
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3036,21 +3133,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Fel vid hävning av blockering."
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "Inställningar för snabbmeddelanden"
@@ -3059,113 +3156,121 @@ msgstr "Inställningar för snabbmeddelanden"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address 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 IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP 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 IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "Aktuell bekräftad Jabber/Gtalk-adress."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 ""
 "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 IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Inställningar för snabbmeddelanden"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Skicka notiser till mig genom Jabber/GTalk."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "Posta en notis när min Jabber/GTalk-status ändras."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, fuzzy
+msgid ""
+"Send me replies through Jabber/Google Talk 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 IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+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 IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Inställningar sparade."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 IM address that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "Kan inte normalisera detta Jabber-ID"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "Inte ett giltigt Jabber-ID"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "Jabber-ID:t tillhör redan en annan användare."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3175,74 +3280,79 @@ 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 IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "Detta är fel IM-adress."
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 #, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "Kunde inte ta bort bekräftelse för snabbmeddelanden."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "Bekräftelse för snabbmeddelanden avbruten."
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging 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."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 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:40
+#: 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:44
+#: 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:77
+#: 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:116
+#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "Inbjudningar skickade"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Bjud in nya användare"
 
@@ -3250,7 +3360,7 @@ 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:139
+#: 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:"
@@ -3258,7 +3368,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3267,7 +3377,7 @@ 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:153
+#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3282,7 +3392,7 @@ 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:167
+#: actions/invite.php:168
 #, fuzzy
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
@@ -3291,7 +3401,7 @@ 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:177
+#: 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!"
@@ -3300,7 +3410,7 @@ msgstr ""
 "registrerar sig. Tack för att du hjälper oss växa!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3308,27 +3418,28 @@ msgstr ""
 "denna tjänst."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:217
+#: 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:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: 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:227
+#: 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:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Skicka"
@@ -3336,7 +3447,7 @@ 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:263
+#: 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"
@@ -3346,7 +3457,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5251,7 +5362,7 @@ msgid "Application profile"
 msgstr "Applikationsprofil"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ikon"
 
@@ -6584,7 +6695,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:885
+#: actions/version.php:198 lib/action.php:898
 msgid "Version"
 msgstr "Version"
 
@@ -6712,7 +6823,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr "Inget databasnamn eller DSN funnen någonstans."
 
@@ -6979,214 +7090,214 @@ msgid "Other"
 msgstr "Övrigt"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Namnlös sida"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Visa mer"
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "Primär webbplatsnavigation"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Personlig profil och vänners tidslinje"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
 #. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
-#: lib/action.php:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Personligt"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "Konto"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: lib/action.php:560
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Anslut till tjänster"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "Anslut"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: lib/action.php:566
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Ändra webbplatskonfiguration"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration.
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Administratör"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: 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"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Bjud in"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: lib/action.php:582
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Logga ut från webbplatsen"
 
 #. TRANS: Main menu option when logged in to log out the current user.
-#: lib/action.php:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Logga ut"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Skapa ett konto"
 
 #. 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrera"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 msgctxt "TOOLTIP"
 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:586 lib/logingroupnav.php:77
+#: 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:589
+#: 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:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "Hjälp"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: lib/action.php:611
 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:620 lib/adminpanelaction.php:387
+#: 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:687
+#: 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:757
+#: 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:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "Sekundär webbplatsnavigation"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "Hjälp"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "Om"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "Frågor & svar"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "Användarvillkor"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "Sekretess"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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
+#: lib/action.php:902
 msgid "Contact"
 msgstr "Kontakt"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "Emblem"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "Programvarulicens för StatusNet"
 
@@ -7194,7 +7305,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7204,7 +7315,7 @@ msgstr ""
 "%%](%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** är en mikrobloggtjänst."
@@ -7213,7 +7324,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7225,51 +7336,51 @@ msgstr ""
 "fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "Tidigare"
 
@@ -7317,6 +7428,13 @@ msgstr ""
 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."
@@ -7521,7 +7639,7 @@ msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Ikon för denna applikation"
 
@@ -8132,12 +8250,12 @@ msgstr "Databasfel"
 
 #. 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "Ladda upp fil"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
@@ -8966,11 +9084,11 @@ msgstr "Skicka en notis"
 msgid "What's up, %s?"
 msgstr "Vad är på gång, %s?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "Bifoga"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "Bifoga en fil"
 
@@ -9164,6 +9282,13 @@ msgstr "Användar-ID"
 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:98
+msgid "Groups"
+msgstr "Grupper"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9585,6 +9710,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "Personal"
-#~ msgstr "Personligt"
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 01b0e56fc5..2098a0bf39 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:43+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:35:46+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 (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -77,7 +77,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -129,6 +129,9 @@ msgstr "అటువంటి పేజీ లేదు."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -146,7 +149,7 @@ msgstr "అటువంటి పేజీ లేదు."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -314,8 +317,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -335,13 +338,15 @@ msgstr "వాడుకరిని తాజాకరించలేకున
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -377,11 +382,12 @@ msgstr[1] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -391,7 +397,7 @@ msgstr "మీ రూపురేఖల అమరికలని భద్రప
 #. TRANS: Client error displayed when a database error occurs updating profile colours.
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 #, fuzzy
 msgid "Could not update your design."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
@@ -407,7 +413,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -805,9 +811,9 @@ msgstr "మీకు అధీకరణ లేదు."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -837,7 +843,7 @@ msgstr "అవతారాన్ని పెట్టడంలో పొరప
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -845,7 +851,7 @@ 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:335
+#: 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
@@ -911,7 +917,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1246,6 +1252,13 @@ msgstr "వాడుకరి దొరకలేదు."
 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
@@ -1284,6 +1297,13 @@ msgstr "ఇష్టాంశాలకు చేర్చు"
 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
@@ -1332,7 +1352,17 @@ msgstr "ఇష్టాంశాన్ని తొలగించలేకప
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1345,12 +1375,12 @@ msgstr "ఇష్టాంశాన్ని తొలగించలేకప
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1391,6 +1421,13 @@ msgstr "మీరు ఎవరికీ చందాచేరలేదు."
 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."
@@ -1423,12 +1460,15 @@ msgstr "అటువంటి జోడింపు లేదు."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "పేరు"
 
@@ -1460,7 +1500,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 #, fuzzy
 msgid "User without matching profile."
@@ -1470,7 +1510,7 @@ msgstr "వాడుకరికి ప్రొఫైలు లేదు."
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "అవతారపు అమరికలు"
 
@@ -1479,7 +1519,7 @@ msgstr "అవతారపు అమరికలు"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "అసలు"
 
@@ -1488,7 +1528,7 @@ msgstr "అసలు"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "మునుజూపు"
 
@@ -1524,7 +1564,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr ""
 
@@ -1589,7 +1629,8 @@ msgstr "మీరు ఇప్పటికే ఆ వాడుకరిని 
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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 "వాడుకరిని నిరోధించు"
 
@@ -1611,7 +1652,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "కాదు"
@@ -1629,7 +1670,7 @@ msgstr "ఈ వాడుకరిని నిరోధించకు"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "అవును"
@@ -1839,7 +1880,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:118
-#: lib/action.php:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1931,12 +1972,13 @@ 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.
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2094,13 +2136,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "నేపథ్యం"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2319,14 +2361,15 @@ 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:70 actions/newgroup.php:65
+#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 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:107 actions/grouplogo.php:112
+#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "గుంపుని మార్చడానికి మీరు నిర్వాహకులయి ఉండాలి."
 
@@ -2384,7 +2427,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2413,7 +2456,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2530,7 +2573,7 @@ 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 IM 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
@@ -2549,7 +2592,7 @@ msgstr ""
 "చూడండి."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2720,63 +2763,78 @@ msgstr "జోడింపులు లేవు."
 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 ""
 
-#: actions/finishremotesubscribe.php:80
+#. 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 ""
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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 "మీరు స్థానిక చందాని ఉపయోగించవచ్చు!"
 
-#: actions/finishremotesubscribe.php:99
+#. 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 "ఆ వాడుకరి మిమ్మల్ని చందాచేరకుండా నిరోధించారు."
 
-#: actions/finishremotesubscribe.php:110
+#. 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 "మీకు అధీకరణ లేదు."
 
-#: actions/finishremotesubscribe.php:113
+#. 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 ""
 
-#: actions/finishremotesubscribe.php:118
+#. 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 ""
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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 "దూరపు ప్రొపైలుని తాజాకరించటంలో పొరపాటు"
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "అటువంటి ఫైలు లేదు."
 
-#: actions/getfile.php:83
+#. TRANS: Client error displayed when requesting a file without having read access to it.
+#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "ఫైలుని చదవలేకపోతున్నాం."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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 ""
 
-#: actions/grantrole.php:75
+#. 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 "ఈ సైటులో మీరు వాడుకరలకి పాత్రలను ఇవ్వలేరు."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2787,38 +2845,48 @@ msgstr "వాడుకరికి ఇప్పటికే ఈ పాత్ర
 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 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:76 actions/groupunblock.php:77
+#: 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తో ఏ నోటీసూ కనబడలేదు."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "గుంపు ఏమీ పేర్కొనలేదు."
 
-#: actions/groupblock.php:91
+#. 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 "నిర్వాహకులు మాత్రమే గుంపు సభ్యులను నిరోధించగలరు."
 
-#: actions/groupblock.php:95
+#. 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 "వాడుకరిని ఇప్పటికే గుంపునుండి నిరోధించారు."
 
-#: actions/groupblock.php:100
+#. 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 "వాడుకరి ఈ గుంపులో సభ్యులు కాదు."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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 "వాడుకరిని గుంపు నుండి నిరోధించు"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2829,168 +2897,191 @@ msgstr ""
 "తొలగిస్తాం, ఇక భవిష్యత్తులో వారు గుంపులో ప్రచురించలేరు, మరియు గుంపుకి చందాచేరలేరు."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "ఈ గుంపునుండి ఈ వాడుకరిని నిరోధించు"
 
-#: actions/groupblock.php:206
+#. 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 "ఈ వాడుకరిని ఈ గుంపు నుండి నిరోధించకు"
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "ఐడీ లేదు."
 
-#: actions/groupdesignsettings.php:68
+#. 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 "గుంపుని మార్చడానికి మీరు ప్రవేశించి ఉండాలి."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "గుంపు అలంకారం"
 
-#: actions/groupdesignsettings.php:155
+#. 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 "నేపథ్య చిత్రం మరియు రంగుల ఎంపికతో మీ గుంపు ఎలా కనిపించాలో మలచుకోండి."
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 msgid "Design preferences saved."
 msgstr "ఈమెయిలు అభిరుచులు భద్రమయ్యాయి."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: 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:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "ఎగుమతించు"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "కత్తిరించు"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "చిహ్నాన్ని తాజాకరించాం."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%1$s గుంపు సభ్యులు, పేజీ %2$d"
 
-#: actions/groupmembers.php:122
+#. TRANS: Page notice for group members page.
+#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "ఈ గుంపులో వాడుకరులు జాబితా."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "నిర్వాహకులు"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "నిరోధించు"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "ఈ వాడుకరిని నిరోధించు"
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr ""
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "%2$sలో %1$s మరియు స్నేహితుల నుండి తాజాకరణలు!"
 
-#. TRANS: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "గుంపులు"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "గుంపులు, పేజీ %d"
 
-#: actions/groups.php:90
-#, php-format
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 "ఒకే రకమైన ఆసక్తులు ఉన్న వ్యక్తులు కలుసుకోడానికి మరియు మాట్లాడుకోడానికి %%%%site.name%%%% "
 "గుంపులు వీలుకల్పిస్తాయి. ఒక గుంపులో చేరిన తర్వాత మీరు \"!groupname\" అన్న సంకేతం ద్వారా ఆ "
 "గుంపు లోని సభ్యులందరికీ సందేశాలని పంపించవచ్చు. మీకు నచ్చిన గుంపు కనబడలేదా? [దాని కోసం వెతకండి](%%"
 "%%action.groupsearch%%%%) లేదా [మీరే కొత్తది సృష్టించండి!](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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 "కొత్త గుంపుని సృష్టించు"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -2999,24 +3090,30 @@ msgstr ""
 "%%site.name%%లో గుంపులను వాటి పేరు, ప్రాంతం, లేదా వివరణని బట్టి వెతకండి. అన్వేషించే పదాలను ఖాళీలతో "
 "వేరుచేయండి; ఒక్కో పదంలో 3 లేదా అంతకంటే ఎక్కువ అక్షరాలు ఉండాలి."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "గుంపుల అన్వేషణ"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "ఫలితాలేమీ లేవు."
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 "మీరు వెతుకున్న గుంపు మీకు కనబడకపోతే, మీరే [దాన్ని సృష్టించవచ్చు](%%action.newgroup%%)."
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3026,21 +3123,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "నిరోధాన్ని తొలగించడంలో పొరపాటు."
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "IM అమరికలు"
@@ -3051,107 +3148,110 @@ msgstr "IM అమరికలు"
 #: actions/imsettings.php:71
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM అందుబాటులో లేదు."
 
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "ప్రస్తుతం నిర్ధారించిన Jabber/GTalk చిరునామా"
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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 GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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 IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "IM అభిరుచులు"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+msgid "Send me notices through Jabber/Google Talk."
 msgstr ""
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr ""
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgid ""
+"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
 msgstr ""
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/GTalk address."
+msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "ప్రస్తుతం నిర్ధారించిన Jabber/GTalk చిరునామా"
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "అభిరుచులు భద్రమయ్యాయి."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
 #, fuzzy
-msgid "Cannot normalize that Jabber ID"
+msgid "Cannot normalize that Jabber ID."
 msgstr "సరైన Jabber ఐడీ కాదు"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "సరైన Jabber ఐడీ కాదు"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "Jabber ID ఇప్పటికే వేరొకరికి ఉంది."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3159,73 +3259,78 @@ msgid ""
 "s for sending messages to you."
 msgstr ""
 
-#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "ఆ IM చిరునామా సరైనది కాదు."
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 #, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "ఈమెయిల్ నిర్ధారణని తొలగించలేకున్నాం."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "IM నిర్ధారణ రద్దయింది."
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging address that is not
 #. TRANS: registered for the active user.
 #: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "ఇది మీ Jabber ID కాదు"
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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వ పేజీ"
 
-#: actions/inbox.php:62
+#. 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:115
 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:40
+#: 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:44
+#: 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:77
+#: actions/invite.php:78
 #, php-format
 msgid "Invalid email address: %s."
 msgstr "చెల్లని ఈమెయిలు చిరునామా: %s."
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:116
+#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "ఆహ్వానాలని పంపించాం"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "కొత్త వాడుకరులని ఆహ్వానించండి"
 
@@ -3233,7 +3338,7 @@ 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:139
+#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3242,7 +3347,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3251,7 +3356,7 @@ 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:153
+#: actions/invite.php:154
 #, fuzzy
 msgid "This person is already a user and you were automatically subscribed:"
 msgid_plural ""
@@ -3262,7 +3367,7 @@ 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:167
+#: actions/invite.php:168
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] "ఈ వ్యక్తికి ఆహ్వానాన్ని పంపించాం:"
@@ -3270,7 +3375,7 @@ msgstr[1] "ఈ వ్యక్తులకు ఆహ్వానాలని ప
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:177
+#: 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!"
@@ -3279,33 +3384,34 @@ msgstr ""
 "పెంచుతున్నందుకు ధన్యవాదాలు!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: 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:217
+#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "ఈమెయిలు చిరునామాలు"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: actions/invite.php:225
 msgid "Personal message"
 msgstr "వ్యక్తిగత సందేశం"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:227
+#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "ఐచ్ఛికంగా ఆహ్వానానికి వ్యక్తిగత సందేశం చేర్చండి."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "పంపించు"
@@ -3313,7 +3419,7 @@ 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:263
+#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%2$sలో చేరమని %1$s మిమ్మల్ని ఆహ్వానించారు"
@@ -3323,7 +3429,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5213,7 +5319,7 @@ msgid "Application profile"
 msgstr "ఉపకరణ ప్రవర"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "ప్రతీకం"
 
@@ -6515,7 +6621,7 @@ msgid "Plugins"
 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:898
 msgid "Version"
 msgstr "సంచిక"
 
@@ -6637,7 +6743,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6906,215 +7012,215 @@ msgid "Other"
 msgstr "ఇతర"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "శీర్షికలేని పేజీ"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "మరింత చూపించు"
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "ప్రాధమిక సైటు మార్గదర్శిని"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 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:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "వ్యక్తిగత"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "ఖాతా"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: lib/action.php:560
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "అనుసంధానాలు"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
-#: lib/action.php:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "అనుసంధానించు"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: 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:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "నిర్వాహకులు"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: lib/action.php:573
 #, 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:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "ఆహ్వానించు"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: 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:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "నిష్క్రమించు"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "నమోదు"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "ప్రవేశించు"
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: lib/action.php:602
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "సహాయం కావాలి!"
 
 #. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "సహాయం"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: 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:620 lib/adminpanelaction.php:387
+#: 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:687
+#: lib/action.php:700
 msgid "Local views"
 msgstr "స్థానిక వీక్షణలు"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:757
+#: lib/action.php:770
 msgid "Page notice"
 msgstr "పేజీ గమనిక"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "ద్వితీయ సైటు మార్గదర్శిని"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "సహాయం"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "గురించి"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "ప్రశ్నలు"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "సేవా నియమాలు"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "అంతరంగికత"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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:902
 msgid "Contact"
 msgstr "సంప్రదించు"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "బాడ్జి"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "స్టేటస్‌నెట్ మృదూపకరణ లైసెన్సు"
 
@@ -7122,7 +7228,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7132,7 +7238,7 @@ msgstr ""
 "అందిస్తున్న సూక్ష్మ బ్లాగింగు సేవ."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** అనేది మైక్రో బ్లాగింగు సదుపాయం."
@@ -7141,7 +7247,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7153,50 +7259,50 @@ msgstr ""
 "పై నడుస్తుంది."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "ఇంతక్రితం"
 
@@ -7244,6 +7350,13 @@ msgstr ""
 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."
@@ -7451,7 +7564,7 @@ msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "ఈ ఉపకరణానికి ప్రతీకం"
 
@@ -8036,12 +8149,12 @@ 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "ఫైలుని ఎక్కించు"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr "మీ వ్యక్తిగత నేపథ్యపు చిత్రాన్ని మీరు ఎక్కించవచ్చు. గరిష్ఠ ఫైలు పరిమాణం 2మెబై."
@@ -8854,11 +8967,11 @@ msgstr "సైటు గమనిక"
 msgid "What's up, %s?"
 msgstr "%s, ఏమిటి సంగతులు?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "జోడించు"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "ఒక ఫైలుని జోడించు"
 
@@ -9056,6 +9169,13 @@ msgstr "వాడుకరి ID"
 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:98
+msgid "Groups"
+msgstr "గుంపులు"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9476,6 +9596,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "Personal"
-#~ msgstr "వ్యక్తిగత"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 29326d5287..58e502c0b9 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:44+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:35:52+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 (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -80,7 +80,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -132,6 +132,9 @@ msgstr "Böyle bir sayfa yok."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -149,7 +152,7 @@ msgstr "Böyle bir sayfa yok."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -326,8 +329,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -347,13 +350,15 @@ msgstr "Kullanıcı güncellenemedi."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -389,11 +394,12 @@ msgstr[0] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -403,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Tasarımınız güncellenemedi."
 
@@ -417,7 +423,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -807,9 +813,9 @@ msgstr "İstek belirteci zaten yetkili."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -838,7 +844,7 @@ msgstr "oauth_token_association eklerken veritabanı hatası."
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -846,7 +852,7 @@ 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:335
+#: 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
@@ -920,7 +926,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1255,6 +1261,13 @@ msgstr "Onay kodu bulunamadı."
 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
@@ -1293,6 +1306,13 @@ msgstr "Favorilere ekle"
 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
@@ -1341,7 +1361,17 @@ msgstr "Favori silinemedi."
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1354,12 +1384,12 @@ msgstr "Favori silinemedi."
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1401,6 +1431,13 @@ msgstr "Bize o profili yollamadınız"
 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."
@@ -1433,12 +1470,15 @@ msgstr "Böyle bir durum mesajı yok."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Takma ad yok"
 
@@ -1471,7 +1511,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 #, fuzzy
 msgid "User without matching profile."
@@ -1481,7 +1521,7 @@ msgstr "Kullanıcının profili yok."
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Profil ayarları"
 
@@ -1490,7 +1530,7 @@ msgstr "Profil ayarları"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Orijinal"
 
@@ -1499,7 +1539,7 @@ msgstr "Orijinal"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Önizleme"
 
@@ -1536,7 +1576,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr ""
 
@@ -1600,7 +1640,8 @@ msgstr "Jabber ID başka bir kullanıcıya ait."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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"
 
@@ -1624,7 +1665,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Hayır"
@@ -1642,7 +1683,7 @@ msgstr "Bu kullanıcıyı engelleme"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Evet"
@@ -1851,7 +1892,7 @@ 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:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -1950,12 +1991,13 @@ msgstr "Bu kullanıcıyı sil"
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2115,13 +2157,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Arkaplan"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2336,14 +2378,15 @@ 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:70 actions/newgroup.php:65
+#: 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: 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:107 actions/grouplogo.php:112
+#: 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."
 
@@ -2401,7 +2444,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2430,7 +2473,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2550,7 +2593,7 @@ msgid "That email address already belongs to another user."
 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 IM 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
@@ -2569,7 +2612,7 @@ msgstr ""
 "mesaj yollanabilmesi için onaylamanız gerekmektedir."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2739,67 +2782,82 @@ msgstr "Ek yok."
 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!"
 
-#: actions/finishremotesubscribe.php:80
+#. 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 ""
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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!"
 
-#: actions/finishremotesubscribe.php:99
+#. 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 ""
 
-#: actions/finishremotesubscribe.php:110
+#. 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"
 
-#: actions/finishremotesubscribe.php:113
+#. 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 ""
 
-#: actions/finishremotesubscribe.php:118
+#. 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ü."
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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"
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Böyle bir dosya yok."
 
-#: actions/getfile.php:83
+#. 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."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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 ""
 
-#: actions/grantrole.php:75
+#. 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"
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2809,37 +2867,47 @@ msgstr "Kullanıcının profili yok."
 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 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:76 actions/groupunblock.php:77
+#: 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 ""
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "Hiçbir grup belirtilmedi."
 
-#: actions/groupblock.php:91
+#. 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."
 
-#: actions/groupblock.php:95
+#. 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ş."
 
-#: actions/groupblock.php:100
+#. 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."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2848,51 +2916,63 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: actions/groupblock.php:191
 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "Bu kullanıcıyı bu gruptan engelleyin"
 
-#: actions/groupblock.php:206
+#. 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 ""
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "JabberID yok."
 
-#: actions/groupdesignsettings.php:68
+#. 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."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Grup dizaynı"
 
-#: actions/groupdesignsettings.php:155
+#. 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 ""
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 #, fuzzy
 msgid "Design preferences saved."
 msgstr "Tercihler kaydedildi."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: actions/grouplogo.php:156
 #, fuzzy, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2900,115 +2980,126 @@ 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:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Yükle"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Kırp"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: 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:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr ""
 
-#: actions/groupmembers.php:122
+#. 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."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "Yönetici"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Engelle"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Bu kullanıcıyı engelle"
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Yönetici Yap"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: actions/grouprss.php:141
 #, fuzzy, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "%s adli kullanicinin durum mesajlari"
 
-#. TRANS: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "Gruplar"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
-msgstr ""
+msgstr "Bütün abonelikler"
 
-#: actions/groups.php:90
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -3018,23 +3109,29 @@ msgstr ""
 "yap. Anahtar kelimeleri boşluk ile ayırın. Anahtar kelime 3 veya daha fazla "
 "karakterden oluşmalı. "
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Grup arama"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "Sonuç yok."
 
-#: actions/groupsearch.php:82
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3042,21 +3139,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Engellemeyi kaldırırken hata."
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "Profil ayarları"
@@ -3065,114 +3162,120 @@ msgstr "Profil ayarları"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address 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 IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP 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 IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "Onaylanmış Jabber/Gtalk adresi."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 ""
 "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 IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Tercihler kaydedildi."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Durum mesajlarını Jabber/GTalk üzerinden gönder."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr ""
 "Jabber/GTalk durum mesajim değiştiğinde nedurum.com'da durumumu güncelle"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
 #, fuzzy
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+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 IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
 #, fuzzy
-msgid "Publish a MicroID for my Jabber/GTalk address."
+msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Onaylanmış Jabber/Gtalk adresi."
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Tercihler kaydedildi."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 IM address that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "Jabber işlemlerinde bir hata oluştu."
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "Geçersiz bir Jabber ID"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "Jabber ID başka bir kullanıcıya ait."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3182,75 +3285,80 @@ 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 IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "Yanlış IM adresi."
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 #, fuzzy
 msgid "Could not delete IM confirmation."
 msgstr "Eposta onayı silinemedi."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "Onay kodu yok."
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging address that is not
 #. TRANS: registered for the active user.
 #: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Bu sizin Jabber ID'niz değil."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 #, 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 ""
 
-#: actions/inbox.php:62
+#. 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:115
 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:40
+#: 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:44
+#: 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:77
+#: 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:116
+#: actions/invite.php:117
 #, fuzzy
 msgid "Invitations sent"
 msgstr "Davet(iyeler) gönderildi"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Yeni kullanıcıları davet et"
 
@@ -3258,7 +3366,7 @@ 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:139
+#: actions/invite.php:140
 #, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
@@ -3266,7 +3374,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, fuzzy, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3275,7 +3383,7 @@ 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:153
+#: 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:"
@@ -3284,48 +3392,48 @@ 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:167
+#: 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:177
+#: 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:190
+#: 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:217
+#: 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:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: 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:227
+#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Gönder"
@@ -3333,7 +3441,7 @@ 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:263
+#: 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"
@@ -3343,7 +3451,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5204,7 +5312,7 @@ 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:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Simge"
 
@@ -6500,7 +6608,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:885
+#: actions/version.php:198 lib/action.php:898
 msgid "Version"
 msgstr "Sürüm"
 
@@ -6624,7 +6732,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6891,77 +6999,77 @@ msgid "Other"
 msgstr "Diğer"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: 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:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr ""
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr ""
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: 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:540 lib/personalgroupnav.php:100
+#: 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:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "Hesap"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: 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:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "Bağlan"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: 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:556 lib/groupnav.php:117
+#: 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:560
+#: lib/action.php:573
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
@@ -6970,141 +7078,141 @@ msgstr ""
 "edin"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
-#: lib/action.php:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Davet et"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: 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:572
+#: lib/action.php:585
 #, fuzzy
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Çıkış"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: lib/action.php:590
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "Bir hesap oluştur"
 
 #. 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:580 lib/logingroupnav.php:85
+#: 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:583
+#: lib/action.php:596
 msgctxt "TOOLTIP"
 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Giriş"
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: 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:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "Yardım"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: lib/action.php:611
 msgctxt "MENU"
 msgid "Search"
 msgstr "Ara"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:620 lib/adminpanelaction.php:387
+#: lib/action.php:633 lib/adminpanelaction.php:387
 #, fuzzy
 msgid "Site notice"
 msgstr "Yeni durum mesajı"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:687
+#: lib/action.php:700
 msgid "Local views"
 msgstr ""
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:757
+#: 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:858
+#: lib/action.php:871
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "Abonelikler"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "Yardım"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "Hakkında"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "SSS"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "Gizlilik"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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
+#: lib/action.php:902
 msgid "Contact"
 msgstr "İletişim"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr ""
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "StatusNet yazılım lisansı"
 
@@ -7112,7 +7220,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:928
+#: lib/action.php:941
 #, fuzzy, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7122,7 +7230,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:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** bir aninda mesajlaşma sosyal ağıdır."
@@ -7131,7 +7239,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7143,50 +7251,50 @@ msgstr ""
 "microbloglama yazılımının %s. versiyonunu kullanmaktadır."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "Önce"
 
@@ -7234,6 +7342,13 @@ msgstr ""
 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."
@@ -7439,7 +7554,7 @@ msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Bu uygulama için simge"
 
@@ -8016,13 +8131,13 @@ 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:104
+#: lib/designsettings.php:108
 #, fuzzy
 msgid "Upload file"
 msgstr "Yükle"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
@@ -8758,11 +8873,11 @@ msgstr "Yeni durum mesajı"
 msgid "What's up, %s?"
 msgstr "N'aber %s?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr ""
 
@@ -8958,6 +9073,13 @@ msgstr ""
 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:98
+msgid "Groups"
+msgstr "Gruplar"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9388,6 +9510,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "Personal"
-#~ msgstr "Kişisel"
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 4ffe2ae0c6..ca6d3775c1 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:45+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:35: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-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -82,7 +82,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -134,6 +134,9 @@ msgstr "Немає такої сторінки."
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -151,7 +154,7 @@ msgstr "Немає такої сторінки."
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -324,8 +327,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -345,13 +348,15 @@ msgstr "Не вдалося оновити користувача."
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -393,11 +398,12 @@ msgstr[2] ""
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -407,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "Не вдалося оновити ваш дизайн."
 
@@ -421,7 +427,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -820,9 +826,9 @@ msgstr "Токен запиту вже авторизовано."
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -852,7 +858,7 @@ msgstr "Помилка бази даних при додаванні парам
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -860,7 +866,7 @@ 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:335
+#: 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
@@ -933,7 +939,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1273,6 +1279,13 @@ msgstr "Сторінку не знайдено."
 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
@@ -1306,6 +1319,13 @@ msgstr "Вже у списку обраних."
 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."
@@ -1348,7 +1368,17 @@ msgstr "Не вдається видалити допис з чужого спи
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1361,12 +1391,12 @@ msgstr "Не вдається видалити допис з чужого спи
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1405,6 +1435,13 @@ msgstr "Профіль %1$d не є підписаним до профілю %2$
 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."
@@ -1437,12 +1474,15 @@ msgstr "Такого вкладення немає."
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "Немає імені."
 
@@ -1474,7 +1514,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "Користувач без відповідного профілю."
@@ -1483,7 +1523,7 @@ msgstr "Користувач без відповідного профілю."
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "Налаштування аватари"
 
@@ -1492,7 +1532,7 @@ msgstr "Налаштування аватари"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "Оригінал"
 
@@ -1501,7 +1541,7 @@ msgstr "Оригінал"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "Перегляд"
 
@@ -1537,7 +1577,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "Дані вашого файлу загублено."
 
@@ -1608,7 +1648,8 @@ msgstr "Цього користувача вже заблоковано."
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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 "Блокувати користувача"
 
@@ -1631,7 +1672,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Ні"
@@ -1649,7 +1690,7 @@ msgstr "Не блокувати цього користувача"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Так"
@@ -1857,7 +1898,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:118
-#: lib/action.php:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Виникли певні проблеми з токеном поточної сесії."
 
@@ -1950,12 +1991,13 @@ 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.
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2110,13 +2152,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "Фон"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2327,14 +2369,15 @@ 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:70 actions/newgroup.php:65
+#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 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:107 actions/grouplogo.php:112
+#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr ""
 "Ви маєте бути наділені правами адміністратора, аби відредагувати властивості "
@@ -2394,7 +2437,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2423,7 +2466,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2538,7 +2581,7 @@ 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 IM 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
@@ -2556,7 +2599,7 @@ msgstr ""
 "подальші інструкції."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2725,62 +2768,77 @@ msgstr "Немає вкладень."
 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 "Ця відповідь не очікується!"
 
-#: actions/finishremotesubscribe.php:80
+#. 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 "Користувача, який слідкував за вашими повідомленнями, більше не існує."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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 "Ви можете користуватись локальними підписками!"
 
-#: actions/finishremotesubscribe.php:99
+#. 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 "Цей користувач позбавив вас можливості підписатись до нього."
 
-#: actions/finishremotesubscribe.php:110
+#. 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 "Не авторизовано."
 
-#: actions/finishremotesubscribe.php:113
+#. 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 "Не вдалося перетворити токени запиту на токени звернення."
 
-#: actions/finishremotesubscribe.php:118
+#. 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."
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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 "Помилка при оновленні віддаленого профілю."
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "Такого файлу немає."
 
-#: actions/getfile.php:83
+#. TRANS: Client error displayed when requesting a file without having read access to it.
+#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "Не можу прочитати файл."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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 "Цю роль вже зарезервовано і не може бути встановлено."
 
-#: actions/grantrole.php:75
+#. 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 "Ви не можете надавати користувачеві жодних ролей на цьому сайті."
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2790,37 +2848,47 @@ msgstr "Користувач вже має цю роль."
 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 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:76 actions/groupunblock.php:77
+#: 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."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "Спільноту не визначено."
 
-#: actions/groupblock.php:91
+#. 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 "Лише адміністратор спільноти має змогу блокувати користувачів."
 
-#: actions/groupblock.php:95
+#. 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 "Користувача заблоковано в цій спільноті."
 
-#: actions/groupblock.php:100
+#. 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 "Користувач не є учасником спільноти."
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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 "Блокувати користувача у цій спільноті"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2832,33 +2900,38 @@ msgstr ""
 "спільноти знов."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "Заблокувати користувача в спільноті"
 
-#: actions/groupblock.php:206
+#. 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 "Виникла помилка при блокуванні користувача в цій спільноті."
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Немає ID."
 
-#: actions/groupdesignsettings.php:68
+#. 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 ""
 "Ви маєте спочатку увійти, аби мати змогу відредагувати властивості спільноти."
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "Дизайн спільноти"
 
-#: actions/groupdesignsettings.php:155
+#. 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."
@@ -2866,19 +2939,26 @@ msgstr ""
 "Налаштуйте вигляд сторінки спільноти, використовуючи фонове зображення і "
 "кольори на свій смак."
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 msgid "Design preferences saved."
 msgstr "Преференції дизайну збережно."
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: actions/grouplogo.php:156
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
@@ -2887,106 +2967,115 @@ msgstr ""
 "розмір файлу становить %s."
 
 #. TRANS: Submit button for uploading a group logo.
-#: actions/grouplogo.php:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "Завантажити"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "Втяти"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "Логотип оновлено."
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "Учасники спільноти %1$s, сторінка %2$d"
 
-#: actions/groupmembers.php:122
+#. TRANS: Page notice for group members page.
+#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "Список учасників цієї спільноти."
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "Адмін"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "Блок"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "Блокувати користувача"
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "Зробити адміном"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "Оновлення членів %1$s на %2$s!"
 
-#. TRANS: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "Спільноти"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "Спільноти, сторінка %d"
 
-#: actions/groups.php:90
-#, php-format
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 "Спільноти на сайті %%%%site.name%%%% дозволять вам відшукати людей зі "
 "схожими інтересами. Лише приєднайтеся до спільноти і надсилайте повідомлення "
@@ -2994,11 +3083,13 @@ msgstr ""
 "повідомлення. Не бачите спільноту, яка вас цікавить? Спробуйте її [знайти](%%"
 "%%action.groupsearch%%%%) або [створіть власну!](%%%%action.newgroup%%%%)"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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 "Створити нову спільноту"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -3008,25 +3099,31 @@ msgstr ""
 "Відокремлюйте пошукові умови інтервалами; вони повинні складатись з 3 знаків "
 "або більше."
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "Пошук спільнот"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "Немає результатів."
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr ""
 "Якщо не можете відшукати спільноту, яка вас цікавить, то [створіть](%%action."
 "newgroup%%) власну."
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -3036,21 +3133,21 @@ 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:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Помилка при розблокуванні."
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "Налаштування ІМ"
@@ -3059,115 +3156,123 @@ msgstr "Налаштування ІМ"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 "Ви можете надсилати та отримувати дописи через Jabber/GTalk [службу миттєвих "
 "повідомлень](%%doc.im%%). Вкажить свою адресу і налаштуйте опції нижче."
 
-#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "ІМ недоступний"
 
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "Поточна підтверджена адреса Jabber/GTalk."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 до "
 "вашого списку контактів?)"
 
-#. TRANS: IM address input field instructions in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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."
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "Преференції ІМ"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "Повідомляти мене через Jabber/GTalk."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "Надсилати дописи на сайт, коли мій статус Jabber/GTalk змінюється."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, fuzzy
+msgid ""
+"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
 msgstr ""
 "Надсилати також мені відповіді через Jabber/GTalk від людей, до яких я не "
 "підписаний."
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Позначати міткою MicroID мою адресу Jabber/GTalk."
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "Преференції збережно."
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "Не можна полагодити цей Jabber ID"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "Це недійсний Jabber ID"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "Jabber ID вже належить іншому користувачу."
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3177,73 +3282,78 @@ msgstr ""
 "Код підтвердження був відправлений на адресу IM, яку ви зазначили. Ви "
 "повинні затвердити %s для відправлення вам повідомлень."
 
-#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "Це помилкова адреса IM."
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 msgid "Could not delete IM confirmation."
 msgstr "Не вдалося видалити підтвердження ІМ-адреси."
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "Підтвердження ІМ скасовано."
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging address that is not
 #. TRANS: registered for the active user.
 #: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "Це не ваш Jabber ID."
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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"
 
-#: actions/inbox.php:62
+#. 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:115
 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:40
+#: 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:44
+#: 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:77
+#: actions/invite.php:78
 #, php-format
 msgid "Invalid email address: %s."
 msgstr "Неправильна електронна адреса: %s."
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:116
+#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "Запрошення надіслано"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "Запросити нових користувачів"
 
@@ -3251,7 +3361,7 @@ 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:139
+#: actions/invite.php:140
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
 msgstr[0] "Ви вже підписані до цього користувача:"
@@ -3260,7 +3370,7 @@ 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3269,7 +3379,7 @@ 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:153
+#: 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:"
@@ -3283,7 +3393,7 @@ 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:167
+#: actions/invite.php:168
 msgid "Invitation sent to the following person:"
 msgid_plural "Invitations sent to the following people:"
 msgstr[0] "Запрошення було надіслано наступній особі:"
@@ -3292,7 +3402,7 @@ msgstr[2] "Запрошення були надіслані наступним 
 
 #. TRANS: Generic message displayed after sending out one or more invitations to
 #. TRANS: people to join a StatusNet site.
-#: actions/invite.php:177
+#: 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!"
@@ -3301,7 +3411,7 @@ msgstr ""
 "і зареєструються на сайті. Дякуємо, що сприяєте формуванню спільноти!"
 
 #. TRANS: Form instructions.
-#: actions/invite.php:190
+#: actions/invite.php:191
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
@@ -3309,28 +3419,29 @@ msgstr ""
 "сервісу."
 
 #. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:217
+#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "Електронні адреси"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: actions/invite.php:225
 msgid "Personal message"
 msgstr "Особисті повідомлення"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:227
+#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "Можна додати персональне повідомлення до запрошення (опціонально)."
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "Надіслати"
@@ -3338,7 +3449,7 @@ 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:263
+#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s запросив(ла) вас приєднатися до нього(неї) на %2$s"
@@ -3348,7 +3459,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5234,7 +5345,7 @@ msgid "Application profile"
 msgstr "Профіль додатку"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Іконка"
 
@@ -6566,7 +6677,7 @@ msgid "Plugins"
 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:898
 msgid "Version"
 msgstr "Версія"
 
@@ -6697,7 +6808,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr "Немає імені бази даних або DSN ніде не знайдено"
 
@@ -6964,214 +7075,214 @@ msgid "Other"
 msgstr "Інше"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "Сторінка без заголовку"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "Розгорнути"
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "Відправна навігація по сайту"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 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:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Стрічка"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "Акаунт"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: 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:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "З’єднання"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: 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:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "Адмін"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: lib/action.php:573
 #, 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:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Запросити"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: 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:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Вийти"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "Реєстрація"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "Увійти"
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: lib/action.php:602
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Допоможіть!"
 
 #. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "Довідка"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: 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:620 lib/adminpanelaction.php:387
+#: 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:687
+#: lib/action.php:700
 msgid "Local views"
 msgstr "Огляд"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:757
+#: lib/action.php:770
 msgid "Page notice"
 msgstr "Зауваження сторінки"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "Другорядна навігація по сайту"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "Допомога"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "Про"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "ЧаП"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "Умови"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "Приватність"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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:902
 msgid "Contact"
 msgstr "Контакт"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "Бедж"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "Ліцензія програмного забезпечення StatusNet"
 
@@ -7179,7 +7290,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7189,7 +7300,7 @@ msgstr ""
 "site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** — це сервіс мікроблоґів."
@@ -7198,7 +7309,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7210,51 +7321,51 @@ msgstr ""
 "License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "Назад"
 
@@ -7300,6 +7411,13 @@ msgstr "Віддалений профіль не є спільнотою!"
 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."
@@ -7502,7 +7620,7 @@ msgid "Failed to delete revoked token."
 msgstr "Не вдалося видалити скасований токен."
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "Іконка для цього додатку"
 
@@ -8122,12 +8240,12 @@ 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "Завантажити файл"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
@@ -8966,11 +9084,11 @@ msgstr "Надіслати допис"
 msgid "What's up, %s?"
 msgstr "Що нового, %s?"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "Вкласти"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "Вкласти файл"
 
@@ -9164,6 +9282,13 @@ msgstr "Ід. номер"
 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:98
+msgid "Groups"
+msgstr "Спільноти"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9601,6 +9726,3 @@ msgstr "Неправильний XML, корінь XRD відсутній."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Отримання резервної копії файлу «%s»."
-
-#~ msgid "Personal"
-#~ msgstr "Особисте"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 89fa1d9810..2b79d1dfe7 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:52:46+0000\n"
+"POT-Creation-Date: 2011-02-02 23:29+0000\n"
+"PO-Revision-Date: 2011-02-02 23:35: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-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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-01-29 22:24:50+0000\n"
+"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -83,7 +83,7 @@ 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 IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
 #. TRANS: Button text for saving "Other settings" in profile.
 #. TRANS: Button text to store form data in the Paths admin panel.
 #. TRANS: Button to save input in profile settings.
@@ -135,6 +135,9 @@ msgstr "没有这个页面。"
 #. TRANS: Client error displayed requesting most recent notices for a non-existing user.
 #. TRANS: Client error displayed trying to get an avatar for a non-existing user.
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
 #. 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.
@@ -152,7 +155,7 @@ msgstr "没有这个页面。"
 #: 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:40 actions/foaf.php:58 actions/hcard.php:67
+#: 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
@@ -323,8 +326,8 @@ msgstr ""
 #. 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 IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM 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.
@@ -344,13 +347,15 @@ msgstr "无法更新用户。"
 #. TRANS: Client error displayed if a user profile could not be found updating a profile image.
 #. TRANS: Client error displayed when requesting user information for a user without a profile.
 #. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:65 actions/hcard.php:74
+#: 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."
@@ -384,11 +389,12 @@ msgstr[0] "服务器当前的设置无法处理这么多的 POST 数据（%s byt
 #. TRANS: Client error displayed when saving design settings fails because of an empty result.
 #. 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:290 actions/groupdesignsettings.php:300
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
 #: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
 msgid "Unable to save your design settings."
@@ -398,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/groupdesignsettings.php:266 actions/userdesignsettings.php:179
+#: actions/userdesignsettings.php:179
 msgid "Could not update your design."
 msgstr "无法更新你的外观。"
 
@@ -412,7 +418,7 @@ 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:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
 #: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
 #: lib/atomusernoticefeed.php:68
 #, php-format
@@ -800,9 +806,9 @@ msgstr "请求 token 已被授权了。"
 #: 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:66 actions/grouplogo.php:324
+#: actions/groupblock.php:65 actions/grouplogo.php:321
 #: actions/groupunblock.php:65 actions/imsettings.php:224
-#: actions/invite.php:59 actions/login.php:137 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:138
 #: actions/othersettings.php:153 actions/passwordsettings.php:138
@@ -831,7 +837,7 @@ msgstr "插入 oauth_token_association 时数据库出错。"
 #. TRANS: Client error displayed submitting invalid form data for edit application.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Form validation error message when an unsupported argument is used.
-#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
 #. TRANS: Client error displayed when encountering an unexpected action on form submission.
 #. TRANS: Client error when submitting a form with unexpected information.
 #. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
@@ -839,7 +845,7 @@ 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:335
+#: 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
@@ -909,7 +915,7 @@ 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 IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging 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
@@ -1235,6 +1241,13 @@ msgstr "API方法没有找到。"
 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
@@ -1268,6 +1281,13 @@ msgstr "已经是一种收藏。"
 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."
@@ -1310,7 +1330,17 @@ msgstr "不能删除其他人的最爱。"
 #. TRANS: Client error when trying to delete a non-local group.
 #. TRANS: Client error when trying to delete a non-existing group.
 #. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
 #. TRANS: Client error displayed when trying to join a non-local group.
 #. TRANS: Client error displayed when trying to join a non-existing group.
@@ -1323,12 +1353,12 @@ msgstr "不能删除其他人的最爱。"
 #: 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:44 actions/foafgroup.php:62 actions/foafgroup.php:69
-#: actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:104
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
+#: 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
@@ -1367,6 +1397,13 @@ msgstr "配置文件 %1$d 不订阅配置文件 %2$d。"
 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."
@@ -1399,12 +1436,15 @@ msgstr "没有这个附件。"
 #. TRANS: Client error displayed trying to get an avatar without providing a nickname.
 #. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
 #. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
-#. TRANS: Client error displayed when trying to change group logo settings without having a nickname.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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:87 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:89 actions/showgroup.php:116
 msgid "No nickname."
 msgstr "没有昵称。"
 
@@ -1436,7 +1476,7 @@ 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.
 #: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:185 actions/remotesubscribe.php:190
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
 msgstr "用户没有相应个人信息。"
@@ -1445,7 +1485,7 @@ msgstr "用户没有相应个人信息。"
 #. 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:263
+#: actions/grouplogo.php:261
 msgid "Avatar settings"
 msgstr "头像设置"
 
@@ -1454,7 +1494,7 @@ msgstr "头像设置"
 #. 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:208 actions/grouplogo.php:272
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
 msgid "Original"
 msgstr "原始"
 
@@ -1463,7 +1503,7 @@ msgstr "原始"
 #. 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:220 actions/grouplogo.php:285
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
 msgid "Preview"
 msgstr "预览"
 
@@ -1499,7 +1539,7 @@ 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:394
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "文件数据丢失"
 
@@ -1565,7 +1605,8 @@ msgstr "你已经屏蔽该用户。"
 
 #. TRANS: Title for block user page.
 #. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. 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 "屏蔽用户。"
 
@@ -1587,7 +1628,7 @@ msgstr ""
 #. 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:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
 msgctxt "BUTTON"
 msgid "No"
 msgstr "否"
@@ -1605,7 +1646,7 @@ msgstr "不要屏蔽这个用户"
 #. 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:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "是"
@@ -1808,7 +1849,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:118
-#: lib/action.php:1409
+#: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "你的 session token 出现了问题。"
 
@@ -1899,12 +1940,13 @@ 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.
 #. 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 a change a subscription while 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:61 actions/groupunblock.php:60 actions/logout.php:69
+#: 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:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
@@ -2058,13 +2100,13 @@ 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:521 actions/designadminpanel.php:609
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
 #: lib/designsettings.php:183
 msgid "Background"
 msgstr "背景"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
-#: actions/designadminpanel.php:527
+#: actions/designadminpanel.php:531
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -2273,14 +2315,15 @@ 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:70 actions/newgroup.php:65
+#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
 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:107 actions/grouplogo.php:112
+#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
 msgid "You must be an admin to edit the group."
 msgstr "管理员才可以编辑小组。"
 
@@ -2338,7 +2381,7 @@ 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 IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging 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
@@ -2367,7 +2410,7 @@ 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 an Instant Messaging address in Instant Messaging 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
@@ -2481,7 +2524,7 @@ 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 IM 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
@@ -2498,7 +2541,7 @@ msgstr ""
 "用说明。"
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM 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
@@ -2663,62 +2706,77 @@ msgstr "没有附件。"
 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 "未预料的响应！"
 
-#: actions/finishremotesubscribe.php:80
+#. 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 "要查看的用户不存在。"
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:58
+#. 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 "你可以使用本地关注！"
 
-#: actions/finishremotesubscribe.php:99
+#. 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 "该用户屏蔽了你，无法关注。"
 
-#: actions/finishremotesubscribe.php:110
+#. 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 "你没有被授权。"
 
-#: actions/finishremotesubscribe.php:113
+#. 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。"
 
-#: actions/finishremotesubscribe.php:118
+#. 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 协议。"
 
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. 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 "更新远程的个人信息时出错。"
 
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
 msgid "No such file."
 msgstr "没有这个文件。"
 
-#: actions/getfile.php:83
+#. TRANS: Client error displayed when requesting a file without having read access to it.
+#: actions/getfile.php:82
 msgid "Cannot read file."
 msgstr "无法读取文件。"
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. 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 "此权限是保留的且不能被设置。"
 
-#: actions/grantrole.php:75
+#. 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 "你不能在这个网站授予用户权限。"
 
-#: actions/grantrole.php:82
+#. 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 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.
@@ -2728,37 +2786,47 @@ msgstr "用户已有此权限。"
 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 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:76 actions/groupunblock.php:77
+#: 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 没有用户。"
 
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. 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
 msgid "No group specified."
 msgstr "没有指定小组。"
 
-#: actions/groupblock.php:91
+#. 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 "只有管理员可以屏蔽小组成员。"
 
-#: actions/groupblock.php:95
+#. 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 "用户已经被小组屏蔽。"
 
-#: actions/groupblock.php:100
+#. 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 "用户不是小组成员。"
 
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. 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 "从小组中屏蔽用户"
 
-#: actions/groupblock.php:160
+#. 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 "
@@ -2769,167 +2837,190 @@ msgstr ""
 "内发布消息或关注该小组。"
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: 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:189
+#: actions/groupblock.php:198
 msgid "Block this user from this group"
 msgstr "在小组中屏蔽此用户。"
 
-#: actions/groupblock.php:206
+#. 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 "在小组中屏蔽用户时数据库发生错误。"
 
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
 msgid "No ID."
 msgstr "没有 ID。"
 
-#: actions/groupdesignsettings.php:68
+#. 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 "你必须登录才能创建小组。"
 
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
 msgid "Group design"
 msgstr "小组页面外观。"
 
-#: actions/groupdesignsettings.php:155
+#. 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 "通过背景图片和颜色板来自定义你的小组的外观。"
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:222
+#. 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:222
 msgid "Design preferences saved."
 msgstr "外观偏好已保存。"
 
 #. TRANS: Title for group logo settings page.
 #. TRANS: Group logo form legend.
-#: actions/grouplogo.php:145 actions/grouplogo.php:200
+#: 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:157
+#: 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:244
+#: actions/grouplogo.php:243
 msgid "Upload"
 msgstr "上传"
 
 #. TRANS: Button text for cropping an uploaded group logo.
-#: actions/grouplogo.php:301
+#: actions/grouplogo.php:299
 msgid "Crop"
 msgstr "剪裁"
 
 #. TRANS: Form instructions on the group logo page.
-#: actions/grouplogo.php:379
+#: 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:414
+#: actions/grouplogo.php:411
 msgid "Logo updated."
 msgstr "logo已更新。"
 
 #. TRANS: Form failure message after failing to update a group logo.
-#: actions/grouplogo.php:417
+#: 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:102
+#: 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:107
+#: actions/groupmembers.php:109
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%s 的小组成员，第%2$d页"
 
-#: actions/groupmembers.php:122
+#. TRANS: Page notice for group members page.
+#: actions/groupmembers.php:125
 msgid "A list of the users in this group."
 msgstr "该小组的成员列表。"
 
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
 msgid "Admin"
 msgstr "管理"
 
 #. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
 msgstr "屏蔽"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
 msgstr "屏蔽这个用户"
 
-#: actions/groupmembers.php:498
+#. 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:533
+#: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
 msgstr "设置管理员"
 
 #. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: 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:142
+#: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 msgstr "在%2$s上%1$s小组组员的更新！"
 
-#. TRANS: Label for user statistics.
-#. TRANS: H2 text for user group membership statistics.
-#: actions/groups.php:62 lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+#, fuzzy
+msgctxt "TITLE"
 msgid "Groups"
 msgstr "小组"
 
-#: actions/groups.php:64
-#, php-format
+#. 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"
 msgstr "小组，第 %d 页"
 
-#: actions/groups.php:90
-#, php-format
+#. 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 "
 "interests. After you join a group you can send messages to all other members "
 "using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
 msgstr ""
 "%%%%site.name%%%%的小组可以让你找到有相同兴趣的朋友一起交流。当你加入到一个小"
 "组后可以可以通过使用“!小组名称”发布消息给所有其他的小组成员。找不到感兴趣的小"
 "组？试一下[搜索小组](%%%%action.groupsearch%%%%)或[建立自己的小组](%%%%"
 "action.newgroup%%%%)！"
 
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
+#. 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 "新建一个小组"
 
-#: actions/groupsearch.php:52
+#. 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. "
@@ -2938,23 +3029,29 @@ msgstr ""
 "在%%site.name%%通过名称、地点或者描述搜索小组。请用空格将关键词分开，每个关键"
 "词至少3个字符。"
 
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
 msgid "Group search"
 msgstr "小组搜索"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. 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
 msgid "No results."
 msgstr "没有查询结果。"
 
-#: actions/groupsearch.php:82
-#, php-format
+#. 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 can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
 msgstr "如果你找不到你想要的小组，你可以自己 [创建它](%%action.newgroup%%) 。"
 
-#: actions/groupsearch.php:85
+#. 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](%%"
@@ -2964,21 +3061,21 @@ msgstr ""
 "%) ！"
 
 #. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:94
+#: 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:99
+#: 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.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "取消屏蔽时出错。"
 
-#. TRANS: Title for instance messaging settings.
+#. TRANS: Title for Instant Messaging settings.
 #: actions/imsettings.php:58
 msgid "IM settings"
 msgstr "IM 设置"
@@ -2987,111 +3084,119 @@ msgstr "IM 设置"
 #. 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
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 "你可以通过Jabber/GTalk [即时通讯工具](%%doc.im%%)发送和接收消息。在这里配置它"
 "们。"
 
-#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:90
 msgid "IM is not available."
 msgstr "IM 不可用。"
 
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
+#. 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:109
-msgid "Current confirmed Jabber/GTalk address."
+#, fuzzy
+msgid "Current confirmed Jabber/Google Talk address."
 msgstr "已确认的Jabber/GTalk帐号。"
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"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 为到你的好友了吗？）"
 
-#. TRANS: IM address input field instructions in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. 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
+#, fuzzy, php-format
 msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"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 加为好友。"
 
-#. TRANS: Form legend for IM preferences form.
+#. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
 msgid "IM preferences"
 msgstr "IM 首选项已保存。"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-msgid "Send me notices through Jabber/GTalk."
+#, fuzzy
+msgid "Send me notices through Jabber/Google Talk."
 msgstr "通过 Jabber/GTalk 发送通告。"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:165
-msgid "Post a notice when my Jabber/GTalk status changes."
+#, fuzzy
+msgid "Post a notice when my Jabber/Google Talk status changes."
 msgstr "当我的 Jabber/GTalk 状态改变时自动发布消息。"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:171
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+#, fuzzy
+msgid ""
+"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
 msgstr "将我没有关注的用户给我的回复通过 Jabber/GTalk 发送给我。"
 
-#. TRANS: Checkbox label in IM preferences form.
+#. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:178
-msgid "Publish a MicroID for my Jabber/GTalk address."
+#, fuzzy
+msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "公开 Jabber/GTalk 帐号的 MicroID。"
 
-#. TRANS: Confirmation message for successful IM preferences save.
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
 #: actions/imsettings.php:283 actions/othersettings.php:190
 msgid "Preferences saved."
 msgstr "首选项已保存。"
 
-#. TRANS: Message given saving IM address without having provided one.
+#. 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 that cannot be normalised.
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-msgid "Cannot normalize that Jabber ID"
+#, fuzzy
+msgid "Cannot normalize that Jabber ID."
 msgstr "无法识别此 Jabber ID"
 
-#. TRANS: Message given saving IM address that not valid.
+#. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-msgid "Not a valid Jabber ID"
+#, fuzzy
+msgid "Not a valid Jabber ID."
 msgstr "不是有效的 Jabber ID"
 
-#. TRANS: Message given saving IM address that is already set.
+#. 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 IM address that is already set for another user.
+#. 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."
 msgstr "Jabber ID 属于另一用户。"
 
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
+#. 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 ""
@@ -3099,72 +3204,77 @@ msgid ""
 "s for sending messages to you."
 msgstr "验证码已被发送到你新增的 IM 地址。你必须允许 %s 向你发送信息。"
 
-#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
 #: actions/imsettings.php:382
 msgid "That is the wrong IM address."
 msgstr "IM 地址错误。"
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:391
 msgid "Could not delete IM confirmation."
 msgstr "无法删除 IM 确认。"
 
-#. TRANS: Message given after successfully canceling IM address confirmation.
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
 #: actions/imsettings.php:396
 msgid "IM confirmation cancelled."
 msgstr "IM 确认已取消。"
 
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging address that is not
 #. TRANS: registered for the active user.
 #: actions/imsettings.php:417
 msgid "That is not your Jabber ID."
 msgstr "这不是你的 Jabber ID。"
 
-#. TRANS: Message given after successfully removing a registered IM address.
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
 #: actions/imsettings.php:440
 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页"
 
-#: actions/inbox.php:62
+#. 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:115
 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:40
+#: 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:44
+#: 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:77
+#: actions/invite.php:78
 #, php-format
 msgid "Invalid email address: %s."
 msgstr "无效的电子邮件地址：%s"
 
 #. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:116
+#: actions/invite.php:117
 msgid "Invitations sent"
 msgstr "邀请已发送"
 
 #. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
 msgid "Invite new users"
 msgstr "邀请新用户"
 
@@ -3172,14 +3282,14 @@ 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:139
+#: 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:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
 #, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
@@ -3188,7 +3298,7 @@ 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:153
+#: 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:"
@@ -3197,47 +3307,48 @@ 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:167
+#: 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:177
+#: 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:190
+#: 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:217
+#: actions/invite.php:218
 msgid "Email addresses"
 msgstr "电邮地址"
 
 #. TRANS: Tooltip for field label for a list of e-mail addresses.
-#: actions/invite.php:220
-msgid "Addresses of friends to invite (one per line)"
+#: 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:224
+#: actions/invite.php:225
 msgid "Personal message"
 msgstr "个人消息"
 
 #. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:227
+#: actions/invite.php:228
 msgid "Optionally add a personal message to the invitation."
 msgstr "在邀请中加几句话(可选)。"
 
 #. TRANS: Send button for inviting friends
-#: actions/invite.php:231
+#: actions/invite.php:232
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "发布"
@@ -3245,7 +3356,7 @@ 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:263
+#: actions/invite.php:264
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s 邀请你加入 %2$s"
@@ -3255,7 +3366,7 @@ 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:270
+#: actions/invite.php:271
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -5081,7 +5192,7 @@ msgid "Application profile"
 msgstr "未找到应用。"
 
 #. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "图标"
 
@@ -6368,7 +6479,7 @@ msgid "Plugins"
 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:898
 msgid "Version"
 msgstr "版本"
 
@@ -6487,7 +6598,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:537
+#: classes/Memcached_DataObject.php:541
 msgid "No database name or DSN found anywhere."
 msgstr "没有找到数据库名称或者 DSN。"
 
@@ -6749,214 +6860,214 @@ msgid "Other"
 msgstr "其他"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: 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:164
+#: lib/action.php:177
 msgid "Untitled page"
 msgstr "无标题页"
 
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
 msgctxt "TOOLTIP"
 msgid "Show more"
 msgstr "显示更多"
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
 msgid "Primary site navigation"
 msgstr "主站导航"
 
 #. TRANS: Tooltip for main menu option "Personal".
-#: lib/action.php:537
+#: lib/action.php:550
 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:540 lib/personalgroupnav.php:100
+#: lib/action.php:553 lib/personalgroupnav.php:100
 msgctxt "MENU"
 msgid "Personal"
 msgstr "个人"
 
 #. TRANS: Tooltip for main menu option "Account".
-#: lib/action.php:542
+#: 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:545
+#: lib/action.php:558
 msgid "Account"
 msgstr "帐号"
 
 #. TRANS: Tooltip for main menu option "Services".
-#: lib/action.php:547
+#: 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:550
+#: lib/action.php:563
 msgid "Connect"
 msgstr "关联"
 
 #. TRANS: Tooltip for menu option "Admin".
-#: lib/action.php:553
+#: 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:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
 msgstr "管理"
 
 #. TRANS: Tooltip for main menu option "Invite".
-#: lib/action.php:560
+#: lib/action.php:573
 #, 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:563
+#: lib/action.php:576
 msgctxt "MENU"
 msgid "Invite"
 msgstr "邀请"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: 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:572
+#: lib/action.php:585
 msgctxt "MENU"
 msgid "Logout"
 msgstr "登出"
 
 #. TRANS: Tooltip for main menu option "Register".
-#: lib/action.php:577
+#: 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:580 lib/logingroupnav.php:85
+#: lib/action.php:593 lib/logingroupnav.php:85
 msgctxt "MENU"
 msgid "Register"
 msgstr "注册"
 
 #. TRANS: Tooltip for main menu option "Login".
-#: lib/action.php:583
+#: lib/action.php:596
 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:586 lib/logingroupnav.php:77
+#: lib/action.php:599 lib/logingroupnav.php:77
 msgctxt "MENU"
 msgid "Login"
 msgstr "登录"
 
 #. TRANS: Tooltip for main menu option "Help".
-#: lib/action.php:589
+#: lib/action.php:602
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "帮助我！"
 
 #. TRANS: Main menu option for help on the StatusNet site.
-#: lib/action.php:592
+#: lib/action.php:605
 msgctxt "MENU"
 msgid "Help"
 msgstr "帮助"
 
 #. TRANS: Tooltip for main menu option "Search".
-#: lib/action.php:595
+#: 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:598
+#: 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:620 lib/adminpanelaction.php:387
+#: 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:687
+#: lib/action.php:700
 msgid "Local views"
 msgstr "本地显示"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:757
+#: lib/action.php:770
 msgid "Page notice"
 msgstr "页面消息"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:858
+#: lib/action.php:871
 msgid "Secondary site navigation"
 msgstr "副站导航"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:877
 msgid "Help"
 msgstr "帮助"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:880
 msgid "About"
 msgstr "关于"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:883
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:888
 msgid "TOS"
 msgstr "条款"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:892
 msgid "Privacy"
 msgstr "隐私"
 
 #. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:895
 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:902
 msgid "Contact"
 msgstr "联系"
 
 #. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:905
 msgid "Badge"
 msgstr "挂件"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:934
 msgid "StatusNet software license"
 msgstr "StatusNet 软件许可证"
 
@@ -6964,7 +7075,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:928
+#: lib/action.php:941
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -6974,7 +7085,7 @@ msgstr ""
 "broughtbyurl%%)。"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** 是一个微博客服务。"
@@ -6983,7 +7094,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:938
+#: lib/action.php:951
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -6994,50 +7105,50 @@ msgstr ""
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)授权。"
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:967
 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:961
+#: lib/action.php:974
 #, 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:968
+#: lib/action.php:981
 #, 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:972
+#: lib/action.php:985
 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:1004
+#: lib/action.php:1017
 #, 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:1340
+#: lib/action.php:1353
 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:1351
+#: lib/action.php:1364
 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:1361
+#: lib/action.php:1374
 msgid "Before"
 msgstr "之前"
 
@@ -7082,6 +7193,13 @@ msgstr "远程配置文件不是一个组 ！"
 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."
@@ -7281,7 +7399,7 @@ msgid "Failed to delete revoked token."
 msgstr "删除取消的 token 失败。"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
 msgid "Icon for this application"
 msgstr "该应用的图标"
 
@@ -7879,12 +7997,12 @@ 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:104
+#: lib/designsettings.php:108
 msgid "Upload file"
 msgstr "上传文件"
 
 #. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr "你可以上传你的个人页面背景。文件最大 2MB。"
@@ -8692,11 +8810,11 @@ msgstr "发送一个通知"
 msgid "What's up, %s?"
 msgstr "%s，最近怎么样？"
 
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
 msgid "Attach"
 msgstr "附件"
 
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
 msgid "Attach a file"
 msgstr "添加一个文件附件"
 
@@ -8888,6 +9006,13 @@ msgstr "用户 ID"
 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:98
+msgid "Groups"
+msgstr "小组"
+
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 #: lib/profileaction.php:253
@@ -9297,6 +9422,3 @@ msgstr "不合法的XML, 缺少XRD根"
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "从文件'%s'获取备份。"
-
-#~ msgid "Personal"
-#~ msgstr "我的主页"
diff --git a/plugins/GroupFavorited/locale/ca/LC_MESSAGES/GroupFavorited.po b/plugins/GroupFavorited/locale/ca/LC_MESSAGES/GroupFavorited.po
new file mode 100644
index 0000000000..1082980fa1
--- /dev/null
+++ b/plugins/GroupFavorited/locale/ca/LC_MESSAGES/GroupFavorited.po
@@ -0,0 +1,55 @@
+# Translation of StatusNet - GroupFavorited to Catalan (Català)
+# Exported from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+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"
+"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-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."
diff --git a/plugins/Mapstraction/locale/te/LC_MESSAGES/Mapstraction.po b/plugins/Mapstraction/locale/te/LC_MESSAGES/Mapstraction.po
index 65a3c17d77..c5e7433f4f 100644
--- a/plugins/Mapstraction/locale/te/LC_MESSAGES/Mapstraction.po
+++ b/plugins/Mapstraction/locale/te/LC_MESSAGES/Mapstraction.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - Mapstraction to Telugu (తెలుగు)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Veeven
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Mapstraction\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:14+0000\n"
+"POT-Creation-Date: 2011-02-02 23:30+0000\n"
+"PO-Revision-Date: 2011-02-02 23:37:12+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:40:37+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-mapstraction\n"
@@ -49,7 +49,7 @@ msgstr ""
 #: allmap.php:69
 #, php-format
 msgid "%s friends map"
-msgstr ""
+msgstr "%s మిత్రుల పటం"
 
 #. TRANS: Page title.
 #. TRANS: %1$s is a user nickname, %2$d is a page number.
@@ -61,4 +61,4 @@ msgstr ""
 #: usermap.php:68
 #, php-format
 msgid "%s map, page %d"
-msgstr ""
+msgstr "%s పటం, పుట %d"
diff --git a/plugins/MobileProfile/locale/bg/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/bg/LC_MESSAGES/MobileProfile.po
index a31c39b9d2..7fd5b6bffc 100644
--- a/plugins/MobileProfile/locale/bg/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/bg/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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:26+0000\n"
+"POT-Creation-Date: 2011-02-02 23:31+0000\n"
+"PO-Revision-Date: 2011-02-02 23:37:19+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-20 20:16:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: bg\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
@@ -65,11 +65,11 @@ msgstr "Влизане"
 msgid "Search"
 msgstr "Търсене"
 
-#: MobileProfilePlugin.php:361
+#: MobileProfilePlugin.php:362
 msgid "Attach"
 msgstr "Прикачване"
 
-#: MobileProfilePlugin.php:365
+#: MobileProfilePlugin.php:366
 msgid "Attach a file"
 msgstr "Прикачване на файл"
 
diff --git a/plugins/MobileProfile/locale/br/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/br/LC_MESSAGES/MobileProfile.po
index de2cb46fee..d5fa690272 100644
--- a/plugins/MobileProfile/locale/br/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/br/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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:26+0000\n"
+"POT-Creation-Date: 2011-02-02 23:31+0000\n"
+"PO-Revision-Date: 2011-02-02 23:37: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-20 20:16:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
@@ -65,11 +65,11 @@ msgstr "Kevreañ"
 msgid "Search"
 msgstr "Klask"
 
-#: MobileProfilePlugin.php:361
+#: MobileProfilePlugin.php:362
 msgid "Attach"
 msgstr "Stagañ"
 
-#: MobileProfilePlugin.php:365
+#: MobileProfilePlugin.php:366
 msgid "Attach a file"
 msgstr "Stagañ ur restr"
 
diff --git a/plugins/MobileProfile/locale/ce/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ce/LC_MESSAGES/MobileProfile.po
index 5edafeeb64..04fdea35fb 100644
--- a/plugins/MobileProfile/locale/ce/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/ce/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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:26+0000\n"
+"POT-Creation-Date: 2011-02-02 23:31+0000\n"
+"PO-Revision-Date: 2011-02-02 23:37:19+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-20 20:16:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ce\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
@@ -65,11 +65,11 @@ msgstr "Вовзийта хьой"
 msgid "Search"
 msgstr "Лаха"
 
-#: MobileProfilePlugin.php:361
+#: MobileProfilePlugin.php:362
 msgid "Attach"
 msgstr "Тlечlагlде"
 
-#: MobileProfilePlugin.php:365
+#: MobileProfilePlugin.php:366
 msgid "Attach a file"
 msgstr "Тlечlагlйе хlума"
 
diff --git a/plugins/MobileProfile/locale/fr/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/fr/LC_MESSAGES/MobileProfile.po
index dd5e522a4b..c286fabe01 100644
--- a/plugins/MobileProfile/locale/fr/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/fr/LC_MESSAGES/MobileProfile.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:26+0000\n"
+"POT-Creation-Date: 2011-02-02 23:31+0000\n"
+"PO-Revision-Date: 2011-02-02 23:37: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-20 20:16:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
@@ -67,11 +67,11 @@ msgstr "Connexion"
 msgid "Search"
 msgstr "Rechercher"
 
-#: MobileProfilePlugin.php:361
+#: MobileProfilePlugin.php:362
 msgid "Attach"
 msgstr "Joindre"
 
-#: MobileProfilePlugin.php:365
+#: MobileProfilePlugin.php:366
 msgid "Attach a file"
 msgstr "Joindre un fichier"
 
diff --git a/plugins/MobileProfile/locale/gl/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/gl/LC_MESSAGES/MobileProfile.po
index 254e2bf0a4..f59acbbe14 100644
--- a/plugins/MobileProfile/locale/gl/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/gl/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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:26+0000\n"
+"POT-Creation-Date: 2011-02-02 23:31+0000\n"
+"PO-Revision-Date: 2011-02-02 23:37: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-20 20:16:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
@@ -65,11 +65,11 @@ msgstr "Rexistro"
 msgid "Search"
 msgstr "Procurar"
 
-#: MobileProfilePlugin.php:361
+#: MobileProfilePlugin.php:362
 msgid "Attach"
 msgstr "Anexar"
 
-#: MobileProfilePlugin.php:365
+#: MobileProfilePlugin.php:366
 msgid "Attach a file"
 msgstr "Anexar un ficheiro"
 
diff --git a/plugins/MobileProfile/locale/ia/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ia/LC_MESSAGES/MobileProfile.po
index dfe4fd352a..2ea0a3a45b 100644
--- a/plugins/MobileProfile/locale/ia/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/ia/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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:26+0000\n"
+"POT-Creation-Date: 2011-02-02 23:31+0000\n"
+"PO-Revision-Date: 2011-02-02 23:37: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-20 20:16:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
@@ -65,11 +65,11 @@ msgstr "Aperir session"
 msgid "Search"
 msgstr "Cercar"
 
-#: MobileProfilePlugin.php:361
+#: MobileProfilePlugin.php:362
 msgid "Attach"
 msgstr "Annexar"
 
-#: MobileProfilePlugin.php:365
+#: MobileProfilePlugin.php:366
 msgid "Attach a file"
 msgstr "Annexar un file"
 
diff --git a/plugins/MobileProfile/locale/mk/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/mk/LC_MESSAGES/MobileProfile.po
index f395533e79..6e225a62ea 100644
--- a/plugins/MobileProfile/locale/mk/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/mk/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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:26+0000\n"
+"POT-Creation-Date: 2011-02-02 23:31+0000\n"
+"PO-Revision-Date: 2011-02-02 23:37: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-20 20:16:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
@@ -65,11 +65,11 @@ msgstr "Најава"
 msgid "Search"
 msgstr "Пребарај"
 
-#: MobileProfilePlugin.php:361
+#: MobileProfilePlugin.php:362
 msgid "Attach"
 msgstr "Приложи"
 
-#: MobileProfilePlugin.php:365
+#: MobileProfilePlugin.php:366
 msgid "Attach a file"
 msgstr "Приложи податотека"
 
diff --git a/plugins/MobileProfile/locale/nb/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/nb/LC_MESSAGES/MobileProfile.po
index 715b62221c..498b2704e2 100644
--- a/plugins/MobileProfile/locale/nb/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/nb/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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:26+0000\n"
+"POT-Creation-Date: 2011-02-02 23:31+0000\n"
+"PO-Revision-Date: 2011-02-02 23:37: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-20 20:16:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
@@ -65,11 +65,11 @@ msgstr "Logg inn"
 msgid "Search"
 msgstr "Søk"
 
-#: MobileProfilePlugin.php:361
+#: MobileProfilePlugin.php:362
 msgid "Attach"
 msgstr "Legg ved"
 
-#: MobileProfilePlugin.php:365
+#: MobileProfilePlugin.php:366
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
diff --git a/plugins/MobileProfile/locale/nl/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/nl/LC_MESSAGES/MobileProfile.po
index 2928fa4ed4..ba2ec506a1 100644
--- a/plugins/MobileProfile/locale/nl/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/nl/LC_MESSAGES/MobileProfile.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:26+0000\n"
+"POT-Creation-Date: 2011-02-02 23:31+0000\n"
+"PO-Revision-Date: 2011-02-02 23:37: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-20 20:16:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
@@ -66,11 +66,11 @@ msgstr "Aanmelden"
 msgid "Search"
 msgstr "Zoeken"
 
-#: MobileProfilePlugin.php:361
+#: MobileProfilePlugin.php:362
 msgid "Attach"
 msgstr "Toevoegen"
 
-#: MobileProfilePlugin.php:365
+#: MobileProfilePlugin.php:366
 msgid "Attach a file"
 msgstr "Bestand toevoegen"
 
diff --git a/plugins/MobileProfile/locale/ru/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ru/LC_MESSAGES/MobileProfile.po
index 4a8f5696a0..a61f14ad63 100644
--- a/plugins/MobileProfile/locale/ru/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/ru/LC_MESSAGES/MobileProfile.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:26+0000\n"
+"POT-Creation-Date: 2011-02-02 23:31+0000\n"
+"PO-Revision-Date: 2011-02-02 23:37: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-20 20:16:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
@@ -67,11 +67,11 @@ msgstr "Представиться"
 msgid "Search"
 msgstr "Поиск"
 
-#: MobileProfilePlugin.php:361
+#: MobileProfilePlugin.php:362
 msgid "Attach"
 msgstr "Прикрепить"
 
-#: MobileProfilePlugin.php:365
+#: MobileProfilePlugin.php:366
 msgid "Attach a file"
 msgstr "Прикрепить файл"
 
diff --git a/plugins/MobileProfile/locale/ta/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ta/LC_MESSAGES/MobileProfile.po
index 7855a3b056..0a9e22a493 100644
--- a/plugins/MobileProfile/locale/ta/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/ta/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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:26+0000\n"
+"POT-Creation-Date: 2011-02-02 23:31+0000\n"
+"PO-Revision-Date: 2011-02-02 23:37:20+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-20 20:16:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ta\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
@@ -65,11 +65,11 @@ msgstr "புகுபதிகை"
 msgid "Search"
 msgstr "தேடுக"
 
-#: MobileProfilePlugin.php:361
+#: MobileProfilePlugin.php:362
 msgid "Attach"
 msgstr "இணை"
 
-#: MobileProfilePlugin.php:365
+#: MobileProfilePlugin.php:366
 msgid "Attach a file"
 msgstr "ஒரு கோப்பை இணைக்கவும்"
 
diff --git a/plugins/MobileProfile/locale/te/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/te/LC_MESSAGES/MobileProfile.po
index 87a93b2dff..7c6c643d89 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:26+0000\n"
+"POT-Creation-Date: 2011-02-02 23:31+0000\n"
+"PO-Revision-Date: 2011-02-02 23:37:20+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-20 20:16:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
@@ -65,11 +65,11 @@ msgstr "ప్రవేశించండి"
 msgid "Search"
 msgstr "వెతుకు"
 
-#: MobileProfilePlugin.php:361
+#: MobileProfilePlugin.php:362
 msgid "Attach"
 msgstr ""
 
-#: MobileProfilePlugin.php:365
+#: MobileProfilePlugin.php:366
 msgid "Attach a file"
 msgstr ""
 
diff --git a/plugins/MobileProfile/locale/tl/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/tl/LC_MESSAGES/MobileProfile.po
index 378142cb2d..400bed9a55 100644
--- a/plugins/MobileProfile/locale/tl/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/tl/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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:26+0000\n"
+"POT-Creation-Date: 2011-02-02 23:31+0000\n"
+"PO-Revision-Date: 2011-02-02 23: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-20 20:16:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tl\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
@@ -65,11 +65,11 @@ msgstr "Lumagda"
 msgid "Search"
 msgstr "Humanap"
 
-#: MobileProfilePlugin.php:361
+#: MobileProfilePlugin.php:362
 msgid "Attach"
 msgstr "Ilakip"
 
-#: MobileProfilePlugin.php:365
+#: MobileProfilePlugin.php:366
 msgid "Attach a file"
 msgstr "Maglakip ng isang talaksan"
 
diff --git a/plugins/MobileProfile/locale/uk/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/uk/LC_MESSAGES/MobileProfile.po
index 11b7c5a33c..087b1f7966 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:26+0000\n"
+"POT-Creation-Date: 2011-02-02 23:31+0000\n"
+"PO-Revision-Date: 2011-02-02 23: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-20 20:16:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
@@ -66,11 +66,11 @@ msgstr "Увійти"
 msgid "Search"
 msgstr "Пошук"
 
-#: MobileProfilePlugin.php:361
+#: MobileProfilePlugin.php:362
 msgid "Attach"
 msgstr "Вкласти"
 
-#: MobileProfilePlugin.php:365
+#: MobileProfilePlugin.php:366
 msgid "Attach a file"
 msgstr "Вкласти файл"
 
diff --git a/plugins/MobileProfile/locale/zh_CN/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/zh_CN/LC_MESSAGES/MobileProfile.po
index 4c093bccbe..4ecc461062 100644
--- a/plugins/MobileProfile/locale/zh_CN/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/zh_CN/LC_MESSAGES/MobileProfile.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\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-02-02 23:31+0000\n"
+"PO-Revision-Date: 2011-02-02 23: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-20 20:16:14+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
@@ -66,11 +66,11 @@ msgstr "登录"
 msgid "Search"
 msgstr "搜索"
 
-#: MobileProfilePlugin.php:361
+#: MobileProfilePlugin.php:362
 msgid "Attach"
 msgstr "附件"
 
-#: MobileProfilePlugin.php:365
+#: MobileProfilePlugin.php:366
 msgid "Attach a file"
 msgstr "添加一个文件附件"
 
diff --git a/plugins/NewMenu/locale/te/LC_MESSAGES/NewMenu.po b/plugins/NewMenu/locale/te/LC_MESSAGES/NewMenu.po
new file mode 100644
index 0000000000..fe7ede2ff7
--- /dev/null
+++ b/plugins/NewMenu/locale/te/LC_MESSAGES/NewMenu.po
@@ -0,0 +1,98 @@
+# Translation of StatusNet - NewMenu 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 - 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"
+"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-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/OStatus/locale/OStatus.pot b/plugins/OStatus/locale/OStatus.pot
index 7c64aba30c..4c6208d262 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-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-02-02 23:30+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"
@@ -672,41 +672,50 @@ msgid "Subscribe"
 msgstr ""
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:118
+#: 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:119
+#: actions/ostatusinit.php:124
 msgid "Nickname of the user you want to follow."
 msgstr ""
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:124
+#: actions/ostatusinit.php:129
 msgid "Profile Account"
 msgstr ""
 
 #. TRANS: Tooltip for field label "Profile Account".
-#: actions/ostatusinit.php:126
+#: actions/ostatusinit.php:131
 msgid "Your account id (e.g. user@identi.ca)."
 msgstr ""
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:148
+#: actions/ostatusinit.php:153
 msgid "Must provide a remote profile."
 msgstr ""
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:160
+#: actions/ostatusinit.php:165
 msgid "Couldn't look up OStatus account profile."
 msgstr ""
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:173
+#: actions/ostatusinit.php:178
 msgid "Couldn't confirm remote profile address."
 msgstr ""
 
 #. TRANS: Page title.
-#: actions/ostatusinit.php:218
+#: actions/ostatusinit.php:223
 msgid "OStatus Connect"
 msgstr ""
 
diff --git a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
index 71d9a514d7..98cbb31248 100644
--- a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
@@ -10,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:54:03+0000\n"
+"POT-Creation-Date: 2011-02-02 23:30+0000\n"
+"PO-Revision-Date: 2011-02-02 23:37: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-29 22:28:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-30 23:08:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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"
@@ -728,41 +728,52 @@ msgid "Subscribe"
 msgstr "S’abonner"
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:118
+#: actions/ostatusinit.php:119
+#, fuzzy
+msgid "Group nickname"
+msgstr "Pseudonyme de l’utilisateur"
+
+#: actions/ostatusinit.php:120
+#, fuzzy
+msgid "Nickname of the group you want to join."
+msgstr "Pseudonyme de l’utilisateur que vous voulez suivre."
+
+#. TRANS: Field label.
+#: actions/ostatusinit.php:123
 msgid "User nickname"
 msgstr "Pseudonyme de l’utilisateur"
 
-#: actions/ostatusinit.php:119
+#: 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:124
+#: actions/ostatusinit.php:129
 msgid "Profile Account"
 msgstr "Compte de profil"
 
 #. TRANS: Tooltip for field label "Profile Account".
-#: actions/ostatusinit.php:126
+#: 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:148
+#: actions/ostatusinit.php:153
 msgid "Must provide a remote profile."
 msgstr "Vous devez fournir un profil distant."
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:160
+#: 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:173
+#: 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:218
+#: actions/ostatusinit.php:223
 msgid "OStatus Connect"
 msgstr "Connexion OStatus"
 
diff --git a/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po
index c2217033f6..cbb803a5d6 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:54:04+0000\n"
+"POT-Creation-Date: 2011-02-02 23:30+0000\n"
+"PO-Revision-Date: 2011-02-02 23:37: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-01-29 22:28:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-30 23:08:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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"
@@ -701,41 +701,52 @@ msgid "Subscribe"
 msgstr "Subscriber"
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:118
+#: actions/ostatusinit.php:119
+#, fuzzy
+msgid "Group nickname"
+msgstr "Pseudonymo del usator"
+
+#: actions/ostatusinit.php:120
+#, fuzzy
+msgid "Nickname of the group you want to join."
+msgstr "Le pseudonymo del usator que tu vole sequer."
+
+#. TRANS: Field label.
+#: actions/ostatusinit.php:123
 msgid "User nickname"
 msgstr "Pseudonymo del usator"
 
-#: actions/ostatusinit.php:119
+#: 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:124
+#: actions/ostatusinit.php:129
 msgid "Profile Account"
 msgstr "Conto de profilo"
 
 #. TRANS: Tooltip for field label "Profile Account".
-#: actions/ostatusinit.php:126
+#: 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:148
+#: actions/ostatusinit.php:153
 msgid "Must provide a remote profile."
 msgstr "Debe fornir un profilo remote."
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:160
+#: 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:173
+#: 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:218
+#: actions/ostatusinit.php:223
 msgid "OStatus Connect"
 msgstr "Connexion OStatus"
 
diff --git a/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po
index 6ac2c956f8..0a65f67f2c 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:54:06+0000\n"
+"POT-Creation-Date: 2011-02-02 23:30+0000\n"
+"PO-Revision-Date: 2011-02-02 23:37: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-01-29 22:28:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-30 23:08:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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"
@@ -704,41 +704,52 @@ msgid "Subscribe"
 msgstr "Претплати се"
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:118
+#: actions/ostatusinit.php:119
+#, fuzzy
+msgid "Group nickname"
+msgstr "Прекар на корисникот"
+
+#: actions/ostatusinit.php:120
+#, fuzzy
+msgid "Nickname of the group you want to join."
+msgstr "Прекарот на корисникот што сакате да го следите."
+
+#. TRANS: Field label.
+#: actions/ostatusinit.php:123
 msgid "User nickname"
 msgstr "Прекар на корисникот"
 
-#: actions/ostatusinit.php:119
+#: actions/ostatusinit.php:124
 msgid "Nickname of the user you want to follow."
 msgstr "Прекарот на корисникот што сакате да го следите."
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:124
+#: actions/ostatusinit.php:129
 msgid "Profile Account"
 msgstr "Профилна сметка"
 
 #. TRANS: Tooltip for field label "Profile Account".
-#: actions/ostatusinit.php:126
+#: actions/ostatusinit.php:131
 msgid "Your account id (e.g. user@identi.ca)."
 msgstr "Вашата назнака (ID) на сметката (на пр. korisnik@identi.ca)."
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:148
+#: actions/ostatusinit.php:153
 msgid "Must provide a remote profile."
 msgstr "Мора да наведете далечински профил."
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:160
+#: actions/ostatusinit.php:165
 msgid "Couldn't look up OStatus account profile."
 msgstr "Не можев да го проверам профилот на OStatus-сметката."
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:173
+#: actions/ostatusinit.php:178
 msgid "Couldn't confirm remote profile address."
 msgstr "Не можев да ја потврдам адресата на далечинскиот профил."
 
 #. TRANS: Page title.
-#: actions/ostatusinit.php:218
+#: actions/ostatusinit.php:223
 msgid "OStatus Connect"
 msgstr "OStatus - Поврзување"
 
diff --git a/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po
index 546598e437..0f87ee4108 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:54:06+0000\n"
+"POT-Creation-Date: 2011-02-02 23:30+0000\n"
+"PO-Revision-Date: 2011-02-02 23:37: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-01-29 22:28:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-30 23:08:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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"
@@ -732,42 +732,53 @@ msgid "Subscribe"
 msgstr "Abonneren"
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:118
+#: actions/ostatusinit.php:119
+#, fuzzy
+msgid "Group nickname"
+msgstr "Gebruikersnaam"
+
+#: actions/ostatusinit.php:120
+#, fuzzy
+msgid "Nickname of the group you want to join."
+msgstr "Gebruikersnaam van de gebruiker waarop u wilt abonneren."
+
+#. TRANS: Field label.
+#: actions/ostatusinit.php:123
 msgid "User nickname"
 msgstr "Gebruikersnaam"
 
-#: actions/ostatusinit.php:119
+#: 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:124
+#: actions/ostatusinit.php:129
 msgid "Profile Account"
 msgstr "Gebruikersprofiel"
 
 #. TRANS: Tooltip for field label "Profile Account".
-#: actions/ostatusinit.php:126
+#: 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:148
+#: 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:160
+#: 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:173
+#: 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:218
+#: actions/ostatusinit.php:223
 msgid "OStatus Connect"
 msgstr "OStatuskoppeling"
 
diff --git a/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po
index 104d357396..75939d51ee 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-01-30 22:50+0000\n"
-"PO-Revision-Date: 2011-01-30 22:54:06+0000\n"
+"POT-Creation-Date: 2011-02-02 23:30+0000\n"
+"PO-Revision-Date: 2011-02-02 23:37: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-29 22:28:11+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81224); Translate extension (2010-09-17)\n"
+"X-POT-Import-Date: 2011-01-30 23:08:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r81409); 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"
@@ -715,41 +715,52 @@ msgid "Subscribe"
 msgstr "Підписатись"
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:118
+#: actions/ostatusinit.php:119
+#, fuzzy
+msgid "Group nickname"
+msgstr "Ім’я користувача"
+
+#: actions/ostatusinit.php:120
+#, fuzzy
+msgid "Nickname of the group you want to join."
+msgstr "Ім’я користувача, дописи якого ви хотіли б читати."
+
+#. TRANS: Field label.
+#: actions/ostatusinit.php:123
 msgid "User nickname"
 msgstr "Ім’я користувача"
 
-#: actions/ostatusinit.php:119
+#: actions/ostatusinit.php:124
 msgid "Nickname of the user you want to follow."
 msgstr "Ім’я користувача, дописи якого ви хотіли б читати."
 
 #. TRANS: Field label.
-#: actions/ostatusinit.php:124
+#: actions/ostatusinit.php:129
 msgid "Profile Account"
 msgstr "Профіль акаунту"
 
 #. TRANS: Tooltip for field label "Profile Account".
-#: actions/ostatusinit.php:126
+#: actions/ostatusinit.php:131
 msgid "Your account id (e.g. user@identi.ca)."
 msgstr "Ідентифікатор вашого акаунту (щось на зразок user@identi.ca)"
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:148
+#: actions/ostatusinit.php:153
 msgid "Must provide a remote profile."
 msgstr "Мусите зазначити віддалений профіль."
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:160
+#: actions/ostatusinit.php:165
 msgid "Couldn't look up OStatus account profile."
 msgstr "Не вдалося знайти профіль акаунту за протоколом OStatus."
 
 #. TRANS: Client error.
-#: actions/ostatusinit.php:173
+#: actions/ostatusinit.php:178
 msgid "Couldn't confirm remote profile address."
 msgstr "Не вдалося підтвердити адресу віддаленого профілю."
 
 #. TRANS: Page title.
-#: actions/ostatusinit.php:218
+#: actions/ostatusinit.php:223
 msgid "OStatus Connect"
 msgstr "З’єднання OStatus"
 
diff --git a/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/ca/LC_MESSAGES/OpenID.po
index 1ea7edd37b..15b871e35e 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:50:40+0000\n"
+"POT-Creation-Date: 2011-02-02 23:31+0000\n"
+"PO-Revision-Date: 2011-02-02 23:37:37+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-22 19:30:33+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -94,14 +94,15 @@ msgstr ""
 #: openidsettings.php:232 finishopenidlogin.php:42 openidlogin.php:51
 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 ""
+msgstr "No es poden afegir proveïdors nous."
 
 #: openidsettings.php:252
 msgid "Something weird happened."
-msgstr ""
+msgstr "Ha passat quelcom estrany."
 
 #: openidsettings.php:276
 msgid "No such OpenID trustroot."
@@ -113,11 +114,11 @@ msgstr ""
 
 #: openidsettings.php:303
 msgid "No such OpenID."
-msgstr ""
+msgstr "No existeix l'OpenID."
 
 #: openidsettings.php:308
 msgid "That OpenID does not belong to you."
-msgstr ""
+msgstr "Aquest OpenID no us pertany."
 
 #: openidsettings.php:312
 msgid "OpenID removed."
@@ -137,7 +138,7 @@ msgstr ""
 
 #: openidadminpanel.php:210
 msgid "Trusted provider"
-msgstr ""
+msgstr "Proveïdor de confiança"
 
 #: openidadminpanel.php:212
 msgid ""
@@ -145,10 +146,13 @@ msgid ""
 "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 ""
+msgstr "URL del proveïdor"
 
 #: openidadminpanel.php:221
 msgid ""
@@ -168,7 +172,7 @@ msgstr ""
 
 #: openidadminpanel.php:238
 msgid "Required team"
-msgstr ""
+msgstr "Equip necessari"
 
 #: openidadminpanel.php:239
 msgid "Only allow logins from users in the given team (Launchpad extension)."
@@ -190,7 +194,7 @@ msgstr ""
 
 #: openidadminpanel.php:278
 msgid "Save OpenID settings"
-msgstr ""
+msgstr "Desa els paràmetres de l'OpenID"
 
 #. TRANS: OpenID plugin server error.
 #: openid.php:138
@@ -200,21 +204,21 @@ msgstr ""
 #. TRANS: OpenID plugin message. Given when an OpenID is not valid.
 #: openid.php:150
 msgid "Not a valid OpenID."
-msgstr ""
+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 ""
+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 ""
+msgstr "No es pot redirigir al servidor: %s"
 
 #. TRANS: OpenID plugin user instructions.
 #: openid.php:244
@@ -222,31 +226,34 @@ 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 ""
+msgstr "Error en desar el perfil."
 
 #. TRANS: OpenID plugin server error.
 #: openid.php:292
 msgid "Error saving the user."
-msgstr ""
+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 ""
+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 ""
+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
@@ -254,18 +261,20 @@ 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."
 
 #. TRANS: Tooltip for main menu option "Login"
 #: OpenIDPlugin.php:218
 msgctxt "TOOLTIP"
 msgid "Login to the site"
-msgstr ""
+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 ""
+msgstr "Inicia una sessió"
 
 #. TRANS: Tooltip for main menu option "Help"
 #: OpenIDPlugin.php:226
@@ -283,7 +292,7 @@ msgstr "Ajuda"
 #: OpenIDPlugin.php:235
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
-msgstr ""
+msgstr "Cerca gent o un text"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private
 #: OpenIDPlugin.php:238
@@ -420,7 +429,7 @@ 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 ""
+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
@@ -432,7 +441,7 @@ 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 ""
+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
@@ -448,7 +457,7 @@ 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 ""
+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.
@@ -456,12 +465,14 @@ msgstr ""
 #: finishopenidlogin.php:241 finishaddopenid.php:95
 #, php-format
 msgid "OpenID authentication failed: %s"
-msgstr ""
+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 ""
+"S'ha interromput l'autenticació OpenD: no teniu permisos per iniciar una "
+"sessió en aquest lloc."
 
 #. 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.

From 59f47349853fbd20ce74fbb2d6cb8f4b30e53f6f Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 2 Feb 2011 16:38:01 -0800
Subject: [PATCH 169/314] Edit page placeholder, link on main profile to
 details

---
 .../ExtendedProfile/ExtendedProfilePlugin.php | 10 ++++++
 .../ExtendedProfile/extendedprofilewidget.php | 34 +++++++++++++++++--
 .../ExtendedProfile/profiledetailaction.php   |  2 +-
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/plugins/ExtendedProfile/ExtendedProfilePlugin.php b/plugins/ExtendedProfile/ExtendedProfilePlugin.php
index 36c8eaa232..c981a7e2fb 100644
--- a/plugins/ExtendedProfile/ExtendedProfilePlugin.php
+++ b/plugins/ExtendedProfile/ExtendedProfilePlugin.php
@@ -95,4 +95,14 @@ class ExtendedProfilePlugin extends Plugin
         $widget->showMenuItem('profiledetailsettings',_m('Details'),$title);
         return true;
     }
+
+    function onEndProfilePageProfileElements(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;
+    }
+
 }
diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/extendedprofilewidget.php
index 2ec99b1992..bf9b4056cd 100644
--- a/plugins/ExtendedProfile/extendedprofilewidget.php
+++ b/plugins/ExtendedProfile/extendedprofilewidget.php
@@ -63,10 +63,40 @@ class ExtendedProfileWidget extends Widget
         $this->out->element('th', null, $field['label']);
 
         $this->out->elementStart('td');
-        // @fixme field value
-        $this->out->text($name);
+        if ($this->editable) {
+            $this->showEditableField($name, $field);
+        } else {
+            $this->showFieldValue($name, $field);
+        }
         $this->out->elementEnd('td');
 
         $this->out->elementEnd('tr');
     }
+
+    protected function showFieldValue($name, $field)
+    {
+        $this->out->text($name);
+    }
+
+    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");
+        }
+    }
 }
diff --git a/plugins/ExtendedProfile/profiledetailaction.php b/plugins/ExtendedProfile/profiledetailaction.php
index 8c907eec2a..a4bb12956e 100644
--- a/plugins/ExtendedProfile/profiledetailaction.php
+++ b/plugins/ExtendedProfile/profiledetailaction.php
@@ -65,7 +65,7 @@ class ProfileDetailAction extends ProfileAction
             $this->elementEnd('div');
         }
 
-        $widget = new ExtendedProfileWidget($this, $this->profile, ExtendedProfileWidget::EDITABLE);
+        $widget = new ExtendedProfileWidget($this, $this->profile);
         $widget->show();
     }
 }

From d1a96dc7afe487b4adf757b75f7060ff767609ad Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 2 Feb 2011 17:29:34 -0800
Subject: [PATCH 170/314] work in progress: prepping for storage of extended
 profile details

---
 plugins/ExtendedProfile/Profile_detail.php  | 16 ++++++++++++++++
 plugins/ExtendedProfile/extendedprofile.php | 19 +++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 plugins/ExtendedProfile/Profile_detail.php

diff --git a/plugins/ExtendedProfile/Profile_detail.php b/plugins/ExtendedProfile/Profile_detail.php
new file mode 100644
index 0000000000..ae8cdcee50
--- /dev/null
+++ b/plugins/ExtendedProfile/Profile_detail.php
@@ -0,0 +1,16 @@
+<?php
+/* 
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+class Profile_detail extends Memcached_DataObject
+{
+    public $id;
+    public $profile_id;
+    public $field;
+    public $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
+
+}
\ No newline at end of file
diff --git a/plugins/ExtendedProfile/extendedprofile.php b/plugins/ExtendedProfile/extendedprofile.php
index 18fef20331..7f69f90899 100644
--- a/plugins/ExtendedProfile/extendedprofile.php
+++ b/plugins/ExtendedProfile/extendedprofile.php
@@ -23,6 +23,25 @@ if (!defined('STATUSNET')) {
 
 class ExtendedProfile
 {
+    function __construct(Profile $profile)
+    {
+        $this->profile = $profile;
+        $this->sections = $this->getSections();
+        $this->fields = $this->loadFields();
+    }
+
+    function loadFields()
+    {
+        $detail = new Profile_detail();
+        $detail->profile_id = $this->profile->id;
+        $detail->find();
+        
+        while ($detail->get()) {
+            $fields[$detail->field][] = clone($detail);
+        }
+        return $fields;
+    }
+
     function getSections()
     {
         return array(

From f06e661a9bd2cde41c9974896bb5f819469dad14 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 10:36:25 -0500
Subject: [PATCH 171/314] new methods for paths to plugin static files

---
 README          | 17 +++++++++++++++++
 lib/default.php |  3 +++
 lib/plugin.php  | 43 +++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/README b/README
index d972bf5676..b71d21aba5 100644
--- a/README
+++ b/README
@@ -1572,6 +1572,23 @@ proxy_user: Username to use for authenticating to the HTTP proxy. Default null.
 proxy_password: Password to use for authenticating to the HTTP proxy. Default null.
 proxy_auth_scheme: Scheme to use for authenticating to the HTTP proxy. Default null.
 
+plugins
+-------
+
+default: associative array mapping plugin name to array of arguments. To disable
+	 a default plugin, unset its value in this array.
+locale_path: path for finding plugin locale files. In the plugin's directory
+	     by default.
+server: Server to find static files for a plugin when the page is plain old HTTP.
+	Defaults to site/server (same as pages). Use this to move plugin CSS and
+	JS files to a CDN.
+sslserver: Server to find static files for a plugin when the page is HTTPS. Defaults
+	   to site/server (same as pages). Use this to move plugin CSS and JS files
+	   to a CDN.
+path: Path to the plugin files. defaults to site/path + '/plugins/'. Expects that
+      each plugin will have a subdirectory at plugins/NameOfPlugin. Change this
+      if you're using a CDN.
+
 Plugins
 =======
 
diff --git a/lib/default.php b/lib/default.php
index 2ddc47bd17..7d8b1fec7a 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -314,6 +314,9 @@ $default =
                                  'RSSCloud' => null,
                                  'OpenID' => null),
               'locale_path' => false, // Set to a path to use *instead of* each plugin's own locale subdirectories
+              'server' => null,
+              'sslserver' => null,
+              'path' => null,
               ),
         'admin' =>
         array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license')),
diff --git a/lib/plugin.php b/lib/plugin.php
index 3f84afa27e..1ca5deb5c5 100644
--- a/lib/plugin.php
+++ b/lib/plugin.php
@@ -110,11 +110,16 @@ class Plugin
     {
         $this->log(LOG_DEBUG, $msg);
     }
+    
+    function name()
+    {
+        $cls = get_class($this);
+        return mb_substr($cls, 0, -6);
+    }
 
     function onPluginVersion(&$versions)
     {
-        $cls = get_class($this);
-        $name = mb_substr($cls, 0, -6);
+        $name = $this->name();
 
         $versions[] = array('name' => $name,
                             // TRANS: Displayed as version information for a plugin if no version information was found.
@@ -122,4 +127,38 @@ class Plugin
 
         return true;
     }
+
+    function path($relative)
+    {
+        return self::staticPath($this->name(), $relative);
+    }
+
+    static function staticPath($plugin, $relative)
+    {
+        $isHTTPS = StatusNet::isHTTPS();
+
+        if ($isHTTPS) {
+            $server = common_config('plugins', 'sslserver');
+        } else {
+            $server = common_config('plugins', 'server');
+        }
+
+        if (is_null($server)) {
+            if ($isHTTPS) {
+                $server = common_config('site', 'sslserver');
+            } else {
+                $server = common_config('site', 'server');
+            }
+        }
+
+        $path = common_config('plugins', 'path');
+
+        if (is_null($path)) {
+            $path = common_config('site', 'path') . '/plugins/';
+        }
+
+        $protocol = ($isHTTPS) ? 'https' : 'http';
+
+        return $protocol.'://'.$server.$path.$plugin.'/'.$relative;
+    }
 }

From 52c3c4468d6088d5328b0014b65df9ec8ca1ce46 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 10:46:56 -0500
Subject: [PATCH 172/314] BlankAd uses plugins server

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

diff --git a/plugins/BlankAd/BlankAdPlugin.php b/plugins/BlankAd/BlankAdPlugin.php
index 49243aeea9..9128e7bcdb 100644
--- a/plugins/BlankAd/BlankAdPlugin.php
+++ b/plugins/BlankAd/BlankAdPlugin.php
@@ -65,7 +65,7 @@ class BlankAdPlugin extends UAPPlugin
         $action->element('img',
                          array('width' => 300,
                                'height' => 250,
-                               'src' => common_path('plugins/BlankAd/redpixel.png')),
+                               'src' => $this->path('redpixel.png')),
                          '');
     }
 
@@ -81,7 +81,7 @@ class BlankAdPlugin extends UAPPlugin
         $action->element('img',
                          array('width' => 180,
                                'height' => 150,
-                               'src' => common_path('plugins/BlankAd/redpixel.png')),
+                               'src' => $this->path('redpixel.png')),
                          '');
     }
 
@@ -97,7 +97,7 @@ class BlankAdPlugin extends UAPPlugin
         $action->element('img',
                          array('width' => 160,
                                'height' => 600,
-                               'src' => common_path('plugins/BlankAd/redpixel.png')),
+                               'src' => $this->path('redpixel.png')),
                          '');
     }
 
@@ -113,7 +113,7 @@ class BlankAdPlugin extends UAPPlugin
         $action->element('img',
                          array('width' => 728,
                                'height' => 90,
-                               'src' => common_path('plugins/BlankAd/redpixel.png')),
+                               'src' => $this->path('redpixel.png')),
                          '');
     }
 

From 429cbb66b4f1d1b8ffd0bed6a75fcd6e2ce2d553 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 10:50:11 -0500
Subject: [PATCH 173/314] Mapstraction plugin uses Plugin::path()

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

diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php
index 020c0818ad..13c5e22057 100644
--- a/plugins/Mapstraction/MapstractionPlugin.php
+++ b/plugins/Mapstraction/MapstractionPlugin.php
@@ -129,7 +129,7 @@ class MapstractionPlugin extends Plugin
             break;
         case 'openlayers':
             // Use our included stripped & minified OpenLayers.
-            $action->script(common_path('plugins/Mapstraction/OpenLayers/OpenLayers.js'));
+            $action->script($this->path('OpenLayers/OpenLayers.js'));
             break;
         case 'yahoo':
             $action->script(sprintf('http://api.maps.yahoo.com/ajaxymap?v=3.8&appid=%s',
@@ -145,13 +145,13 @@ class MapstractionPlugin extends Plugin
             //
             // Note that OpenLayers.js needs to be separate, or it won't
             // be able to find its UI images and styles.
-            $action->script(common_path('plugins/Mapstraction/usermap-mxn-openlayers.min.js'));
+            $action->script($this->path('usermap-mxn-openlayers.min.js'));
         } else {
             $action->script(sprintf('%s?(%s)',
-                                    common_path('plugins/Mapstraction/js/mxn.js'),
+                                    $this->path('js/mxn.js'),
                                     $this->provider));
 
-            $action->script(common_path('plugins/Mapstraction/usermap.js'));
+            $action->script($this->path('usermap.js'));
         }
 
         $action->inlineScript(sprintf('var _provider = "%s";', $this->provider));

From 0a6d2d24b13436933bbda75290d9c5108c1fb367 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 10:51:59 -0500
Subject: [PATCH 174/314] MeteorPlugin uses Plugin::path()

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

diff --git a/plugins/Meteor/MeteorPlugin.php b/plugins/Meteor/MeteorPlugin.php
index 1bdccae7a8..6e93e364f7 100644
--- a/plugins/Meteor/MeteorPlugin.php
+++ b/plugins/Meteor/MeteorPlugin.php
@@ -89,7 +89,7 @@ class MeteorPlugin extends RealtimePlugin
     {
         $scripts = parent::_getScripts();
         $scripts[] = 'http://'.$this->webserver.(($this->webport == 80) ? '':':'.$this->webport).'/meteor.js';
-        $scripts[] = common_path('plugins/Meteor/meteorupdater.min.js');
+        $scripts[] = $this->path('meteorupdater.min.js');
         return $scripts;
     }
 

From 26407c3e35a328879816f56f3b722b1b1c3b5d8a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 10:58:06 -0500
Subject: [PATCH 175/314] Realtime plugin uses Plugin::path()

---
 plugins/Realtime/RealtimePlugin.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 113187e1e3..5d119982f5 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -116,8 +116,9 @@ class RealtimePlugin extends Plugin
 
     function onEndShowStatusNetStyles($action)
     {
-        $action->cssLink('plugins/Realtime/realtimeupdate.css',
-                         null, 'screen, projection, tv');
+        $action->cssLink($this->path('realtimeupdate.css'),
+                         null,
+                         'screen, projection, tv');
         return true;
     }
 
@@ -322,7 +323,7 @@ class RealtimePlugin extends Plugin
 
     function _getScripts()
     {
-        return array('plugins/Realtime/realtimeupdate.min.js');
+        return array($this->path('realtimeupdate.min.js'));
     }
 
     /**

From c8386c7ecb9f77f1a4eb606b6ae0c43c9337a86a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 11:03:24 -0500
Subject: [PATCH 176/314] TwitterBridge uses Plugin::staticPath()

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

diff --git a/plugins/TwitterBridge/twitterlogin.php b/plugins/TwitterBridge/twitterlogin.php
index 5b5bfae191..062c781f77 100644
--- a/plugins/TwitterBridge/twitterlogin.php
+++ b/plugins/TwitterBridge/twitterlogin.php
@@ -83,7 +83,7 @@ class TwitterloginAction extends Action
         $this->elementStart('a', array('href' => common_local_url('twitterauthorization',
                                                                   null,
                                                                   array('signin' => true))));
-        $this->element('img', array('src' => common_path('plugins/TwitterBridge/Sign-in-with-Twitter-lighter.png'),
+        $this->element('img', array('src' => Plugin::staticPath('TwitterBridge', 'Sign-in-with-Twitter-lighter.png'),
                                     'alt' => _m('Sign in with Twitter')));
         $this->elementEnd('a');
     }

From 22e8893fbaccc31294e3916e141d0d83fc54df90 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 11:09:26 -0500
Subject: [PATCH 177/314] OStatus uses Plugin::path()

---
 plugins/OStatus/OStatusPlugin.php           | 4 ++--
 plugins/OStatus/classes/Ostatus_profile.php | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index 59c18746f0..8e6e2d2891 100644
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -419,12 +419,12 @@ class OStatusPlugin extends Plugin
     }
 
     function onEndShowStatusNetStyles($action) {
-        $action->cssLink('plugins/OStatus/theme/base/css/ostatus.css');
+        $action->cssLink($this->path('theme/base/css/ostatus.css'));
         return true;
     }
 
     function onEndShowStatusNetScripts($action) {
-        $action->script('plugins/OStatus/js/ostatus.js');
+        $action->script($this->path('js/ostatus.js'));
         return true;
     }
 
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 303e177a57..13711d39f4 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -1112,7 +1112,8 @@ class Ostatus_profile extends Memcached_DataObject
                 return $url;
             }
         }
-        return common_path('plugins/OStatus/images/96px-Feed-icon.svg.png');
+
+        return Plugin::staticPath('OStatus', 'images/96px-Feed-icon.svg.png');
     }
 
     /**

From 0bab5e4a9ef114c89b2b12d105d4d68f80f101cd Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 11:16:30 -0500
Subject: [PATCH 178/314] Autocomplete uses Plugin::path()

---
 plugins/Autocomplete/AutocompletePlugin.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/Autocomplete/AutocompletePlugin.php b/plugins/Autocomplete/AutocompletePlugin.php
index 230ba089de..ca495f79f4 100644
--- a/plugins/Autocomplete/AutocompletePlugin.php
+++ b/plugins/Autocomplete/AutocompletePlugin.php
@@ -51,15 +51,15 @@ class AutocompletePlugin extends Plugin
 
     function onEndShowScripts($action){
         if (common_logged_in()) {
-            $action->script('plugins/Autocomplete/jquery-autocomplete/jquery.autocomplete.pack.js');
-            $action->script('plugins/Autocomplete/Autocomplete.js');
+            $action->script($this->path('jquery-autocomplete/jquery.autocomplete.pack.js'));
+            $action->script($this->path('Autocomplete.js'));
         }
     }
 
     function onEndShowStatusNetStyles($action)
     {
         if (common_logged_in()) {
-            $action->cssLink('plugins/Autocomplete/jquery-autocomplete/jquery.autocomplete.css');
+            $action->cssLink($this->path('jquery-autocomplete/jquery.autocomplete.css'));
         }
     }
 

From 6494f5938cfe74ae539e15d14d9ae6ba46ab20a5 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 11:19:03 -0500
Subject: [PATCH 179/314] ClientSideShorten uses Plugin::path()

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

diff --git a/plugins/ClientSideShorten/ClientSideShortenPlugin.php b/plugins/ClientSideShorten/ClientSideShortenPlugin.php
index 27a3a56f72..443d2fffe0 100644
--- a/plugins/ClientSideShorten/ClientSideShortenPlugin.php
+++ b/plugins/ClientSideShorten/ClientSideShortenPlugin.php
@@ -53,7 +53,7 @@ class ClientSideShortenPlugin extends Plugin
     function onEndShowScripts($action){
         $action->inlineScript('var Notice_maxContent = ' . Notice::maxContent());
         if (common_logged_in()) {
-            $action->script('plugins/ClientSideShorten/shorten.js');
+            $action->script($this->path('shorten.js'));
         }
     }
 

From 0ba450373d3ca788fa4baf7d85e266c4dc77f2ca Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 11:20:57 -0500
Subject: [PATCH 180/314] DirectionDetector uses Plugin::path()

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

diff --git a/plugins/DirectionDetector/DirectionDetectorPlugin.php b/plugins/DirectionDetector/DirectionDetectorPlugin.php
index 4a38f390f1..ec206dd75c 100644
--- a/plugins/DirectionDetector/DirectionDetectorPlugin.php
+++ b/plugins/DirectionDetector/DirectionDetectorPlugin.php
@@ -129,7 +129,7 @@ class DirectionDetectorPlugin extends Plugin {
      */
     function onEndShowScripts($action){
         if (common_logged_in()) {
-            $action->script('plugins/DirectionDetector/jquery.DirectionDetector.js');
+            $action->script($this->path('jquery.DirectionDetector.js'));
         }
     }
 

From 3496559d8e29d73aa6ebf3c759ec81eca4c466b9 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 11:23:39 -0500
Subject: [PATCH 181/314] InfiniteScroll uses Plugin::path()

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

diff --git a/plugins/InfiniteScroll/InfiniteScrollPlugin.php b/plugins/InfiniteScroll/InfiniteScrollPlugin.php
index 50c1b5a208..b6c4fabba0 100644
--- a/plugins/InfiniteScroll/InfiniteScrollPlugin.php
+++ b/plugins/InfiniteScroll/InfiniteScrollPlugin.php
@@ -40,8 +40,8 @@ class InfiniteScrollPlugin extends Plugin
 
     function onEndShowScripts($action)
     {
-        $action->script('plugins/InfiniteScroll/jquery.infinitescroll.js');
-        $action->script('plugins/InfiniteScroll/infinitescroll.js');
+        $action->script($this->path('jquery.infinitescroll.js'));
+        $action->script($this->path('infinitescroll.js'));
     }
 
     function onPluginVersion(&$versions)

From 2f598f8c7be264bcb945c7fb04a4dd0be95bafc8 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 11:25:56 -0500
Subject: [PATCH 182/314] LinkPreview uses Plugin::path()

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

diff --git a/plugins/LinkPreview/LinkPreviewPlugin.php b/plugins/LinkPreview/LinkPreviewPlugin.php
index 65f896ca27..8bc726413d 100644
--- a/plugins/LinkPreview/LinkPreviewPlugin.php
+++ b/plugins/LinkPreview/LinkPreviewPlugin.php
@@ -51,7 +51,7 @@ class LinkPreviewPlugin extends Plugin
     {
         $user = common_current_user();
         if ($user && common_config('attachments', 'process_links')) {
-            $action->script('plugins/LinkPreview/linkpreview.min.js');
+            $action->script($this->path('linkpreview.min.js'));
             $data = json_encode(array(
                 'api' => common_local_url('oembedproxy'),
                 'width' => common_config('attachments', 'thumbwidth'),

From 50675e356b4e5b184de35c3bfdc1d5207f5a4da0 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 11:28:39 -0500
Subject: [PATCH 183/314] ModPlus uses Plugin::path()

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

diff --git a/plugins/ModPlus/ModPlusPlugin.php b/plugins/ModPlus/ModPlusPlugin.php
index 3e7a8c7455..d2b7c09346 100644
--- a/plugins/ModPlus/ModPlusPlugin.php
+++ b/plugins/ModPlus/ModPlusPlugin.php
@@ -51,13 +51,13 @@ class ModPlusPlugin extends Plugin
     {
         $user = common_current_user();
         if ($user) {
-            $action->script('plugins/ModPlus/modplus.js');
+            $action->script($this->path('modplus.js'));
         }
         return true;
     }
 
     function onEndShowStatusNetStyles($action) {
-        $action->cssLink('plugins/ModPlus/modplus.css');
+        $action->cssLink($this->path('modplus.css'));
         return true;
     }
 

From 21950205668c913e905a1e458af8062ab37c6730 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 11:30:14 -0500
Subject: [PATCH 184/314] TabFocus uses Plugin::path()

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

diff --git a/plugins/TabFocus/TabFocusPlugin.php b/plugins/TabFocus/TabFocusPlugin.php
index dd8a972767..1b1d1c2b0a 100644
--- a/plugins/TabFocus/TabFocusPlugin.php
+++ b/plugins/TabFocus/TabFocusPlugin.php
@@ -41,7 +41,7 @@ class TabFocusPlugin extends Plugin
 
     function onEndShowScripts($action)
     {
-        $action->script('plugins/TabFocus/tabfocus.js');
+        $action->script($this->path('tabfocus.js'));
     }
 
     function onPluginVersion(&$versions)

From 27eeee08c1534859dc944346422597610ab2f7c7 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 11:38:11 -0500
Subject: [PATCH 185/314] FIXME for Plugin::path() in TinyMCE

---
 plugins/TinyMCE/TinyMCEPlugin.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/TinyMCE/TinyMCEPlugin.php b/plugins/TinyMCE/TinyMCEPlugin.php
index e0640ebdf3..49bbdf90db 100644
--- a/plugins/TinyMCE/TinyMCEPlugin.php
+++ b/plugins/TinyMCE/TinyMCEPlugin.php
@@ -38,6 +38,10 @@ if (!defined('STATUSNET')) {
  * Use TinyMCE library to allow rich text editing in the browser
  *
  * Converts the notice form in browser to a rich-text editor.
+ * 
+ * FIXME: this plugin DOES NOT load its static files from the configured
+ * plugin server if one exists. There are cross-server permissions errors
+ * if you try to do that (something about window.tinymce).
  *
  * @category  WYSIWYG
  * @package   StatusNet

From 9ae3d3de36e069d215fbc11f29d6058d1759b65c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 11:41:47 -0500
Subject: [PATCH 186/314] NewMenu uses Plugin::path()

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

diff --git a/plugins/NewMenu/NewMenuPlugin.php b/plugins/NewMenu/NewMenuPlugin.php
index 7aad0672bf..2454f867d6 100644
--- a/plugins/NewMenu/NewMenuPlugin.php
+++ b/plugins/NewMenu/NewMenuPlugin.php
@@ -331,7 +331,7 @@ class NewMenuPlugin extends Plugin
                       array('default', 'identica', 'h4ck3r'))) &&
             ($action instanceof AccountSettingsAction ||
              $action instanceof ConnectSettingsAction)) {
-            $action->cssLink(common_path('plugins/NewMenu/newmenu.css'));
+            $action->cssLink($this->path('newmenu.css'));
         }
         return true;
     }

From 70cf37cb8884740c3aa5db7df728336cf5215604 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 11:42:36 -0500
Subject: [PATCH 187/314] fix variable name in NewMenu

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

diff --git a/plugins/NewMenu/NewMenuPlugin.php b/plugins/NewMenu/NewMenuPlugin.php
index 7aad0672bf..382a3acc01 100644
--- a/plugins/NewMenu/NewMenuPlugin.php
+++ b/plugins/NewMenu/NewMenuPlugin.php
@@ -326,7 +326,7 @@ class NewMenuPlugin extends Plugin
 
     function onEndShowStyles($action)
     {
-        if (($this->showCSS ||
+        if (($this->loadCSS ||
              in_array(common_config('site', 'theme'),
                       array('default', 'identica', 'h4ck3r'))) &&
             ($action instanceof AccountSettingsAction ||

From 0c7104ec2fd3aeb9f0e1b8df2d2f853ade459085 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 11:46:20 -0500
Subject: [PATCH 188/314] MobileProfile uses Plugin::path()

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

diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php
index b50440682f..b9c25ab998 100644
--- a/plugins/MobileProfile/MobileProfilePlugin.php
+++ b/plugins/MobileProfile/MobileProfilePlugin.php
@@ -241,13 +241,13 @@ class MobileProfilePlugin extends WAP20Plugin
         if (file_exists(Theme::file('css/mp-screen.css'))) {
             $action->cssLink('css/mp-screen.css', null, 'screen');
         } else {
-            $action->cssLink('plugins/MobileProfile/mp-screen.css',null,'screen');
+            $action->cssLink($this->path('mp-screen.css'),null,'screen');
         }
 
         if (file_exists(Theme::file('css/mp-handheld.css'))) {
             $action->cssLink('css/mp-handheld.css', null, 'handheld');
         } else {
-            $action->cssLink('plugins/MobileProfile/mp-handheld.css',null,'handheld');
+            $action->cssLink($this->path('mp-handheld.css'),null,'handheld');
         }
 
         // Allow other plugins to load their styles.

From 55af561887d1c2992af75994bef9615a42aec60e Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 11:49:00 -0500
Subject: [PATCH 189/314] ShareNotice uses Plugin::path()

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

diff --git a/plugins/ShareNotice/ShareNoticePlugin.php b/plugins/ShareNotice/ShareNoticePlugin.php
index 8b94f83c8f..0cd248e213 100644
--- a/plugins/ShareNotice/ShareNoticePlugin.php
+++ b/plugins/ShareNotice/ShareNoticePlugin.php
@@ -33,7 +33,7 @@ class ShareNoticePlugin extends Plugin
     );
 
     function onEndShowStatusNetStyles($action) {
-        $action->cssLink('plugins/ShareNotice/css/sharenotice.css');
+        $action->cssLink($this->path('css/sharenotice.css'));
         return true;
     }
 

From 77769e4b3c9cb48fbbad13b8b2e17f29131c25cd Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 11:51:58 -0500
Subject: [PATCH 190/314] YammerImport uses Plugin::path()

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

diff --git a/plugins/YammerImport/actions/yammeradminpanel.php b/plugins/YammerImport/actions/yammeradminpanel.php
index 3faf390ac1..4714154290 100644
--- a/plugins/YammerImport/actions/yammeradminpanel.php
+++ b/plugins/YammerImport/actions/yammeradminpanel.php
@@ -176,12 +176,12 @@ class YammeradminpanelAction extends AdminPanelAction
     function showStylesheets()
     {
         parent::showStylesheets();
-        $this->cssLink('plugins/YammerImport/css/admin.css', null, 'screen, projection, tv');
+        $this->cssLink(Plugin::staticPath('YammerImport', 'css/admin.css'), null, 'screen, projection, tv');
     }
 
     function showScripts()
     {
         parent::showScripts();
-        $this->script('plugins/YammerImport/js/yammer-admin.js');
+        $this->script(Plugin::staticPath('YammerImport', 'js/yammer-admin.js'));
     }
 }

From 68cf2bdced6fab78639fed15d72a134ce2a3f657 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 12:04:54 -0500
Subject: [PATCH 191/314] Bookmark uses Plugin::path()

---
 plugins/Bookmark/BookmarkPlugin.php | 2 +-
 plugins/Bookmark/bookmarkpopup.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/Bookmark/BookmarkPlugin.php b/plugins/Bookmark/BookmarkPlugin.php
index 800a26e795..2e6baf5e4e 100644
--- a/plugins/Bookmark/BookmarkPlugin.php
+++ b/plugins/Bookmark/BookmarkPlugin.php
@@ -149,7 +149,7 @@ class BookmarkPlugin extends Plugin
 
     function onEndShowStyles($action)
     {
-        $action->cssLink('plugins/Bookmark/bookmark.css');
+        $action->cssLink($this->path('bookmark.css'));
         return true;
     }
 
diff --git a/plugins/Bookmark/bookmarkpopup.php b/plugins/Bookmark/bookmarkpopup.php
index 24ed79612b..33f983a93a 100644
--- a/plugins/Bookmark/bookmarkpopup.php
+++ b/plugins/Bookmark/bookmarkpopup.php
@@ -107,6 +107,6 @@ class BookmarkpopupAction extends NewbookmarkAction
     function showScripts()
     {
         parent::showScripts();
-        $this->script(common_path('plugins/Bookmark/bookmarkpopup.js'));
+        $this->script(Plugin::staticPath('Bookmark', 'bookmarkpopup.js'));
     }
 }

From ffb7ca3e9939076285b7823048c0a5eae90cf3b8 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 12:18:57 -0500
Subject: [PATCH 192/314] Realtime needs to load from own directory, not
 subclass's

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

diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php
index 5d119982f5..246b1f9735 100644
--- a/plugins/Realtime/RealtimePlugin.php
+++ b/plugins/Realtime/RealtimePlugin.php
@@ -116,7 +116,7 @@ class RealtimePlugin extends Plugin
 
     function onEndShowStatusNetStyles($action)
     {
-        $action->cssLink($this->path('realtimeupdate.css'),
+        $action->cssLink(Plugin::staticPath('Realtime', 'realtimeupdate.css'),
                          null,
                          'screen, projection, tv');
         return true;
@@ -323,7 +323,7 @@ class RealtimePlugin extends Plugin
 
     function _getScripts()
     {
-        return array($this->path('realtimeupdate.min.js'));
+        return array(Plugin::staticPath('Realtime', 'realtimeupdate.min.js'));
     }
 
     /**

From 67b83bcca83293c29ea19ec9b0dd78159d9dc626 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 12:22:39 -0500
Subject: [PATCH 193/314] FacebookBridge use Plugin::path()

---
 plugins/FacebookBridge/actions/facebooklogin.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/plugins/FacebookBridge/actions/facebooklogin.php b/plugins/FacebookBridge/actions/facebooklogin.php
index f8a45c41b2..924dd46565 100644
--- a/plugins/FacebookBridge/actions/facebooklogin.php
+++ b/plugins/FacebookBridge/actions/facebooklogin.php
@@ -89,10 +89,7 @@ class FacebookloginAction extends Action
         );
 
         $attrs = array(
-            'src' => common_path(
-                'plugins/FacebookBridge/images/login-button.png',
-                true
-            ),
+            'src' => Plugin::staticPath('FacebookBridge', 'images/login-button.png'),
             'alt'   => 'Login with Facebook',
             'title' => 'Login with Facebook'
         );

From 5f365e75ca15c9777ab1930b416abae4d9d4d7cc Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 13:58:56 -0500
Subject: [PATCH 194/314] only blow public timeline cache if notice is in it

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

diff --git a/classes/Notice.php b/classes/Notice.php
index e9ea479e14..2d13828f1f 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -446,7 +446,10 @@ class Notice extends Memcached_DataObject
     function blowOnInsert($conversation = false)
     {
         self::blow('profile:notice_ids:%d', $this->profile_id);
-        self::blow('public');
+
+        if ($this->isPublic()) {
+            self::blow('public');
+        }
 
         // XXX: Before we were blowing the casche only if the notice id
         // was not the root of the conversation.  What to do now?
@@ -481,7 +484,10 @@ class Notice extends Memcached_DataObject
         $this->blowOnInsert();
 
         self::blow('profile:notice_ids:%d;last', $this->profile_id);
-        self::blow('public;last');
+
+        if ($this->isPublic()) {
+            self::blow('public;last');
+        }
     }
 
     /** save all urls in the notice to the db
@@ -2107,4 +2113,14 @@ class Notice extends Memcached_DataObject
             $obj->whereAdd($max);
         }
     }
+
+    function isPublic()
+    {
+        if (common_config('public', 'localonly')) {
+            return ($this->is_local == Notice::LOCAL_PUBLIC);
+        } else {
+            return (($this->is_local != Notice::LOCAL_NONPUBLIC) &&
+                    ($this->is_local != Notice::GATEWAY));
+        }
+    }
 }

From 094bb9e1c36cff414b824210ac6395ef51a7a623 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 15:28:41 -0500
Subject: [PATCH 195/314] redo the group dm schema, again

---
 plugins/PrivateGroup/Group_message.php        | 105 ++++-------------
 .../PrivateGroup/Group_message_profile.php    | 111 ++++++++++++++++++
 plugins/PrivateGroup/PrivateGroupPlugin.php   |  33 +++---
 3 files changed, 150 insertions(+), 99 deletions(-)
 create mode 100644 plugins/PrivateGroup/Group_message_profile.php

diff --git a/plugins/PrivateGroup/Group_message.php b/plugins/PrivateGroup/Group_message.php
index 404f663a1f..27f4cff0ed 100644
--- a/plugins/PrivateGroup/Group_message.php
+++ b/plugins/PrivateGroup/Group_message.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Data class for group inbox info
+ * Data class for group direct messages
  *
  * PHP version 5
  *
@@ -34,17 +34,9 @@ if (!defined('STATUSNET')) {
 require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
 
 /**
- * Data class for counting greetings
+ * Data class for group direct messages
  *
- * 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 PrivateGroup
  * @package  StatusNet
  * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
@@ -55,9 +47,15 @@ require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
 
 class Group_message extends Memcached_DataObject
 {
-    public $__table = 'user_greeting_count'; // table name
-    public $user_id;                         // int(4)  primary_key not_null
-    public $greeting_count;                  // int(4)
+    public $__table = 'group_message'; // table name
+    public $id;                        // char(36)  primary_key not_null
+    public $uri;                       // varchar(255)
+    public $from_profile;              // int
+    public $to_group;                  // int
+    public $content;
+    public $rendered;
+    public $url;
+    public $created;
 
     /**
      * Get an instance by key
@@ -85,8 +83,14 @@ class Group_message extends Memcached_DataObject
      */
     function table()
     {
-        return array('user_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
-                     'greeting_count' => DB_DATAOBJECT_INT);
+        return array('id' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
+                     'uri' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
+                     'from_profile' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+                     'to_group' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+                     'content' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
+                     'rendered' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
+                     'url' => DB_DATAOBJECT_STR,
+                     'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL);
     }
 
     /**
@@ -106,79 +110,12 @@ class Group_message extends Memcached_DataObject
     /**
      * 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 Group_message instance for this user, with count already incremented.
-     */
-    static function inc($user_id)
-    {
-        $gc = Group_message::staticGet('user_id', $user_id);
-
-        if (empty($gc)) {
-
-            $gc = new Group_message();
-
-            $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;
+        return array('id' => 'K', 'uri' => 'U');
     }
 }
diff --git a/plugins/PrivateGroup/Group_message_profile.php b/plugins/PrivateGroup/Group_message_profile.php
new file mode 100644
index 0000000000..b32341ca77
--- /dev/null
+++ b/plugins/PrivateGroup/Group_message_profile.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Who received a group message
+ *
+ * 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) 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')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
+
+/**
+ * Data class for group direct messages for users
+ *
+ * @category PrivateGroup
+ * @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 Group_message_profile extends Memcached_DataObject
+{
+    public $__table = 'group_message_profile'; // table name
+    public $to_profile;                        // int
+    public $group_message_id;                  // char(36)  primary_key not_null
+    public $created;
+
+    /**
+     * 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 Group_message object found, or null for no hits
+     *
+     */
+    function staticGet($k, $v=null)
+    {
+        return Memcached_DataObject::staticGet('Group_message_profile', $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('to_profile' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+                     'group_message_id' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
+                     'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL);
+    }
+
+    /**
+     * 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
+     *
+     * @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('to_profile' => 'K', 'group_message_id' => 'K');
+    }
+}
diff --git a/plugins/PrivateGroup/PrivateGroupPlugin.php b/plugins/PrivateGroup/PrivateGroupPlugin.php
index 9851313ff4..cd0ef0a22d 100644
--- a/plugins/PrivateGroup/PrivateGroupPlugin.php
+++ b/plugins/PrivateGroup/PrivateGroupPlugin.php
@@ -110,26 +110,21 @@ class PrivateGroupPlugin extends Plugin
                                                  false,
                                                  'UNI'),
                                    new ColumnDef('created',
-                                                 'datetime'),
-                                   new ColumnDef('modified',
-                                                 'timestamp')));
+                                                 'datetime')));
 
-
-        $schema->ensureTable('group_message_copy',
-                             array(new ColumnDef('group_message_id',
+        $schema->ensureTable('group_message_profile',
+                             array(new ColumnDef('to_profile',
+                                                 'integer',
+                                                 null,
+                                                 false,
+                                                 'PRI'),
+                                   new ColumnDef('group_message_id',
                                                  'char',
                                                  36,
                                                  false,
                                                  'PRI'),
-                                   new ColumnDef('message_uri',
-                                                 'varchar',
-                                                 255,
-                                                 false,
-                                                 'PRI'),
                                    new ColumnDef('created',
-                                                 'datetime'),
-                                   new ColumnDef('modified',
-                                                 'timestamp')));
+                                                 'datetime')));
 
         return true;
     }
@@ -205,7 +200,7 @@ class PrivateGroupPlugin extends Plugin
     /**
      * Create default group privacy settings at group create time
      *
-     * @param $group Group that was just created
+     * @param User_group $group Group that was just created
      *
      * @result boolean hook value
      */
@@ -227,6 +222,14 @@ class PrivateGroupPlugin extends Plugin
         return true;
     }
 
+    /**
+     * Show group privacy controls on group edit form
+     *
+     * @param Action $action EditgroupAction being executed
+     *
+     * 
+     */
+ 
     function onPluginVersion(&$versions)
     {
         $versions[] = array('name' => 'PrivateGroup',

From 8bf57019c1e88ebf4c00eaf1641dbc82fc724ec7 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 15:30:57 -0500
Subject: [PATCH 196/314] autoload private group classes

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

diff --git a/plugins/PrivateGroup/PrivateGroupPlugin.php b/plugins/PrivateGroup/PrivateGroupPlugin.php
index cd0ef0a22d..66fd7430b1 100644
--- a/plugins/PrivateGroup/PrivateGroupPlugin.php
+++ b/plugins/PrivateGroup/PrivateGroupPlugin.php
@@ -147,7 +147,8 @@ class PrivateGroupPlugin extends Plugin
             include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
             return false;
         case 'Group_privacy_settings':
-        case 'Group_private_inbox':
+        case 'Group_message':
+        case 'Group_message_profile':
             include_once $dir . '/'.$cls.'.php';
             return false;
         default:

From 2cdba23df418245e9981753e473b2eeaf1420dad Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 16:19:41 -0500
Subject: [PATCH 197/314] hook for new group through a form, same as editing

---
 actions/newgroup.php | 186 ++++++++++++++++++++++---------------------
 1 file changed, 96 insertions(+), 90 deletions(-)

diff --git a/actions/newgroup.php b/actions/newgroup.php
index 53c95d03f0..9682b875cb 100644
--- a/actions/newgroup.php
+++ b/actions/newgroup.php
@@ -120,103 +120,109 @@ class NewgroupAction extends Action
 
     function trySave()
     {
-        try {
-            $nickname = Nickname::normalize($this->trimmed('nickname'));
-        } catch (NicknameException $e) {
-            $this->showForm($e->getMessage());
-        }
-        $fullname    = $this->trimmed('fullname');
-        $homepage    = $this->trimmed('homepage');
-        $description = $this->trimmed('description');
-        $location    = $this->trimmed('location');
-        $aliasstring = $this->trimmed('aliases');
+        if (Event::handle('StartGroupSaveForm', array($this))) {
+            try {
+                $nickname = Nickname::normalize($this->trimmed('nickname'));
+            } catch (NicknameException $e) {
+                $this->showForm($e->getMessage());
+            }
+            $fullname    = $this->trimmed('fullname');
+            $homepage    = $this->trimmed('homepage');
+            $description = $this->trimmed('description');
+            $location    = $this->trimmed('location');
+            $aliasstring = $this->trimmed('aliases');
 
-        if ($this->nicknameExists($nickname)) {
-            // TRANS: Group create form validation error.
-            $this->showForm(_('Nickname already in use. Try another one.'));
-            return;
-        } else if (!User_group::allowedNickname($nickname)) {
-            // TRANS: Group create form validation error.
-            $this->showForm(_('Not a valid nickname.'));
-            return;
-        } else if (!is_null($homepage) && (strlen($homepage) > 0) &&
-                   !Validate::uri($homepage,
-                                  array('allowed_schemes' =>
-                                        array('http', 'https')))) {
-            // TRANS: Group create form validation error.
-            $this->showForm(_('Homepage is not a valid URL.'));
-            return;
-        } else if (!is_null($fullname) && mb_strlen($fullname) > 255) {
-            // TRANS: Group create form validation error.
-            $this->showForm(_('Full name is too long (maximum 255 characters).'));
-            return;
-        } else if (User_group::descriptionTooLong($description)) {
-            // TRANS: Group create form validation error.
-            // TRANS: %d is the maximum number of allowed characters.
-            $this->showForm(sprintf(_m('Description is too long (maximum %d character).',
-                                       'Description is too long (maximum %d characters).',
-                                       User_group::maxDescription()),
-                                    User_group::maxDescription()));
-            return;
-        } else if (!is_null($location) && mb_strlen($location) > 255) {
-            // TRANS: Group create form validation error.
-            $this->showForm(_('Location is too long (maximum 255 characters).'));
-            return;
-        }
-
-        if (!empty($aliasstring)) {
-            $aliases = array_map('common_canonical_nickname', array_unique(preg_split('/[\s,]+/', $aliasstring)));
-        } else {
-            $aliases = array();
-        }
-
-        if (count($aliases) > common_config('group', 'maxaliases')) {
-            // TRANS: Group create form validation error.
-            // TRANS: %d is the maximum number of allowed aliases.
-            $this->showForm(sprintf(_m('Too many aliases! Maximum %d allowed.',
-                                       'Too many aliases! Maximum %d allowed.',
-                                       common_config('group', 'maxaliases')),
-                                    common_config('group', 'maxaliases')));
-            return;
-        }
-
-        foreach ($aliases as $alias) {
-            if (!Nickname::isValid($alias)) {
+            if ($this->nicknameExists($nickname)) {
                 // TRANS: Group create form validation error.
-                // TRANS: %s is the invalid alias.
-                $this->showForm(sprintf(_('Invalid alias: "%s"'), $alias));
+                $this->showForm(_('Nickname already in use. Try another one.'));
                 return;
-            }
-            if ($this->nicknameExists($alias)) {
-                // TRANS: Group create form validation error. %s is the already used alias.
-                $this->showForm(sprintf(_('Alias "%s" already in use. Try another one.'),
-                                        $alias));
-                return;
-            }
-            // XXX assumes alphanum nicknames
-            if (strcmp($alias, $nickname) == 0) {
+            } else if (!User_group::allowedNickname($nickname)) {
                 // TRANS: Group create form validation error.
-                $this->showForm(_('Alias cannot be the same as nickname.'));
+                $this->showForm(_('Not a valid nickname.'));
+                return;
+            } else if (!is_null($homepage) && (strlen($homepage) > 0) &&
+                       !Validate::uri($homepage,
+                                      array('allowed_schemes' =>
+                                            array('http', 'https')))) {
+                // TRANS: Group create form validation error.
+                $this->showForm(_('Homepage is not a valid URL.'));
+                return;
+            } else if (!is_null($fullname) && mb_strlen($fullname) > 255) {
+                // TRANS: Group create form validation error.
+                $this->showForm(_('Full name is too long (maximum 255 characters).'));
+                return;
+            } else if (User_group::descriptionTooLong($description)) {
+                // TRANS: Group create form validation error.
+                // TRANS: %d is the maximum number of allowed characters.
+                $this->showForm(sprintf(_m('Description is too long (maximum %d character).',
+                                           'Description is too long (maximum %d characters).',
+                                           User_group::maxDescription()),
+                                        User_group::maxDescription()));
+                return;
+            } else if (!is_null($location) && mb_strlen($location) > 255) {
+                // TRANS: Group create form validation error.
+                $this->showForm(_('Location is too long (maximum 255 characters).'));
                 return;
             }
+
+            if (!empty($aliasstring)) {
+                $aliases = array_map('common_canonical_nickname', array_unique(preg_split('/[\s,]+/', $aliasstring)));
+            } else {
+                $aliases = array();
+            }
+
+            if (count($aliases) > common_config('group', 'maxaliases')) {
+                // TRANS: Group create form validation error.
+                // TRANS: %d is the maximum number of allowed aliases.
+                $this->showForm(sprintf(_m('Too many aliases! Maximum %d allowed.',
+                                           'Too many aliases! Maximum %d allowed.',
+                                           common_config('group', 'maxaliases')),
+                                        common_config('group', 'maxaliases')));
+                return;
+            }
+
+            foreach ($aliases as $alias) {
+                if (!Nickname::isValid($alias)) {
+                    // TRANS: Group create form validation error.
+                    // TRANS: %s is the invalid alias.
+                    $this->showForm(sprintf(_('Invalid alias: "%s"'), $alias));
+                    return;
+                }
+                if ($this->nicknameExists($alias)) {
+                    // TRANS: Group create form validation error. %s is the already used alias.
+                    $this->showForm(sprintf(_('Alias "%s" already in use. Try another one.'),
+                                            $alias));
+                    return;
+                }
+                // XXX assumes alphanum nicknames
+                if (strcmp($alias, $nickname) == 0) {
+                    // TRANS: Group create form validation error.
+                    $this->showForm(_('Alias cannot be the same as nickname.'));
+                    return;
+                }
+            }
+
+            $cur = common_current_user();
+
+            // Checked in prepare() above
+
+            assert(!is_null($cur));
+
+            $group = User_group::register(array('nickname' => $nickname,
+                                                'fullname' => $fullname,
+                                                'homepage' => $homepage,
+                                                'description' => $description,
+                                                'location' => $location,
+                                                'aliases'  => $aliases,
+                                                'userid'   => $cur->id,
+                                                'local'    => true));
+
+            $this->group = $group;
+
+            Event::handle('EndGroupSaveForm', array($this));
+
+            common_redirect($group->homeUrl(), 303);
         }
-
-        $cur = common_current_user();
-
-        // Checked in prepare() above
-
-        assert(!is_null($cur));
-
-        $group = User_group::register(array('nickname' => $nickname,
-                                            'fullname' => $fullname,
-                                            'homepage' => $homepage,
-                                            'description' => $description,
-                                            'location' => $location,
-                                            'aliases'  => $aliases,
-                                            'userid'   => $cur->id,
-                                            'local'    => true));
-
-        common_redirect($group->homeUrl(), 303);
     }
 
     function nicknameExists($nickname)

From a002d577364a1e92f693ff005d71bdaae14d67a5 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 16:39:52 -0500
Subject: [PATCH 198/314] save group privacy settings

---
 plugins/PrivateGroup/PrivateGroupPlugin.php | 65 ++++++++++++++++++++-
 1 file changed, 62 insertions(+), 3 deletions(-)

diff --git a/plugins/PrivateGroup/PrivateGroupPlugin.php b/plugins/PrivateGroup/PrivateGroupPlugin.php
index 66fd7430b1..67e1cfb65e 100644
--- a/plugins/PrivateGroup/PrivateGroupPlugin.php
+++ b/plugins/PrivateGroup/PrivateGroupPlugin.php
@@ -226,10 +226,69 @@ class PrivateGroupPlugin extends Plugin
     /**
      * Show group privacy controls on group edit form
      *
-     * @param Action $action EditgroupAction being executed
-     *
-     * 
+     * @param GroupEditForm $form form being shown
      */
+
+    function onEndGroupEditFormData($form)
+    {
+        $gps = null;
+
+        if (!empty($form->group)) {
+            $gps = Group_privacy_settings::staticGet('group_id', $form->group->id);
+        }
+
+        $form->out->elementStart('li');
+        $form->out->dropdown('allow_privacy',
+                             _('Private messages'),
+                             array(Group_privacy_settings::SOMETIMES => _('Sometimes'),
+                                   Group_privacy_settings::ALWAYS => _('Always'),
+                                   Group_privacy_settings::NEVER => _('Never')),
+                             _('Whether to allow private messages to this group'),
+                             false,
+                             (empty($gps)) ? Group_privacy_settings::SOMETIMES : $gps->allow_privacy);
+        $form->out->elementEnd('li');
+        $form->out->elementStart('li');
+        $form->out->dropdown('allow_sender',
+                             _('Private sender'),
+                             array(Group_privacy_settings::EVERYONE => _('Everyone'),
+                                   Group_privacy_settings::MEMBER => _('Member'),
+                                   Group_privacy_settings::ADMIN => _('Admin')),
+                             _('Who can send private messages to the group'),
+                             false,
+                             (empty($gps)) ? Group_privacy_settings::MEMBER : $gps->allow_sender);
+        $form->out->elementEnd('li');
+        return true;
+    }
+
+    function onEndGroupSaveForm($action)
+    {
+        $gps = null;
+
+        if (!empty($action->group)) {
+            $gps = Group_privacy_settings::staticGet('group_id', $action->group->id);
+        }
+
+        $orig = null;
+
+        if (empty($gps)) {
+            $gps = new Group_privacy_settings();
+            $gps->group_id = $action->group->id;
+        } else {
+            $orig = clone($gps);
+        }
+        
+        $gps->allow_privacy = $action->trimmed('allow_privacy');
+        $gps->allow_sender  = $action->trimmed('allow_sender');
+
+        if (empty($orig)) {
+            $gps->created = common_sql_now();
+            $gps->insert();
+        } else {
+            $gps->update($orig);
+        }
+        
+        return true;
+    }
  
     function onPluginVersion(&$versions)
     {

From 21feac3bea72b0ecd88a39d95345a0c78fe5fd89 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 17:04:16 -0500
Subject: [PATCH 199/314] hooks for commands

---
 EVENTS.txt                 |  13 +
 lib/commandinterpreter.php | 487 ++++++++++++++++++++-----------------
 2 files changed, 273 insertions(+), 227 deletions(-)

diff --git a/EVENTS.txt b/EVENTS.txt
index d26c576e19..98927127b7 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -1069,3 +1069,16 @@ StartGroupSave: After initializing but before saving a group
 
 EndGroupSave: After saving a group, aliases, and first member
 - $group: group that was saved
+
+StartInterpretCommand: Before running a command
+- $cmd: First word in the string, 'foo' in 'foo argument' 
+- $arg: Argument, if any, like 'argument' in 'foo argument'
+- $user: User who issued the command
+- &$result: Resulting command; you can set this!
+
+EndInterpretCommand: Before running a command
+- $cmd: First word in the string, 'foo' in 'foo argument' 
+- $arg: Argument, if any, like 'argument' in 'foo argument'
+- $user: User who issued the command
+- $result: Resulting command
+
diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php
index c288c2e5f0..2e79fb27ee 100644
--- a/lib/commandinterpreter.php
+++ b/lib/commandinterpreter.php
@@ -25,252 +25,285 @@ class CommandInterpreter
 {
     function handle_command($user, $text)
     {
-        # XXX: localise
+        // XXX: localise
 
         $text = preg_replace('/\s+/', ' ', trim($text));
         list($cmd, $arg) = $this->split_arg($text);
 
-        # We try to support all the same commands as Twitter, see
-        # http://getsatisfaction.com/twitter/topics/what_are_the_twitter_commands
-        # There are a few compatibility commands from earlier versions of
-        # StatusNet
+        // We try to support all the same commands as Twitter, see
+        // http://getsatisfaction.com/twitter/topics/what_are_the_twitter_commands
+        // There are a few compatibility commands from earlier versions of
+        // StatusNet
 
-        switch(strtolower($cmd)) {
-         case 'help':
-            if ($arg) {
-                return null;
-            }
-            return new HelpCommand($user);
-         case 'login':
-            if ($arg) {
-                return null;
-            } else {
-                return new LoginCommand($user);
-            }
-         case 'lose':
-            if ($arg) {
+        if (Event::handle('StartIntepretCommand', array($cmd, $arg, $user, &$result))) {
+            switch(strtolower($cmd)) {
+            case 'help':
+                if ($arg) {
+                    $result = null;
+                }
+                $result = new HelpCommand($user);
+                break;
+            case 'login':
+                if ($arg) {
+                    $result = null;
+                } else {
+                    $result = new LoginCommand($user);
+                }
+                break;
+            case 'lose':
+                if ($arg) {
+                    list($other, $extra) = $this->split_arg($arg);
+                    if ($extra) {
+                        $result = null;
+                    } else {
+                        $result = new LoseCommand($user, $other);
+                    }
+                } else {
+                    $result = null;
+                }
+                break;
+            case 'subscribers':
+                if ($arg) {
+                    $result = null;
+                } else {
+                    $result = new SubscribersCommand($user);
+                }
+                break;
+            case 'subscriptions':
+                if ($arg) {
+                    $result = null;
+                } else {
+                    $result = new SubscriptionsCommand($user);
+                }
+                break;
+            case 'groups':
+                if ($arg) {
+                    $result = null;
+                } else {
+                    $result = new GroupsCommand($user);
+                }
+                break;
+            case 'on':
+                if ($arg) {
+                    list($other, $extra) = $this->split_arg($arg);
+                    if ($extra) {
+                        $result = null;
+                    } else {
+                        $result = new OnCommand($user, $other);
+                    }
+                } else {
+                    $result = new OnCommand($user);
+                }
+                break;
+            case 'off':
+                if ($arg) {
+                    list($other, $extra) = $this->split_arg($arg);
+                    if ($extra) {
+                        $result = null;
+                    } else {
+                        $result = new OffCommand($user, $other);
+                    }
+                } else {
+                    $result = new OffCommand($user);
+                }
+                break;
+            case 'stop':
+            case 'quit':
+                if ($arg) {
+                    $result = null;
+                } else {
+                    $result = new OffCommand($user);
+                }
+                break;
+            case 'join':
+                if (!$arg) {
+                    $result = null;
+                }
                 list($other, $extra) = $this->split_arg($arg);
                 if ($extra) {
-                    return null;
+                    $result = null;
                 } else {
-                    return new LoseCommand($user, $other);
+                    $result = new JoinCommand($user, $other);
+                }
+                break;
+            case 'drop':
+                if (!$arg) {
+                    $result = null;
                 }
-            } else {
-              return null;
-            }
-         case 'subscribers':
-            if ($arg) {
-                return null;
-            } else {
-                return new SubscribersCommand($user);
-            }
-         case 'subscriptions':
-            if ($arg) {
-                return null;
-            } else {
-                return new SubscriptionsCommand($user);
-            }
-         case 'groups':
-            if ($arg) {
-                return null;
-            } else {
-                return new GroupsCommand($user);
-            }
-         case 'on':
-            if ($arg) {
                 list($other, $extra) = $this->split_arg($arg);
                 if ($extra) {
-                    return null;
+                    $result = null;
                 } else {
-                    return new OnCommand($user, $other);
+                    $result = new DropCommand($user, $other);
                 }
-            } else {
-                return new OnCommand($user);
-            }
-         case 'off':
-            if ($arg) {
+                break;
+            case 'follow':
+            case 'sub':
+                if (!$arg) {
+                    $result = null;
+                }
+
                 list($other, $extra) = $this->split_arg($arg);
                 if ($extra) {
-                    return null;
+                    $result = null;
                 } else {
-                    return new OffCommand($user, $other);
+                    $result = new SubCommand($user, $other);
                 }
-            } else {
-                return new OffCommand($user);
+                break;
+            case 'leave':
+            case 'unsub':
+                if (!$arg) {
+                    $result = null;
+                }
+
+                list($other, $extra) = $this->split_arg($arg);
+                if ($extra) {
+                    $result = null;
+                } else {
+                    $result = new UnsubCommand($user, $other);
+                }
+                break;
+            case 'get':
+            case 'last':
+                if (!$arg) {
+                    $result = null;
+                }
+                list($other, $extra) = $this->split_arg($arg);
+                if ($extra) {
+                    $result = null;
+                } else {
+                    $result = new GetCommand($user, $other);
+                }
+                break;
+            case 'd':
+            case 'dm':
+                if (!$arg) {
+                    $result = null;
+                }
+                list($other, $extra) = $this->split_arg($arg);
+                if (!$extra) {
+                    $result = null;
+                } else {
+                    $result = new MessageCommand($user, $other, $extra);
+                }
+                break;
+            case 'r':
+            case 'reply':
+                if (!$arg) {
+                    $result = null;
+                }
+                list($other, $extra) = $this->split_arg($arg);
+                if (!$extra) {
+                    $result = null;
+                } else {
+                    $result = new ReplyCommand($user, $other, $extra);
+                }
+                break;
+            case 'repeat':
+            case 'rp':
+            case 'rt':
+            case 'rd':
+                if (!$arg) {
+                    $result = null;
+                }
+                list($other, $extra) = $this->split_arg($arg);
+                if ($extra) {
+                    $result = null;
+                } else {
+                    $result = new RepeatCommand($user, $other);
+                }
+                break;
+            case 'whois':
+                if (!$arg) {
+                    $result = null;
+                }
+                list($other, $extra) = $this->split_arg($arg);
+                if ($extra) {
+                    $result = null;
+                } else {
+                    $result = new WhoisCommand($user, $other);
+                }
+                break;
+            case 'fav':
+                if (!$arg) {
+                    $result = null;
+                }
+                list($other, $extra) = $this->split_arg($arg);
+                if ($extra) {
+                    $result = null;
+                } else {
+                    $result = new FavCommand($user, $other);
+                }
+                break;
+            case 'nudge':
+                if (!$arg) {
+                    $result = null;
+                }
+                list($other, $extra) = $this->split_arg($arg);
+                if ($extra) {
+                    $result = null;
+                } else {
+                    $result = new NudgeCommand($user, $other);
+                }
+                break;
+            case 'stats':
+                if ($arg) {
+                    $result = null;
+                }
+                $result = new StatsCommand($user);
+                break;
+            case 'invite':
+                if (!$arg) {
+                    $result = null;
+                }
+                list($other, $extra) = $this->split_arg($arg);
+                if ($extra) {
+                    $result = null;
+                } else {
+                    $result = new InviteCommand($user, $other);
+                }
+                break;
+            case 'track':
+                if (!$arg) {
+                    $result = null;
+                }
+                list($word, $extra) = $this->split_arg($arg);
+                if ($extra) {
+                    $result = null;
+                } else if ($word == 'off') {
+                    $result = new TrackOffCommand($user);
+                } else {
+                    $result = new TrackCommand($user, $word);
+                }
+                break;
+            case 'untrack':
+                if (!$arg) {
+                    $result = null;
+                }
+                list($word, $extra) = $this->split_arg($arg);
+                if ($extra) {
+                    $result = null;
+                } else if ($word == 'all') {
+                    $result = new TrackOffCommand($user);
+                } else {
+                    $result = new UntrackCommand($user, $word);
+                }
+                break;
+            case 'tracks':
+            case 'tracking':
+                if ($arg) {
+                    $result = null;
+                }
+                $result = new TrackingCommand($user);
+                break;
+            default:
+                $result = false;
             }
-         case 'stop':
-         case 'quit':
-            if ($arg) {
-                return null;
-            } else {
-                return new OffCommand($user);
-            }
-         case 'join':
-             if (!$arg) {
-                return null;
-            }
-            list($other, $extra) = $this->split_arg($arg);
-            if ($extra) {
-                return null;
-            } else {
-                return new JoinCommand($user, $other);
-            }
-         case 'drop':
-            if (!$arg) {
-                return null;
-            }
-            list($other, $extra) = $this->split_arg($arg);
-            if ($extra) {
-                return null;
-            } else {
-                return new DropCommand($user, $other);
-            }
-         case 'follow':
-         case 'sub':
-            if (!$arg) {
-                return null;
-            }
-            list($other, $extra) = $this->split_arg($arg);
-            if ($extra) {
-                return null;
-            } else {
-                return new SubCommand($user, $other);
-            }
-         case 'leave':
-         case 'unsub':
-            if (!$arg) {
-                return null;
-            }
-            list($other, $extra) = $this->split_arg($arg);
-            if ($extra) {
-                return null;
-            } else {
-                return new UnsubCommand($user, $other);
-            }
-         case 'get':
-         case 'last':
-            if (!$arg) {
-                return null;
-            }
-            list($other, $extra) = $this->split_arg($arg);
-            if ($extra) {
-                return null;
-            } else {
-                return new GetCommand($user, $other);
-            }
-         case 'd':
-         case 'dm':
-            if (!$arg) {
-                return null;
-            }
-            list($other, $extra) = $this->split_arg($arg);
-            if (!$extra) {
-                return null;
-            } else {
-                return new MessageCommand($user, $other, $extra);
-            }
-         case 'r':
-         case 'reply':
-            if (!$arg) {
-                return null;
-            }
-            list($other, $extra) = $this->split_arg($arg);
-            if (!$extra) {
-                return null;
-            } else {
-                return new ReplyCommand($user, $other, $extra);
-            }
-         case 'repeat':
-         case 'rp':
-         case 'rt':
-         case 'rd':
-            if (!$arg) {
-                return null;
-            }
-            list($other, $extra) = $this->split_arg($arg);
-            if ($extra) {
-                return null;
-            } else {
-                return new RepeatCommand($user, $other);
-            }
-         case 'whois':
-            if (!$arg) {
-                return null;
-            }
-            list($other, $extra) = $this->split_arg($arg);
-            if ($extra) {
-                return null;
-            } else {
-                return new WhoisCommand($user, $other);
-            }
-         case 'fav':
-            if (!$arg) {
-                return null;
-            }
-            list($other, $extra) = $this->split_arg($arg);
-            if ($extra) {
-                return null;
-            } else {
-                return new FavCommand($user, $other);
-            }
-         case 'nudge':
-            if (!$arg) {
-                return null;
-            }
-            list($other, $extra) = $this->split_arg($arg);
-            if ($extra) {
-                return null;
-            } else {
-                return new NudgeCommand($user, $other);
-            }
-         case 'stats':
-            if ($arg) {
-                return null;
-            }
-            return new StatsCommand($user);
-         case 'invite':
-            if (!$arg) {
-                return null;
-            }
-            list($other, $extra) = $this->split_arg($arg);
-            if ($extra) {
-                return null;
-            } else {
-                return new InviteCommand($user, $other);
-            }
-         case 'track':
-            if (!$arg) {
-                return null;
-            }
-            list($word, $extra) = $this->split_arg($arg);
-            if ($extra) {
-                return null;
-            } else if ($word == 'off') {
-                return new TrackOffCommand($user);
-            } else {
-                return new TrackCommand($user, $word);
-            }
-         case 'untrack':
-            if (!$arg) {
-                return null;
-            }
-            list($word, $extra) = $this->split_arg($arg);
-            if ($extra) {
-                return null;
-            } else if ($word == 'all') {
-                return new TrackOffCommand($user);
-            } else {
-                return new UntrackCommand($user, $word);
-            }
-         case 'tracks':
-         case 'tracking':
-            if ($arg) {
-                return null;
-            }
-            return new TrackingCommand($user);
-         default:
-            return false;
+                
+            Event::handle('EndInterpretCommand', array($cmd, $arg, $user, $result));
         }
+
+        return $result;
     }
 
     /**

From d7b2b141be24b8de813733bafb07e624c99e4a02 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Feb 2011 17:06:15 -0500
Subject: [PATCH 200/314] commands are always lowercased in interpreter

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

diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php
index 2e79fb27ee..f2caf48bdb 100644
--- a/lib/commandinterpreter.php
+++ b/lib/commandinterpreter.php
@@ -35,8 +35,10 @@ class CommandInterpreter
         // There are a few compatibility commands from earlier versions of
         // StatusNet
 
+        $cmd = strtolower($cmd);
+
         if (Event::handle('StartIntepretCommand', array($cmd, $arg, $user, &$result))) {
-            switch(strtolower($cmd)) {
+            switch($cmd) {
             case 'help':
                 if ($arg) {
                     $result = null;

From 672eb17e942709b6b315c89b78f42aed47dfcb85 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 3 Feb 2011 17:15:12 -0800
Subject: [PATCH 201/314] Work in progress: partway through making
 profile_detail DB-accessible

---
 .../ExtendedProfile/ExtendedProfilePlugin.php |  13 ++
 plugins/ExtendedProfile/Profile_detail.php    | 144 +++++++++++++++++-
 2 files changed, 152 insertions(+), 5 deletions(-)

diff --git a/plugins/ExtendedProfile/ExtendedProfilePlugin.php b/plugins/ExtendedProfile/ExtendedProfilePlugin.php
index c981a7e2fb..3f541c0008 100644
--- a/plugins/ExtendedProfile/ExtendedProfilePlugin.php
+++ b/plugins/ExtendedProfile/ExtendedProfilePlugin.php
@@ -62,6 +62,9 @@ class ExtendedProfilePlugin extends Plugin
         case 'profiledetailsettingsaction':
             require_once dirname(__FILE__) . '/' . $lower . '.php';
             return false;
+        case 'profile_detail':
+            require_once dirname(__FILE__) . '/' . ucfirst($lower) . '.php';
+            return false;
         default:
             return true;
         }
@@ -87,6 +90,16 @@ class ExtendedProfilePlugin extends Plugin
         return true;
     }
 
+    function onCheckSchema()
+    {
+        $schema = Schema::get();
+        $schema->ensureTable('profile_detail', Profile_detail::schemaDef());
+
+        // @hack until key definition support is merged
+        Profile_detail::fixIndexes($schema);
+        return true;
+    }
+
     function onEndAccountSettingsProfileMenuItem($widget, $menu)
     {
         // TRANS: Link title attribute in user account settings menu.
diff --git a/plugins/ExtendedProfile/Profile_detail.php b/plugins/ExtendedProfile/Profile_detail.php
index ae8cdcee50..6fd96cca70 100644
--- a/plugins/ExtendedProfile/Profile_detail.php
+++ b/plugins/ExtendedProfile/Profile_detail.php
@@ -1,16 +1,150 @@
 <?php
-/* 
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+/*
+ * 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);
+}
+
 class Profile_detail extends Memcached_DataObject
 {
+    public $__table = 'submirror';
+
     public $id;
+
     public $profile_id;
     public $field;
-    public $index; // relative ordering of multiple values in the same field
+    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
 
-}
\ No newline at end of file
+    public $created;
+    public $modified;
+
+    public /*static*/ function staticGet($k, $v=null)
+    {
+        return parent::staticGet(__CLASS__, $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('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_ID,
+
+                     '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()
+    {
+        // @fixme need a reverse key on (subscribed, subscriber) as well
+        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');
+    }
+
+    function sequenceKey()
+    {
+        return array('id', true);
+    }
+
+}

From 842bc5708e4aed14d8e10a559234bd5fdce9d2a8 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 4 Feb 2011 15:51:59 -0500
Subject: [PATCH 202/314] Send a private group message with a d command

---
 plugins/PrivateGroup/Group_message.php        | 94 +++++++++++++++++++
 .../PrivateGroup/Group_message_profile.php    | 75 +++++++++++++++
 plugins/PrivateGroup/PrivateGroupPlugin.php   | 49 +++++++++-
 plugins/PrivateGroup/groupmessagecommand.php  | 85 +++++++++++++++++
 4 files changed, 302 insertions(+), 1 deletion(-)
 create mode 100644 plugins/PrivateGroup/groupmessagecommand.php

diff --git a/plugins/PrivateGroup/Group_message.php b/plugins/PrivateGroup/Group_message.php
index 27f4cff0ed..b3d34cf287 100644
--- a/plugins/PrivateGroup/Group_message.php
+++ b/plugins/PrivateGroup/Group_message.php
@@ -118,4 +118,98 @@ class Group_message extends Memcached_DataObject
     {
         return array('id' => 'K', 'uri' => 'U');
     }
+
+    static function send($user, $group, $text)
+    {
+        if (!$user->hasRight(Right::NEWMESSAGE)) {
+            // XXX: maybe break this out into a separate right
+            throw new Exception(sprintf(_('User %s not allowed to send private messages.'),
+                                        $user->nickname));
+        }
+
+        $gps = Group_privacy_settings::staticGet('group_id', $group->id);
+
+        if (empty($gps)) {
+            // make a fake one with defaults
+            $gps = new Group_privacy_settings();
+            $gps->allow_privacy = Group_privacy_settings::SOMETIMES;
+            $gps->allow_sender  = Group_privacy_settings::MEMBER;
+        }
+
+        if ($gps->allow_privacy == Group_privacy_settings::NEVER) {
+            throw new Exception(sprintf(_('Group %s does not allow private messages.'),
+                                        $group->nickname));
+        }
+
+        switch ($gps->allow_sender) {
+        case Group_privacy_settings::EVERYONE:
+            $profile = $user->getProfile();
+            if (Group_block::isBlocked($group, $profile)) {
+                throw new Exception(sprintf(_('User %s is blocked from group %s.'),
+                                            $user->nickname,
+                                            $group->nickname));
+            }
+            break;
+        case Group_privacy_settings::MEMBER:
+            if (!$user->isMember($group)) {
+                throw new Exception(sprintf(_('User %s is not a member of group %s.'),
+                                            $user->nickname,
+                                            $group->nickname));
+            }
+            break;
+        case Group_privacy_settings::ADMIN:
+            if (!$user->isAdmin($group)) {
+                throw new Exception(sprintf(_('User %s is not an administrator of group %s.'),
+                                            $user->nickname,
+                                            $group->nickname));
+            }
+            break;
+        default:
+            throw new Exception(sprintf(_('Unknown privacy settings for group %s.'),
+                                        $group->nickname));
+        }
+        
+        $text = $user->shortenLinks($text);
+
+        // We use the same limits as for 'regular' private messages.
+
+        if (Message::contentTooLong($text)) {
+            throw new Exception(sprintf(_m('That\'s too long. Maximum message size is %d character.',
+                                           'That\'s too long. Maximum message size is %d characters.',
+                                           Message::maxContent()),
+                                        Message::maxContent()));
+        }
+
+        // Valid! Let's do this thing!
+
+        $gm = new Group_message();
+        
+        $gm->id           = UUID::gen();
+        $gm->uri          = common_local_url('showgroupmessage', array('id' => $gm->id));
+        $gm->from_profile = $user->id;
+        $gm->to_group     = $group->id;
+        $gm->content      = $text; // XXX: is this cool?!
+        $gm->rendered     = common_render_text($text);
+        $gm->url          = $gm->uri;
+        $gm->created      = common_sql_now();
+
+        // This throws a conniption if there's a problem
+
+        $gm->insert();
+
+        $gm->distribute();
+
+        return $gm;
+    }
+
+    function distribute()
+    {
+        $group = User_group::staticGet('id', $this->to_group);
+        
+        $member = $group->getMembers();
+
+        while ($member->fetch()) {
+            Group_message_profile::send($this, $member);
+        }
+    }
 }
diff --git a/plugins/PrivateGroup/Group_message_profile.php b/plugins/PrivateGroup/Group_message_profile.php
index b32341ca77..fc1ff1bceb 100644
--- a/plugins/PrivateGroup/Group_message_profile.php
+++ b/plugins/PrivateGroup/Group_message_profile.php
@@ -108,4 +108,79 @@ class Group_message_profile extends Memcached_DataObject
     {
         return array('to_profile' => 'K', 'group_message_id' => 'K');
     }
+
+    /**
+     * No sequence keys in this table.
+     */
+    function sequenceKey()
+    {
+        return array(false, false, false);
+    }
+
+    function send($gm, $profile)
+    {
+        $gmp = new Group_message_profile();
+        
+        $gmp->group_message_id = $gm->id;
+        $gmp->to_profile       = $profile->id;
+        $gmp->created          = common_sql_now();
+
+        $gmp->insert();
+
+        $gmp->notify();
+
+        return $gmp;
+    }
+
+    function notify()
+    {
+        // XXX: add more here
+        $this->notifyByMail();
+    }
+
+    function notifyByMail() 
+    {
+        $to = User::staticGet('id', $this->to_profile);
+
+        if (empty($to) || is_null($to->email) || !$to->emailnotifymsg) {
+            return true;
+        }
+
+        $gm = Group_message::staticGet('id', $this->group_message_id);
+
+        $from_profile = Profile::staticGet('id', $gm->from_profile);
+
+        common_switch_locale($to->language);
+
+        // TRANS: Subject for direct-message notification email.
+        // TRANS: %s is the sending user's nickname.
+        $subject = sprintf(_('New private message from %s'), $from->nickname);
+
+        $from_profile = $from->getProfile();
+
+        // TRANS: Body for direct-message notification email.
+        // 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.
+        $body = sprintf(_("%1\$s (%2\$s) sent you a private message:\n\n".
+                          "------------------------------------------------------\n".
+                          "%3\$s\n".
+                          "------------------------------------------------------\n\n".
+                          "You can reply to their message here:\n\n".
+                          "%4\$s\n\n".
+                          "Don't reply to this email; it won't get to them.\n\n".
+                          "With kind regards,\n".
+                          "%5\$s\n"),
+                        $from_profile->getBestName(),
+                        $from->nickname,
+                        $this->content,
+                        common_local_url('newmessage', array('to' => $from->id)),
+                        common_config('site', 'name'));
+
+        $headers = _mail_prepare_headers('message', $to->nickname, $from->nickname);
+
+        common_switch_locale();
+
+        return mail_to_user($to, $subject, $body, $headers);
+    }
 }
diff --git a/plugins/PrivateGroup/PrivateGroupPlugin.php b/plugins/PrivateGroup/PrivateGroupPlugin.php
index 67e1cfb65e..4d8f2b370b 100644
--- a/plugins/PrivateGroup/PrivateGroupPlugin.php
+++ b/plugins/PrivateGroup/PrivateGroupPlugin.php
@@ -144,6 +144,7 @@ class PrivateGroupPlugin extends Plugin
         switch ($cls)
         {
         case 'GroupinboxAction':
+        case 'ShowgroupmessageAction':
             include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
             return false;
         case 'Group_privacy_settings':
@@ -151,6 +152,9 @@ class PrivateGroupPlugin extends Plugin
         case 'Group_message_profile':
             include_once $dir . '/'.$cls.'.php';
             return false;
+        case 'GroupMessageCommand':
+            include_once $dir . '/'.strtolower($cls).'.php';
+            return false;
         default:
             return true;
         }
@@ -170,6 +174,10 @@ class PrivateGroupPlugin extends Plugin
                     array('action' => 'groupinbox'),
                     array('nickname' => Nickname::DISPLAY_FMT));
 
+        $m->connect('group/message/:id',
+                    array('action' => 'showgroupmessage'),
+                    array('id' => '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'));
+
         return true;
     }
 
@@ -289,7 +297,46 @@ class PrivateGroupPlugin extends Plugin
         
         return true;
     }
- 
+
+    /**
+     * Overload 'd' command to send private messages to groups.
+     * 
+     * 'd !group word word word' will send the private message
+     * 'word word word' to the group 'group'.
+     * 
+     * @param string  $cmd     Command being run
+     * @param string  $arg     Rest of the message (including address)
+     * @param User    $user    User sending the message
+     * @param Command &$result The resulting command object to be run.
+     * 
+     * @return boolean hook value
+     */
+    function onStartIntepretCommand($cmd, $arg, $user, &$result)
+    {
+        if ($cmd == 'd' || $cmd == 'dm') {
+
+            $this->debug('Got a d command');
+
+            // Break off the first word as the address
+
+            $pieces = explode(' ', $arg, 2);
+
+            if (count($pieces) == 1) {
+                $pieces[] = null;
+            }
+
+            list($addr, $msg) = $pieces;
+
+            if (!empty($addr) && $addr[0] == '!') {
+                $result = new GroupMessageCommand($user, substr($addr, 1), $msg);
+                Event::handle('EndInterpretCommand', array($cmd, $arg, $user, $result));
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     function onPluginVersion(&$versions)
     {
         $versions[] = array('name' => 'PrivateGroup',
diff --git a/plugins/PrivateGroup/groupmessagecommand.php b/plugins/PrivateGroup/groupmessagecommand.php
new file mode 100644
index 0000000000..19136f1318
--- /dev/null
+++ b/plugins/PrivateGroup/groupmessagecommand.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * Command object for messages to groups
+ * 
+ * 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  Command
+ * @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);
+}
+
+/**
+ * Command object for messages to groups
+ *
+ * @category  General
+ * @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 GroupMessageCommand extends Command
+{
+    /** User sending the message. */
+    var $user;
+    /** Nickname of the group they're sending to. */
+    var $nickname;
+    /** Text of the message. */
+    var $text;
+
+    /**
+     * Constructor
+     *
+     * @param User   $user     User sending the message
+     * @param string $nickname Nickname of the group
+     * @param string $text     Text of message
+     */
+
+    function __construct($user, $nickname, $text)
+    {
+        $this->user     = $user;
+        $this->nickname = $nickname;
+        $this->text     = $text;
+    }
+
+    function handle($channel)
+    {
+        // Throws a command exception if group not found
+        $group = $this->getGroup($this->nickname);
+
+        $gm = Group_message::send($this->user, $group, $this->text);
+
+        $channel->output($this->user, 
+                         sprintf(_('Direct message to group %s sent.'), 
+                                 $group->nickname));
+
+        return true;
+    }
+}

From cd536e30991c61bcfc432fa48b8d31b2b0f8e41a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 5 Feb 2011 16:18:59 -0500
Subject: [PATCH 203/314] move MESSAGES_PER_PAGE to common.php

---
 lib/common.php  | 1 +
 lib/mailbox.php | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/common.php b/lib/common.php
index 08779fb6fd..4fd49a5592 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -36,6 +36,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);
diff --git a/lib/mailbox.php b/lib/mailbox.php
index 2b00f5ffde..63bffa75cc 100644
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-define('MESSAGES_PER_PAGE', 20);
-
 /**
  * common superclass for direct messages inbox and outbox
  *

From 143cc4bdd08ee363518219f1d0b769028c508e11 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Feb 2011 09:46:26 -0500
Subject: [PATCH 204/314] Show private messages to groups in a list

Shows the messages to a private group in a list. New classes for
showing a group private message and list of group private messages.

New actions for showing a stream of group private messages and a
single group private message.
---
 plugins/PrivateGroup/Group_message.php        |  32 +++
 plugins/PrivateGroup/PrivateGroupPlugin.php   |   2 +
 plugins/PrivateGroup/groupinbox.php           | 214 +++++++++---------
 plugins/PrivateGroup/groupmessagelist.php     |  77 +++++++
 plugins/PrivateGroup/groupmessagelistitem.php | 113 +++++++++
 plugins/PrivateGroup/showgroupmessage.php     | 188 +++++++++++++++
 6 files changed, 516 insertions(+), 110 deletions(-)
 create mode 100644 plugins/PrivateGroup/groupmessagelist.php
 create mode 100644 plugins/PrivateGroup/groupmessagelistitem.php
 create mode 100644 plugins/PrivateGroup/showgroupmessage.php

diff --git a/plugins/PrivateGroup/Group_message.php b/plugins/PrivateGroup/Group_message.php
index b3d34cf287..21147b4629 100644
--- a/plugins/PrivateGroup/Group_message.php
+++ b/plugins/PrivateGroup/Group_message.php
@@ -212,4 +212,36 @@ class Group_message extends Memcached_DataObject
             Group_message_profile::send($this, $member);
         }
     }
+
+    function getGroup()
+    {
+        $group = User_group::staticGet('id', $this->to_group);
+        if (empty($group)) {
+            throw new ServerException(_('No group for group message'));
+        }
+        return $group;
+    }
+
+    function getSender()
+    {
+        $sender = Profile::staticGet('id', $this->from_profile);
+        if (empty($sender)) {
+            throw new ServerException(_('No sender for group message'));
+        }
+        return $sender;
+    }
+
+    static function forGroup($group, $offset, $limit)
+    {
+        // XXX: cache
+        $gm = new Group_message();
+
+        $gm->to_group = $group->id;
+        $gm->orderBy('created DESC');
+        $gm->limit($offset, $limit);
+
+        $gm->find();
+
+        return $gm;
+    }
 }
diff --git a/plugins/PrivateGroup/PrivateGroupPlugin.php b/plugins/PrivateGroup/PrivateGroupPlugin.php
index 4d8f2b370b..39e788074c 100644
--- a/plugins/PrivateGroup/PrivateGroupPlugin.php
+++ b/plugins/PrivateGroup/PrivateGroupPlugin.php
@@ -153,6 +153,8 @@ class PrivateGroupPlugin extends Plugin
             include_once $dir . '/'.$cls.'.php';
             return false;
         case 'GroupMessageCommand':
+        case 'GroupMessageList':
+        case 'GroupMessageListItem':
             include_once $dir . '/'.strtolower($cls).'.php';
             return false;
         default:
diff --git a/plugins/PrivateGroup/groupinbox.php b/plugins/PrivateGroup/groupinbox.php
index a793ac6de2..8b16e0632a 100644
--- a/plugins/PrivateGroup/groupinbox.php
+++ b/plugins/PrivateGroup/groupinbox.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) 2010, StatusNet, Inc.
+ *
+ * List of private messages to this 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
@@ -25,140 +19,140 @@
  *
  * 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  PrivateGroup
+ * @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);
 }
 
 /**
- * Give a warm greeting to our friendly user
+ * Show a list of private messages to this group
  *
- * 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  PrivateGroup
+ * @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 HelloAction extends Action
+
+class GroupinboxAction extends GroupDesignAction
 {
-    var $user = null;
-    var $gc   = null;
+    var $gm;
 
     /**
-     * Take arguments for running
+     * For initializing members of the class.
      *
-     * 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.
+     * @param array $argarray misc. arguments
      *
-     * 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 boolean true
      */
-    function prepare($args)
+    function prepare($argarray)
     {
-        parent::prepare($args);
+        parent::prepare($argarray);
 
-        $this->user = common_current_user();
+        $cur = common_current_user();
 
-        if (!empty($this->user)) {
-            $this->gc = User_greeting_count::inc($this->user->id);
+        if (empty($cur)) {
+            throw new ClientException(_('Only for logged-in users'), 403);
         }
 
+        $nicknameArg = $this->trimmed('nickname');
+
+        $nickname = common_canonical_nickname($nicknameArg);
+
+        if ($nickname != $nicknameArg) {
+            $url = common_local_url('groupinbox', array('nickname' => $nickname));
+            common_redirect($url);
+            return false;
+        }
+
+        $localGroup = Local_group::staticGet('nickname', $nickname);
+
+        if (empty($localGroup)) {
+            throw new ClientException(_('No such group'), 404);
+        }
+
+        $this->group = User_group::staticGet('id', $localGroup->group_id);
+
+        if (empty($this->group)) {
+            throw new ClientException(_('No such group'), 404);
+        }
+
+        if (!$cur->isMember($this->group)) {
+            throw new ClientException(_('Only for members'), 403);
+        }
+
+        $this->page = $this->trimmed('page');
+
+        if (!$this->page) {
+            $this->page = 1;
+        }
+        
+        $this->gm = Group_message::forGroup($this->group, 
+                                            ($this->page - 1) * MESSAGES_PER_PAGE,
+                                            MESSAGES_PER_PAGE + 1);
         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));
-        }
+        $gml = new GroupMessageList($this, $this->gm);
+        $gml->show();
+    }
+
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return void
+     */
+    function handle($argarray=null)
+    {
+        $this->showPage();
     }
 
     /**
      * 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;
+        return true;
+    }
+
+    /**
+     * Title of the page
+     *
+     * @return string page title, with page number
+     */
+    function title()
+    {
+        $base = $this->group->getFancyName();
+
+        if ($this->page == 1) {
+            return sprintf(_('%s group inbox'), $base);
+        } else {
+            // TRANS: Page title for any but first group page.
+            // TRANS: %1$s is a group name, $2$s is a page number.
+            return sprintf(_('%1$s group inbox, page %2$d'),
+                           $base,
+                           $this->page);
+        }
     }
 }
diff --git a/plugins/PrivateGroup/groupmessagelist.php b/plugins/PrivateGroup/groupmessagelist.php
new file mode 100644
index 0000000000..09f453d520
--- /dev/null
+++ b/plugins/PrivateGroup/groupmessagelist.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * Widget for showing list of group messages
+ * 
+ * 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  PrivateGroup
+ * @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 showing list of group messages
+ *
+ * @category  PrivateGroup
+ * @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 GroupMessageList extends Widget
+{
+    var $gm;
+
+    /**
+     * Constructor
+     *
+     * @param HTMLOutputter $out output context
+     * @param Group_message $gm  Group message stream
+     */
+    function __construct($out, $gm)
+    {
+        parent::__construct($out);
+        $this->gm = $gm;
+    }
+
+    /**
+     * Show the list
+     *
+     * @return void
+     */
+    function show()
+    {
+        $this->out->elementStart('ul', 'notices messages group-messages');
+        while ($this->gm->fetch()) {
+            $gmli = new GroupMessageListItem($this->out, $this->gm);
+            $gmli->show();
+        }
+        $this->out->elementEnd('ul');
+    }
+}
diff --git a/plugins/PrivateGroup/groupmessagelistitem.php b/plugins/PrivateGroup/groupmessagelistitem.php
new file mode 100644
index 0000000000..e7b7c6a8f8
--- /dev/null
+++ b/plugins/PrivateGroup/groupmessagelistitem.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * Widget for showing an individual group message
+ * 
+ * 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  PrivateGroup
+ * @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 showing a single group message
+ *
+ * @category  PrivateGroup
+ * @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 GroupMessageListItem extends Widget
+{
+    var $gm;
+
+    /**
+     * Constructor
+     *
+     * @param HTMLOutputter $out output context
+     * @param Group_message $gm  Group message
+     */
+    function __construct($out, $gm)
+    {
+        parent::__construct($out);
+        $this->gm = $gm;
+    }
+
+    /**
+     * Show the item
+     *
+     * @return void
+     */
+    function show()
+    {
+        $group  = $this->gm->getGroup();
+        $sender = $this->gm->getSender();
+ 
+        $this->out->elementStart('li', array('class' => 'hentry notice message group-message',
+                                         'id' => 'message-' . $this->gm->id));
+
+        $this->out->elementStart('div', 'entry-title');
+        $this->out->elementStart('span', 'vcard author');
+        $this->out->elementStart('a', 
+                                 array('href' => $sender->profileurl,
+                                       'class' => 'url'));
+        $avatar = $sender->getAvatar(AVATAR_STREAM_SIZE);
+        $this->out->element('img', array('src' => ($avatar) ?
+                                    $avatar->displayUrl() :
+                                    Avatar::defaultImage(AVATAR_STREAM_SIZE),
+                                    'width' => AVATAR_STREAM_SIZE,
+                                    'height' => AVATAR_STREAM_SIZE,
+                                    'class' => 'photo avatar',
+                                    'alt' => $sender->getBestName()));
+        $this->out->element('span',
+                            array('class' => 'nickname fn'),
+                            $sender->nickname);
+        $this->out->elementEnd('a');
+        $this->out->elementEnd('span');
+
+        $this->out->elementStart('p', array('class' => 'entry-content message-content'));
+        $this->out->raw($this->gm->rendered);
+        $this->out->elementEnd('p');
+        $this->out->elementEnd('div');
+
+        $this->out->elementStart('div', 'entry-content');
+        $this->out->elementStart('a', array('rel' => 'bookmark',
+                                            'class' => 'timestamp',
+                                            'href' => $this->gm->url));
+        $dt = common_date_iso8601($this->gm->created);
+        $this->out->element('abbr', array('class' => 'published',
+                                          'title' => $dt),
+                            common_date_string($this->gm->created));
+        $this->out->elementEnd('a');
+        $this->out->elementEnd('div');
+
+        $this->out->elementEnd('li');
+    }
+}
diff --git a/plugins/PrivateGroup/showgroupmessage.php b/plugins/PrivateGroup/showgroupmessage.php
new file mode 100644
index 0000000000..cc0126e03d
--- /dev/null
+++ b/plugins/PrivateGroup/showgroupmessage.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * Show a single group message
+ * 
+ * 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  PrivateGroup
+ * @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 private group message
+ *
+ * @category  PrivateGroup
+ * @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 ShowgroupmessageAction extends Action
+{
+    var $gm;
+    var $group;
+    var $sender;
+    var $user;
+
+    /**
+     * 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(_('Only logged-in users can view private messages.'),
+                                      403);
+        }
+
+        $id = $this->trimmed('id');
+
+        $this->gm = Group_message::staticGet('id', $id);
+
+        if (empty($this->gm)) {
+            throw new ClientException(_('No such message'), 404);
+        }
+
+        $this->group = User_group::staticGet('id', $this->gm->to_group);
+
+        if (empty($this->group)) {
+            throw new ServerException(_('Group not found.'));
+        }
+
+        if (!$this->user->isMember($this->group)) {
+            throw new ClientException(_('Cannot read message.'), 403);
+        }
+
+        $this->sender = Profile::staticGet('id', $this->gm->from_profile);
+
+        if (empty($this->sender)) {
+            throw new ServerException(_('No sender found.'));
+        }
+
+        return true;
+    }
+
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return void
+     */
+
+    function handle($argarray=null)
+    {
+        $this->showPage();
+    }
+
+    /**
+     * Title of the page
+     */
+
+    function title()
+    {
+        return sprintf(_('Message from %1$s to group %2$s on %3$s'),
+                       $this->sender->nickname,
+                       $this->group->nickname,
+                       common_exact_date($this->gm->created));
+    }
+
+    /**
+     * Show the content area.
+     */
+
+    function showContent()
+    {
+        $this->elementStart('ul', 'notices messages');
+        $gmli = new GroupMessageListItem($this, $this->gm);
+        $gmli->show();
+        $this->elementEnd('ul');
+    }
+
+    /**
+     * 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()
+    {
+        return max(strtotime($this->group->modified),
+                   strtotime($this->sender->modified),
+                   strtotime($this->gm->modified));
+    }
+
+    /**
+     * Return etag, if applicable.
+     *
+     * MAY override
+     *
+     * @return string etag http header
+     */
+    function etag()
+    {
+        $avatar = $this->sender->getAvatar(AVATAR_STREAM_SIZE);
+
+        $avtime = ($avatar) ? strtotime($avatar->modified) : 0;
+
+        return 'W/"' . implode(':', array($this->arg('action'),
+                                          common_user_cache_hash(),
+                                          common_language(),
+                                          $this->gm->id,
+                                          strtotime($this->sender->modified),
+                                          strtotime($this->group->modified),
+                                          $avtime)) . '"';
+    }
+}

From 4a435e6670a22935e2e964cafffe26e2c7d7eee4 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Feb 2011 10:18:54 -0500
Subject: [PATCH 205/314] Show group local nav on group inbox

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

diff --git a/plugins/PrivateGroup/groupinbox.php b/plugins/PrivateGroup/groupinbox.php
index 8b16e0632a..419053151c 100644
--- a/plugins/PrivateGroup/groupinbox.php
+++ b/plugins/PrivateGroup/groupinbox.php
@@ -104,6 +104,12 @@ class GroupinboxAction extends GroupDesignAction
         return true;
     }
 
+    function showLocalNav()
+    {
+        $nav = new GroupNav($this, $this->group);
+        $nav->show();
+    }
+
     function showContent()
     {
         $gml = new GroupMessageList($this, $this->gm);

From 8b20399932ea3466a6019295be761249da70c52c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Feb 2011 10:23:56 -0500
Subject: [PATCH 206/314] Add a hook for group action list

---
 EVENTS.txt            |  8 ++++++++
 actions/showgroup.php | 35 +++++++++++++++++++----------------
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/EVENTS.txt b/EVENTS.txt
index 98927127b7..d6d8004674 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -1082,3 +1082,11 @@ EndInterpretCommand: Before running a command
 - $user: User who issued the command
 - $result: Resulting command
 
+StartGroupActionsList: Start the list of actions on a group profile page (after <ul>, before first <li>)
+- $action: action being executed (for output and params)
+- $group: group for the page
+
+EndGroupActionsList: End the list of actions on a group profile page (before </ul>, after last </li>)
+- $action: action being executed (for output and params)
+- $group: group for the page
+
diff --git a/actions/showgroup.php b/actions/showgroup.php
index f38cd420ac..58d7ec7c6f 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -303,25 +303,28 @@ class ShowgroupAction extends GroupDesignAction
         // TRANS: Group actions header (h2). Text hidden by default.
         $this->element('h2', null, _('Group actions'));
         $this->elementStart('ul');
-        $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();
+        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));
             }
-            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');
+            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');

From 5db1479a9526fbb264d1d51647e925355ed6f062 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Feb 2011 11:24:00 -0500
Subject: [PATCH 207/314] Form for posting a group message on group inbox

---
 plugins/PrivateGroup/Group_message.php        |  43 +----
 .../PrivateGroup/Group_privacy_settings.php   |  47 +++++
 plugins/PrivateGroup/PrivateGroupPlugin.php   |   6 +
 plugins/PrivateGroup/groupinbox.php           |   6 +
 plugins/PrivateGroup/groupmessageform.php     | 166 ++++++++++++++++++
 plugins/PrivateGroup/newgroupmessage.php      | 155 ++++++++++++++++
 6 files changed, 382 insertions(+), 41 deletions(-)
 create mode 100644 plugins/PrivateGroup/groupmessageform.php
 create mode 100644 plugins/PrivateGroup/newgroupmessage.php

diff --git a/plugins/PrivateGroup/Group_message.php b/plugins/PrivateGroup/Group_message.php
index 21147b4629..07d4c57c08 100644
--- a/plugins/PrivateGroup/Group_message.php
+++ b/plugins/PrivateGroup/Group_message.php
@@ -127,48 +127,8 @@ class Group_message extends Memcached_DataObject
                                         $user->nickname));
         }
 
-        $gps = Group_privacy_settings::staticGet('group_id', $group->id);
+        Group_privacy_settings::ensurePost($user, $group);
 
-        if (empty($gps)) {
-            // make a fake one with defaults
-            $gps = new Group_privacy_settings();
-            $gps->allow_privacy = Group_privacy_settings::SOMETIMES;
-            $gps->allow_sender  = Group_privacy_settings::MEMBER;
-        }
-
-        if ($gps->allow_privacy == Group_privacy_settings::NEVER) {
-            throw new Exception(sprintf(_('Group %s does not allow private messages.'),
-                                        $group->nickname));
-        }
-
-        switch ($gps->allow_sender) {
-        case Group_privacy_settings::EVERYONE:
-            $profile = $user->getProfile();
-            if (Group_block::isBlocked($group, $profile)) {
-                throw new Exception(sprintf(_('User %s is blocked from group %s.'),
-                                            $user->nickname,
-                                            $group->nickname));
-            }
-            break;
-        case Group_privacy_settings::MEMBER:
-            if (!$user->isMember($group)) {
-                throw new Exception(sprintf(_('User %s is not a member of group %s.'),
-                                            $user->nickname,
-                                            $group->nickname));
-            }
-            break;
-        case Group_privacy_settings::ADMIN:
-            if (!$user->isAdmin($group)) {
-                throw new Exception(sprintf(_('User %s is not an administrator of group %s.'),
-                                            $user->nickname,
-                                            $group->nickname));
-            }
-            break;
-        default:
-            throw new Exception(sprintf(_('Unknown privacy settings for group %s.'),
-                                        $group->nickname));
-        }
-        
         $text = $user->shortenLinks($text);
 
         // We use the same limits as for 'regular' private messages.
@@ -244,4 +204,5 @@ class Group_message extends Memcached_DataObject
 
         return $gm;
     }
+
 }
diff --git a/plugins/PrivateGroup/Group_privacy_settings.php b/plugins/PrivateGroup/Group_privacy_settings.php
index 7861571222..898ac266ce 100644
--- a/plugins/PrivateGroup/Group_privacy_settings.php
+++ b/plugins/PrivateGroup/Group_privacy_settings.php
@@ -144,4 +144,51 @@ class Group_privacy_settings extends Memcached_DataObject
     {
         return array(false, false, false);
     }
+
+    function ensurePost($user, $group)
+    {
+        $gps = Group_privacy_settings::staticGet('group_id', $group->id);
+
+        if (empty($gps)) {
+            // make a fake one with defaults
+            $gps = new Group_privacy_settings();
+            $gps->allow_privacy = Group_privacy_settings::SOMETIMES;
+            $gps->allow_sender  = Group_privacy_settings::MEMBER;
+        }
+
+        if ($gps->allow_privacy == Group_privacy_settings::NEVER) {
+            throw new Exception(sprintf(_('Group %s does not allow private messages.'),
+                                        $group->nickname));
+        }
+
+        switch ($gps->allow_sender) {
+        case Group_privacy_settings::EVERYONE:
+            $profile = $user->getProfile();
+            if (Group_block::isBlocked($group, $profile)) {
+                throw new Exception(sprintf(_('User %s is blocked from group %s.'),
+                                            $user->nickname,
+                                            $group->nickname));
+            }
+            break;
+        case Group_privacy_settings::MEMBER:
+            if (!$user->isMember($group)) {
+                throw new Exception(sprintf(_('User %s is not a member of group %s.'),
+                                            $user->nickname,
+                                            $group->nickname));
+            }
+            break;
+        case Group_privacy_settings::ADMIN:
+            if (!$user->isAdmin($group)) {
+                throw new Exception(sprintf(_('User %s is not an administrator of group %s.'),
+                                            $user->nickname,
+                                            $group->nickname));
+            }
+            break;
+        default:
+            throw new Exception(sprintf(_('Unknown privacy settings for group %s.'),
+                                        $group->nickname));
+        }
+
+        return true;
+    }
 }
diff --git a/plugins/PrivateGroup/PrivateGroupPlugin.php b/plugins/PrivateGroup/PrivateGroupPlugin.php
index 39e788074c..001f085c0d 100644
--- a/plugins/PrivateGroup/PrivateGroupPlugin.php
+++ b/plugins/PrivateGroup/PrivateGroupPlugin.php
@@ -145,6 +145,7 @@ class PrivateGroupPlugin extends Plugin
         {
         case 'GroupinboxAction':
         case 'ShowgroupmessageAction':
+        case 'NewgroupmessageAction':
             include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
             return false;
         case 'Group_privacy_settings':
@@ -155,6 +156,7 @@ class PrivateGroupPlugin extends Plugin
         case 'GroupMessageCommand':
         case 'GroupMessageList':
         case 'GroupMessageListItem':
+        case 'GroupMessageForm':
             include_once $dir . '/'.strtolower($cls).'.php';
             return false;
         default:
@@ -180,6 +182,10 @@ class PrivateGroupPlugin extends Plugin
                     array('action' => 'showgroupmessage'),
                     array('id' => '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'));
 
+        $m->connect('group/:nickname/message/new',
+                    array('action' => 'newgroupmessage'),
+                    array('nickname' => Nickname::DISPLAY_FMT));
+
         return true;
     }
 
diff --git a/plugins/PrivateGroup/groupinbox.php b/plugins/PrivateGroup/groupinbox.php
index 419053151c..55bf4b0ee2 100644
--- a/plugins/PrivateGroup/groupinbox.php
+++ b/plugins/PrivateGroup/groupinbox.php
@@ -110,6 +110,12 @@ class GroupinboxAction extends GroupDesignAction
         $nav->show();
     }
 
+    function showNoticeForm()
+    {
+        $form = new GroupMessageForm($this, $this->group);
+        $form->show();
+    }
+
     function showContent()
     {
         $gml = new GroupMessageList($this, $this->gm);
diff --git a/plugins/PrivateGroup/groupmessageform.php b/plugins/PrivateGroup/groupmessageform.php
new file mode 100644
index 0000000000..4564a60761
--- /dev/null
+++ b/plugins/PrivateGroup/groupmessageform.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Form for posting a group message
+ * 
+ * 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  PrivateGroup
+ * @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 posting a group message
+ *
+ * @category  PrivateGroup
+ * @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 GroupMessageForm extends Form
+{
+    var $group;
+    var $content;
+
+    /**
+     * Constructor
+     *
+     * @param HTMLOutputter $out   Output context
+     * @param User_group    $group Group to post to
+     *
+     * @todo add a drop-down list to post to any group
+     */
+
+    function __construct($out, $group, $content=null)
+    {
+        parent::__construct($out);
+
+        $this->group   = $group;
+        $this->content = $content;
+    }
+
+    /**
+     * Action for the form
+     */
+    function action()
+    { 
+        return common_local_url('newgroupmessage',
+                                array('nickname' => $this->group->nickname));
+    }
+
+    /**
+     * Legend for the form
+     *
+     * @param
+     *
+     * @return
+     */
+    function formLegend()
+    {
+        $this->out->element('legend',
+                            null,
+                            sprintf(_('Message to %s'), $this->group->nickname));
+    }
+
+    /**
+     * id for the form
+     *
+     * @param
+     *
+     * @return
+     */
+
+    function id()
+    {
+        return 'form_notice-group-message';
+    }
+
+    /**
+     * class for the form
+     *
+     * @param
+     *
+     * @return
+     */
+
+    function formClass()
+    {
+        return 'form_notice';
+    }
+
+    /**
+     * Entry data
+     *
+     * @param
+     *
+     * @return
+     */
+
+    function formData()
+    {
+        $this->out->element('label', array('for' => 'notice_data-text',
+                                           'id' => 'notice_data-text-label'),
+                            sprintf(_('Direct message to %s'), $this->group->nickname));
+
+        $this->out->element('textarea', array('id' => 'notice_data-text',
+                                              'cols' => 35,
+                                              'rows' => 4,
+                                              'name' => 'content'),
+                            ($this->content) ? $this->content : '');
+
+        $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'),
+                                $contentLimit);
+            $this->out->elementEnd('dl');
+        }
+    }
+
+    /**
+     * Legend for the form
+     *
+     * @param
+     *
+     * @return
+     */
+
+    function formActions()
+    {
+        $this->out->element('input', array('id' => 'notice_action-submit',
+                                           'class' => 'submit',
+                                           'name' => 'message_send',
+                                           'type' => 'submit',
+                                           'value' => _m('Send button for sending notice', 'Send')));
+    }
+}
diff --git a/plugins/PrivateGroup/newgroupmessage.php b/plugins/PrivateGroup/newgroupmessage.php
new file mode 100644
index 0000000000..c2755596b5
--- /dev/null
+++ b/plugins/PrivateGroup/newgroupmessage.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * Action for adding a new group message
+ * 
+ * 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 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);
+}
+
+/**
+ * Action for adding a new group message
+ *
+ * @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 NewgroupmessageAction extends Action
+{
+    var $group;
+    var $user;
+    var $text;
+
+    /**
+     * 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.'), 403);
+        }
+
+        if (!$this->user->hasRight(Right::NEWMESSAGE)) {
+            throw new Exception(sprintf(_('User %s not allowed to send private messages.'),
+                                        $this->user->nickname));
+        }
+
+        $nicknameArg = $this->trimmed('nickname');
+
+        $nickname = common_canonical_nickname($nicknameArg);
+
+        if ($nickname != $nicknameArg) {
+            $url = common_local_url('newgroupmessage', array('nickname' => $nickname));
+            common_redirect($url, 301);
+            return false;
+        }
+
+        $localGroup = Local_group::staticGet('nickname', $nickname);
+
+        if (empty($localGroup)) {
+            throw new ClientException(_('No such group'), 404);
+        }
+
+        $this->group = User_group::staticGet('id', $localGroup->group_id);
+
+        if (empty($this->group)) {
+            throw new ClientException(_('No such group'), 404);
+        }
+
+        // This throws an exception on error
+
+        Group_privacy_settings::ensurePost($this->user, $this->group);
+
+        // If we're posted to, check session token and get text
+
+        if ($this->isPost()) {
+            $this->checkSessionToken();
+            $this->text = $this->trimmed('content');
+        }
+
+        return true;
+    }
+
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return void
+     */
+
+    function handle($argarray=null)
+    {
+        if ($this->isPost()) {
+            $this->sendNewMessage();
+        } else {
+            $this->showPage();
+        }
+    }
+
+    function sendNewMessage()
+    {
+        $gm = Group_message::send($this->user, $this->group, $this->text);
+
+        if ($this->boolean('ajax')) {
+            $this->startHTML('text/xml;charset=utf-8');
+            $this->elementStart('head');
+            $this->element('title', null, _('Message sent'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            $this->element('p',
+                           array('id' => 'command_result'),
+                           sprintf(_('Direct message to %s sent.'),
+                                   $this->group->nickname));
+            $this->elementEnd('body');
+            $this->elementEnd('html');
+        } else {
+            common_redirect($gm->url, 303);
+        }
+    }
+
+    function title()
+    {
+        return sprintf(_('New message to group %s'), $this->group->nickname);
+    }
+}

From 951df6b02f1dcb51ae173d3ee5b822edc1e1661c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Feb 2011 11:51:38 -0500
Subject: [PATCH 208/314] button on the group page to post a new message

---
 plugins/PrivateGroup/PrivateGroupPlugin.php | 33 +++++++++++++++++++++
 plugins/PrivateGroup/newgroupmessage.php    |  6 ++++
 2 files changed, 39 insertions(+)

diff --git a/plugins/PrivateGroup/PrivateGroupPlugin.php b/plugins/PrivateGroup/PrivateGroupPlugin.php
index 001f085c0d..6ead6965ec 100644
--- a/plugins/PrivateGroup/PrivateGroupPlugin.php
+++ b/plugins/PrivateGroup/PrivateGroupPlugin.php
@@ -345,6 +345,39 @@ class PrivateGroupPlugin extends Plugin
         return true;
     }
 
+    /**
+     * To add a "Message" button to the group profile page
+     *
+     * @param Action     $action The showgroup action being shown
+     * @param User_group $group  The current group
+     * 
+     * @return boolean hook value
+     */
+    function onEndGroupActionsList($action, $group)
+    {
+        $cur = common_current_user();
+
+        if (empty($cur)) {
+            return true;
+        }
+
+        try {
+            Group_privacy_settings::ensurePost($cur, $group);
+        } catch (Exception $e) {
+            return true;
+        }
+
+        $action->elementStart('li', 'entity_send-a-message');
+        $action->element('a', array('href' => common_local_url('newgroupmessage', array('nickname' => $group->nickname)),
+                                    'title' => _('Send a direct message to this group')),
+                         _('Message'));
+        // $form = new GroupMessageForm($action, $group);
+        // $form->hidden = true;
+        // $form->show();
+        $action->elementEnd('li');
+        return true;
+    }
+ 
     function onPluginVersion(&$versions)
     {
         $versions[] = array('name' => 'PrivateGroup',
diff --git a/plugins/PrivateGroup/newgroupmessage.php b/plugins/PrivateGroup/newgroupmessage.php
index c2755596b5..a2c5dfdbdb 100644
--- a/plugins/PrivateGroup/newgroupmessage.php
+++ b/plugins/PrivateGroup/newgroupmessage.php
@@ -127,6 +127,12 @@ class NewgroupmessageAction extends Action
         }
     }
 
+    function showNoticeForm()
+    {
+        $form = new GroupMessageForm($this, $this->group);
+        $form->show();
+    }
+
     function sendNewMessage()
     {
         $gm = Group_message::send($this->user, $this->group, $this->text);

From ee0bbdf89cc6691b16a851a3beab19b7befeb480 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Feb 2011 11:55:16 -0500
Subject: [PATCH 209/314] Add group info to new group message email

---
 plugins/PrivateGroup/Group_message_profile.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/plugins/PrivateGroup/Group_message_profile.php b/plugins/PrivateGroup/Group_message_profile.php
index fc1ff1bceb..332337423a 100644
--- a/plugins/PrivateGroup/Group_message_profile.php
+++ b/plugins/PrivateGroup/Group_message_profile.php
@@ -150,11 +150,13 @@ class Group_message_profile extends Memcached_DataObject
 
         $from_profile = Profile::staticGet('id', $gm->from_profile);
 
+        $group = $gm->getGroup();
+
         common_switch_locale($to->language);
 
         // TRANS: Subject for direct-message notification email.
         // TRANS: %s is the sending user's nickname.
-        $subject = sprintf(_('New private message from %s'), $from->nickname);
+        $subject = sprintf(_('New private message from %s to group %s'), $from->nickname, $group->nickname);
 
         $from_profile = $from->getProfile();
 
@@ -162,17 +164,18 @@ class Group_message_profile extends Memcached_DataObject
         // 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.
-        $body = sprintf(_("%1\$s (%2\$s) sent you a private message:\n\n".
+        $body = sprintf(_("%1\$s (%2\$s) sent a private message to group %3\$s:\n\n".
                           "------------------------------------------------------\n".
-                          "%3\$s\n".
+                          "%4\$s\n".
                           "------------------------------------------------------\n\n".
                           "You can reply to their message here:\n\n".
-                          "%4\$s\n\n".
+                          "%5\$s\n\n".
                           "Don't reply to this email; it won't get to them.\n\n".
                           "With kind regards,\n".
-                          "%5\$s\n"),
+                          "%6\$s\n"),
                         $from_profile->getBestName(),
                         $from->nickname,
+                        $group->nickname,
                         $this->content,
                         common_local_url('newmessage', array('to' => $from->id)),
                         common_config('site', 'name'));

From 20824292c986733d3efb71fb4aaf411e5b008b94 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Feb 2011 11:57:34 -0500
Subject: [PATCH 210/314] Rename PrivateGroup to GroupPrivateMessage to be
 clearer

---
 .../GroupPrivateMessagePlugin.php}                          | 6 +++---
 .../{PrivateGroup => GroupPrivateMessage}/Group_message.php | 0
 .../Group_message_profile.php                               | 0
 .../Group_privacy_settings.php                              | 0
 .../{PrivateGroup => GroupPrivateMessage}/groupinbox.php    | 0
 .../groupmessagecommand.php                                 | 0
 .../groupmessageform.php                                    | 0
 .../groupmessagelist.php                                    | 0
 .../groupmessagelistitem.php                                | 0
 .../newgroupmessage.php                                     | 0
 .../showgroupmessage.php                                    | 0
 11 files changed, 3 insertions(+), 3 deletions(-)
 rename plugins/{PrivateGroup/PrivateGroupPlugin.php => GroupPrivateMessage/GroupPrivateMessagePlugin.php} (98%)
 rename plugins/{PrivateGroup => GroupPrivateMessage}/Group_message.php (100%)
 rename plugins/{PrivateGroup => GroupPrivateMessage}/Group_message_profile.php (100%)
 rename plugins/{PrivateGroup => GroupPrivateMessage}/Group_privacy_settings.php (100%)
 rename plugins/{PrivateGroup => GroupPrivateMessage}/groupinbox.php (100%)
 rename plugins/{PrivateGroup => GroupPrivateMessage}/groupmessagecommand.php (100%)
 rename plugins/{PrivateGroup => GroupPrivateMessage}/groupmessageform.php (100%)
 rename plugins/{PrivateGroup => GroupPrivateMessage}/groupmessagelist.php (100%)
 rename plugins/{PrivateGroup => GroupPrivateMessage}/groupmessagelistitem.php (100%)
 rename plugins/{PrivateGroup => GroupPrivateMessage}/newgroupmessage.php (100%)
 rename plugins/{PrivateGroup => GroupPrivateMessage}/showgroupmessage.php (100%)

diff --git a/plugins/PrivateGroup/PrivateGroupPlugin.php b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
similarity index 98%
rename from plugins/PrivateGroup/PrivateGroupPlugin.php
rename to plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
index 6ead6965ec..9707c08107 100644
--- a/plugins/PrivateGroup/PrivateGroupPlugin.php
+++ b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
@@ -47,7 +47,7 @@ if (!defined('STATUSNET')) {
  * @link      http://status.net/
  */
 
-class PrivateGroupPlugin extends Plugin
+class GroupPrivateMessagePlugin extends Plugin
 {
     /**
      * Database schema setup
@@ -380,10 +380,10 @@ class PrivateGroupPlugin extends Plugin
  
     function onPluginVersion(&$versions)
     {
-        $versions[] = array('name' => 'PrivateGroup',
+        $versions[] = array('name' => 'GroupPrivateMessage',
                             'version' => STATUSNET_VERSION,
                             'author' => 'Evan Prodromou',
-                            'homepage' => 'http://status.net/wiki/Plugin:PrivateGroup',
+                            'homepage' => 'http://status.net/wiki/Plugin:GroupPrivateMessage',
                             'rawdescription' =>
                             _m('Allow posting DMs to a group.'));
         return true;
diff --git a/plugins/PrivateGroup/Group_message.php b/plugins/GroupPrivateMessage/Group_message.php
similarity index 100%
rename from plugins/PrivateGroup/Group_message.php
rename to plugins/GroupPrivateMessage/Group_message.php
diff --git a/plugins/PrivateGroup/Group_message_profile.php b/plugins/GroupPrivateMessage/Group_message_profile.php
similarity index 100%
rename from plugins/PrivateGroup/Group_message_profile.php
rename to plugins/GroupPrivateMessage/Group_message_profile.php
diff --git a/plugins/PrivateGroup/Group_privacy_settings.php b/plugins/GroupPrivateMessage/Group_privacy_settings.php
similarity index 100%
rename from plugins/PrivateGroup/Group_privacy_settings.php
rename to plugins/GroupPrivateMessage/Group_privacy_settings.php
diff --git a/plugins/PrivateGroup/groupinbox.php b/plugins/GroupPrivateMessage/groupinbox.php
similarity index 100%
rename from plugins/PrivateGroup/groupinbox.php
rename to plugins/GroupPrivateMessage/groupinbox.php
diff --git a/plugins/PrivateGroup/groupmessagecommand.php b/plugins/GroupPrivateMessage/groupmessagecommand.php
similarity index 100%
rename from plugins/PrivateGroup/groupmessagecommand.php
rename to plugins/GroupPrivateMessage/groupmessagecommand.php
diff --git a/plugins/PrivateGroup/groupmessageform.php b/plugins/GroupPrivateMessage/groupmessageform.php
similarity index 100%
rename from plugins/PrivateGroup/groupmessageform.php
rename to plugins/GroupPrivateMessage/groupmessageform.php
diff --git a/plugins/PrivateGroup/groupmessagelist.php b/plugins/GroupPrivateMessage/groupmessagelist.php
similarity index 100%
rename from plugins/PrivateGroup/groupmessagelist.php
rename to plugins/GroupPrivateMessage/groupmessagelist.php
diff --git a/plugins/PrivateGroup/groupmessagelistitem.php b/plugins/GroupPrivateMessage/groupmessagelistitem.php
similarity index 100%
rename from plugins/PrivateGroup/groupmessagelistitem.php
rename to plugins/GroupPrivateMessage/groupmessagelistitem.php
diff --git a/plugins/PrivateGroup/newgroupmessage.php b/plugins/GroupPrivateMessage/newgroupmessage.php
similarity index 100%
rename from plugins/PrivateGroup/newgroupmessage.php
rename to plugins/GroupPrivateMessage/newgroupmessage.php
diff --git a/plugins/PrivateGroup/showgroupmessage.php b/plugins/GroupPrivateMessage/showgroupmessage.php
similarity index 100%
rename from plugins/PrivateGroup/showgroupmessage.php
rename to plugins/GroupPrivateMessage/showgroupmessage.php

From e759b15a92f48c2be32388c948571eaa3006f383 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Feb 2011 12:08:18 -0500
Subject: [PATCH 211/314] pagination for group inbox

---
 plugins/GroupPrivateMessage/groupinbox.php       |  8 +++++++-
 plugins/GroupPrivateMessage/groupmessagelist.php | 15 ++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/plugins/GroupPrivateMessage/groupinbox.php b/plugins/GroupPrivateMessage/groupinbox.php
index 55bf4b0ee2..409f59aa1c 100644
--- a/plugins/GroupPrivateMessage/groupinbox.php
+++ b/plugins/GroupPrivateMessage/groupinbox.php
@@ -119,7 +119,13 @@ class GroupinboxAction extends GroupDesignAction
     function showContent()
     {
         $gml = new GroupMessageList($this, $this->gm);
-        $gml->show();
+        $cnt = $gml->show();
+
+        $this->pagination($this->page > 1,
+                          $cnt > MESSAGES_PER_PAGE,
+                          $this->page,
+                          'groupinbox',
+                          array('nickname' => $this->group->nickname));
     }
 
     /**
diff --git a/plugins/GroupPrivateMessage/groupmessagelist.php b/plugins/GroupPrivateMessage/groupmessagelist.php
index 09f453d520..fb49f5c239 100644
--- a/plugins/GroupPrivateMessage/groupmessagelist.php
+++ b/plugins/GroupPrivateMessage/groupmessagelist.php
@@ -68,10 +68,23 @@ class GroupMessageList extends Widget
     function show()
     {
         $this->out->elementStart('ul', 'notices messages group-messages');
-        while ($this->gm->fetch()) {
+
+        $cnt = 0;
+
+        while ($this->gm->fetch() && $cnt <= MESSAGES_PER_PAGE) {
+
+            $cnt++;
+
+            if ($cnt > MESSAGES_PER_PAGE) {
+                break;
+            }
+
             $gmli = new GroupMessageListItem($this->out, $this->gm);
             $gmli->show();
         }
+
         $this->out->elementEnd('ul');
+
+        return $cnt;
     }
 }

From 80a4b9c76fbc2ec8d6818d98f5cfe43b7581060f Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Feb 2011 12:28:58 -0500
Subject: [PATCH 212/314] Change category and copyright year

---
 .../GroupPrivateMessage/GroupPrivateMessagePlugin.php  |  6 +++---
 plugins/GroupPrivateMessage/Group_message.php          |  2 +-
 plugins/GroupPrivateMessage/Group_message_profile.php  |  4 ++--
 plugins/GroupPrivateMessage/groupinbox.php             | 10 +++++-----
 plugins/GroupPrivateMessage/groupmessagecommand.php    |  6 +++---
 plugins/GroupPrivateMessage/groupmessageform.php       |  4 ++--
 plugins/GroupPrivateMessage/groupmessagelist.php       | 10 +++++-----
 plugins/GroupPrivateMessage/groupmessagelistitem.php   | 10 +++++-----
 plugins/GroupPrivateMessage/newgroupmessage.php        |  6 +++---
 plugins/GroupPrivateMessage/showgroupmessage.php       | 10 +++++-----
 10 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
index 9707c08107..f97bba9446 100644
--- a/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
+++ b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2010, StatusNet, Inc.
+ * Copyright (C) 2011, StatusNet, Inc.
  *
  * Private groups for StatusNet 0.9.x
  *
@@ -23,7 +23,7 @@
  * @category  Privacy
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2010 StatusNet, Inc.
+ * @copyright 2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
@@ -42,7 +42,7 @@ if (!defined('STATUSNET')) {
  * @category  Privacy
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2010 StatusNet, Inc.
+ * @copyright 2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
diff --git a/plugins/GroupPrivateMessage/Group_message.php b/plugins/GroupPrivateMessage/Group_message.php
index 07d4c57c08..f8c0c707c3 100644
--- a/plugins/GroupPrivateMessage/Group_message.php
+++ b/plugins/GroupPrivateMessage/Group_message.php
@@ -36,7 +36,7 @@ require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
 /**
  * Data class for group direct messages
  *
- * @category PrivateGroup
+ * @category GroupPrivateMessage
  * @package  StatusNet
  * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
diff --git a/plugins/GroupPrivateMessage/Group_message_profile.php b/plugins/GroupPrivateMessage/Group_message_profile.php
index 332337423a..bd778b815a 100644
--- a/plugins/GroupPrivateMessage/Group_message_profile.php
+++ b/plugins/GroupPrivateMessage/Group_message_profile.php
@@ -11,7 +11,7 @@
  * @link     http://status.net/
  *
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2010, 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
@@ -36,7 +36,7 @@ require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
 /**
  * Data class for group direct messages for users
  *
- * @category PrivateGroup
+ * @category GroupPrivateMessage
  * @package  StatusNet
  * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
diff --git a/plugins/GroupPrivateMessage/groupinbox.php b/plugins/GroupPrivateMessage/groupinbox.php
index 409f59aa1c..c7dfb966d5 100644
--- a/plugins/GroupPrivateMessage/groupinbox.php
+++ b/plugins/GroupPrivateMessage/groupinbox.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2010, StatusNet, Inc.
+ * Copyright (C) 2011, StatusNet, Inc.
  *
  * List of private messages to this group
  * 
@@ -20,10 +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  PrivateGroup
+ * @category  GroupPrivateMessage
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2010 StatusNet, Inc.
+ * @copyright 2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
@@ -37,10 +37,10 @@ if (!defined('STATUSNET')) {
 /**
  * Show a list of private messages to this group
  *
- * @category  PrivateGroup
+ * @category  GroupPrivateMessage
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2010 StatusNet, Inc.
+ * @copyright 2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
diff --git a/plugins/GroupPrivateMessage/groupmessagecommand.php b/plugins/GroupPrivateMessage/groupmessagecommand.php
index 19136f1318..3b3cf4cfea 100644
--- a/plugins/GroupPrivateMessage/groupmessagecommand.php
+++ b/plugins/GroupPrivateMessage/groupmessagecommand.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2010, StatusNet, Inc.
+ * Copyright (C) 2011, StatusNet, Inc.
  *
  * Command object for messages to groups
  * 
@@ -23,7 +23,7 @@
  * @category  Command
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2010 StatusNet, Inc.
+ * @copyright 2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
@@ -40,7 +40,7 @@ if (!defined('STATUSNET')) {
  * @category  General
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2010 StatusNet, Inc.
+ * @copyright 2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
diff --git a/plugins/GroupPrivateMessage/groupmessageform.php b/plugins/GroupPrivateMessage/groupmessageform.php
index 4564a60761..7205d3f0b9 100644
--- a/plugins/GroupPrivateMessage/groupmessageform.php
+++ b/plugins/GroupPrivateMessage/groupmessageform.php
@@ -20,7 +20,7 @@
  * 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  PrivateGroup
+ * @category  GroupPrivateMessage
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
  * @copyright 2011 StatusNet, Inc.
@@ -37,7 +37,7 @@ if (!defined('STATUSNET')) {
 /**
  * Form for posting a group message
  *
- * @category  PrivateGroup
+ * @category  GroupPrivateMessage
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
  * @copyright 2011 StatusNet, Inc.
diff --git a/plugins/GroupPrivateMessage/groupmessagelist.php b/plugins/GroupPrivateMessage/groupmessagelist.php
index fb49f5c239..07f8ed5e4c 100644
--- a/plugins/GroupPrivateMessage/groupmessagelist.php
+++ b/plugins/GroupPrivateMessage/groupmessagelist.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2010, StatusNet, Inc.
+ * Copyright (C) 2011, StatusNet, Inc.
  *
  * Widget for showing list of group messages
  * 
@@ -20,10 +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  PrivateGroup
+ * @category  GroupPrivateMessage
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2010 StatusNet, Inc.
+ * @copyright 2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
@@ -37,10 +37,10 @@ if (!defined('STATUSNET')) {
 /**
  * Widget for showing list of group messages
  *
- * @category  PrivateGroup
+ * @category  GroupPrivateMessage
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2010 StatusNet, Inc.
+ * @copyright 2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
diff --git a/plugins/GroupPrivateMessage/groupmessagelistitem.php b/plugins/GroupPrivateMessage/groupmessagelistitem.php
index e7b7c6a8f8..4c0fd2ce64 100644
--- a/plugins/GroupPrivateMessage/groupmessagelistitem.php
+++ b/plugins/GroupPrivateMessage/groupmessagelistitem.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2010, StatusNet, Inc.
+ * Copyright (C) 2011, StatusNet, Inc.
  *
  * Widget for showing an individual group message
  * 
@@ -20,10 +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  PrivateGroup
+ * @category  GroupPrivateMessage
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2010 StatusNet, Inc.
+ * @copyright 2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
@@ -37,10 +37,10 @@ if (!defined('STATUSNET')) {
 /**
  * Widget for showing a single group message
  *
- * @category  PrivateGroup
+ * @category  GroupPrivateMessage
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2010 StatusNet, Inc.
+ * @copyright 2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
diff --git a/plugins/GroupPrivateMessage/newgroupmessage.php b/plugins/GroupPrivateMessage/newgroupmessage.php
index a2c5dfdbdb..1ad24c4a0a 100644
--- a/plugins/GroupPrivateMessage/newgroupmessage.php
+++ b/plugins/GroupPrivateMessage/newgroupmessage.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2010, StatusNet, Inc.
+ * Copyright (C) 2011, StatusNet, Inc.
  *
  * Action for adding a new group message
  * 
@@ -23,7 +23,7 @@
  * @category  Cache
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2010 StatusNet, Inc.
+ * @copyright 2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
@@ -40,7 +40,7 @@ if (!defined('STATUSNET')) {
  * @category  Action
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2010 StatusNet, Inc.
+ * @copyright 2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
diff --git a/plugins/GroupPrivateMessage/showgroupmessage.php b/plugins/GroupPrivateMessage/showgroupmessage.php
index cc0126e03d..73293255cf 100644
--- a/plugins/GroupPrivateMessage/showgroupmessage.php
+++ b/plugins/GroupPrivateMessage/showgroupmessage.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2010, StatusNet, Inc.
+ * Copyright (C) 2011, StatusNet, Inc.
  *
  * Show a single group message
  * 
@@ -20,10 +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  PrivateGroup
+ * @category  GroupPrivateMessage
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2010 StatusNet, Inc.
+ * @copyright 2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
@@ -37,10 +37,10 @@ if (!defined('STATUSNET')) {
 /**
  * Show a single private group message
  *
- * @category  PrivateGroup
+ * @category  GroupPrivateMessage
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2010 StatusNet, Inc.
+ * @copyright 2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */

From 1d439ef5d887fe31740915c5a51388a167bcd532 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Feb 2011 12:58:42 -0500
Subject: [PATCH 213/314] Force notices to DMs when privacy = always

---
 .../GroupPrivateMessagePlugin.php             | 80 +++++++++++++++++++
 .../Group_privacy_settings.php                |  9 ++-
 2 files changed, 88 insertions(+), 1 deletion(-)

diff --git a/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
index f97bba9446..7598b3f2b7 100644
--- a/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
+++ b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
@@ -377,6 +377,86 @@ class GroupPrivateMessagePlugin extends Plugin
         $action->elementEnd('li');
         return true;
     }
+
+    /**
+     * When saving a notice, check its groups. If any of them has
+     * privacy == always, force a group private message to all mentioned groups.
+     * If any of the groups disallows private messages, skip it.
+     *
+     * @param 
+     *
+     */
+
+    function onStartNoticeSave(&$notice) {
+
+        // Look for group tags
+        // FIXME: won't work for remote groups
+
+        $count = preg_match_all('/(?:^|\s)!([A-Za-z0-9]{1,64})/',
+                                strtolower($notice->content),
+                                $match);
+
+        $groups = array();
+        $ignored = array();
+
+        $forcePrivate = false;
+
+        if ($count > 0) {
+
+            /* Add them to the database */
+
+            foreach (array_unique($match[1]) as $nickname) {
+
+                $group = User_group::getForNickname($nickname, $profile);
+
+                if (empty($group)) {
+                    continue;
+                }
+
+                $gps = Group_privacy_settings::forGroup($group);
+
+                switch ($gps->allow_privacy) {
+                case Group_privacy_settings::ALWAYS:
+                    $forcePrivate = true;
+                    // fall through
+                case Group_privacy_settings::SOMETIMES:
+                    $groups[] = $group;
+                    break;
+                case Group_privacy_settings::NEVER:
+                    $ignored[] = $group;
+                    break;
+                }
+            }
+
+            if ($forcePrivate) {
+
+                foreach ($ignored as $group) {
+                    common_log(LOG_NOTICE,
+                               "Notice forced to group direct message ".
+                               "but group ".$group->nickname." does not allow them.");
+                }
+
+                $user = User::staticGet('id', $notice->profile_id);
+
+                if (empty($user)) {
+                    common_log(LOG_WARNING,
+                               "Notice forced to group direct message ".
+                               "but profile ".$notice->profile_id." is not a local user.");
+                } else {
+                    foreach ($groups as $group) {
+                        Group_message::send($user, $group, $notice->content);
+                    }
+                }
+
+                // Don't save the notice!
+                // FIXME: this is probably cheating.
+                throw new ClientException(sprintf(_('Forced notice to private group message.')),
+                                          200);
+            }
+        }
+        
+        return true;
+    }
  
     function onPluginVersion(&$versions)
     {
diff --git a/plugins/GroupPrivateMessage/Group_privacy_settings.php b/plugins/GroupPrivateMessage/Group_privacy_settings.php
index 898ac266ce..0176d3bd6e 100644
--- a/plugins/GroupPrivateMessage/Group_privacy_settings.php
+++ b/plugins/GroupPrivateMessage/Group_privacy_settings.php
@@ -145,7 +145,7 @@ class Group_privacy_settings extends Memcached_DataObject
         return array(false, false, false);
     }
 
-    function ensurePost($user, $group)
+    function forGroup($group)
     {
         $gps = Group_privacy_settings::staticGet('group_id', $group->id);
 
@@ -156,6 +156,13 @@ class Group_privacy_settings extends Memcached_DataObject
             $gps->allow_sender  = Group_privacy_settings::MEMBER;
         }
 
+        return $gps;
+    }
+
+    function ensurePost($user, $group)
+    {
+        $gps = self::forGroup($group);
+
         if ($gps->allow_privacy == Group_privacy_settings::NEVER) {
             throw new Exception(sprintf(_('Group %s does not allow private messages.'),
                                         $group->nickname));

From b41816fdc16df562d894aa5d3b4026dda15f392b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Feb 2011 14:04:58 -0500
Subject: [PATCH 214/314] add hooks for Group profile information

---
 EVENTS.txt            |   7 +++
 actions/showgroup.php | 141 ++++++++++++++++++++++--------------------
 2 files changed, 82 insertions(+), 66 deletions(-)

diff --git a/EVENTS.txt b/EVENTS.txt
index d6d8004674..f675c199a0 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -1090,3 +1090,10 @@ EndGroupActionsList: End the list of actions on a group profile page (before </u
 - $action: action being executed (for output and params)
 - $group: group for the page
 
+StartGroupProfileElements: Start showing stuff about the group on its profile page
+- $action: action being executed (for output and params)
+- $group: group for the page
+			   
+EndGroupProfileElements: Start showing stuff about the group on its profile page
+- $action: action being executed (for output and params)
+- $group: group for the page
diff --git a/actions/showgroup.php b/actions/showgroup.php
index 58d7ec7c6f..2806944452 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -181,6 +181,7 @@ class ShowgroupAction extends GroupDesignAction
     function showContent()
     {
         $this->showGroupProfile();
+        $this->showGroupActions();
         $this->showGroupNotices();
     }
 
@@ -216,88 +217,96 @@ 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'));
+        if (Event::handle('StartGroupProfileElements', array($this, $this->group))) {
 
-        $this->elementStart('dl', 'entity_depiction');
-        // TRANS: Label for group avatar (dt). Text hidden by default.
-        $this->element('dt', null, _('Avatar'));
-        $this->elementStart('dd');
+            // TRANS: Group profile header (h2). Text hidden by default.
+            $this->element('h2', null, _('Group profile'));
 
-        $logo = ($this->group->homepage_logo) ?
-          $this->group->homepage_logo : User_group::defaultLogo(AVATAR_PROFILE_SIZE);
-
-        $this->element('img', array('src' => $logo,
-                                    'class' => 'photo avatar',
-                                    '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';
-        $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('dl', 'entity_depiction');
+            // TRANS: Label for group avatar (dt). Text hidden by default.
+            $this->element('dt', null, _('Avatar'));
             $this->elementStart('dd');
-            $this->element('span', 'fn org', $this->group->fullname);
+
+            $logo = ($this->group->homepage_logo) ?
+                $this->group->homepage_logo : User_group::defaultLogo(AVATAR_PROFILE_SIZE);
+
+            $this->element('img', array('src' => $logo,
+                                        'class' => 'photo avatar',
+                                        'width' => AVATAR_PROFILE_SIZE,
+                                        'height' => AVATAR_PROFILE_SIZE,
+                                        'alt' => $this->group->nickname));
             $this->elementEnd('dd');
             $this->elementEnd('dl');
-        }
 
-        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');
-        }
-
-        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('dl', 'entity_nickname');
+            // TRANS: Label for group nickname (dt). Text hidden by default.
+            $this->element('dt', null, _('Nickname'));
             $this->elementStart('dd');
-            $this->element('a', array('href' => $this->group->homepage,
-                                      'rel' => 'me', 'class' => 'url'),
-                           $this->group->homepage);
+            $hasFN = ($this->group->fullname) ? 'nickname url uid' : '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->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));
+            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');
             }
+
+            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');
+            }
+
+            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'),
+                               $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');
+            }
+
+            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.

From 204b5e8a63e98d143a9f1f37e7c90fbfdbed8a10 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Feb 2011 14:21:54 -0500
Subject: [PATCH 215/314] Show a little indicator for private-only groups

---
 .../GroupPrivateMessagePlugin.php             | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
index 7598b3f2b7..e086fe91dc 100644
--- a/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
+++ b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
@@ -457,7 +457,27 @@ class GroupPrivateMessagePlugin extends Plugin
         
         return true;
     }
- 
+
+    /**
+     * Show an indicator that the group is (essentially) private on the group page
+     *
+     * @param Action     $action The action being shown
+     * @param User_group $group  The group being shown
+     *
+     * @return boolean hook value
+     */
+
+    function onEndGroupProfileElements($action, $group)
+    {
+        $gps = Group_privacy_settings::forGroup($group);
+        
+        if ($gps->allow_privacy == Group_privacy_settings::ALWAYS) {
+            $action->element('p', 'privategroupindicator', _('Private'));
+        }
+
+        return true;
+    }
+
     function onPluginVersion(&$versions)
     {
         $versions[] = array('name' => 'GroupPrivateMessage',

From dbd496f9014adee1d003c08366795a292cf73776 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Feb 2011 14:24:35 -0500
Subject: [PATCH 216/314] hide feeds from group page if it's private-only

---
 .../GroupPrivateMessagePlugin.php                    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
index e086fe91dc..6a58ec3e21 100644
--- a/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
+++ b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
@@ -478,6 +478,18 @@ class GroupPrivateMessagePlugin extends Plugin
         return true;
     }
 
+    function onStartShowExportData($action)
+    {
+        if ($action instanceof ShowgroupAction) {
+            $gps = Group_privacy_settings::forGroup($action->group);
+        
+            if ($gps->allow_privacy == Group_privacy_settings::ALWAYS) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     function onPluginVersion(&$versions)
     {
         $versions[] = array('name' => 'GroupPrivateMessage',

From 4883069177fbdd4c430661fc47c4669d0b1ff230 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 7 Feb 2011 12:18:41 -0800
Subject: [PATCH 217/314] Fix group regexes that got missed in
 Nickname::DISPLAY_FMT update: fixes bug where group linking happened, but not
 actual delivery, when using _underscores_ in the !group_name

---
 classes/Notice.php                                        | 2 +-
 plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/classes/Notice.php b/classes/Notice.php
index 2d13828f1f..4522d1fc38 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -964,7 +964,7 @@ class Notice extends Memcached_DataObject
         $groups = array();
 
         /* extract all !group */
-        $count = preg_match_all('/(?:^|\s)!([A-Za-z0-9]{1,64})/',
+        $count = preg_match_all('/(?:^|\s)!(' . Nickname::DISPLAY_FMT . ')/',
                                 strtolower($this->content),
                                 $match);
         if (!$count) {
diff --git a/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
index 7598b3f2b7..9468423bed 100644
--- a/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
+++ b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
@@ -391,8 +391,10 @@ class GroupPrivateMessagePlugin extends Plugin
 
         // Look for group tags
         // FIXME: won't work for remote groups
+        // @fixme if Notice::saveNew is refactored so we can just pull its list
+        // of groups between processing and saving, make use of it
 
-        $count = preg_match_all('/(?:^|\s)!([A-Za-z0-9]{1,64})/',
+        $count = preg_match_all('/(?:^|\s)!(' . Nickname::DISPLAY_FMT . ')/',
                                 strtolower($notice->content),
                                 $match);
 

From 1c3fabbc271f21b9de7f7610612c6225717356c7 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 7 Feb 2011 12:39:40 -0800
Subject: [PATCH 218/314] Add a brief explanation of what group inbox is at the
 top of the page (instructions section), plus a message to show when there are
 no private messages in the inbox.

---
 plugins/GroupPrivateMessage/groupinbox.php | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/plugins/GroupPrivateMessage/groupinbox.php b/plugins/GroupPrivateMessage/groupinbox.php
index c7dfb966d5..39789cc9af 100644
--- a/plugins/GroupPrivateMessage/groupinbox.php
+++ b/plugins/GroupPrivateMessage/groupinbox.php
@@ -121,6 +121,9 @@ class GroupinboxAction extends GroupDesignAction
         $gml = new GroupMessageList($this, $this->gm);
         $cnt = $gml->show();
 
+        if ($cnt == 0) {
+            $this->element('p', 'guide', _m('This group has not received any private messages.'));
+        }
         $this->pagination($this->page > 1,
                           $cnt > MESSAGES_PER_PAGE,
                           $this->page,
@@ -173,4 +176,33 @@ class GroupinboxAction extends GroupDesignAction
                            $this->page);
         }
     }
+
+    /**
+     * 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');
+    }
+
+    /**
+     * Instructions for using this page
+     *
+     * @return string localised instructions for using the page
+     */
+    function getInstructions()
+    {
+        // TRANS: Instructions for user inbox page.
+        return _m('This is the group inbox, which lists all incoming private messages for this group.');
+    }
 }

From c858e2bc3484d58833650cf64bb2fbe2a4871cf8 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 7 Feb 2011 14:38:35 -0800
Subject: [PATCH 219/314] Issue #3025: string -> boolean for
 profile_background_tile entry in JSON user results from Twitter-compat API

This entry was using the strings 'true' and 'false' instead of literal booleans, which could confuse clients expecting literal booleans as in other places and on Twitter in this place.
---
 lib/apiaction.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/apiaction.php b/lib/apiaction.php
index b6e8f87b6d..5d70425720 100644
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -263,8 +263,7 @@ class ApiAction extends Action
             ? Design::url($design->backgroundimage) : '';
 
         $twitter_user['profile_background_tile']
-            = empty($design->disposition)
-            ? '' : ($design->disposition & BACKGROUND_TILE) ? 'true' : 'false';
+            = (bool)($design->disposition & BACKGROUND_TILE);
 
         $twitter_user['statuses_count'] = $profile->noticeCount();
 

From f500d4ea5be3583e7c2e9ad21d0c300bceda83f2 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 8 Feb 2011 11:11:21 -0500
Subject: [PATCH 220/314] Create and use MessageList widget

Our mailbox actions (inbox and outbox) were doing their own display of
messages. This was causing issues with especially showmessage, which
since the more rigourous nickname checks were added, no longer works as
a mailbox subclass.

I've taken the time to rip out the message listing code from MailboxAction
and moved it to a MessageList widget. The different mailboxes now have their
own subclasses that show the correct profile in the list.
---
 actions/inbox.php       |  34 ++++++----
 actions/outbox.php      |  37 +++++++----
 lib/mailbox.php         | 121 ++++------------------------------
 lib/messagelist.php     | 107 ++++++++++++++++++++++++++++++
 lib/messagelistitem.php | 140 ++++++++++++++++++++++++++++++++++++++++
 5 files changed, 306 insertions(+), 133 deletions(-)
 create mode 100644 lib/messagelist.php
 create mode 100644 lib/messagelistitem.php

diff --git a/actions/inbox.php b/actions/inbox.php
index 3a50f4964f..6ab58f9751 100644
--- a/actions/inbox.php
+++ b/actions/inbox.php
@@ -90,18 +90,9 @@ class InboxAction extends MailboxAction
         }
     }
 
-    /**
-     * Returns the profile we want to show with the message
-     *
-     * For inboxes, we show the sender; for outboxes, the recipient.
-     *
-     * @param Message $message The message to get the profile for
-     *
-     * @return Profile The profile that matches the message
-     */
-    function getMessageProfile($message)
+    function getMessageList($message)
     {
-        return $message->getFrom();
+        return new InboxMessageList($this, $message);
     }
 
     /**
@@ -115,3 +106,24 @@ class InboxAction extends MailboxAction
         return _('This is your inbox, which lists your incoming private messages.');
     }
 }
+
+class InboxMessageList extends MessageList
+{
+    function newItem($message)
+    {
+        return new InboxMessageListItem($this->out, $message);
+    }
+}
+
+class InboxMessageListItem extends MessageListItem
+{
+    /**
+     * Returns the profile we want to show with the message
+     *
+     * @return Profile The profile that matches the message
+     */
+    function getMessageProfile()
+    {
+        return $this->message->getFrom();
+    }
+}
\ No newline at end of file
diff --git a/actions/outbox.php b/actions/outbox.php
index b81d4b9d0d..cad19bba24 100644
--- a/actions/outbox.php
+++ b/actions/outbox.php
@@ -88,21 +88,9 @@ class OutboxAction extends MailboxAction
         }
     }
 
-    /**
-     * returns the profile we want to show with the message
-     *
-     * For outboxes, we show the recipient.
-     *
-     * @param Message $message The message to get the profile for
-     *
-     * @return Profile The profile of the message recipient
-     *
-     * @see MailboxAction::getMessageProfile()
-     */
-
-    function getMessageProfile($message)
+    function getMessageList($message)
     {
-        return $message->getTo();
+        return new OutboxMessageList($this, $message);
     }
 
     /**
@@ -116,3 +104,24 @@ class OutboxAction extends MailboxAction
         return _('This is your outbox, which lists private messages you have sent.');
     }
 }
+
+class OutboxMessageList extends MessageList
+{
+    function newItem($message)
+    {
+        return new OutboxMessageListItem($this->out, $message);
+    }
+}
+
+class OutboxMessageListItem extends MessageListItem
+{
+    /**
+     * Returns the profile we want to show with the message
+     *
+     * @return Profile The profile that matches the message
+     */
+    function getMessageProfile()
+    {
+        return $this->message->getTo();
+    }
+}
\ No newline at end of file
diff --git a/lib/mailbox.php b/lib/mailbox.php
index 63bffa75cc..bbcf2ef5dd 100644
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -109,32 +109,22 @@ class MailboxAction extends CurrentUserDesignAction
         $message = $this->getMessages();
 
         if ($message) {
-            $cnt = 0;
-            $this->elementStart('div', array('id' =>'notices_primary'));
-            $this->element('h2', null, _('Notices'));
-            $this->elementStart('ul', 'notices');
 
-            while ($message->fetch() && $cnt <= MESSAGES_PER_PAGE) {
-                $cnt++;
+            $ml = $this->getMessageList($message);
 
-                if ($cnt > MESSAGES_PER_PAGE) {
-                    break;
-                }
+            $cnt = $ml->show();
 
-                $this->showMessage($message);
-            }
-
-            $this->elementEnd('ul');
-
-            $this->pagination($this->page > 1, $cnt > MESSAGES_PER_PAGE,
-                              $this->page, $this->trimmed('action'),
+            $this->pagination($this->page > 1,
+                              $cnt > MESSAGES_PER_PAGE,
+                              $this->page,
+                              $this->trimmed('action'),
                               array('nickname' => $this->user->nickname));
-            $this->elementEnd('div');
-            $message->free();
-            unset($message);
-        }
-        else {
-            $this->element('p', 'guide', _('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.'));
+        } else {
+            $this->element('p', 
+                           'guide', 
+                           _('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.'));
         }
     }
 
@@ -143,95 +133,11 @@ class MailboxAction extends CurrentUserDesignAction
         return null;
     }
 
-    /**
-     * returns the profile we want to show with the message
-     *
-     * For inboxes, we show the sender; for outboxes, the recipient.
-     *
-     * @param Message $message The message to get the profile for
-     *
-     * @return Profile The profile that matches the message
-     */
-
-    function getMessageProfile($message)
+    function getMessageList($message)
     {
         return null;
     }
 
-    /**
-     * show a single message in the list format
-     *
-     * XXX: This needs to be extracted out into a MessageList similar
-     * to NoticeList.
-     *
-     * @param Message $message the message to show
-     *
-     * @return void
-     */
-
-    function showMessage($message)
-    {
-        $this->elementStart('li', array('class' => 'hentry notice',
-                                         'id' => 'message-' . $message->id));
-
-        $profile = $this->getMessageProfile($message);
-
-        $this->elementStart('div', 'entry-title');
-        $this->elementStart('span', 'vcard author');
-        $this->elementStart('a', array('href' => $profile->profileurl,
-                                       'class' => 'url'));
-        $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
-        $this->element('img', array('src' => ($avatar) ?
-                                    $avatar->displayUrl() :
-                                    Avatar::defaultImage(AVATAR_STREAM_SIZE),
-                                    'class' => 'photo avatar',
-                                    'width' => AVATAR_STREAM_SIZE,
-                                    'height' => AVATAR_STREAM_SIZE,
-                                    'alt' =>
-                                    ($profile->fullname) ? $profile->fullname :
-                                    $profile->nickname));
-        $this->element('span', array('class' => 'nickname fn'),
-                            $profile->nickname);
-        $this->elementEnd('a');
-        $this->elementEnd('span');
-
-        // FIXME: URL, image, video, audio
-        $this->elementStart('p', array('class' => 'entry-content'));
-        $this->raw($message->rendered);
-        $this->elementEnd('p');
-        $this->elementEnd('div');
-
-        $messageurl = common_local_url('showmessage',
-                                       array('message' => $message->id));
-
-        // XXX: we need to figure this out better. Is this right?
-        if (strcmp($message->uri, $messageurl) != 0 &&
-            preg_match('/^http/', $message->uri)) {
-            $messageurl = $message->uri;
-        }
-
-        $this->elementStart('div', 'entry-content');
-        $this->elementStart('a', array('rel' => 'bookmark',
-                                       'class' => 'timestamp',
-                                       'href' => $messageurl));
-        $dt = common_date_iso8601($message->created);
-        $this->element('abbr', array('class' => 'published',
-                                     'title' => $dt),
-                               common_date_string($message->created));
-        $this->elementEnd('a');
-
-        if ($message->source) {
-            $this->elementStart('span', 'source');
-            // FIXME: bad i18n. Device should be a parameter (from %s).
-            $this->text(_('from'));
-            $this->element('span', 'device', $this->showSource($message->source));
-            $this->elementEnd('span');
-        }
-        $this->elementEnd('div');
-
-        $this->elementEnd('li');
-    }
-
     /**
      * Show the page notice
      *
@@ -300,5 +206,4 @@ class MailboxAction extends CurrentUserDesignAction
     {
          return true;
     }
-
 }
diff --git a/lib/messagelist.php b/lib/messagelist.php
new file mode 100644
index 0000000000..da7e9a6c27
--- /dev/null
+++ b/lib/messagelist.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * The message list 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);
+}
+
+/**
+ * Message list widget
+ *
+ * @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/
+ */
+
+abstract class MessageList extends Widget
+{
+    var $message;
+
+    /**
+     * Constructor
+     *
+     * @param HTMLOutputter $out     Output context
+     * @param Message       $message Stream of messages to show
+     */
+    function __construct($out, $message)
+    {
+        parent::__construct($out);
+        $this->message = $message;
+    }
+    
+    /**
+     * Show the widget
+     * 
+     * Uses newItem() to create each new item.
+     *
+     * @return integer count of messages seen.
+     */
+    function show()
+    {
+            $cnt = 0;
+
+            $this->out->elementStart('div', array('id' =>'notices_primary'));
+
+            $this->out->element('h2', null, _('Messages'));
+
+            $this->out->elementStart('ul', 'notices messages');
+
+            while ($this->message->fetch() && $cnt <= MESSAGES_PER_PAGE) {
+
+                $cnt++;
+
+                if ($cnt > MESSAGES_PER_PAGE) {
+                    break;
+                }
+                
+                $mli = $this->newItem($this->message);
+
+                $mli->show();
+            }
+
+            $this->out->elementEnd('ul');
+
+            $this->out->elementEnd('div');
+    }
+
+    /**
+     * Create a new message item for a message
+     *
+     * @param Message $message The message to show
+     *
+     * @return MessageListItem an item to show
+     */
+    abstract function newItem($message);
+}
diff --git a/lib/messagelistitem.php b/lib/messagelistitem.php
new file mode 100644
index 0000000000..2907eab274
--- /dev/null
+++ b/lib/messagelistitem.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * A single list item for showing in a message 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 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 single item in a message list
+ *
+ * @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/
+ */
+abstract class MessageListItem extends Widget
+{
+    var $message;
+
+    /**
+     * Constructor
+     *
+     * @param HTMLOutputter $out     Output context
+     * @param Message       $message Message to show
+     */
+    function __construct($out, $message)
+    {
+        parent::__construct($out);
+        $this->message = $message;
+    }
+
+    /**
+     * Show the widget
+     *
+     * @return void
+     */
+
+    function show()
+    {
+        $this->out->elementStart('li', array('class' => 'hentry notice',
+                                             'id' => 'message-' . $this->message->id));
+
+        $profile = $this->getMessageProfile();
+
+        $this->out->elementStart('div', 'entry-title');
+        $this->out->elementStart('span', 'vcard author');
+        $this->out->elementStart('a', array('href' => $profile->profileurl,
+                                            'class' => 'url'));
+        $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
+        $this->out->element('img', array('src' => ($avatar) ?
+                                         $avatar->displayUrl() :
+                                         Avatar::defaultImage(AVATAR_STREAM_SIZE),
+                                         'class' => 'photo avatar',
+                                         'width' => AVATAR_STREAM_SIZE,
+                                         'height' => AVATAR_STREAM_SIZE,
+                                         'alt' =>
+                                         ($profile->fullname) ? $profile->fullname :
+                                         $profile->nickname));
+        $this->out->element('span', array('class' => 'nickname fn'),
+                            $profile->nickname);
+        $this->out->elementEnd('a');
+        $this->out->elementEnd('span');
+
+        // FIXME: URL, image, video, audio
+        $this->out->elementStart('p', array('class' => 'entry-content'));
+        $this->out->raw($this->message->rendered);
+        $this->out->elementEnd('p');
+        $this->out->elementEnd('div');
+
+        $messageurl = common_local_url('showmessage',
+                                       array('message' => $this->message->id));
+
+        // XXX: we need to figure this out better. Is this right?
+        if (strcmp($this->message->uri, $messageurl) != 0 &&
+            preg_match('/^http/', $this->message->uri)) {
+            $messageurl = $this->message->uri;
+        }
+
+        $this->out->elementStart('div', 'entry-content');
+        $this->out->elementStart('a', array('rel' => 'bookmark',
+                                            'class' => 'timestamp',
+                                            'href' => $messageurl));
+        $dt = common_date_iso8601($this->message->created);
+        $this->out->element('abbr', array('class' => 'published',
+                                          'title' => $dt),
+                            common_date_string($this->message->created));
+        $this->out->elementEnd('a');
+
+        if ($this->message->source) {
+            $this->out->elementStart('span', 'source');
+            // FIXME: bad i18n. Device should be a parameter (from %s).
+            $this->out->text(_('from'));
+            $this->out->element('span', 'device', $this->out->showSource($this->message->source));
+            $this->out->elementEnd('span');
+        }
+        $this->out->elementEnd('div');
+
+        $this->out->elementEnd('li');
+    }
+
+    /**
+     * Return the profile to show in the message item
+     *
+     * Overridden in sub-classes to show sender, receiver, or whatever
+     *
+     * @return Profile profile to show avatar and name of
+     */
+    abstract function getMessageProfile();
+}

From 3b19b63babc538d7dece46fa818049c92a3eae3f Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 8 Feb 2011 11:32:35 -0500
Subject: [PATCH 221/314] correctly show the source of messages in a message
 list

---
 lib/mailbox.php         | 38 --------------------------------------
 lib/messagelistitem.php | 40 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/lib/mailbox.php b/lib/mailbox.php
index bbcf2ef5dd..7faeb7dba3 100644
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -156,44 +156,6 @@ class MailboxAction extends CurrentUserDesignAction
         $this->elementEnd('div');
     }
 
-    /**
-     * Show the source of the message
-     *
-     * Returns either the name (and link) of the API client that posted the notice,
-     * or one of other other channels.
-     *
-     * @param string $source the source of the message
-     *
-     * @return void
-     */
-
-    function showSource($source)
-    {
-        $source_name = _($source);
-        switch ($source) {
-        case 'web':
-        case 'xmpp':
-        case 'mail':
-        case 'omb':
-        case 'api':
-            $this->element('span', 'device', $source_name);
-            break;
-        default:
-            $ns = Notice_source::staticGet($source);
-            if ($ns) {
-                $this->elementStart('span', 'device');
-                $this->element('a', array('href' => $ns->url,
-                                               'rel' => 'external'),
-                                    $ns->name);
-                $this->elementEnd('span');
-            } else {
-                $this->element('span', 'device', $source_name);
-            }
-            break;
-        }
-        return;
-    }
-
     /**
      * Mailbox actions are read only
      *
diff --git a/lib/messagelistitem.php b/lib/messagelistitem.php
index 2907eab274..44e6976454 100644
--- a/lib/messagelistitem.php
+++ b/lib/messagelistitem.php
@@ -121,7 +121,7 @@ abstract class MessageListItem extends Widget
             $this->out->elementStart('span', 'source');
             // FIXME: bad i18n. Device should be a parameter (from %s).
             $this->out->text(_('from'));
-            $this->out->element('span', 'device', $this->out->showSource($this->message->source));
+            $this->showSource($this->message->source);
             $this->out->elementEnd('span');
         }
         $this->out->elementEnd('div');
@@ -129,6 +129,44 @@ abstract class MessageListItem extends Widget
         $this->out->elementEnd('li');
     }
 
+
+    /**
+     * Show the source of the message
+     *
+     * Returns either the name (and link) of the API client that posted the notice,
+     * or one of other other channels.
+     *
+     * @param string $source the source of the message
+     *
+     * @return void
+     */
+    function showSource($source)
+    {
+        $source_name = _($source);
+        switch ($source) {
+        case 'web':
+        case 'xmpp':
+        case 'mail':
+        case 'omb':
+        case 'api':
+            $this->out->element('span', 'device', $source_name);
+            break;
+        default:
+            $ns = Notice_source::staticGet($source);
+            if ($ns) {
+                $this->out->elementStart('span', 'device');
+                $this->out->element('a', array('href' => $ns->url,
+                                               'rel' => 'external'),
+                                    $ns->name);
+                $this->out->elementEnd('span');
+            } else {
+                $this->out->element('span', 'device', $source_name);
+            }
+            break;
+        }
+        return;
+    }
+
     /**
      * Return the profile to show in the message item
      *

From e903ff0525099be10681123c42a2b2d55c8649b6 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 8 Feb 2011 11:33:36 -0500
Subject: [PATCH 222/314] Make ShowmessageAction not be a subclass of
 MailboxAction

The ShowmessageAction was using the MailboxAction to do its display of
a single direct message. Since we redid the nickname management, this
was breaking (MailboxAction requires a nickname argument,
ShowmessageAction does not, and nickname validation that used to
quietly fail now throws an exception).

I've moved the message list processing to its own widget class, so the
need to subclass MailboxAction has disappeared. I've rewritten this
action to use the MessageListItem widget, and it works fine now.
---
 actions/showmessage.php | 105 ++++++++++++++++------------------------
 1 file changed, 42 insertions(+), 63 deletions(-)

diff --git a/actions/showmessage.php b/actions/showmessage.php
index d737f85d3a..1c867af119 100644
--- a/actions/showmessage.php
+++ b/actions/showmessage.php
@@ -30,20 +30,17 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/mailbox.php';
-
 /**
  * Show a single message
  *
- * // XXX: It is totally weird how this works!
- *
  * @category Personal
  * @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 ShowmessageAction extends MailboxAction
+
+class ShowmessageAction extends Action
 {
     /**
      * Message object to show
@@ -82,22 +79,20 @@ class ShowmessageAction extends MailboxAction
 
         $this->user = common_current_user();
 
+        if (empty($this->user) ||
+            ($this->user->id != $this->message->from_profile &&
+             $this->user->id != $this->message->to_profile)) {
+            // TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
+            throw new ClientException(_('Only the sender and recipient ' .
+                                        'may read this message.'), 403);
+        }
+
         return true;
     }
 
     function handle($args)
     {
-        Action::handle($args);
-
-        if ($this->user && ($this->user->id == $this->message->from_profile ||
-            $this->user->id == $this->message->to_profile)) {
-                $this->showPage();
-        } else {
-            // TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-            $this->clientError(_('Only the sender and recipient ' .
-                'may read this message.'), 403);
-            return;
-        }
+        $this->showPage();
     }
 
     function title()
@@ -121,12 +116,38 @@ class ShowmessageAction extends MailboxAction
         }
     }
 
-    function getMessages()
+
+    function showContent()
     {
-        $message     = new Message();
-        $message->id = $this->message->id;
-        $message->find();
-        return $message;
+        $this->elementStart('ul', 'notices messages');
+        $ml = new ShowMessageListItem($this, $this->message, $this->user);
+        $ml->show();
+        $this->elementEnd('ul');
+    }
+
+    function isReadOnly($args)
+    {
+        return true;
+    }
+
+    /**
+     * Don't show aside
+     *
+     * @return void
+     */
+
+    function showAside() {
+    }
+}
+
+class ShowMessageListItem extends MessageListItem
+{
+    var $user;
+
+    function __construct($out, $message, $user)
+    {
+        parent::__construct($out, $message);
+        $this->user = $user;
     }
 
     function getMessageProfile()
@@ -140,46 +161,4 @@ class ShowmessageAction extends MailboxAction
             return null;
         }
     }
-
-    /**
-     * Don't show local navigation
-     *
-     * @return void
-     */
-    function showLocalNavBlock()
-    {
-    }
-
-    /**
-     * Don't show page notice
-     *
-     * @return void
-     */
-    function showPageNoticeBlock()
-    {
-    }
-
-    /**
-     * Don't show aside
-     *
-     * @return void
-     */
-    function showAside()
-    {
-    }
-
-    /**
-     * Don't show any instructions
-     *
-     * @return string
-     */
-    function getInstructions()
-    {
-        return '';
-    }
-
-    function isReadOnly($args)
-    {
-        return true;
-    }
 }

From ecf0dec0c12221550772400392d4007de71bf8f3 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 8 Feb 2011 11:53:30 -0500
Subject: [PATCH 223/314] change alpha1 to beta1

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

diff --git a/lib/common.php b/lib/common.php
index 4fd49a5592..a5cfb6f8f7 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -23,7 +23,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') {  exit; }
 
 define('STATUSNET_BASE_VERSION', '0.9.7');
-define('STATUSNET_LIFECYCLE', 'alpha1'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
+define('STATUSNET_LIFECYCLE', 'beta1'); // '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

From 98af8d2a196906cfc1831c8b83104189e1bc255f Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 9 Feb 2011 04:49:39 +0000
Subject: [PATCH 224/314] FacebookBridge plugin - allow Facebook app ID and
 secret to be initialized via config.php

---
 .../FacebookBridge/FacebookBridgePlugin.php   | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/plugins/FacebookBridge/FacebookBridgePlugin.php b/plugins/FacebookBridge/FacebookBridgePlugin.php
index 000b214ff4..7e17c2d7ec 100644
--- a/plugins/FacebookBridge/FacebookBridgePlugin.php
+++ b/plugins/FacebookBridge/FacebookBridgePlugin.php
@@ -24,7 +24,7 @@
  * @category  Pugin
  * @package   StatusNet
  * @author    Zach Copley <zach@status.net>
- * @copyright 2010 StatusNet, Inc.
+ * @copyright 2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
@@ -47,8 +47,9 @@ define("FACEBOOK_SERVICE", 2);
  */
 class FacebookBridgePlugin extends Plugin
 {
-    public $appId    = null; // Facebook application ID
-    public $secret   = null; // Facebook application secret
+    public $appId;  // Facebook application ID
+    public $secret; // Facebook application secret
+
     public $facebook = null; // Facebook application instance
     public $dir      = null; // Facebook plugin dir
 
@@ -61,6 +62,28 @@ class FacebookBridgePlugin extends Plugin
      */
     function initialize()
     {
+
+        // Allow the id and key to be passed in
+        // Control panel will override
+
+        if (isset($this->appId)) {
+            $appId = common_config('facebook', 'appid');
+            if (empty($appId)) {
+                Config::save(
+                    'facebook',
+                    'appid',
+                    $this->appId
+                );
+            }
+        }
+
+        if (isset($this->secret)) {
+            $secret = common_config('facebook', 'secret');
+            if (empty($secret)) {
+                Config::save('facebook', 'secret', $this->secret);
+            }
+        }
+
         $this->facebook = Facebookclient::getFacebook(
             $this->appId,
             $this->secret

From ae492c71326eb63109751071a18a8f5d6ccbf666 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 8 Feb 2011 22:28:23 -0800
Subject: [PATCH 225/314] Revert jQuery Form to r2.17 -- the latest fails with
 our Meteor stuff the way it tweaks document.domain (which also causes other
 AJAX-related problems and needs to be destroyed one of these days...)

---
 js/jquery.form.js     | 1435 ++++++++++++++++++-----------------------
 js/jquery.form.min.js |   12 +-
 2 files changed, 633 insertions(+), 814 deletions(-)

diff --git a/js/jquery.form.js b/js/jquery.form.js
index 14e14572af..936b847abe 100644
--- a/js/jquery.form.js
+++ b/js/jquery.form.js
@@ -1,803 +1,632 @@
-/*!
- * jQuery Form Plugin
- * version: 2.63 (29-JAN-2011)
- * @requires jQuery v1.3.2 or later
- *
- * Examples and documentation at: http://malsup.com/jquery/form/
- * Dual licensed under the MIT and GPL licenses:
- *   http://www.opensource.org/licenses/mit-license.php
- *   http://www.gnu.org/licenses/gpl.html
- */
-;(function($) {
-
-/*
-	Usage Note:
-	-----------
-	Do not use both ajaxSubmit and ajaxForm on the same form.  These
-	functions are intended to be exclusive.  Use ajaxSubmit if you want
-	to bind your own submit handler to the form.  For example,
-
-	$(document).ready(function() {
-		$('#myForm').bind('submit', function(e) {
-			e.preventDefault(); // <-- important
-			$(this).ajaxSubmit({
-				target: '#output'
-			});
-		});
-	});
-
-	Use ajaxForm when you want the plugin to manage all the event binding
-	for you.  For example,
-
-	$(document).ready(function() {
-		$('#myForm').ajaxForm({
-			target: '#output'
-		});
-	});
-
-	When using ajaxForm, the ajaxSubmit function will be invoked for you
-	at the appropriate time.
-*/
-
-/**
- * ajaxSubmit() provides a mechanism for immediately submitting
- * an HTML form using AJAX.
- */
-$.fn.ajaxSubmit = function(options) {
-	// fast fail if nothing selected (http://dev.jquery.com/ticket/2752)
-	if (!this.length) {
-		log('ajaxSubmit: skipping submit process - no element selected');
-		return this;
-	}
-
-	if (typeof options == 'function') {
-		options = { success: options };
-	}
-
-	var action = this.attr('action');
-	var url = (typeof action === 'string') ? $.trim(action) : '';
-	if (url) {
-		// clean url (don't include hash vaue)
-		url = (url.match(/^([^#]+)/)||[])[1];
-	}
-	url = url || window.location.href || '';
-
-	options = $.extend(true, {
-		url:  url,
-		type: this[0].getAttribute('method') || 'GET', // IE7 massage (see issue 57)
-		iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank'
-	}, options);
-
-	// hook for manipulating the form data before it is extracted;
-	// convenient for use with rich editors like tinyMCE or FCKEditor
-	var veto = {};
-	this.trigger('form-pre-serialize', [this, options, veto]);
-	if (veto.veto) {
-		log('ajaxSubmit: submit vetoed via form-pre-serialize trigger');
-		return this;
-	}
-
-	// provide opportunity to alter form data before it is serialized
-	if (options.beforeSerialize && options.beforeSerialize(this, options) === false) {
-		log('ajaxSubmit: submit aborted via beforeSerialize callback');
-		return this;
-	}
-
-	var n,v,a = this.formToArray(options.semantic);
-	if (options.data) {
-		options.extraData = options.data;
-		for (n in options.data) {
-			if(options.data[n] instanceof Array) {
-				for (var k in options.data[n]) {
-					a.push( { name: n, value: options.data[n][k] } );
-				}
-			}
-			else {
-				v = options.data[n];
-				v = $.isFunction(v) ? v() : v; // if value is fn, invoke it
-				a.push( { name: n, value: v } );
-			}
-		}
-	}
-
-	// give pre-submit callback an opportunity to abort the submit
-	if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) {
-		log('ajaxSubmit: submit aborted via beforeSubmit callback');
-		return this;
-	}
-
-	// fire vetoable 'validate' event
-	this.trigger('form-submit-validate', [a, this, options, veto]);
-	if (veto.veto) {
-		log('ajaxSubmit: submit vetoed via form-submit-validate trigger');
-		return this;
-	}
-
-	var q = $.param(a);
-
-	if (options.type.toUpperCase() == 'GET') {
-		options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
-		options.data = null;  // data is null for 'get'
-	}
-	else {
-		options.data = q; // data is the query string for 'post'
-	}
-
-	var $form = this, callbacks = [];
-	if (options.resetForm) {
-		callbacks.push(function() { $form.resetForm(); });
-	}
-	if (options.clearForm) {
-		callbacks.push(function() { $form.clearForm(); });
-	}
-
-	// perform a load on the target only if dataType is not provided
-	if (!options.dataType && options.target) {
-		var oldSuccess = options.success || function(){};
-		callbacks.push(function(data) {
-			var fn = options.replaceTarget ? 'replaceWith' : 'html';
-			$(options.target)[fn](data).each(oldSuccess, arguments);
-		});
-	}
-	else if (options.success) {
-		callbacks.push(options.success);
-	}
-
-	options.success = function(data, status, xhr) { // jQuery 1.4+ passes xhr as 3rd arg
-		var context = options.context || options;   // jQuery 1.4+ supports scope context 
-		for (var i=0, max=callbacks.length; i < max; i++) {
-			callbacks[i].apply(context, [data, status, xhr || $form, $form]);
-		}
-	};
-
-	// are there files to upload?
-	var fileInputs = $('input:file', this).length > 0;
-	var mp = 'multipart/form-data';
-	var multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
-
-	// options.iframe allows user to force iframe mode
-	// 06-NOV-09: now defaulting to iframe mode if file input is detected
-   if (options.iframe !== false && (fileInputs || options.iframe || multipart)) {
-	   // hack to fix Safari hang (thanks to Tim Molendijk for this)
-	   // see:  http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
-	   if (options.closeKeepAlive) {
-		   $.get(options.closeKeepAlive, fileUpload);
-		}
-	   else {
-		   fileUpload();
-		}
-   }
-   else {
-		$.ajax(options);
-   }
-
-	// fire 'notify' event
-	this.trigger('form-submit-notify', [this, options]);
-	return this;
-
-
-	// private function for handling file uploads (hat tip to YAHOO!)
-	function fileUpload() {
-		var form = $form[0];
-
-		if ($(':input[name=submit],:input[id=submit]', form).length) {
-			// if there is an input with a name or id of 'submit' then we won't be
-			// able to invoke the submit fn on the form (at least not x-browser)
-			alert('Error: Form elements must not have name or id of "submit".');
-			return;
-		}
-		
-		var s = $.extend(true, {}, $.ajaxSettings, options);
-		s.context = s.context || s;
-		var id = 'jqFormIO' + (new Date().getTime()), fn = '_'+id;
-		var $io = $('<iframe id="' + id + '" name="' + id + '" src="'+ s.iframeSrc +'" />');
-		var io = $io[0];
-
-		$io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
-
-		var xhr = { // mock object
-			aborted: 0,
-			responseText: null,
-			responseXML: null,
-			status: 0,
-			statusText: 'n/a',
-			getAllResponseHeaders: function() {},
-			getResponseHeader: function() {},
-			setRequestHeader: function() {},
-			abort: function() {
-				this.aborted = 1;
-				$io.attr('src', s.iframeSrc); // abort op in progress
-			}
-		};
-
-		var g = s.global;
-		// trigger ajax global events so that activity/block indicators work like normal
-		if (g && ! $.active++) {
-			$.event.trigger("ajaxStart");
-		}
-		if (g) {
-			$.event.trigger("ajaxSend", [xhr, s]);
-		}
-
-		if (s.beforeSend && s.beforeSend.call(s.context, xhr, s) === false) {
-			if (s.global) { 
-				$.active--;
-			}
-			return;
-		}
-		if (xhr.aborted) {
-			return;
-		}
-
-		var timedOut = 0;
-
-		// add submitting element to data if we know it
-		var sub = form.clk;
-		if (sub) {
-			var n = sub.name;
-			if (n && !sub.disabled) {
-				s.extraData = s.extraData || {};
-				s.extraData[n] = sub.value;
-				if (sub.type == "image") {
-					s.extraData[n+'.x'] = form.clk_x;
-					s.extraData[n+'.y'] = form.clk_y;
-				}
-			}
-		}
-
-		// take a breath so that pending repaints get some cpu time before the upload starts
-		function doSubmit() {
-			// make sure form attrs are set
-			var t = $form.attr('target'), a = $form.attr('action');
-
-			// update form attrs in IE friendly way
-			form.setAttribute('target',id);
-			if (form.getAttribute('method') != 'POST') {
-				form.setAttribute('method', 'POST');
-			}
-			if (form.getAttribute('action') != s.url) {
-				form.setAttribute('action', s.url);
-			}
-
-			// ie borks in some cases when setting encoding
-			if (! s.skipEncodingOverride) {
-				$form.attr({
-					encoding: 'multipart/form-data',
-					enctype:  'multipart/form-data'
-				});
-			}
-
-			// support timout
-			if (s.timeout) {
-				setTimeout(function() { timedOut = true; cb(); }, s.timeout);
-			}
-
-			// add "extra" data to form if provided in options
-			var extraInputs = [];
-			try {
-				if (s.extraData) {
-					for (var n in s.extraData) {
-						extraInputs.push(
-							$('<input type="hidden" name="'+n+'" value="'+s.extraData[n]+'" />')
-								.appendTo(form)[0]);
-					}
-				}
-
-				// add iframe to doc and submit the form
-				$io.appendTo('body');
-                io.attachEvent ? io.attachEvent('onload', cb) : io.addEventListener('load', cb, false);
-				form.submit();
-			}
-			finally {
-				// reset attrs and remove "extra" input elements
-				form.setAttribute('action',a);
-				if(t) {
-					form.setAttribute('target', t);
-				} else {
-					$form.removeAttr('target');
-				}
-				$(extraInputs).remove();
-			}
-		}
-
-		if (s.forceSync) {
-			doSubmit();
-		}
-		else {
-			setTimeout(doSubmit, 10); // this lets dom updates render
-		}
-	
-		var data, doc, domCheckCount = 50;
-
-		function cb() {
-			doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
-			if (!doc || doc.location.href == s.iframeSrc) {
-				// response not received yet
-				return;
-			}
-            io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
-
-			var ok = true;
-			try {
-				if (timedOut) {
-					throw 'timeout';
-				}
-
-				var isXml = s.dataType == 'xml' || doc.XMLDocument || $.isXMLDoc(doc);
-				log('isXml='+isXml);
-				if (!isXml && window.opera && (doc.body == null || doc.body.innerHTML == '')) {
-					if (--domCheckCount) {
-						// in some browsers (Opera) the iframe DOM is not always traversable when
-						// the onload callback fires, so we loop a bit to accommodate
-						log('requeing onLoad callback, DOM not available');
-						setTimeout(cb, 250);
-						return;
-					}
-					// let this fall through because server response could be an empty document
-					//log('Could not access iframe DOM after mutiple tries.');
-					//throw 'DOMException: not available';
-				}
-
-				//log('response detected');
-				xhr.responseText = doc.body ? doc.body.innerHTML : doc.documentElement ? doc.documentElement.innerHTML : null; 
-				xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
-				xhr.getResponseHeader = function(header){
-					var headers = {'content-type': s.dataType};
-					return headers[header];
-				};
-
-				var scr = /(json|script)/.test(s.dataType);
-				if (scr || s.textarea) {
-					// see if user embedded response in textarea
-					var ta = doc.getElementsByTagName('textarea')[0];
-					if (ta) {
-						xhr.responseText = ta.value;
-					}
-					else if (scr) {
-						// account for browsers injecting pre around json response
-						var pre = doc.getElementsByTagName('pre')[0];
-						var b = doc.getElementsByTagName('body')[0];
-						if (pre) {
-							xhr.responseText = pre.textContent;
-						}
-						else if (b) {
-							xhr.responseText = b.innerHTML;
-						}
-					}			  
-				}
-				else if (s.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
-					xhr.responseXML = toXml(xhr.responseText);
-				}
-				
-				data = httpData(xhr, s.dataType, s);
-			}
-			catch(e){
-				log('error caught:',e);
-				ok = false;
-				xhr.error = e;
-				s.error.call(s.context, xhr, 'error', e);
-				g && $.event.trigger("ajaxError", [xhr, s, e]);
-			}
-			
-			if (xhr.aborted) {
-				log('upload aborted');
-				ok = false;
-			}
-
-			// ordering of these callbacks/triggers is odd, but that's how $.ajax does it
-			if (ok) {
-				s.success.call(s.context, data, 'success', xhr);
-				g && $.event.trigger("ajaxSuccess", [xhr, s]);
-			}
-			
-			g && $.event.trigger("ajaxComplete", [xhr, s]);
-
-			if (g && ! --$.active) {
-				$.event.trigger("ajaxStop");
-			}
-			
-			s.complete && s.complete.call(s.context, xhr, ok ? 'success' : 'error');
-
-			// clean up
-			setTimeout(function() {
-				$io.removeData('form-plugin-onload');
-				$io.remove();
-				xhr.responseXML = null;
-			}, 100);
-		}
-
-		var toXml = $.parseXML || function(s, doc) { // use parseXML if available (jQuery 1.5+)
-			if (window.ActiveXObject) {
-				doc = new ActiveXObject('Microsoft.XMLDOM');
-				doc.async = 'false';
-				doc.loadXML(s);
-			}
-			else {
-				doc = (new DOMParser()).parseFromString(s, 'text/xml');
-			}
-			return (doc && doc.documentElement && doc.documentElement.nodeName != 'parsererror') ? doc : null;
-		};
-		var parseJSON = $.parseJSON || function(s) {
-			return window['eval']('(' + s + ')');
-		};
-		
-		var httpData = function( xhr, type, s ) { // mostly lifted from jq1.4.4
-			var ct = xhr.getResponseHeader('content-type') || '',
-				xml = type === 'xml' || !type && ct.indexOf('xml') >= 0,
-				data = xml ? xhr.responseXML : xhr.responseText;
-
-			if (xml && data.documentElement.nodeName === 'parsererror') {
-				$.error && $.error('parsererror');
-			}
-			if (s && s.dataFilter) {
-				data = s.dataFilter(data, type);
-			}
-			if (typeof data === 'string') {
-				if (type === 'json' || !type && ct.indexOf('json') >= 0) {
-					data = parseJSON(data);
-				} else if (type === "script" || !type && ct.indexOf("javascript") >= 0) {
-					$.globalEval(data);
-				}
-			}
-			return data;
-		};
-	}
-};
-
-/**
- * ajaxForm() provides a mechanism for fully automating form submission.
- *
- * The advantages of using this method instead of ajaxSubmit() are:
- *
- * 1: This method will include coordinates for <input type="image" /> elements (if the element
- *	is used to submit the form).
- * 2. This method will include the submit element's name/value data (for the element that was
- *	used to submit the form).
- * 3. This method binds the submit() method to the form for you.
- *
- * The options argument for ajaxForm works exactly as it does for ajaxSubmit.  ajaxForm merely
- * passes the options argument along after properly binding events for submit elements and
- * the form itself.
- */
-$.fn.ajaxForm = function(options) {
-	// in jQuery 1.3+ we can fix mistakes with the ready state
-	if (this.length === 0) {
-		var o = { s: this.selector, c: this.context };
-		if (!$.isReady && o.s) {
-			log('DOM not ready, queuing ajaxForm');
-			$(function() {
-				$(o.s,o.c).ajaxForm(options);
-			});
-			return this;
-		}
-		// is your DOM ready?  http://docs.jquery.com/Tutorials:Introducing_$(document).ready()
-		log('terminating; zero elements found by selector' + ($.isReady ? '' : ' (DOM not ready)'));
-		return this;
-	}
-	
-	return this.ajaxFormUnbind().bind('submit.form-plugin', function(e) {
-		if (!e.isDefaultPrevented()) { // if event has been canceled, don't proceed
-			e.preventDefault();
-			$(this).ajaxSubmit(options);
-		}
-	}).bind('click.form-plugin', function(e) {
-		var target = e.target;
-		var $el = $(target);
-		if (!($el.is(":submit,input:image"))) {
-			// is this a child element of the submit el?  (ex: a span within a button)
-			var t = $el.closest(':submit');
-			if (t.length == 0) {
-				return;
-			}
-			target = t[0];
-		}
-		var form = this;
-		form.clk = target;
-		if (target.type == 'image') {
-			if (e.offsetX != undefined) {
-				form.clk_x = e.offsetX;
-				form.clk_y = e.offsetY;
-			} else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin
-				var offset = $el.offset();
-				form.clk_x = e.pageX - offset.left;
-				form.clk_y = e.pageY - offset.top;
-			} else {
-				form.clk_x = e.pageX - target.offsetLeft;
-				form.clk_y = e.pageY - target.offsetTop;
-			}
-		}
-		// clear form vars
-		setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 100);
-	});
-};
-
-// ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm
-$.fn.ajaxFormUnbind = function() {
-	return this.unbind('submit.form-plugin click.form-plugin');
-};
-
-/**
- * formToArray() gathers form element data into an array of objects that can
- * be passed to any of the following ajax functions: $.get, $.post, or load.
- * Each object in the array has both a 'name' and 'value' property.  An example of
- * an array for a simple login form might be:
- *
- * [ { name: 'username', value: 'jresig' }, { name: 'password', value: 'secret' } ]
- *
- * It is this array that is passed to pre-submit callback functions provided to the
- * ajaxSubmit() and ajaxForm() methods.
- */
-$.fn.formToArray = function(semantic) {
-	var a = [];
-	if (this.length === 0) {
-		return a;
-	}
-
-	var form = this[0];
-	var els = semantic ? form.getElementsByTagName('*') : form.elements;
-	if (!els) {
-		return a;
-	}
-	
-	var i,j,n,v,el,max,jmax;
-	for(i=0, max=els.length; i < max; i++) {
-		el = els[i];
-		n = el.name;
-		if (!n) {
-			continue;
-		}
-
-		if (semantic && form.clk && el.type == "image") {
-			// handle image inputs on the fly when semantic == true
-			if(!el.disabled && form.clk == el) {
-				a.push({name: n, value: $(el).val()});
-				a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
-			}
-			continue;
-		}
-
-		v = $.fieldValue(el, true);
-		if (v && v.constructor == Array) {
-			for(j=0, jmax=v.length; j < jmax; j++) {
-				a.push({name: n, value: v[j]});
-			}
-		}
-		else if (v !== null && typeof v != 'undefined') {
-			a.push({name: n, value: v});
-		}
-	}
-
-	if (!semantic && form.clk) {
-		// input type=='image' are not found in elements array! handle it here
-		var $input = $(form.clk), input = $input[0];
-		n = input.name;
-		if (n && !input.disabled && input.type == 'image') {
-			a.push({name: n, value: $input.val()});
-			a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
-		}
-	}
-	return a;
-};
-
-/**
- * Serializes form data into a 'submittable' string. This method will return a string
- * in the format: name1=value1&amp;name2=value2
- */
-$.fn.formSerialize = function(semantic) {
-	//hand off to jQuery.param for proper encoding
-	return $.param(this.formToArray(semantic));
-};
-
-/**
- * Serializes all field elements in the jQuery object into a query string.
- * This method will return a string in the format: name1=value1&amp;name2=value2
- */
-$.fn.fieldSerialize = function(successful) {
-	var a = [];
-	this.each(function() {
-		var n = this.name;
-		if (!n) {
-			return;
-		}
-		var v = $.fieldValue(this, successful);
-		if (v && v.constructor == Array) {
-			for (var i=0,max=v.length; i < max; i++) {
-				a.push({name: n, value: v[i]});
-			}
-		}
-		else if (v !== null && typeof v != 'undefined') {
-			a.push({name: this.name, value: v});
-		}
-	});
-	//hand off to jQuery.param for proper encoding
-	return $.param(a);
-};
-
-/**
- * Returns the value(s) of the element in the matched set.  For example, consider the following form:
- *
- *  <form><fieldset>
- *	  <input name="A" type="text" />
- *	  <input name="A" type="text" />
- *	  <input name="B" type="checkbox" value="B1" />
- *	  <input name="B" type="checkbox" value="B2"/>
- *	  <input name="C" type="radio" value="C1" />
- *	  <input name="C" type="radio" value="C2" />
- *  </fieldset></form>
- *
- *  var v = $(':text').fieldValue();
- *  // if no values are entered into the text inputs
- *  v == ['','']
- *  // if values entered into the text inputs are 'foo' and 'bar'
- *  v == ['foo','bar']
- *
- *  var v = $(':checkbox').fieldValue();
- *  // if neither checkbox is checked
- *  v === undefined
- *  // if both checkboxes are checked
- *  v == ['B1', 'B2']
- *
- *  var v = $(':radio').fieldValue();
- *  // if neither radio is checked
- *  v === undefined
- *  // if first radio is checked
- *  v == ['C1']
- *
- * The successful argument controls whether or not the field element must be 'successful'
- * (per http://www.w3.org/TR/html4/interact/forms.html#successful-controls).
- * The default value of the successful argument is true.  If this value is false the value(s)
- * for each element is returned.
- *
- * Note: This method *always* returns an array.  If no valid value can be determined the
- *	   array will be empty, otherwise it will contain one or more values.
- */
-$.fn.fieldValue = function(successful) {
-	for (var val=[], i=0, max=this.length; i < max; i++) {
-		var el = this[i];
-		var v = $.fieldValue(el, successful);
-		if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length)) {
-			continue;
-		}
-		v.constructor == Array ? $.merge(val, v) : val.push(v);
-	}
-	return val;
-};
-
-/**
- * Returns the value of the field element.
- */
-$.fieldValue = function(el, successful) {
-	var n = el.name, t = el.type, tag = el.tagName.toLowerCase();
-	if (successful === undefined) {
-		successful = true;
-	}
-
-	if (successful && (!n || el.disabled || t == 'reset' || t == 'button' ||
-		(t == 'checkbox' || t == 'radio') && !el.checked ||
-		(t == 'submit' || t == 'image') && el.form && el.form.clk != el ||
-		tag == 'select' && el.selectedIndex == -1)) {
-			return null;
-	}
-
-	if (tag == 'select') {
-		var index = el.selectedIndex;
-		if (index < 0) {
-			return null;
-		}
-		var a = [], ops = el.options;
-		var one = (t == 'select-one');
-		var max = (one ? index+1 : ops.length);
-		for(var i=(one ? index : 0); i < max; i++) {
-			var op = ops[i];
-			if (op.selected) {
-				var v = op.value;
-				if (!v) { // extra pain for IE...
-					v = (op.attributes && op.attributes['value'] && !(op.attributes['value'].specified)) ? op.text : op.value;
-				}
-				if (one) {
-					return v;
-				}
-				a.push(v);
-			}
-		}
-		return a;
-	}
-	return $(el).val();
-};
-
-/**
- * Clears the form data.  Takes the following actions on the form's input fields:
- *  - input text fields will have their 'value' property set to the empty string
- *  - select elements will have their 'selectedIndex' property set to -1
- *  - checkbox and radio inputs will have their 'checked' property set to false
- *  - inputs of type submit, button, reset, and hidden will *not* be effected
- *  - button elements will *not* be effected
- */
-$.fn.clearForm = function() {
-	return this.each(function() {
-		$('input,select,textarea', this).clearFields();
-	});
-};
-
-/**
- * Clears the selected form elements.
- */
-$.fn.clearFields = $.fn.clearInputs = function() {
-	return this.each(function() {
-		var t = this.type, tag = this.tagName.toLowerCase();
-		if (t == 'text' || t == 'password' || tag == 'textarea') {
-			this.value = '';
-		}
-		else if (t == 'checkbox' || t == 'radio') {
-			this.checked = false;
-		}
-		else if (tag == 'select') {
-			this.selectedIndex = -1;
-		}
-	});
-};
-
-/**
- * Resets the form data.  Causes all form elements to be reset to their original value.
- */
-$.fn.resetForm = function() {
-	return this.each(function() {
-		// guard against an input with the name of 'reset'
-		// note that IE reports the reset function as an 'object'
-		if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType)) {
-			this.reset();
-		}
-	});
-};
-
-/**
- * Enables or disables any matching elements.
- */
-$.fn.enable = function(b) {
-	if (b === undefined) {
-		b = true;
-	}
-	return this.each(function() {
-		this.disabled = !b;
-	});
-};
-
-/**
- * Checks/unchecks any matching checkboxes or radio buttons and
- * selects/deselects and matching option elements.
- */
-$.fn.selected = function(select) {
-	if (select === undefined) {
-		select = true;
-	}
-	return this.each(function() {
-		var t = this.type;
-		if (t == 'checkbox' || t == 'radio') {
-			this.checked = select;
-		}
-		else if (this.tagName.toLowerCase() == 'option') {
-			var $sel = $(this).parent('select');
-			if (select && $sel[0] && $sel[0].type == 'select-one') {
-				// deselect all other options
-				$sel.find('option').selected(false);
-			}
-			this.selected = select;
-		}
-	});
-};
-
-// helper fn for console logging
-// set $.fn.ajaxSubmit.debug to true to enable debug logging
-function log() {
-	if ($.fn.ajaxSubmit.debug) {
-		var msg = '[jquery.form] ' + Array.prototype.join.call(arguments,'');
-		if (window.console && window.console.log) {
-			window.console.log(msg);
-		}
-		else if (window.opera && window.opera.postError) {
-			window.opera.postError(msg);
-		}
-	}
-};
-
-})(jQuery);
+/*
+ * jQuery Form Plugin
+ * version: 2.17 (06-NOV-2008)
+ * @requires jQuery v1.2.2 or later
+ *
+ * Examples and documentation at: http://malsup.com/jquery/form/
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ *
+ * Revision: $Id$
+ */
+;(function($) {
+
+/*
+    Usage Note:  
+    -----------
+    Do not use both ajaxSubmit and ajaxForm on the same form.  These
+    functions are intended to be exclusive.  Use ajaxSubmit if you want
+    to bind your own submit handler to the form.  For example,
+
+    $(document).ready(function() {
+        $('#myForm').bind('submit', function() {
+            $(this).ajaxSubmit({
+                target: '#output'
+            });
+            return false; // <-- important!
+        });
+    });
+
+    Use ajaxForm when you want the plugin to manage all the event binding
+    for you.  For example,
+
+    $(document).ready(function() {
+        $('#myForm').ajaxForm({
+            target: '#output'
+        });
+    });
+        
+    When using ajaxForm, the ajaxSubmit function will be invoked for you
+    at the appropriate time.  
+*/
+
+/**
+ * ajaxSubmit() provides a mechanism for immediately submitting 
+ * an HTML form using AJAX.
+ */
+$.fn.ajaxSubmit = function(options) {
+    // fast fail if nothing selected (http://dev.jquery.com/ticket/2752)
+    if (!this.length) {
+        log('ajaxSubmit: skipping submit process - no element selected');
+        return this;
+    }
+
+    if (typeof options == 'function')
+        options = { success: options };
+
+    options = $.extend({
+        url:  this.attr('action') || window.location.toString(),
+        type: this.attr('method') || 'GET'
+    }, options || {});
+
+    // hook for manipulating the form data before it is extracted;
+    // convenient for use with rich editors like tinyMCE or FCKEditor
+    var veto = {};
+    this.trigger('form-pre-serialize', [this, options, veto]);
+    if (veto.veto) {
+        log('ajaxSubmit: submit vetoed via form-pre-serialize trigger');
+        return this;
+    }
+
+    // provide opportunity to alter form data before it is serialized
+    if (options.beforeSerialize && options.beforeSerialize(this, options) === false) {
+        log('ajaxSubmit: submit aborted via beforeSerialize callback');
+        return this;
+    }    
+   
+    var a = this.formToArray(options.semantic);
+    if (options.data) {
+        options.extraData = options.data;
+        for (var n in options.data) {
+          if(options.data[n] instanceof Array) {
+            for (var k in options.data[n])
+              a.push( { name: n, value: options.data[n][k] } )
+          }  
+          else
+             a.push( { name: n, value: options.data[n] } );
+        }
+    }
+
+    // give pre-submit callback an opportunity to abort the submit
+    if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) {
+        log('ajaxSubmit: submit aborted via beforeSubmit callback');
+        return this;
+    }    
+
+    // fire vetoable 'validate' event
+    this.trigger('form-submit-validate', [a, this, options, veto]);
+    if (veto.veto) {
+        log('ajaxSubmit: submit vetoed via form-submit-validate trigger');
+        return this;
+    }    
+
+    var q = $.param(a);
+
+    if (options.type.toUpperCase() == 'GET') {
+        options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
+        options.data = null;  // data is null for 'get'
+    }
+    else
+        options.data = q; // data is the query string for 'post'
+
+    var $form = this, callbacks = [];
+    if (options.resetForm) callbacks.push(function() { $form.resetForm(); });
+    if (options.clearForm) callbacks.push(function() { $form.clearForm(); });
+
+    // perform a load on the target only if dataType is not provided
+    if (!options.dataType && options.target) {
+        var oldSuccess = options.success || function(){};
+        callbacks.push(function(data) {
+            $(options.target).html(data).each(oldSuccess, arguments);
+        });
+    }
+    else if (options.success)
+        callbacks.push(options.success);
+
+    options.success = function(data, status) {
+        for (var i=0, max=callbacks.length; i < max; i++)
+            callbacks[i].apply(options, [data, status, $form]);
+    };
+
+    // are there files to upload?
+    var files = $('input:file', this).fieldValue();
+    var found = false;
+    for (var j=0; j < files.length; j++)
+        if (files[j])
+            found = true;
+
+    // options.iframe allows user to force iframe mode
+   if (options.iframe || found) { 
+       // hack to fix Safari hang (thanks to Tim Molendijk for this)
+       // see:  http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
+       if ($.browser.safari && options.closeKeepAlive)
+           $.get(options.closeKeepAlive, fileUpload);
+       else
+           fileUpload();
+       }
+   else
+       $.ajax(options);
+
+    // fire 'notify' event
+    this.trigger('form-submit-notify', [this, options]);
+    return this;
+
+
+    // private function for handling file uploads (hat tip to YAHOO!)
+    function fileUpload() {
+        var form = $form[0];
+        
+        if ($(':input[name=submit]', form).length) {
+            alert('Error: Form elements must not be named "submit".');
+            return;
+        }
+        
+        var opts = $.extend({}, $.ajaxSettings, options);
+		var s = jQuery.extend(true, {}, $.extend(true, {}, $.ajaxSettings), opts);
+
+        var id = 'jqFormIO' + (new Date().getTime());
+        var $io = $('<iframe id="' + id + '" name="' + id + '" />');
+        var io = $io[0];
+
+        if ($.browser.msie || $.browser.opera) 
+            io.src = 'javascript:false;document.write("");';
+        $io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
+
+        var xhr = { // mock object
+            aborted: 0,
+            responseText: null,
+            responseXML: null,
+            status: 0,
+            statusText: 'n/a',
+            getAllResponseHeaders: function() {},
+            getResponseHeader: function() {},
+            setRequestHeader: function() {},
+            abort: function() { 
+                this.aborted = 1; 
+                $io.attr('src','about:blank'); // abort op in progress
+            }
+        };
+
+        var g = opts.global;
+        // trigger ajax global events so that activity/block indicators work like normal
+        if (g && ! $.active++) $.event.trigger("ajaxStart");
+        if (g) $.event.trigger("ajaxSend", [xhr, opts]);
+
+		if (s.beforeSend && s.beforeSend(xhr, s) === false) {
+			s.global && jQuery.active--;
+			return;
+        }
+        if (xhr.aborted)
+            return;
+        
+        var cbInvoked = 0;
+        var timedOut = 0;
+
+        // add submitting element to data if we know it
+        var sub = form.clk;
+        if (sub) {
+            var n = sub.name;
+            if (n && !sub.disabled) {
+                options.extraData = options.extraData || {};
+                options.extraData[n] = sub.value;
+                if (sub.type == "image") {
+                    options.extraData[name+'.x'] = form.clk_x;
+                    options.extraData[name+'.y'] = form.clk_y;
+                }
+            }
+        }
+
+        // take a breath so that pending repaints get some cpu time before the upload starts
+        setTimeout(function() {
+            // make sure form attrs are set
+            var t = $form.attr('target'), a = $form.attr('action');
+            $form.attr({
+                target:   id,
+                method:   'POST',
+                action:   opts.url
+            });
+            
+            // ie borks in some cases when setting encoding
+            if (! options.skipEncodingOverride) {
+                $form.attr({
+                    encoding: 'multipart/form-data',
+                    enctype:  'multipart/form-data'
+                });
+            }
+
+            // support timout
+            if (opts.timeout)
+                setTimeout(function() { timedOut = true; cb(); }, opts.timeout);
+
+            // add "extra" data to form if provided in options
+            var extraInputs = [];
+            try {
+                if (options.extraData)
+                    for (var n in options.extraData)
+                        extraInputs.push(
+                            $('<input type="hidden" name="'+n+'" value="'+options.extraData[n]+'" />')
+                                .appendTo(form)[0]);
+            
+                // add iframe to doc and submit the form
+                $io.appendTo('body');
+                io.attachEvent ? io.attachEvent('onload', cb) : io.addEventListener('load', cb, false);
+                form.submit();
+            }
+            finally {
+                // reset attrs and remove "extra" input elements
+                $form.attr('action', a);
+                t ? $form.attr('target', t) : $form.removeAttr('target');
+                $(extraInputs).remove();
+            }
+        }, 10);
+
+        function cb() {
+            if (cbInvoked++) return;
+            
+            io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
+
+            var operaHack = 0;
+            var ok = true;
+            try {
+                if (timedOut) throw 'timeout';
+                // extract the server response from the iframe
+                var data, doc;
+
+                doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
+                
+                if (doc.body == null && !operaHack && $.browser.opera) {
+                    // In Opera 9.2.x the iframe DOM is not always traversable when
+                    // the onload callback fires so we give Opera 100ms to right itself
+                    operaHack = 1;
+                    cbInvoked--;
+                    setTimeout(cb, 100);
+                    return;
+                }
+                
+                xhr.responseText = doc.body ? doc.body.innerHTML : null;
+                xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
+                xhr.getResponseHeader = function(header){
+                    var headers = {'content-type': opts.dataType};
+                    return headers[header];
+                };
+
+                if (opts.dataType == 'json' || opts.dataType == 'script') {
+                    var ta = doc.getElementsByTagName('textarea')[0];
+                    xhr.responseText = ta ? ta.value : xhr.responseText;
+                }
+                else if (opts.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
+                    xhr.responseXML = toXml(xhr.responseText);
+                }
+                data = $.httpData(xhr, opts.dataType);
+            }
+            catch(e){
+                ok = false;
+                $.handleError(opts, xhr, 'error', e);
+            }
+
+            // ordering of these callbacks/triggers is odd, but that's how $.ajax does it
+            if (ok) {
+                opts.success(data, 'success');
+                if (g) $.event.trigger("ajaxSuccess", [xhr, opts]);
+            }
+            if (g) $.event.trigger("ajaxComplete", [xhr, opts]);
+            if (g && ! --$.active) $.event.trigger("ajaxStop");
+            if (opts.complete) opts.complete(xhr, ok ? 'success' : 'error');
+
+            // clean up
+            setTimeout(function() {
+                $io.remove();
+                xhr.responseXML = null;
+            }, 100);
+        };
+
+        function toXml(s, doc) {
+            if (window.ActiveXObject) {
+                doc = new ActiveXObject('Microsoft.XMLDOM');
+                doc.async = 'false';
+                doc.loadXML(s);
+            }
+            else
+                doc = (new DOMParser()).parseFromString(s, 'text/xml');
+            return (doc && doc.documentElement && doc.documentElement.tagName != 'parsererror') ? doc : null;
+        };
+    };
+};
+
+/**
+ * ajaxForm() provides a mechanism for fully automating form submission.
+ *
+ * The advantages of using this method instead of ajaxSubmit() are:
+ *
+ * 1: This method will include coordinates for <input type="image" /> elements (if the element
+ *    is used to submit the form).
+ * 2. This method will include the submit element's name/value data (for the element that was
+ *    used to submit the form).
+ * 3. This method binds the submit() method to the form for you.
+ *
+ * The options argument for ajaxForm works exactly as it does for ajaxSubmit.  ajaxForm merely
+ * passes the options argument along after properly binding events for submit elements and
+ * the form itself.
+ */ 
+$.fn.ajaxForm = function(options) {
+    return this.ajaxFormUnbind().bind('submit.form-plugin',function() {
+        $(this).ajaxSubmit(options);
+        return false;
+    }).each(function() {
+        // store options in hash
+        $(":submit,input:image", this).bind('click.form-plugin',function(e) {
+            var form = this.form;
+            form.clk = this;
+            if (this.type == 'image') {
+                if (e.offsetX != undefined) {
+                    form.clk_x = e.offsetX;
+                    form.clk_y = e.offsetY;
+                } else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin
+                    var offset = $(this).offset();
+                    form.clk_x = e.pageX - offset.left;
+                    form.clk_y = e.pageY - offset.top;
+                } else {
+                    form.clk_x = e.pageX - this.offsetLeft;
+                    form.clk_y = e.pageY - this.offsetTop;
+                }
+            }
+            // clear form vars
+            setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 10);
+        });
+    });
+};
+
+// ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm
+$.fn.ajaxFormUnbind = function() {
+    this.unbind('submit.form-plugin');
+    return this.each(function() {
+        $(":submit,input:image", this).unbind('click.form-plugin');
+    });
+
+};
+
+/**
+ * formToArray() gathers form element data into an array of objects that can
+ * be passed to any of the following ajax functions: $.get, $.post, or load.
+ * Each object in the array has both a 'name' and 'value' property.  An example of
+ * an array for a simple login form might be:
+ *
+ * [ { name: 'username', value: 'jresig' }, { name: 'password', value: 'secret' } ]
+ *
+ * It is this array that is passed to pre-submit callback functions provided to the
+ * ajaxSubmit() and ajaxForm() methods.
+ */
+$.fn.formToArray = function(semantic) {
+    var a = [];
+    if (this.length == 0) return a;
+
+    var form = this[0];
+    var els = semantic ? form.getElementsByTagName('*') : form.elements;
+    if (!els) return a;
+    for(var i=0, max=els.length; i < max; i++) {
+        var el = els[i];
+        var n = el.name;
+        if (!n) continue;
+
+        if (semantic && form.clk && el.type == "image") {
+            // handle image inputs on the fly when semantic == true
+            if(!el.disabled && form.clk == el)
+                a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+            continue;
+        }
+
+        var v = $.fieldValue(el, true);
+        if (v && v.constructor == Array) {
+            for(var j=0, jmax=v.length; j < jmax; j++)
+                a.push({name: n, value: v[j]});
+        }
+        else if (v !== null && typeof v != 'undefined')
+            a.push({name: n, value: v});
+    }
+
+    if (!semantic && form.clk) {
+        // input type=='image' are not found in elements array! handle them here
+        var inputs = form.getElementsByTagName("input");
+        for(var i=0, max=inputs.length; i < max; i++) {
+            var input = inputs[i];
+            var n = input.name;
+            if(n && !input.disabled && input.type == "image" && form.clk == input)
+                a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+        }
+    }
+    return a;
+};
+
+/**
+ * Serializes form data into a 'submittable' string. This method will return a string
+ * in the format: name1=value1&amp;name2=value2
+ */
+$.fn.formSerialize = function(semantic) {
+    //hand off to jQuery.param for proper encoding
+    return $.param(this.formToArray(semantic));
+};
+
+/**
+ * Serializes all field elements in the jQuery object into a query string.
+ * This method will return a string in the format: name1=value1&amp;name2=value2
+ */
+$.fn.fieldSerialize = function(successful) {
+    var a = [];
+    this.each(function() {
+        var n = this.name;
+        if (!n) return;
+        var v = $.fieldValue(this, successful);
+        if (v && v.constructor == Array) {
+            for (var i=0,max=v.length; i < max; i++)
+                a.push({name: n, value: v[i]});
+        }
+        else if (v !== null && typeof v != 'undefined')
+            a.push({name: this.name, value: v});
+    });
+    //hand off to jQuery.param for proper encoding
+    return $.param(a);
+};
+
+/**
+ * Returns the value(s) of the element in the matched set.  For example, consider the following form:
+ *
+ *  <form><fieldset>
+ *      <input name="A" type="text" />
+ *      <input name="A" type="text" />
+ *      <input name="B" type="checkbox" value="B1" />
+ *      <input name="B" type="checkbox" value="B2"/>
+ *      <input name="C" type="radio" value="C1" />
+ *      <input name="C" type="radio" value="C2" />
+ *  </fieldset></form>
+ *
+ *  var v = $(':text').fieldValue();
+ *  // if no values are entered into the text inputs
+ *  v == ['','']
+ *  // if values entered into the text inputs are 'foo' and 'bar'
+ *  v == ['foo','bar']
+ *
+ *  var v = $(':checkbox').fieldValue();
+ *  // if neither checkbox is checked
+ *  v === undefined
+ *  // if both checkboxes are checked
+ *  v == ['B1', 'B2']
+ *
+ *  var v = $(':radio').fieldValue();
+ *  // if neither radio is checked
+ *  v === undefined
+ *  // if first radio is checked
+ *  v == ['C1']
+ *
+ * The successful argument controls whether or not the field element must be 'successful'
+ * (per http://www.w3.org/TR/html4/interact/forms.html#successful-controls).
+ * The default value of the successful argument is true.  If this value is false the value(s)
+ * for each element is returned.
+ *
+ * Note: This method *always* returns an array.  If no valid value can be determined the
+ *       array will be empty, otherwise it will contain one or more values.
+ */
+$.fn.fieldValue = function(successful) {
+    for (var val=[], i=0, max=this.length; i < max; i++) {
+        var el = this[i];
+        var v = $.fieldValue(el, successful);
+        if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length))
+            continue;
+        v.constructor == Array ? $.merge(val, v) : val.push(v);
+    }
+    return val;
+};
+
+/**
+ * Returns the value of the field element.
+ */
+$.fieldValue = function(el, successful) {
+    var n = el.name, t = el.type, tag = el.tagName.toLowerCase();
+    if (typeof successful == 'undefined') successful = true;
+
+    if (successful && (!n || el.disabled || t == 'reset' || t == 'button' ||
+        (t == 'checkbox' || t == 'radio') && !el.checked ||
+        (t == 'submit' || t == 'image') && el.form && el.form.clk != el ||
+        tag == 'select' && el.selectedIndex == -1))
+            return null;
+
+    if (tag == 'select') {
+        var index = el.selectedIndex;
+        if (index < 0) return null;
+        var a = [], ops = el.options;
+        var one = (t == 'select-one');
+        var max = (one ? index+1 : ops.length);
+        for(var i=(one ? index : 0); i < max; i++) {
+            var op = ops[i];
+            if (op.selected) {
+                // extra pain for IE...
+                var v = $.browser.msie && !(op.attributes['value'].specified) ? op.text : op.value;
+                if (one) return v;
+                a.push(v);
+            }
+        }
+        return a;
+    }
+    return el.value;
+};
+
+/**
+ * Clears the form data.  Takes the following actions on the form's input fields:
+ *  - input text fields will have their 'value' property set to the empty string
+ *  - select elements will have their 'selectedIndex' property set to -1
+ *  - checkbox and radio inputs will have their 'checked' property set to false
+ *  - inputs of type submit, button, reset, and hidden will *not* be effected
+ *  - button elements will *not* be effected
+ */
+$.fn.clearForm = function() {
+    return this.each(function() {
+        $('input,select,textarea', this).clearFields();
+    });
+};
+
+/**
+ * Clears the selected form elements.
+ */
+$.fn.clearFields = $.fn.clearInputs = function() {
+    return this.each(function() {
+        var t = this.type, tag = this.tagName.toLowerCase();
+        if (t == 'file' || t == 'text' || t == 'password' || tag == 'textarea')
+            this.value = '';
+        else if (t == 'checkbox' || t == 'radio')
+            this.checked = false;
+        else if (tag == 'select')
+            this.selectedIndex = -1;
+    });
+};
+
+/**
+ * Resets the form data.  Causes all form elements to be reset to their original value.
+ */
+$.fn.resetForm = function() {
+    return this.each(function() {
+        // guard against an input with the name of 'reset'
+        // note that IE reports the reset function as an 'object'
+        if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType))
+            this.reset();
+    });
+};
+
+/**
+ * Enables or disables any matching elements.
+ */
+$.fn.enable = function(b) { 
+    if (b == undefined) b = true;
+    return this.each(function() { 
+        this.disabled = !b 
+    });
+};
+
+/**
+ * Checks/unchecks any matching checkboxes or radio buttons and
+ * selects/deselects and matching option elements.
+ */
+$.fn.selected = function(select) {
+    if (select == undefined) select = true;
+    return this.each(function() { 
+        var t = this.type;
+        if (t == 'checkbox' || t == 'radio')
+            this.checked = select;
+        else if (this.tagName.toLowerCase() == 'option') {
+            var $sel = $(this).parent('select');
+            if (select && $sel[0] && $sel[0].type == 'select-one') {
+                // deselect all other options
+                $sel.find('option').selected(false);
+            }
+            this.selected = select;
+        }
+    });
+};
+
+// helper fn for console logging
+// set $.fn.ajaxSubmit.debug to true to enable debug logging
+function log() {
+    if ($.fn.ajaxSubmit.debug && window.console && window.console.log)
+        window.console.log('[jquery.form] ' + Array.prototype.join.call(arguments,''));
+};
+
+})(jQuery);
diff --git a/js/jquery.form.min.js b/js/jquery.form.min.js
index 7ecc4ca923..b6a0ed1eb2 100644
--- a/js/jquery.form.min.js
+++ b/js/jquery.form.min.js
@@ -1,11 +1 @@
-/*
- * jQuery Form Plugin
- * version: 2.63 (29-JAN-2011)
- * @requires jQuery v1.3.2 or later
- *
- * Examples and documentation at: http://malsup.com/jquery/form/
- * Dual licensed under the MIT and GPL licenses:
- *   http://www.opensource.org/licenses/mit-license.php
- *   http://www.gnu.org/licenses/gpl.html
- */
-(function(b){b.fn.ajaxSubmit=function(t){if(!this.length){a("ajaxSubmit: skipping submit process - no element selected");return this}if(typeof t=="function"){t={success:t}}var h=this.attr("action");var d=(typeof h==="string")?b.trim(h):"";if(d){d=(d.match(/^([^#]+)/)||[])[1]}d=d||window.location.href||"";t=b.extend(true,{url:d,type:this[0].getAttribute("method")||"GET",iframeSrc:/^https/i.test(window.location.href||"")?"javascript:false":"about:blank"},t);var u={};this.trigger("form-pre-serialize",[this,t,u]);if(u.veto){a("ajaxSubmit: submit vetoed via form-pre-serialize trigger");return this}if(t.beforeSerialize&&t.beforeSerialize(this,t)===false){a("ajaxSubmit: submit aborted via beforeSerialize callback");return this}var f,p,m=this.formToArray(t.semantic);if(t.data){t.extraData=t.data;for(f in t.data){if(t.data[f] instanceof Array){for(var i in t.data[f]){m.push({name:f,value:t.data[f][i]})}}else{p=t.data[f];p=b.isFunction(p)?p():p;m.push({name:f,value:p})}}}if(t.beforeSubmit&&t.beforeSubmit(m,this,t)===false){a("ajaxSubmit: submit aborted via beforeSubmit callback");return this}this.trigger("form-submit-validate",[m,this,t,u]);if(u.veto){a("ajaxSubmit: submit vetoed via form-submit-validate trigger");return this}var c=b.param(m);if(t.type.toUpperCase()=="GET"){t.url+=(t.url.indexOf("?")>=0?"&":"?")+c;t.data=null}else{t.data=c}var s=this,l=[];if(t.resetForm){l.push(function(){s.resetForm()})}if(t.clearForm){l.push(function(){s.clearForm()})}if(!t.dataType&&t.target){var r=t.success||function(){};l.push(function(n){var k=t.replaceTarget?"replaceWith":"html";b(t.target)[k](n).each(r,arguments)})}else{if(t.success){l.push(t.success)}}t.success=function(w,n,x){var v=t.context||t;for(var q=0,k=l.length;q<k;q++){l[q].apply(v,[w,n,x||s,s])}};var g=b("input:file",this).length>0;var e="multipart/form-data";var j=(s.attr("enctype")==e||s.attr("encoding")==e);if(t.iframe!==false&&(g||t.iframe||j)){if(t.closeKeepAlive){b.get(t.closeKeepAlive,o)}else{o()}}else{b.ajax(t)}this.trigger("form-submit-notify",[this,t]);return this;function o(){var v=s[0];if(b(":input[name=submit],:input[id=submit]",v).length){alert('Error: Form elements must not have name or id of "submit".');return}var B=b.extend(true,{},b.ajaxSettings,t);B.context=B.context||B;var E="jqFormIO"+(new Date().getTime()),z="_"+E;var w=b('<iframe id="'+E+'" name="'+E+'" src="'+B.iframeSrc+'" />');var A=w[0];w.css({position:"absolute",top:"-1000px",left:"-1000px"});var x={aborted:0,responseText:null,responseXML:null,status:0,statusText:"n/a",getAllResponseHeaders:function(){},getResponseHeader:function(){},setRequestHeader:function(){},abort:function(){this.aborted=1;w.attr("src",B.iframeSrc)}};var I=B.global;if(I&&!b.active++){b.event.trigger("ajaxStart")}if(I){b.event.trigger("ajaxSend",[x,B])}if(B.beforeSend&&B.beforeSend.call(B.context,x,B)===false){if(B.global){b.active--}return}if(x.aborted){return}var H=0;var y=v.clk;if(y){var F=y.name;if(F&&!y.disabled){B.extraData=B.extraData||{};B.extraData[F]=y.value;if(y.type=="image"){B.extraData[F+".x"]=v.clk_x;B.extraData[F+".y"]=v.clk_y}}}function G(){var O=s.attr("target"),M=s.attr("action");v.setAttribute("target",E);if(v.getAttribute("method")!="POST"){v.setAttribute("method","POST")}if(v.getAttribute("action")!=B.url){v.setAttribute("action",B.url)}if(!B.skipEncodingOverride){s.attr({encoding:"multipart/form-data",enctype:"multipart/form-data"})}if(B.timeout){setTimeout(function(){H=true;D()},B.timeout)}var N=[];try{if(B.extraData){for(var P in B.extraData){N.push(b('<input type="hidden" name="'+P+'" value="'+B.extraData[P]+'" />').appendTo(v)[0])}}w.appendTo("body");A.attachEvent?A.attachEvent("onload",D):A.addEventListener("load",D,false);v.submit()}finally{v.setAttribute("action",M);if(O){v.setAttribute("target",O)}else{s.removeAttr("target")}b(N).remove()}}if(B.forceSync){G()}else{setTimeout(G,10)}var K,L,J=50;function D(){L=A.contentWindow?A.contentWindow.document:A.contentDocument?A.contentDocument:A.document;if(!L||L.location.href==B.iframeSrc){return}A.detachEvent?A.detachEvent("onload",D):A.removeEventListener("load",D,false);var N=true;try{if(H){throw"timeout"}var R=B.dataType=="xml"||L.XMLDocument||b.isXMLDoc(L);a("isXml="+R);if(!R&&window.opera&&(L.body==null||L.body.innerHTML=="")){if(--J){a("requeing onLoad callback, DOM not available");setTimeout(D,250);return}}x.responseText=L.body?L.body.innerHTML:L.documentElement?L.documentElement.innerHTML:null;x.responseXML=L.XMLDocument?L.XMLDocument:L;x.getResponseHeader=function(T){var S={"content-type":B.dataType};return S[T]};var Q=/(json|script)/.test(B.dataType);if(Q||B.textarea){var M=L.getElementsByTagName("textarea")[0];if(M){x.responseText=M.value}else{if(Q){var P=L.getElementsByTagName("pre")[0];var n=L.getElementsByTagName("body")[0];if(P){x.responseText=P.textContent}else{if(n){x.responseText=n.innerHTML}}}}}else{if(B.dataType=="xml"&&!x.responseXML&&x.responseText!=null){x.responseXML=C(x.responseText)}}K=k(x,B.dataType,B)}catch(O){a("error caught:",O);N=false;x.error=O;B.error.call(B.context,x,"error",O);I&&b.event.trigger("ajaxError",[x,B,O])}if(x.aborted){a("upload aborted");N=false}if(N){B.success.call(B.context,K,"success",x);I&&b.event.trigger("ajaxSuccess",[x,B])}I&&b.event.trigger("ajaxComplete",[x,B]);if(I&&!--b.active){b.event.trigger("ajaxStop")}B.complete&&B.complete.call(B.context,x,N?"success":"error");setTimeout(function(){w.removeData("form-plugin-onload");w.remove();x.responseXML=null},100)}var C=b.parseXML||function(n,M){if(window.ActiveXObject){M=new ActiveXObject("Microsoft.XMLDOM");M.async="false";M.loadXML(n)}else{M=(new DOMParser()).parseFromString(n,"text/xml")}return(M&&M.documentElement&&M.documentElement.nodeName!="parsererror")?M:null};var q=b.parseJSON||function(n){return window["eval"]("("+n+")")};var k=function(Q,O,N){var M=Q.getResponseHeader("content-type")||"",n=O==="xml"||!O&&M.indexOf("xml")>=0,P=n?Q.responseXML:Q.responseText;if(n&&P.documentElement.nodeName==="parsererror"){b.error&&b.error("parsererror")}if(N&&N.dataFilter){P=N.dataFilter(P,O)}if(typeof P==="string"){if(O==="json"||!O&&M.indexOf("json")>=0){P=q(P)}else{if(O==="script"||!O&&M.indexOf("javascript")>=0){b.globalEval(P)}}}return P}}};b.fn.ajaxForm=function(c){if(this.length===0){var d={s:this.selector,c:this.context};if(!b.isReady&&d.s){a("DOM not ready, queuing ajaxForm");b(function(){b(d.s,d.c).ajaxForm(c)});return this}a("terminating; zero elements found by selector"+(b.isReady?"":" (DOM not ready)"));return this}return this.ajaxFormUnbind().bind("submit.form-plugin",function(f){if(!f.isDefaultPrevented()){f.preventDefault();b(this).ajaxSubmit(c)}}).bind("click.form-plugin",function(j){var i=j.target;var g=b(i);if(!(g.is(":submit,input:image"))){var f=g.closest(":submit");if(f.length==0){return}i=f[0]}var h=this;h.clk=i;if(i.type=="image"){if(j.offsetX!=undefined){h.clk_x=j.offsetX;h.clk_y=j.offsetY}else{if(typeof b.fn.offset=="function"){var k=g.offset();h.clk_x=j.pageX-k.left;h.clk_y=j.pageY-k.top}else{h.clk_x=j.pageX-i.offsetLeft;h.clk_y=j.pageY-i.offsetTop}}}setTimeout(function(){h.clk=h.clk_x=h.clk_y=null},100)})};b.fn.ajaxFormUnbind=function(){return this.unbind("submit.form-plugin click.form-plugin")};b.fn.formToArray=function(q){var p=[];if(this.length===0){return p}var d=this[0];var g=q?d.getElementsByTagName("*"):d.elements;if(!g){return p}var k,h,f,r,e,m,c;for(k=0,m=g.length;k<m;k++){e=g[k];f=e.name;if(!f){continue}if(q&&d.clk&&e.type=="image"){if(!e.disabled&&d.clk==e){p.push({name:f,value:b(e).val()});p.push({name:f+".x",value:d.clk_x},{name:f+".y",value:d.clk_y})}continue}r=b.fieldValue(e,true);if(r&&r.constructor==Array){for(h=0,c=r.length;h<c;h++){p.push({name:f,value:r[h]})}}else{if(r!==null&&typeof r!="undefined"){p.push({name:f,value:r})}}}if(!q&&d.clk){var l=b(d.clk),o=l[0];f=o.name;if(f&&!o.disabled&&o.type=="image"){p.push({name:f,value:l.val()});p.push({name:f+".x",value:d.clk_x},{name:f+".y",value:d.clk_y})}}return p};b.fn.formSerialize=function(c){return b.param(this.formToArray(c))};b.fn.fieldSerialize=function(d){var c=[];this.each(function(){var h=this.name;if(!h){return}var f=b.fieldValue(this,d);if(f&&f.constructor==Array){for(var g=0,e=f.length;g<e;g++){c.push({name:h,value:f[g]})}}else{if(f!==null&&typeof f!="undefined"){c.push({name:this.name,value:f})}}});return b.param(c)};b.fn.fieldValue=function(h){for(var g=[],e=0,c=this.length;e<c;e++){var f=this[e];var d=b.fieldValue(f,h);if(d===null||typeof d=="undefined"||(d.constructor==Array&&!d.length)){continue}d.constructor==Array?b.merge(g,d):g.push(d)}return g};b.fieldValue=function(c,j){var e=c.name,p=c.type,q=c.tagName.toLowerCase();if(j===undefined){j=true}if(j&&(!e||c.disabled||p=="reset"||p=="button"||(p=="checkbox"||p=="radio")&&!c.checked||(p=="submit"||p=="image")&&c.form&&c.form.clk!=c||q=="select"&&c.selectedIndex==-1)){return null}if(q=="select"){var k=c.selectedIndex;if(k<0){return null}var m=[],d=c.options;var g=(p=="select-one");var l=(g?k+1:d.length);for(var f=(g?k:0);f<l;f++){var h=d[f];if(h.selected){var o=h.value;if(!o){o=(h.attributes&&h.attributes.value&&!(h.attributes.value.specified))?h.text:h.value}if(g){return o}m.push(o)}}return m}return b(c).val()};b.fn.clearForm=function(){return this.each(function(){b("input,select,textarea",this).clearFields()})};b.fn.clearFields=b.fn.clearInputs=function(){return this.each(function(){var d=this.type,c=this.tagName.toLowerCase();if(d=="text"||d=="password"||c=="textarea"){this.value=""}else{if(d=="checkbox"||d=="radio"){this.checked=false}else{if(c=="select"){this.selectedIndex=-1}}}})};b.fn.resetForm=function(){return this.each(function(){if(typeof this.reset=="function"||(typeof this.reset=="object"&&!this.reset.nodeType)){this.reset()}})};b.fn.enable=function(c){if(c===undefined){c=true}return this.each(function(){this.disabled=!c})};b.fn.selected=function(c){if(c===undefined){c=true}return this.each(function(){var d=this.type;if(d=="checkbox"||d=="radio"){this.checked=c}else{if(this.tagName.toLowerCase()=="option"){var e=b(this).parent("select");if(c&&e[0]&&e[0].type=="select-one"){e.find("option").selected(false)}this.selected=c}}})};function a(){if(b.fn.ajaxSubmit.debug){var c="[jquery.form] "+Array.prototype.join.call(arguments,"");if(window.console&&window.console.log){window.console.log(c)}else{if(window.opera&&window.opera.postError){window.opera.postError(c)}}}}})(jQuery);
\ No newline at end of file
+(function(b){b.fn.ajaxSubmit=function(p){if(!this.length){a("ajaxSubmit: skipping submit process - no element selected");return this}if(typeof p=="function"){p={success:p}}p=b.extend({url:this.attr("action")||window.location.toString(),type:this.attr("method")||"GET"},p||{});var s={};this.trigger("form-pre-serialize",[this,p,s]);if(s.veto){a("ajaxSubmit: submit vetoed via form-pre-serialize trigger");return this}if(p.beforeSerialize&&p.beforeSerialize(this,p)===false){a("ajaxSubmit: submit aborted via beforeSerialize callback");return this}var i=this.formToArray(p.semantic);if(p.data){p.extraData=p.data;for(var e in p.data){if(p.data[e] instanceof Array){for(var f in p.data[e]){i.push({name:e,value:p.data[e][f]})}}else{i.push({name:e,value:p.data[e]})}}}if(p.beforeSubmit&&p.beforeSubmit(i,this,p)===false){a("ajaxSubmit: submit aborted via beforeSubmit callback");return this}this.trigger("form-submit-validate",[i,this,p,s]);if(s.veto){a("ajaxSubmit: submit vetoed via form-submit-validate trigger");return this}var d=b.param(i);if(p.type.toUpperCase()=="GET"){p.url+=(p.url.indexOf("?")>=0?"&":"?")+d;p.data=null}else{p.data=d}var r=this,h=[];if(p.resetForm){h.push(function(){r.resetForm()})}if(p.clearForm){h.push(function(){r.clearForm()})}if(!p.dataType&&p.target){var m=p.success||function(){};h.push(function(j){b(p.target).html(j).each(m,arguments)})}else{if(p.success){h.push(p.success)}}p.success=function(q,k){for(var n=0,j=h.length;n<j;n++){h[n].apply(p,[q,k,r])}};var c=b("input:file",this).fieldValue();var o=false;for(var g=0;g<c.length;g++){if(c[g]){o=true}}if(p.iframe||o){if(b.browser.safari&&p.closeKeepAlive){b.get(p.closeKeepAlive,l)}else{l()}}else{b.ajax(p)}this.trigger("form-submit-notify",[this,p]);return this;function l(){var u=r[0];if(b(":input[name=submit]",u).length){alert('Error: Form elements must not be named "submit".');return}var q=b.extend({},b.ajaxSettings,p);var D=jQuery.extend(true,{},b.extend(true,{},b.ajaxSettings),q);var t="jqFormIO"+(new Date().getTime());var z=b('<iframe id="'+t+'" name="'+t+'" />');var B=z[0];if(b.browser.msie||b.browser.opera){B.src='javascript:false;document.write("");'}z.css({position:"absolute",top:"-1000px",left:"-1000px"});var C={aborted:0,responseText:null,responseXML:null,status:0,statusText:"n/a",getAllResponseHeaders:function(){},getResponseHeader:function(){},setRequestHeader:function(){},abort:function(){this.aborted=1;z.attr("src","about:blank")}};var A=q.global;if(A&&!b.active++){b.event.trigger("ajaxStart")}if(A){b.event.trigger("ajaxSend",[C,q])}if(D.beforeSend&&D.beforeSend(C,D)===false){D.global&&jQuery.active--;return}if(C.aborted){return}var k=0;var w=0;var j=u.clk;if(j){var v=j.name;if(v&&!j.disabled){p.extraData=p.extraData||{};p.extraData[v]=j.value;if(j.type=="image"){p.extraData[name+".x"]=u.clk_x;p.extraData[name+".y"]=u.clk_y}}}setTimeout(function(){var G=r.attr("target"),E=r.attr("action");r.attr({target:t,method:"POST",action:q.url});if(!p.skipEncodingOverride){r.attr({encoding:"multipart/form-data",enctype:"multipart/form-data"})}if(q.timeout){setTimeout(function(){w=true;x()},q.timeout)}var F=[];try{if(p.extraData){for(var H in p.extraData){F.push(b('<input type="hidden" name="'+H+'" value="'+p.extraData[H]+'" />').appendTo(u)[0])}}z.appendTo("body");B.attachEvent?B.attachEvent("onload",x):B.addEventListener("load",x,false);u.submit()}finally{r.attr("action",E);G?r.attr("target",G):r.removeAttr("target");b(F).remove()}},10);function x(){if(k++){return}B.detachEvent?B.detachEvent("onload",x):B.removeEventListener("load",x,false);var E=0;var F=true;try{if(w){throw"timeout"}var G,I;I=B.contentWindow?B.contentWindow.document:B.contentDocument?B.contentDocument:B.document;if(I.body==null&&!E&&b.browser.opera){E=1;k--;setTimeout(x,100);return}C.responseText=I.body?I.body.innerHTML:null;C.responseXML=I.XMLDocument?I.XMLDocument:I;C.getResponseHeader=function(K){var J={"content-type":q.dataType};return J[K]};if(q.dataType=="json"||q.dataType=="script"){var n=I.getElementsByTagName("textarea")[0];C.responseText=n?n.value:C.responseText}else{if(q.dataType=="xml"&&!C.responseXML&&C.responseText!=null){C.responseXML=y(C.responseText)}}G=b.httpData(C,q.dataType)}catch(H){F=false;b.handleError(q,C,"error",H)}if(F){q.success(G,"success");if(A){b.event.trigger("ajaxSuccess",[C,q])}}if(A){b.event.trigger("ajaxComplete",[C,q])}if(A&&!--b.active){b.event.trigger("ajaxStop")}if(q.complete){q.complete(C,F?"success":"error")}setTimeout(function(){z.remove();C.responseXML=null},100)}function y(n,E){if(window.ActiveXObject){E=new ActiveXObject("Microsoft.XMLDOM");E.async="false";E.loadXML(n)}else{E=(new DOMParser()).parseFromString(n,"text/xml")}return(E&&E.documentElement&&E.documentElement.tagName!="parsererror")?E:null}}};b.fn.ajaxForm=function(c){return this.ajaxFormUnbind().bind("submit.form-plugin",function(){b(this).ajaxSubmit(c);return false}).each(function(){b(":submit,input:image",this).bind("click.form-plugin",function(f){var d=this.form;d.clk=this;if(this.type=="image"){if(f.offsetX!=undefined){d.clk_x=f.offsetX;d.clk_y=f.offsetY}else{if(typeof b.fn.offset=="function"){var g=b(this).offset();d.clk_x=f.pageX-g.left;d.clk_y=f.pageY-g.top}else{d.clk_x=f.pageX-this.offsetLeft;d.clk_y=f.pageY-this.offsetTop}}}setTimeout(function(){d.clk=d.clk_x=d.clk_y=null},10)})})};b.fn.ajaxFormUnbind=function(){this.unbind("submit.form-plugin");return this.each(function(){b(":submit,input:image",this).unbind("click.form-plugin")})};b.fn.formToArray=function(q){var p=[];if(this.length==0){return p}var d=this[0];var h=q?d.getElementsByTagName("*"):d.elements;if(!h){return p}for(var k=0,m=h.length;k<m;k++){var e=h[k];var f=e.name;if(!f){continue}if(q&&d.clk&&e.type=="image"){if(!e.disabled&&d.clk==e){p.push({name:f+".x",value:d.clk_x},{name:f+".y",value:d.clk_y})}continue}var r=b.fieldValue(e,true);if(r&&r.constructor==Array){for(var g=0,c=r.length;g<c;g++){p.push({name:f,value:r[g]})}}else{if(r!==null&&typeof r!="undefined"){p.push({name:f,value:r})}}}if(!q&&d.clk){var l=d.getElementsByTagName("input");for(var k=0,m=l.length;k<m;k++){var o=l[k];var f=o.name;if(f&&!o.disabled&&o.type=="image"&&d.clk==o){p.push({name:f+".x",value:d.clk_x},{name:f+".y",value:d.clk_y})}}}return p};b.fn.formSerialize=function(c){return b.param(this.formToArray(c))};b.fn.fieldSerialize=function(d){var c=[];this.each(function(){var h=this.name;if(!h){return}var f=b.fieldValue(this,d);if(f&&f.constructor==Array){for(var g=0,e=f.length;g<e;g++){c.push({name:h,value:f[g]})}}else{if(f!==null&&typeof f!="undefined"){c.push({name:this.name,value:f})}}});return b.param(c)};b.fn.fieldValue=function(h){for(var g=[],e=0,c=this.length;e<c;e++){var f=this[e];var d=b.fieldValue(f,h);if(d===null||typeof d=="undefined"||(d.constructor==Array&&!d.length)){continue}d.constructor==Array?b.merge(g,d):g.push(d)}return g};b.fieldValue=function(c,j){var e=c.name,p=c.type,q=c.tagName.toLowerCase();if(typeof j=="undefined"){j=true}if(j&&(!e||c.disabled||p=="reset"||p=="button"||(p=="checkbox"||p=="radio")&&!c.checked||(p=="submit"||p=="image")&&c.form&&c.form.clk!=c||q=="select"&&c.selectedIndex==-1)){return null}if(q=="select"){var k=c.selectedIndex;if(k<0){return null}var m=[],d=c.options;var g=(p=="select-one");var l=(g?k+1:d.length);for(var f=(g?k:0);f<l;f++){var h=d[f];if(h.selected){var o=b.browser.msie&&!(h.attributes.value.specified)?h.text:h.value;if(g){return o}m.push(o)}}return m}return c.value};b.fn.clearForm=function(){return this.each(function(){b("input,select,textarea",this).clearFields()})};b.fn.clearFields=b.fn.clearInputs=function(){return this.each(function(){var d=this.type,c=this.tagName.toLowerCase();if(d=="file"||d=="text"||d=="password"||c=="textarea"){this.value=""}else{if(d=="checkbox"||d=="radio"){this.checked=false}else{if(c=="select"){this.selectedIndex=-1}}}})};b.fn.resetForm=function(){return this.each(function(){if(typeof this.reset=="function"||(typeof this.reset=="object"&&!this.reset.nodeType)){this.reset()}})};b.fn.enable=function(c){if(c==undefined){c=true}return this.each(function(){this.disabled=!c})};b.fn.selected=function(c){if(c==undefined){c=true}return this.each(function(){var d=this.type;if(d=="checkbox"||d=="radio"){this.checked=c}else{if(this.tagName.toLowerCase()=="option"){var e=b(this).parent("select");if(c&&e[0]&&e[0].type=="select-one"){e.find("option").selected(false)}this.selected=c}}})};function a(){if(b.fn.ajaxSubmit.debug&&window.console&&window.console.log){window.console.log("[jquery.form] "+Array.prototype.join.call(arguments,""))}}})(jQuery);
\ No newline at end of file

From a277a003b9e4446d4e33339bfd0439348e4d3a3d Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 8 Feb 2011 22:55:15 -0800
Subject: [PATCH 226/314] 0.9.7beta2 (for js update)

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

diff --git a/lib/common.php b/lib/common.php
index a5cfb6f8f7..35a5391052 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -23,7 +23,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') {  exit; }
 
 define('STATUSNET_BASE_VERSION', '0.9.7');
-define('STATUSNET_LIFECYCLE', 'beta1'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
+define('STATUSNET_LIFECYCLE', 'beta2'); // '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

From 75bf7561117f48dd7af51cf1400f8ce97d9e011b Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 8 Feb 2011 23:34:37 -0800
Subject: [PATCH 227/314] LOG_WARN -> LOG_WARNING

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

diff --git a/plugins/FacebookBridge/lib/facebookclient.php b/plugins/FacebookBridge/lib/facebookclient.php
index d5ecd11a9c..094338533e 100644
--- a/plugins/FacebookBridge/lib/facebookclient.php
+++ b/plugins/FacebookBridge/lib/facebookclient.php
@@ -116,7 +116,7 @@ class Facebookclient
 
         if (empty($this->flink)) {
             common_log(
-                LOG_WARN,
+                LOG_WARNING,
                 sprintf(
                     "No Foreign_link to Facebook for the author of notice %d.",
                     $this->notice->id

From 9efedfc2179e4e4d1476be6b9276f7e4889b8a8a Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 9 Feb 2011 00:04:01 -0800
Subject: [PATCH 228/314] Tweak to use site/server fallback when no
 plugins/sslserver or site/sslserver and generating plugin CSS

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

diff --git a/lib/plugin.php b/lib/plugin.php
index 1ca5deb5c5..2b34834577 100644
--- a/lib/plugin.php
+++ b/lib/plugin.php
@@ -146,7 +146,8 @@ class Plugin
         if (is_null($server)) {
             if ($isHTTPS) {
                 $server = common_config('site', 'sslserver');
-            } else {
+            }
+            if (is_null($server)) {
                 $server = common_config('site', 'server');
             }
         }

From 10500e7f85037d940c4730d94be0890ec8155665 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 9 Feb 2011 03:08:52 -0500
Subject: [PATCH 229/314] ensure*() functions throw exceptions for errors

---
 plugins/OStatus/classes/Ostatus_profile.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 13711d39f4..28f2dc0a97 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -1782,12 +1782,14 @@ class Ostatus_profile extends Memcached_DataObject
                     $oprofile = Ostatus_profile::ensureWebfinger($rest);
                     break;
                 default:
-                    common_log(LOG_WARNING,
-                               "Unrecognized URI protocol for profile: $protocol ($uri)");
+                    throw new ServerException("Unrecognized URI protocol for profile: $protocol ($uri)");
                     break;
                 }
+            } else {
+                throw new ServerException("No URI protocol for profile: ($uri)");
             }
         }
+
         return $oprofile;
     }
 

From dc5daa237e8d691ca9be85da3ab883b00cee74e1 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 9 Feb 2011 00:09:25 -0800
Subject: [PATCH 230/314] Further tweak for ssl paths in plugin check
 (sslserver may be set but empty)

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

diff --git a/lib/plugin.php b/lib/plugin.php
index 2b34834577..115bb10e01 100644
--- a/lib/plugin.php
+++ b/lib/plugin.php
@@ -143,18 +143,18 @@ class Plugin
             $server = common_config('plugins', 'server');
         }
 
-        if (is_null($server)) {
+        if (empty($server)) {
             if ($isHTTPS) {
                 $server = common_config('site', 'sslserver');
             }
-            if (is_null($server)) {
+            if (empty($server)) {
                 $server = common_config('site', 'server');
             }
         }
 
         $path = common_config('plugins', 'path');
 
-        if (is_null($path)) {
+        if (empty($path)) {
             $path = common_config('site', 'path') . '/plugins/';
         }
 

From 9c4294fb507fb613ce5e07c00d0e36d9e966deed Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 9 Feb 2011 11:03:44 -0500
Subject: [PATCH 231/314] include Auth_SASL from PEAR in extlib

---
 extlib/Auth/SASL.php           | 104 +++++++++++++++++
 extlib/Auth/SASL/Anonymous.php |  71 ++++++++++++
 extlib/Auth/SASL/Common.php    |  74 +++++++++++++
 extlib/Auth/SASL/CramMD5.php   |  68 ++++++++++++
 extlib/Auth/SASL/DigestMD5.php | 197 +++++++++++++++++++++++++++++++++
 extlib/Auth/SASL/External.php  |  63 +++++++++++
 extlib/Auth/SASL/Login.php     |  65 +++++++++++
 extlib/Auth/SASL/Plain.php     |  63 +++++++++++
 8 files changed, 705 insertions(+)
 create mode 100755 extlib/Auth/SASL.php
 create mode 100755 extlib/Auth/SASL/Anonymous.php
 create mode 100755 extlib/Auth/SASL/Common.php
 create mode 100755 extlib/Auth/SASL/CramMD5.php
 create mode 100755 extlib/Auth/SASL/DigestMD5.php
 create mode 100644 extlib/Auth/SASL/External.php
 create mode 100755 extlib/Auth/SASL/Login.php
 create mode 100755 extlib/Auth/SASL/Plain.php

diff --git a/extlib/Auth/SASL.php b/extlib/Auth/SASL.php
new file mode 100755
index 0000000000..e70f0146bc
--- /dev/null
+++ b/extlib/Auth/SASL.php
@@ -0,0 +1,104 @@
+<?php
+// +-----------------------------------------------------------------------+ 
+// | Copyright (c) 2002-2003 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.  | 
+// |                                                                       | 
+// +-----------------------------------------------------------------------+ 
+// | Author: Richard Heyes <richard@php.net>                               | 
+// +-----------------------------------------------------------------------+ 
+// 
+// $Id: SASL.php 286825 2009-08-05 06:23:42Z cweiske $
+
+/**
+* Client implementation of various SASL mechanisms 
+*
+* @author  Richard Heyes <richard@php.net>
+* @access  public
+* @version 1.0
+* @package Auth_SASL
+*/
+
+require_once('PEAR.php');
+
+class Auth_SASL
+{
+    /**
+    * Factory class. Returns an object of the request
+    * type.
+    *
+    * @param string $type One of: Anonymous
+    *                             Plain
+    *                             CramMD5
+    *                             DigestMD5
+    *                     Types are not case sensitive
+    */
+    function &factory($type)
+    {
+        switch (strtolower($type)) {
+            case 'anonymous':
+                $filename  = 'Auth/SASL/Anonymous.php';
+                $classname = 'Auth_SASL_Anonymous';
+                break;
+
+            case 'login':
+                $filename  = 'Auth/SASL/Login.php';
+                $classname = 'Auth_SASL_Login';
+                break;
+
+            case 'plain':
+                $filename  = 'Auth/SASL/Plain.php';
+                $classname = 'Auth_SASL_Plain';
+                break;
+
+            case 'external':
+                $filename  = 'Auth/SASL/External.php';
+                $classname = 'Auth_SASL_External';
+                break;
+
+            case 'crammd5':
+                $filename  = 'Auth/SASL/CramMD5.php';
+                $classname = 'Auth_SASL_CramMD5';
+                break;
+
+            case 'digestmd5':
+                $filename  = 'Auth/SASL/DigestMD5.php';
+                $classname = 'Auth_SASL_DigestMD5';
+                break;
+
+            default:
+                return PEAR::raiseError('Invalid SASL mechanism type');
+                break;
+        }
+
+        require_once($filename);
+        $obj = new $classname();
+        return $obj;
+    }
+}
+
+?>
diff --git a/extlib/Auth/SASL/Anonymous.php b/extlib/Auth/SASL/Anonymous.php
new file mode 100755
index 0000000000..4eaaa399e6
--- /dev/null
+++ b/extlib/Auth/SASL/Anonymous.php
@@ -0,0 +1,71 @@
+<?php
+// +-----------------------------------------------------------------------+ 
+// | Copyright (c) 2002-2003 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.  | 
+// |                                                                       | 
+// +-----------------------------------------------------------------------+ 
+// | Author: Richard Heyes <richard@php.net>                               | 
+// +-----------------------------------------------------------------------+ 
+// 
+// $Id: Anonymous.php 286825 2009-08-05 06:23:42Z cweiske $
+
+/**
+* Implmentation of ANONYMOUS SASL mechanism
+*
+* @author  Richard Heyes <richard@php.net>
+* @access  public
+* @version 1.0
+* @package Auth_SASL
+*/
+
+require_once('Auth/SASL/Common.php');
+
+class Auth_SASL_Anonymous extends Auth_SASL_Common
+{
+    /**
+    * Not much to do here except return the token supplied.
+    * No encoding, hashing or encryption takes place for this
+    * mechanism, simply one of:
+    *  o An email address
+    *  o An opaque string not containing "@" that can be interpreted
+    *    by the sysadmin
+    *  o Nothing
+    *
+    * We could have some logic here for the second option, but this
+    * would by no means create something interpretable.
+    *
+    * @param  string $token Optional email address or string to provide
+    *                       as trace information.
+    * @return string        The unaltered input token
+    */
+    function getResponse($token = '')
+    {
+        return $token;
+    }
+}
+?>
\ No newline at end of file
diff --git a/extlib/Auth/SASL/Common.php b/extlib/Auth/SASL/Common.php
new file mode 100755
index 0000000000..44181645c4
--- /dev/null
+++ b/extlib/Auth/SASL/Common.php
@@ -0,0 +1,74 @@
+<?php
+// +-----------------------------------------------------------------------+ 
+// | Copyright (c) 2002-2003 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.  | 
+// |                                                                       | 
+// +-----------------------------------------------------------------------+ 
+// | Author: Richard Heyes <richard@php.net>                               | 
+// +-----------------------------------------------------------------------+ 
+// 
+// $Id: Common.php 286825 2009-08-05 06:23:42Z cweiske $
+
+/**
+* Common functionality to SASL mechanisms
+*
+* @author  Richard Heyes <richard@php.net>
+* @access  public
+* @version 1.0
+* @package Auth_SASL
+*/
+
+class Auth_SASL_Common
+{
+    /**
+    * Function which implements HMAC MD5 digest
+    *
+    * @param  string $key  The secret key
+    * @param  string $data The data to protect
+    * @return string       The HMAC MD5 digest
+    */
+    function _HMAC_MD5($key, $data)
+    {
+        if (strlen($key) > 64) {
+            $key = pack('H32', md5($key));
+        }
+
+        if (strlen($key) < 64) {
+            $key = str_pad($key, 64, chr(0));
+        }
+
+        $k_ipad = substr($key, 0, 64) ^ str_repeat(chr(0x36), 64);
+        $k_opad = substr($key, 0, 64) ^ str_repeat(chr(0x5C), 64);
+
+        $inner  = pack('H32', md5($k_ipad . $data));
+        $digest = md5($k_opad . $inner);
+
+        return $digest;
+    }
+}
+?>
diff --git a/extlib/Auth/SASL/CramMD5.php b/extlib/Auth/SASL/CramMD5.php
new file mode 100755
index 0000000000..177279c06b
--- /dev/null
+++ b/extlib/Auth/SASL/CramMD5.php
@@ -0,0 +1,68 @@
+<?php
+// +-----------------------------------------------------------------------+ 
+// | Copyright (c) 2002-2003 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.  | 
+// |                                                                       | 
+// +-----------------------------------------------------------------------+ 
+// | Author: Richard Heyes <richard@php.net>                               | 
+// +-----------------------------------------------------------------------+ 
+// 
+// $Id: CramMD5.php 286825 2009-08-05 06:23:42Z cweiske $
+
+/**
+* Implmentation of CRAM-MD5 SASL mechanism
+*
+* @author  Richard Heyes <richard@php.net>
+* @access  public
+* @version 1.0
+* @package Auth_SASL
+*/
+
+require_once('Auth/SASL/Common.php');
+
+class Auth_SASL_CramMD5 extends Auth_SASL_Common
+{
+    /**
+    * Implements the CRAM-MD5 SASL mechanism
+    * This DOES NOT base64 encode the return value,
+    * you will need to do that yourself.
+    *
+    * @param string $user      Username
+    * @param string $pass      Password
+    * @param string $challenge The challenge supplied by the server.
+    *                          this should be already base64_decoded.
+    *
+    * @return string The string to pass back to the server, of the form
+    *                "<user> <digest>". This is NOT base64_encoded.
+    */
+    function getResponse($user, $pass, $challenge)
+    {
+        return $user . ' ' . $this->_HMAC_MD5($pass, $challenge);
+    }
+}
+?>
\ No newline at end of file
diff --git a/extlib/Auth/SASL/DigestMD5.php b/extlib/Auth/SASL/DigestMD5.php
new file mode 100755
index 0000000000..8c58787dfe
--- /dev/null
+++ b/extlib/Auth/SASL/DigestMD5.php
@@ -0,0 +1,197 @@
+<?php
+// +-----------------------------------------------------------------------+ 
+// | Copyright (c) 2002-2003 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.  | 
+// |                                                                       | 
+// +-----------------------------------------------------------------------+ 
+// | Author: Richard Heyes <richard@php.net>                               | 
+// +-----------------------------------------------------------------------+ 
+// 
+// $Id: DigestMD5.php 294702 2010-02-07 16:03:55Z cweiske $
+
+/**
+* Implmentation of DIGEST-MD5 SASL mechanism
+*
+* @author  Richard Heyes <richard@php.net>
+* @access  public
+* @version 1.0
+* @package Auth_SASL
+*/
+
+require_once('Auth/SASL/Common.php');
+
+class Auth_SASL_DigestMD5 extends Auth_SASL_Common
+{
+    /**
+    * Provides the (main) client response for DIGEST-MD5
+    * requires a few extra parameters than the other
+    * mechanisms, which are unavoidable.
+    * 
+    * @param  string $authcid   Authentication id (username)
+    * @param  string $pass      Password
+    * @param  string $challenge The digest challenge sent by the server
+    * @param  string $hostname  The hostname of the machine you're connecting to
+    * @param  string $service   The servicename (eg. imap, pop, acap etc)
+    * @param  string $authzid   Authorization id (username to proxy as)
+    * @return string            The digest response (NOT base64 encoded)
+    * @access public
+    */
+    function getResponse($authcid, $pass, $challenge, $hostname, $service, $authzid = '')
+    {
+        $challenge = $this->_parseChallenge($challenge);
+        $authzid_string = '';
+        if ($authzid != '') {
+            $authzid_string = ',authzid="' . $authzid . '"'; 
+        }
+
+        if (!empty($challenge)) {
+            $cnonce         = $this->_getCnonce();
+            $digest_uri     = sprintf('%s/%s', $service, $hostname);
+            $response_value = $this->_getResponseValue($authcid, $pass, $challenge['realm'], $challenge['nonce'], $cnonce, $digest_uri, $authzid);
+
+            if ($challenge['realm']) {
+                return sprintf('username="%s",realm="%s"' . $authzid_string  .
+',nonce="%s",cnonce="%s",nc=00000001,qop=auth,digest-uri="%s",response=%s,maxbuf=%d', $authcid, $challenge['realm'], $challenge['nonce'], $cnonce, $digest_uri, $response_value, $challenge['maxbuf']);
+            } else {
+                return sprintf('username="%s"' . $authzid_string  . ',nonce="%s",cnonce="%s",nc=00000001,qop=auth,digest-uri="%s",response=%s,maxbuf=%d', $authcid, $challenge['nonce'], $cnonce, $digest_uri, $response_value, $challenge['maxbuf']);
+            }
+        } else {
+            return PEAR::raiseError('Invalid digest challenge');
+        }
+    }
+    
+    /**
+    * Parses and verifies the digest challenge*
+    *
+    * @param  string $challenge The digest challenge
+    * @return array             The parsed challenge as an assoc
+    *                           array in the form "directive => value".
+    * @access private
+    */
+    function _parseChallenge($challenge)
+    {
+        $tokens = array();
+        while (preg_match('/^([a-z-]+)=("[^"]+(?<!\\\)"|[^,]+)/i', $challenge, $matches)) {
+
+            // Ignore these as per rfc2831
+            if ($matches[1] == 'opaque' OR $matches[1] == 'domain') {
+                $challenge = substr($challenge, strlen($matches[0]) + 1);
+                continue;
+            }
+
+            // Allowed multiple "realm" and "auth-param"
+            if (!empty($tokens[$matches[1]]) AND ($matches[1] == 'realm' OR $matches[1] == 'auth-param')) {
+                if (is_array($tokens[$matches[1]])) {
+                    $tokens[$matches[1]][] = preg_replace('/^"(.*)"$/', '\\1', $matches[2]);
+                } else {
+                    $tokens[$matches[1]] = array($tokens[$matches[1]], preg_replace('/^"(.*)"$/', '\\1', $matches[2]));
+                }
+
+            // Any other multiple instance = failure
+            } elseif (!empty($tokens[$matches[1]])) {
+                $tokens = array();
+                break;
+
+            } else {
+                $tokens[$matches[1]] = preg_replace('/^"(.*)"$/', '\\1', $matches[2]);
+            }
+
+            // Remove the just parsed directive from the challenge
+            $challenge = substr($challenge, strlen($matches[0]) + 1);
+        }
+
+        /**
+        * Defaults and required directives
+        */
+        // Realm
+        if (empty($tokens['realm'])) {
+            $tokens['realm'] = "";
+        }
+
+        // Maxbuf
+        if (empty($tokens['maxbuf'])) {
+            $tokens['maxbuf'] = 65536;
+        }
+
+        // Required: nonce, algorithm
+        if (empty($tokens['nonce']) OR empty($tokens['algorithm'])) {
+            return array();
+        }
+
+        return $tokens;
+    }
+
+    /**
+    * Creates the response= part of the digest response
+    *
+    * @param  string $authcid    Authentication id (username)
+    * @param  string $pass       Password
+    * @param  string $realm      Realm as provided by the server
+    * @param  string $nonce      Nonce as provided by the server
+    * @param  string $cnonce     Client nonce
+    * @param  string $digest_uri The digest-uri= value part of the response
+    * @param  string $authzid    Authorization id
+    * @return string             The response= part of the digest response
+    * @access private
+    */    
+    function _getResponseValue($authcid, $pass, $realm, $nonce, $cnonce, $digest_uri, $authzid = '')
+    {
+        if ($authzid == '') {
+            $A1 = sprintf('%s:%s:%s', pack('H32', md5(sprintf('%s:%s:%s', $authcid, $realm, $pass))), $nonce, $cnonce);
+        } else {
+            $A1 = sprintf('%s:%s:%s:%s', pack('H32', md5(sprintf('%s:%s:%s', $authcid, $realm, $pass))), $nonce, $cnonce, $authzid);
+        }
+        $A2 = 'AUTHENTICATE:' . $digest_uri;
+        return md5(sprintf('%s:%s:00000001:%s:auth:%s', md5($A1), $nonce, $cnonce, md5($A2)));
+    }
+
+    /**
+    * Creates the client nonce for the response
+    *
+    * @return string  The cnonce value
+    * @access private
+    */
+    function _getCnonce()
+    {
+        if (@file_exists('/dev/urandom') && $fd = @fopen('/dev/urandom', 'r')) {
+            return base64_encode(fread($fd, 32));
+
+        } elseif (@file_exists('/dev/random') && $fd = @fopen('/dev/random', 'r')) {
+            return base64_encode(fread($fd, 32));
+
+        } else {
+            $str = '';
+            for ($i=0; $i<32; $i++) {
+                $str .= chr(mt_rand(0, 255));
+            }
+            
+            return base64_encode($str);
+        }
+    }
+}
+?>
diff --git a/extlib/Auth/SASL/External.php b/extlib/Auth/SASL/External.php
new file mode 100644
index 0000000000..86a17cb7ab
--- /dev/null
+++ b/extlib/Auth/SASL/External.php
@@ -0,0 +1,63 @@
+<?php
+// +-----------------------------------------------------------------------+ 
+// | Copyright (c) 2008 Christoph Schulz                                   | 
+// | 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.  | 
+// |                                                                       | 
+// +-----------------------------------------------------------------------+ 
+// | Author: Christoph Schulz <develop@kristov.de>                         | 
+// +-----------------------------------------------------------------------+ 
+// 
+// $Id: External.php 286825 2009-08-05 06:23:42Z cweiske $
+
+/**
+* Implmentation of EXTERNAL SASL mechanism
+*
+* @author  Christoph Schulz <develop@kristov.de>
+* @access  public
+* @version 1.0.3
+* @package Auth_SASL
+*/
+
+require_once('Auth/SASL/Common.php');
+
+class Auth_SASL_External extends Auth_SASL_Common
+{
+    /**
+    * Returns EXTERNAL response
+    *
+    * @param  string $authcid   Authentication id (username)
+    * @param  string $pass      Password
+    * @param  string $authzid   Autorization id
+    * @return string            EXTERNAL Response
+    */
+    function getResponse($authcid, $pass, $authzid = '')
+    {
+        return $authzid;
+    }
+}
+?>
diff --git a/extlib/Auth/SASL/Login.php b/extlib/Auth/SASL/Login.php
new file mode 100755
index 0000000000..a925f53a79
--- /dev/null
+++ b/extlib/Auth/SASL/Login.php
@@ -0,0 +1,65 @@
+<?php
+// +-----------------------------------------------------------------------+ 
+// | Copyright (c) 2002-2003 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.  | 
+// |                                                                       | 
+// +-----------------------------------------------------------------------+ 
+// | Author: Richard Heyes <richard@php.net>                               | 
+// +-----------------------------------------------------------------------+ 
+// 
+// $Id: Login.php 286825 2009-08-05 06:23:42Z cweiske $
+
+/**
+* This is technically not a SASL mechanism, however
+* it's used by Net_Sieve, Net_Cyrus and potentially
+* other protocols , so here is a good place to abstract
+* it.
+*
+* @author  Richard Heyes <richard@php.net>
+* @access  public
+* @version 1.0
+* @package Auth_SASL
+*/
+
+require_once('Auth/SASL/Common.php');
+
+class Auth_SASL_Login extends Auth_SASL_Common
+{
+    /**
+    * Pseudo SASL LOGIN mechanism
+    *
+    * @param  string $user Username
+    * @param  string $pass Password
+    * @return string       LOGIN string
+    */
+    function getResponse($user, $pass)
+    {
+        return sprintf('LOGIN %s %s', $user, $pass);
+    }
+}
+?>
\ No newline at end of file
diff --git a/extlib/Auth/SASL/Plain.php b/extlib/Auth/SASL/Plain.php
new file mode 100755
index 0000000000..912710169e
--- /dev/null
+++ b/extlib/Auth/SASL/Plain.php
@@ -0,0 +1,63 @@
+<?php
+// +-----------------------------------------------------------------------+ 
+// | Copyright (c) 2002-2003 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.  | 
+// |                                                                       | 
+// +-----------------------------------------------------------------------+ 
+// | Author: Richard Heyes <richard@php.net>                               | 
+// +-----------------------------------------------------------------------+ 
+// 
+// $Id: Plain.php 286825 2009-08-05 06:23:42Z cweiske $
+
+/**
+* Implmentation of PLAIN SASL mechanism
+*
+* @author  Richard Heyes <richard@php.net>
+* @access  public
+* @version 1.0
+* @package Auth_SASL
+*/
+
+require_once('Auth/SASL/Common.php');
+
+class Auth_SASL_Plain extends Auth_SASL_Common
+{
+    /**
+    * Returns PLAIN response
+    *
+    * @param  string $authcid   Authentication id (username)
+    * @param  string $pass      Password
+    * @param  string $authzid   Autorization id
+    * @return string            PLAIN Response
+    */
+    function getResponse($authcid, $pass, $authzid = '')
+    {
+        return $authzid . chr(0) . $authcid . chr(0) . $pass;
+    }
+}
+?>

From bfa053ef1724cd57986ccdc0fb1717c22fd02230 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 9 Feb 2011 11:04:52 -0500
Subject: [PATCH 232/314] Remove executable bits from Auth_SASL files

---
 extlib/Auth/SASL.php           | 0
 extlib/Auth/SASL/Anonymous.php | 0
 extlib/Auth/SASL/Common.php    | 0
 extlib/Auth/SASL/CramMD5.php   | 0
 extlib/Auth/SASL/DigestMD5.php | 0
 extlib/Auth/SASL/Login.php     | 0
 extlib/Auth/SASL/Plain.php     | 0
 7 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 extlib/Auth/SASL.php
 mode change 100755 => 100644 extlib/Auth/SASL/Anonymous.php
 mode change 100755 => 100644 extlib/Auth/SASL/Common.php
 mode change 100755 => 100644 extlib/Auth/SASL/CramMD5.php
 mode change 100755 => 100644 extlib/Auth/SASL/DigestMD5.php
 mode change 100755 => 100644 extlib/Auth/SASL/Login.php
 mode change 100755 => 100644 extlib/Auth/SASL/Plain.php

diff --git a/extlib/Auth/SASL.php b/extlib/Auth/SASL.php
old mode 100755
new mode 100644
diff --git a/extlib/Auth/SASL/Anonymous.php b/extlib/Auth/SASL/Anonymous.php
old mode 100755
new mode 100644
diff --git a/extlib/Auth/SASL/Common.php b/extlib/Auth/SASL/Common.php
old mode 100755
new mode 100644
diff --git a/extlib/Auth/SASL/CramMD5.php b/extlib/Auth/SASL/CramMD5.php
old mode 100755
new mode 100644
diff --git a/extlib/Auth/SASL/DigestMD5.php b/extlib/Auth/SASL/DigestMD5.php
old mode 100755
new mode 100644
diff --git a/extlib/Auth/SASL/Login.php b/extlib/Auth/SASL/Login.php
old mode 100755
new mode 100644
diff --git a/extlib/Auth/SASL/Plain.php b/extlib/Auth/SASL/Plain.php
old mode 100755
new mode 100644

From a76f0676317058a8c1e2fd14ac04c7cabcbed6a7 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 9 Feb 2011 13:46:48 -0800
Subject: [PATCH 233/314] Partial revert of 073f3e99: restores the original
 non-hashbang URLs for twitter users as the remote profile. Should fix issue
 #3027: twitter user avatars not getting imported.

Due to the change in URI, all twitter users that had been previously seen were getting new profile entries, which tried to save the same avatar. This would fail as Avatar.url has a unique index.
Note: now anything new seen in the last couple days in production will still potentially conflict.
---
 plugins/TwitterBridge/twitter.php       | 2 +-
 plugins/TwitterBridge/twitterimport.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php
index a993f8ff8f..e8d11f3b6a 100644
--- a/plugins/TwitterBridge/twitter.php
+++ b/plugins/TwitterBridge/twitter.php
@@ -45,7 +45,7 @@ function add_twitter_user($twitter_id, $screen_name)
     $fuser = new Foreign_user();
 
     $fuser->nickname = $screen_name;
-    $fuser->uri = 'http://twitter.com/#!/' . $screen_name;
+    $fuser->uri = 'http://twitter.com/' . $screen_name;
     $fuser->id = $twitter_id;
     $fuser->service = TWITTER_SERVICE;
     $fuser->created = common_sql_now();
diff --git a/plugins/TwitterBridge/twitterimport.php b/plugins/TwitterBridge/twitterimport.php
index 3a4c0c43c0..475a99efac 100644
--- a/plugins/TwitterBridge/twitterimport.php
+++ b/plugins/TwitterBridge/twitterimport.php
@@ -264,7 +264,7 @@ class TwitterImport
     function ensureProfile($user)
     {
         // check to see if there's already a profile for this user
-        $profileurl = 'http://twitter.com/#!/' . $user->screen_name;
+        $profileurl = 'http://twitter.com/' . $user->screen_name;
         $profile = $this->getProfileByUrl($user->screen_name, $profileurl);
 
         if (!empty($profile)) {

From df19e8832376c70193562694c09c48fbec30305d Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 9 Feb 2011 23:18:14 -0800
Subject: [PATCH 234/314] Atom output - Reinstate activity:actor and
 activity:subject w/deprecation warnings. Also add statusnet:profile_info back
 into author/actor.

---
 classes/Profile.php         | 25 +++++++++++++++++++++++++
 lib/activity.php            | 12 ++++++++++++
 lib/atomgroupnoticefeed.php | 12 ++++++++++--
 lib/atomusernoticefeed.php  | 20 ++++++++++++++++++++
 4 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/classes/Profile.php b/classes/Profile.php
index adad0c6157..03f9300962 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -918,6 +918,31 @@ class Profile extends Memcached_DataObject
         return $xs->getString();
     }
 
+    /**
+     * Extra profile info for atom entries
+     *
+     * Clients use some extra profile info in the atom stream.
+     * This gives it to them.
+     *
+     * @param User $cur Current user
+     *
+     * @return array representation of <statusnet:profile_info> element
+     */
+
+    function profileInfo($cur)
+    {
+        $profileInfoAttr = array();
+
+        if ($cur != null) {
+            // Whether the current user is a subscribed to this profile
+            $profileInfoAttr['following'] = $cur->isSubscribed($this) ? 'true' : 'false';
+            // Whether the current user is has blocked this profile
+            $profileInfoAttr['blocking']  = $cur->hasBlocked($this) ? 'true' : 'false';
+        }
+
+        return array('statusnet:profile_info', $profileInfoAttr, null);
+    }
+
     /**
      * Returns an XML string fragment with profile information as an
      * Activity Streams <activity:actor> element.
diff --git a/lib/activity.php b/lib/activity.php
index 585a25de2e..6c21c0bcc9 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -392,6 +392,18 @@ class Activity
 
         if ($author) {
             $this->actor->outputTo($xs, 'author');
+
+            // XXX: Remove <activity:actor> ASAP! Author information
+            // has been moved to the author element in the Activity
+            // Streams spec. We're outputting actor only for backward
+            // compatibility with clients that can only parse
+            // activities based on older versions of the spec.
+
+            $depMsg = 'Deprecation warning: activity:actor is present '
+                . 'only for backward compatibility. It will be '
+                . 'removed in the next version of StatusNet.';
+            $xs->comment($depMsg);
+            $this->actor->outputTo($xs, 'activity:actor');
         }
 
         if ($this->verb != ActivityVerb::POST || count($this->objects) != 1) {
diff --git a/lib/atomgroupnoticefeed.php b/lib/atomgroupnoticefeed.php
index 4e7f992662..817191b64a 100644
--- a/lib/atomgroupnoticefeed.php
+++ b/lib/atomgroupnoticefeed.php
@@ -91,8 +91,16 @@ class AtomGroupNoticeFeed extends AtomNoticeFeed
 
         $ao = ActivityObject::fromGroup($group);
 
-        $this->addAuthorRaw($ao->asString('author').
-                            $ao->asString('activity:subject'));
+        $this->addAuthorRaw($ao->asString('author'));
+
+        $depMsg = 'Deprecation warning: activity:subject is present '
+            . 'only for backward compatibility. It will be '
+            . 'removed in the next version of StatusNet.';
+
+        $this->addAuthorRaw(
+            "<!--$depMsg-->\n"
+            . $ao->asString('activity:subject')
+        );
 
         $this->addLink($group->homeUrl());
     }
diff --git a/lib/atomusernoticefeed.php b/lib/atomusernoticefeed.php
index 5ca089b859..3398cc8b4d 100644
--- a/lib/atomusernoticefeed.php
+++ b/lib/atomusernoticefeed.php
@@ -59,9 +59,29 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
         parent::__construct($cur, $indent);
         $this->user = $user;
         if (!empty($user)) {
+
             $profile = $user->getProfile();
+
             $ao = ActivityObject::fromProfile($profile);
+
+            $ao->extra[] = $profile->profileInfo($cur);
+
+            // XXX: For users, we generate an author _AND_ an <activity:subject>
+            // This is for backward compatibility with clients (especially
+            // StatusNet's clients) that assume the Atom will conform to an
+            // older version of the Activity Streams API. Subject should be
+            // removed in future versions of StatusNet.
+
             $this->addAuthorRaw($ao->asString('author'));
+
+            $depMsg = 'Deprecation warning: activity:subject is present '
+                . 'only for backward compatibility. It will be '
+                . 'removed in the next version of StatusNet.';
+
+            $this->addAuthorRaw(
+                "<!--$depMsg-->\n"
+                . $ao->asString('activity:subject')
+            );
         }
 
         // TRANS: Title in atom user notice feed. %s is a user name.

From 8fa44e58f975ad6d59e0151f624de603a650352c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 10 Feb 2011 09:39:40 -0500
Subject: [PATCH 235/314] Try not to wipe out good data with empty values in
 Ostatus_profile::updateProfile()

Output from 0.9.6 PuSH feeds seems to have a rump <author> but no
<activity:actor>. It was overwriting valid and useful data set up at
subscribe time.

This fix tries to avoid overwriting data. However, it may prevent
updates that delete data.

Bug: 3028
---
 plugins/OStatus/classes/Ostatus_profile.php | 32 ++++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 28f2dc0a97..c4d857f22c 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -1354,7 +1354,17 @@ class Ostatus_profile extends Memcached_DataObject
     {
         $orig = clone($profile);
 
-        $profile->nickname = self::getActivityObjectNickname($object, $hints);
+        // Existing nickname is better than nothing.
+
+        if (!array_key_exists('nickname', $hints)) {
+            $hints['nickname'] = $profile->nickname;
+        }
+
+        $nickname = self::getActivityObjectNickname($object, $hints);
+
+        if (!empty($nickname)) {
+            $profile->nickname = $nickname;
+        }
 
         if (!empty($object->title)) {
             $profile->fullname = $object->title;
@@ -1370,9 +1380,23 @@ class Ostatus_profile extends Memcached_DataObject
             $profile->profileurl = $object->id;
         }
 
-        $profile->bio      = self::getActivityObjectBio($object, $hints);
-        $profile->location = self::getActivityObjectLocation($object, $hints);
-        $profile->homepage = self::getActivityObjectHomepage($object, $hints);
+        $bio = self::getActivityObjectBio($object, $hints);
+
+        if (!empty($bio)) {
+            $profile->bio = $bio;
+        }
+
+        $location = self::getActivityObjectLocation($object, $hints);
+
+        if (!empty($location)) {
+            $profile->location = $location;
+        }
+
+        $homepage = self::getActivityObjectHomepage($object, $hints);
+
+        if (!empty($homepage)) {
+            $profile->homepage = $homepage;
+        }
 
         if (!empty($object->geopoint)) {
             $location = ActivityContext::locationFromPoint($object->geopoint);

From 523e8c86e9448defd8a3b2a6a8d55ee68ab283e9 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 10 Feb 2011 10:11:30 -0500
Subject: [PATCH 236/314] correct error in README on default for deletion

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index b71d21aba5..f290ef4244 100644
--- a/README
+++ b/README
@@ -1279,7 +1279,7 @@ biolimit: max character length of bio; 0 means no limit; null means to use
 backup: whether users can backup their own profiles. Defaults to true.
 restore: whether users can restore their profiles from backup files. Defaults
 	 to true.
-delete: whether users can delete their own accounts. Defaults to true.
+delete: whether users can delete their own accounts. Defaults to false.
 move: whether users can move their accounts to another server. Defaults
       to true.	 
 

From 8a87e9869f5a4e61592bd4f44a9ed6e208a3151d Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Thu, 10 Feb 2011 13:23:20 -0500
Subject: [PATCH 237/314] Show aside primary on settings pages for all themes.

---
 plugins/NewMenu/newmenu.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/NewMenu/newmenu.css b/plugins/NewMenu/newmenu.css
index f700fdcc45..67fe5826c0 100644
--- a/plugins/NewMenu/newmenu.css
+++ b/plugins/NewMenu/newmenu.css
@@ -41,7 +41,12 @@ border-radius-topright:7px;
 border-radius-topright:0;
 -moz-border-radius-topright:0;
 -webkit-border-top-right-radius:0;
+min-height: 360px;
 }
 body[id$=settings] #aside_primary {
-display:none;
+float: right;
+width: 17.25%;
+margin-right: 10.45%;
+margin-top: 6px;
+min-height: 0px;
 }

From d9ace57625bebd1205ab3348db7097e74b8c6d24 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 10 Feb 2011 10:24:38 -0800
Subject: [PATCH 238/314] FacebookBridge - remove unnecessary warning and noisy
 debugging statement

---
 plugins/FacebookBridge/lib/facebookclient.php | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/plugins/FacebookBridge/lib/facebookclient.php b/plugins/FacebookBridge/lib/facebookclient.php
index 094338533e..030a75caed 100644
--- a/plugins/FacebookBridge/lib/facebookclient.php
+++ b/plugins/FacebookBridge/lib/facebookclient.php
@@ -115,14 +115,7 @@ class Facebookclient
     function isFacebookBound() {
 
         if (empty($this->flink)) {
-            common_log(
-                LOG_WARNING,
-                sprintf(
-                    "No Foreign_link to Facebook for the author of notice %d.",
-                    $this->notice->id
-                ),
-                __FILE__
-            );
+            // User hasn't setup bridging
             return false;
         }
 
@@ -180,15 +173,6 @@ class Facebookclient
                 // Otherwise we most likely have an access token
                 return $this->sendGraph();
             }
-
-        } else {
-            common_debug(
-                sprintf(
-                    "Skipping notice %d - not bound for Facebook",
-                    $this->notice->id,
-                    __FILE__
-                )
-            );
         }
     }
 

From 2bf8a68908fef5d4680235c561912b5e3c2ee4da Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 10 Feb 2011 10:53:24 -0800
Subject: [PATCH 239/314] Fix for ticket #3039: TwitterBridge was incorrectly
 sending repeats of Twitter-bound messages if the repeater has sending of
 things to Twitter disabled.

A repeat/retweet is roughly equivalent to an active direct post, so should follow the posting rules, rather than always sending over as we do for fave notifications.
---
 plugins/TwitterBridge/twitter.php | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/plugins/TwitterBridge/twitter.php b/plugins/TwitterBridge/twitter.php
index e8d11f3b6a..f5a0b62588 100644
--- a/plugins/TwitterBridge/twitter.php
+++ b/plugins/TwitterBridge/twitter.php
@@ -173,18 +173,20 @@ function broadcast_twitter($notice)
 
     // Don't bother with basic auth, since it's no longer allowed
     if (!empty($flink) && TwitterOAuthClient::isPackedToken($flink->credentials)) {
-        if (!empty($notice->repeat_of) && is_twitter_notice($notice->repeat_of)) {
-            $retweet = retweet_notice($flink, Notice::staticGet('id', $notice->repeat_of));
-            if (is_object($retweet)) {
-                Notice_to_status::saveNew($notice->id, twitter_id($retweet));
-                return true;
+        if (is_twitter_bound($notice, $flink)) {
+            if (!empty($notice->repeat_of) && is_twitter_notice($notice->repeat_of)) {
+                $retweet = retweet_notice($flink, Notice::staticGet('id', $notice->repeat_of));
+                if (is_object($retweet)) {
+                    Notice_to_status::saveNew($notice->id, twitter_id($retweet));
+                    return true;
+                } else {
+                    // Our error processing will have decided if we need to requeue
+                    // this or can discard safely.
+                    return $retweet;
+                }
             } else {
-                // Our error processing will have decided if we need to requeue
-                // this or can discard safely.
-                return $retweet;
+                return broadcast_oauth($notice, $flink);
             }
-        } else if (is_twitter_bound($notice, $flink)) {
-            return broadcast_oauth($notice, $flink);
         }
     }
 

From fc317f8b7290be1c89eca6c76739e24ddde27e9b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 11 Feb 2011 02:59:18 +0000
Subject: [PATCH 240/314] check legacy <actor> and <subject> first from feed

---
 lib/activityutils.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/activityutils.php b/lib/activityutils.php
index 11befc0ed4..3aa09deb4e 100644
--- a/lib/activityutils.php
+++ b/lib/activityutils.php
@@ -273,14 +273,6 @@ class ActivityUtils
 
     static function getFeedAuthor($feedEl)
     {
-        // Try the feed author
-
-        $author = ActivityUtils::child($feedEl, Activity::AUTHOR, Activity::ATOM);
-
-        if (!empty($author)) {
-            return new ActivityObject($author);
-        }
-
         // Try old and deprecated activity:subject
 
         $subject = ActivityUtils::child($feedEl, Activity::SUBJECT, Activity::SPEC);
@@ -289,6 +281,14 @@ class ActivityUtils
             return new ActivityObject($subject);
         }
 
+        // Try the feed author
+
+        $author = ActivityUtils::child($feedEl, Activity::AUTHOR, Activity::ATOM);
+
+        if (!empty($author)) {
+            return new ActivityObject($author);
+        }
+
         // Sheesh. Not a very nice feed! Let's try fingerpoken in the
         // entries.
 
@@ -298,14 +298,6 @@ class ActivityUtils
 
             $entry = $entries->item(0);
 
-            // Try the author
-
-            $author = ActivityUtils::child($entry, Activity::AUTHOR, Activity::ATOM);
-
-            if (!empty($author)) {
-                return new ActivityObject($author);
-            }
-
             // Try the (deprecated) activity:actor
 
             $actor = ActivityUtils::child($entry, Activity::ACTOR, Activity::SPEC);
@@ -313,6 +305,14 @@ class ActivityUtils
             if (!empty($actor)) {
                 return new ActivityObject($actor);
             }
+
+            // Try the author
+
+            $author = ActivityUtils::child($entry, Activity::AUTHOR, Activity::ATOM);
+
+            if (!empty($author)) {
+                return new ActivityObject($author);
+            }
         }
 
         return null;

From ff2553b9c72d0470bfa18f1100bcd0e17b4f7e90 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 11 Feb 2011 03:01:24 +0000
Subject: [PATCH 241/314] get the subject first if you go to the feed

---
 lib/activity.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/activity.php b/lib/activity.php
index 6c21c0bcc9..17684d897b 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -205,18 +205,19 @@ class Activity
             // the surrounding feed.
             $this->actor = new ActivityObject($authorEl);
 
-        } else if (!empty($feed) && $authorEl = $this->_child($feed, self::AUTHOR,
-                                                              self::ATOM)) {
-
-            // If there's no <atom:author> on the entry, it's safe to assume
-            // the containing feed's authorship info applies.
-            $this->actor = new ActivityObject($authorEl);
         } else if (!empty($feed) &&
                    $subjectEl = $this->_child($feed, self::SUBJECT)) {
 
             // Feed subject is used for things like groups.
             // Should actually possibly not be interpreted as an actor...?
             $this->actor = new ActivityObject($subjectEl);
+
+        } else if (!empty($feed) && $authorEl = $this->_child($feed, self::AUTHOR,
+                                                              self::ATOM)) {
+
+            // If there's no <atom:author> on the entry, it's safe to assume
+            // the containing feed's authorship info applies.
+            $this->actor = new ActivityObject($authorEl);
         }
 
         $contextEl = $this->_child($entry, self::CONTEXT);

From 91535365b3a2f0b56f52c982f0e8ab8976d36dc6 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 11 Feb 2011 11:55:23 -0800
Subject: [PATCH 242/314] Work in progress: update-profile-data.php to update
 ostatus profile info from the current feed

---
 .../OStatus/scripts/update-profile-data.php   | 88 +++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 plugins/OStatus/scripts/update-profile-data.php

diff --git a/plugins/OStatus/scripts/update-profile-data.php b/plugins/OStatus/scripts/update-profile-data.php
new file mode 100644
index 0000000000..f10da71437
--- /dev/null
+++ b/plugins/OStatus/scripts/update-profile-data.php
@@ -0,0 +1,88 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a 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/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
+
+$helptext = <<<END_OF_HELP
+update-profile-data.php [options] http://example.com/profile/url
+
+Rerun profile discovery for the given OStatus remote profile, and save the
+updated profile data (nickname, avatar, bio, etc). Doesn't touch feed state.
+Can be used to clean up after breakages.
+
+END_OF_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+if (empty($args[0]) || !Validate::uri($args[0])) {
+    print "$helptext";
+    exit(1);
+}
+
+$uri = $args[0];
+
+
+$oprofile = Ostatus_profile::staticGet('uri', $uri);
+
+if (!$oprofile) {
+    print "No OStatus remote profile known for URI $uri\n";
+    exit(1);
+}
+
+function showProfileInfo($oprofile) {
+    if ($oprofile->isGroup()) {
+        echo "group\n";
+    } else {
+        $profile = $oprofile->localProfile();
+        foreach (array('nickname', 'bio', 'homepage', 'location') as $field) {
+            print "  $field: {$profile->$field}\n";
+        }
+    }
+    echo "\n";
+}
+
+echo "Before:\n";
+showProfileInfo($oprofile);
+
+$feedurl = $oprofile->feeduri;
+$client = new HttpClient();
+$response = $client->get($feedurl);
+if ($response->isOk()) {
+    echo "Updating profile from feed: $feedurl\n";
+    $dom = new DOMDocument();
+    if ($dom->loadXML($response->getBody())) {
+        $entries = $dom->getElementsByTagNameNS(Activity::ATOM, 'entry');
+        if ($entries->length) {
+            $entry = $entries->item(0);
+            $activity = new Activity($entry, $feed);
+            $oprofile->checkAuthorship($activity);
+            echo "  (ok)\n";
+        } else {
+            echo "  (no entry; skipping)\n";
+        }
+    } else {
+        echo "  (bad feed; skipping)\n";
+    }
+} else {
+    echo "Failed feed fetch: {$response->getStatus()} for $feedurl\n";
+}
+
+echo "After:\n";
+showProfileInfo($oprofile);

From f7b431d60bd2d38d5fbf12e1a37678f3d25a7cc6 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 11 Feb 2011 12:08:35 -0800
Subject: [PATCH 243/314] woops

---
 plugins/OStatus/scripts/update-profile-data.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/OStatus/scripts/update-profile-data.php b/plugins/OStatus/scripts/update-profile-data.php
index f10da71437..4f5409bfab 100644
--- a/plugins/OStatus/scripts/update-profile-data.php
+++ b/plugins/OStatus/scripts/update-profile-data.php
@@ -68,6 +68,7 @@ if ($response->isOk()) {
     echo "Updating profile from feed: $feedurl\n";
     $dom = new DOMDocument();
     if ($dom->loadXML($response->getBody())) {
+        $feed = $dom->documentElement;
         $entries = $dom->getElementsByTagNameNS(Activity::ATOM, 'entry');
         if ($entries->length) {
             $entry = $entries->item(0);

From f30744c7c565c50047b90515bcfd71baa382c96e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 11 Feb 2011 12:13:33 -0800
Subject: [PATCH 244/314] refactor for multi....

---
 .../OStatus/scripts/update-profile-data.php   | 80 ++++++++++---------
 1 file changed, 43 insertions(+), 37 deletions(-)

diff --git a/plugins/OStatus/scripts/update-profile-data.php b/plugins/OStatus/scripts/update-profile-data.php
index 4f5409bfab..d61d9470d1 100644
--- a/plugins/OStatus/scripts/update-profile-data.php
+++ b/plugins/OStatus/scripts/update-profile-data.php
@@ -31,21 +31,6 @@ END_OF_HELP;
 
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
-if (empty($args[0]) || !Validate::uri($args[0])) {
-    print "$helptext";
-    exit(1);
-}
-
-$uri = $args[0];
-
-
-$oprofile = Ostatus_profile::staticGet('uri', $uri);
-
-if (!$oprofile) {
-    print "No OStatus remote profile known for URI $uri\n";
-    exit(1);
-}
-
 function showProfileInfo($oprofile) {
     if ($oprofile->isGroup()) {
         echo "group\n";
@@ -58,32 +43,53 @@ function showProfileInfo($oprofile) {
     echo "\n";
 }
 
-echo "Before:\n";
-showProfileInfo($oprofile);
+function fixProfile($uri) {
+    $oprofile = Ostatus_profile::staticGet('uri', $uri);
 
-$feedurl = $oprofile->feeduri;
-$client = new HttpClient();
-$response = $client->get($feedurl);
-if ($response->isOk()) {
-    echo "Updating profile from feed: $feedurl\n";
-    $dom = new DOMDocument();
-    if ($dom->loadXML($response->getBody())) {
-        $feed = $dom->documentElement;
-        $entries = $dom->getElementsByTagNameNS(Activity::ATOM, 'entry');
-        if ($entries->length) {
-            $entry = $entries->item(0);
-            $activity = new Activity($entry, $feed);
-            $oprofile->checkAuthorship($activity);
-            echo "  (ok)\n";
+    if (!$oprofile) {
+        print "No OStatus remote profile known for URI $uri\n";
+        return false;
+    }
+
+    echo "Before:\n";
+    showProfileInfo($oprofile);
+
+    $feedurl = $oprofile->feeduri;
+    $client = new HttpClient();
+    $response = $client->get($feedurl);
+    if ($response->isOk()) {
+        echo "Updating profile from feed: $feedurl\n";
+        $dom = new DOMDocument();
+        if ($dom->loadXML($response->getBody())) {
+            $feed = $dom->documentElement;
+            $entries = $dom->getElementsByTagNameNS(Activity::ATOM, 'entry');
+            if ($entries->length) {
+                $entry = $entries->item(0);
+                $activity = new Activity($entry, $feed);
+                $oprofile->checkAuthorship($activity);
+                echo "  (ok)\n";
+            } else {
+                echo "  (no entry; skipping)\n";
+                return false;
+            }
         } else {
-            echo "  (no entry; skipping)\n";
+            echo "  (bad feed; skipping)\n";
+            return false;
         }
     } else {
-        echo "  (bad feed; skipping)\n";
+        echo "Failed feed fetch: {$response->getStatus()} for $feedurl\n";
+        return false;
     }
-} else {
-    echo "Failed feed fetch: {$response->getStatus()} for $feedurl\n";
+
+    echo "After:\n";
+    showProfileInfo($oprofile);
+    return true;
 }
 
-echo "After:\n";
-showProfileInfo($oprofile);
+if (empty($args[0]) || !Validate::uri($args[0])) {
+    print "$helptext";
+    exit(1);
+}
+
+$uri = $args[0];
+fixProfile($uri);

From c92358fa7bfadef0138e22d7e19f6d33cb557f72 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 11 Feb 2011 12:23:03 -0800
Subject: [PATCH 245/314] add --all and --suspicious options for
 update-profile-data.php

---
 .../OStatus/scripts/update-profile-data.php   | 36 ++++++++++++++++---
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/plugins/OStatus/scripts/update-profile-data.php b/plugins/OStatus/scripts/update-profile-data.php
index d61d9470d1..20f6d57d90 100644
--- a/plugins/OStatus/scripts/update-profile-data.php
+++ b/plugins/OStatus/scripts/update-profile-data.php
@@ -20,13 +20,20 @@
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
 
+$longoptions = array('all', 'suspicious', 'quiet');
+
 $helptext = <<<END_OF_HELP
-update-profile-data.php [options] http://example.com/profile/url
+update-profile-data.php [options] [http://example.com/profile/url]
 
 Rerun profile discovery for the given OStatus remote profile, and save the
 updated profile data (nickname, avatar, bio, etc). Doesn't touch feed state.
 Can be used to clean up after breakages.
 
+Options:
+  --all        Run for all known OStatus profiles
+  --suspicious Run for OStatus profiles with all-numeric nicknames
+               (fixes 0.9.7 prerelease back-compatibility bug)
+
 END_OF_HELP;
 
 require_once INSTALLDIR.'/scripts/commandline.inc';
@@ -86,10 +93,29 @@ function fixProfile($uri) {
     return true;
 }
 
-if (empty($args[0]) || !Validate::uri($args[0])) {
+$ok = true;
+if (have_option('all')) {
+    $oprofile = new Ostatus_profile();
+    $oprofile->find();
+    echo "Found $oprofile->N profiles:\n\n";
+    while ($oprofile->fetch()) {
+        $ok = fixProfile($oprofile->uri) && $ok;
+    }
+} else if (have_option('suspicious')) {
+    $oprofile = new Ostatus_profile();
+    $oprofile->joinAdd(array('profile_id', 'profile:id'));
+    $oprofile->whereAdd("nickname rlike '^[0-9]$'");
+    $oprofile->find();
+    echo "Found $oprofile->N matching profiles:\n\n";
+    while ($oprofile->fetch()) {
+        $ok = fixProfile($oprofile->uri) && $ok;
+    }
+} else if (!empty($args[0]) && Validate::uri($args[0])) {
+    $uri = $args[0];
+    $ok = fixProfile($uri);
+} else {
     print "$helptext";
-    exit(1);
+    $ok = false;
 }
 
-$uri = $args[0];
-fixProfile($uri);
+exit($ok ? 0 : 1);

From f6e614b8943be20e9688bdf970e236e19ac06aae Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 11 Feb 2011 15:58:47 -0500
Subject: [PATCH 246/314] add plugins/sslpath setting, default to site
 path/plugins

---
 README          | 1 +
 lib/default.php | 1 +
 lib/plugin.php  | 6 +++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/README b/README
index f290ef4244..c27182395c 100644
--- a/README
+++ b/README
@@ -1588,6 +1588,7 @@ sslserver: Server to find static files for a plugin when the page is HTTPS. Defa
 path: Path to the plugin files. defaults to site/path + '/plugins/'. Expects that
       each plugin will have a subdirectory at plugins/NameOfPlugin. Change this
       if you're using a CDN.
+sslpath: Path to use on the SSL server. Same as plugins/path.
 
 Plugins
 =======
diff --git a/lib/default.php b/lib/default.php
index 7d8b1fec7a..124c90c998 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -317,6 +317,7 @@ $default =
               'server' => null,
               'sslserver' => null,
               'path' => null,
+              'sslpath' => null,
               ),
         'admin' =>
         array('panels' => array('design', 'site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license')),
diff --git a/lib/plugin.php b/lib/plugin.php
index 115bb10e01..1ccf23a095 100644
--- a/lib/plugin.php
+++ b/lib/plugin.php
@@ -152,7 +152,11 @@ class Plugin
             }
         }
 
-        $path = common_config('plugins', 'path');
+        if ($isHTTPS) {
+            $path = common_config('plugins', 'sslpath');
+        } else {
+            $path = common_config('plugins', 'path');
+        }
 
         if (empty($path)) {
             $path = common_config('site', 'path') . '/plugins/';

From 454a980bd4f1d32062775772d7ddd6f57e5a0864 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 11 Feb 2011 13:21:53 -0800
Subject: [PATCH 247/314] Fix for failure/exception on subscription/subscriber
 lists when deleted profiles are stuck in cached list.

Workaround for deleted profiles still appearing in cached subscriptions/subscribers lists: if we couldn't fetch them, don't include them in the ArrayWrapper.
ArrayWrapper doesn't deal well with null entries, which aren't meant to happen in how it works. This code has recently changed from dying directly with a PHP fatal error in that case to throwing an exception, which allows tracking down the caller.

It looks like there might be some cases where profiles and their matching subscriptions get deleted, but the subscription entries don't get properly cleared from cache... that still bears further investigation. The regular code path looks ok; calls Subscription::cancel() from code called in Profile::delete(); but if they're batch-deleted instead of one row at a time, that could fail to trigger.
---
 classes/Profile.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/classes/Profile.php b/classes/Profile.php
index 03f9300962..bdac3ba453 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -354,7 +354,10 @@ class Profile extends Memcached_DataObject
         $profiles = array();
 
         while ($subs->fetch()) {
-            $profiles[] = Profile::staticGet($subs->subscribed);
+            $profile = Profile::staticGet($subs->subscribed);
+            if ($profile) {
+                $profiles[] = $profile;
+            }
         }
 
         return new ArrayWrapper($profiles);
@@ -369,7 +372,10 @@ class Profile extends Memcached_DataObject
         $profiles = array();
 
         while ($subs->fetch()) {
-            $profiles[] = Profile::staticGet($subs->subscriber);
+            $profile = Profile::staticGet($subs->subscriber);
+            if ($profile) {
+                $profiles[] = $profile;
+            }
         }
 
         return new ArrayWrapper($profiles);

From 30eddaf168484d628519c02c4612ee103002911d Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 11 Feb 2011 14:11:37 -0800
Subject: [PATCH 248/314] Update translator comment for the url shortener "free
 service" marker: free as in open

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

diff --git a/actions/othersettings.php b/actions/othersettings.php
index ef2c9f32b0..9b12deaae4 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -106,8 +106,10 @@ class OthersettingsAction extends AccountSettingsAction
             $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).
+                // 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).
                 $services[$name].=_(' (free service)');
             }
         }

From 7de1aaf86dda013dab94d5ae4694a3fc80fba6e9 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Sun, 13 Feb 2011 00:40:28 +0000
Subject: [PATCH 249/314] Atom - output nickname for atom:name in atom:author

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

diff --git a/lib/activityobject.php b/lib/activityobject.php
index f774dd3c8b..5898c6d050 100644
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -546,7 +546,10 @@ class ActivityObject
         if (!empty($this->title)) {
             $name = common_xml_safe_str($this->title);
             if ($tag == 'author') {
-                $xo->element(self::NAME, null, $name);
+                // 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);
             }

From 40533ee85168ca0f8b3747970494a82f9b34df15 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 14 Feb 2011 12:41:20 -0500
Subject: [PATCH 250/314] backup action is read-only

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

diff --git a/actions/backupaccount.php b/actions/backupaccount.php
index 7794826760..928aba69ce 100644
--- a/actions/backupaccount.php
+++ b/actions/backupaccount.php
@@ -149,7 +149,7 @@ class BackupaccountAction extends Action
      */
     function isReadOnly($args)
     {
-        return false;
+        return true;
     }
 
     /**

From a86d293c9327057fb7d4a8c9c376967227d20178 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Mon, 14 Feb 2011 19:43:16 +0100
Subject: [PATCH 251/314] Localisation updates from http://translatewiki.net.

---
 locale/ar/LC_MESSAGES/statusnet.po            | 245 +++---
 locale/arz/LC_MESSAGES/statusnet.po           | 244 +++---
 locale/bg/LC_MESSAGES/statusnet.po            | 245 +++---
 locale/br/LC_MESSAGES/statusnet.po            | 245 +++---
 locale/ca/LC_MESSAGES/statusnet.po            | 256 +++---
 locale/cs/LC_MESSAGES/statusnet.po            | 245 +++---
 locale/de/LC_MESSAGES/statusnet.po            | 249 +++---
 locale/en_GB/LC_MESSAGES/statusnet.po         | 245 +++---
 locale/eo/LC_MESSAGES/statusnet.po            | 321 +++----
 locale/es/LC_MESSAGES/statusnet.po            | 341 ++++----
 locale/fa/LC_MESSAGES/statusnet.po            | 245 +++---
 locale/fi/LC_MESSAGES/statusnet.po            | 249 +++---
 locale/fr/LC_MESSAGES/statusnet.po            | 254 +++---
 locale/gl/LC_MESSAGES/statusnet.po            | 247 +++---
 locale/hsb/LC_MESSAGES/statusnet.po           | 307 +++----
 locale/hu/LC_MESSAGES/statusnet.po            | 245 +++---
 locale/ia/LC_MESSAGES/statusnet.po            | 325 +++----
 locale/it/LC_MESSAGES/statusnet.po            | 246 +++---
 locale/ja/LC_MESSAGES/statusnet.po            | 245 +++---
 locale/ka/LC_MESSAGES/statusnet.po            | 245 +++---
 locale/ko/LC_MESSAGES/statusnet.po            | 245 +++---
 locale/mk/LC_MESSAGES/statusnet.po            | 328 ++++----
 locale/ml/LC_MESSAGES/statusnet.po            | 565 +++++++------
 locale/nb/LC_MESSAGES/statusnet.po            | 245 +++---
 locale/nl/LC_MESSAGES/statusnet.po            | 324 +++----
 locale/nn/LC_MESSAGES/statusnet.po            | 248 +++---
 locale/pl/LC_MESSAGES/statusnet.po            | 247 +++---
 locale/pt/LC_MESSAGES/statusnet.po            | 245 +++---
 locale/pt_BR/LC_MESSAGES/statusnet.po         | 245 +++---
 locale/ru/LC_MESSAGES/statusnet.po            | 249 +++---
 locale/statusnet.pot                          | 237 +++---
 locale/sv/LC_MESSAGES/statusnet.po            | 245 +++---
 locale/te/LC_MESSAGES/statusnet.po            | 245 +++---
 locale/tr/LC_MESSAGES/statusnet.po            | 247 +++---
 locale/uk/LC_MESSAGES/statusnet.po            | 336 ++++----
 locale/zh_CN/LC_MESSAGES/statusnet.po         | 289 +++----
 plugins/APC/locale/de/LC_MESSAGES/APC.po      |  30 +
 .../Adsense/locale/de/LC_MESSAGES/Adsense.po  |  11 +-
 .../locale/de/LC_MESSAGES/Awesomeness.po      |  30 +
 .../locale/br/LC_MESSAGES/Bookmark.po         |  36 +
 .../locale/de/LC_MESSAGES/Bookmark.po         |  36 +
 .../locale/fr/LC_MESSAGES/Bookmark.po         |  36 +
 .../locale/my/LC_MESSAGES/Bookmark.po         |  36 +
 .../de/LC_MESSAGES/CasAuthentication.po       |  26 +-
 .../Disqus/locale/de/LC_MESSAGES/Disqus.po    |  11 +-
 .../locale/de/LC_MESSAGES/EmailSummary.po     |  27 +
 .../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   | 318 +++++++
 .../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 +-
 .../locale/GroupPrivateMessage.pot            |  53 ++
 plugins/Imap/locale/de/LC_MESSAGES/Imap.po    |  59 ++
 .../locale/de/LC_MESSAGES/InProcessCache.po   |  26 +
 .../locale/de/LC_MESSAGES/InfiniteScroll.po   |  13 +-
 .../de/LC_MESSAGES/LdapAuthentication.po      |  30 +
 .../de/LC_MESSAGES/LdapAuthorization.po       |  30 +
 .../locale/de/LC_MESSAGES/LinkPreview.po      |  28 +
 .../locale/de/LC_MESSAGES/LogFilter.po        |  28 +
 .../MobileProfile/locale/MobileProfile.pot    |   6 +-
 .../locale/de/LC_MESSAGES/MobileProfile.po    |  78 ++
 .../locale/ps/LC_MESSAGES/MobileProfile.po    |  20 +-
 .../locale/de/LC_MESSAGES/ModHelper.po        |  29 +
 .../ModPlus/locale/de/LC_MESSAGES/ModPlus.po  |  52 ++
 .../NewMenu/locale/br/LC_MESSAGES/NewMenu.po  |  98 +++
 .../NewMenu/locale/de/LC_MESSAGES/NewMenu.po  |  98 +++
 plugins/OStatus/locale/OStatus.pot            |  20 +-
 .../OStatus/locale/de/LC_MESSAGES/OStatus.po  | 792 ++++++++++++++++++
 .../OStatus/locale/fr/LC_MESSAGES/OStatus.po  |  33 +-
 .../OStatus/locale/ia/LC_MESSAGES/OStatus.po  |  32 +-
 .../OStatus/locale/mk/LC_MESSAGES/OStatus.po  |  32 +-
 .../OStatus/locale/nl/LC_MESSAGES/OStatus.po  |  32 +-
 .../OStatus/locale/uk/LC_MESSAGES/OStatus.po  |  32 +-
 .../OpenID/locale/de/LC_MESSAGES/OpenID.po    |  36 +-
 .../locale/de/LC_MESSAGES/RSSCloud.po         |  34 +-
 plugins/Realtime/locale/Realtime.pot          |  14 +-
 .../locale/af/LC_MESSAGES/Realtime.po         |  20 +-
 .../locale/br/LC_MESSAGES/Realtime.po         |  20 +-
 .../locale/ca/LC_MESSAGES/Realtime.po         |  20 +-
 .../locale/de/LC_MESSAGES/Realtime.po         |  58 ++
 .../locale/fr/LC_MESSAGES/Realtime.po         |  20 +-
 .../locale/ia/LC_MESSAGES/Realtime.po         |  20 +-
 .../locale/mk/LC_MESSAGES/Realtime.po         |  20 +-
 .../locale/ne/LC_MESSAGES/Realtime.po         |  20 +-
 .../locale/nl/LC_MESSAGES/Realtime.po         |  20 +-
 .../locale/tr/LC_MESSAGES/Realtime.po         |  20 +-
 .../locale/uk/LC_MESSAGES/Realtime.po         |  20 +-
 .../ReverseUsernameAuthentication.po          |  32 +
 .../locale/de/LC_MESSAGES/SQLProfile.po       |  26 +
 .../locale/fr/LC_MESSAGES/SQLProfile.po       |  28 +
 .../Sitemap/locale/de/LC_MESSAGES/Sitemap.po  |  92 ++
 .../locale/de/LC_MESSAGES/SlicedFavorites.po  |  34 +
 .../locale/de/LC_MESSAGES/SphinxSearch.po     |  37 +
 .../locale/de/LC_MESSAGES/SubMirror.po        | 141 ++++
 .../locale/fr/LC_MESSAGES/SubMirror.po        |  11 +-
 plugins/TinyMCE/locale/TinyMCE.pot            |   4 +-
 .../TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po  |  10 +-
 .../TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po  |  10 +-
 .../TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po  |  10 +-
 .../TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po  |  10 +-
 .../TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po  |  10 +-
 .../TinyMCE/locale/ia/LC_MESSAGES/TinyMCE.po  |  10 +-
 .../TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po  |  10 +-
 .../TinyMCE/locale/mk/LC_MESSAGES/TinyMCE.po  |  10 +-
 .../TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po  |  10 +-
 .../TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po  |  10 +-
 .../locale/pt_BR/LC_MESSAGES/TinyMCE.po       |  10 +-
 .../TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po  |  10 +-
 .../TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po  |  10 +-
 .../TinyMCE/locale/uk/LC_MESSAGES/TinyMCE.po  |  10 +-
 .../TwitterBridge/locale/TwitterBridge.pot    |   6 +-
 .../locale/br/LC_MESSAGES/TwitterBridge.po    |  12 +-
 .../locale/ca/LC_MESSAGES/TwitterBridge.po    |  12 +-
 .../locale/fa/LC_MESSAGES/TwitterBridge.po    |  12 +-
 .../locale/fr/LC_MESSAGES/TwitterBridge.po    |  12 +-
 .../locale/ia/LC_MESSAGES/TwitterBridge.po    |  12 +-
 .../locale/mk/LC_MESSAGES/TwitterBridge.po    |  12 +-
 .../locale/nl/LC_MESSAGES/TwitterBridge.po    |  12 +-
 .../locale/tr/LC_MESSAGES/TwitterBridge.po    |  12 +-
 .../locale/uk/LC_MESSAGES/TwitterBridge.po    |  12 +-
 .../locale/zh_CN/LC_MESSAGES/TwitterBridge.po |  12 +-
 124 files changed, 7980 insertions(+), 5197 deletions(-)
 create mode 100644 plugins/APC/locale/de/LC_MESSAGES/APC.po
 create mode 100644 plugins/Awesomeness/locale/de/LC_MESSAGES/Awesomeness.po
 create mode 100644 plugins/Bookmark/locale/br/LC_MESSAGES/Bookmark.po
 create mode 100644 plugins/Bookmark/locale/de/LC_MESSAGES/Bookmark.po
 create mode 100644 plugins/Bookmark/locale/fr/LC_MESSAGES/Bookmark.po
 create mode 100644 plugins/Bookmark/locale/my/LC_MESSAGES/Bookmark.po
 create mode 100644 plugins/EmailSummary/locale/de/LC_MESSAGES/EmailSummary.po
 create mode 100644 plugins/FacebookBridge/locale/de/LC_MESSAGES/FacebookBridge.po
 create mode 100644 plugins/GroupPrivateMessage/locale/GroupPrivateMessage.pot
 create mode 100644 plugins/Imap/locale/de/LC_MESSAGES/Imap.po
 create mode 100644 plugins/InProcessCache/locale/de/LC_MESSAGES/InProcessCache.po
 create mode 100644 plugins/LdapAuthentication/locale/de/LC_MESSAGES/LdapAuthentication.po
 create mode 100644 plugins/LdapAuthorization/locale/de/LC_MESSAGES/LdapAuthorization.po
 create mode 100644 plugins/LinkPreview/locale/de/LC_MESSAGES/LinkPreview.po
 create mode 100644 plugins/LogFilter/locale/de/LC_MESSAGES/LogFilter.po
 create mode 100644 plugins/MobileProfile/locale/de/LC_MESSAGES/MobileProfile.po
 create mode 100644 plugins/ModHelper/locale/de/LC_MESSAGES/ModHelper.po
 create mode 100644 plugins/ModPlus/locale/de/LC_MESSAGES/ModPlus.po
 create mode 100644 plugins/NewMenu/locale/br/LC_MESSAGES/NewMenu.po
 create mode 100644 plugins/NewMenu/locale/de/LC_MESSAGES/NewMenu.po
 create mode 100644 plugins/OStatus/locale/de/LC_MESSAGES/OStatus.po
 create mode 100644 plugins/Realtime/locale/de/LC_MESSAGES/Realtime.po
 create mode 100644 plugins/ReverseUsernameAuthentication/locale/de/LC_MESSAGES/ReverseUsernameAuthentication.po
 create mode 100644 plugins/SQLProfile/locale/de/LC_MESSAGES/SQLProfile.po
 create mode 100644 plugins/SQLProfile/locale/fr/LC_MESSAGES/SQLProfile.po
 create mode 100644 plugins/Sitemap/locale/de/LC_MESSAGES/Sitemap.po
 create mode 100644 plugins/SlicedFavorites/locale/de/LC_MESSAGES/SlicedFavorites.po
 create mode 100644 plugins/SphinxSearch/locale/de/LC_MESSAGES/SphinxSearch.po
 create mode 100644 plugins/SubMirror/locale/de/LC_MESSAGES/SubMirror.po

diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index a93de4874e..bb965033a4 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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:33:45+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:05:12+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 (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -93,11 +93,11 @@ msgstr "حفظ إعدادت الوصول"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "احفظ"
@@ -160,7 +160,7 @@ msgstr "لا صفحة كهذه."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "لا مستخدم كهذا."
 
@@ -330,7 +330,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -420,7 +420,7 @@ msgstr ""
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "مسار %s الزمني"
@@ -597,8 +597,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "الاسم المستعار مستخدم بالفعل. جرّب اسمًا آخرًا."
@@ -607,8 +607,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "ليس اسمًا مستعارًا صحيحًا."
@@ -620,8 +620,8 @@ msgstr "ليس اسمًا مستعارًا صحيحًا."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "الصفحة الرئيسية ليست عنونًا صالحًا."
@@ -630,8 +630,8 @@ msgstr "الصفحة الرئيسية ليست عنونًا صالحًا."
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "الاسم الكامل طويل جدًا (الحد الأقصى 255 حرفًا)."
@@ -646,8 +646,8 @@ msgstr "الاسم الكامل طويل جدًا (الحد الأقصى 255 ح
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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,8 +662,8 @@ msgstr[5] "المنظمة طويلة جدا (الأقصى %d حرفا)."
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -675,8 +675,8 @@ msgstr "المنظمة طويلة جدا (الأقصى 255 حرفا)."
 #. 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:229
-#: actions/newgroup.php:176
+#: 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."
@@ -698,15 +698,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -833,7 +833,7 @@ msgstr "لا تملك تصريحًا."
 #: 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:153 actions/passwordsettings.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
@@ -918,8 +918,8 @@ msgstr "الحساب"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "الاسم المستعار"
@@ -1514,7 +1514,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "أفتار"
@@ -1814,7 +1814,7 @@ msgstr "محادثة"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "الإشعارات"
@@ -2411,24 +2411,24 @@ msgstr "استخدم هذا النموذج لتعديل المجموعة."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: actions/editgroup.php:281 classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "تعذّر إنشاء الكنى."
 
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "حُفظت الخيارات."
 
@@ -3234,7 +3234,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "انشر هوية مصغّرة لعنوان بريدي الإلكتروني."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "حُفِظت التفضيلات."
 
@@ -3318,7 +3318,7 @@ msgid "Inbox for %s"
 msgstr "صندوق %s الوارد"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "هذا صندوق بريدك الوارد، والذي يسرد رسائلك الخاصة الواردة."
 
@@ -3744,7 +3744,7 @@ msgid "Use this form to create a new group."
 msgstr "استخدم هذا النموذج لإنشاء مجموعة جديدة."
 
 #. TRANS: Group create form validation error.
-#: actions/newgroup.php:199
+#: actions/newgroup.php:200
 msgid "Alias cannot be the same as nickname."
 msgstr ""
 
@@ -3944,8 +3944,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "ليس نسق بيانات مدعوم."
 
@@ -3967,34 +3967,36 @@ 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/othersettings.php:111
+#. 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:120
+#: actions/othersettings.php:122
 msgid "Shorten URLs with"
 msgstr "قصّر المسارات بـ"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:122
+#: actions/othersettings.php:124
 msgid "Automatic shortening service to use."
 msgstr "خدمة التقصير المطلوب استخدامها."
 
 #. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "اعرض تصاميم الملف الشخصي"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: actions/othersettings.php:164
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
@@ -4029,7 +4031,7 @@ msgstr "صندوق %1$s الصادر - صفحة %2$d"
 msgid "Outbox for %s"
 msgstr "صندوق %s الصادر"
 
-#: actions/outbox.php:116
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "هذا صندوق بريدك الصادر، والذي يسرد الرسائل الخاصة التي أرسلتها."
 
@@ -4307,7 +4309,7 @@ msgstr "مسار دليل المحليات"
 
 #. TRANS: Fieldset legens in Paths admin panel.
 #. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "مرفقات"
 
@@ -4429,7 +4431,6 @@ msgstr "معلومات الملف الشخصي"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
@@ -4438,15 +4439,15 @@ msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أ
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "الصفحة الرئيسية"
 
@@ -4485,8 +4486,8 @@ msgstr "السيرة"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "الموقع"
@@ -5314,13 +5315,13 @@ msgstr "المنظمة"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "إحصاءات"
@@ -5460,61 +5461,61 @@ msgid "%1$s group, page %2$d"
 msgstr "مجموعة %1$s، الصفحة %2$d"
 
 #. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "ملاحظة"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "الكنى"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 #, fuzzy
 msgid "Group actions"
 msgstr "تصرفات المستخدم"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "الأعضاء"
 
@@ -5522,26 +5523,26 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "جميع الأعضاء"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "أنشئت"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5551,7 +5552,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5569,7 +5570,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5582,30 +5583,30 @@ msgstr ""
 "(http://status.net/). يتشارك أعضاؤها رسائل قصيرة عن حياتهم واهتماماتهم. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "الإداريون"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, fuzzy, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "نتائج البحث ل\"%1$s\" على %2$s"
@@ -6545,7 +6546,7 @@ msgstr "جرّب [البحث عن مجموعات](%%action.groupsearch%%) وال
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, fuzzy, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "الإشعارات التي فضلها %1$s في %2$s!"
@@ -6620,20 +6621,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6650,7 +6651,7 @@ 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:217
+#: 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."
@@ -6663,7 +6664,7 @@ 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:229
+#: 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."
@@ -6675,7 +6676,7 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 #, fuzzy
 msgid "Invalid filename."
 msgstr "حجم غير صالح."
@@ -6734,7 +6735,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6803,26 +6804,26 @@ msgid "Problem saving notice."
 msgstr "مشكلة أثناء حفظ الإشعار."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6836,14 +6837,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:765
+#: classes/Profile.php:771
 #, 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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6925,22 +6926,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "تعذر تحديث المجموعة المحلية."
 
@@ -7682,12 +7683,12 @@ msgid "Do not use this method!"
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "المؤلف"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "المزود"
 
@@ -8134,25 +8135,25 @@ msgstr ""
 "tracking - لم يطبق بعد.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 #, 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:164
+#: lib/common.php:165
 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "اذهب إلى المُثبّت."
 
@@ -8339,19 +8340,24 @@ msgstr "اذهب"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "صِف المجموعة أو الموضوع"
 
-#: lib/groupeditform.php:162
+#: 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."
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "صِف المجموعة أو الموضوع"
 msgstr[1] "صِف المجموعة أو الموضوع"
 msgstr[2] "صِف المجموعة أو الموضوع"
@@ -8359,13 +8365,13 @@ msgstr[3] "صِف المجموعة أو الموضوع"
 msgstr[4] "صِف المجموعة أو الموضوع"
 msgstr[5] "صِف المجموعة أو الموضوع"
 
-#: lib/groupeditform.php:174
+#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "مكان تواجدك، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\""
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8840,21 +8846,17 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:89
+#: lib/mailbox.php:87
 #, fuzzy
 msgid "Only the user can read their own mailboxes."
 msgstr "يستطيع المستخدمون الوالجون وحدهم تكرار الإشعارات."
 
-#: lib/mailbox.php:139
+#: 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/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "من"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "تعذّر تحليل الرسالة."
@@ -8946,6 +8948,15 @@ msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "أرسل"
 
+#: lib/messagelist.php:77
+#, fuzzy
+msgid "Messages"
+msgstr "رسالة"
+
+#: lib/messagelistitem.php:123 lib/noticelist.php:522
+msgid "from"
+msgstr "من"
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:165
 #, fuzzy
@@ -9139,7 +9150,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "غير معروفة"
 
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index 60379142b5..65fb7a4bb2 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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:33:49+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:05:15+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 (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -95,11 +95,11 @@ msgstr "اذف إعدادت الموقع"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
@@ -163,7 +163,7 @@ msgstr "لا وسم كهذا."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "لا مستخدم كهذا."
 
@@ -333,7 +333,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -424,7 +424,7 @@ msgstr ""
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "مسار %s الزمني"
@@ -605,8 +605,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr ""
@@ -615,8 +615,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "ليس اسمًا مستعارًا صحيحًا."
@@ -628,8 +628,8 @@ msgstr "ليس اسمًا مستعارًا صحيحًا."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "الصفحه الرئيسيه ليست عنونًا صالحًا."
@@ -638,8 +638,8 @@ msgstr "الصفحه الرئيسيه ليست عنونًا صالحًا."
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -655,8 +655,8 @@ msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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)."
@@ -671,8 +671,8 @@ msgstr[5] "المنظمه طويله جدا (اكتر حاجه %d رمز)."
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -684,8 +684,8 @@ msgstr "المنظمه طويله جدا (اكتر حاجه 255 رمز)."
 #. 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:229
-#: actions/newgroup.php:176
+#: 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."
@@ -707,15 +707,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -843,7 +843,7 @@ msgstr "لا تملك تصريحًا."
 #: 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:153 actions/passwordsettings.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
@@ -929,8 +929,8 @@ msgstr "الحساب"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "الاسم المستعار"
@@ -1530,7 +1530,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "أفتار"
@@ -1831,7 +1831,7 @@ msgstr "محادثة"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "الإشعارات"
@@ -2434,24 +2434,24 @@ msgstr "استخدم هذا النموذج لتعديل المجموعه."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: actions/editgroup.php:281 classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "تعذّر إنشاء الكنى."
 
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "حُفظت الخيارات."
 
@@ -3263,7 +3263,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "هذا ليس عنوان بريدك الإلكترونى."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "حُفِظت التفضيلات."
 
@@ -3348,7 +3348,7 @@ msgid "Inbox for %s"
 msgstr ""
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 
@@ -3778,7 +3778,7 @@ msgid "Use this form to create a new group."
 msgstr "استخدم هذا النموذج لإنشاء مجموعه جديده."
 
 #. TRANS: Group create form validation error.
-#: actions/newgroup.php:199
+#: actions/newgroup.php:200
 msgid "Alias cannot be the same as nickname."
 msgstr ""
 
@@ -3977,8 +3977,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr " مش نظام بيانات مدعوم."
 
@@ -4000,34 +4000,36 @@ 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/othersettings.php:111
+#. 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:120
+#: actions/othersettings.php:122
 msgid "Shorten URLs with"
 msgstr "قصّر المسارات بـ"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:122
+#: actions/othersettings.php:124
 msgid "Automatic shortening service to use."
 msgstr "خدمه التقصير المطلوب استخدامها."
 
 #. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "اعرض تصاميم الملف الشخصي"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: actions/othersettings.php:164
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
@@ -4062,7 +4064,7 @@ msgstr ""
 msgid "Outbox for %s"
 msgstr "صندوق الصادر"
 
-#: actions/outbox.php:116
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
@@ -4341,7 +4343,7 @@ msgstr "مسار دليل المحليات"
 
 #. TRANS: Fieldset legens in Paths admin panel.
 #. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "مرفقات"
 
@@ -4461,7 +4463,6 @@ msgstr "معلومات الملف الشخصي"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 
@@ -4469,15 +4470,15 @@ msgstr ""
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "الصفحه الرئيسية"
 
@@ -4515,8 +4516,8 @@ msgstr "السيرة"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "الموقع"
@@ -5346,13 +5347,13 @@ msgstr "المنظمه"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "إحصاءات"
@@ -5494,61 +5495,61 @@ msgid "%1$s group, page %2$d"
 msgstr "%1$s اعضاء الجروپ, صفحه %2$d"
 
 #. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "ملاحظة"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "الكنى"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 #, fuzzy
 msgid "Group actions"
 msgstr "تصرفات المستخدم"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "الأعضاء"
 
@@ -5556,26 +5557,26 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "جميع الأعضاء"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "أنشئ"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5585,7 +5586,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:476
+#: actions/showgroup.php:488
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5602,7 +5603,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:486
+#: actions/showgroup.php:498
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5614,30 +5615,30 @@ msgstr ""
 "blogging) المبنيه على البرنامج الحر [StatusNet](http://status.net/)."
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "الإداريون"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, fuzzy, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "نتايج التدوير لـ\"%1$s\" على %2$s"
@@ -6579,7 +6580,7 @@ msgstr ""
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, fuzzy, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "نتايج التدوير لـ\"%1$s\" على %2$s"
@@ -6650,20 +6651,20 @@ msgid "%1$s marked notice %2$s as a favorite."
 msgstr "أرسل لى بريدًا إلكرتونيًا عندما يضيف أحدهم إشعارى مفضله."
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6680,7 +6681,7 @@ 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:217
+#: 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."
@@ -6693,7 +6694,7 @@ 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:229
+#: 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."
@@ -6705,7 +6706,7 @@ msgstr[4] ""
 msgstr[5] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 #, fuzzy
 msgid "Invalid filename."
 msgstr "حجم غير صالح."
@@ -6765,7 +6766,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6834,26 +6835,26 @@ msgid "Problem saving notice."
 msgstr "مشكله أثناء حفظ الإشعار."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "آر تى @%1$s %2$s"
@@ -6867,14 +6868,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:765
+#: classes/Profile.php:771
 #, 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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6955,22 +6956,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 #, fuzzy
 msgid "Could not save local group info."
 msgstr "تعذّر حفظ الاشتراك."
@@ -7735,12 +7736,12 @@ msgid "Do not use this method!"
 msgstr "لا تحذف هذا الإشعار"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "المؤلف"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "المزود"
 
@@ -8152,25 +8153,25 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 #, 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:164
+#: lib/common.php:165
 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "اذهب إلى المُثبّت."
 
@@ -8357,20 +8358,24 @@ msgstr "اذهب"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:155
+#: 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:160
+#: lib/groupeditform.php:161
 #, fuzzy
 msgid "Describe the group or topic"
 msgstr "اوصف الapplication بتاعتك"
 
-#: lib/groupeditform.php:162
+#: 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."
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "اوصف الapplication بتاعتك"
 msgstr[1] "اوصف الapplication بتاعتك"
 msgstr[2] "اوصف الapplication بتاعتك"
@@ -8378,12 +8383,12 @@ msgstr[3] "اوصف الapplication بتاعتك"
 msgstr[4] "اوصف الapplication بتاعتك"
 msgstr[5] "اوصف الapplication بتاعتك"
 
-#: lib/groupeditform.php:174
+#: lib/groupeditform.php:175
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8838,21 +8843,17 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:89
+#: lib/mailbox.php:87
 #, fuzzy
 msgid "Only the user can read their own mailboxes."
 msgstr "يحق للمُرسل والمستلم فقط قراءه هذه الرساله."
 
-#: lib/mailbox.php:139
+#: 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/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "من"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "تعذّر تحليل الرساله."
@@ -8944,6 +8945,15 @@ msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "أرسل"
 
+#: lib/messagelist.php:77
+#, fuzzy
+msgid "Messages"
+msgstr "رسالة"
+
+#: lib/messagelistitem.php:123 lib/noticelist.php:522
+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."
@@ -9136,7 +9146,7 @@ msgid "Tags in %s's notices"
 msgstr "ليس للمستخدم إشعار أخير"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "مش معروف"
 
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 5ab15444c6..3ea62a4545 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:33:51+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:05:18+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 (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -89,11 +89,11 @@ msgstr "Запазване настройките за достъп"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Запазване"
@@ -156,7 +156,7 @@ msgstr "Няма такака страница."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Няма такъв потребител"
 
@@ -324,7 +324,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -412,7 +412,7 @@ msgstr ""
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "Поток на %s"
@@ -591,8 +591,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Опитайте друг псевдоним, този вече е зает."
@@ -601,8 +601,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Неправилен псевдоним."
@@ -614,8 +614,8 @@ msgstr "Неправилен псевдоним."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Адресът на личната страница не е правилен URL."
@@ -624,8 +624,8 @@ msgstr "Адресът на личната страница не е правил
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -641,8 +641,8 @@ msgstr "Пълното име е твърде дълго (макс. 255 знак
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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)."
@@ -653,8 +653,8 @@ msgstr[1] "Описанието е твърде дълго (до %d символ
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -666,8 +666,8 @@ 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.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:176
+#: 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,15 +685,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -819,7 +819,7 @@ msgstr "Не сте абонирани за никого."
 #: 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:153 actions/passwordsettings.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
@@ -905,8 +905,8 @@ msgstr "Сметка"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Псевдоним"
@@ -1491,7 +1491,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Аватар"
@@ -1790,7 +1790,7 @@ msgstr "Разговор"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Бележки"
@@ -2400,25 +2400,25 @@ msgstr "Използвайте тази бланка за създаване н
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: 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:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Настройките са запазени."
 
@@ -3241,7 +3241,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Публикуване на MicroID за адреса в Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Настройките са запазени."
 
@@ -3325,7 +3325,7 @@ msgid "Inbox for %s"
 msgstr "Входяща кутия за %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "Това е входящата ви кутия с лични съобщения от други потребители."
 
@@ -3782,7 +3782,7 @@ msgid "Use this form to create a new group."
 msgstr "Използвайте тази бланка за създаване на нова група."
 
 #. TRANS: Group create form validation error.
-#: actions/newgroup.php:199
+#: actions/newgroup.php:200
 msgid "Alias cannot be the same as nickname."
 msgstr ""
 
@@ -3983,8 +3983,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "Неподдържан формат на данните"
 
@@ -4006,34 +4006,36 @@ 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/othersettings.php:111
+#. 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:120
+#: actions/othersettings.php:122
 msgid "Shorten URLs with"
 msgstr "Съкращаване на адресите с"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:122
+#: actions/othersettings.php:124
 msgid "Automatic shortening service to use."
 msgstr "Услуга за автоматично съкращаване, която да се ползва."
 
 #. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "Редактиране на профила"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: actions/othersettings.php:164
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Услугата за съкращаване е твърде дълга (може да е до 50 знака)."
@@ -4070,7 +4072,7 @@ msgstr "%1$s, страница %2$d"
 msgid "Outbox for %s"
 msgstr "Изходяща кутия за %s"
 
-#: actions/outbox.php:116
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "Това е изходящата ви кутия с лични съобщения до други потребители."
 
@@ -4344,7 +4346,7 @@ msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
 #. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 #, fuzzy
 msgid "Attachments"
 msgstr "Няма прикачени файлове."
@@ -4467,7 +4469,6 @@ msgstr "Данни на профила"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "От 1 до 64 малки букви или цифри, без пунктоация и интервали"
@@ -4476,15 +4477,15 @@ msgstr "От 1 до 64 малки букви или цифри, без пунк
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Лична страница"
 
@@ -4519,8 +4520,8 @@ msgstr "За мен"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Местоположение"
@@ -5359,13 +5360,13 @@ msgstr "Организация"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Статистики"
@@ -5502,61 +5503,61 @@ msgid "%1$s group, page %2$d"
 msgstr "%1$s, страница %2$d"
 
 #. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Бележка"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Псевдоними"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 #, fuzzy
 msgid "Group actions"
 msgstr "Потребителски действия"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "Членове"
 
@@ -5564,26 +5565,26 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "Всички членове"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Създадена на"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5593,7 +5594,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5606,7 +5607,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5616,30 +5617,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "Администратори"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Съобщение от %1$s в %2$s"
@@ -6584,7 +6585,7 @@ msgstr ""
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Бележки от %1$s в %2$s."
@@ -6654,20 +6655,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6680,7 +6681,7 @@ 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:217
+#: 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."
@@ -6689,7 +6690,7 @@ 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:229
+#: 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."
@@ -6697,7 +6698,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 #, fuzzy
 msgid "Invalid filename."
 msgstr "Неправилен размер."
@@ -6760,7 +6761,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6834,26 +6835,26 @@ msgid "Problem saving notice."
 msgstr "Проблем при записване на бележката."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6867,14 +6868,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:765
+#: classes/Profile.php:771
 #, 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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6958,22 +6959,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Грешка при запазване на етикетите."
 
@@ -7725,12 +7726,12 @@ msgid "Do not use this method!"
 msgstr "Да не се изтрива бележката"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "Автор"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "Доставчик"
 
@@ -8125,26 +8126,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 #, 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:164
+#: lib/common.php:165
 #, 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Влизане в сайта"
@@ -8335,30 +8336,35 @@ msgstr ""
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Опишете групата или темата"
 
-#: lib/groupeditform.php:162
+#: 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."
+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:174
+#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Къде се намира групата — град, община, държава и т.н. (ако е приложимо)"
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8802,20 +8808,16 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:89
+#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "Само потребителят може да отваря собствената си кутия."
 
-#: lib/mailbox.php:139
+#: 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/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "от"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Грешка при обработка на съобщението"
@@ -8906,6 +8908,15 @@ msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Прати"
 
+#: lib/messagelist.php:77
+#, fuzzy
+msgid "Messages"
+msgstr "Съобщение"
+
+#: lib/messagelistitem.php:123 lib/noticelist.php:522
+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."
@@ -9096,7 +9107,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Непознато"
 
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 8487725cd3..307400d8ca 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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:33:54+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:05: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-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -92,11 +92,11 @@ msgstr "Enrollañ an arventennoù moned"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Enrollañ"
@@ -159,7 +159,7 @@ msgstr "N'eus ket eus ar bajenn-se."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "N'eus ket eus an implijer-se."
 
@@ -333,7 +333,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -419,7 +419,7 @@ msgstr "Pennañ"
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "Oberezhioù %s"
@@ -597,8 +597,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
@@ -607,8 +607,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "N'eo ket ul lesanv mat."
@@ -620,8 +620,8 @@ msgstr "N'eo ket ul lesanv mat."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "N'eo ket chomlec'h al lec'hienn personel un URL reizh."
@@ -630,8 +630,8 @@ msgstr "N'eo ket chomlec'h al lec'hienn personel un URL reizh."
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: 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ñ)."
@@ -646,8 +646,8 @@ msgstr "Re hir eo an anv klok (255 arouezenn d'ar muiañ)."
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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)."
@@ -658,8 +658,8 @@ msgstr[1] "Re hir eo an deskrivadur (%d arouezenn d'ar muiañ)."
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Re hir eo al lec'hiadur (255 arouezenn d'ar muiañ)."
@@ -670,8 +670,8 @@ msgstr "Re hir eo al lec'hiadur (255 arouezenn d'ar muiañ)."
 #. 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:229
-#: actions/newgroup.php:176
+#: 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,15 +689,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 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."
 
@@ -819,7 +819,7 @@ msgstr "Aotreet eo bet ar jedouer reked dija."
 #: 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:153 actions/passwordsettings.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
@@ -904,8 +904,8 @@ msgstr "Kont"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Lesanv"
@@ -1481,7 +1481,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Avatar"
@@ -1773,7 +1773,7 @@ msgstr "Kaozeadenn"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Ali"
@@ -2351,24 +2351,24 @@ 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:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: 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:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Enrollet eo bet ho dibarzhioù."
 
@@ -3181,7 +3181,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.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Penndibaboù enrollet"
 
@@ -3263,7 +3263,7 @@ msgid "Inbox for %s"
 msgstr "Bost resevout %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 
@@ -3689,7 +3689,7 @@ 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:199
+#: 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."
@@ -3893,8 +3893,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 #, fuzzy
 msgid "Not a supported data format."
 msgstr "Diembreget eo ar furmad-se."
@@ -3917,35 +3917,37 @@ 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/othersettings.php:111
+#. 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:120
+#: actions/othersettings.php:122
 msgid "Shorten URLs with"
 msgstr ""
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:122
+#: actions/othersettings.php:124
 msgid "Automatic shortening service to use."
 msgstr ""
 
 #. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
 #, fuzzy
 msgid "View profile designs"
 msgstr "Design ar profil"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: 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ñ)."
@@ -3984,7 +3986,7 @@ msgstr "Boest kas %1$s - pajenn %2$d"
 msgid "Outbox for %s"
 msgstr "Boest kas %s"
 
-#: actions/outbox.php:116
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
@@ -4257,7 +4259,7 @@ msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
 #. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "Pezhioù stag"
 
@@ -4384,7 +4386,6 @@ msgstr "Titouroù ar profil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
@@ -4393,15 +4394,15 @@ msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Pajenn degemer"
 
@@ -4436,8 +4437,8 @@ msgstr "Buhezskrid"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Lec'hiadur"
@@ -5272,13 +5273,13 @@ msgstr "Aozadur"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Stadegoù"
@@ -5413,60 +5414,60 @@ 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:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Notenn"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Aliasoù"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "Obererezh ar strollad"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "Izili"
 
@@ -5474,25 +5475,25 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "An holl izili"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Krouet"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Izili"
@@ -5501,7 +5502,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:476
+#: actions/showgroup.php:488
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5516,7 +5517,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:486
+#: actions/showgroup.php:498
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5528,17 +5529,17 @@ 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:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "Merourien"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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 "
@@ -5546,14 +5547,14 @@ 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Kemenadenn resevet eus %1$s d'an %2$s"
@@ -6498,7 +6499,7 @@ msgstr ""
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Hizivadennoù eus %1$s e %2$s!"
@@ -6568,20 +6569,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6594,7 +6595,7 @@ 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:217
+#: 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."
@@ -6603,7 +6604,7 @@ 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:229
+#: 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."
@@ -6611,7 +6612,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 #, fuzzy
 msgid "Invalid filename."
 msgstr "Ment direizh."
@@ -6671,7 +6672,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6740,25 +6741,25 @@ 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:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6772,14 +6773,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:765
+#: classes/Profile.php:771
 #, 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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6859,22 +6860,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Dibosupl eo enrollañ titouroù ar strollad lec'hel."
 
@@ -7602,12 +7603,12 @@ msgid "Do not use this method!"
 msgstr "Arabat dilemel ar c'hemenn-mañ"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "Aozer"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "Pourvezer"
 
@@ -8006,26 +8007,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 #, 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:164
+#: lib/common.php:165
 #, 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "Mont d'ar meziant staliañ"
 
@@ -8212,30 +8213,35 @@ msgstr "Mont"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+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:160
+#: lib/groupeditform.php:161
 #, fuzzy
 msgid "Describe the group or topic"
 msgstr "Deskrivit ho poellad"
 
-#: lib/groupeditform.php:162
+#: 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."
+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:174
+#: 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:182
+#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8675,21 +8681,17 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:89
+#: 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:139
+#: 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/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "eus"
-
 #: lib/mailhandler.php:37
 #, fuzzy
 msgid "Could not parse message."
@@ -8784,6 +8786,15 @@ msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Kas"
 
+#: lib/messagelist.php:77
+#, fuzzy
+msgid "Messages"
+msgstr "Kemennadenn"
+
+#: lib/messagelistitem.php:123 lib/noticelist.php:522
+msgid "from"
+msgstr "eus"
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:165
 #, fuzzy
@@ -8973,7 +8984,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Dianav"
 
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index 8867e63d56..aa29515d86 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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:33:57+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:05:23+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 (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -97,11 +97,11 @@ msgstr "Desa els paràmetres d'accés"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Desa"
@@ -164,7 +164,7 @@ msgstr "No existeix la pàgina."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "No existeix l'usuari."
 
@@ -342,7 +342,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -432,7 +432,7 @@ msgstr "Principal"
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s línia temporal"
@@ -607,8 +607,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Aquest sobrenom ja existeix. Prova un altre. "
@@ -617,8 +617,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Sobrenom no vàlid."
@@ -630,8 +630,8 @@ msgstr "Sobrenom no vàlid."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "La pàgina personal no és un URL vàlid."
@@ -640,8 +640,8 @@ msgstr "La pàgina personal no és un URL vàlid."
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: 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)."
@@ -656,8 +656,8 @@ msgstr "El vostre nom sencer és massa llarg (màx. 255 caràcters)."
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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,8 +668,8 @@ msgstr[1] "La descripció és massa llarga (màx. %d caràcters)."
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "La localització és massa llarga (màx. 255 caràcters)."
@@ -680,8 +680,8 @@ msgstr "La localització és massa llarga (màx. 255 caràcters)."
 #. 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:229
-#: actions/newgroup.php:176
+#: 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,15 +699,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "L'àlies no pot ser el mateix que el sobrenom."
 
@@ -828,7 +828,7 @@ msgstr "El testimoni de sol·licitud ja està autoritzat."
 #: 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:153 actions/passwordsettings.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
@@ -920,8 +920,8 @@ msgstr "Compte"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Sobrenom"
@@ -1272,9 +1272,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Notices %1$s has favorited on %2$s"
-msgstr "Actualitzacions de %1$s i amics a %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.
@@ -1312,9 +1312,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %1$s is a member of on %2$s"
-msgstr "%s grups són membres de"
+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
@@ -1489,7 +1489,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Avatar"
@@ -1793,7 +1793,7 @@ msgstr "Conversa"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Avisos"
@@ -2382,24 +2382,24 @@ 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:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: 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:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Configuració guardada."
 
@@ -3231,7 +3231,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Publica una MicroID per al meu compte de Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "S'han desat les preferències."
 
@@ -3314,7 +3314,7 @@ msgid "Inbox for %s"
 msgstr "Safata d'entrada de %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: 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 "
@@ -3767,7 +3767,7 @@ 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:199
+#: actions/newgroup.php:200
 msgid "Alias cannot be the same as nickname."
 msgstr "L'àlies no pot ser el mateix que el sobrenom."
 
@@ -3976,8 +3976,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "Format de data no suportat."
 
@@ -3999,34 +3999,36 @@ 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/othersettings.php:111
+#. 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 gratuït)"
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:120
+#: 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:122
+#: 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:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "Visualitza els dissenys de perfil"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: 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)."
@@ -4061,7 +4063,7 @@ msgstr "Safata de sortida de %1$s - pàgina %2$d"
 msgid "Outbox for %s"
 msgstr "Safata de sortida per %s"
 
-#: actions/outbox.php:116
+#: 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 "
@@ -4328,7 +4330,7 @@ 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:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "Adjuncions"
 
@@ -4450,7 +4452,6 @@ msgstr "Informació del perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 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."
@@ -4459,15 +4460,15 @@ msgstr ""
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Pàgina personal"
 
@@ -4501,8 +4502,8 @@ msgstr "Biografia"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Ubicació"
@@ -5357,13 +5358,13 @@ msgstr "Organització"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Estadístiques"
@@ -5506,60 +5507,60 @@ 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:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Avisos"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Àlies"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "Accions del grup"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "Membres"
 
@@ -5567,25 +5568,25 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "Tots els membres"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 msgctxt "LABEL"
 msgid "Created"
 msgstr "S'ha creat"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Membres"
@@ -5594,7 +5595,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5613,7 +5614,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5627,30 +5628,30 @@ msgstr ""
 "curts sobre llur vida i interessos. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "Administradors"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Missatge de %1$s a %2$s"
@@ -6613,7 +6614,7 @@ msgstr "Proveu de [cercar grups](%%action.groupsearch%%) i unir-vos-hi."
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Actualitzacions de %1$s a %2$s!"
@@ -6695,20 +6696,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6725,7 +6726,7 @@ 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:217
+#: 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."
@@ -6736,7 +6737,7 @@ 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:229
+#: 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."
@@ -6746,7 +6747,7 @@ 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:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "El nom del fitxer no és vàlid."
 
@@ -6804,7 +6805,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr "No s'ha trobat el nom de la base de dades o el DSN enlloc."
 
@@ -6876,25 +6877,25 @@ 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:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6908,14 +6909,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:765
+#: classes/Profile.php:771
 #, 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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6997,22 +6998,22 @@ 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:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "No s'ha pogut desar la informació del grup local."
 
@@ -7749,12 +7750,12 @@ msgid "Do not use this method!"
 msgstr "No feu servir aquest mètode!"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "Autoria"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "Proveïdor"
 
@@ -8180,24 +8181,24 @@ 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:161
+#: lib/common.php:162
 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:164
+#: lib/common.php:165
 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "Vés a l'instal·lador."
 
@@ -8377,28 +8378,34 @@ msgstr "Vés-hi"
 msgid "Grant this user the \"%s\" role"
 msgstr "Atorga a l'usuari el rol «%s»"
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Descriviu el grup o la temàtica"
 
-#: lib/groupeditform.php:162
-#, 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."
+#: 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] "Descriviu el grup o la temàtica en %d caràcter o menys."
 msgstr[1] "Descriviu el grup o la temàtica en %d caràcters o menys."
 
-#: lib/groupeditform.php:174
+#: 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:182
+#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8936,11 +8943,11 @@ msgstr ""
 "\n"
 "P.S. Podeu desactivar els avisos per correu aquí: %8$s\n"
 
-#: lib/mailbox.php:89
+#: 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:139
+#: 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."
@@ -8949,10 +8956,6 @@ msgstr ""
 "usuaris en la conversa. La gent pot enviar-vos missatges només per als "
 "vostres ulls."
 
-#: lib/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "de"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "No es pot analitzar el missatge."
@@ -9044,6 +9047,15 @@ msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Envia"
 
+#: lib/messagelist.php:77
+#, fuzzy
+msgid "Messages"
+msgstr "Missatge"
+
+#: lib/messagelistitem.php:123 lib/noticelist.php:522
+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."
@@ -9230,7 +9242,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Desconegut"
 
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 97e265eddf..fc84189c16 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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:34:00+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:05:25+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 (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -91,11 +91,11 @@ msgstr "uložit nastavení přístupu"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Uložit"
@@ -158,7 +158,7 @@ msgstr "Tady žádná taková stránka není."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Uživatel neexistuje."
 
@@ -335,7 +335,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -428,7 +428,7 @@ msgstr ""
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "časová osa %s"
@@ -604,8 +604,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Přezdívku již někdo používá. Zkuste jinou."
@@ -614,8 +614,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Není platnou přezdívkou."
@@ -627,8 +627,8 @@ msgstr "Není platnou přezdívkou."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Domovská stránka není platná URL."
@@ -637,8 +637,8 @@ msgstr "Domovská stránka není platná URL."
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -654,8 +654,8 @@ msgstr "Celé jméno je moc dlouhé (maximální délka je 255 znaků)."
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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,8 +667,8 @@ msgstr[2] "Popis je příliš dlouhý (maximálně %d znaků)."
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -680,8 +680,8 @@ msgstr "Umístění je příliš dlouhé (maximálně 255 znaků)."
 #. 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:229
-#: actions/newgroup.php:176
+#: 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."
@@ -700,15 +700,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Alias nemůže být stejný jako přezdívka."
 
@@ -832,7 +832,7 @@ msgstr "Nejste autorizován."
 #: 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:153 actions/passwordsettings.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
@@ -924,8 +924,8 @@ msgstr "Účet"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Přezdívka"
@@ -1514,7 +1514,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Avatar"
@@ -1814,7 +1814,7 @@ msgstr "Konverzace"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Sdělení"
@@ -2416,24 +2416,24 @@ 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:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: 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:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Nastavení uloženo."
 
@@ -3263,7 +3263,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.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Nastavení uloženo"
 
@@ -3347,7 +3347,7 @@ msgid "Inbox for %s"
 msgstr "Doručená pošta pro %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: 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."
 
@@ -3799,7 +3799,7 @@ 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:199
+#: actions/newgroup.php:200
 #, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "Alias nemůže být stejný jako přezdívka."
@@ -4006,8 +4006,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "Nepodporovaný formát dat."
 
@@ -4029,34 +4029,36 @@ 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/othersettings.php:111
+#. 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:120
+#: 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:122
+#: 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:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "Zobrazit vzhledy profilu"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: 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ů)."
@@ -4091,7 +4093,7 @@ msgstr "Odeslaná pošta uživatele %1$s - strana %2$d"
 msgid "Outbox for %s"
 msgstr "Odeslané uživatele %s"
 
-#: actions/outbox.php:116
+#: 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 "
@@ -4370,7 +4372,7 @@ 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:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "Přílohy"
 
@@ -4496,7 +4498,6 @@ msgstr "Nastavené Profilu"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer"
@@ -4505,15 +4506,15 @@ msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer"
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Moje stránky"
 
@@ -4549,8 +4550,8 @@ msgstr "O mě"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Umístění"
@@ -5408,13 +5409,13 @@ msgstr "Organizace"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistiky"
@@ -5557,60 +5558,60 @@ 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:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Poznámka"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Aliasy"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "Akce skupiny"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "Členové"
 
@@ -5618,26 +5619,26 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "Všichni členové"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Vytvořeno"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5647,7 +5648,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5665,7 +5666,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5679,30 +5680,30 @@ msgstr ""
 "životě a zájmech.  "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "Adminové"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Zpráva od %1$s na %2$s"
@@ -6659,7 +6660,7 @@ msgstr ""
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Oznámení od %1$s na %2$s!"
@@ -6741,20 +6742,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6774,7 +6775,7 @@ 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:217
+#: 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."
@@ -6784,7 +6785,7 @@ 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:229
+#: 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."
@@ -6793,7 +6794,7 @@ 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:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Neplatné jméno souboru."
 
@@ -6851,7 +6852,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr "Nenalezeno jméno databáze ani DSN."
 
@@ -6922,26 +6923,26 @@ 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:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6955,14 +6956,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:765
+#: classes/Profile.php:771
 #, 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:774
+#: classes/Profile.php:780
 #, 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."
@@ -7042,22 +7043,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Nelze uložit místní info skupiny."
 
@@ -7790,12 +7791,12 @@ msgid "Do not use this method!"
 msgstr "Neodstraňujte toto oznámení"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "Autor"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "Poskytovatel"
 
@@ -8223,26 +8224,26 @@ msgstr ""
 "tracking - Dosud neimplementován.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 #, 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:164
+#: lib/common.php:165
 #, 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "Jdi na instalaci."
 
@@ -8430,24 +8431,29 @@ msgstr "Jdi"
 msgid "Grant this user the \"%s\" role"
 msgstr "Dát tomuto uživateli roli \"%s\""
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Popište skupinu nebo téma"
 
-#: lib/groupeditform.php:162
+#: 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."
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "Popište skupinu nebo téma ve %d znacích"
 msgstr[1] "Popište skupinu nebo téma ve %d znacích"
 msgstr[2] "Popište skupinu nebo téma ve %d znacích"
 
-#: lib/groupeditform.php:174
+#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -8455,7 +8461,7 @@ msgstr ""
 "Umístění skupiny, pokud je nějaké, ve stylu \"město, stát (nebo region), země"
 "\""
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:183
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8994,11 +9000,11 @@ msgstr ""
 "\n"
 "P.S. Tato upozornění můžete vypnout zde: %8$s\n"
 
-#: lib/mailbox.php:89
+#: 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:139
+#: 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."
@@ -9007,10 +9013,6 @@ msgstr ""
 "zapojili ostatní uživatelé v rozhovoru. Lidé mohou posílat zprávy jen pro "
 "vaše oči."
 
-#: lib/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "od"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Nelze zpracovat zprávu."
@@ -9100,6 +9102,15 @@ 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:522
+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."
@@ -9290,7 +9301,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Neznámé"
 
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 1b9ebd4457..791799f3d1 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -4,6 +4,7 @@
 # Author: Apmon
 # Author: Bavatar
 # Author: Brion
+# Author: George Animal
 # Author: Kghbln
 # Author: Lutzgh
 # Author: March
@@ -19,17 +20,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:34:03+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:05: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-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -99,11 +100,11 @@ msgstr "Zugangs-Einstellungen speichern"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Speichern"
@@ -166,7 +167,7 @@ msgstr "Seite nicht vorhanden"
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Unbekannter Benutzer."
 
@@ -344,7 +345,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -434,7 +435,7 @@ msgstr ""
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s-Zeitleiste"
@@ -613,8 +614,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
@@ -623,8 +624,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ungültiger Benutzername."
@@ -636,8 +637,8 @@ msgstr "Ungültiger Benutzername."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr ""
@@ -647,8 +648,8 @@ msgstr ""
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Der bürgerliche Name ist zu lang (maximal 255 Zeichen)."
@@ -663,8 +664,8 @@ msgstr "Der bürgerliche Name ist zu lang (maximal 255 Zeichen)."
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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)."
@@ -675,8 +676,8 @@ msgstr[1] "Die Beschreibung ist zu lang (max. %d Zeichen)."
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
@@ -687,8 +688,8 @@ msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
 #. 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:229
-#: actions/newgroup.php:176
+#: 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."
@@ -706,15 +707,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Alias kann nicht das gleiche wie der Spitzname sein."
 
@@ -835,7 +836,7 @@ msgstr "Anfrage-Token bereits autorisiert."
 #: 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:153 actions/passwordsettings.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
@@ -925,8 +926,8 @@ msgstr "Profil"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Benutzername"
@@ -1509,7 +1510,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Avatar"
@@ -1805,7 +1806,7 @@ msgstr "Unterhaltung"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Nachrichten"
@@ -1824,7 +1825,7 @@ 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 ""
+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.
@@ -2394,24 +2395,24 @@ 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:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: 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:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Einstellungen gespeichert."
 
@@ -3250,7 +3251,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.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Einstellungen gesichert."
 
@@ -3334,7 +3335,7 @@ msgid "Inbox for %s"
 msgstr "Posteingang von %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: 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 "
@@ -3788,7 +3789,7 @@ 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:199
+#: actions/newgroup.php:200
 #, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "Alias kann nicht das gleiche wie der Spitzname sein."
@@ -4001,8 +4002,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "Kein unterstütztes Datenformat."
 
@@ -4024,34 +4025,36 @@ 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/othersettings.php:111
+#. 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 " (kostenloser Dienst)"
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:120
+#: 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:122
+#: actions/othersettings.php:124
 msgid "Automatic shortening service to use."
 msgstr "URL-Auto-Kürzungs-Dienst."
 
 #. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "Profil-Designs ansehen"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: 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)."
 
@@ -4085,7 +4088,7 @@ msgstr "Postausgang für %1$s - Seite %2$d"
 msgid "Outbox for %s"
 msgstr "Postausgang von %s"
 
-#: actions/outbox.php:116
+#: 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."
@@ -4351,7 +4354,7 @@ 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:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "Anhänge"
 
@@ -4474,7 +4477,6 @@ msgstr "Profilinformation"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen."
 
@@ -4482,15 +4484,15 @@ msgstr "1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen."
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Homepage"
 
@@ -4526,8 +4528,8 @@ msgstr "Biografie"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Aufenthaltsort"
@@ -5393,13 +5395,13 @@ msgstr "Organisation"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistik"
@@ -5543,60 +5545,60 @@ 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:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Nachricht"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Pseudonyme"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "Gruppenaktionen"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "Mitglieder"
 
@@ -5604,25 +5606,25 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "Alle Mitglieder"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Erstellt"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Mitglieder"
@@ -5631,7 +5633,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5649,7 +5651,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5663,30 +5665,30 @@ msgstr ""
 "Nachrichten über ihr Leben und Interessen. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "Admins"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Nachricht von %1$s auf %2$s"
@@ -6648,7 +6650,7 @@ msgstr ""
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Aktualisierungen von %1$s auf %2$s!"
@@ -6730,20 +6732,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6760,7 +6762,7 @@ 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:217
+#: 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."
@@ -6771,7 +6773,7 @@ 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:229
+#: 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."
@@ -6783,7 +6785,7 @@ msgstr[1] ""
 "überschreiten."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Ungültiger Dateiname."
 
@@ -6841,7 +6843,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr "Nirgendwo einen Datenbanknamen oder DSN gefunden."
 
@@ -6913,27 +6915,27 @@ 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:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6947,7 +6949,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:765
+#: classes/Profile.php:771
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -6956,7 +6958,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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7038,22 +7040,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Konnte die lokale Gruppen Information nicht speichern."
 
@@ -7788,12 +7790,12 @@ msgid "Do not use this method!"
 msgstr "Diese Gruppe nicht löschen"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "Autor"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "Anbieter"
 
@@ -8217,24 +8219,24 @@ msgstr ""
 "tracking - noch nicht implementiert\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 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:164
+#: lib/common.php:165
 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "Zur Installation gehen."
 
@@ -8417,27 +8419,32 @@ msgstr "Los geht's"
 msgid "Grant this user the \"%s\" role"
 msgstr "Teile dem Benutzer die „%s“-Rolle zu"
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Beschreibe die Gruppe oder das Thema"
 
-#: lib/groupeditform.php:162
+#: 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."
+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:174
+#: 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:182
+#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8975,11 +8982,11 @@ msgstr ""
 "\n"
 "P.S. Diese E-Mail Benachrichtigung kannst du hier deaktivieren: %8$s\n"
 
-#: lib/mailbox.php:89
+#: 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:139
+#: 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."
@@ -8988,10 +8995,6 @@ msgstr ""
 "schicken, um sie in eine Konversation zu verwickeln. Andere Leute können dir "
 "Nachrichten schicken, die nur du sehen kannst."
 
-#: lib/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "von"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Konnte Nachricht nicht parsen."
@@ -9084,6 +9087,15 @@ 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:522
+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."
@@ -9246,7 +9258,6 @@ msgstr "Favoriten"
 
 #. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
 #: lib/personalgroupnav.php:133
-#, fuzzy
 msgctxt "MENU"
 msgid "Inbox"
 msgstr "Posteingang"
@@ -9275,7 +9286,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Unbekannt"
 
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index aefcc542de..d44b8dc215 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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:34:06+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:05:31+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 (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -92,11 +92,11 @@ msgstr "Save access settings"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Save"
@@ -159,7 +159,7 @@ msgstr "No such page."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "No such user."
 
@@ -336,7 +336,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -426,7 +426,7 @@ msgstr ""
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s timeline"
@@ -601,8 +601,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Nickname already in use. Try another one."
@@ -611,8 +611,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Not a valid nickname."
@@ -624,8 +624,8 @@ msgstr "Not a valid nickname."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Homepage is not a valid URL."
@@ -634,8 +634,8 @@ msgstr "Homepage is not a valid URL."
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -651,8 +651,8 @@ msgstr "Full name is too long (max 255 chars)."
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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,8 +663,8 @@ msgstr[1] "Description is too long (max %d chars)"
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -676,8 +676,8 @@ msgstr "Location is too long (max 255 chars)."
 #. 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:229
-#: actions/newgroup.php:176
+#: 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."
@@ -695,15 +695,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Alias can't be the same as nickname."
 
@@ -825,7 +825,7 @@ msgstr "You are not authorised."
 #: 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:153 actions/passwordsettings.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
@@ -917,8 +917,8 @@ msgstr "Account"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Nickname"
@@ -1502,7 +1502,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Avatar"
@@ -1802,7 +1802,7 @@ msgstr "Conversation"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Notices"
@@ -2399,24 +2399,24 @@ 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:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: 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:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Options saved."
 
@@ -3243,7 +3243,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.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Preferences saved."
 
@@ -3327,7 +3327,7 @@ msgid "Inbox for %s"
 msgstr "Inbox for %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: 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."
 
@@ -3776,7 +3776,7 @@ 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:199
+#: actions/newgroup.php:200
 #, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "Alias can't be the same as nickname."
@@ -3983,8 +3983,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "Not a supported data format."
 
@@ -4006,34 +4006,36 @@ 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/othersettings.php:111
+#. 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:120
+#: actions/othersettings.php:122
 msgid "Shorten URLs with"
 msgstr "Shorten URLs with"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:122
+#: actions/othersettings.php:124
 msgid "Automatic shortening service to use."
 msgstr "Automatic shortening service to use."
 
 #. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "View profile designs"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: 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)."
@@ -4068,7 +4070,7 @@ msgstr "Outbox for %1$s - page %2$d"
 msgid "Outbox for %s"
 msgstr "Outbox for %s"
 
-#: actions/outbox.php:116
+#: 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."
 
@@ -4339,7 +4341,7 @@ msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
 #. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "Attachments"
 
@@ -4461,7 +4463,6 @@ msgstr "Profile information"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
@@ -4470,15 +4471,15 @@ msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Homepage"
 
@@ -4513,8 +4514,8 @@ msgstr "Bio"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Location"
@@ -5364,13 +5365,13 @@ msgstr "Organization"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistics"
@@ -5511,60 +5512,60 @@ 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:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Note"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr ""
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "Group actions"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "Members"
 
@@ -5572,26 +5573,26 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "All members"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Created"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5601,7 +5602,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5619,7 +5620,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5633,30 +5634,30 @@ msgstr ""
 "their life and interests. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "Admins"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Message from %1$s on %2$s"
@@ -6598,7 +6599,7 @@ msgstr ""
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Updates from %1$s on %2$s!"
@@ -6678,20 +6679,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6704,7 +6705,7 @@ 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:217
+#: 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."
@@ -6713,7 +6714,7 @@ 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:229
+#: 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."
@@ -6721,7 +6722,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Invalid filename."
 
@@ -6779,7 +6780,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6849,25 +6850,25 @@ msgid "Problem saving notice."
 msgstr "Problem saving notice."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6881,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:765
+#: classes/Profile.php:771
 #, 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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6968,22 +6969,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Could not save local group info."
 
@@ -7713,12 +7714,12 @@ msgid "Do not use this method!"
 msgstr "Do not delete this group"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "Author"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "Provider"
 
@@ -8133,26 +8134,26 @@ msgstr ""
 "tracking - not yet implemented.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 #, 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:164
+#: lib/common.php:165
 #, 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "Go to the installer."
 
@@ -8336,30 +8337,35 @@ msgstr "Go"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Describe the group or topic"
 
-#: lib/groupeditform.php:162
+#: 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."
+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:174
+#: 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:182
+#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8811,20 +8817,16 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:89
+#: 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:139
+#: 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/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "from"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Could not parse message."
@@ -8914,6 +8916,15 @@ 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:522
+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."
@@ -9101,7 +9112,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Unknown"
 
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index 22894c6e13..85d2fb32e5 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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:34:10+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:05:33+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 (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -96,11 +96,11 @@ msgstr "Konservu atingan agordon"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Konservu"
@@ -163,7 +163,7 @@ msgstr "Ne estas tiu paĝo."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Ne ekzistas tiu uzanto."
 
@@ -340,7 +340,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -431,7 +431,7 @@ msgstr "Ĉefa"
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "Tempstrio de %s"
@@ -604,8 +604,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "La uzantnomo jam uziĝis. Provu ion alian."
@@ -614,8 +614,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ne valida kromnomo."
@@ -627,8 +627,8 @@ msgstr "Ne valida kromnomo."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Ĉefpaĝo ne estas valida URL."
@@ -637,8 +637,8 @@ msgstr "Ĉefpaĝo ne estas valida URL."
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Kompleta nomo tro longas (maksimume 255 signoj)"
@@ -653,8 +653,8 @@ msgstr "Kompleta nomo tro longas (maksimume 255 signoj)"
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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,8 +665,8 @@ msgstr[1] "Priskribo estas tro longa (maksimume %d signoj)."
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Lokonomo tro longas (maksimume 255 signoj)"
@@ -677,8 +677,8 @@ msgstr "Lokonomo tro longas (maksimume 255 signoj)"
 #. 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:229
-#: actions/newgroup.php:176
+#: 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."
@@ -696,15 +696,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "La alinomo devas ne esti sama al la kromnomo."
 
@@ -825,7 +825,7 @@ msgstr ""
 #: 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:153 actions/passwordsettings.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
@@ -916,8 +916,8 @@ msgstr "Konto"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Kromnomo"
@@ -1506,7 +1506,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Vizaĝbildo"
@@ -1805,7 +1805,7 @@ msgstr "Konversacio"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Avizoj"
@@ -2405,24 +2405,24 @@ 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:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: 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:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Elektoj konserviĝis."
 
@@ -3245,7 +3245,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.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Prefero konservita."
 
@@ -3329,7 +3329,7 @@ msgid "Inbox for %s"
 msgstr "Alvenkesto de %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: 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."
@@ -3774,7 +3774,7 @@ 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:199
+#: actions/newgroup.php:200
 #, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "La alinomo devas ne esti sama al la kromnomo."
@@ -3980,8 +3980,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "Datumformato ne subteniĝas."
 
@@ -4003,34 +4003,36 @@ 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/othersettings.php:111
+#. 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 " (Senpaga servo)"
+msgstr " (libera servo)"
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:120
+#: actions/othersettings.php:122
 msgid "Shorten URLs with"
 msgstr "Mallongigu URLojn per"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:122
+#: actions/othersettings.php:124
 msgid "Automatic shortening service to use."
 msgstr "Uzota aŭtomata mallongigad-servo."
 
 #. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "Vidi profilo-desegnon"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: actions/othersettings.php:164
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL-mallongigado-servo tro longas (maksimume 50 literojn)."
@@ -4065,7 +4067,7 @@ msgstr "elirkesto de %1$s - paĝo %2$d"
 msgid "Outbox for %s"
 msgstr "Elirkesto de %s"
 
-#: actions/outbox.php:116
+#: 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."
@@ -4332,7 +4334,7 @@ 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:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "Aldonaĵo"
 
@@ -4452,7 +4454,6 @@ msgstr "Profila informo"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 minusklaj literoj aŭ ciferoj, neniu interpunkcio aŭ spaco"
@@ -4461,15 +4462,15 @@ msgstr "1-64 minusklaj literoj aŭ ciferoj, neniu interpunkcio aŭ spaco"
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Hejmpaĝo"
 
@@ -4504,8 +4505,8 @@ msgstr "Biografio"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Loko"
@@ -5360,13 +5361,13 @@ msgstr "Organizaĵo"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistiko"
@@ -5507,60 +5508,60 @@ 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:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Noto"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Alnomo"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "Grupaj agoj"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "Grupanoj"
 
@@ -5568,26 +5569,26 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "Ĉiuj grupanoj"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Kreita"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5597,7 +5598,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5614,7 +5615,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5628,30 +5629,30 @@ msgstr ""
 "siaj vivoj kaj ŝatokupoj. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "Administrantoj"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Mesaĝo de %1$s ĉe %2$s"
@@ -6594,7 +6595,7 @@ msgstr "Provu [serĉi grupojn](%%*action.*groupsearch%%) kaj aniĝi."
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Ĝisdatiĝoj de %1$s ĉe %2$s!"
@@ -6675,20 +6676,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6705,7 +6706,7 @@ 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:217
+#: 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."
@@ -6714,7 +6715,7 @@ 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:229
+#: 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."
@@ -6722,7 +6723,7 @@ 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:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Nevalida dosiernomo."
 
@@ -6780,7 +6781,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr "Ne troviĝas datumbaza nomo aŭ DSN ie ajn."
 
@@ -6849,26 +6850,26 @@ msgid "Problem saving notice."
 msgstr "Malsukcesis konservi avizon."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6882,14 +6883,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:765
+#: classes/Profile.php:771
 #, 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:774
+#: classes/Profile.php:780
 #, 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."
@@ -6969,22 +6970,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Malsukcesis lokan grupan informon."
 
@@ -7717,12 +7718,12 @@ msgid "Do not use this method!"
 msgstr "Ne forigi la avizon"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "Aŭtoro"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "Donanto"
 
@@ -8110,65 +8111,65 @@ msgid ""
 "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 - listi grupon, kiujn vi aniĝis\n"
-"subscriptions - listi viajn abonatojn\n"
-"subscribers - listi viajn abonantojn\n"
-"leave <nickname> - malabnoi 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"
+"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.
-#: lib/common.php:161
+#: lib/common.php:162
 #, 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:164
+#: lib/common.php:165
 #, 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "Al la instalilo."
 
@@ -8355,30 +8356,35 @@ msgstr "Iri"
 msgid "Grant this user the \"%s\" role"
 msgstr "Donu al la uzanto rolon \"%s\""
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Priskribo de grupo aŭ temo"
 
-#: lib/groupeditform.php:162
+#: 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."
+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:174
+#: 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:182
+#: lib/groupeditform.php:183
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8913,11 +8919,11 @@ msgstr ""
 "\n"
 "P.S. Vi rajtas malŝalti tian ĉi retpoŝtan sciigon ĉi tie: %8$s\n"
 
-#: lib/mailbox.php:89
+#: 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:139
+#: 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."
@@ -8925,10 +8931,6 @@ 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/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "de"
-
 #: lib/mailhandler.php:37
 #, fuzzy
 msgid "Could not parse message."
@@ -9021,6 +9023,15 @@ 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:522
+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."
@@ -9211,7 +9222,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Nekonata"
 
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 14100befac..2051709a58 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -3,6 +3,7 @@
 #
 # Author: Brion
 # Author: Crazymadlover
+# Author: Fitoschido
 # Author: Locos epraix
 # Author: McDutchie
 # Author: Ovruni
@@ -17,17 +18,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:34:13+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:05: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-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -96,11 +97,11 @@ msgstr "Guardar la configuración de acceso"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Guardar"
@@ -163,7 +164,7 @@ msgstr "No existe tal página."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "No existe ese usuario."
 
@@ -341,7 +342,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -431,7 +432,7 @@ msgstr ""
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "línea temporal de %s"
@@ -606,8 +607,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "El usuario ya existe. Prueba con otro."
@@ -616,8 +617,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Usuario inválido"
@@ -629,8 +630,8 @@ msgstr "Usuario inválido"
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "La página de inicio no es un URL válido."
@@ -639,8 +640,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.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -656,8 +657,8 @@ msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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,8 +669,8 @@ msgstr[1] "La descripción es demasiado larga (máx. %d caracteres)."
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -681,8 +682,8 @@ 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.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:176
+#: 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."
@@ -700,15 +701,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "El alias no puede ser el mismo que el usuario."
 
@@ -832,7 +833,7 @@ msgstr "No estás autorizado."
 #: 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:153 actions/passwordsettings.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
@@ -924,8 +925,8 @@ msgstr "Cuenta"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Usuario"
@@ -1234,7 +1235,7 @@ msgstr ""
 #: actions/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
-msgstr ""
+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
@@ -1246,20 +1247,20 @@ msgstr ""
 #: actions/apitimelineuser.php:346
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
-msgstr ""
+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
-#, fuzzy, php-format
+#, php-format
 msgid "No content for notice %d."
-msgstr "Buscar en el contenido de mensajes"
+msgstr "No hay contenido para el aviso %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #: actions/apitimelineuser.php:408
-#, fuzzy, php-format
+#, php-format
 msgid "Notice with URI \"%s\" already exists."
-msgstr "No existe ningún mensaje con ese ID."
+msgstr "El aviso con la URI «%s» ya existe."
 
 #. TRANS: Server error for unfinished API method showTrends.
 #: actions/apitrends.php:85
@@ -1282,47 +1283,42 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Notices %1$s has favorited on %2$s"
-msgstr "¡Actualizaciones de %1$s y sus amistades en %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
-#, fuzzy
 msgid "Cannot add someone else's subscription."
-msgstr "No se pudo insertar una nueva suscripción."
+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
-#, fuzzy
 msgid "Can only handle favorite activities."
-msgstr "Buscar en el contenido de mensajes"
+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
-#, fuzzy
 msgid "Can only fave notices."
-msgstr "Buscar en el contenido de mensajes"
+msgstr "Sólo se pueden preferir los avisos."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
 #: actions/atompubfavoritefeed.php:259
-#, fuzzy
 msgid "Unknown note."
-msgstr "Desconocido"
+msgstr "Nota desconocida."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
 #: actions/atompubfavoritefeed.php:267
-#, fuzzy
 msgid "Already a favorite."
-msgstr "Agregar a favoritos"
+msgstr "Ya incluido en favoritos."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
 #: actions/atompubmembershipfeed.php:144
-#, fuzzy, php-format
+#, php-format
 msgid "%s group memberships"
-msgstr "Miembros del grupo %s"
+msgstr "%s miembros en el grupo"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
@@ -1513,7 +1509,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Imagen"
@@ -1812,7 +1808,7 @@ msgstr "Conversación"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Mensajes"
@@ -1832,27 +1828,25 @@ 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 ""
+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 ""
+msgstr "Debe escribir «%s» exactamente dentro del cuadro."
 
 #. TRANS: Confirmation that a user account has been deleted.
 #: actions/deleteaccount.php:206
-#, fuzzy
 msgid "Account deleted."
-msgstr "Imagen borrada."
+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
-#, fuzzy
 msgid "Delete account"
-msgstr "Crear una cuenta"
+msgstr "Eliminar cuenta"
 
 #. TRANS: Form text for user deletion form.
 #: actions/deleteaccount.php:279
@@ -1860,6 +1854,8 @@ msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
 msgstr ""
+"Esto permanentemente <strong>eliminará</strong> sus datos de cuenta de este "
+"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.
@@ -1869,6 +1865,8 @@ msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
 "deletion."
 msgstr ""
+"Se recomienda encarecidamente <a href=\"%s\">respaldar sus datos</a> antes "
+"de la eliminación."
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
@@ -1880,15 +1878,14 @@ 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
+#, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
-msgstr "No puedes borrar usuarios."
+msgstr "Introduzca «%s» para confirmar que desea eliminar su cuenta."
 
 #. TRANS: Button title for user account deletion.
 #: actions/deleteaccount.php:323
-#, fuzzy
 msgid "Permanently delete your account"
-msgstr "No puedes borrar usuarios."
+msgstr "Eliminar permanentemente su cuenta"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 #: actions/deleteapplication.php:62
@@ -1943,9 +1940,8 @@ msgstr "Borrar esta 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 "Debes estar conectado para dejar un grupo."
+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.
@@ -1957,23 +1953,22 @@ 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
-#, fuzzy
 msgid "You are not allowed to delete this group."
-msgstr "No eres miembro de este grupo."
+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
-#, fuzzy, php-format
+#, php-format
 msgid "Could not delete group %s."
-msgstr "No se pudo actualizar el grupo."
+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
-#, fuzzy, php-format
+#, php-format
 msgid "Deleted group %s"
-msgstr "%1$s ha dejado el grupo %2$s"
+msgstr "Grupo %s eliminado"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
@@ -1983,14 +1978,14 @@ msgstr "Borrar 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 "
 "the group from the database, without a backup. Public posts to this group "
 "will still appear in individual timelines."
 msgstr ""
-"¿Realmente deseas eliminar este usuario? Esto borrará de la base de datos "
-"todos los datos sobre el usuario, sin dejar una copia de seguridad."
+"¿Está seguro de que quiere eliminar el grupo? Se eliminarán todos los datos "
+"del grupo de la base de datos, sin ninguna copia de seguridad. Los apuntes "
+"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
@@ -2062,10 +2057,9 @@ msgstr "Sólo puedes eliminar usuarios locales."
 
 #. TRANS: Title of delete user page.
 #: actions/deleteuser.php:110
-#, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
-msgstr "Borrar usuario"
+msgstr "Eliminar usuario"
 
 #. TRANS: Fieldset legend on delete user page.
 #: actions/deleteuser.php:134
@@ -2083,9 +2077,8 @@ msgstr ""
 
 #. 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 grupo"
+msgstr "No eliminar este usuario"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
 #. TRANS: Description of form for deleting a user.
@@ -2102,7 +2095,7 @@ msgstr "Diseño"
 #. TRANS: Instructions for design adminsitration panel.
 #: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
-msgstr ""
+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
@@ -2111,9 +2104,8 @@ msgstr "URL de logotipo inválido."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
 #: actions/designadminpanel.php:333
-#, fuzzy
 msgid "Invalid SSL logo URL."
-msgstr "URL de logotipo inválido."
+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.
@@ -2134,9 +2126,8 @@ msgstr "Logo del sitio"
 
 #. TRANS: Field label for SSL StatusNet site logo.
 #: actions/designadminpanel.php:452
-#, fuzzy
 msgid "SSL logo"
-msgstr "Logo del sitio"
+msgstr "Logo SSL"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
 #: actions/designadminpanel.php:467
@@ -2212,7 +2203,6 @@ msgstr "Imagen de fondo en mosaico"
 
 #. TRANS: Fieldset legend for theme colors.
 #: actions/designadminpanel.php:598
-#, fuzzy
 msgid "Change colors"
 msgstr "Cambiar colores"
 
@@ -2252,10 +2242,9 @@ msgstr "Personalizar CSS"
 
 #. TRANS: Button text for resetting theme settings.
 #: actions/designadminpanel.php:718
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
-msgstr "Utilizar los valores predeterminados"
+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.
@@ -2413,24 +2402,24 @@ 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:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: 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:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Se guardó Opciones."
 
@@ -3267,7 +3256,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.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Preferencias guardadas."
 
@@ -3352,7 +3341,7 @@ msgid "Inbox for %s"
 msgstr "Bandeja de entrada para %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: 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."
@@ -3806,7 +3795,7 @@ 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:199
+#: actions/newgroup.php:200
 #, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "El alias no puede ser el mismo que el usuario."
@@ -4014,8 +4003,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "No es un formato de datos compatible."
 
@@ -4037,34 +4026,36 @@ 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/othersettings.php:111
+#. 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 gratuito)"
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:120
+#: 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:122
+#: 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:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "Ver diseños de perfil"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: 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)."
@@ -4099,7 +4090,7 @@ msgstr "Bandeja de salida de %1$s - página %2$d"
 msgid "Outbox for %s"
 msgstr "Bandeja de salida para %s"
 
-#: actions/outbox.php:116
+#: 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."
@@ -4377,7 +4368,7 @@ 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:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "Adjuntos"
 
@@ -4505,7 +4496,6 @@ msgstr "Información del perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4515,15 +4505,15 @@ msgstr ""
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Página de inicio"
 
@@ -4558,8 +4548,8 @@ msgstr "Biografía"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Ubicación"
@@ -5434,13 +5424,13 @@ msgstr "Organización"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Estadísticas"
@@ -5583,60 +5573,60 @@ 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:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Nota"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Alias"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "Acciones del grupo"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "Miembros"
 
@@ -5644,26 +5634,26 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "Todos los miembros"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Creado"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Miembros"
@@ -5672,7 +5662,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5691,7 +5681,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5705,30 +5695,30 @@ 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:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "Administradores"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Mensaje de %1$s en %2$s"
@@ -6695,7 +6685,7 @@ msgstr "Intenta [buscar gupos](%%action.groupsearch%%) y unirte a ellos."
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "¡Actualizaciones de %1$s en %2$s!"
@@ -6777,20 +6767,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6807,7 +6797,7 @@ 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:217
+#: 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."
@@ -6818,7 +6808,7 @@ 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:229
+#: 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."
@@ -6828,7 +6818,7 @@ 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:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Nombre de archivo inválido."
 
@@ -6886,7 +6876,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr "Ningún nombre de base de datos o DSN encontrado."
 
@@ -6957,26 +6947,26 @@ 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:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6990,14 +6980,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:765
+#: classes/Profile.php:771
 #, 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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7079,22 +7069,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "No se ha podido guardar la información del grupo local."
 
@@ -7834,12 +7824,12 @@ msgid "Do not use this method!"
 msgstr "No eliminar este mensaje"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "Autor"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "Proveedor"
 
@@ -8267,26 +8257,26 @@ msgstr ""
 "tracking - aún sin implementar.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 #, 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:164
+#: lib/common.php:165
 #, 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "Ir al instalador."
 
@@ -8474,23 +8464,29 @@ msgstr "Ir"
 msgid "Grant this user the \"%s\" role"
 msgstr "Otorgar al usuario el papel de \"%$\""
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, 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"
+
+#: 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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Describir al grupo o tema"
 
-#: lib/groupeditform.php:162
+#: 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."
+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:174
+#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -8498,7 +8494,7 @@ msgstr ""
 "Ubicación del grupo, si existe, por ejemplo \"Ciudad, Estado (o Región), País"
 "\""
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:183
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9037,11 +9033,11 @@ msgstr ""
 "P.D. Puedes desactivar las notificaciones que recibes en tu correo "
 "electrónico aquí: %8$s\n"
 
-#: lib/mailbox.php:89
+#: 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:139
+#: 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,10 +9046,6 @@ msgstr ""
 "otros usuarios partícipes de la conversación. La gente puede enviarte "
 "mensajes que sólo puedas leer tú."
 
-#: lib/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "desde"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "No se pudo analizar sintácticamente mensaje."
@@ -9147,6 +9139,15 @@ 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:522
+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."
@@ -9338,7 +9339,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Desconocido"
 
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index 0170e30010..fd7b37146d 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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:34:17+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:05:47+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 (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-POT-Import-Date: 2011-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -96,11 +96,11 @@ msgstr "ذخیرهٔ تنظیمات دسترسی"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "ذخیره"
@@ -163,7 +163,7 @@ msgstr "چنین صفحه‌ای وجود ندارد."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "چنین کاربری وجود ندارد."
 
@@ -338,7 +338,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -425,7 +425,7 @@ msgstr "اصلی"
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "خط‌زمانی %s"
@@ -599,8 +599,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "این لقب در حال حاضر ثبت شده است. لطفا یکی دیگر انتخاب کنید."
@@ -609,8 +609,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "لقب نا معتبر."
@@ -622,8 +622,8 @@ msgstr "لقب نا معتبر."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "صفحهٔ خانگی یک نشانی معتبر نیست."
@@ -632,8 +632,8 @@ msgstr "صفحهٔ خانگی یک نشانی معتبر نیست."
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -649,8 +649,8 @@ msgstr "نام کامل خیلی طولانی است (حداکثر ۲۵۵ نوی
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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)."
@@ -660,8 +660,8 @@ msgstr[0] "توصیف خیلی طولانی است (حداکثر %d نویسه)"
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -673,8 +673,8 @@ 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.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:176
+#: 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."
@@ -691,15 +691,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "نام و نام مستعار شما نمی تواند یکی باشد ."
 
@@ -823,7 +823,7 @@ msgstr "شما شناسایی نشده اید."
 #: 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:153 actions/passwordsettings.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
@@ -917,8 +917,8 @@ msgstr "حساب کاربری"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "نام کاربری"
@@ -1503,7 +1503,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "چهره"
@@ -1806,7 +1806,7 @@ msgstr "مکالمه"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "پیام‌ها"
@@ -2414,24 +2414,24 @@ msgstr "از این روش برای ویرایش گروه استفاده کنی
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: actions/editgroup.php:281 classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "نمی‌توان نام‌های مستعار را ساخت."
 
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "گزینه‌ها ذخیره شدند."
 
@@ -3258,7 +3258,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "یک شناسهٔ کوچک برای Jabber/Gtalk من منتشر کن."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "تنظیمات ذخیره شد."
 
@@ -3342,7 +3342,7 @@ msgid "Inbox for %s"
 msgstr "صندوق ورودی %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "این صندوق ورودی‌های شماست که پیام‌های خصوصی شما در آن خواهد بود."
 
@@ -3787,7 +3787,7 @@ msgid "Use this form to create a new group."
 msgstr "از این فرم برای ساختن یک گروه جدید استفاده کنید"
 
 #. TRANS: Group create form validation error.
-#: actions/newgroup.php:199
+#: actions/newgroup.php:200
 #, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "نام و نام مستعار شما نمی تواند یکی باشد ."
@@ -3993,8 +3993,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "یک قالب دادهٔ پشتیبانی‌شده نیست."
 
@@ -4016,34 +4016,36 @@ 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/othersettings.php:111
+#. 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:120
+#: actions/othersettings.php:122
 msgid "Shorten URLs with"
 msgstr "کوتاه‌کردن نشانی‌های اینترنتی با"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:122
+#: actions/othersettings.php:124
 msgid "Automatic shortening service to use."
 msgstr "کوتاه‌کنندهٔ نشانی مورد استفاده."
 
 #. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "نمایش طراحی‌های نمایه"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: actions/othersettings.php:164
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "کوتاه کنندهٔ نشانی بسیار طولانی است (بیش‌تر از ۵۰ حرف)."
@@ -4078,7 +4080,7 @@ msgstr "صندوق خروجی %1$s - صفحهٔ %2$d"
 msgid "Outbox for %s"
 msgstr "فرستاده‌های %s"
 
-#: actions/outbox.php:116
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "این صندوق خروجی شماست، که پیام‌های خصوصی فرستاده شده به وسیلهٔ شما را فهرست "
@@ -4357,7 +4359,7 @@ msgstr "مسیر پوشه برای زبان‌های محلی"
 
 #. TRANS: Fieldset legens in Paths admin panel.
 #. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "ضمائم"
 
@@ -4483,7 +4485,6 @@ msgstr "اطلاعات نمایه"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "۱-۶۴ کاراکتر کوچک یا اعداد، بدون نقطه گذاری یا فاصله"
@@ -4492,15 +4493,15 @@ msgstr "۱-۶۴ کاراکتر کوچک یا اعداد، بدون نقطه گذ
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "صفحهٔ خانگی"
 
@@ -4534,8 +4535,8 @@ msgstr "شرح‌حال"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "موقعیت"
@@ -5392,13 +5393,13 @@ msgstr "سازمان"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "آمار"
@@ -5541,60 +5542,60 @@ msgid "%1$s group, page %2$d"
 msgstr "گروه %1$s، صفحهٔ %2$d"
 
 #. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "یادداشت"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "نام های مستعار"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "اعمال گروه"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "اعضا"
 
@@ -5602,26 +5603,26 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "همهٔ اعضا"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "ساخته شد"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5631,7 +5632,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5650,7 +5651,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5665,30 +5666,30 @@ msgstr ""
 "می‌گذارند. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "مدیران"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "پیام از %1$s در %2$s"
@@ -6643,7 +6644,7 @@ msgstr ""
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "به روز رسانی‌های %1$s در %2$s"
@@ -6723,20 +6724,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6750,7 +6751,7 @@ 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:217
+#: 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."
@@ -6759,7 +6760,7 @@ 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:229
+#: 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."
@@ -6768,7 +6769,7 @@ msgstr[0] ""
 "بگذرد."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "نام‌پرونده نادرست است."
 
@@ -6826,7 +6827,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr "هیچ پایگاه‌داده یا DSN هیچ‌جا پیدا نشد."
 
@@ -6898,25 +6899,25 @@ msgid "Problem saving notice."
 msgstr "هنگام ذخیرهٔ پیام مشکلی ایجاد شد."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6930,14 +6931,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:765
+#: classes/Profile.php:771
 #, 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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7019,23 +7020,23 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "نمی‌توان اطلاعات گروه محلی را ذخیره کرد."
 
@@ -7767,12 +7768,12 @@ msgid "Do not use this method!"
 msgstr "این پیام را پاک نکن"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "مؤلف"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "مهیا کننده"
 
@@ -8196,26 +8197,26 @@ msgstr ""
 "tracking - هنوز پیاده نشده است.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 #, 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:164
+#: lib/common.php:165
 #, 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "برو به نصاب."
 
@@ -8404,28 +8405,33 @@ msgstr "برو"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "گروه یا موضوع را توصیف کنید"
 
-#: lib/groupeditform.php:162
+#: 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."
+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:174
+#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "مکان گروه، در صورت وجود داشتن، مانند «شهر، ایالت (یا استان)، کشور»"
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:183
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8958,20 +8964,16 @@ msgstr ""
 "\n"
 "پ.ن. شما می‌توانید این آگاه‌سازی با نامه را این‌جا خاموش کنید:%8$s\n"
 
-#: lib/mailbox.php:89
+#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "تنها کاربران می تواند صندوق نامهٔ خودشان را بخوانند."
 
-#: lib/mailbox.php:139
+#: 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/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "از"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "نمی‌توان پیام را تجزیه کرد."
@@ -9062,6 +9064,15 @@ msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "فرستادن"
 
+#: lib/messagelist.php:77
+#, fuzzy
+msgid "Messages"
+msgstr "پیام"
+
+#: lib/messagelistitem.php:123 lib/noticelist.php:522
+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."
@@ -9251,7 +9262,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "ناشناخته"
 
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 1c3f8bbaa0..438bc2a854 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -14,17 +14,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:34:20+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:05:50+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 (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -99,11 +99,11 @@ msgstr "Profiilikuva-asetukset"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Tallenna"
@@ -166,7 +166,7 @@ msgstr "Sivua ei ole."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Käyttäjää ei ole."
 
@@ -340,7 +340,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -427,7 +427,7 @@ msgstr ""
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s aikajana"
@@ -606,8 +606,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
@@ -616,8 +616,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Tuo ei ole kelvollinen tunnus."
@@ -629,8 +629,8 @@ msgstr "Tuo ei ole kelvollinen tunnus."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Kotisivun verkko-osoite ei ole toimiva."
@@ -639,8 +639,8 @@ msgstr "Kotisivun verkko-osoite ei ole toimiva."
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -656,8 +656,8 @@ msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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,8 +668,8 @@ msgstr[1] "kuvaus on liian pitkä (max %d merkkiä)."
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -681,8 +681,8 @@ msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)."
 #. 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:229
-#: actions/newgroup.php:176
+#: 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."
@@ -700,15 +700,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Alias ei voi olla sama kuin ryhmätunnus."
 
@@ -832,7 +832,7 @@ msgstr "Sinulla ei ole valtuutusta tähän."
 #: 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:153 actions/passwordsettings.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
@@ -921,8 +921,8 @@ msgstr "Käyttäjätili"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Tunnus"
@@ -1510,7 +1510,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Kuva"
@@ -1807,7 +1807,7 @@ msgstr "Keskustelu"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Päivitykset"
@@ -2427,24 +2427,24 @@ 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:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: 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:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Asetukset tallennettu."
 
@@ -3271,7 +3271,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.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Asetukset tallennettu."
 
@@ -3355,7 +3355,7 @@ msgid "Inbox for %s"
 msgstr "Saapuneet viestit käyttäjälle %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: 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."
 
@@ -3817,7 +3817,7 @@ 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:199
+#: actions/newgroup.php:200
 #, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "Alias ei voi olla sama kuin ryhmätunnus."
@@ -4027,8 +4027,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "Tuo ei ole tuettu tietomuoto."
 
@@ -4050,34 +4050,36 @@ 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/othersettings.php:111
+#. 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:120
+#: actions/othersettings.php:122
 msgid "Shorten URLs with"
 msgstr "Lyhennä URL-osoitteita"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:122
+#: actions/othersettings.php:124
 msgid "Automatic shortening service to use."
 msgstr "Käytettävä automaattinen lyhennyspalvelu."
 
 #. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "Näytä tai piillota profiilin ulkoasu."
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: 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ä)."
@@ -4116,7 +4118,7 @@ msgstr "Käyttäjän %s lähetetyt viestit"
 msgid "Outbox for %s"
 msgstr "Käyttäjän %s lähetetyt viestit"
 
-#: actions/outbox.php:116
+#: 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."
 
@@ -4396,7 +4398,7 @@ msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
 #. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "Liitteet"
 
@@ -4525,7 +4527,6 @@ msgstr "Profiilitieto"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4536,15 +4537,15 @@ msgstr ""
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Kotisivu"
 
@@ -4579,8 +4580,8 @@ msgstr "Tietoja"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Kotipaikka"
@@ -5450,13 +5451,13 @@ msgstr "Sivutus"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Tilastot"
@@ -5591,60 +5592,60 @@ msgid "%1$s group, page %2$d"
 msgstr "Ryhmät, sivu %d"
 
 #. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Huomaa"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Aliakset"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "Ryhmän toiminnot"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "Jäsenet"
 
@@ -5652,7 +5653,7 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 #, fuzzy
@@ -5660,19 +5661,19 @@ 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "Kaikki jäsenet"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Luotu"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5682,7 +5683,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5695,7 +5696,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:486
+#: actions/showgroup.php:498
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5707,30 +5708,30 @@ msgstr ""
 "(http://en.wikipedia.org/wiki/Micro-blogging)"
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "Ylläpitäjät"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Viesti käyttäjältä %1$s, %2$s"
@@ -6698,7 +6699,7 @@ msgstr ""
 #. 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:75
+#: 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!"
@@ -6769,20 +6770,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6795,7 +6796,7 @@ 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:217
+#: 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."
@@ -6804,7 +6805,7 @@ 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:229
+#: 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."
@@ -6812,7 +6813,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 #, fuzzy
 msgid "Invalid filename."
 msgstr "Koko ei kelpaa."
@@ -6875,7 +6876,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6948,26 +6949,26 @@ 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:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6981,14 +6982,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:765
+#: classes/Profile.php:771
 #, 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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7072,22 +7073,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 #, fuzzy
 msgid "Could not save local group info."
 msgstr "Tilausta ei onnistuttu tallentamaan."
@@ -7850,13 +7851,13 @@ msgid "Do not use this method!"
 msgstr "Älä poista tätä päivitystä"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 #, fuzzy
 msgid "Author"
 msgstr "Atom"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "Esikatselu"
 
@@ -8248,26 +8249,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 #, 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:164
+#: lib/common.php:165
 #, 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Kirjaudu sisään palveluun"
@@ -8458,24 +8459,31 @@ msgstr "Mene"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+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:160
+#: lib/groupeditform.php:161
 #, fuzzy
 msgid "Describe the group or topic"
 msgstr "Kuvaile ryhmää tai aihetta 140 merkillä"
 
-#: lib/groupeditform.php:162
+#: 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."
+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:174
+#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -8483,7 +8491,7 @@ msgstr ""
 "Ryhmän paikka, jos sellainen on, kuten \"Kaupunki, Maakunta (tai Lääni), Maa"
 "\""
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8935,21 +8943,16 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:89
+#: 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:139
+#: 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/mailbox.php:228 lib/noticelist.php:522
-#, fuzzy
-msgid "from"
-msgstr " lähteestä "
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Ei voitu lukea viestiä."
@@ -9039,6 +9042,16 @@ 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:522
+#, 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."
@@ -9234,7 +9247,7 @@ 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:121
+#: lib/plugin.php:126
 #, fuzzy
 msgid "Unknown"
 msgstr "Tuntematon toiminto"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 1803c0c1fd..03f7adecd5 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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:34:22+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:05: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-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -100,11 +100,11 @@ msgstr "Sauvegarder les paramètres d’accès"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Enregistrer"
@@ -167,7 +167,7 @@ msgstr "Page non trouvée."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Utilisateur non trouvé."
 
@@ -346,7 +346,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -426,7 +426,6 @@ msgstr "Impossible de mettre à jour votre conception."
 
 #. TRANS: Title for Atom feed.
 #: actions/apiatomservice.php:85
-#, fuzzy
 msgctxt "ATOM"
 msgid "Main"
 msgstr "Principal"
@@ -437,7 +436,7 @@ msgstr "Principal"
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "Activité de %s"
@@ -457,9 +456,9 @@ msgstr "Abonnements de %s"
 #. 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 "Favoris"
+msgstr "Favoris de %s"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
 #: actions/apiatomservice.php:126
@@ -614,8 +613,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudo déjà utilisé. Essayez-en un autre."
@@ -624,8 +623,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Pseudo invalide."
@@ -637,8 +636,8 @@ msgstr "Pseudo invalide."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "L’adresse du site personnel n’est pas un URL valide. "
@@ -647,8 +646,8 @@ msgstr "L’adresse du site personnel n’est pas un URL valide. "
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: 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)."
@@ -663,8 +662,8 @@ msgstr "Le nom complet est trop long (limité à 255 caractères maximum)."
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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)."
@@ -675,8 +674,8 @@ msgstr[1] "La description est trop longue (limitée à %d caractères maximum)."
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "L’emplacement est trop long (limité à 255 caractères maximum)."
@@ -687,8 +686,8 @@ msgstr "L’emplacement est trop long (limité à 255 caractères maximum)."
 #. 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:229
-#: actions/newgroup.php:176
+#: 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."
@@ -706,15 +705,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 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."
 
@@ -835,7 +834,7 @@ msgstr "Le jeton de requête a déjà été autorisé."
 #: 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:153 actions/passwordsettings.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
@@ -931,8 +930,8 @@ msgstr "Compte"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Pseudo"
@@ -1084,7 +1083,6 @@ 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
-#, fuzzy
 msgid "Cannot delete this notice."
 msgstr "Impossible de supprimer cet avis."
 
@@ -1223,9 +1221,8 @@ 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
-#, fuzzy
 msgid "Only accept AtomPub for Atom feeds."
-msgstr "N’accepter que des AtomPub pour les flux atom."
+msgstr "N’accepte que AtomPub pour les flux atom."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
 #: actions/apitimelineuser.php:311
@@ -1525,7 +1522,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Avatar"
@@ -1822,7 +1819,7 @@ msgstr "Conversation"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Avis"
@@ -2419,24 +2416,24 @@ 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:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: 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:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Vos options ont été enregistrées."
 
@@ -3275,7 +3272,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.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Préférences enregistrées"
 
@@ -3359,7 +3356,7 @@ msgid "Inbox for %s"
 msgstr "Boîte de réception de %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: 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 "
@@ -3821,7 +3818,7 @@ 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:199
+#: 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."
@@ -4033,8 +4030,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "Format de données non supporté."
 
@@ -4056,34 +4053,36 @@ 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/othersettings.php:111
+#. 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 gratuit)"
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:120
+#: 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:122
+#: 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:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "Afficher les conceptions de profils"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: 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)."
 
@@ -4117,7 +4116,7 @@ msgstr "Boîte d’envoi de %1$s - page %2$d"
 msgid "Outbox for %s"
 msgstr "Boîte d’envoi de %s"
 
-#: actions/outbox.php:116
+#: 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."
@@ -4383,7 +4382,7 @@ 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:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "Pièces jointes"
 
@@ -4506,7 +4505,6 @@ msgstr "Information de profil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces."
 
@@ -4514,15 +4512,15 @@ msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces."
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Site personnel"
 
@@ -4557,8 +4555,8 @@ msgstr "Bio"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Emplacement"
@@ -5431,13 +5429,13 @@ msgstr "Organisation"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistiques"
@@ -5581,60 +5579,60 @@ 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:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Note"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Alias"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "Actions du groupe"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "Membres"
 
@@ -5642,25 +5640,25 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "Tous les membres"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Créé"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Membres"
@@ -5669,7 +5667,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5688,7 +5686,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5702,17 +5700,17 @@ 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:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "Administrateurs"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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 "
@@ -5720,14 +5718,14 @@ 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Message reçu de %1$s le %2$s"
@@ -6700,7 +6698,7 @@ msgstr ""
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Statuts de %1$s dans %2$s!"
@@ -6782,20 +6780,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6814,7 +6812,7 @@ 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:217
+#: 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."
@@ -6825,7 +6823,7 @@ 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:229
+#: 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."
@@ -6833,7 +6831,7 @@ 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:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Nom de fichier non valide."
 
@@ -6891,7 +6889,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr "Aucun nom de base de données ou DSN trouvé nulle part."
 
@@ -6962,25 +6960,25 @@ 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:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6994,7 +6992,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:765
+#: classes/Profile.php:771
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7003,7 +7001,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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7085,22 +7083,22 @@ 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:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Impossible d’enregistrer les informations du groupe local."
 
@@ -7841,12 +7839,12 @@ msgid "Do not use this method!"
 msgstr "Ne pas supprimer ce groupe"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "Auteur"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "Fournisseur"
 
@@ -8278,25 +8276,25 @@ msgstr ""
 "tracking - pas encore implémenté.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 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:164
+#: lib/common.php:165
 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "Aller au programme d’installation"
 
@@ -8479,29 +8477,34 @@ msgstr "Aller"
 msgid "Grant this user the \"%s\" role"
 msgstr "Accorder le rôle « %s » à cet utilisateur"
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Description du groupe ou du sujet"
 
-#: lib/groupeditform.php:162
+#: 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."
+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:174
+#: 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:182
+#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9044,11 +9047,11 @@ msgstr ""
 "\n"
 "P.S. Vous pouvez désactiver ces notifications électroniques ici : %8$s\n"
 
-#: lib/mailbox.php:89
+#: 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:139
+#: 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."
@@ -9057,10 +9060,6 @@ msgstr ""
 "pour démarrer des conversations avec d’autres utilisateurs. Ceux-ci peuvent "
 "vous envoyer des messages destinés à vous seul(e)."
 
-#: lib/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "de"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Impossible de déchiffrer ce message."
@@ -9152,6 +9151,15 @@ 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:522
+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."
@@ -9343,7 +9351,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Inconnu"
 
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index db66a6c861..206923ad36 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:34:25+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:05:56+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 (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -90,11 +90,11 @@ msgstr "Gardar a configuración de acceso"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Gardar"
@@ -157,7 +157,7 @@ msgstr "Esa páxina non existe."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Non existe tal usuario."
 
@@ -335,7 +335,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -425,7 +425,7 @@ msgstr ""
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "Liña do tempo de %s"
@@ -603,8 +603,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Ese alcume xa está en uso. Probe con outro."
@@ -613,8 +613,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "O formato do alcume non é correcto."
@@ -626,8 +626,8 @@ msgstr "O formato do alcume non é correcto."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "O URL da páxina persoal non é correcto."
@@ -636,8 +636,8 @@ 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.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -653,8 +653,8 @@ msgstr "O nome completo é longo de máis (o máximo son 255 caracteres)."
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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,8 +665,8 @@ 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.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -678,8 +678,8 @@ 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.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:176
+#: 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."
@@ -697,15 +697,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "O pseudónimo non pode coincidir co alcume."
 
@@ -828,7 +828,7 @@ msgstr "Non está autorizado."
 #: 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:153 actions/passwordsettings.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
@@ -921,8 +921,8 @@ msgstr "Conta"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Alcume"
@@ -1510,7 +1510,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Avatar"
@@ -1808,7 +1808,7 @@ msgstr "Conversa"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Notas"
@@ -2412,24 +2412,24 @@ 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:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: 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:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Gardáronse as preferencias."
 
@@ -3266,7 +3266,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.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Gardáronse as preferencias."
 
@@ -3350,7 +3350,7 @@ msgid "Inbox for %s"
 msgstr "Caixa de entrada de %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: 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."
@@ -3808,7 +3808,7 @@ 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:199
+#: actions/newgroup.php:200
 #, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "O pseudónimo non pode coincidir co alcume."
@@ -4015,8 +4015,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "Non se soporta ese formato de datos."
 
@@ -4038,34 +4038,36 @@ 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/othersettings.php:111
+#. 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 gratuíto)"
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:120
+#: 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:122
+#: 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:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "Deseños visuais do perfil"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: actions/othersettings.php:164
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr ""
@@ -4102,7 +4104,7 @@ msgstr "Caixa de saída de %1$s - páxina %2$d"
 msgid "Outbox for %s"
 msgstr "Caixa de saída de %s"
 
-#: actions/outbox.php:116
+#: 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."
@@ -4375,7 +4377,7 @@ 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:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "Ficheiros anexos"
 
@@ -4502,7 +4504,6 @@ msgstr "Información do perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4513,15 +4514,15 @@ msgstr ""
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Páxina persoal"
 
@@ -4556,8 +4557,8 @@ msgstr "Biografía"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Lugar"
@@ -5431,13 +5432,13 @@ msgstr "Organización"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Estatísticas"
@@ -5582,60 +5583,60 @@ 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:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Nota"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Pseudónimos"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "Accións do grupo"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "Membros"
 
@@ -5643,26 +5644,26 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "Todos os membros"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Creado"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5672,7 +5673,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5691,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5705,30 +5706,30 @@ 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:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "Administradores"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Mensaxe de %1$s en %2$s"
@@ -6695,7 +6696,7 @@ msgstr "Probe a [buscar grupos](%%action.groupsearch%%) e unirse a eles."
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Actualizacións de %1$s en %2$s!"
@@ -6777,20 +6778,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6807,7 +6808,7 @@ 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:217
+#: 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."
@@ -6818,7 +6819,7 @@ 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:229
+#: 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."
@@ -6826,7 +6827,7 @@ 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:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Nome de ficheiro incorrecto."
 
@@ -6884,7 +6885,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr "Non se atopou por ningures o nome da base de datos ou DSN."
 
@@ -6955,26 +6956,26 @@ 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:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6988,7 +6989,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:765
+#: classes/Profile.php:771
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -6996,7 +6997,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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7077,22 +7078,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Non se puido gardar a información do grupo local."
 
@@ -7836,12 +7837,12 @@ msgid "Do not use this method!"
 msgstr "Non borrar esta nota"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "Autor"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "Provedor"
 
@@ -8270,26 +8271,26 @@ 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:161
+#: lib/common.php:162
 #, 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:164
+#: lib/common.php:165
 #, 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "Ir ao instalador."
 
@@ -8477,23 +8478,30 @@ msgstr "Continuar"
 msgid "Grant this user the \"%s\" role"
 msgstr "Outorgarlle a este usuario o rol \"%s\""
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Describa o grupo ou o tema"
 
-#: lib/groupeditform.php:162
+#: 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."
+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:174
+#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -8501,7 +8509,7 @@ msgstr ""
 "Localidade do grupo, se a ten, como por exemplo \"Cidade, Provincia, "
 "Comunidade, País\""
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:183
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9041,11 +9049,11 @@ msgstr ""
 "\n"
 "P.S.: pode desactivar estas notificacións por correo electrónico en %8$s\n"
 
-#: lib/mailbox.php:89
+#: 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:139
+#: 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."
@@ -9053,10 +9061,6 @@ 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/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "de"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Non se puido analizar a mensaxe."
@@ -9149,6 +9153,15 @@ 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:522
+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."
@@ -9340,7 +9353,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Descoñecida"
 
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index 212d8ad7eb..5267a12241 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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:34:28+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:05:58+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 (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -91,11 +91,11 @@ msgstr "Přistupne nastajenja składować"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Składować"
@@ -158,7 +158,7 @@ msgstr "Strona njeeksistuje."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Wužiwar njeeksistuje"
 
@@ -328,7 +328,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -416,7 +416,7 @@ msgstr "Hłowny"
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr ""
@@ -593,8 +593,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Přimjeno so hižo wužiwa. Spytaj druhe."
@@ -603,8 +603,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Žane płaćiwe přimjeno."
@@ -616,8 +616,8 @@ msgstr "Žane płaćiwe přimjeno."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Startowa strona njeje płaćiwy URL."
@@ -626,8 +626,8 @@ msgstr "Startowa strona njeje płaćiwy URL."
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: 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)."
@@ -642,8 +642,8 @@ msgstr "Dospołne mjeno je předołho (maks. 255 znamješkow)."
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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,8 +656,8 @@ msgstr[3] "Wopisanje je předołho (maks. %d znamješkow)."
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Městno je předołho (maks. 255 znamješkow)."
@@ -668,8 +668,8 @@ msgstr "Městno je předołho (maks. 255 znamješkow)."
 #. 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:229
-#: actions/newgroup.php:176
+#: 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,15 +689,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Alias njemóže samsny kaž přimjeno być."
 
@@ -818,7 +818,7 @@ msgstr "Naprašowanski token hižo awtorizowany."
 #: 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:153 actions/passwordsettings.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
@@ -902,8 +902,8 @@ msgstr "Konto"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Přimjeno"
@@ -1253,9 +1253,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Notices %1$s has favorited on %2$s"
-msgstr "Aktualizacije wot %1$s a přećelow na %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.
@@ -1293,9 +1293,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %1$s is a member of on %2$s"
-msgstr "Skupiny, w kotrychž %s je čłon"
+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
@@ -1409,9 +1409,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "People %1$s has subscribed to on %2$s"
-msgstr "Ludźo, kotřiž su %s abonowali"
+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
@@ -1470,7 +1470,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Awatar"
@@ -1761,7 +1761,7 @@ msgstr "Konwersacija"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Zdźělenki"
@@ -1962,6 +1962,7 @@ msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgstr ""
+"Chceš zdźělenku na přeco zhašeć. Hdyž sy to činił, njeje móžno to cofnyć."
 
 #. TRANS: Page title when deleting a notice.
 #. TRANS: Fieldset legend for the delete notice form.
@@ -2336,24 +2337,24 @@ 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:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: 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:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Opcije składowane."
 
@@ -2868,9 +2869,8 @@ 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 "Njeje móžno, designowe nastajenja składować."
+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
@@ -2979,7 +2979,6 @@ msgstr "Aktualizacije wot  %1$s na %2$s!"
 
 #. TRANS: Title for first page of the groups list.
 #: actions/groups.php:62
-#, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "Skupiny"
@@ -2987,7 +2986,7 @@ 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
+#, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
 msgstr "Skupiny, strona %d"
@@ -3032,7 +3031,7 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
 "action.newgroup%%) yourself."
@@ -3091,9 +3090,8 @@ msgid "IM address"
 msgstr "IM-adresa"
 
 #: actions/imsettings.php:109
-#, fuzzy
 msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Aktualna wobkrućena adresa Jabber/GTalk."
+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.
@@ -3123,30 +3121,29 @@ msgstr "IM-nastajenja"
 
 #. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-#, fuzzy
 msgid "Send me notices through Jabber/Google Talk."
-msgstr "Pósćel mi zdźělenki přez Jabber/GTalk."
+msgstr "Pósćel mi zdźělenki přez 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 "Powěsć pósłac, hdyž so status Jabber/GTalk změni."
+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."
 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
-#, fuzzy
 msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "MicroID za moju adresu Jabber/GTalk publikować."
+msgstr "MicroID za moju adresu Jabber/Google Talk publikować."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Nastajenja składowane."
 
@@ -3157,15 +3154,13 @@ msgstr "Žadyn ID Jabber."
 
 #. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-#, fuzzy
 msgid "Cannot normalize that Jabber ID."
 msgstr "Tutón Jabber-ID njehodźi so normalizować"
 
 #. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-#, fuzzy
 msgid "Not a valid Jabber ID."
-msgstr "Njepłaćiwy ID Jabber"
+msgstr "Njepłaćiwy Jabber-ID."
 
 #. TRANS: Message given saving Instant Messaging address that is already set.
 #: actions/imsettings.php:321
@@ -3227,7 +3222,7 @@ msgid "Inbox for %s"
 msgstr "Dochadny póst za %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: 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."
@@ -3330,7 +3325,6 @@ msgstr "E-mejlowe 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řećelow, kotřiž maja so přeprosyć (jedna na linku)"
 
@@ -3650,7 +3644,7 @@ 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:199
+#: actions/newgroup.php:200
 msgid "Alias cannot be the same as nickname."
 msgstr "Alias njemóže samsne kaž přimjeno być."
 
@@ -3846,8 +3840,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "Njeje podpěrany datowy format."
 
@@ -3869,34 +3863,36 @@ 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/othersettings.php:111
+#. 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:120
+#: 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:122
+#: actions/othersettings.php:124
 msgid "Automatic shortening service to use."
 msgstr ""
 
 #. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "Profilowe designy sej wobhladać"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: 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)."
 
@@ -3930,7 +3926,7 @@ msgstr "Wuchadny póst za %1$s - strona %2$d"
 msgid "Outbox for %s"
 msgstr "Wuchadny póst za %s"
 
-#: actions/outbox.php:116
+#: 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 "
@@ -4053,7 +4049,7 @@ msgstr "Serwer"
 
 #: actions/pathsadminpanel.php:242
 msgid "Site's server hostname."
-msgstr ""
+msgstr "Serwerowe mjeno sydła"
 
 #. TRANS: Field label in Paths admin panel.
 #: actions/pathsadminpanel.php:248 actions/pathsadminpanel.php:288
@@ -4197,7 +4193,7 @@ 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:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "Přiwěški"
 
@@ -4315,7 +4311,6 @@ msgstr "Profilowe informacije"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 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 "
@@ -4325,15 +4320,15 @@ msgstr ""
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Startowa strona"
 
@@ -4369,8 +4364,8 @@ msgstr "Biografija"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Městno"
@@ -4815,13 +4810,13 @@ msgstr "Dlěše mjeno, wosebje twoje \"woprawdźite\" mjeno"
 
 #: actions/register.php:462
 msgid "URL of your homepage, blog, or profile on another site"
-msgstr ""
+msgstr "URL twojeje startoweje strony, bloga abo profila na druhim sydle"
 
 #: actions/register.php:523
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
-msgstr ""
+msgstr "Rozumju, zo wobsah a daty wot %1$s su priwatne a dowěrliwe."
 
 #: actions/register.php:533
 #, php-format
@@ -5072,7 +5067,7 @@ 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 ""
+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
@@ -5162,13 +5157,13 @@ msgstr "Organizacija"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistika"
@@ -5302,60 +5297,60 @@ 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:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Přispomnjenka"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Aliasy"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "Skupinske akcije"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "Čłonojo"
 
@@ -5363,25 +5358,25 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "Wšitcy čłonojo"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Wutworjeny"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Čłonojo"
@@ -5390,7 +5385,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5403,7 +5398,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5413,30 +5408,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "Administratorojo"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Powěsć wot %1$s na %2$s"
@@ -5631,6 +5626,8 @@ 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"
@@ -6344,7 +6341,7 @@ msgstr ""
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Aktualizacije wot %1$s na %2$s!"
@@ -6414,20 +6411,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6442,7 +6439,7 @@ 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:217
+#: 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."
@@ -6453,7 +6450,7 @@ 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:229
+#: 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."
@@ -6463,7 +6460,7 @@ msgstr[2] ""
 msgstr[3] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Njepłaćiwe datajowe mjeno."
 
@@ -6521,7 +6518,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr "Žane mjeno datoweje banki namakane abo žadyn DSN namakany."
 
@@ -6588,25 +6585,25 @@ 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:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6620,14 +6617,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:765
+#: classes/Profile.php:771
 #, 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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6707,22 +6704,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Informacije wo lokalnej skupinje njedachu so składować."
 
@@ -7009,7 +7006,7 @@ msgstr ""
 #: lib/action.php:944
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
-msgstr ""
+msgstr "**%%site.name%%** je mikroblogowanska słužba."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
@@ -7117,7 +7114,7 @@ msgstr "Wužiwar je hižo čłon tuteje skupiny."
 #: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
-msgstr ""
+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
@@ -7416,7 +7413,7 @@ msgstr "jenož čitajomny"
 #: lib/applicationlist.php:268
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
-msgstr ""
+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.
@@ -7441,19 +7438,19 @@ msgid "Do not use this method!"
 msgstr "Njewužij tutu metodu!"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "Awtor"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "Poskićowar"
 
 #. TRANS: Title.
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
-msgstr ""
+msgstr "Zdźělenki, hdźež so tutón přiwěšk jewi"
 
 #. TRANS: Title.
 #: lib/attachmenttagcloudsection.php:48
@@ -7850,24 +7847,24 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 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:164
+#: lib/common.php:165
 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "K instalaciji"
 
@@ -8047,31 +8044,38 @@ msgstr "Start"
 msgid "Grant this user the \"%s\" role"
 msgstr "Tutomu wužiwarjej rólu \"%s\" dać"
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Skupinu abo temu wopisać"
 
-#: lib/groupeditform.php:162
-#, 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."
+#: 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] "Skupinu abo temu w %d znamješce abo mjenje wopisać"
 msgstr[1] "Skupinu abo temu w %d znamješkomaj abo mjenje wopisać"
 msgstr[2] "Skupinu abo temu w %d znamješkach abo mjenje wopisać"
 msgstr[3] "Skupinu abo temu w %d znamješkach abo mjenje wopisać"
 
-#: lib/groupeditform.php:174
+#: 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:182
+#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8518,20 +8522,16 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:89
+#: 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:139
+#: 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/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "wot"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Powěsć njeda so analyzować."
@@ -8623,6 +8623,15 @@ msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Pósłać"
 
+#: lib/messagelist.php:77
+#, fuzzy
+msgid "Messages"
+msgstr "Powěsć"
+
+#: lib/messagelistitem.php:123 lib/noticelist.php:522
+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."
@@ -8808,7 +8817,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Njeznaty"
 
diff --git a/locale/hu/LC_MESSAGES/statusnet.po b/locale/hu/LC_MESSAGES/statusnet.po
index 5e1edb426c..49690a28c4 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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:34:34+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:06:01+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-01-30 23:06:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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"
@@ -93,11 +93,11 @@ msgstr "Hozzáférések beállításainak mentése"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Mentés"
@@ -160,7 +160,7 @@ msgstr "Nincs ilyen lap."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Nincs ilyen felhasználó."
 
@@ -332,7 +332,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -422,7 +422,7 @@ msgstr ""
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s története"
@@ -597,8 +597,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: 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."
@@ -607,8 +607,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Nem érvényes becenév."
@@ -620,8 +620,8 @@ msgstr "Nem érvényes becenév."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "A honlap érvénytelen URL-cím."
@@ -630,8 +630,8 @@ msgstr "A honlap érvénytelen URL-cím."
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -647,8 +647,8 @@ msgstr "A teljes név túl hosszú (legfeljebb 255 karakter lehet)."
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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,8 +659,8 @@ msgstr[1] "A leírás túl hosszú (legfeljebb %d karakter lehet)."
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -672,8 +672,8 @@ msgstr "A hely túl hosszú (legfeljebb 255 karakter lehet)."
 #. 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:229
-#: actions/newgroup.php:176
+#: 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."
@@ -691,15 +691,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Az álnév nem egyezhet meg a becenévvel."
 
@@ -822,7 +822,7 @@ msgstr "Nincs jogosultságod."
 #: 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:153 actions/passwordsettings.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
@@ -907,8 +907,8 @@ msgstr "Kontó"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Becenév"
@@ -1495,7 +1495,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Avatar"
@@ -1792,7 +1792,7 @@ msgstr "Beszélgetés"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Hírek"
@@ -2389,24 +2389,24 @@ 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:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: 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:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Beállítások elmentve."
 
@@ -3219,7 +3219,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.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Beállítások elmentve."
 
@@ -3301,7 +3301,7 @@ msgid "Inbox for %s"
 msgstr "%s bejövő postafiókja"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: 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."
 
@@ -3722,7 +3722,7 @@ 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:199
+#: actions/newgroup.php:200
 #, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "Az álnév nem egyezhet meg a becenévvel."
@@ -3919,8 +3919,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "Nem támogatott adatformátum."
 
@@ -3942,34 +3942,36 @@ 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/othersettings.php:111
+#. 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:120
+#: actions/othersettings.php:122
 msgid "Shorten URLs with"
 msgstr ""
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:122
+#: actions/othersettings.php:124
 msgid "Automatic shortening service to use."
 msgstr ""
 
 #. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr ""
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: 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)."
@@ -4004,7 +4006,7 @@ msgstr "%1$s kimenő postafiókja - %2$d. oldal"
 msgid "Outbox for %s"
 msgstr "%s kimenő postafiókja"
 
-#: actions/outbox.php:116
+#: 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."
 
@@ -4281,7 +4283,7 @@ 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:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "Csatolmányok"
 
@@ -4407,7 +4409,6 @@ msgstr "Személyes profil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 #, 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"
@@ -4416,15 +4417,15 @@ msgstr "1-64 kisbetű vagy számjegy, nem lehet benne írásjel vagy szóköz"
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Honlap"
 
@@ -4461,8 +4462,8 @@ msgstr "Életrajz"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Helyszín"
@@ -5283,13 +5284,13 @@ msgstr "Szervezet"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statisztika"
@@ -5423,60 +5424,60 @@ 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:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Megjegyzés"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Álnevek"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "Csoport-tevékenységek"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "Tagok"
 
@@ -5484,26 +5485,26 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "Összes tag"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Létrehoztuk"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5513,7 +5514,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5532,7 +5533,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5542,30 +5543,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "Adminisztrátorok"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr ""
@@ -6481,7 +6482,7 @@ msgstr ""
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
@@ -6551,20 +6552,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6577,7 +6578,7 @@ 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:217
+#: 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."
@@ -6586,7 +6587,7 @@ 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:229
+#: 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."
@@ -6594,7 +6595,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr ""
 
@@ -6652,7 +6653,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6719,25 +6720,25 @@ 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:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -6751,14 +6752,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:765
+#: classes/Profile.php:771
 #, 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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6838,22 +6839,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr ""
 
@@ -7577,12 +7578,12 @@ 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:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "Szerző"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "Szolgáltató"
 
@@ -7965,26 +7966,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 #, 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:164
+#: lib/common.php:165
 #, 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "Menj a telepítőhöz."
 
@@ -8169,23 +8170,28 @@ msgstr "Menjünk"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, 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"
+
+#: 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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Jellemezd a csoportot vagy a témát"
 
-#: lib/groupeditform.php:162
+#: 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."
+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:174
+#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -8193,7 +8199,7 @@ msgstr ""
 "A csoport földrajzi elhelyezkedése, ha van ilyen, pl. \"Város, Megye, Ország"
 "\""
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:183
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8696,11 +8702,11 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:89
+#: 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:139
+#: 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."
@@ -8709,10 +8715,6 @@ msgstr ""
 "keveredj más felhasználókkal. Olyan üzenetet küldhetnek neked emberek, amit "
 "csak te láthatsz."
 
-#: lib/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "írta"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Nem sikerült az üzenetet feldolgozni."
@@ -8802,6 +8804,15 @@ 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:522
+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."
@@ -8989,7 +9000,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr ""
 
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index d552346f42..e8d10886ae 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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:34:37+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:06: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-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -88,11 +88,11 @@ msgstr "Salveguardar configurationes de accesso"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salveguardar"
@@ -155,7 +155,7 @@ msgstr "Pagina non existe."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Iste usator non existe."
 
@@ -333,7 +333,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -423,7 +423,7 @@ msgstr "Principal"
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "Chronologia de %s"
@@ -598,8 +598,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonymo ja in uso. Proba un altere."
@@ -608,8 +608,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Non un pseudonymo valide."
@@ -621,8 +621,8 @@ msgstr "Non un pseudonymo valide."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Le pagina personal non es un URL valide."
@@ -631,8 +631,8 @@ msgstr "Le pagina personal non es un URL valide."
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Le nomine complete es troppo longe (maximo 255 characteres)."
@@ -647,8 +647,8 @@ msgstr "Le nomine complete es troppo longe (maximo 255 characteres)."
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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,8 +659,8 @@ msgstr[1] "Description es troppo longe (maximo %d characteres)."
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Loco es troppo longe (maximo 255 characteres)."
@@ -671,8 +671,8 @@ msgstr "Loco es troppo longe (maximo 255 characteres)."
 #. 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:229
-#: actions/newgroup.php:176
+#: 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,15 +690,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Le alias non pote esser identic al pseudonymo."
 
@@ -819,7 +819,7 @@ msgstr "Indicio de requesta jam autorisate."
 #: 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:153 actions/passwordsettings.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
@@ -910,8 +910,8 @@ msgstr "Conto"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Pseudonymo"
@@ -1266,9 +1266,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Notices %1$s has favorited on %2$s"
-msgstr "Actualisationes de %1$s e su amicos in %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.
@@ -1306,9 +1306,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %1$s is a member of on %2$s"
-msgstr "Gruppos del quales %s es membro"
+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
@@ -1422,9 +1422,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "People %1$s has subscribed to on %2$s"
-msgstr "Personas qui seque %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
@@ -1483,7 +1483,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Avatar"
@@ -1783,7 +1783,7 @@ msgstr "Conversation"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Notas"
@@ -2375,24 +2375,24 @@ 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:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: 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:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Optiones salveguardate."
 
@@ -2925,9 +2925,8 @@ 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 "Impossibile salveguardar le configurationes del apparentia."
+msgstr "Impossibile actualisar le configurationes del apparentia."
 
 #. TRANS: Form text to confirm saved group design settings.
 #: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
@@ -3036,7 +3035,6 @@ msgstr "Actualisationes de membros de %1$s in %2$s!"
 
 #. TRANS: Title for first page of the groups list.
 #: actions/groups.php:62
-#, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "Gruppos"
@@ -3044,7 +3042,7 @@ msgstr "Gruppos"
 #. 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
+#, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
 msgstr "Gruppos, pagina %d"
@@ -3053,7 +3051,7 @@ msgstr "Gruppos, pagina %d"
 #. 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
+#, 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 "
@@ -3062,10 +3060,10 @@ msgid ""
 "%%%)!"
 msgstr ""
 "Le gruppos de %%%%site.name%%%% permitte trovar e parlar con personas que ha "
-"interesses similar al tues. Post haber unite se a un gruppo, tu pote inviar "
-"messages a tote le altere membros usante le syntaxe \"!groupname\". Tu non "
-"vide un gruppo que te place? Tenta [cercar un](%%%%action.groupsearch%%%%) o "
-"[crear le tue!](%%%%action.newgroup%%%%)"
+"interesses similar al tues. Post unir te a un gruppo, tu pote inviar "
+"messages a tote le altere membros usante le syntaxe \"!nominedelgruppo\". Tu "
+"non vide un gruppo que te place? Tenta [cercar un](%%%%action.groupsearch%%%"
+"%) 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
@@ -3096,7 +3094,7 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
 "action.newgroup%%) yourself."
@@ -3139,13 +3137,13 @@ msgstr "Configuration de messageria instantanee"
 #. 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
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can send and receive notices through Jabber/Google Talk [instant "
 "messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
 "Tu pote inviar e reciper notas per [messages instantanee](%%doc.im%%) de "
-"Jabber/GTalk. Configura tu adresse e parametros hic infra."
+"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.
 #: actions/imsettings.php:90
@@ -3159,19 +3157,18 @@ msgid "IM address"
 msgstr "Adresse de messageria instantanee"
 
 #: actions/imsettings.php:109
-#, fuzzy
 msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Adresse Jabber/GTalk actualmente confirmate."
+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
-#, 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 ""
-"Attende confirmation de iste adresse. Verifica tu conto Jabber/GTalk pro un "
+"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.
@@ -3180,14 +3177,14 @@ 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 ""
-"Un adresse Jabber o GTalk, como \"nomine@example.org\". Primo, assecura te "
-"de adder %s a tu lista de amicos in tu cliente de messageria instantanee o "
-"in GTalk."
+"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."
 
 #. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
@@ -3196,33 +3193,29 @@ msgstr "Preferentias de messageria instantanee"
 
 #. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-#, fuzzy
 msgid "Send me notices through Jabber/Google Talk."
-msgstr "Inviar me notas per Jabber/GTalk."
+msgstr "Inviar me notas per 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 "Publicar un nota quando mi stato de Jabber/GTalk cambia."
+msgstr "Publicar un nota quando mi stato de Jabber/Google Talk 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 ""
-"Inviar me responsas per Jabber/GTalk de personas al quales io non es "
+"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
-#, fuzzy
 msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "Publicar un MicroID pro mi adresse Jabber/GTalk."
+msgstr "Publicar un MicroID pro mi adresse Jabber/Google Talk."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Preferentias confirmate."
 
@@ -3233,15 +3226,13 @@ msgstr "Nulle ID de Jabber."
 
 #. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-#, fuzzy
 msgid "Cannot normalize that Jabber ID."
-msgstr "Non pote normalisar iste ID de Jabber"
+msgstr "Impossibile normalisar iste ID de Jabber."
 
 #. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-#, fuzzy
 msgid "Not a valid Jabber ID."
-msgstr "ID de Jabber non valide"
+msgstr "ID de Jabber non valide."
 
 #. TRANS: Message given saving Instant Messaging address that is already set.
 #: actions/imsettings.php:321
@@ -3305,7 +3296,7 @@ msgid "Inbox for %s"
 msgstr "Cassa de entrata de %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: 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 "
@@ -3404,9 +3395,8 @@ msgstr "Adresses 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 "Adresses de amicos a invitar (un per linea)"
+msgstr "Adresses de amicos a invitar (un per linea)."
 
 #. TRANS: Field label for a personal message to send to invitees.
 #: actions/invite.php:225
@@ -3755,7 +3745,7 @@ 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:199
+#: actions/newgroup.php:200
 msgid "Alias cannot be the same as nickname."
 msgstr "Le alias non pote esser identic al pseudonymo."
 
@@ -3964,8 +3954,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "Formato de datos non supportate."
 
@@ -3987,34 +3977,36 @@ 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/othersettings.php:111
+#. 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 gratuite)"
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:120
+#: actions/othersettings.php:122
 msgid "Shorten URLs with"
 msgstr "Accurtar URLs con"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:122
+#: 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:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "Vider apparentias de profilo"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: 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)."
@@ -4049,7 +4041,7 @@ msgstr "Cassa de exito de %1$s - pagina %2$d"
 msgid "Outbox for %s"
 msgstr "Cassa de exito pro %s"
 
-#: actions/outbox.php:116
+#: 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."
@@ -4315,7 +4307,7 @@ 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:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "Annexos"
 
@@ -4433,11 +4425,10 @@ msgstr ""
 #. TRANS: Profile settings form legend.
 #: actions/profilesettings.php:98
 msgid "Profile information"
-msgstr "Information de profilo"
+msgstr "Informationes del profilo"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 minusculas o numeros, sin punctuation o spatios."
 
@@ -4445,15 +4436,15 @@ msgstr "1-64 minusculas o numeros, sin punctuation o spatios."
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Pagina personal"
 
@@ -4487,8 +4478,8 @@ msgstr "Bio"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Loco"
@@ -5337,13 +5328,13 @@ msgstr "Organisation"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statisticas"
@@ -5487,60 +5478,60 @@ 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:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Nota"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Aliases"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "Actiones del gruppo"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "Membros"
 
@@ -5548,25 +5539,25 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "Tote le membros"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Create"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Membros"
@@ -5575,7 +5566,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5593,7 +5584,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5607,30 +5598,30 @@ msgstr ""
 "lor vita e interesses. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "Administratores"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Message de %1$s in %2$s"
@@ -6588,7 +6579,7 @@ msgstr ""
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Actualisationes de %1$s in %2$s!"
@@ -6670,20 +6661,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6700,7 +6691,7 @@ 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:217
+#: 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."
@@ -6709,7 +6700,7 @@ 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:229
+#: 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."
@@ -6717,7 +6708,7 @@ 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:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Nomine de file invalide."
 
@@ -6775,7 +6766,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr "Nulle nomine de base de datos o DSN trovate."
 
@@ -6846,25 +6837,25 @@ msgid "Problem saving notice."
 msgstr "Problema salveguardar nota."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6878,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:765
+#: classes/Profile.php:771
 #, 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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6967,22 +6958,22 @@ 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:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Non poteva salveguardar le informationes del gruppo local."
 
@@ -7385,7 +7376,7 @@ msgstr "Le usator es ja membro de iste gruppo."
 #: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
-msgstr ""
+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
@@ -7719,12 +7710,12 @@ msgid "Do not use this method!"
 msgstr "Non usa iste methodo!"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "Autor"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "Providitor"
 
@@ -8146,24 +8137,24 @@ msgstr ""
 "tracking - non ancora implementate.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 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:164
+#: lib/common.php:165
 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "Ir al installator."
 
@@ -8343,28 +8334,33 @@ msgstr "Ir"
 msgid "Grant this user the \"%s\" role"
 msgstr "Conceder le rolo \"%s\" a iste usator"
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Describe le gruppo o topico"
 
-#: lib/groupeditform.php:162
-#, 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."
+#: 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 le gruppo o topico in %d character o minus."
 msgstr[1] "Describe le gruppo o topico in %d characteres o minus."
 
-#: lib/groupeditform.php:174
+#: 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:182
+#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8901,11 +8897,11 @@ msgstr ""
 "\n"
 "P.S. Tu pote disactivar iste notificationes electronic hic: %8$s\n"
 
-#: lib/mailbox.php:89
+#: 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:139
+#: 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."
@@ -8914,10 +8910,6 @@ msgstr ""
 "altere usatores in conversation. Altere personas pote inviar te messages que "
 "solmente tu pote leger."
 
-#: lib/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "via"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Non comprendeva le syntaxe del message."
@@ -9009,6 +9001,15 @@ msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Inviar"
 
+#: lib/messagelist.php:77
+#, fuzzy
+msgid "Messages"
+msgstr "Message"
+
+#: lib/messagelistitem.php:123 lib/noticelist.php:522
+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."
@@ -9193,7 +9194,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Incognite"
 
@@ -9387,12 +9388,12 @@ msgstr "Invitar amicos e collegas a accompaniar te in %s"
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
-msgstr "Nube de etiquettas de personas como auto-etiquettate"
+msgstr "Etiquettario de personas como auto-etiquettate"
 
 #: lib/subscriberspeopletagcloudsection.php:48
 #: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
-msgstr "Nube de etiquetta de personas como etiquettate"
+msgstr "Etiquettario de personas como etiquettate"
 
 #: lib/tagcloudsection.php:56
 msgid "None"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index c84a1816d3..22b17fa0fc 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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:34:43+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:06:06+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 (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -92,11 +92,11 @@ msgstr "Salva impostazioni di accesso"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salva"
@@ -159,7 +159,7 @@ msgstr "Pagina inesistente."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Utente inesistente."
 
@@ -335,7 +335,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -425,7 +425,7 @@ msgstr ""
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "Attività di %s"
@@ -602,8 +602,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Soprannome già in uso. Prova con un altro."
@@ -612,8 +612,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Non è un soprannome valido."
@@ -625,8 +625,8 @@ msgstr "Non è un soprannome valido."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "L'indirizzo della pagina web non è valido."
@@ -635,8 +635,8 @@ msgstr "L'indirizzo della pagina web non è valido."
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -652,8 +652,8 @@ msgstr "Nome troppo lungo (max 255 caratteri)."
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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,8 +664,8 @@ msgstr[1] "La descrizione è troppo lunga (max %d caratteri)."
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -677,8 +677,8 @@ msgstr "Ubicazione troppo lunga (max 255 caratteri)."
 #. 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:229
-#: actions/newgroup.php:176
+#: 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."
@@ -696,15 +696,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "L'alias non può essere lo stesso del soprannome."
 
@@ -828,7 +828,7 @@ msgstr "Autorizzazione non presente."
 #: 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:153 actions/passwordsettings.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
@@ -921,8 +921,8 @@ msgstr "Account"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Soprannome"
@@ -1510,7 +1510,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Immagine"
@@ -1811,7 +1811,7 @@ msgstr "Conversazione"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Messaggi"
@@ -2414,24 +2414,24 @@ 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:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: 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:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Opzioni salvate."
 
@@ -3267,7 +3267,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.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Preferenze salvate."
 
@@ -3351,7 +3351,7 @@ msgid "Inbox for %s"
 msgstr "Casella posta in arrivo di %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: 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 "
@@ -3806,7 +3806,7 @@ 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:199
+#: actions/newgroup.php:200
 #, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "L'alias non può essere lo stesso del soprannome."
@@ -4013,8 +4013,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "Non è un formato di dati supportato."
 
@@ -4036,34 +4036,36 @@ 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/othersettings.php:111
+#. 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:120
+#: 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:122
+#: actions/othersettings.php:124
 msgid "Automatic shortening service to use."
 msgstr "Servizio di autoriduzione da usare"
 
 #. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "Visualizza aspetto"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: 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)."
@@ -4098,7 +4100,7 @@ msgstr "Casella posta inviata di %s - pagina %2$d"
 msgid "Outbox for %s"
 msgstr "Casella posta inviata di %s"
 
-#: actions/outbox.php:116
+#: 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 "
@@ -4377,7 +4379,7 @@ 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:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "Allegati"
 
@@ -4505,7 +4507,6 @@ msgstr "Informazioni sul profilo"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4515,15 +4516,15 @@ msgstr ""
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Pagina web"
 
@@ -4558,8 +4559,8 @@ msgstr "Biografia"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Ubicazione"
@@ -5420,13 +5421,13 @@ msgstr "Organizzazione"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistiche"
@@ -5568,60 +5569,60 @@ 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:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Nota"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Alias"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "Azioni dei gruppi"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "Membri"
 
@@ -5629,26 +5630,26 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "Tutti i membri"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Creato"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5658,7 +5659,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5677,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5690,30 +5691,30 @@ msgstr ""
 "[StatusNet](http://status.net/)."
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "Amministratori"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Messaggio da %1$s su %2$s"
@@ -6676,7 +6677,7 @@ msgstr "Prova a [cercare dei gruppi](%%action.groupsearch%%) e iscriviti."
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Messaggi da %1$s su %2$s!"
@@ -6758,20 +6759,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6788,7 +6789,7 @@ 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:217
+#: 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."
@@ -6799,7 +6800,7 @@ 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:229
+#: 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."
@@ -6809,7 +6810,7 @@ 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:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Nome file non valido."
 
@@ -6867,7 +6868,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr "Non è stato trovato un nome di database o DNS."
 
@@ -6938,26 +6939,26 @@ 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:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6971,7 +6972,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:765
+#: classes/Profile.php:771
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -6979,7 +6980,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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7061,22 +7062,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Impossibile salvare le informazioni del gruppo locale."
 
@@ -7815,12 +7816,12 @@ msgid "Do not use this method!"
 msgstr "Non eliminare il messaggio"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "Autore"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "Provider"
 
@@ -8247,20 +8248,20 @@ msgstr ""
 "tracking - non ancora implementato\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 #, 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:164
+#: lib/common.php:165
 #, 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:167
+#: lib/common.php:168
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 "Potrebbe essere necessario lanciare il programma d'installazione per "
@@ -8268,7 +8269,7 @@ 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "Vai al programma d'installazione."
 
@@ -8456,29 +8457,35 @@ msgstr "Vai"
 msgid "Grant this user the \"%s\" role"
 msgstr "Concedi a questo utente il ruolo \"%s\""
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, 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"
+
+#: 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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Descrivi il gruppo o l'argomento"
 
-#: lib/groupeditform.php:162
+#: 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."
+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:174
+#: 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:182
+#: lib/groupeditform.php:183
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9017,11 +9024,11 @@ msgstr ""
 "\n"
 "P.S: puoi disabilitare le notifiche via email qui: %8$s\n"
 
-#: lib/mailbox.php:89
+#: 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:139
+#: 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."
@@ -9030,10 +9037,6 @@ msgstr ""
 "iniziare una conversazione con altri utenti. Altre persone possono mandare "
 "messaggi riservati solamente a te."
 
-#: lib/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "via"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Impossibile analizzare il messaggio."
@@ -9126,6 +9129,15 @@ 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:522
+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."
@@ -9317,7 +9329,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Sconosciuto"
 
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index cbe28f2797..68a8bd19d5 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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:34:47+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:06:08+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 (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -94,11 +94,11 @@ msgstr "アクセス設定の保存"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "保存"
@@ -161,7 +161,7 @@ msgstr "そのようなページはありません。"
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "そのようなユーザはいません。"
 
@@ -338,7 +338,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -425,7 +425,7 @@ msgstr ""
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s のタイムライン"
@@ -601,8 +601,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "そのニックネームは既に使用されています。他のものを試してみて下さい。"
@@ -611,8 +611,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "有効なニックネームではありません。"
@@ -624,8 +624,8 @@ msgstr "有効なニックネームではありません。"
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "ホームページのURLが不適切です。"
@@ -634,8 +634,8 @@ msgstr "ホームページのURLが不適切です。"
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -651,8 +651,8 @@ msgstr "フルネームが長すぎます。（255字まで）"
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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,8 +662,8 @@ msgstr[0] "記述が長すぎます。（最長%d字）"
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -675,8 +675,8 @@ msgstr "場所が長すぎます。（255字まで）"
 #. 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:229
-#: actions/newgroup.php:176
+#: 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,15 +693,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "別名はニックネームと同じではいけません。"
 
@@ -826,7 +826,7 @@ msgstr "認証されていません。"
 #: 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:153 actions/passwordsettings.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
@@ -912,8 +912,8 @@ msgstr "アカウント"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "ニックネーム"
@@ -1500,7 +1500,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "アバター"
@@ -1802,7 +1802,7 @@ msgstr "会話"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "つぶやき"
@@ -2408,24 +2408,24 @@ msgstr "このフォームを使ってグループを編集します。"
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: actions/editgroup.php:281 classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "別名を作成できません。"
 
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "オプションが保存されました。"
 
@@ -3267,7 +3267,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "私のJabber/GTalkアドレスのためにMicroIDを発行してください。"
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "設定が保存されました。"
 
@@ -3351,7 +3351,7 @@ msgid "Inbox for %s"
 msgstr "%s の受信箱"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "これはあなたの受信箱です、やってきたプライベートメッセージをリストします。"
@@ -3800,7 +3800,7 @@ msgid "Use this form to create a new group."
 msgstr "このフォームを使って新しいグループを作成します。"
 
 #. TRANS: Group create form validation error.
-#: actions/newgroup.php:199
+#: actions/newgroup.php:200
 #, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "別名はニックネームと同じではいけません。"
@@ -4008,8 +4008,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "サポートされていないデータ形式。"
 
@@ -4031,34 +4031,36 @@ 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/othersettings.php:111
+#. 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:120
+#: actions/othersettings.php:122
 msgid "Shorten URLs with"
 msgstr "URLを短くします"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:122
+#: actions/othersettings.php:124
 msgid "Automatic shortening service to use."
 msgstr "使用する自動短縮サービス。"
 
 #. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "プロファイルデザインを表示"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: actions/othersettings.php:164
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL 短縮サービスが長すぎます。（最大50字）"
@@ -4093,7 +4095,7 @@ msgstr "%1$s の送信箱 - ページ %2$d"
 msgid "Outbox for %s"
 msgstr "%s の送信箱"
 
-#: actions/outbox.php:116
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "これはあなたの送信箱です、あなたが送ったプライベート・メッセージをリストしま"
@@ -4372,7 +4374,7 @@ msgstr "ロケールへのディレクトリパス"
 
 #. TRANS: Fieldset legens in Paths admin panel.
 #. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "添付"
 
@@ -4499,7 +4501,6 @@ msgstr "プロファイル情報"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く"
@@ -4508,15 +4509,15 @@ msgstr "1-64文字の、小文字アルファベットか数字で、スペー
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "ホームページ"
 
@@ -4550,8 +4551,8 @@ msgstr "自己紹介"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "場所"
@@ -5412,13 +5413,13 @@ msgstr "組織"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "統計データ"
@@ -5562,60 +5563,60 @@ msgid "%1$s group, page %2$d"
 msgstr "%1$s グループ、ページ %2$d"
 
 #. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "ノート"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "別名"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "グループアクション"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "メンバー"
 
@@ -5623,26 +5624,26 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "全てのメンバー"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "作成日"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5652,7 +5653,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5670,7 +5671,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5684,30 +5685,30 @@ msgstr ""
 "する短いメッセージを共有します。"
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "管理者"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "%2$s 上の %1$s からのメッセージ"
@@ -6682,7 +6683,7 @@ msgstr "[グループを探して](%%action.groupsearch%%)それに加入して
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "%1$s から %2$s  上の更新をしました!"
@@ -6754,20 +6755,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6782,7 +6783,7 @@ 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:217
+#: 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."
@@ -6791,7 +6792,7 @@ 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:229
+#: 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."
@@ -6799,7 +6800,7 @@ msgstr[0] ""
 "これほど大きいファイルはあなたの%dバイトの毎月の割当てを超えているでしょう。"
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 #, fuzzy
 msgid "Invalid filename."
 msgstr "不正なサイズ。"
@@ -6859,7 +6860,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6929,25 +6930,25 @@ msgid "Problem saving notice."
 msgstr "つぶやきを保存する際に問題が発生しました。"
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -6961,14 +6962,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:765
+#: classes/Profile.php:771
 #, 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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7049,22 +7050,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 #, fuzzy
 msgid "Could not save local group info."
 msgstr "フォローを保存できません。"
@@ -7813,12 +7814,12 @@ msgid "Do not use this method!"
 msgstr "このつぶやきを削除できません。"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "作者"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "プロバイダ"
 
@@ -8202,20 +8203,20 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 #, 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:164
+#: lib/common.php:165
 #, 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:167
+#: lib/common.php:168
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 "あなたは、これを修理するためにインストーラを動かしたがっているかもしれませ"
@@ -8223,7 +8224,7 @@ 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "インストーラへ。"
 
@@ -8411,28 +8412,33 @@ msgstr "移動"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "グループやトピックを記述"
 
-#: lib/groupeditform.php:162
+#: 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."
+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:174
+#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "グループの場所, 例えば \"都市, 都道府県 (または 地域), 国\""
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:183
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8935,11 +8941,11 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:89
+#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "ユーザだけがかれら自身のメールボックスを読むことができます。"
 
-#: lib/mailbox.php:139
+#: 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."
@@ -8948,10 +8954,6 @@ msgstr ""
 "に引き込むプライベートメッセージを送ることができます。人々はあなただけへの"
 "メッセージを送ることができます。"
 
-#: lib/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "from"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "メッセージを分析できませんでした。"
@@ -9044,6 +9046,15 @@ msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "投稿"
 
+#: lib/messagelist.php:77
+#, fuzzy
+msgid "Messages"
+msgstr "メッセージ"
+
+#: lib/messagelistitem.php:123 lib/noticelist.php:522
+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."
@@ -9238,7 +9249,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "不明"
 
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
index abe36af0f7..b567fda9dd 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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:34:49+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:06: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"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -88,11 +88,11 @@ msgstr "შეინახე შესვლის პარამეტრე
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "შეინახე"
@@ -155,7 +155,7 @@ msgstr "ასეთი გვერდი არ არსებობს."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "ასეთი მომხმარებელი არ არსებობს."
 
@@ -331,7 +331,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -418,7 +418,7 @@ msgstr ""
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s-ის ნაკადი"
@@ -592,8 +592,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "მეტსახელი უკვე გამოყენებულია. სცადე სხვა."
@@ -602,8 +602,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "მეტსახელი არასწორია."
@@ -615,8 +615,8 @@ msgstr "მეტსახელი არასწორია."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "სასტარტო გვერდი არასწორი URL-ია."
@@ -625,8 +625,8 @@ msgstr "სასტარტო გვერდი არასწორი URL
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -642,8 +642,8 @@ msgstr "სრული სახელი ძალიან გრძელი
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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)."
@@ -653,8 +653,8 @@ msgstr[0] "აღწერა ძალიან გრძელია (არ
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -666,8 +666,8 @@ 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.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:176
+#: 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,15 +684,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -815,7 +815,7 @@ msgstr "თქვენ არ ხართ ავტორიზირებუ
 #: 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:153 actions/passwordsettings.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
@@ -901,8 +901,8 @@ msgstr "ანგარიში"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "მეტსახელი"
@@ -1486,7 +1486,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "ავატარი"
@@ -1784,7 +1784,7 @@ msgstr "საუბარი"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "შეტყობინებები"
@@ -2386,24 +2386,24 @@ msgstr "ჯგუფის რედაქტირებისათვის 
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: actions/editgroup.php:281 classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr ""
 
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "პარამეტრები შენახულია."
 
@@ -3234,7 +3234,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "გამოაქვეყნე  MicroID ჩემი Jabber/GTalk მისამართისთვის."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "პარამეტრები შენახულია."
 
@@ -3318,7 +3318,7 @@ msgid "Inbox for %s"
 msgstr "%s-ის შემომავალი ფოსტა"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "ეს არის თქვენი საფოსტო ყუთი, რომელშიც ჩამოთვლილია შემომავალი პირადი წერილები."
@@ -3768,7 +3768,7 @@ msgid "Use this form to create a new group."
 msgstr "ახალი ჯგუფის შესაქმნელად გამოიყენეთ ეს ფორმა."
 
 #. TRANS: Group create form validation error.
-#: actions/newgroup.php:199
+#: actions/newgroup.php:200
 msgid "Alias cannot be the same as nickname."
 msgstr ""
 
@@ -3970,8 +3970,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "მონაცემთა ფორმატი მხარდაჭერილი არ არის."
 
@@ -3993,34 +3993,36 @@ 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/othersettings.php:111
+#. 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:120
+#: actions/othersettings.php:122
 msgid "Shorten URLs with"
 msgstr "შეამოკლე URL–ები შემდეგით"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:122
+#: actions/othersettings.php:124
 msgid "Automatic shortening service to use."
 msgstr "გამოსაყენებელი შემოკლების ავტომატური სერვისი."
 
 #. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "პროფილის დიზაინების ნახვა"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: actions/othersettings.php:164
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL–ს შემოკლების სერვისი ძალიან გრძელია (მაქს. 50 სიმბოლო)."
@@ -4055,7 +4057,7 @@ msgstr "%1$s-ის გამავალი ფოსტა - გვერდ
 msgid "Outbox for %s"
 msgstr "%s-ის გამავალი ფოსტა"
 
-#: actions/outbox.php:116
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "ეს არის თქვენი გამავალი ფოსტა, რომელშიც ჩამოთვლილია პირადი შეტყობინებები "
@@ -4330,7 +4332,7 @@ msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
 #. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "მიმაგრებები"
 
@@ -4457,7 +4459,6 @@ msgstr "ინფორმაცია პროფილზე"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1–64 პატარა ასოები ან ციფრები. პუნქტუაციები ან სივრცეები დაუშვებელია"
@@ -4466,15 +4467,15 @@ msgstr "1–64 პატარა ასოები ან ციფრებ
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "ვებ. გვერსი"
 
@@ -4508,8 +4509,8 @@ msgstr "ბიოგრაფია"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "მდებარეობა"
@@ -5366,13 +5367,13 @@ msgstr "ორგანიზაცია"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "სტატისტიკა"
@@ -5512,60 +5513,60 @@ msgid "%1$s group, page %2$d"
 msgstr ""
 
 #. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "შენიშვნა"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr ""
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:365
+#: actions/showgroup.php:377
 #, php-format
 msgid "FOAF for %s group"
 msgstr ""
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "წევრები"
 
@@ -5573,26 +5574,26 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr ""
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "შექმნილია"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5602,7 +5603,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5615,7 +5616,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5625,30 +5626,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr ""
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr ""
@@ -6602,7 +6603,7 @@ msgstr "სცადეთ [ჯგუფების მოძებნა](%%ac
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "%1$s-ს განახლებები %2$s-ზე!"
@@ -6684,20 +6685,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6711,7 +6712,7 @@ 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:217
+#: 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."
@@ -6720,7 +6721,7 @@ 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:229
+#: 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."
@@ -6729,7 +6730,7 @@ msgstr[0] ""
 "ბაიტს."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "ფაილის არასწორი სახელი."
 
@@ -6787,7 +6788,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr "ბაზის სახელი ან DSN ვერსად ვერ მოიძებნა."
 
@@ -6858,26 +6859,26 @@ msgid "Problem saving notice."
 msgstr "პრობლემა შეტყობინების შენახვისას."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6891,7 +6892,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:765
+#: classes/Profile.php:771
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -6899,7 +6900,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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6981,22 +6982,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "ჯგუფის ლოკალური ინფორმაციის დამახსოვრება ვერ მოხერხდა."
 
@@ -7730,12 +7731,12 @@ msgid "Do not use this method!"
 msgstr "არ წაშალო ეს შეტყობინება"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "ავტორი"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "მომწოდებელი"
 
@@ -8119,26 +8120,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 #, 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:164
+#: lib/common.php:165
 #, 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "გადადი ამ ინსტალატორზე."
 
@@ -8325,22 +8326,27 @@ msgstr "წინ"
 msgid "Grant this user the \"%s\" role"
 msgstr "მიანიჭე ამ მომხმარებელს \"%s\" როლი"
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "აღწერე ჯგუფი ან თემა"
 
-#: lib/groupeditform.php:162
+#: 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."
+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:174
+#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -8348,7 +8354,7 @@ msgstr ""
 "ჯგუფის მდებარეობა არსებობის შემთხვევაში. მაგ.: \"ქალაქი, ქვეყანა (ან რეგიონი)"
 "\""
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:183
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8859,11 +8865,11 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:89
+#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "მხოლოდ მომხმარებელს შეუძლია თავისი ფოსტის წაკითხვა."
 
-#: lib/mailbox.php:139
+#: 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."
@@ -8872,10 +8878,6 @@ msgstr ""
 "შეტყობინებები, რომ ჩაერთოთ საუბრებში სხვა ხალხთან. ხალხს შეუძლია "
 "გამოგიგზავნონ შეტყობინებები მხოლოდ თქვენ დასანახად."
 
-#: lib/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "ვისგან"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "შეტყობინების გაცრა (გა-parse-ვა) ვერ მოხერხდა."
@@ -8967,6 +8969,15 @@ msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "გაგზავნა"
 
+#: lib/messagelist.php:77
+#, fuzzy
+msgid "Messages"
+msgstr "შეტყობინება"
+
+#: lib/messagelistitem.php:123 lib/noticelist.php:522
+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."
@@ -9155,7 +9166,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "უცნობი"
 
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 1b6fffbcd5..9c65877cfc 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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:34:53+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:06:13+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 (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -90,11 +90,11 @@ msgstr "접근 설정을 저장"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "저장"
@@ -157,7 +157,7 @@ msgstr "해당하는 페이지 없음"
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "해당하는 이용자 없음"
 
@@ -327,7 +327,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -414,7 +414,7 @@ msgstr ""
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s 타임라인"
@@ -589,8 +589,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십시오."
@@ -599,8 +599,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "유효한 별명이 아닙니다"
@@ -612,8 +612,8 @@ msgstr "유효한 별명이 아닙니다"
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "홈페이지 주소형식이 올바르지 않습니다."
@@ -622,8 +622,8 @@ msgstr "홈페이지 주소형식이 올바르지 않습니다."
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -639,8 +639,8 @@ msgstr "실명이 너무 깁니다. (최대 255글자)"
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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)."
@@ -650,8 +650,8 @@ msgstr[0] "설명이 너무 깁니다. (최대 %d 글자)"
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -663,8 +663,8 @@ msgstr "위치가 너무 깁니다. (최대 255글자)"
 #. 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:229
-#: actions/newgroup.php:176
+#: 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."
@@ -681,15 +681,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -813,7 +813,7 @@ msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 #: 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:153 actions/passwordsettings.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
@@ -905,8 +905,8 @@ msgstr "계정"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "별명"
@@ -1490,7 +1490,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "아바타"
@@ -1790,7 +1790,7 @@ msgstr "대화"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "통지"
@@ -2389,24 +2389,24 @@ msgstr "다음 양식을 이용해 그룹을 편집하십시오."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: actions/editgroup.php:281 classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "관심소식을 생성할 수 없습니다."
 
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "옵션을 저장했습니다."
 
@@ -3225,7 +3225,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Jabber/GTalk 계정을 위한 MicroID의 생성"
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "설정이 저장되었습니다."
 
@@ -3309,7 +3309,7 @@ msgid "Inbox for %s"
 msgstr "%s의 받은쪽지함"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "당신의 받은 쪽지함입니다. 당신이 받은 비밀 메시지가 있습니다."
 
@@ -3751,7 +3751,7 @@ msgid "Use this form to create a new group."
 msgstr "새 그룹을 만들기 위해 이 양식을 사용하세요."
 
 #. TRANS: Group create form validation error.
-#: actions/newgroup.php:199
+#: actions/newgroup.php:200
 msgid "Alias cannot be the same as nickname."
 msgstr ""
 
@@ -3953,8 +3953,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "지원하는 형식의 데이터가 아닙니다."
 
@@ -3976,34 +3976,36 @@ 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/othersettings.php:111
+#. 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:120
+#: actions/othersettings.php:122
 msgid "Shorten URLs with"
 msgstr "URL 줄이기 기능"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:122
+#: actions/othersettings.php:124
 msgid "Automatic shortening service to use."
 msgstr "사용할 URL 자동 줄이기 서비스."
 
 #. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "프로필 디자인 보기"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: actions/othersettings.php:164
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL 줄이기 서비스 너무 깁니다. (최대 50글자)"
@@ -4040,7 +4042,7 @@ msgstr "%s 및 친구들, %d 페이지"
 msgid "Outbox for %s"
 msgstr "%s의 보낸쪽지함"
 
-#: actions/outbox.php:116
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "당신의 보낸 쪽지함입니다. 이곳엔 당신이 보냈던 비밀 쪽지가 있습니다."
 
@@ -4313,7 +4315,7 @@ msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
 #. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "첨부파일"
 
@@ -4437,7 +4439,6 @@ msgstr "프로필 정보"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다."
@@ -4446,15 +4447,15 @@ msgstr "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "홈페이지"
 
@@ -4488,8 +4489,8 @@ msgstr "자기소개"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "위치"
@@ -5327,13 +5328,13 @@ msgstr "기관 이름이 필요합니다."
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "통계"
@@ -5469,60 +5470,60 @@ msgid "%1$s group, page %2$d"
 msgstr "그룹, %d페이지"
 
 #. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "설명"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr ""
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "그룹 행동"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "회원"
 
@@ -5530,26 +5531,26 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "모든 회원"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "생성됨"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5559,7 +5560,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5572,7 +5573,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:486
+#: actions/showgroup.php:498
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5584,31 +5585,31 @@ msgstr ""
 "Micro-blogging)의 사용자 그룹입니다. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 #, fuzzy
 msgid "Admins"
 msgstr "관리자"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "%1$s에서 %2$s까지 메시지"
@@ -6554,7 +6555,7 @@ msgstr ""
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "%2$s에 있는 %1$s의 업데이트!"
@@ -6635,20 +6636,20 @@ msgid "%1$s marked notice %2$s as a favorite."
 msgstr "누군가 내 글을 좋아하는 게시글로 추가했을 때, 메일을 보냅니다."
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6660,7 +6661,7 @@ 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:217
+#: 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."
@@ -6668,14 +6669,14 @@ 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:229
+#: 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:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 #, fuzzy
 msgid "Invalid filename."
 msgstr "옳지 않은 크기"
@@ -6736,7 +6737,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6810,26 +6811,26 @@ msgid "Problem saving notice."
 msgstr "통지를 저장하는데 문제가 발생했습니다."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6843,14 +6844,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:765
+#: classes/Profile.php:771
 #, 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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6932,22 +6933,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "새 그룹을 만들 수 없습니다."
 
@@ -7685,12 +7686,12 @@ msgid "Do not use this method!"
 msgstr "이 통지를 지울 수 없습니다."
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "작성자"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "미리보기"
 
@@ -8074,26 +8075,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 #, 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:164
+#: lib/common.php:165
 #, 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "이 사이트에 로그인"
 
@@ -8281,28 +8282,33 @@ msgstr "이동"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "응용프로그램 삭제"
 
-#: lib/groupeditform.php:162
+#: 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."
+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:174
+#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "그룹의 위치, \"시/군/구, 도, 국가\""
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8738,20 +8744,16 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:89
+#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "오직 해당 사용자만 자신의 메일박스를 열람할 수 있습니다."
 
-#: lib/mailbox.php:139
+#: 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/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "방법"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "메시지를 분리할 수 없습니다."
@@ -8841,6 +8843,15 @@ msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "보내기"
 
+#: lib/messagelist.php:77
+#, fuzzy
+msgid "Messages"
+msgstr "메시지"
+
+#: lib/messagelistitem.php:123 lib/noticelist.php:522
+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."
@@ -9030,7 +9041,7 @@ 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:121
+#: lib/plugin.php:126
 #, fuzzy
 msgid "Unknown"
 msgstr "알려지지 않은 행동"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 366cfd6d52..54fd422177 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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:34:58+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:06: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-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -91,11 +91,11 @@ msgstr "Зачувај нагодувања на пристап"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Зачувај"
@@ -158,7 +158,7 @@ msgstr "Нема таква страница."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Нема таков корисник."
 
@@ -335,7 +335,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -425,7 +425,7 @@ msgstr "Главна"
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "Историја на %s"
@@ -602,8 +602,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Тој прекар е во употреба. Одберете друг."
@@ -612,8 +612,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Неправилен прекар."
@@ -625,8 +625,8 @@ msgstr "Неправилен прекар."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Главната страница не е важечка URL-адреса."
@@ -635,8 +635,8 @@ msgstr "Главната страница не е важечка URL-адрес
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Полното име е предолго (највеќе 255 знаци)."
@@ -651,8 +651,8 @@ msgstr "Полното име е предолго (највеќе 255 знаци
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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,8 +663,8 @@ msgstr[1] "Описот е предолг (дозволено е највеќе
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Местоположбата е предолга (највеќе 255 знаци)."
@@ -675,8 +675,8 @@ msgstr "Местоположбата е предолга (највеќе 255 з
 #. 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:229
-#: actions/newgroup.php:176
+#: 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,15 +694,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Алијасот не може да биде ист како прекарот."
 
@@ -823,7 +823,7 @@ msgstr "Жетонот за барање е веќе овластен."
 #: 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:153 actions/passwordsettings.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
@@ -913,8 +913,8 @@ msgstr "Сметка"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Прекар"
@@ -1268,9 +1268,9 @@ 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
+#, php-format
 msgid "Notices %1$s has favorited on %2$s"
-msgstr "Подновувања од %1$s и пријатели на %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.
@@ -1308,9 +1308,9 @@ 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
+#, 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.
 #: actions/atompubmembershipfeed.php:219
@@ -1424,9 +1424,9 @@ 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
+#, 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.
 #: actions/atompubsubscriptionfeed.php:248
@@ -1485,7 +1485,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Аватар"
@@ -1786,7 +1786,7 @@ msgstr "Разговор"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Забелешки"
@@ -2375,24 +2375,24 @@ msgstr "ОБразецов служи за уредување на групат
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: actions/editgroup.php:281 classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "Не можеше да се создадат алијаси."
 
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Нагодувањата се зачувани."
 
@@ -2930,9 +2930,8 @@ 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 "Не можам да ги зачувам Вашите нагодувања за изглед."
+msgstr "Не можам да ги подновам Вашите нагодувања за изглед."
 
 #. TRANS: Form text to confirm saved group design settings.
 #: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
@@ -3041,7 +3040,6 @@ msgstr "Подновувања од членови на %1$s на %2$s!"
 
 #. TRANS: Title for first page of the groups list.
 #: actions/groups.php:62
-#, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "Групи"
@@ -3049,16 +3047,16 @@ 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
+#, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
-msgstr "Групи, стр. %d"
+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
+#, 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 "
@@ -3067,11 +3065,11 @@ 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.
 #: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
@@ -3102,7 +3100,7 @@ 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
+#, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
 "action.newgroup%%) yourself."
@@ -3145,13 +3143,13 @@ msgstr "Нагодувања за IM"
 #. 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
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can send and receive notices through Jabber/Google Talk [instant "
 "messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
-"Можете да примате и праќате забелешки преку Jabber/GTalk [брзи пораки](%%doc."
-"im%%). Подолу "
+"Можете да праќате и примате забелешки преку [непосредни пораки](%%doc.im%%) "
+"на Jabber/Google Talk . Подолу ставете адреса и наместете ги нагодувањата."
 
 #. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:90
@@ -3165,21 +3163,20 @@ msgid "IM address"
 msgstr "IM адреса"
 
 #: actions/imsettings.php:109
-#, fuzzy
 msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Моментално потврдена Jabber/GTalk адреса."
+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
-#, 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/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.
@@ -3187,13 +3184,14 @@ 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 адреса како „KorisnickoIme@example.org“. Но прво додајте го "
-"%s во Вашиот контактен список во Вашиот IM клиент или GTalk."
+"Адреса на Jabber или Google Talk, како на пр. „KorisnickoIme@example.org“. "
+"Но прво додајте го/ја %s во Вашиот контактен список на Вашиот клиент за НП "
+"или Google Talk."
 
 #. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
@@ -3202,32 +3200,30 @@ 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 од луѓе на кои не сум претплатен."
+"Испраќај ми одговори преку 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 "Објави MicroID за мојата адреса на Jabber/GTalk."
+msgstr "Објави MicroID за мојата адреса на Jabber/Google Talk."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Нагодувањата се зачувани."
 
@@ -3238,15 +3234,13 @@ msgstr "Нема JabberID."
 
 #. TRANS: Message given saving Instant Messaging address that cannot be normalised.
 #: actions/imsettings.php:312
-#, fuzzy
 msgid "Cannot normalize that Jabber ID."
-msgstr "Ова JabberID не може да се нормализира."
+msgstr "Не можам да го нормализирам овој ID за Jabber."
 
 #. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-#, fuzzy
 msgid "Not a valid Jabber ID."
-msgstr "Неправилен JabberID"
+msgstr "Ова не е важечки ID за Jabber."
 
 #. TRANS: Message given saving Instant Messaging address that is already set.
 #: actions/imsettings.php:321
@@ -3310,7 +3304,7 @@ msgid "Inbox for %s"
 msgstr "Приемно сандаче за %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "Ова е Вашето приемно сандаче, кадешто се наведени Вашите добиени приватни "
@@ -3409,9 +3403,8 @@ 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 "Адреси на пријателите што ги каните (по една во секој ред)"
+msgstr "Адреси на пријателите што ги каните (по една во секој ред)."
 
 #. TRANS: Field label for a personal message to send to invitees.
 #: actions/invite.php:225
@@ -3762,7 +3755,7 @@ msgid "Use this form to create a new group."
 msgstr "Овој образец служи за создавање нова група."
 
 #. TRANS: Group create form validation error.
-#: actions/newgroup.php:199
+#: actions/newgroup.php:200
 msgid "Alias cannot be the same as nickname."
 msgstr "Алијасот не може да биде ист како прекарот."
 
@@ -3972,8 +3965,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "Ова не е поддржан формат на податотека."
 
@@ -3995,34 +3988,36 @@ 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/othersettings.php:111
+#. 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:120
+#: actions/othersettings.php:122
 msgid "Shorten URLs with"
 msgstr "Скратувај URL-адреси со"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:122
+#: actions/othersettings.php:124
 msgid "Automatic shortening service to use."
 msgstr "Која автоматска служба за скратување да се користи."
 
 #. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "Види изгледи на профилот"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: actions/othersettings.php:164
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Услугата за скратување на URL-адреси е предолга (највеќе до 50 знаци)."
 
@@ -4056,7 +4051,7 @@ msgstr "Излезно сандаче за %1$s - стр. %2$d"
 msgid "Outbox for %s"
 msgstr "Излезно сандаче за %s"
 
-#: actions/outbox.php:116
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Ова е Вашето излезно сандче, во кое се наведени приватните пораки кои ги "
@@ -4323,7 +4318,7 @@ msgstr "Директориумот кадешто се сместени поза
 
 #. TRANS: Fieldset legens in Paths admin panel.
 #. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "Прилози"
 
@@ -4446,7 +4441,6 @@ msgstr "Информации за профил"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 мали букви или бројки, без интерпукциски знаци и празни места."
 
@@ -4454,15 +4448,15 @@ msgstr "1-64 мали букви или бројки, без интерпукц
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
-msgstr "Цело име"
+msgstr "Име и презиме"
 
 #. TRANS: Field label in form for profile settings.
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:118 actions/register.php:460
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Домашна страница"
 
@@ -4497,8 +4491,8 @@ msgstr "Биографија"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Местоположба"
@@ -5355,13 +5349,13 @@ msgstr "Организација"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Статистики"
@@ -5506,60 +5500,60 @@ msgid "%1$s group, page %2$d"
 msgstr "Група %1$s, стр. %2$d"
 
 #. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Забелешка"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Алијаси"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "Групни дејства"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "Членови"
 
@@ -5567,25 +5561,25 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "Сите членови"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Создадено"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Членови"
@@ -5594,7 +5588,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5613,7 +5607,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5627,30 +5621,30 @@ msgstr ""
 "членови си разменуваат кратки пораки за нивниот живот и интереси. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "Администратори"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Порака од %1$s на %2$s"
@@ -6611,7 +6605,7 @@ msgstr ""
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Подновувања од %1$s на %2$s!"
@@ -6693,20 +6687,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6723,7 +6717,7 @@ 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:217
+#: 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."
@@ -6735,7 +6729,7 @@ 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:229
+#: 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."
@@ -6745,7 +6739,7 @@ msgstr[1] ""
 "Волку голема податотека ќе го надмине Вашето месечно следување од %d бајти"
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Погрешно податотечно име."
 
@@ -6803,7 +6797,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr "Никаде не е пронајдено име на базата или DSN."
 
@@ -6874,25 +6868,25 @@ msgid "Problem saving notice."
 msgstr "Проблем во зачувувањето на белешката."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6906,7 +6900,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:765
+#: classes/Profile.php:771
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -6915,7 +6909,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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6997,22 +6991,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr "Повикан е еднокориснички режим, но не е овозможен."
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Не можев да ги зачувам информациите за локалните групи."
 
@@ -7416,7 +7410,7 @@ msgstr "Корисникот веќе членува во групава."
 #: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
-msgstr ""
+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
@@ -7744,12 +7738,12 @@ msgid "Do not use this method!"
 msgstr "Не користете го овој метод!"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "Автор"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "Обезбедувач"
 
@@ -8174,24 +8168,24 @@ msgstr ""
 "tracking - сè уште не е имплементирано.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 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:164
+#: lib/common.php:165
 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "Оди на инсталаторот."
 
@@ -8371,28 +8365,33 @@ msgstr "Оди"
 msgid "Grant this user the \"%s\" role"
 msgstr "Додели улога „%s“ на корисников"
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Опишете ја групата или темата"
 
-#: lib/groupeditform.php:162
-#, 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."
+#: 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:174
+#: lib/groupeditform.php:175
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Местоположба на групата (ако има). На пр. „Град, Сој. држава/област, Земја“"
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8932,11 +8931,11 @@ msgstr ""
 "\n"
 "П.С. Можете да ги исклучите овие известувања по е-пошта тука: %8$s\n"
 
-#: lib/mailbox.php:89
+#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "Само корисникот може да го чита своето сандаче."
 
-#: lib/mailbox.php:139
+#: 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."
@@ -8945,10 +8944,6 @@ msgstr ""
 "впуштите во разговор со други корисници. Луѓето можат да Ви испраќаат пораки "
 "што ќе можете да ги видите само Вие."
 
-#: lib/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "од"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Не можев да ја парсирам пораката."
@@ -9040,6 +9035,15 @@ msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Испрати"
 
+#: lib/messagelist.php:77
+#, fuzzy
+msgid "Messages"
+msgstr "Порака"
+
+#: lib/messagelistitem.php:123 lib/noticelist.php:522
+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."
@@ -9224,7 +9228,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Непознато"
 
diff --git a/locale/ml/LC_MESSAGES/statusnet.po b/locale/ml/LC_MESSAGES/statusnet.po
index c2b38c2598..a30ab2d388 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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:35:02+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:06:22+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-01-30 23:06:54+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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"
@@ -88,11 +88,11 @@ msgstr "അഭിഗമ്യതാ സജ്ജീകരണങ്ങൾ സേ
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "സേവ് ചെയ്യുക"
@@ -155,7 +155,7 @@ msgstr "അത്തരത്തിൽ ഒരു താളില്ല."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "അങ്ങനെ ഒരു ഉപയോക്താവില്ല."
 
@@ -323,7 +323,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -409,7 +409,7 @@ msgstr "മുഖ്യം"
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s എന്ന ഉപയോക്താവിന്റെ സമയരേഖ"
@@ -431,7 +431,7 @@ msgstr ""
 #: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
 #, 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
@@ -502,13 +502,13 @@ 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."
-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.
@@ -521,25 +521,25 @@ 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 ""
+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
 msgid "Could not create favorite."
-msgstr ""
+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 ""
+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 ""
+msgstr "പ്രിയങ്കരം മായ്ക്കാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Client error displayed when trying follow who's profile could not be found.
 #: actions/apifriendshipscreate.php:109
@@ -551,7 +551,7 @@ msgstr ""
 #: actions/apifriendshipscreate.php:120
 #, php-format
 msgid "Could not follow user: %s is already on your list."
-msgstr ""
+msgstr "ഉപയോക്താവിനെ പിന്തുടരാൻ കഴിഞ്ഞില്ല: %s താങ്കളുടെ പട്ടികയിൽ മുമ്പേയുണ്ട്."
 
 #. TRANS: Client error displayed when trying to unfollow a user that cannot be found.
 #: actions/apifriendshipsdestroy.php:109
@@ -582,8 +582,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "വിളിപ്പേര് മുമ്പേ ഉപയോഗത്തിലുണ്ട്. മറ്റൊരെണ്ണം ശ്രമിക്കുക."
@@ -592,8 +592,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "സാധുവായ വിളിപ്പേര് അല്ല."
@@ -605,8 +605,8 @@ msgstr "സാധുവായ വിളിപ്പേര് അല്ല."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "ഹോംപേജിന്റെ യൂ.ആർ.എൽ. സാധുവല്ല."
@@ -615,8 +615,8 @@ msgstr "ഹോംപേജിന്റെ യൂ.ആർ.എൽ. സാധുവ
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "പൂർണ്ണ നാമത്തിന്റെ നീളം വളരെ കൂടുതലാണ് (പരമാവധി 255 അക്ഷരങ്ങൾ)."
@@ -631,20 +631,20 @@ msgstr "പൂർണ്ണ നാമത്തിന്റെ നീളം വള
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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] ""
-msgstr[1] ""
+msgstr[0] "വിവരണത്തിനു നീളം കൂടുതലാണ് (പരമാവധി %d അക്ഷരം)."
+msgstr[1] "വിവരണത്തിനു നീളം കൂടുതലാണ് (പരമാവധി %d അക്ഷരങ്ങൾ)."
 
 #. TRANS: Client error shown when providing too long a location during group creation.
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr ""
@@ -655,8 +655,8 @@ 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.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:176
+#: 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."
@@ -674,15 +674,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -750,7 +750,7 @@ msgstr "%s എന്ന ഉപയോക്താവിന്റെ സംഘങ
 #: actions/apigrouplist.php:104
 #, php-format
 msgid "%1$s groups %2$s is a member of."
-msgstr ""
+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.
@@ -803,7 +803,7 @@ msgstr "അഭ്യർത്ഥനാ ചീട്ട് മുമ്പേ ത
 #: 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:153 actions/passwordsettings.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
@@ -887,8 +887,8 @@ msgstr "അംഗത്വം"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "വിളിപ്പേര്"
@@ -1087,7 +1087,7 @@ msgstr "പിന്തുണയ്ക്കാത്തയിനം തരം."
 #: actions/apitimelinefavorites.php:108
 #, php-format
 msgid "%1$s / Favorites from %2$s"
-msgstr ""
+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,
@@ -1102,7 +1102,7 @@ msgstr ""
 #: actions/apitimelinegroup.php:134
 #, php-format
 msgid "Could not generate feed for group - %s"
-msgstr ""
+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.
@@ -1238,7 +1238,7 @@ msgstr ""
 #: actions/atompubfavoritefeed.php:147
 #, php-format
 msgid "Notices %1$s has favorited on %2$s"
-msgstr ""
+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.
@@ -1249,14 +1249,13 @@ 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 "പങ്ക് ചേരൽ പ്രക്രിയകൾ മാത്രം കൈകാര്യം ചെയ്യാനേ കഴിയൂ."
+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 ""
+msgstr "അറിയിപ്പുകൾ മാത്രമേ പ്രിയങ്കരമാണെന്ന് കുറിക്കാനാവൂ."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
 #: actions/atompubfavoritefeed.php:259
@@ -1266,7 +1265,7 @@ msgstr "അജ്ഞാതമായ കുറിപ്പ്."
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
 #: actions/atompubfavoritefeed.php:267
 msgid "Already a favorite."
-msgstr ""
+msgstr "മുമ്പേ തന്നെ പ്രിയങ്കരമാണ്."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
@@ -1278,9 +1277,9 @@ 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
+#, 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.
 #: actions/atompubmembershipfeed.php:219
@@ -1311,13 +1310,12 @@ msgstr "കാര്യനിർവ്വാഹകനാൽ തടയപ്പ
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
 #: actions/atompubshowfavorite.php:90
 msgid "No such favorite."
-msgstr ""
+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 "മറ്റൊരാളുടെ അംഗത്വം മായ്ക്കാനാവില്ല."
+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.
@@ -1389,9 +1387,8 @@ 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.
@@ -1420,9 +1417,9 @@ 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
+#, php-format
 msgid "Already subscribed to %s."
-msgstr "എല്ലാ വരിക്കാരും"
+msgstr "മുമ്പേ തന്നെ %s എന്ന ഉപയോക്താവിന്റെ വരിക്കാരനാണ്."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
@@ -1457,7 +1454,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "അവതാരം"
@@ -1558,18 +1555,17 @@ msgstr ""
 #. 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 ""
+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 "ഉപയോക്താവിനു മാത്രമേ അദ്ദേഹത്തിന്റെ സ്വന്തം സമയരേഖ ചേർക്കാൻ കഴിയൂ."
+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:225
@@ -1583,15 +1579,14 @@ msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:248
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
-msgstr "പശ്ചാത്തലം"
+msgstr "ബാക്ക്അപ്"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
 msgid "Backup your account"
-msgstr ""
+msgstr "താങ്കളുടെ അംഗത്വത്തിന്റെ ബാക്ക്അപ് എടുക്കുക"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 #: actions/block.php:68
@@ -1749,7 +1744,7 @@ msgstr "സംഭാഷണം"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "അറിയിപ്പുകൾ"
@@ -1772,7 +1767,7 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "You must write \"%s\" exactly in the box."
 msgstr "പെട്ടിയിൽ  \"%s\" എന്നു തന്നെ താങ്കൾ എഴുതി നൽകണം."
 
@@ -2199,12 +2194,12 @@ 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 ""
+msgstr "ഈ അറിയിപ്പ് പ്രിയങ്കരമാണെന്ന് അടയാളപ്പെടുത്തിയിട്ടില്ല!"
 
 #. TRANS: Title for page on which favorites can be added.
 #: actions/disfavor.php:98
 msgid "Add to favorites"
-msgstr ""
+msgstr "പ്രിയങ്കരങ്ങളിലേയ്ക്ക് ചേർക്കുക"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
@@ -2332,24 +2327,24 @@ msgstr "സംഘത്തിൽ മാറ്റം വരുത്താൻ ഈ
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: actions/editgroup.php:281 classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr ""
 
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "ഐച്ഛികങ്ങൾ സേവ് ചെയ്തിരിക്കുന്നു."
 
@@ -2583,9 +2578,8 @@ msgstr "സ്വീകരിക്കാനുള്ള ഇമെയിൽ വ
 #. 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
-#, fuzzy
 msgid "Could not update user record."
-msgstr "ഉപയോക്തൃ വിവരങ്ങൾ പുതുക്കാൻ കഴിഞ്ഞില്ല."
+msgstr "ഉപയോക്തൃ രേഖകൾ പുതുക്കാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #: actions/emailsettings.php:534 actions/smssettings.php:568
@@ -2600,12 +2594,12 @@ 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 ""
+msgstr "ഈ അറിയിപ്പ് മുമ്പേ തന്നെ പ്രിയങ്കരമാണ്!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
 msgid "Disfavor favorite"
-msgstr ""
+msgstr "പ്രിയങ്കരമാണ് എന്നത് നീക്കം ചെയ്യുക"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2630,6 +2624,8 @@ msgstr "ഈ സൈറ്റിൽ ഇപ്പോഴുള്ള ഏറ്റവ
 #: 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
@@ -2656,7 +2652,7 @@ msgstr ""
 #: lib/personalgroupnav.php:122
 #, php-format
 msgid "%s's favorite notices"
-msgstr ""
+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.
@@ -2681,9 +2677,9 @@ msgstr "പ്രമുഖ ഉപയോക്താക്കൾ, താൾ %d"
 
 #. TRANS: Description on page displaying featured users.
 #: actions/featured.php:102
-#, fuzzy, php-format
+#, php-format
 msgid "A selection of some great users on %s."
-msgstr "%s പദ്ധതിയിലെ ചില മഹദ് ഉപയോക്താക്കൾ"
+msgstr "%s പദ്ധതിയിലെ ചില മഹദ് ഉപയോക്താക്കൾ."
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
 #: actions/file.php:36
@@ -2873,9 +2869,8 @@ 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 "താങ്കളുടെ രൂപകല്പനാ സജ്ജീകരണങ്ങൾ കാത്തുസൂക്ഷിക്കാനായില്ല."
+msgstr "താങ്കളുടെ രൂപകല്പനാ സജ്ജീകരണങ്ങൾ പുതുക്കാനായില്ല."
 
 #. TRANS: Form text to confirm saved group design settings.
 #: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
@@ -2984,7 +2979,6 @@ msgstr ""
 
 #. TRANS: Title for first page of the groups list.
 #: actions/groups.php:62
-#, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "സംഘങ്ങൾ"
@@ -2992,7 +2986,7 @@ 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
+#, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
 msgstr "സംഘങ്ങൾ, താൾ %d"
@@ -3001,7 +2995,7 @@ msgstr "സംഘങ്ങൾ, താൾ %d"
 #. 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
+#, 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 "
@@ -3045,13 +3039,13 @@ 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
+#, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
 "action.newgroup%%) yourself."
 msgstr ""
-"താങ്കൾ അന്വേഷിക്കുന്ന സംഘം കണ്ടെത്താനായില്ലെങ്കിൽ, താങ്കൾ തന്നെ [അതുണ്ടാക്കുക](%%action."
-"newgroup%%)."
+"താങ്കൾ അന്വേഷിക്കുന്ന സംഘം കണ്ടെത്താനായില്ലെങ്കിൽ, താങ്കൾക്ക് തന്നെ [അതുണ്ടാക്കാവുന്നതാണ്](%%"
+"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).
@@ -3088,7 +3082,7 @@ msgstr "ഐ.എം. സജ്ജീകരണങ്ങൾ"
 #. 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
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can send and receive notices through Jabber/Google Talk [instant "
 "messages](%%doc.im%%). Configure your address and settings below."
@@ -3109,14 +3103,13 @@ msgid "IM address"
 msgstr "ഐ.എം. വിലാസം"
 
 #: actions/imsettings.php:109
-#, fuzzy
 msgid "Current confirmed Jabber/Google Talk address."
-msgstr "ഇപ്പോഴത്തെ സ്ഥിരീകരിക്കപ്പെട്ട ജാബ്ബർ/ജിറ്റോക് വിലാസം"
+msgstr "ഇപ്പോഴത്തെ സ്ഥിരീകരിക്കപ്പെട്ട ജാബ്ബർ/ജിറ്റോക് വിലാസം."
 
 #. 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?)"
@@ -3130,7 +3123,7 @@ 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."
@@ -3145,13 +3138,11 @@ msgstr "ഐ.എം. ക്രമീകരണങ്ങൾ"
 
 #. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-#, fuzzy
 msgid "Send me notices through Jabber/Google Talk."
 msgstr "ജാബ്ബർ/ജിറ്റോക് വഴി എനിക്ക് അറിയിപ്പുകൾ അയയ്ക്കുക."
 
 #. 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 "എന്റെ ജാബ്ബർ/ജിറ്റോക് സ്ഥിതിവിവരം മാറുമ്പോൾ അറിയിപ്പുകൾ പ്രസിദ്ധീകരിക്കുക."
 
@@ -3168,7 +3159,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "ഇപ്പോഴത്തെ സ്ഥിരീകരിക്കപ്പെട്ട ജാബ്ബർ/ജിറ്റോക് വിലാസം"
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "ക്രമീകരണങ്ങൾ സേവ് ചെയ്തു."
 
@@ -3185,9 +3176,8 @@ msgstr "സാധുവായ ഇമെയിൽ വിലാസം അല്ല
 
 #. TRANS: Message given saving Instant Messaging address that not valid.
 #: actions/imsettings.php:317
-#, fuzzy
 msgid "Not a valid Jabber ID."
-msgstr "ജാബർ ഐ.ഡി. അസാധുവാണ്"
+msgstr "അസാധുവായ ജാബർ ഐ.ഡി.."
 
 #. TRANS: Message given saving Instant Messaging address that is already set.
 #: actions/imsettings.php:321
@@ -3241,17 +3231,17 @@ msgstr "ഐ.എം. വിലാസം നീക്കം ചെയ്തിര
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
-msgstr ""
+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 ""
+msgstr "%s എന്ന ഉപയോക്താവിന്റെ ഇൻബോക്സ്"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "ഇതാണ് താങ്കളുടെ ഇൻബോക്സ്, താങ്കൾക്ക് വരുന്ന സ്വകാര്യസന്ദേശങ്ങൾ ഇവിടെയാണെത്തുക."
 
@@ -3345,9 +3335,8 @@ 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 "ക്ഷണിക്കേണ്ട സുഹൃത്തുക്കളുടെ വിലാസം (ഒരു വരിയിൽ ഒന്നു വീതം)"
+msgstr "ക്ഷണിക്കേണ്ട സുഹൃത്തുക്കളുടെ വിലാസം (ഒരു വരിയിൽ ഒന്നു വീതം)."
 
 #. TRANS: Field label for a personal message to send to invitees.
 #: actions/invite.php:225
@@ -3665,7 +3654,7 @@ msgid "Use this form to create a new group."
 msgstr "പുതിയൊരു സംഘം സൃഷ്ടിക്കാൻ ഈ ഫോം ഉപയോഗിക്കുക."
 
 #. TRANS: Group create form validation error.
-#: actions/newgroup.php:199
+#: actions/newgroup.php:200
 msgid "Alias cannot be the same as nickname."
 msgstr ""
 
@@ -3846,7 +3835,7 @@ msgstr ""
 #: actions/oembed.php:83 actions/shownotice.php:172
 #, php-format
 msgid "%1$s's status on %2$s"
-msgstr ""
+msgstr "%2$s പദ്ധതിയിൽ %1$s എന്ന ഉപയോക്താവിന്റെ സ്ഥിതിവിവരം"
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
@@ -3861,10 +3850,10 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
-msgstr ""
+msgstr "പിന്തുണയില്ലാത്ത തരം ഡേറ്റ."
 
 #: actions/opensearch.php:64
 msgid "People Search"
@@ -3881,37 +3870,39 @@ msgstr "മറ്റ് സജ്ജീകരണങ്ങൾ"
 #. TRANS: Instructions for tab "Other" in user profile settings.
 #: actions/othersettings.php:71
 msgid "Manage various other options."
-msgstr ""
+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/othersettings.php:111
+#. 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:120
+#: actions/othersettings.php:122
 msgid "Shorten URLs with"
-msgstr ""
+msgstr "യൂ.ആർ.എൽ. ചെറുതാക്കാൻ ഇതുപയോഗിക്കുക"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:122
+#: actions/othersettings.php:124
 msgid "Automatic shortening service to use."
 msgstr "ഉപയോഗിക്കാവുന്ന സ്വയംപ്രവർത്തിത ചെറുതാക്കൽ സേവനം."
 
 #. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr ""
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: actions/othersettings.php:164
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "യൂ.ആർ.എൽ. ചെറുതാക്കൽ സേവനം വളരെ വലുതാണ് (പരമാവധി 50 അക്ഷരങ്ങൾ)."
 
@@ -3938,16 +3929,16 @@ msgstr "ലോഗിൻ ചീട്ട് കാലഹരണപ്പെട്
 #: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
-msgstr ""
+msgstr "%1$s എന്ന ഉപയോക്താവിന്റെ ഔട്ട്ബോക്സ് - താൾ %2$d"
 
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
-msgstr ""
+msgstr "%s എന്ന ഉപയോക്താവിന്റെ ഔട്ട്ബോക്സ്"
 
-#: actions/outbox.php:116
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
-msgstr ""
+msgstr "ഇത് താങ്കളുടെ ഔട്ട്ബോക്സ് ആണ്, താങ്കൾ അയച്ച സ്വകാര്യ സന്ദേശങ്ങൾ ഇവിടെ കാണാം."
 
 #: actions/passwordsettings.php:58
 msgid "Change password"
@@ -4210,7 +4201,7 @@ msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
 #. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr ""
 
@@ -4307,6 +4298,8 @@ msgstr "അറിയിപ്പിന്റെ ഉള്ളടക്കം അ
 #, 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:59
@@ -4326,7 +4319,6 @@ msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 
@@ -4334,15 +4326,15 @@ msgstr ""
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "ഹോംപേജ്"
 
@@ -4378,8 +4370,8 @@ msgstr ""
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "സ്ഥലം"
@@ -4470,9 +4462,8 @@ msgstr "ഉപയോക്തൃ വിവരങ്ങൾ പുതുക്ക
 
 #. TRANS: Server error thrown when user profile location preference settings could not be updated.
 #: actions/profilesettings.php:405
-#, fuzzy
 msgid "Could not save location prefs."
-msgstr "എന്റെ സ്ഥാനം പങ്ക് വെയ്ക്കരുത്"
+msgstr "സ്ഥാനം സംബന്ധിച്ച ക്രമീകരണങ്ങൾ സേവ് ചെയ്യാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Server error thrown when user profile settings tags could not be saved.
 #: actions/profilesettings.php:427 actions/tagother.php:200
@@ -4530,13 +4521,15 @@ msgstr ""
 
 #: actions/public.php:191
 msgid "Be the first to post!"
-msgstr ""
+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
@@ -4546,6 +4539,11 @@ msgid ""
 "tool. [Join now](%%action.register%%) to share notices about yourself with "
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
+"ഇത് %%site.name%%, സ്വതന്ത്ര സോഫ്റ്റ്‌വേറായ [സ്റ്റാറ്റസ്‌നെറ്റ്](http://status.net/) ഉപകരണം "
+"ഉപയോഗിക്കുന്ന  [മൈക്രോ-ബ്ലോഗിങ്](http://en.wikipedia.org/wiki/Micro-blogging) "
+"സേവനദാതാവ്. അറിയിപ്പുകൾ സ്വയം താങ്കളുടെ സുഹൃത്തുക്കളുമായും, കുടുംബാംഗങ്ങളുമായും, "
+"സഹപ്രവർത്തകരുമായും പങ്ക് വെയ്ക്കുവാൻ [ഇപ്പോൾ തന്നെ ചേരുക](%%action.register%%)! (കൂടുതൽ "
+"അറിയുക](%%doc.help%%))"
 
 #: actions/public.php:247
 #, php-format
@@ -4579,7 +4577,7 @@ msgstr ""
 #. 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 ""
+msgstr "പ്രസിദ്ധീകരിക്കുന്ന ആദ്യ വ്യക്തിയാകുക!"
 
 #. TRANS: Message shown to a anonymous user for the public tag cloud
 #. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
@@ -4592,6 +4590,8 @@ msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
 "one!"
 msgstr ""
+"എന്തുകൊണ്ട് [അംഗത്വമെടുക്കുകയും](%%action.register%%) പ്രസിദ്ധീകരിക്കുന്ന ആദ്യ വ്യക്തിയാകുകയും "
+"ചെയ്തുകൂട!"
 
 #: actions/publictagcloud.php:146
 msgid "Tag cloud"
@@ -4630,7 +4630,7 @@ 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 ""
+msgstr "സ്ഥിരീകരിച്ച ഇമെയിൽ വിലാസത്തോടെ ഉപയോക്തൃവിവരങ്ങൾ പുതുക്കാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Page notice for password recovery page.
 #: actions/recoverpassword.php:160
@@ -4888,6 +4888,8 @@ 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
@@ -4973,12 +4975,12 @@ msgstr "ആവർത്തിച്ചു!"
 #: lib/personalgroupnav.php:109
 #, php-format
 msgid "Replies to %s"
-msgstr ""
+msgstr "%s എന്ന ഉപയോക്താവിനുള്ള മറുപടികൾ"
 
 #: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
-msgstr ""
+msgstr "%1$s എന്ന ഉപയോക്താവിനുള്ള മറുപടികൾ, താൾ %2$d"
 
 #: actions/replies.php:145
 #, php-format
@@ -5019,7 +5021,7 @@ msgstr ""
 #: actions/repliesrss.php:72
 #, php-format
 msgid "Replies to %1$s on %2$s!"
-msgstr ""
+msgstr "%2$s സംരംഭത്തിൽ %1$s എന്ന ഉപയോക്താവിന് അയച്ച മറുപടികൾ!"
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
 #: actions/restoreaccount.php:78
@@ -5052,7 +5054,7 @@ msgstr ""
 #. TRANS: Client exception.
 #: actions/restoreaccount.php:141 lib/mediafile.php:206
 msgid "The uploaded file was only partially uploaded."
-msgstr ""
+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
@@ -5067,7 +5069,7 @@ 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 ""
+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.
@@ -5133,7 +5135,7 @@ msgstr ""
 
 #: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site"
-msgstr ""
+msgstr "ഈ സ്റ്റാറ്റസ്‌നെറ്റ് സൈറ്റിന്റെ സെഷൻ സജ്ജീകരണങ്ങൾ"
 
 #: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
@@ -5181,13 +5183,13 @@ msgstr "സംഘടന"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "സ്ഥിതിവിവരക്കണക്കുകൾ"
@@ -5203,7 +5205,7 @@ msgstr ""
 
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
-msgstr ""
+msgstr "പുനഃക്രമീകരണ ചാവിയും രഹസ്യവും"
 
 #. TRANS: Title of form for deleting a user.
 #: actions/showapplication.php:252 lib/deletegroupform.php:121
@@ -5221,7 +5223,7 @@ msgstr ""
 
 #: actions/showapplication.php:268
 msgid "Consumer secret"
-msgstr ""
+msgstr "ഉപയോക്തൃ രഹസ്യം"
 
 #: actions/showapplication.php:273
 msgid "Request token URL"
@@ -5245,19 +5247,19 @@ msgstr ""
 
 #: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr ""
+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 ""
+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 ""
+msgstr "പ്രിയങ്കരങ്ങളായ അറിയിപ്പുകൾ ശേഖരിക്കാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Feed link text. %s is a username.
 #: actions/showfavorites.php:172
@@ -5283,6 +5285,9 @@ msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
+"താങ്കളിതുവരെ പ്രിയങ്കരങ്ങലായ അറിയിപ്പുകൾ തിരഞ്ഞെടുത്തിട്ടില്ല. താങ്കളിഷ്ടപ്പെടുന്ന "
+"അറിയിപ്പുകളിൽ പ്രിയങ്കരമെന്നു കുറിക്കാനുള്ള ബട്ടൺ ഞെക്കിയാൽ അവ ബുക്ക്‌മാർക്ക് ചെയ്യാനും "
+"അവയിലേയ്ക്ക് ശ്രദ്ധ ക്ഷണിക്കാനും സാധിക്കും."
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
@@ -5323,60 +5328,60 @@ msgid "%1$s group, page %2$d"
 msgstr "%1$s സംഘം, താൾ %2$d"
 
 #. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "കുറിപ്പ്"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr ""
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "സംഘത്തിന്റെ പ്രവൃത്തികൾ"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:365
+#: actions/showgroup.php:377
 #, php-format
 msgid "FOAF for %s group"
 msgstr ""
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "അംഗങ്ങൾ"
 
@@ -5384,25 +5389,25 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "എല്ലാ അംഗങ്ങളും"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 msgctxt "LABEL"
 msgid "Created"
 msgstr "സൃഷ്ടിച്ചിരിക്കുന്നു"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 msgctxt "LABEL"
 msgid "Members"
 msgstr "അംഗങ്ങൾ"
@@ -5411,7 +5416,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5424,7 +5429,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5434,33 +5439,33 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "കാര്യനിർവാഹകർ"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: actions/showmessage.php:105
 #, php-format
 msgid "Message to %1$s on %2$s"
-msgstr ""
+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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
-msgstr ""
+msgstr "%2$s സംരംഭത്തിൽ %1$s അയച്ച സന്ദേശങ്ങൾ"
 
 #: actions/shownotice.php:90
 msgid "Notice deleted."
@@ -5553,6 +5558,11 @@ msgid ""
 "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
+"സ്വതന്ത്ര സോഫ്റ്റ്‌വേറായ [സ്റ്റാറ്റസ്‌നെറ്റ്](http://status.net/) ഉപകരണം ഉപയോഗിച്ച്  [മൈക്രോ-"
+"ബ്ലോഗിങ്](http://en.wikipedia.org/wiki/Micro-blogging) സേവനം നൽകുന്ന %%site.name%"
+"% എന്ന സൈറ്റിൽ **%s** എന്നയാൾക്ക് അംഗത്വമുണ്ട്. **%s** എന്ന ഉപയോക്താവിന്റേയും മറ്റ് നിരവധി "
+"പേരുടേയും അറിയിപ്പുകൾ പിന്തുടരാൻ [ഇപ്പോൾ തന്നെ ചേരുക](%%action.register%%)! (കൂടുതൽ "
+"അറിയുക](%%doc.help%%))"
 
 #. 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.
@@ -5563,6 +5573,9 @@ msgid ""
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
+"സ്വതന്ത്ര സോഫ്റ്റ്‌വേറായ [സ്റ്റാറ്റസ്‌നെറ്റ്](http://status.net/) ഉപകരണം ഉപയോഗിച്ച്  [മൈക്രോ-"
+"ബ്ലോഗിങ്](http://en.wikipedia.org/wiki/Micro-blogging) സേവനം നൽകുന്ന %%site.name%"
+"% എന്ന സൈറ്റിൽ **%s** എന്നയാൾക്ക് അംഗത്വമുണ്ട്. "
 
 #. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
 #: actions/showstream.php:328
@@ -5674,6 +5687,8 @@ 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
@@ -5858,9 +5873,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-#, fuzzy
 msgid "No code entered."
-msgstr "യാതൊരു കോഡും ചേർത്തിട്ടില്ല"
+msgstr "യാതൊരു കോഡും നൽകിയിട്ടില്ല."
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
@@ -5948,27 +5962,27 @@ msgstr ""
 #: actions/subscribers.php:51
 #, php-format
 msgid "%s subscribers"
-msgstr ""
+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 ""
+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 ""
+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 ""
+msgstr "ഈ ആൾക്കാരാണ് %s എന്ന ഉപയോക്താവിന്റെ അറിയിപ്പുകൾ ശ്രദ്ധിക്കുന്നത്."
 
 #. TRANS: Subscriber list text when the logged in user has no subscribers.
 #: actions/subscribers.php:114
@@ -5976,13 +5990,15 @@ msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor."
 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 ""
+msgstr "%s എന്ന ഉപയോക്താവിന് വരിക്കാരില്ല. ആദ്യത്തെ ആളാകുന്നോ?"
 
 #. TRANS: Subscriber list text when looking at the subscribers for a of a user that has none
 #. TRANS: as an anonymous user. %s is the user nickname.
@@ -5995,26 +6011,28 @@ msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
 "%) and be the first?"
 msgstr ""
+"%s എന്ന ഉപയോക്താവിന് വരിക്കാരില്ല. എന്തുകൊണ്ട് [ഒരംഗത്വം എടുക്കുകയും](%%%%action.register%%"
+"%%) ആദ്യത്തെ ആളാവുകയും ചെയ്തുകൂട?"
 
 #. 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 ""
+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 ""
+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 ""
+msgstr "ഈ ആൾക്കാരുടെ അറിയിപ്പുകളാണ് %s ശ്രദ്ധിക്കുന്നത്."
 
 #. TRANS: Subscription list text when the logged in user has no subscriptions.
 #. TRANS: This message contains Markdown URLs. The link description is between
@@ -6153,7 +6171,7 @@ msgstr "ഉപയോക്താവ്"
 #. TRANS: Instruction for user admin panel.
 #: actions/useradminpanel.php:69
 msgid "User settings for this StatusNet site"
-msgstr ""
+msgstr "ഈ സ്റ്റാറ്റസ്‌നെറ്റ് സൈറ്റിന്റെ ഉപയോക്തൃ സജ്ജീകരണങ്ങൾ"
 
 #. TRANS: Form validation error in user admin panel when a non-numeric character limit was set.
 #: actions/useradminpanel.php:147
@@ -6225,7 +6243,7 @@ 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 ""
+msgstr "പുതിയ ഉപയോക്താക്കളെ ക്ഷണിക്കാൻ ഉപയോക്താക്കളെ അനുവദിക്കേണ്ടതുണ്ടോ."
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
@@ -6234,7 +6252,7 @@ msgstr "ഉപയോക്തൃ സജ്ജീകരണങ്ങൾ സേവ
 
 #: actions/userauthorization.php:105
 msgid "Authorize subscription"
-msgstr ""
+msgstr "വരിക്കാരനാകൽ അംഗീകരിക്കുക"
 
 #: actions/userauthorization.php:110
 msgid ""
@@ -6256,7 +6274,7 @@ msgstr "സ്വീകരിക്കുക"
 #: actions/userauthorization.php:218 lib/subscribeform.php:115
 #: lib/subscribeform.php:139
 msgid "Subscribe to this user"
-msgstr ""
+msgstr "ഈ ഉപയോക്താവിന്റെ വരിക്കാരൻ/വരിക്കാരി ആകുക"
 
 #: actions/userauthorization.php:219
 msgid "Reject"
@@ -6264,7 +6282,7 @@ msgstr "നിരാകരിക്കുക"
 
 #: actions/userauthorization.php:220
 msgid "Reject this subscription"
-msgstr ""
+msgstr "ഈ വരിക്കാരനാകൽ നിരസിക്കുക"
 
 #: actions/userauthorization.php:232
 msgid "No authorization request!"
@@ -6272,7 +6290,7 @@ msgstr ""
 
 #: actions/userauthorization.php:254
 msgid "Subscription authorized"
-msgstr ""
+msgstr "വരിക്കാരനാകൽ അംഗീകരിക്കപ്പെട്ടു"
 
 #: actions/userauthorization.php:256
 msgid ""
@@ -6283,7 +6301,7 @@ msgstr ""
 
 #: actions/userauthorization.php:266
 msgid "Subscription rejected"
-msgstr ""
+msgstr "വരിക്കാരനാകൽ നിരസിക്കപ്പെട്ടു"
 
 #: actions/userauthorization.php:268
 msgid ""
@@ -6341,13 +6359,13 @@ msgstr ""
 
 #: actions/userdesignsettings.php:272
 msgid "Enjoy your hotdog!"
-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 ""
+msgstr "%1$s സംഘങ്ങൾ, താൾ %2$d"
 
 #: actions/usergroups.php:132
 msgid "Search for more groups"
@@ -6361,7 +6379,7 @@ msgstr "%s എന്ന ഉപയോക്താവ് ഒരു സംഘത്
 #: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
-msgstr ""
+msgstr "[സംഘങ്ങൾ തിരയുക](%%action.groupsearch%%), അവയിൽ ചേരുക."
 
 #. 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 in atom group notice feed.
@@ -6369,7 +6387,7 @@ msgstr ""
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
@@ -6439,20 +6457,20 @@ msgid "%1$s marked notice %2$s as a favorite."
 msgstr ""
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:156
+#: 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:188
+#: classes/File.php:194
 msgid "Robin thinks something is impossible."
-msgstr ""
+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:204
+#: 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. "
@@ -6465,7 +6483,7 @@ 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:217
+#: 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."
@@ -6474,7 +6492,7 @@ 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:229
+#: 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."
@@ -6482,7 +6500,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "പ്രമാണത്തിന്റെ പേര് അസാധുവാണ്."
 
@@ -6499,7 +6517,7 @@ msgstr "സംഘത്തിന്റെ ഭാഗമല്ല."
 #. TRANS: Exception thrown when trying to leave a group fails.
 #: classes/Group_member.php:72
 msgid "Group leave failed."
-msgstr ""
+msgstr "സംഘത്തിൽ നിന്നും ഒഴിവാകൽ പരാജയപ്പെട്ടിരിക്കുന്നു."
 
 #. TRANS: Exception thrown providing an invalid profile ID.
 #. TRANS: %s is the invalid profile ID.
@@ -6540,19 +6558,19 @@ 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:541
+#: classes/Memcached_DataObject.php:542
 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 ""
+msgstr "നേരിട്ടുള്ള സന്ദേശങ്ങൾ അയക്കുന്നതിൽ നിന്നും താങ്കൾ തടയപ്പെട്ടിരിക്കുന്നു."
 
 #. TRANS: Message given when a message could not be stored on the server.
 #: classes/Message.php:69
 msgid "Could not insert message."
-msgstr ""
+msgstr "സന്ദേശം ഉൾപ്പെടുത്താൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Message given when a message could not be updated on the server.
 #: classes/Message.php:80
@@ -6575,18 +6593,20 @@ msgstr ""
 #. TRANS: Client exception thrown if a notice contains too many characters.
 #: classes/Notice.php:279
 msgid "Problem saving notice. Too long."
-msgstr ""
+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 ""
+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
@@ -6594,38 +6614,40 @@ 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 ""
+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 ""
+msgstr "അറിയിപ്പ് സേവ് ചെയ്യുന്നതിൽ പിഴവുണ്ടായി."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
-msgstr ""
+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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -6639,14 +6661,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:765
+#: classes/Profile.php:771
 #, 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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6706,14 +6728,14 @@ msgstr "പിന്തുടരുക"
 #: classes/Subscription.php:268
 #, php-format
 msgid "%1$s is now following %2$s."
-msgstr ""
+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
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
-msgstr ""
+msgstr "%1$s സൈറ്റിലേയ്ക്ക് സ്വാഗതം, @%2$s!"
 
 #. TRANS: Server exception.
 #: classes/User.php:918
@@ -6726,31 +6748,31 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: classes/User_group.php:522
 msgid "Could not create group."
-msgstr ""
+msgstr "സംഘം സൃഷ്ടിക്കാൻ കഴിഞ്ഞില്ല."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:530
+#: 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:553
+#: classes/User_group.php:555
 msgid "Could not set group membership."
-msgstr ""
+msgstr "സംഘ അംഗത്വം സജ്ജീകരിച്ചിട്ടില്ല."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
-msgstr ""
+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
+#, php-format
 msgid "Cannot locate account %s."
-msgstr "താങ്കളുടെ അംഗത്വം താങ്കൾക്ക് മായ്ക്കാനാകില്ല."
+msgstr "%s എന്ന അംഗത്വം കണ്ടെത്താനായില്ല."
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
@@ -6938,7 +6960,7 @@ msgstr "സഹായം"
 #: lib/action.php:608
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
-msgstr ""
+msgstr "ആൾക്കാരെയോ എഴുത്തോ തിരയുക"
 
 #. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
 #: lib/action.php:611
@@ -6955,7 +6977,7 @@ msgstr "സൈറ്റ് അറിയിപ്പ്"
 #. TRANS: DT element for local views block. String is hidden in default CSS.
 #: lib/action.php:700
 msgid "Local views"
-msgstr ""
+msgstr "പ്രാദേശിക എടുത്തുനോക്കലുകൾ"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
 #: lib/action.php:770
@@ -7052,7 +7074,7 @@ msgstr "സൈറ്റിന്റെ ഉള്ളടക്കത്തിന
 #: lib/action.php:974
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
-msgstr ""
+msgstr "%1$s സൈറ്റിന്റെ ഉള്ളടക്കം സ്വകാര്യവും രഹസ്യവുമാണ്."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
@@ -7064,7 +7086,7 @@ msgstr ""
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
 #: lib/action.php:985
 msgid "Content and data copyright by contributors. All rights reserved."
-msgstr ""
+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.
@@ -7152,9 +7174,9 @@ msgid "No content for notice %s."
 msgstr "ഉള്ളടക്കമൊന്നും %s എന്ന അറിയിപ്പിൽ നൽകിയിട്ടില്ല."
 
 #: lib/activitymover.php:84
-#, 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.
@@ -7260,7 +7282,7 @@ msgstr ""
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:385
 msgid "Edit site notice"
-msgstr ""
+msgstr "സൈറ്റ് അറിയിപ്പ് തിരുത്തുക"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:393
@@ -7270,7 +7292,7 @@ msgstr ""
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:401
 msgid "Set site license"
-msgstr ""
+msgstr "സൈറ്റിന്റെ ഉപയോഗാനുമതി സജ്ജീകരിക്കുക"
 
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
@@ -7459,12 +7481,12 @@ msgid "Do not use this method!"
 msgstr "ഈ മാർഗ്ഗം ഉപയോഗിക്കരുത്!"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "രചയിതാവ്"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr ""
 
@@ -7643,19 +7665,19 @@ msgstr[1] ""
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
 #: lib/command.php:516
 msgid "Error sending direct message."
-msgstr ""
+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
 #, php-format
 msgid "Notice from %s repeated."
-msgstr ""
+msgstr "%s എന്ന ഉപയോക്താവിന്റെ അറിയിപ്പ് ആവർത്തിച്ചു."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
 #: lib/command.php:556
 msgid "Error repeating notice."
-msgstr ""
+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.
@@ -7671,12 +7693,12 @@ msgstr[1] ""
 #: lib/command.php:604
 #, php-format
 msgid "Reply to %s sent."
-msgstr ""
+msgstr "%s എന്ന ഉപയോക്താവിനുള്ള മറുപടി അയച്ചു."
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
 #: lib/command.php:607
 msgid "Error saving notice."
-msgstr ""
+msgstr "അറിയിപ്പ് സേവ് ചെയ്യുന്നതിൽ പിഴവുണ്ടായി."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
 #: lib/command.php:654
@@ -7745,6 +7767,8 @@ msgstr ""
 #, 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.
@@ -7841,24 +7865,24 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 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:164
+#: lib/common.php:165
 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr ""
 
@@ -8036,29 +8060,33 @@ msgstr "പോകൂ"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:155
+#: 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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "സംഘത്തെക്കുറിച്ചോ വിഷയത്തെക്കുറിച്ചോ വിവരിക്കുക"
 
-#: lib/groupeditform.php:162
-#, 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."
+#: 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:174
+#: lib/groupeditform.php:175
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "സംഘത്തിന്റെ പ്രദേശം, അങ്ങനെയൊന്നുണ്ടെങ്കിൽ - ഉദാ: \"പട്ടണം, സംസ്ഥാനം (അഥവാ പ്രദേശം), "
 "രാജ്യം\"."
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8495,11 +8523,11 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:89
+#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "ഉപയോക്താവിനു മാത്രമേ അദ്ദേഹത്തിന്റെ സ്വന്തം മെയിൽബോക്സ് വായിക്കാനാകൂ."
 
-#: lib/mailbox.php:139
+#: 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."
@@ -8508,10 +8536,6 @@ msgstr ""
 "സന്ദേശങ്ങൾ അയയ്ക്കാവുന്നതാണ്. താങ്കൾക്ക് മാത്രം കാണാവുന്ന സന്ദേശങ്ങൾ അയയ്ക്കാൻ മറ്റുള്ളവർക്കും "
 "കഴിയുന്നതാണ്."
 
-#: lib/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "അയച്ചത്"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr ""
@@ -8564,13 +8588,14 @@ msgid ""
 "\"%1$s\" is not a supported file type on this server. Try using another %2$s "
 "format."
 msgstr ""
+"\"%1$s\" എന്ന തരം പ്രമാണത്തിന് ഈ സെർവറിൽ പിന്തുണയില്ല. മറ്റൊരു %2$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 ""
+msgstr "\"%s\" എന്ന തരം പ്രമാണത്തിന് ഈ സെർവറിൽ പിന്തുണയില്ല."
 
 #: lib/messageform.php:120
 msgid "Send a direct notice"
@@ -8599,6 +8624,15 @@ msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "അയക്കുക"
 
+#: lib/messagelist.php:77
+#, fuzzy
+msgid "Messages"
+msgstr "സന്ദേശം"
+
+#: lib/messagelistitem.php:123 lib/noticelist.php:522
+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."
@@ -8647,6 +8681,8 @@ 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
@@ -8736,7 +8772,6 @@ msgstr ""
 
 #. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
-#, fuzzy
 msgctxt "MENU"
 msgid "Replies"
 msgstr "മറുപടികൾ"
@@ -8756,7 +8791,6 @@ msgstr ""
 
 #. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
 #: lib/personalgroupnav.php:133
-#, fuzzy
 msgctxt "MENU"
 msgid "Inbox"
 msgstr "ഇൻബോക്സ്"
@@ -8768,7 +8802,6 @@ msgstr "താങ്കൾക്ക് വരുന്ന സന്ദേശങ
 
 #. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
 #: lib/personalgroupnav.php:140
-#, fuzzy
 msgctxt "MENU"
 msgid "Outbox"
 msgstr "ഔട്ട്ബോക്സ്"
@@ -8785,7 +8818,7 @@ msgid "Tags in %s's notices"
 msgstr ""
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "അജ്ഞാതം"
 
@@ -9099,12 +9132,12 @@ msgstr "ഉപയോക്തൃ പ്രവൃത്തികൾ"
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
 #: lib/userprofile.php:249
 msgid "User deletion in progress..."
-msgstr ""
+msgstr "ഉപയോക്താവിനെ നീക്കം ചെയ്യൽ പുരോഗമിക്കുന്നു..."
 
 #. TRANS: Link title for link on user profile.
 #: lib/userprofile.php:277
 msgid "Edit profile settings"
-msgstr ""
+msgstr "ക്രമീകരണങ്ങളുടെ സജ്ജീകരണം മാറ്റുക"
 
 #. TRANS: Link text for link on user profile.
 #: lib/userprofile.php:279
@@ -9210,13 +9243,15 @@ msgstr "ഏകദേശം ഒരു വർഷം മുമ്പ്"
 #: lib/webcolor.php:81 lib/webcolor.php:121
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex characters."
-msgstr ""
+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.
@@ -9225,7 +9260,9 @@ 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 അക്ഷരങ്ങൾ."
 
 #. TRANS: Exception.
 #: lib/xrd.php:63
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 01415e660a..774401abeb 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:35:21+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:06: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-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -90,11 +90,11 @@ msgstr "Lagre tilgangsinnstillinger"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Lagre"
@@ -157,7 +157,7 @@ msgstr "Ingen slik side."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Ingen slik bruker."
 
@@ -331,7 +331,7 @@ msgstr "Du må angi en verdi for parameteren 'device' med en av: sms, im, none."
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -422,7 +422,7 @@ msgstr "Hoved"
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s tidslinje"
@@ -596,8 +596,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Det nicket er allerede i bruk. Prøv et annet."
@@ -606,8 +606,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ugyldig nick."
@@ -619,8 +619,8 @@ msgstr "Ugyldig nick."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Hjemmesiden er ikke en gyldig URL."
@@ -629,8 +629,8 @@ msgstr "Hjemmesiden er ikke en gyldig URL."
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Fullt navn er for langt (maks 255 tegn)."
@@ -645,8 +645,8 @@ msgstr "Fullt navn er for langt (maks 255 tegn)."
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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)."
@@ -657,8 +657,8 @@ msgstr[1] "Beskrivelsen er for lang (maks %d tegn)."
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Plasseringen er for lang (maks 255 tegn)."
@@ -669,8 +669,8 @@ msgstr "Plasseringen er for lang (maks 255 tegn)."
 #. 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:229
-#: actions/newgroup.php:176
+#: 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,15 +688,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Alias kan ikke være det samme som kallenavn."
 
@@ -820,7 +820,7 @@ msgstr "Du er ikke autorisert."
 #: 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:153 actions/passwordsettings.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
@@ -910,8 +910,8 @@ msgstr "Konto"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Nick"
@@ -1492,7 +1492,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Brukerbilde"
@@ -1787,7 +1787,7 @@ msgstr "Samtale"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Notiser"
@@ -2382,24 +2382,24 @@ 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:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: 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:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Lagret valg."
 
@@ -3225,7 +3225,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.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Innstillinger lagret."
 
@@ -3309,7 +3309,7 @@ msgid "Inbox for %s"
 msgstr "Innboks for %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: 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."
@@ -3751,7 +3751,7 @@ 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:199
+#: actions/newgroup.php:200
 #, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "Alias kan ikke være det samme som kallenavn."
@@ -3959,8 +3959,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "Ikke et støttet dataformat."
 
@@ -3982,34 +3982,36 @@ 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/othersettings.php:111
+#. 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 " (gratis tjeneste)"
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:120
+#: actions/othersettings.php:122
 msgid "Shorten URLs with"
 msgstr "Forkort nettadresser med"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:122
+#: actions/othersettings.php:124
 msgid "Automatic shortening service to use."
 msgstr "Automatisk fortkortelsestjeneste å bruke."
 
 #. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "Vis profilutseender"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: actions/othersettings.php:164
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Adresseforkortelsestjenesten er for lang (maks 50 tegn)."
 
@@ -4044,7 +4046,7 @@ msgstr "Utboks for %1$s - side %2$d"
 msgid "Outbox for %s"
 msgstr "Utboks for %s"
 
-#: actions/outbox.php:116
+#: 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."
 
@@ -4311,7 +4313,7 @@ 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:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "Vedlegg"
 
@@ -4431,7 +4433,6 @@ msgstr "Profilinformasjon"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1‒64 små bokstaver eller tall, ingen tegnsetting eller mellomrom."
 
@@ -4439,15 +4440,15 @@ msgstr "1‒64 små bokstaver eller tall, ingen tegnsetting eller mellomrom."
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Hjemmesiden"
 
@@ -4481,8 +4482,8 @@ msgstr "Om meg"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Plassering"
@@ -5338,13 +5339,13 @@ msgstr "Organisasjon"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistikk"
@@ -5489,60 +5490,60 @@ 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:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Merk"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Alias"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "Gruppehandlinger"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "Medlemmer"
 
@@ -5550,25 +5551,25 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "Alle medlemmer"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Opprettet"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Medlemmer"
@@ -5577,7 +5578,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5596,7 +5597,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5610,30 +5611,30 @@ msgstr ""
 "korte meldinger om deres liv og interesser. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "Administratorer"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Melding fra %1$s på %2$s"
@@ -6585,7 +6586,7 @@ msgstr "Prøv å [søke etter grupper](%%action.groupsearch%%) og bli med i dem.
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Oppdateringar fra %1$s på %2$s!"
@@ -6658,20 +6659,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6684,7 +6685,7 @@ 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:217
+#: 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."
@@ -6693,7 +6694,7 @@ 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:229
+#: 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."
@@ -6701,7 +6702,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Ugyldig filnavn."
 
@@ -6759,7 +6760,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6828,25 +6829,25 @@ 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:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6860,14 +6861,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:765
+#: classes/Profile.php:771
 #, 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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6951,22 +6952,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Kunne ikke lagre lokal gruppeinformasjon."
 
@@ -7707,12 +7708,12 @@ msgid "Do not use this method!"
 msgstr "Ikke slett denne gruppen"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "Forfatter"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "Leverandør"
 
@@ -8103,26 +8104,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 #, 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:164
+#: lib/common.php:165
 #, 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Log inn på nettstedet"
@@ -8316,29 +8317,34 @@ msgstr "Gå"
 msgid "Grant this user the \"%s\" role"
 msgstr "Innvilg denne brukeren rollen «%s»"
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1‒64 små bokstaver eller tall, ingen tegnsetting 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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Beskriv programmet ditt"
 
-#: lib/groupeditform.php:162
+#: 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."
+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:174
+#: 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:182
+#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8869,11 +8875,11 @@ msgstr ""
 "\n"
 "P.S. Du kan slå av disse e-postvarslene her: %8$s\n"
 
-#: lib/mailbox.php:89
+#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "Bare brukeren kan lese sine egne postbokser."
 
-#: lib/mailbox.php:139
+#: 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."
@@ -8882,10 +8888,6 @@ msgstr ""
 "engasjere andre brukere i en samtale. Personer kan sende deg meldinger som "
 "bare du kan se."
 
-#: lib/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "fra"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Kunne ikke tolke meldingen."
@@ -8977,6 +8979,15 @@ 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:522
+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."
@@ -9168,7 +9179,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Ukjent"
 
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index c863a5e210..8883b62de7 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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:35:14+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:06: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-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -91,11 +91,11 @@ msgstr "Toegangsinstellingen opslaan"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Opslaan"
@@ -158,7 +158,7 @@ msgstr "Deze pagina bestaat niet."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Onbekende gebruiker."
 
@@ -337,7 +337,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -427,7 +427,7 @@ msgstr "Overzicht"
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s tijdlijn"
@@ -605,8 +605,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr ""
@@ -616,8 +616,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ongeldige gebruikersnaam!"
@@ -629,8 +629,8 @@ msgstr "Ongeldige gebruikersnaam!"
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "De thuispagina is geen geldige URL."
@@ -639,8 +639,8 @@ msgstr "De thuispagina is geen geldige URL."
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "De volledige naam is te lang (maximaal 255 tekens)."
@@ -655,8 +655,8 @@ msgstr "De volledige naam is te lang (maximaal 255 tekens)."
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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,8 +667,8 @@ msgstr[1] "De beschrijving is te lang (maximaal %d tekens)."
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "De locatie is te lang (maximaal 255 tekens)."
@@ -679,8 +679,8 @@ msgstr "De locatie is te lang (maximaal 255 tekens)."
 #. 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:229
-#: actions/newgroup.php:176
+#: 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,15 +698,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Een alias kan niet hetzelfde zijn als de gebruikersnaam."
 
@@ -827,7 +827,7 @@ msgstr "Het verzoektoken is al geautoriseerd."
 #: 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:153 actions/passwordsettings.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
@@ -921,8 +921,8 @@ msgstr "Gebruikersgegevens"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Gebruikersnaam"
@@ -1277,9 +1277,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Notices %1$s has favorited on %2$s"
-msgstr "Updates van %1$s en vrienden op %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.
@@ -1319,9 +1319,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %1$s is a member of on %2$s"
-msgstr "Groepen waar %s lid van is"
+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
@@ -1438,9 +1438,9 @@ 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
+#, php-format
 msgid "People %1$s has subscribed to on %2$s"
-msgstr "Gebruikers met een abonnement op %s"
+msgstr "Gebruikers die %1$s volgen op %2$s"
 
 #. TRANS: Client error displayed when not using the follow verb.
 #: actions/atompubsubscriptionfeed.php:248
@@ -1501,7 +1501,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Avatar"
@@ -1801,7 +1801,7 @@ msgstr "Dialoog"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Mededelingen"
@@ -2395,24 +2395,24 @@ 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:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: 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:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "De instellingen zijn opgeslagen."
 
@@ -2954,9 +2954,8 @@ 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 "Het was niet mogelijk om uw ontwerpinstellingen op te slaan."
+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
@@ -3065,7 +3064,6 @@ msgstr "Updates voor leden van %1$s op %2$s."
 
 #. TRANS: Title for first page of the groups list.
 #: actions/groups.php:62
-#, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "Groepen"
@@ -3073,7 +3071,7 @@ msgstr "Groepen"
 #. 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
+#, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
 msgstr "Groepen, pagina %d"
@@ -3082,7 +3080,7 @@ msgstr "Groepen, pagina %d"
 #. 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
+#, 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 "
@@ -3091,11 +3089,11 @@ msgid ""
 "%%%)!"
 msgstr ""
 "Met groepen van %%%%site.name%%%% kunt u gebruikers vinden met gelijke "
-"interessen en daarmee in contact treden. Nadat u lid bent geworden van een "
+"interesses en daarmee in contact treden. Nadat u lid bent geworden van een "
 "groep, kunt u berichten naar alle gebruikers zenden met door het voorvoegsel "
 "\"!groepsnaam\" te gebruiken. Als u geen groep ziet die u aantreft, "
 "[doorzoek dan de groepen](%%%%action.groupsearch%%%%) of [start zelf een "
-"groep!](%%%%action.newgroup%%%%)."
+"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
@@ -3127,7 +3125,7 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
 "action.newgroup%%) yourself."
@@ -3170,13 +3168,14 @@ msgstr "IM-instellingen"
 #. 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
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can send and receive notices through Jabber/Google Talk [instant "
 "messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
-"U kunt berichten verzenden en ontvangen via Jabber/GTalk [\"onmiddellijke "
-"berichten\"](%%doc.im%%). Maak hieronder uw instellingen."
+"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.
 #: actions/imsettings.php:90
@@ -3190,21 +3189,20 @@ msgid "IM address"
 msgstr "IM-adres"
 
 #: actions/imsettings.php:109
-#, fuzzy
 msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Huidige bevestigde Jabber/GTalk adres."
+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
-#, 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 ""
-"Er wordt gewacht op bevestiging van dit adres. Controleer uw Jabber/GTalk-"
-"gebruiker op een bericht met nadere instructies. Hebt u %s aan uw "
-"contactenlijst toegevoegd?"
+"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.
@@ -3212,13 +3210,14 @@ 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-ID of GTalk-adres, zoals \"gebruiker@example.org\". Zorg ervoor dat u "
-"%s eerst aan uw contactenlijst in uw IM-programma of in GTalk toevoegt."
+"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."
 
 #. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
@@ -3227,33 +3226,30 @@ msgstr "IM-voorkeuren"
 
 #. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-#, fuzzy
 msgid "Send me notices through Jabber/Google Talk."
-msgstr "Mij berichten sturen via Jabber/GTalk."
+msgstr "Mij berichten sturen via Jabber of 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 "Een mededeling versturen als mijn Jabber/GTalk-status wijzigt."
+msgstr ""
+"Een mededeling verzenden als mijn Jabber- of Google Talk-status wijzigt."
 
 #. 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 ""
-"Mij antwoorden sturen via Jabber/GTalk van gebruikers op wie ik niet "
-"geabonneerd ben."
+"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
-#, fuzzy
 msgid "Publish a MicroID for my Jabber/Google Talk address."
-msgstr "Een MicroID voor mijn Jabber/GTalk-adres publiceren."
+msgstr "Een MicroID voor mijn Jabber- of Google Talk-adres publiceren."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Uw voorkeuren zijn opgeslagen."
 
@@ -3264,15 +3260,13 @@ msgstr "Geen 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 "Het was niet mogelijk om het Jabber-ID te normaliseren"
+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
-#, fuzzy
 msgid "Not a valid Jabber ID."
-msgstr "Geen geldige Jabber-ID"
+msgstr "Geen geldige Jabber-ID."
 
 #. TRANS: Message given saving Instant Messaging address that is already set.
 #: actions/imsettings.php:321
@@ -3336,7 +3330,7 @@ msgid "Inbox for %s"
 msgstr "Postvak IN van %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: 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."
 
@@ -3435,9 +3429,8 @@ msgstr "E-mailadressen"
 
 #. 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 "Adressen van uit te nodigen vrienden (één per regel)"
+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
@@ -3786,7 +3779,7 @@ 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:199
+#: actions/newgroup.php:200
 msgid "Alias cannot be the same as nickname."
 msgstr "Een alias kan niet hetzelfde zijn als de gebruikersnaam."
 
@@ -4000,8 +3993,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "Geen ondersteund gegevensformaat."
 
@@ -4023,34 +4016,36 @@ 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/othersettings.php:111
+#. 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 " (gratis dienst)"
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:120
+#: 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:122
+#: actions/othersettings.php:124
 msgid "Automatic shortening service to use."
 msgstr "Te gebruiken automatische verkortingsdienst."
 
 #. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "Profielontwerpen gebruiken"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: 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)."
 
@@ -4084,7 +4079,7 @@ msgstr "Postvak UIT voor %1$s - pagina %2$d"
 msgid "Outbox for %s"
 msgstr "Postvak UIT voor %s"
 
-#: actions/outbox.php:116
+#: 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."
 
@@ -4349,7 +4344,7 @@ 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:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "Bijlagen"
 
@@ -4472,7 +4467,6 @@ msgstr "Profielinformatie"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties."
 
@@ -4480,15 +4474,15 @@ msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties."
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Startpagina"
 
@@ -4522,8 +4516,8 @@ msgstr "Beschrijving"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Locatie"
@@ -5383,13 +5377,13 @@ msgstr "Organisatie"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistieken"
@@ -5535,60 +5529,60 @@ 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:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Opmerking"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Aliassen"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "Groepshandelingen"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "Leden"
 
@@ -5596,25 +5590,25 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "Alle leden"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Aangemaakt"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Leden"
@@ -5623,7 +5617,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5642,7 +5636,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5656,30 +5650,30 @@ msgstr ""
 "over hun ervaringen en interesses. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "Beheerders"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Bericht van %1$s op %2$s"
@@ -6649,7 +6643,7 @@ msgstr ""
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Updates van %1$s op %2$s."
@@ -6731,20 +6725,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6761,7 +6755,7 @@ 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:217
+#: 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."
@@ -6770,7 +6764,7 @@ 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:229
+#: 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."
@@ -6781,7 +6775,7 @@ msgstr[1] ""
 "bytes."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Ongeldige bestandsnaam."
 
@@ -6839,7 +6833,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr "Geen databasenaam of DSN gevonden."
 
@@ -6915,12 +6909,12 @@ 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:923
+#: 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:1022
+#: classes/Notice.php:1028
 msgid "Problem saving group inbox."
 msgstr ""
 "Er is een probleem opgetreden bij het opslaan van het Postvak IN van de "
@@ -6928,14 +6922,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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6949,7 +6943,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:765
+#: classes/Profile.php:771
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -6958,7 +6952,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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7042,22 +7036,22 @@ 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:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Het was niet mogelijk de lokale groepsinformatie op te slaan."
 
@@ -7465,7 +7459,7 @@ msgstr "De gebruiker is al lid van deze groep."
 #: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
-msgstr ""
+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
@@ -7798,12 +7792,12 @@ msgid "Do not use this method!"
 msgstr "Gebruik deze methode niet!"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "Auteur"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "Provider"
 
@@ -8236,25 +8230,25 @@ msgstr ""
 "tracking - nog niet beschikbaar\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 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:164
+#: lib/common.php:165
 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "Naar het installatieprogramma gaan."
 
@@ -8434,28 +8428,33 @@ msgstr "OK"
 msgid "Grant this user the \"%s\" role"
 msgstr "Deze gebruiker de rol \"%s\" geven"
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Beschrijf de groep of het onderwerp"
 
-#: lib/groupeditform.php:162
-#, 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."
+#: 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] "Beschrijf de groep in %d teken of minder."
 msgstr[1] "Beschrijf de groep in %d tekens of minder."
 
-#: lib/groupeditform.php:174
+#: 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:182
+#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8994,11 +8993,11 @@ msgstr ""
 "\n"
 "Ps. U kunt de e-mailmeldingen hier uitschakelen: %8$s\n"
 
-#: lib/mailbox.php:89
+#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "Gebruikers kunnen alleen hun eigen postvakken lezen."
 
-#: lib/mailbox.php:139
+#: 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."
@@ -9006,10 +9005,6 @@ msgstr ""
 "U hebt geen privéberichten. U kunt privéberichten verzenden aan andere "
 "gebruikers. Mensen kunnen u privéberichten sturen die alleen u kunt lezen."
 
-#: lib/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "van"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Het was niet mogelijk het bericht te verwerken."
@@ -9101,6 +9096,15 @@ msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Verzenden"
 
+#: lib/messagelist.php:77
+#, fuzzy
+msgid "Messages"
+msgstr "Bericht"
+
+#: lib/messagelistitem.php:123 lib/noticelist.php:522
+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."
@@ -9287,7 +9291,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Onbekend"
 
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 8af4b58618..5049240890 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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:35:18+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:06:27+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 (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -96,11 +96,11 @@ msgstr "Avatar-innstillingar"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
@@ -165,7 +165,7 @@ msgstr "Dette emneord finst ikkje."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Brukaren finst ikkje."
 
@@ -334,7 +334,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -422,7 +422,7 @@ msgstr ""
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s tidsline"
@@ -603,8 +603,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
@@ -613,8 +613,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Ikkje eit gyldig brukarnamn."
@@ -626,8 +626,8 @@ msgstr "Ikkje eit gyldig brukarnamn."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Heimesida er ikkje ei gyldig internettadresse."
@@ -636,8 +636,8 @@ msgstr "Heimesida er ikkje ei gyldig internettadresse."
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -653,8 +653,8 @@ msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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,8 +665,8 @@ msgstr[1] "Plassering er for lang (maksimalt 255 teikn)."
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -678,8 +678,8 @@ msgstr "Plassering er for lang (maksimalt 255 teikn)."
 #. 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:229
-#: actions/newgroup.php:176
+#: 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,15 +697,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -832,7 +832,7 @@ msgstr "Du tingar ikkje oppdateringar til den profilen."
 #: 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:153 actions/passwordsettings.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
@@ -919,8 +919,8 @@ msgstr "Konto"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Kallenamn"
@@ -1510,7 +1510,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Brukarbilete"
@@ -1813,7 +1813,7 @@ msgstr "Stadfestingskode"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Notisar"
@@ -2428,25 +2428,25 @@ 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:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: 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:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Lagra innstillingar."
 
@@ -3279,7 +3279,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.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Lagra brukarval."
 
@@ -3363,7 +3363,7 @@ msgid "Inbox for %s"
 msgstr "Innboks for %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "Dette er innboksen for dine private meldingar."
 
@@ -3818,7 +3818,7 @@ 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:199
+#: actions/newgroup.php:200
 msgid "Alias cannot be the same as nickname."
 msgstr ""
 
@@ -4024,8 +4024,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "Ikkje eit støtta dataformat."
 
@@ -4047,35 +4047,37 @@ 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/othersettings.php:111
+#. 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:120
+#: actions/othersettings.php:122
 msgid "Shorten URLs with"
 msgstr ""
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:122
+#: actions/othersettings.php:124
 msgid "Automatic shortening service to use."
 msgstr "Den automatisk forkortingstenesta du vil bruke"
 
 #. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
 #, fuzzy
 msgid "View profile designs"
 msgstr "Profilinnstillingar"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: 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)."
@@ -4114,7 +4116,7 @@ msgstr "Utboks for %s"
 msgid "Outbox for %s"
 msgstr "Utboks for %s"
 
-#: actions/outbox.php:116
+#: 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."
 
@@ -4392,7 +4394,7 @@ msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
 #. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr ""
 
@@ -4518,7 +4520,6 @@ msgstr "Profil informasjon"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4528,15 +4529,15 @@ msgstr ""
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Heimeside"
 
@@ -4572,8 +4573,8 @@ msgstr "Om meg"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Plassering"
@@ -5431,13 +5432,13 @@ msgstr "Paginering"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistikk"
@@ -5572,60 +5573,60 @@ msgid "%1$s group, page %2$d"
 msgstr "Grupper, side %d"
 
 #. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Merknad"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr ""
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "Gruppe handlingar"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "Medlemmar"
 
@@ -5633,25 +5634,25 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "Alle medlemmar"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Oppretta"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Medlemmar"
@@ -5660,7 +5661,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5673,7 +5674,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:486
+#: actions/showgroup.php:498
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5685,31 +5686,31 @@ msgstr ""
 "wikipedia.org/wiki/Micro-blogging)-teneste"
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 #, fuzzy
 msgid "Admins"
 msgstr "Administrator"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Melding fra %1$s på %2$s"
@@ -6671,7 +6672,7 @@ msgstr ""
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Oppdateringar frå %1$s på %2$s!"
@@ -6743,20 +6744,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6769,7 +6770,7 @@ 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:217
+#: 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."
@@ -6778,7 +6779,7 @@ 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:229
+#: 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."
@@ -6786,7 +6787,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Ugyldig filnamn."
 
@@ -6848,7 +6849,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6920,26 +6921,26 @@ 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:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6953,14 +6954,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:765
+#: classes/Profile.php:771
 #, 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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7044,22 +7045,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 #, fuzzy
 msgid "Could not save local group info."
 msgstr "Kunne ikkje lagra abonnement."
@@ -7822,12 +7823,12 @@ msgid "Do not use this method!"
 msgstr "Ikkje slett denne gruppa"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr ""
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "Forhandsvis"
 
@@ -8216,26 +8217,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 #, 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:164
+#: lib/common.php:165
 #, 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Logg inn or sida"
@@ -8423,30 +8424,36 @@ msgstr "Gå"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, 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"
+
+#: 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:160
+#: lib/groupeditform.php:161
 #, fuzzy
 msgid "Describe the group or topic"
 msgstr "Beskriv gruppa eller emnet med 140 teikn"
 
-#: lib/groupeditform.php:162
+#: 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."
+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:174
+#: 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:182
+#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8894,21 +8901,16 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:89
+#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "Kun brukaren kan lese sine eigne meldingar."
 
-#: lib/mailbox.php:139
+#: 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/mailbox.php:228 lib/noticelist.php:522
-#, fuzzy
-msgid "from"
-msgstr " frå "
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Kunne ikkje prosessera melding."
@@ -8999,6 +9001,16 @@ 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:522
+#, 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."
@@ -9192,7 +9204,7 @@ 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:121
+#: lib/plugin.php:126
 #, fuzzy
 msgid "Unknown"
 msgstr "Uventa handling."
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index 2ea411c561..a50e613282 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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:35:25+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:06:32+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 (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -93,11 +93,11 @@ msgstr "Zapisz ustawienia dostępu"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Zapisz"
@@ -160,7 +160,7 @@ msgstr "Nie ma takiej strony."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Brak takiego użytkownika."
 
@@ -337,7 +337,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -430,7 +430,7 @@ msgstr "Główny"
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "Oś czasu użytkownika %s"
@@ -607,8 +607,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonim jest już używany. Spróbuj innego."
@@ -617,8 +617,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "To nie jest prawidłowy pseudonim."
@@ -630,8 +630,8 @@ msgstr "To nie jest prawidłowy pseudonim."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Strona domowa nie jest prawidłowym adresem URL."
@@ -640,8 +640,8 @@ msgstr "Strona domowa nie jest prawidłowym adresem URL."
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: 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)."
@@ -656,8 +656,8 @@ msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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)."
@@ -669,8 +669,8 @@ msgstr[2] "Opis jest za długi (maksymalnie %d znaków)."
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
@@ -681,8 +681,8 @@ msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
 #. 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:229
-#: actions/newgroup.php:176
+#: 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."
@@ -701,15 +701,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Alias nie może być taki sam jak pseudonim."
 
@@ -830,7 +830,7 @@ msgstr "Token żądania został już upoważniony."
 #: 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:153 actions/passwordsettings.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
@@ -920,8 +920,8 @@ msgstr "Konto"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Pseudonim"
@@ -1493,7 +1493,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Awatar"
@@ -1793,7 +1793,7 @@ msgstr "Rozmowa"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Wpisy"
@@ -2379,24 +2379,24 @@ 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:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: 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:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Zapisano opcje."
 
@@ -3223,7 +3223,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.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Zapisano preferencje."
 
@@ -3306,7 +3306,7 @@ msgid "Inbox for %s"
 msgstr "Odebrane wiadomości użytkownika %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: 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."
@@ -3761,7 +3761,7 @@ 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:199
+#: actions/newgroup.php:200
 msgid "Alias cannot be the same as nickname."
 msgstr "Alias nie może być taki sam jak pseudonim."
 
@@ -3970,8 +3970,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "To nie jest obsługiwany format danych."
 
@@ -3993,34 +3993,36 @@ 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/othersettings.php:111
+#. 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:120
+#: 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:122
+#: actions/othersettings.php:124
 msgid "Automatic shortening service to use."
 msgstr "Używana automatyczna usługa skracania."
 
 #. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "Wyświetl ustawienia wyglądu profilu"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: 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)."
 
@@ -4054,7 +4056,7 @@ msgstr "Wysłane wiadomości użytkownika %1$s - strona %2$d"
 msgid "Outbox for %s"
 msgstr "Wysłane wiadomości użytkownika %s"
 
-#: actions/outbox.php:116
+#: 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ś."
 
@@ -4321,7 +4323,7 @@ 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:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "Załączniki"
 
@@ -4442,7 +4444,6 @@ msgstr "Informacje o profilu"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 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."
 
@@ -4450,15 +4451,15 @@ msgstr "1-64 małe litery lub liczby, bez spacji i znaków przestankowych."
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Strona domowa"
 
@@ -4493,8 +4494,8 @@ msgstr "O mnie"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Położenie"
@@ -5341,13 +5342,13 @@ msgstr "Organizacja"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statystyki"
@@ -5491,60 +5492,60 @@ 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:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Wpis"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Aliasy"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "Działania grupy"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "Członkowie"
 
@@ -5552,25 +5553,25 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "Wszyscy członkowie"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Utworzono"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Członkowie"
@@ -5579,7 +5580,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5598,7 +5599,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5612,30 +5613,30 @@ 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:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "Administratorzy"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Wiadomość od użytkownika %1$s na %2$s"
@@ -6593,7 +6594,7 @@ msgstr "Spróbuj [wyszukać grupy](%%action.groupsearch%%) i dołączyć do nich
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Aktualizacje z %1$s na %2$s."
@@ -6677,20 +6678,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6710,7 +6711,7 @@ 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:217
+#: 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."
@@ -6723,7 +6724,7 @@ 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:229
+#: 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."
@@ -6738,7 +6739,7 @@ msgstr[2] ""
 "d bajtów."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Nieprawidłowa nazwa pliku."
 
@@ -6796,7 +6797,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr "Nigdzie nie odnaleziono nazwy lub DSN bazy danych."
 
@@ -6867,25 +6868,25 @@ 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:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6899,14 +6900,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:765
+#: classes/Profile.php:771
 #, 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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6988,22 +6989,22 @@ 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:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Nie można zapisać informacji o lokalnej grupie."
 
@@ -7736,12 +7737,12 @@ 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:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "Autor"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "Dostawca"
 
@@ -8169,24 +8170,24 @@ msgstr ""
 "tracking - jeszcze nie zaimplementowano\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 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:164
+#: lib/common.php:165
 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "Przejdź do instalatora."
 
@@ -8366,30 +8367,35 @@ msgstr "Przejdź"
 msgid "Grant this user the \"%s\" role"
 msgstr "Nadaj użytkownikowi rolę \"%s\""
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Opisz grupę lub temat"
 
-#: lib/groupeditform.php:162
-#, 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."
+#: 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] "Opisz grupę lub temat w %d znaku."
 msgstr[1] "Opisz grupę lub temat w %d znakach lub mniej."
 msgstr[2] "Opisz grupę lub temat w %d znakach lub mniej."
 
-#: lib/groupeditform.php:174
+#: 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:182
+#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8935,11 +8941,11 @@ msgstr ""
 "\n"
 "PS Można wyłączyć powiadomienia przez e-mail tutaj: %8$s\n"
 
-#: lib/mailbox.php:89
+#: 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:139
+#: 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."
@@ -8948,10 +8954,6 @@ msgstr ""
 "rozmowę z innymi użytkownikami. Inni mogą wysyłać ci wiadomości tylko dla "
 "twoich oczu."
 
-#: lib/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "z"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Nie można przetworzyć wiadomości."
@@ -9041,6 +9043,15 @@ 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:522
+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."
@@ -9231,7 +9242,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Nieznane"
 
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index bc75c523a9..af8af1c4e5 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:35:30+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:06:34+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 (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -94,11 +94,11 @@ msgstr "Gravar configurações de acesso"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Gravar"
@@ -161,7 +161,7 @@ msgstr "Página não foi encontrada."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Utilizador não foi encontrado."
 
@@ -337,7 +337,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -428,7 +428,7 @@ msgstr "Principal"
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "Notas de %s"
@@ -605,8 +605,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Utilizador já é usado. Tente outro."
@@ -615,8 +615,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Utilizador não é válido."
@@ -628,8 +628,8 @@ msgstr "Utilizador não é válido."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Página de ínicio não é uma URL válida."
@@ -638,8 +638,8 @@ 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.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -655,8 +655,8 @@ msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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,8 +667,8 @@ 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.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -680,8 +680,8 @@ 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.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:176
+#: 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."
@@ -699,15 +699,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 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."
 
@@ -831,7 +831,7 @@ msgstr "Não tem autorização."
 #: 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:153 actions/passwordsettings.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
@@ -923,8 +923,8 @@ msgstr "Conta"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Utilizador"
@@ -1511,7 +1511,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Avatar"
@@ -1811,7 +1811,7 @@ msgstr "Conversação"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Notas"
@@ -2417,24 +2417,24 @@ 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:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: 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:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Opções gravadas."
 
@@ -3269,7 +3269,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.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Preferências gravadas."
 
@@ -3353,7 +3353,7 @@ msgid "Inbox for %s"
 msgstr "Caixa de entrada de %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: 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 "
@@ -3806,7 +3806,7 @@ 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:199
+#: 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."
@@ -4012,8 +4012,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "Formato de dados não suportado."
 
@@ -4035,34 +4035,36 @@ 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/othersettings.php:111
+#. 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 gratuito)"
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:120
+#: actions/othersettings.php:122
 msgid "Shorten URLs with"
 msgstr "Encurtar URLs com"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:122
+#: 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:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "Ver estilos para o perfil"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: 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)"
@@ -4097,7 +4099,7 @@ msgstr "Caixa de saída de %s - página %2$d"
 msgid "Outbox for %s"
 msgstr "Caixa de saída de %s"
 
-#: actions/outbox.php:116
+#: 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."
@@ -4375,7 +4377,7 @@ 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:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "Anexos"
 
@@ -4503,7 +4505,6 @@ msgstr "Informação do perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 #, 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"
@@ -4512,15 +4513,15 @@ msgstr "1-64 letras minúsculas ou números, sem pontuação ou espaços"
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Página pessoal"
 
@@ -4555,8 +4556,8 @@ msgstr "Biografia"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Localidade"
@@ -5424,13 +5425,13 @@ msgstr "Organização"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Estatísticas"
@@ -5575,60 +5576,60 @@ 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:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Anotação"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Nomes alternativos"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "Acções do grupo"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "Membros"
 
@@ -5636,26 +5637,26 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "Todos os membros"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Criado"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5665,7 +5666,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5684,7 +5685,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5698,30 +5699,30 @@ 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:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "Gestores"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Mensagem de %1$s a %2$s"
@@ -6683,7 +6684,7 @@ msgstr "Tente [pesquisar grupos](%%action.groupsearch%%) e juntar-se a eles."
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Actualizações de %1#s a %2$s!"
@@ -6764,20 +6765,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6794,7 +6795,7 @@ 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:217
+#: 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."
@@ -6805,7 +6806,7 @@ 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:229
+#: 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."
@@ -6815,7 +6816,7 @@ 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:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Nome de ficheiro inválido."
 
@@ -6873,7 +6874,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr "Não foi encontrado nenhum nome de base de dados ou DSN."
 
@@ -6944,26 +6945,26 @@ 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:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6977,7 +6978,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:765
+#: classes/Profile.php:771
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -6985,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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7067,22 +7068,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: 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."
 
@@ -7820,12 +7821,12 @@ msgid "Do not use this method!"
 msgstr "Não apagar esta nota"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "Autor"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "Fornecedor"
 
@@ -8248,26 +8249,26 @@ msgstr ""
 "tracking - ainda não implementado.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 #, 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:164
+#: lib/common.php:165
 #, 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "Ir para o instalador."
 
@@ -8455,29 +8456,34 @@ msgstr "Prosseguir"
 msgid "Grant this user the \"%s\" role"
 msgstr "Atribuir a este utilizador a função \"%s\""
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, 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"
+
+#: 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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Descreva o grupo ou assunto"
 
-#: lib/groupeditform.php:162
+#: 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."
+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:174
+#: 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:182
+#: lib/groupeditform.php:183
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -9014,11 +9020,11 @@ msgstr ""
 "\n"
 "P.S. Pode desligar estas notificações electrónicas aqui: %8$s\n"
 
-#: lib/mailbox.php:89
+#: 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:139
+#: 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."
@@ -9027,10 +9033,6 @@ msgstr ""
 "conversa com outros utilizadores. Outros podem enviar-lhe mensagens, a que "
 "só você terá acesso."
 
-#: lib/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "a partir de"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Não foi possível fazer a análise sintáctica da mensagem."
@@ -9124,6 +9126,15 @@ 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:522
+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."
@@ -9313,7 +9324,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Desconhecida"
 
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index f59c043271..80a66372b3 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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:35:33+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:06:37+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 (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -95,11 +95,11 @@ msgstr "Salvar as configurações de acesso"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salvar"
@@ -162,7 +162,7 @@ msgstr "Esta página não existe."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Este usuário não existe."
 
@@ -340,7 +340,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -431,7 +431,7 @@ msgstr "Principal"
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "Mensagens de %s"
@@ -610,8 +610,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Esta identificação já está em uso. Tente outro."
@@ -620,8 +620,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Não é uma identificação válida."
@@ -633,8 +633,8 @@ msgstr "Não é uma identificação válida."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "A URL informada não é válida."
@@ -643,8 +643,8 @@ msgstr "A URL informada não é válida."
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "O nome completo é muito extenso (máx. 255 caracteres)"
@@ -659,8 +659,8 @@ msgstr "O nome completo é muito extenso (máx. 255 caracteres)"
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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)."
@@ -671,8 +671,8 @@ msgstr[1] "A descrição é muito extensa (máximo %d caracteres)."
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "A localização é muito extensa (máx. 255 caracteres)."
@@ -683,8 +683,8 @@ msgstr "A localização é muito extensa (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.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:176
+#: 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."
@@ -702,15 +702,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "O apelido não pode ser igual à identificação."
 
@@ -831,7 +831,7 @@ msgstr "O token solicitado já foi autorizado."
 #: 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:153 actions/passwordsettings.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
@@ -923,8 +923,8 @@ msgstr "Conta"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Usuário"
@@ -1500,7 +1500,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Avatar"
@@ -1802,7 +1802,7 @@ msgstr "Conversa"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Mensagens"
@@ -2399,24 +2399,24 @@ 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:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: 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:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "As configurações foram salvas."
 
@@ -3255,7 +3255,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.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "As preferências foram salvas."
 
@@ -3339,7 +3339,7 @@ msgid "Inbox for %s"
 msgstr "Recebidas por %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: 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 "
@@ -3796,7 +3796,7 @@ 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:199
+#: actions/newgroup.php:200
 #, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "O apelido não pode ser igual à identificação."
@@ -4007,8 +4007,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "Não é um formato de dados suportado."
 
@@ -4030,34 +4030,36 @@ 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/othersettings.php:111
+#. 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:120
+#: actions/othersettings.php:122
 msgid "Shorten URLs with"
 msgstr "Encolher URLs com"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:122
+#: 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:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "Visualizar aparências do perfil"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: 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)."
 
@@ -4091,7 +4093,7 @@ msgstr "Enviadas por %s - pág. %2$d"
 msgid "Outbox for %s"
 msgstr "Enviadas de %s"
 
-#: actions/outbox.php:116
+#: 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 "
@@ -4359,7 +4361,7 @@ 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:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "Anexos"
 
@@ -4480,7 +4482,6 @@ msgstr "Informações do perfil"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 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."
 
@@ -4488,15 +4489,15 @@ msgstr "1-64 letras minúsculas ou números, sem pontuações ou espaços."
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Site"
 
@@ -4530,8 +4531,8 @@ msgstr "Descrição"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Localização"
@@ -5399,13 +5400,13 @@ msgstr "Organização"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Estatísticas"
@@ -5548,60 +5549,60 @@ 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:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Mensagem"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Apelidos"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "Ações do grupo"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "Membros"
 
@@ -5609,25 +5610,25 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "Todos os membros"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Criado"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Membros"
@@ -5636,7 +5637,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5655,7 +5656,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5669,30 +5670,30 @@ msgstr ""
 "sobre suas vidas e interesses. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "Administradores"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Mensagem de %1$s no %2$s"
@@ -6653,7 +6654,7 @@ msgstr ""
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Mensagens de %1$s no %2$s!"
@@ -6735,20 +6736,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6765,7 +6766,7 @@ 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:217
+#: 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."
@@ -6774,7 +6775,7 @@ 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:229
+#: 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."
@@ -6782,7 +6783,7 @@ 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:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Nome de arquivo inválido."
 
@@ -6840,7 +6841,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr "Não foi encontrado nenhum nome de base de dados ou DSN."
 
@@ -6911,26 +6912,26 @@ 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:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6944,14 +6945,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:765
+#: classes/Profile.php:771
 #, 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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7033,22 +7034,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: 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."
 
@@ -7787,12 +7788,12 @@ msgid "Do not use this method!"
 msgstr "Não excluir este grupo"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "Autor"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "Operadora"
 
@@ -8223,26 +8224,26 @@ msgstr ""
 "tracking -  não implementado ainda\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 #, 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:164
+#: lib/common.php:165
 #, 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "Ir para o instalador."
 
@@ -8429,23 +8430,28 @@ msgstr "Ir"
 msgid "Grant this user the \"%s\" role"
 msgstr "Associa o papel \"%s\" a este usuário"
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Descreva o grupo ou tópico"
 
-#: lib/groupeditform.php:162
+#: 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."
+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:174
+#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
@@ -8453,7 +8459,7 @@ msgstr ""
 "Localização do grupo, caso tenha alguma, como \"cidade, estado (ou região), "
 "país\""
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:183
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8991,11 +8997,11 @@ msgstr ""
 "\n"
 "P.S.: Você pode cancelar a notificações por e-mail aqui: %8$s\n"
 
-#: lib/mailbox.php:89
+#: 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:139
+#: 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."
@@ -9004,10 +9010,6 @@ msgstr ""
 "privadas para envolver outras pessoas em uma conversa. Você também pode "
 "receber mensagens privadas."
 
-#: lib/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "de"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Não foi possível analisar a mensagem."
@@ -9101,6 +9103,15 @@ 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:522
+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."
@@ -9292,7 +9303,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Desconhecido"
 
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 11c4ee401f..03126770f7 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - Core to Russian (Русский)
 # Exported from translatewiki.net
 #
+# Author: AVRS
 # Author: Brion
 # Author: Eleferen
 # Author: Haffman
@@ -17,18 +18,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:35:39+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:06:39+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 (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -98,11 +99,11 @@ msgstr "Сохранить настройки доступа"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Сохранить"
@@ -165,7 +166,7 @@ msgstr "Нет такой страницы."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Нет такого пользователя."
 
@@ -341,7 +342,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -434,7 +435,7 @@ msgstr "Главная"
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "Лента %s"
@@ -612,8 +613,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Такое имя уже используется. Попробуйте какое-нибудь другое."
@@ -622,8 +623,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Неверное имя."
@@ -635,8 +636,8 @@ msgstr "Неверное имя."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "URL Главной страницы неверен."
@@ -645,8 +646,8 @@ msgstr "URL Главной страницы неверен."
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Полное имя слишком длинное (максимум 255 символов)."
@@ -661,8 +662,8 @@ msgstr "Полное имя слишком длинное (максимум 255
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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,8 +675,8 @@ msgstr[2] "Слишком длинное описание (максимум %d 
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Слишком длинное месторасположение (максимум 255 символов)."
@@ -686,8 +687,8 @@ 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.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:176
+#: 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."
@@ -706,15 +707,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Алиас не может совпадать с именем."
 
@@ -835,7 +836,7 @@ msgstr "Ключ запроса уже авторизован."
 #: 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:153 actions/passwordsettings.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
@@ -926,8 +927,8 @@ msgstr "Аккаунт"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Имя"
@@ -1505,7 +1506,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Аватар"
@@ -1801,7 +1802,7 @@ msgstr "Дискуссия"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Записи"
@@ -2396,24 +2397,24 @@ msgstr "Заполните информацию о группе в следую
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: actions/editgroup.php:281 classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "Не удаётся создать алиасы."
 
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Настройки сохранены."
 
@@ -3255,7 +3256,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Опубликовать MicroID для моего Jabber/GTalk - адреса."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Предпочтения сохранены."
 
@@ -3339,7 +3340,7 @@ msgid "Inbox for %s"
 msgstr "Входящие для %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "Это ваш ящик входящих сообщений, в котором хранятся поступившие личные "
@@ -3796,7 +3797,7 @@ msgid "Use this form to create a new group."
 msgstr "Используйте эту форму для создания новой группы."
 
 #. TRANS: Group create form validation error.
-#: actions/newgroup.php:199
+#: actions/newgroup.php:200
 #, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "Алиас не может совпадать с именем."
@@ -4004,8 +4005,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "Неподдерживаемый формат данных."
 
@@ -4027,34 +4028,36 @@ 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/othersettings.php:111
+#. 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 " (бесплатный сервис)"
+msgstr " (свободный сервис)"
 
 #. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:120
+#: actions/othersettings.php:122
 msgid "Shorten URLs with"
 msgstr "Сокращать URL с помощью"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:122
+#: actions/othersettings.php:124
 msgid "Automatic shortening service to use."
 msgstr "Автоматически использовать выбранный сервис"
 
 #. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "Показать оформления профиля"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: actions/othersettings.php:164
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Сервис сокращения URL слишком длинный (максимум 50 символов)."
 
@@ -4088,7 +4091,7 @@ msgstr "Исходящие для %s — страница %2$d"
 msgid "Outbox for %s"
 msgstr "Исходящие для %s"
 
-#: actions/outbox.php:116
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Это список исходящих писем, в котором перечислены отправленные вами личные "
@@ -4355,7 +4358,7 @@ msgstr "Директория, в которой расположены фоно
 
 #. TRANS: Fieldset legens in Paths admin panel.
 #. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "Вложения"
 
@@ -4475,7 +4478,6 @@ msgstr "Информация профиля"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 "1-64 латинских строчных буквы или цифры, без знаков препинания и пробелов"
@@ -4484,15 +4486,15 @@ msgstr ""
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Главная"
 
@@ -4527,8 +4529,8 @@ msgstr "Биография"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Месторасположение"
@@ -5387,13 +5389,13 @@ msgstr "Организация"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Статистика"
@@ -5537,60 +5539,60 @@ msgid "%1$s group, page %2$d"
 msgstr "Группа %1$s, страница %2$d"
 
 #. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Запись"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Алиасы"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "Действия группы"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "Участники"
 
@@ -5598,25 +5600,25 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "Все участники"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Дата создания"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Участники"
@@ -5625,7 +5627,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5644,7 +5646,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5658,30 +5660,30 @@ msgstr ""
 "короткими сообщениями о своей жизни и интересах. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "Администраторы"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Сообщение от %1$s на %2$s"
@@ -6643,7 +6645,7 @@ msgstr ""
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Обновлено от %1$s на %2$s!"
@@ -6725,20 +6727,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6758,7 +6760,7 @@ 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:217
+#: 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."
@@ -6769,7 +6771,7 @@ 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:229
+#: 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."
@@ -6778,7 +6780,7 @@ msgstr[1] "Файл такого размера превысит вашу мес
 msgstr[2] "Файл такого размера превысит вашу месячную квоту в %d байт."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Неверное имя файла."
 
@@ -6836,7 +6838,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr "Имя базы данных или DSN не найдено."
 
@@ -6907,25 +6909,25 @@ msgid "Problem saving notice."
 msgstr "Проблемы с сохранением записи."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6939,7 +6941,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:765
+#: classes/Profile.php:771
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -6948,7 +6950,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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7029,22 +7031,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr "Вызов отключённого кода однопользовательского режима."
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Не удаётся сохранить информацию о локальной группе."
 
@@ -7780,12 +7782,12 @@ msgid "Do not use this method!"
 msgstr "Не удаляйте эту группу"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "Автор"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "Сервис"
 
@@ -8217,24 +8219,24 @@ msgstr ""
 "tracking — пока не реализовано.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 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:164
+#: lib/common.php:165
 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "Перейти к установщику"
 
@@ -8417,30 +8419,36 @@ msgstr "Перейти"
 msgid "Grant this user the \"%s\" role"
 msgstr "Назначить этому пользователю роль «%s»"
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Опишите группу или тему"
 
-#: lib/groupeditform.php:162
+#: 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."
+msgid "Describe the group or topic in %d character or less"
+msgid_plural "Describe the group or topic in %d characters or less"
 msgstr[0] "Опишите группу или тему, используя до %d символов"
 msgstr[1] "Опишите группу или тему, используя до %d символов"
 msgstr[2] "Опишите группу или тему, используя до %d символов"
 
-#: lib/groupeditform.php:174
+#: lib/groupeditform.php:175
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Местонахождение группы, если есть, например «Город, область (или регион), "
 "страна»."
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8984,11 +8992,11 @@ msgstr ""
 "\n"
 "PS Вы можете отключить эти уведомления по электронной почте здесь: %8$s\n"
 
-#: lib/mailbox.php:89
+#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "Только сам пользователь может читать собственный почтовый ящик."
 
-#: lib/mailbox.php:139
+#: 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."
@@ -8997,10 +9005,6 @@ msgstr ""
 "вовлечения других пользователей в разговор. Сообщения, получаемые от других "
 "людей, видите только вы."
 
-#: lib/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "от"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Сообщение не удаётся разобрать."
@@ -9092,6 +9096,15 @@ msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Отправить"
 
+#: lib/messagelist.php:77
+#, fuzzy
+msgid "Messages"
+msgstr "Сообщение"
+
+#: lib/messagelistitem.php:123 lib/noticelist.php:522
+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."
@@ -9283,7 +9296,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Неизвестно"
 
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 635888d61d..15d455b818 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-02 23:29+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+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"
@@ -84,11 +84,11 @@ msgstr ""
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr ""
@@ -151,7 +151,7 @@ msgstr ""
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr ""
 
@@ -319,7 +319,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -405,7 +405,7 @@ msgstr ""
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr ""
@@ -578,8 +578,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr ""
@@ -588,8 +588,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr ""
@@ -601,8 +601,8 @@ msgstr ""
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr ""
@@ -611,8 +611,8 @@ msgstr ""
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr ""
@@ -627,8 +627,8 @@ msgstr ""
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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)."
@@ -639,8 +639,8 @@ msgstr[1] ""
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr ""
@@ -651,8 +651,8 @@ 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.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:176
+#: 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."
@@ -670,15 +670,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr ""
 
@@ -799,7 +799,7 @@ msgstr ""
 #: 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:153 actions/passwordsettings.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
@@ -883,8 +883,8 @@ msgstr ""
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr ""
@@ -1447,7 +1447,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr ""
@@ -1737,7 +1737,7 @@ msgstr ""
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr ""
@@ -2311,24 +2311,24 @@ msgstr ""
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: actions/editgroup.php:281 classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr ""
 
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr ""
 
@@ -3111,7 +3111,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr ""
 
@@ -3190,7 +3190,7 @@ msgid "Inbox for %s"
 msgstr ""
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 
@@ -3597,7 +3597,7 @@ msgid "Use this form to create a new group."
 msgstr ""
 
 #. TRANS: Group create form validation error.
-#: actions/newgroup.php:199
+#: actions/newgroup.php:200
 msgid "Alias cannot be the same as nickname."
 msgstr ""
 
@@ -3793,8 +3793,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr ""
 
@@ -3816,34 +3816,36 @@ 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/othersettings.php:111
+#. 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:120
+#: actions/othersettings.php:122
 msgid "Shorten URLs with"
 msgstr ""
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:122
+#: actions/othersettings.php:124
 msgid "Automatic shortening service to use."
 msgstr ""
 
 #. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr ""
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: actions/othersettings.php:164
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr ""
 
@@ -3877,7 +3879,7 @@ msgstr ""
 msgid "Outbox for %s"
 msgstr ""
 
-#: actions/outbox.php:116
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
@@ -4142,7 +4144,7 @@ msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
 #. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr ""
 
@@ -4258,7 +4260,6 @@ msgstr ""
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 
@@ -4266,15 +4267,15 @@ msgstr ""
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr ""
 
@@ -4308,8 +4309,8 @@ msgstr ""
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr ""
@@ -5097,13 +5098,13 @@ msgstr ""
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr ""
@@ -5237,60 +5238,60 @@ msgid "%1$s group, page %2$d"
 msgstr ""
 
 #. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr ""
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr ""
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:365
+#: actions/showgroup.php:377
 #, php-format
 msgid "FOAF for %s group"
 msgstr ""
 
 #. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr ""
 
@@ -5298,25 +5299,25 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr ""
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 msgctxt "LABEL"
 msgid "Created"
 msgstr ""
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 msgctxt "LABEL"
 msgid "Members"
 msgstr ""
@@ -5325,7 +5326,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5338,7 +5339,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5348,30 +5349,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr ""
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr ""
@@ -6276,7 +6277,7 @@ msgstr ""
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
@@ -6346,20 +6347,20 @@ msgid "%1$s marked notice %2$s as a favorite."
 msgstr ""
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6372,7 +6373,7 @@ 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:217
+#: 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."
@@ -6381,7 +6382,7 @@ 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:229
+#: 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."
@@ -6389,7 +6390,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr ""
 
@@ -6447,7 +6448,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6514,25 +6515,25 @@ msgid "Problem saving notice."
 msgstr ""
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -6546,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:765
+#: classes/Profile.php:771
 #, 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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6633,22 +6634,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr ""
 
@@ -7365,12 +7366,12 @@ msgid "Do not use this method!"
 msgstr ""
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr ""
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr ""
 
@@ -7747,24 +7748,24 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 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:164
+#: lib/common.php:165
 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr ""
 
@@ -7942,27 +7943,31 @@ msgstr ""
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:155
+#: 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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr ""
 
-#: lib/groupeditform.php:162
+#: 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."
+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:174
+#: lib/groupeditform.php:175
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8396,20 +8401,16 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:89
+#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr ""
 
-#: lib/mailbox.php:139
+#: 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/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr ""
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr ""
@@ -8497,6 +8498,14 @@ msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr ""
 
+#: lib/messagelist.php:77
+msgid "Messages"
+msgstr ""
+
+#: lib/messagelistitem.php:123 lib/noticelist.php:522
+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."
@@ -8679,7 +8688,7 @@ msgid "Tags in %s's notices"
 msgstr ""
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr ""
 
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 261a9c178e..b5f95764bf 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:35:42+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:06:42+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 (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -92,11 +92,11 @@ msgstr "Spara inställningar för åtkomst"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Spara"
@@ -159,7 +159,7 @@ msgstr "Ingen sådan sida"
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Ingen sådan användare."
 
@@ -333,7 +333,7 @@ msgstr "Du måste ange ett värdet på parametern 'device': sms, im, none"
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -423,7 +423,7 @@ msgstr ""
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s tidslinje"
@@ -599,8 +599,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Smeknamnet används redan. Försök med ett annat."
@@ -609,8 +609,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Inte ett giltigt smeknamn."
@@ -622,8 +622,8 @@ msgstr "Inte ett giltigt smeknamn."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Hemsida är inte en giltig webbadress."
@@ -632,8 +632,8 @@ msgstr "Hemsida är inte en giltig webbadress."
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: 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)."
@@ -648,8 +648,8 @@ msgstr "Fullständigt namn är för långt (max 255 tecken)."
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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,8 +660,8 @@ msgstr[1] "Beskrivning är för lång (max %d tecken)."
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Beskrivning av plats är för lång (max 255 tecken)."
@@ -672,8 +672,8 @@ msgstr "Beskrivning av plats är för lång (max 255 tecken)."
 #. 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:229
-#: actions/newgroup.php:176
+#: 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."
@@ -691,15 +691,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Alias kan inte vara samma som smeknamn."
 
@@ -821,7 +821,7 @@ msgstr "Begäran-token är redan auktoriserad."
 #: 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:153 actions/passwordsettings.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
@@ -912,8 +912,8 @@ msgstr "Konto"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Smeknamn"
@@ -1497,7 +1497,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Avatar"
@@ -1794,7 +1794,7 @@ msgstr "Konversationer"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Notiser"
@@ -2389,24 +2389,24 @@ 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:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: 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:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Alternativ sparade."
 
@@ -3238,7 +3238,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.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Inställningar sparade."
 
@@ -3322,7 +3322,7 @@ msgid "Inbox for %s"
 msgstr "Inkorg för %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: 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."
@@ -3773,7 +3773,7 @@ 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:199
+#: actions/newgroup.php:200
 #, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "Alias kan inte vara samma som smeknamn."
@@ -3981,8 +3981,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "Ett dataformat som inte stödjs"
 
@@ -4004,34 +4004,36 @@ 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/othersettings.php:111
+#. 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:120
+#: 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:122
+#: 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:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "Visa profilutseenden"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: 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)."
@@ -4066,7 +4068,7 @@ msgstr "Utkorg för %1$s - sida %2$d"
 msgid "Outbox for %s"
 msgstr "Utkorg för %s"
 
-#: actions/outbox.php:116
+#: 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."
 
@@ -4338,7 +4340,7 @@ 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:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "Bilagor"
 
@@ -4462,7 +4464,6 @@ msgstr "Profilinformation"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
@@ -4471,15 +4472,15 @@ msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Hemsida"
 
@@ -4514,8 +4515,8 @@ msgstr "Biografi"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Plats"
@@ -5379,13 +5380,13 @@ msgstr "Organisation"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistik"
@@ -5529,60 +5530,60 @@ 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:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Notis"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Alias"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "Åtgärder för grupp"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "Medlemmar"
 
@@ -5590,25 +5591,25 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "Alla medlemmar"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Skapad"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Medlemmar"
@@ -5617,7 +5618,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5635,7 +5636,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5649,30 +5650,30 @@ msgstr ""
 "sina liv och intressen. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "Administratörer"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Meddelande från %1$s på %2$s"
@@ -6634,7 +6635,7 @@ msgstr ""
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Uppdateringar från %1$s på %2$s!"
@@ -6716,20 +6717,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6746,7 +6747,7 @@ 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:217
+#: 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."
@@ -6755,7 +6756,7 @@ 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:229
+#: 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."
@@ -6765,7 +6766,7 @@ 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:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Ogiltigt filnamn."
 
@@ -6823,7 +6824,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr "Inget databasnamn eller DSN funnen någonstans."
 
@@ -6894,26 +6895,26 @@ 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:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6927,14 +6928,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:765
+#: classes/Profile.php:771
 #, 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:774
+#: classes/Profile.php:780
 #, 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."
@@ -7014,22 +7015,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Kunde inte spara lokal gruppinformation."
 
@@ -7762,12 +7763,12 @@ msgid "Do not use this method!"
 msgstr "Ta inte bort denna grupp"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "Författare"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "Tillhandahållare"
 
@@ -8188,26 +8189,26 @@ msgstr ""
 "tracking - inte implementerat än.\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 #, 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:164
+#: lib/common.php:165
 #, 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "Gå till installeraren."
 
@@ -8390,29 +8391,34 @@ msgstr "Gå"
 msgid "Grant this user the \"%s\" role"
 msgstr "Bevilja denna användare \"%s\"-rollen"
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Beskriv gruppen eller ämnet"
 
-#: lib/groupeditform.php:162
+#: 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."
+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:174
+#: 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:182
+#: lib/groupeditform.php:183
 #, fuzzy, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8947,11 +8953,11 @@ msgstr ""
 "\n"
 "P.S. Du kan stänga av dessa e-postnotifikationer här: %8$s\n"
 
-#: lib/mailbox.php:89
+#: 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:139
+#: 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."
@@ -8960,10 +8966,6 @@ msgstr ""
 "engagera andra användare i konversationen. Folk kan skicka meddelanden till "
 "dig som bara du ser."
 
-#: lib/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "från"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Kunde inte tolka meddelande."
@@ -9056,6 +9058,15 @@ 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:522
+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."
@@ -9246,7 +9257,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Okänd"
 
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 2098a0bf39..25f7457be0 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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:35:46+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:06:44+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 (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -89,11 +89,11 @@ msgstr "అందుబాటు అమరికలను భద్రపరచ
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "భద్రపరచు"
@@ -156,7 +156,7 @@ msgstr "అటువంటి పేజీ లేదు."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "అటువంటి వాడుకరి లేరు."
 
@@ -326,7 +326,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -415,7 +415,7 @@ msgstr "ప్రధాన"
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s కాలరేఖ"
@@ -590,8 +590,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్నారు. మరోటి ప్రయత్నించండి."
@@ -600,8 +600,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "సరైన పేరు కాదు."
@@ -613,8 +613,8 @@ msgstr "సరైన పేరు కాదు."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "హోమ్ పేజీ URL సరైనది కాదు."
@@ -623,8 +623,8 @@ msgstr "హోమ్ పేజీ URL సరైనది కాదు."
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
@@ -640,8 +640,8 @@ msgstr "పూర్తి పేరు చాలా పెద్దగా ఉ
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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,8 +652,8 @@ msgstr[1] "వివరణ చాలా పెద్దగా ఉంది (%d 
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
@@ -665,8 +665,8 @@ 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.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:176
+#: 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."
@@ -684,15 +684,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "మారుపేరు పేరుతో సమానంగా ఉండకూడదు."
 
@@ -816,7 +816,7 @@ msgstr "మీకు అధీకరణ లేదు."
 #: 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:153 actions/passwordsettings.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
@@ -901,8 +901,8 @@ msgstr "ఖాతా"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "పేరు"
@@ -1485,7 +1485,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "అవతారం"
@@ -1782,7 +1782,7 @@ msgstr "సంభాషణ"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "సందేశాలు"
@@ -2381,24 +2381,24 @@ msgstr "గుంపుని మార్చడానికి ఈ ఫారా
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: actions/editgroup.php:281 classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "మారుపేర్లని సృష్టించలేకపోయాం."
 
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "ఎంపికలు భద్రమయ్యాయి."
 
@@ -3219,7 +3219,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "ప్రస్తుతం నిర్ధారించిన Jabber/GTalk చిరునామా"
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "అభిరుచులు భద్రమయ్యాయి."
 
@@ -3301,7 +3301,7 @@ msgid "Inbox for %s"
 msgstr "%sకి వచ్చినవి"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "ఇవి మీకు వచ్చిన అంతరంగిక సందేశాలు."
 
@@ -3740,7 +3740,7 @@ msgid "Use this form to create a new group."
 msgstr "కొత్త గుంపుని సృష్టిండానికి ఈ ఫారాన్ని ఉపయోగించండి."
 
 #. TRANS: Group create form validation error.
-#: actions/newgroup.php:199
+#: actions/newgroup.php:200
 #, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "మారుపేరు పేరుతో సమానంగా ఉండకూడదు."
@@ -3944,8 +3944,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr ""
 
@@ -3967,35 +3967,37 @@ 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/othersettings.php:111
+#. 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:120
+#: actions/othersettings.php:122
 msgid "Shorten URLs with"
 msgstr "URL కుదింపు సేవ"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:122
+#: actions/othersettings.php:124
 msgid "Automatic shortening service to use."
 msgstr "ఉపయోగించాల్సిన యాంత్రిక కుదింపు సేవ."
 
 #. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "ఫ్రొఫైలు రూపురేఖలు"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: actions/othersettings.php:164
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "URL కుదింపు సేవ మరీ పెద్దగా ఉంది (50 అక్షరాలు గరిష్ఠం)."
@@ -4033,7 +4035,7 @@ msgstr "%1$sకి వచ్చినవి - %2$dవ పేజీ"
 msgid "Outbox for %s"
 msgstr "%sకి వచ్చినవి"
 
-#: actions/outbox.php:116
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "ఇవి మీరు పంపివున్న అంతరంగిక సందేశాలు."
 
@@ -4308,7 +4310,7 @@ msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
 #. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "జోడింపులు"
 
@@ -4434,7 +4436,6 @@ msgstr "ప్రొఫైలు సమాచారం"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామచిహ్నాలు మరియు ఖాళీలు తప్ప"
@@ -4443,15 +4444,15 @@ msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అ
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "హోమ్ పేజీ"
 
@@ -4486,8 +4487,8 @@ msgstr "స్వపరిచయం"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "ప్రాంతం"
@@ -5336,13 +5337,13 @@ msgstr "సంస్ధ"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "గణాంకాలు"
@@ -5481,60 +5482,60 @@ msgid "%1$s group, page %2$d"
 msgstr "%1$s గుంపు , %2$dవ పేజీ"
 
 #. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "గమనిక"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "మారుపేర్లు"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "గుంపు చర్యలు"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "%s కొరకు స్పందనల ఫీడు (ఆటమ్)"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "సభ్యులు"
 
@@ -5542,26 +5543,26 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "అందరు సభ్యులూ"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "సృష్టితం"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 msgctxt "LABEL"
 msgid "Members"
 msgstr "సభ్యులు"
@@ -5570,7 +5571,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5589,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:486
+#: actions/showgroup.php:498
 #, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5605,30 +5606,30 @@ msgstr ""
 "doc.help%%%%))"
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "నిర్వాహకులు"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, fuzzy, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "%2$sలో %1$sకి స్పందనలు!"
@@ -6571,7 +6572,7 @@ msgstr "[గుంపులని వెతికి](%%action.groupsearch%%) 
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, fuzzy, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "%2$sలో %1$s మరియు స్నేహితుల నుండి తాజాకరణలు!"
@@ -6642,20 +6643,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6668,7 +6669,7 @@ 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:217
+#: 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."
@@ -6677,7 +6678,7 @@ 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:229
+#: 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."
@@ -6685,7 +6686,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "తప్పుడు దస్త్రపుపేరు.."
 
@@ -6743,7 +6744,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6813,26 +6814,26 @@ msgid "Problem saving notice."
 msgstr "సందేశాన్ని భద్రపరచడంలో పొరపాటు."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6846,14 +6847,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:765
+#: classes/Profile.php:771
 #, 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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6935,22 +6936,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "స్థానిక గుంపుని తాజాకరించలేకున్నాం."
 
@@ -7688,12 +7689,12 @@ msgid "Do not use this method!"
 msgstr "ఈ గుంపును తొలగించకు"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "రచయిత"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "మునుజూపు"
 
@@ -8084,26 +8085,26 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 #, 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:164
+#: lib/common.php:165
 #, 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 #, fuzzy
 msgid "Go to the installer."
 msgstr "సైటు లోనికి ప్రవేశించండి"
@@ -8289,29 +8290,34 @@ msgstr "వెళ్ళు"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "గుంపుని లేదా విషయాన్ని వివరించండి"
 
-#: lib/groupeditform.php:162
+#: 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."
+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:174
+#: lib/groupeditform.php:175
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "గుంపు యొక్క ప్రాంతం, ఉంటే, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8833,11 +8839,11 @@ msgstr ""
 "\n"
 "తా.క. ఈ ఈమెయిలు గమనింపులని మీరు ఇక్కడ నిలిపివేసుకోవచ్చు: %8$s\n"
 
-#: lib/mailbox.php:89
+#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "ఎవరి తపాలాపెట్టెలను ఆ వాడుకరి మాత్రమే చదవలగరు."
 
-#: lib/mailbox.php:139
+#: 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."
@@ -8845,10 +8851,6 @@ msgstr ""
 "మీకు అంతరంగిక సందేశాలు లేవు. ఇతర వాడుకరులతో సంభాషణకై మీరు వారికి అంతరంగిక సందేశాలు "
 "పంపించవచ్చు. మీ కంటికి మాత్రమే కనబడేలా వారు మీకు సందేశాలు పంపవచ్చు."
 
-#: lib/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "నుండి"
-
 #: lib/mailhandler.php:37
 #, fuzzy
 msgid "Could not parse message."
@@ -8940,6 +8942,15 @@ msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "పంపించు"
 
+#: lib/messagelist.php:77
+#, fuzzy
+msgid "Messages"
+msgstr "సందేశం"
+
+#: lib/messagelistitem.php:123 lib/noticelist.php:522
+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."
@@ -9132,7 +9143,7 @@ msgid "Tags in %s's notices"
 msgstr ""
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:121
+#: lib/plugin.php:126
 #, fuzzy
 msgid "Unknown"
 msgstr "తెలియని చర్య"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 58e502c0b9..32ee491927 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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:35:52+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:06:46+0000\n"
 "Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -92,11 +92,11 @@ msgstr "Erişim ayarlarını kaydet"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Kaydet"
@@ -159,7 +159,7 @@ msgstr "Böyle bir sayfa yok."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Böyle bir kullanıcı yok."
 
@@ -338,7 +338,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -425,7 +425,7 @@ msgstr "Ana"
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s zaman çizelgesi"
@@ -599,8 +599,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Takma ad kullanımda. Başka bir tane deneyin."
@@ -609,8 +609,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Geçersiz bir takma ad."
@@ -622,8 +622,8 @@ msgstr "Geçersiz bir takma ad."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
@@ -632,8 +632,8 @@ msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Tam isim çok uzun (en fazla: 255 karakter)."
@@ -648,8 +648,8 @@ msgstr "Tam isim çok uzun (en fazla: 255 karakter)."
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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,8 +659,8 @@ msgstr[0] "Tanım çok uzun (en fazla %d karakter)."
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Yer bilgisi çok uzun (en fazla 255 karakter)."
@@ -671,8 +671,8 @@ msgstr "Yer bilgisi çok uzun (en fazla 255 karakter)."
 #. 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:229
-#: actions/newgroup.php:176
+#: 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,15 +689,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Diğerisim, kullanıcı adı ile aynı olamaz."
 
@@ -818,7 +818,7 @@ msgstr "İstek belirteci zaten yetkili."
 #: 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:153 actions/passwordsettings.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
@@ -910,8 +910,8 @@ msgstr "Hesap"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Takma ad"
@@ -1495,7 +1495,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Avatar"
@@ -1795,7 +1795,7 @@ msgstr "Konuşma"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Durum mesajları"
@@ -2398,24 +2398,24 @@ 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:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: 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:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Seçenekler kaydedildi."
 
@@ -3243,7 +3243,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.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Tercihler kaydedildi."
 
@@ -3328,7 +3328,7 @@ msgid "Inbox for %s"
 msgstr "%s için gelen kutusu"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 
@@ -3747,7 +3747,7 @@ msgid "Use this form to create a new group."
 msgstr ""
 
 #. TRANS: Group create form validation error.
-#: actions/newgroup.php:199
+#: actions/newgroup.php:200
 #, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "Diğerisim, kullanıcı adı ile aynı olamaz."
@@ -3947,8 +3947,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "Desteklenen bir veri biçimi değil."
 
@@ -3970,34 +3970,36 @@ 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/othersettings.php:111
+#. 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:120
+#: 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:122
+#: actions/othersettings.php:124
 msgid "Automatic shortening service to use."
 msgstr "Kullanılacak otomatik kısaltma servisi."
 
 #. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "Profil dizaynlarını görüntüle"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: actions/othersettings.php:164
 #, fuzzy
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
@@ -4036,7 +4038,7 @@ msgstr ""
 msgid "Outbox for %s"
 msgstr ""
 
-#: actions/outbox.php:116
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
@@ -4312,7 +4314,7 @@ msgstr ""
 
 #. TRANS: Fieldset legens in Paths admin panel.
 #. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr ""
 
@@ -4438,7 +4440,6 @@ msgstr "Profil ayarları"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4449,15 +4450,15 @@ msgstr ""
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Başlangıç Sayfası"
 
@@ -4493,8 +4494,8 @@ msgstr "Hakkında"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Yer"
@@ -5330,13 +5331,13 @@ msgstr "Organizasyon"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "İstatistikler"
@@ -5471,60 +5472,60 @@ msgid "%1$s group, page %2$d"
 msgstr "Bütün abonelikler"
 
 #. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Not"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Diğerisimler"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr ""
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "Üyeler"
 
@@ -5532,26 +5533,26 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "Tüm üyeler"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 #, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Oluşturuldu"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 #, fuzzy
 msgctxt "LABEL"
 msgid "Members"
@@ -5561,7 +5562,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5574,7 +5575,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5584,30 +5585,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "Yöneticiler"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr ""
@@ -6559,7 +6560,7 @@ msgstr ""
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
@@ -6629,20 +6630,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6654,7 +6655,7 @@ 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:217
+#: 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."
@@ -6662,14 +6663,14 @@ 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:229
+#: 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:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Geçersiz dosya ismi."
 
@@ -6732,7 +6733,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
@@ -6801,26 +6802,26 @@ 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:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -6834,14 +6835,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:765
+#: classes/Profile.php:771
 #, 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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6923,22 +6924,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Profil kaydedilemedi."
 
@@ -7681,12 +7682,12 @@ msgid "Do not use this method!"
 msgstr "Bu durum mesajını silme"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr ""
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "Sağlayıcı"
 
@@ -8069,25 +8070,25 @@ msgid ""
 msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 #, 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:164
+#: lib/common.php:165
 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr ""
 
@@ -8275,30 +8276,37 @@ msgstr ""
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+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:160
+#: 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:162
+#: 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."
+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:174
+#: 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:182
+#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8740,20 +8748,16 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:89
+#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr ""
 
-#: lib/mailbox.php:139
+#: 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/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr ""
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Mesaj ayrıştırılamadı."
@@ -8844,6 +8848,15 @@ 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:522
+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."
@@ -9036,7 +9049,7 @@ msgid "Tags in %s's notices"
 msgstr ""
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr ""
 
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index ca6d3775c1..2a437e7d6e 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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:35:54+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:06: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-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -94,11 +94,11 @@ msgstr "Зберегти параметри доступу"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Зберегти"
@@ -161,7 +161,7 @@ msgstr "Немає такої сторінки."
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Такого користувача немає."
 
@@ -336,7 +336,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -429,7 +429,7 @@ msgstr "Головна"
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s стрічка"
@@ -608,8 +608,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "Це ім’я вже використовується. Спробуйте інше."
@@ -618,8 +618,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "Це недійсне ім’я користувача."
@@ -631,8 +631,8 @@ msgstr "Це недійсне ім’я користувача."
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "Веб-сторінка має недійсну URL-адресу."
@@ -641,8 +641,8 @@ msgstr "Веб-сторінка має недійсну URL-адресу."
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Повне ім’я надто довге (не більше 255 символів)."
@@ -657,8 +657,8 @@ msgstr "Повне ім’я надто довге (не більше 255 сим
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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)."
@@ -670,8 +670,8 @@ msgstr[2] "Опис надто довгий (максимум — %d знакі
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Розташування надто довге (не більше 255 символів)."
@@ -682,8 +682,8 @@ msgstr "Розташування надто довге (не більше 255 с
 #. 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:229
-#: actions/newgroup.php:176
+#: 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."
@@ -702,15 +702,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "Додаткове ім’я не може бути таким самим що й основне."
 
@@ -831,7 +831,7 @@ msgstr "Токен запиту вже авторизовано."
 #: 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:153 actions/passwordsettings.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
@@ -923,8 +923,8 @@ msgstr "Акаунт"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "Ім’я користувача"
@@ -1282,9 +1282,9 @@ 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
+#, php-format
 msgid "Notices %1$s has favorited on %2$s"
-msgstr "Оновлення від %1$s та друзів на %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.
@@ -1322,9 +1322,9 @@ 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
+#, php-format
 msgid "Groups %1$s is a member of on %2$s"
-msgstr "Спільноти, до яких залучений %s"
+msgstr "Спільноти, до яких залучений %1$s на %2$s"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
 #: actions/atompubmembershipfeed.php:219
@@ -1438,9 +1438,9 @@ 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
+#, 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.
 #: actions/atompubsubscriptionfeed.php:248
@@ -1499,7 +1499,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Аватара"
@@ -1800,7 +1800,7 @@ msgstr "Розмова"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Дописи"
@@ -2391,24 +2391,24 @@ msgstr "Скористайтесь цією формою, щоб відреда
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: actions/editgroup.php:281 classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "Неможна призначити додаткові імена."
 
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "Опції збережено."
 
@@ -2560,9 +2560,8 @@ msgstr "Немає електронної адреси."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
 #: actions/emailsettings.php:388
-#, fuzzy
 msgid "Cannot normalize that email address."
-msgstr "Не можна полагодити цю поштову адресу"
+msgstr "Не можна полагодити цю поштову адресу."
 
 #. TRANS: Message given saving e-mail address that not valid.
 #: actions/emailsettings.php:393 actions/register.php:212
@@ -2743,9 +2742,9 @@ msgstr "Користувачі варті уваги, сторінка %d"
 
 #. TRANS: Description on page displaying featured users.
 #: actions/featured.php:102
-#, fuzzy, php-format
+#, php-format
 msgid "A selection of some great users on %s."
-msgstr "Список деяких видатних користувачів на %s"
+msgstr "Список деяких видатних користувачів на %s."
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
 #: actions/file.php:36
@@ -2941,9 +2940,8 @@ 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 "Не маю можливості зберегти налаштування дизайну."
+msgstr "Не вдалося оновити налаштування дизайну."
 
 #. TRANS: Form text to confirm saved group design settings.
 #: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
@@ -3052,7 +3050,6 @@ msgstr "Оновлення членів %1$s на %2$s!"
 
 #. TRANS: Title for first page of the groups list.
 #: actions/groups.php:62
-#, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "Спільноти"
@@ -3060,7 +3057,7 @@ 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
+#, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
 msgstr "Спільноти, сторінка %d"
@@ -3069,7 +3066,7 @@ msgstr "Спільноти, сторінка %d"
 #. 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
+#, 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 "
@@ -3079,7 +3076,7 @@ msgid ""
 msgstr ""
 "Спільноти на сайті %%%%site.name%%%% дозволять вам відшукати людей зі "
 "схожими інтересами. Лише приєднайтеся до спільноти і надсилайте повідомлення "
-"до усіх її учасників використовуючи просту команду «!groupname» у тексті "
+"до усіх її учасників використовуючи просту команду «!spilnota» у тексті "
 "повідомлення. Не бачите спільноту, яка вас цікавить? Спробуйте її [знайти](%%"
 "%%action.groupsearch%%%%) або [створіть власну!](%%%%action.newgroup%%%%)"
 
@@ -3113,7 +3110,7 @@ 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
+#, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
 "action.newgroup%%) yourself."
@@ -3156,13 +3153,14 @@ msgstr "Налаштування ІМ"
 #. 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
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can send and receive notices through Jabber/Google Talk [instant "
 "messages](%%doc.im%%). Configure your address and settings below."
 msgstr ""
-"Ви можете надсилати та отримувати дописи через Jabber/GTalk [службу миттєвих "
-"повідомлень](%%doc.im%%). Вкажить свою адресу і налаштуйте опції нижче."
+"Ви можете надсилати та отримувати дописи через Jabber/Google Talk [службу "
+"миттєвих повідомлень](%%doc.im%%). Вкажіть свою адресу і налаштуйте опції "
+"нижче."
 
 #. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:90
@@ -3176,21 +3174,20 @@ msgid "IM address"
 msgstr "ІМ-адреса"
 
 #: actions/imsettings.php:109
-#, fuzzy
 msgid "Current confirmed Jabber/Google Talk address."
-msgstr "Поточна підтверджена адреса Jabber/GTalk."
+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
-#, 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/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.
@@ -3198,14 +3195,14 @@ 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». Але спершу "
+"Jabber або Google Talk адреса, на зразок «username@example.org». Але спершу "
 "переконайтеся, що додали %s до списку контактів в своєму IM-клієнті або в "
-"GTalk."
+"Google Talk."
 
 #. TRANS: Form legend for Instant Messaging preferences form.
 #: actions/imsettings.php:154
@@ -3214,33 +3211,30 @@ msgstr "Преференції ІМ"
 
 #. 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 від людей, до яких я не "
+"Надсилати мені відповіді через 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 "Позначати міткою MicroID мою адресу Jabber/GTalk."
+msgstr "Позначати міткою MicroID мою адресу Jabber/Google Talk."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "Преференції збережно."
 
@@ -3251,15 +3245,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
@@ -3323,7 +3315,7 @@ msgid "Inbox for %s"
 msgstr "Вхідні для %s"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 "Це ваші вхідні повідомлення, тут містяться повідомлення надіслані приватно."
@@ -3425,10 +3417,9 @@ 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
@@ -3781,7 +3772,7 @@ msgid "Use this form to create a new group."
 msgstr "Скористайтесь цією формою для створення нової спільноти."
 
 #. TRANS: Group create form validation error.
-#: actions/newgroup.php:199
+#: actions/newgroup.php:200
 msgid "Alias cannot be the same as nickname."
 msgstr "Додаткове ім’я не може збігатися з псевдонімом."
 
@@ -3990,8 +3981,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "Такий формат даних не підтримується."
 
@@ -4013,34 +4004,36 @@ 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/othersettings.php:111
+#. 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:120
+#: actions/othersettings.php:122
 msgid "Shorten URLs with"
 msgstr "Скорочення URL"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:122
+#: actions/othersettings.php:124
 msgid "Automatic shortening service to use."
 msgstr "Доступні сервіси."
 
 #. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "Переглядати дизайн користувачів"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: actions/othersettings.php:164
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Сервіс скорочення URL-адрес надто довгий (50 символів максимум)."
 
@@ -4074,7 +4067,7 @@ msgstr "Вихідні для %1$s — сторінка %2$d"
 msgid "Outbox for %s"
 msgstr "Вихідні для %s"
 
-#: actions/outbox.php:116
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 "Це ваші вихідні повідомлення, тут містяться повідомлення, які ви надіслали "
@@ -4341,7 +4334,7 @@ msgstr "Директорія, в якій знаходяться фонові з
 
 #. TRANS: Fieldset legens in Paths admin panel.
 #. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "Вкладення"
 
@@ -4461,7 +4454,6 @@ msgstr "Інформація профілю"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 рядкових літер і цифр, ніякої пунктуації або інтервалів."
 
@@ -4469,15 +4461,15 @@ msgstr "1-64 рядкових літер і цифр, ніякої пункту
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "Веб-сторінка"
 
@@ -4512,8 +4504,8 @@ msgstr "Про себе"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "Розташування"
@@ -5362,13 +5354,13 @@ msgstr "Організація"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Статистика"
@@ -5512,60 +5504,60 @@ msgid "%1$s group, page %2$d"
 msgstr "Спільнота %1$s, сторінка %2$d"
 
 #. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "Зауваження"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "Додаткові імена"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "Дії спільноти"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "Учасники"
 
@@ -5573,25 +5565,25 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "Всі учасники"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Створено"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Учасники"
@@ -5600,7 +5592,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5619,7 +5611,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5633,30 +5625,30 @@ msgstr ""
 "спільноти роблять короткі дописи про своє життя та інтереси. "
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "Адміни"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "Повідомлення від %1$s на %2$s"
@@ -6077,9 +6069,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-#, fuzzy
 msgid "No code entered."
-msgstr "Код не введено"
+msgstr "Код не введено."
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
@@ -6616,7 +6607,7 @@ msgstr ""
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Оновлення від %1$s на %2$s!"
@@ -6698,20 +6689,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6731,7 +6722,7 @@ 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:217
+#: 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."
@@ -6741,7 +6732,7 @@ 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:229
+#: 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."
@@ -6750,7 +6741,7 @@ msgstr[1] "Розміри цього файлу перевищують вашу
 msgstr[2] "Розміри цього файлу перевищують вашу місячну квоту у %d байтів."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "Невірне ім’я файлу."
 
@@ -6808,7 +6799,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr "Немає імені бази даних або DSN ніде не знайдено"
 
@@ -6879,25 +6870,25 @@ msgid "Problem saving notice."
 msgstr "Проблема при збереженні допису."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6911,14 +6902,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:765
+#: classes/Profile.php:771
 #, 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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6999,22 +6990,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr "Код для однокористувацького режиму називається, коли не ввімкнуто."
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "Не вдалося зберегти інформацію про локальну спільноту."
 
@@ -7416,7 +7407,7 @@ msgstr "Користувач вже є учасником цієї спільн
 #: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
-msgstr ""
+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
@@ -7743,12 +7734,12 @@ msgid "Do not use this method!"
 msgstr "Не видаляти цей метод!"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "Автор"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "Провайдер"
 
@@ -8180,24 +8171,24 @@ msgstr ""
 "tracking — наразі не виконується\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 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:164
+#: lib/common.php:165
 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "Іти до файлу інсталяції."
 
@@ -8299,7 +8290,6 @@ msgstr "Видалити з обраних"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
 #: lib/disfavorform.php:136
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "Видалити з обраних"
@@ -8312,7 +8302,6 @@ msgstr "Позначити як обране"
 
 #. TRANS: Button text for adding the favourite status to a notice.
 #: lib/favorform.php:135
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
 msgstr "Обрати"
@@ -8379,29 +8368,34 @@ msgstr "Вперед"
 msgid "Grant this user the \"%s\" role"
 msgstr "Надати цьому користувачеві роль «%s»"
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "Опишіть спільноту або тему"
 
-#: lib/groupeditform.php:162
-#, 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."
+#: 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 знаків"
 msgstr[2] "Опишіть спільноту або тему, вкладаючись у %d знаків"
 
-#: lib/groupeditform.php:174
+#: lib/groupeditform.php:175
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr ""
 "Розташування спільноти, на кшталт «Місто, область (або регіон), країна»."
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8946,12 +8940,12 @@ msgstr ""
 "\n"
 "P.S. Ви можете вимкнути сповіщення електронною поштою тут: %8$s\n"
 
-#: lib/mailbox.php:89
+#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr ""
 "Лише користувач має можливість переглядати свою власну поштову скриньку."
 
-#: lib/mailbox.php:139
+#: 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."
@@ -8960,10 +8954,6 @@ msgstr ""
 "повідомлення аби долучити користувачів до розмови. Такі повідомлення бачите "
 "лише ви."
 
-#: lib/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "з"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "Не можна розібрати повідомлення."
@@ -9054,6 +9044,15 @@ msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Так"
 
+#: lib/messagelist.php:77
+#, fuzzy
+msgid "Messages"
+msgstr "Повідомлення"
+
+#: lib/messagelistitem.php:123 lib/noticelist.php:522
+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."
@@ -9196,28 +9195,24 @@ msgstr "Не вдалося додати нову підписку."
 
 #. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
-#, fuzzy
 msgctxt "MENU"
 msgid "Replies"
 msgstr "Відповіді"
 
 #. TRANS: Personal group navigation menu option when logged in for seeing own profile.
 #: lib/personalgroupnav.php:114
-#, 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
-#, fuzzy
 msgctxt "MENU"
 msgid "Inbox"
 msgstr "Вхідні"
@@ -9229,7 +9224,6 @@ msgstr "Ваші вхідні повідомлення"
 
 #. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
 #: lib/personalgroupnav.php:140
-#, fuzzy
 msgctxt "MENU"
 msgid "Outbox"
 msgstr "Вихідні"
@@ -9246,7 +9240,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "Невідомо"
 
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 2b79d1dfe7..398a1102c7 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-02 23:29+0000\n"
-"PO-Revision-Date: 2011-02-02 23:35:58+0000\n"
+"POT-Creation-Date: 2011-02-14 16:00+0000\n"
+"PO-Revision-Date: 2011-02-14 16:06:51+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 (r81409); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-01-30 23:06:54+0000\n"
+"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -95,11 +95,11 @@ msgstr "保存访问设置"
 #. 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:134 actions/pathsadminpanel.php:512
+#: 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/useradminpanel.php:298 lib/applicationeditform.php:355
-#: lib/designsettings.php:270 lib/groupeditform.php:198
+#: lib/designsettings.php:270 lib/groupeditform.php:201
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "保存"
@@ -162,7 +162,7 @@ msgstr "没有这个页面。"
 #: 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
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/mailbox.php:80 lib/profileaction.php:77
 msgid "No such user."
 msgstr "没有这个用户。"
 
@@ -335,7 +335,7 @@ msgstr ""
 #: 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:184
+#: actions/imsettings.php:432 actions/othersettings.php:186
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
@@ -420,7 +420,7 @@ msgstr "主要"
 #. 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:68
+#: lib/atomusernoticefeed.php:88
 #, php-format
 msgid "%s timeline"
 msgstr "%s的时间线"
@@ -592,8 +592,8 @@ 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:189
-#: actions/newgroup.php:136 actions/profilesettings.php:273
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
 #: actions/register.php:214
 msgid "Nickname already in use. Try another one."
 msgstr "昵称已被使用，换一个吧。"
@@ -602,8 +602,8 @@ 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:193
-#: actions/newgroup.php:140 actions/profilesettings.php:243
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
 #: actions/register.php:216
 msgid "Not a valid nickname."
 msgstr "不是有效的昵称。"
@@ -615,8 +615,8 @@ msgstr "不是有效的昵称。"
 #. 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:200 actions/newapplication.php:221
-#: actions/newgroup.php:147 actions/profilesettings.php:248
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
 #: actions/register.php:223
 msgid "Homepage is not a valid URL."
 msgstr "主页的URL不正确。"
@@ -625,8 +625,8 @@ msgstr "主页的URL不正确。"
 #. 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:204
-#: actions/newgroup.php:151 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:226
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "全名过长(不能超过 255 个字符)。"
@@ -641,8 +641,8 @@ msgstr "全名过长(不能超过 255 个字符)。"
 #. 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:209 actions/newapplication.php:182
-#: actions/newgroup.php:156
+#: 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)."
@@ -652,8 +652,8 @@ msgstr[0] "D描述过长(不能超过%d 个字符)。"
 #. 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:216
-#: actions/newgroup.php:163 actions/profilesettings.php:265
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:235
 msgid "Location is too long (maximum 255 characters)."
 msgstr "位置过长(不能超过255个字符)。"
@@ -664,8 +664,8 @@ msgstr "位置过长(不能超过255个字符)。"
 #. 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:229
-#: actions/newgroup.php:176
+#: 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."
@@ -682,15 +682,15 @@ 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:244
-#: actions/newgroup.php:192
+#: actions/apigroupcreate.php:264 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:251
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
 msgid "Alias can't be the same as nickname."
 msgstr "别名不能和昵称相同。"
 
@@ -811,7 +811,7 @@ msgstr "请求 token 已被授权了。"
 #: 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:153 actions/passwordsettings.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
@@ -899,8 +899,8 @@ msgstr "帐号"
 #. 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:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:144
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
 #: lib/userprofile.php:137
 msgid "Nickname"
 msgstr "昵称"
@@ -1244,9 +1244,9 @@ 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
+#, php-format
 msgid "Notices %1$s has favorited on %2$s"
-msgstr "%2$s上%1$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.
@@ -1402,7 +1402,7 @@ msgstr "不能删除别人的订阅。"
 #: actions/atompubsubscriptionfeed.php:153
 #, fuzzy, php-format
 msgid "People %1$s has subscribed to on %2$s"
-msgstr "关注了%s的用户"
+msgstr "%1$在%2$s上关注的用户"
 
 #. TRANS: Client error displayed when not using the follow verb.
 #: actions/atompubsubscriptionfeed.php:248
@@ -1424,9 +1424,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Already subscribed to %s."
-msgstr "已经关注了！"
+msgstr "已经订阅了%s。"
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
@@ -1461,7 +1461,7 @@ 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:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
 #: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "头像"
@@ -1756,7 +1756,7 @@ msgstr "对话"
 
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
+#: actions/conversation.php:149 lib/noticelist.php:87
 #: lib/profileaction.php:246 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "消息"
@@ -1779,9 +1779,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "You must write \"%s\" exactly in the box."
-msgstr "您必须编写 %s 完全在框中。"
+msgstr "你必须在框中输入“%s”。"
 
 #. TRANS: Confirmation that a user account has been deleted.
 #: actions/deleteaccount.php:206
@@ -2335,24 +2335,24 @@ msgstr "通过这个表单来编辑小组"
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: %s is the invalid alias.
-#: actions/editgroup.php:239 actions/newgroup.php:187
+#: 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:272
+#: 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:279 classes/User_group.php:538
+#: actions/editgroup.php:281 classes/User_group.php:540
 msgid "Could not create aliases."
 msgstr "无法创建别名。"
 
 #. TRANS: Group edit form success message.
-#: actions/editgroup.php:296
+#: actions/editgroup.php:301
 msgid "Options saved."
 msgstr "选项已保存。"
 
@@ -2503,9 +2503,8 @@ msgstr "没有电子邮件地址。"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
 #: actions/emailsettings.php:388
-#, fuzzy
 msgid "Cannot normalize that email address."
-msgstr "无法识别此电子邮件"
+msgstr "无法识别此电子邮件。"
 
 #. TRANS: Message given saving e-mail address that not valid.
 #: actions/emailsettings.php:393 actions/register.php:212
@@ -2681,9 +2680,9 @@ msgstr "推荐用户，第 %d 页"
 
 #. TRANS: Description on page displaying featured users.
 #: actions/featured.php:102
-#, fuzzy, php-format
+#, php-format
 msgid "A selection of some great users on %s."
-msgstr "%s上的优秀用户摘选"
+msgstr "%s上的一些优秀的用户摘选。"
 
 #. TRANS: Client error displayed when no notice ID was given trying do display a file.
 #: actions/file.php:36
@@ -2875,9 +2874,8 @@ 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 "无法保存你的外观设置。"
+msgstr "无法更新你的外观设置。"
 
 #. TRANS: Form text to confirm saved group design settings.
 #: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
@@ -2984,7 +2982,6 @@ msgstr "在%2$s上%1$s小组组员的更新！"
 
 #. TRANS: Title for first page of the groups list.
 #: actions/groups.php:62
-#, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "小组"
@@ -2992,16 +2989,16 @@ 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
+#, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
-msgstr "小组，第 %d 页"
+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
+#, 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 "
@@ -3043,11 +3040,11 @@ 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
+#, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
 "action.newgroup%%) yourself."
-msgstr "如果你找不到你想要的小组，你可以自己 [创建它](%%action.newgroup%%) 。"
+msgstr "如果你找不到想要的小组，你可以自己 [创建它](%%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).
@@ -3084,7 +3081,7 @@ msgstr "IM 设置"
 #. 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
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can send and receive notices through Jabber/Google Talk [instant "
 "messages](%%doc.im%%). Configure your address and settings below."
@@ -3104,9 +3101,8 @@ msgid "IM address"
 msgstr "IM 地址"
 
 #: actions/imsettings.php:109
-#, fuzzy
 msgid "Current confirmed Jabber/Google Talk address."
-msgstr "已确认的Jabber/GTalk帐号。"
+msgstr "当前已确认的Jabber/GTalk账号。"
 
 #. TRANS: Form note in Instant Messaging settings form.
 #. TRANS: %s is the Instant Messaging address set for the site.
@@ -3164,7 +3160,7 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "公开 Jabber/GTalk 帐号的 MicroID。"
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:190
+#: actions/imsettings.php:283 actions/othersettings.php:192
 msgid "Preferences saved."
 msgstr "首选项已保存。"
 
@@ -3245,7 +3241,7 @@ msgid "Inbox for %s"
 msgstr "%s 的收件箱"
 
 #. TRANS: Instructions for user inbox page.
-#: actions/inbox.php:115
+#: actions/inbox.php:106
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "这是你的收件箱，包含发给你的私信。"
 
@@ -3672,7 +3668,7 @@ msgid "Use this form to create a new group."
 msgstr "通过此表单创建小组。"
 
 #. TRANS: Group create form validation error.
-#: actions/newgroup.php:199
+#: actions/newgroup.php:200
 #, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "别名不能和昵称相同。"
@@ -3876,8 +3872,8 @@ 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:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
 msgid "Not a supported data format."
 msgstr "不支持的数据格式。"
 
@@ -3899,34 +3895,36 @@ 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/othersettings.php:111
+#. 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:120
+#: actions/othersettings.php:122
 msgid "Shorten URLs with"
 msgstr "缩短 URL 使用"
 
 #. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:122
+#: actions/othersettings.php:124
 msgid "Automatic shortening service to use."
 msgstr "要使用的自动短网址服务。"
 
 #. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
 msgid "View profile designs"
 msgstr "查看个人页面外观"
 
 #. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: 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:162
+#: actions/othersettings.php:164
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "短网址服务过长(不能超过50个字符)。"
 
@@ -3960,7 +3958,7 @@ msgstr "%1$s的发件箱 - 第%2$d页"
 msgid "Outbox for %s"
 msgstr "%s 的发件箱"
 
-#: actions/outbox.php:116
+#: actions/outbox.php:104
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr "这是你的发件箱，包含你发送的私信。"
 
@@ -4225,7 +4223,7 @@ msgstr "背景文件的目录。"
 
 #. TRANS: Fieldset legens in Paths admin panel.
 #. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
 msgid "Attachments"
 msgstr "附件"
 
@@ -4343,7 +4341,6 @@ msgstr "个人信息"
 
 #. TRANS: Tooltip for field label in form for profile settings.
 #: actions/profilesettings.php:109 actions/register.php:433
-#: lib/groupeditform.php:146
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1 到 64 个小写字母或数字，不包含标点或空格。"
 
@@ -4351,15 +4348,15 @@ msgstr "1 到 64 个小写字母或数字，不包含标点或空格。"
 #. 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:252 actions/tagother.php:104
-#: lib/groupeditform.php:149 lib/userprofile.php:156
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
 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
-#: lib/applicationeditform.php:236 lib/groupeditform.php:153
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
 msgid "Homepage"
 msgstr "主页"
 
@@ -4392,8 +4389,8 @@ msgstr "自述"
 #. 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:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:172
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
 #: lib/userprofile.php:172
 msgid "Location"
 msgstr "位置"
@@ -5209,13 +5206,13 @@ msgstr "组织名称必填。"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:167
+#: 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:448
+#: actions/showapplication.php:192 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "统计"
@@ -5353,60 +5350,60 @@ msgid "%1$s group, page %2$d"
 msgstr "%1$s小组，第%2$d页"
 
 #. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:220
+#: 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:270 actions/tagother.php:118
+#: 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:282 actions/tagother.php:128
+#: actions/showgroup.php:285 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:204
 msgid "Note"
 msgstr "注释"
 
 #. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:179
+#: actions/showgroup.php:296 lib/groupeditform.php:180
 msgid "Aliases"
 msgstr "别名"
 
 #. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
 msgid "Group actions"
 msgstr "小组动作"
 
 #. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
 #, 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:352
+#: actions/showgroup.php:364
 #, 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:359
+#: actions/showgroup.php:371
 #, 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:365
+#: actions/showgroup.php:377
 #, 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:402
+#: actions/showgroup.php:414
 msgid "Members"
 msgstr "小组成员"
 
@@ -5414,25 +5411,25 @@ 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:408 lib/profileaction.php:137
+#: actions/showgroup.php:420 lib/profileaction.php:137
 #: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
 #: lib/subscriptionlist.php:127 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:417
+#: actions/showgroup.php:429
 msgid "All members"
 msgstr "所有成员"
 
 #. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
 msgctxt "LABEL"
 msgid "Created"
 msgstr "已创建"
 
 #. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
 msgctxt "LABEL"
 msgid "Members"
 msgstr "成员"
@@ -5441,7 +5438,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:476
+#: actions/showgroup.php:488
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5459,7 +5456,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:486
+#: actions/showgroup.php:498
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5473,30 +5470,30 @@ msgstr ""
 "趣的消息。"
 
 #. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
 msgid "Admins"
 msgstr "管理员"
 
 #. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: 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:97
+#: 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:110
+#: 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:118
+#: actions/showmessage.php:113
 #, php-format
 msgid "Message from %1$s on %2$s"
 msgstr "来自 %1$s 的 %2$s 消息"
@@ -6425,7 +6422,7 @@ msgstr "试一下[搜索小组](%%action.groupsearch%%)并加入他们。"
 #. 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:75
+#: lib/atomusernoticefeed.php:95
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "%2$s 上 %1$s 的更新！"
@@ -6500,20 +6497,20 @@ 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:156
+#: 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:188
+#: 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:204
+#: 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. "
@@ -6525,7 +6522,7 @@ 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:217
+#: 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."
@@ -6533,14 +6530,14 @@ 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:229
+#: 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:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
 msgid "Invalid filename."
 msgstr "无效的文件名。"
 
@@ -6598,7 +6595,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:541
+#: classes/Memcached_DataObject.php:542
 msgid "No database name or DSN found anywhere."
 msgstr "没有找到数据库名称或者 DSN。"
 
@@ -6665,25 +6662,25 @@ msgid "Problem saving notice."
 msgstr "保存消息时出错。"
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:923
+#: 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:1022
+#: 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:1136
+#: classes/Notice.php:1142
 #, 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:1655
+#: classes/Notice.php:1661
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6697,14 +6694,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:765
+#: classes/Profile.php:771
 #, 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:774
+#: classes/Profile.php:780
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr "无法取消用户#%2$d的\\\"%1$s\\\"权限，数据库错误。"
@@ -6784,22 +6781,22 @@ msgid "Single-user mode code called when not enabled."
 msgstr "没启用单用户模式的代码。"
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:520
+#: 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:530
+#: 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:553
+#: 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:568
+#: classes/User_group.php:570
 msgid "Could not save local group info."
 msgstr "无法保存本地小组信息。"
 
@@ -7519,12 +7516,12 @@ msgid "Do not use this method!"
 msgstr "不要使用此方法 ！"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
 msgid "Author"
 msgstr "作者"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
 msgid "Provider"
 msgstr "提供者"
 
@@ -7937,24 +7934,24 @@ msgstr ""
 "tracking - 尚未实现。\n"
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:161
+#: lib/common.php:162
 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:164
+#: lib/common.php:165
 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:167
+#: lib/common.php:168
 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:171
+#: lib/common.php:172
 msgid "Go to the installer."
 msgstr "去安装程序。"
 
@@ -8134,26 +8131,31 @@ msgstr "执行"
 msgid "Grant this user the \"%s\" role"
 msgstr "给这个用户添加\\\"%s\\\"权限"
 
-#: lib/groupeditform.php:155
+#: lib/groupeditform.php:147
+#, fuzzy
+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:160
+#: lib/groupeditform.php:161
 msgid "Describe the group or topic"
 msgstr "小组或主题的描述"
 
-#: lib/groupeditform.php:162
-#, 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] ""
+#: 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:174
+#: lib/groupeditform.php:175
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\"."
 msgstr "小组的地理位置，例如“国家、省份、城市”。"
 
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:183
 #, php-format
 msgid ""
 "Extra nicknames for the group, separated with commas or spaces. Maximum %d "
@@ -8681,11 +8683,11 @@ msgstr ""
 "\n"
 "P.S. 你可以到这里关掉这些邮件提醒：%8$s\n"
 
-#: lib/mailbox.php:89
+#: lib/mailbox.php:87
 msgid "Only the user can read their own mailboxes."
 msgstr "只有该用户才能查看自己的私信。"
 
-#: lib/mailbox.php:139
+#: 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."
@@ -8693,10 +8695,6 @@ msgstr ""
 "你没有任何私信。你可以试着发送私信给其他用户鼓励他们用私信和你交流。其他用户"
 "发给你你私信只有你看得到。"
 
-#: lib/mailbox.php:228 lib/noticelist.php:522
-msgid "from"
-msgstr "通过"
-
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr "无法解析消息。"
@@ -8784,6 +8782,15 @@ msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "发布"
 
+#: lib/messagelist.php:77
+#, fuzzy
+msgid "Messages"
+msgstr "私信"
+
+#: lib/messagelistitem.php:123 lib/noticelist.php:522
+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."
@@ -8970,7 +8977,7 @@ 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:121
+#: lib/plugin.php:126
 msgid "Unknown"
 msgstr "未知的"
 
diff --git a/plugins/APC/locale/de/LC_MESSAGES/APC.po b/plugins/APC/locale/de/LC_MESSAGES/APC.po
new file mode 100644
index 0000000000..8461a88ae3
--- /dev/null
+++ b/plugins/APC/locale/de/LC_MESSAGES/APC.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - APC to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Fujnky
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+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"
+"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-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."
+msgstr ""
+"Benutze den <a href=\"http://pecl.php.net/package/apc\">APC-</a>Variablen-"
+"Cache um Anfragenergebnisse zwischenzuspeichern."
diff --git a/plugins/Adsense/locale/de/LC_MESSAGES/Adsense.po b/plugins/Adsense/locale/de/LC_MESSAGES/Adsense.po
index 632adfa07d..4a796eef40 100644
--- a/plugins/Adsense/locale/de/LC_MESSAGES/Adsense.po
+++ b/plugins/Adsense/locale/de/LC_MESSAGES/Adsense.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - Adsense to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: Fujnky
 # Author: Michael
 # Author: The Evil IP address
 # --
@@ -10,13 +11,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:13+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:06: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-15 11:03:12+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-adsense\n"
@@ -59,7 +60,7 @@ msgstr "Skript-URL"
 
 #: adsenseadminpanel.php:171
 msgid "Script URL (advanced)"
-msgstr ""
+msgstr "Skript-URL (erweitert)"
 
 #: adsenseadminpanel.php:176
 msgid "Medium rectangle"
diff --git a/plugins/Awesomeness/locale/de/LC_MESSAGES/Awesomeness.po b/plugins/Awesomeness/locale/de/LC_MESSAGES/Awesomeness.po
new file mode 100644
index 0000000000..d7f419500d
--- /dev/null
+++ b/plugins/Awesomeness/locale/de/LC_MESSAGES/Awesomeness.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - Awesomeness to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Fujnky
+# --
+# 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-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:07: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-01-29 22:19:22+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-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 ""
+"Das Awesomeness-Plugin fügt zusätzliche Großartigkeit zu einer StatusNet-"
+"Installation hinzu."
diff --git a/plugins/Bookmark/locale/br/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/br/LC_MESSAGES/Bookmark.po
new file mode 100644
index 0000000000..c3d8053423
--- /dev/null
+++ b/plugins/Bookmark/locale/br/LC_MESSAGES/Bookmark.po
@@ -0,0 +1,36 @@
+# Translation of StatusNet - Bookmark 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 - 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"
+"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-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ñ"
+
+#: importdelicious.php:340
+msgctxt "BUTTON"
+msgid "Upload"
+msgstr "Enporzhiañ"
+
+#: BookmarkPlugin.php:458
+msgid "Simple extension for supporting bookmarks."
+msgstr ""
diff --git a/plugins/Bookmark/locale/de/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/de/LC_MESSAGES/Bookmark.po
new file mode 100644
index 0000000000..bcf3268259
--- /dev/null
+++ b/plugins/Bookmark/locale/de/LC_MESSAGES/Bookmark.po
@@ -0,0 +1,36 @@
+# Translation of StatusNet - Bookmark to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Fujnky
+# --
+# 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-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:07: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:19:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-bookmark\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: bookmarkform.php:162
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Speichern"
+
+#: 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."
diff --git a/plugins/Bookmark/locale/fr/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/fr/LC_MESSAGES/Bookmark.po
new file mode 100644
index 0000000000..b63c065af0
--- /dev/null
+++ b/plugins/Bookmark/locale/fr/LC_MESSAGES/Bookmark.po
@@ -0,0 +1,36 @@
+# Translation of StatusNet - Bookmark to French (Français)
+# Exported from translatewiki.net
+#
+# Author: IAlex
+# --
+# 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-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:07: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:19:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-bookmark\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: bookmarkform.php:162
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Sauvegarder"
+
+#: 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."
diff --git a/plugins/Bookmark/locale/my/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/my/LC_MESSAGES/Bookmark.po
new file mode 100644
index 0000000000..1b79ca620e
--- /dev/null
+++ b/plugins/Bookmark/locale/my/LC_MESSAGES/Bookmark.po
@@ -0,0 +1,36 @@
+# Translation of StatusNet - Bookmark to Burmese (မြန်မာဘာသာ)
+# Exported from translatewiki.net
+#
+# Author: Erikoo
+# --
+# 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-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:07:18+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-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 "သိမ်းရန်"
+
+#: importdelicious.php:340
+msgctxt "BUTTON"
+msgid "Upload"
+msgstr "Upload တင်ရန်"
+
+#: BookmarkPlugin.php:458
+msgid "Simple extension for supporting bookmarks."
+msgstr ""
diff --git a/plugins/CasAuthentication/locale/de/LC_MESSAGES/CasAuthentication.po b/plugins/CasAuthentication/locale/de/LC_MESSAGES/CasAuthentication.po
index abeee5435a..179f95640e 100644
--- a/plugins/CasAuthentication/locale/de/LC_MESSAGES/CasAuthentication.po
+++ b/plugins/CasAuthentication/locale/de/LC_MESSAGES/CasAuthentication.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - CasAuthentication to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
+# Author: Fujnky
 # Author: Michael
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,13 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - CasAuthentication\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:32:51+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:07:22+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:25:59+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-casauthentication\n"
@@ -29,7 +30,7 @@ msgstr "CAS"
 #. TRANS: Tooltip for menu item. CAS is Central Authentication Service.
 #: CasAuthenticationPlugin.php:85
 msgid "Login or register with CAS."
-msgstr ""
+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.
@@ -38,18 +39,19 @@ msgstr ""
 #, 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 ""
+msgstr "Es ist erforderlich, einen Server anzugeben."
 
 #: CasAuthenticationPlugin.php:131
 msgid "Specifying a port is required."
-msgstr ""
+msgstr "Es ist erforderlich, einen Port anzugeben."
 
 #: CasAuthenticationPlugin.php:134
 msgid "Specifying a path is required."
-msgstr ""
+msgstr "Es ist erforderlich, einen Pfad anzugeben."
 
 #. TRANS: Plugin description. CAS is Central Authentication Service.
 #: CasAuthenticationPlugin.php:154
@@ -57,6 +59,8 @@ msgid ""
 "The CAS Authentication plugin allows for StatusNet to handle authentication "
 "through CAS (Central Authentication Service)."
 msgstr ""
+"Das CAS-Authenfizierungs-Plugin erlaubt es StatusNet, die Authentifizierung "
+"über CAS (Central Authentication Service) abzuwickeln."
 
 #: caslogin.php:28
 msgid "Already logged in."
@@ -64,8 +68,10 @@ msgstr "Bereits angemeldet."
 
 #: caslogin.php:39
 msgid "Incorrect username or password."
-msgstr ""
+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 "
+"berechtigt."
diff --git a/plugins/Disqus/locale/de/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/de/LC_MESSAGES/Disqus.po
index 158ece0cc8..7536ce7eaf 100644
--- a/plugins/Disqus/locale/de/LC_MESSAGES/Disqus.po
+++ b/plugins/Disqus/locale/de/LC_MESSAGES/Disqus.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - Disqus to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: Fujnky
 # Author: Michael
 # Author: The Evil IP address
 # --
@@ -10,13 +11,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-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:07: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-14 23:54:48+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-disqus\n"
@@ -35,7 +36,7 @@ msgstr ""
 #. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
 #: DisqusPlugin.php:151
 msgid "Comments powered by "
-msgstr ""
+msgstr "Kommentare werden unterstützt durch "
 
 #. TRANS: Plugin supplied feature for Disqus comments to notices.
 #: DisqusPlugin.php:204
diff --git a/plugins/EmailSummary/locale/de/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/de/LC_MESSAGES/EmailSummary.po
new file mode 100644
index 0000000000..089324c36a
--- /dev/null
+++ b/plugins/EmailSummary/locale/de/LC_MESSAGES/EmailSummary.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - EmailSummary to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Fujnky
+# --
+# 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-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:07: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:24:11+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-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/FacebookBridge/locale/FacebookBridge.pot b/plugins/FacebookBridge/locale/FacebookBridge.pot
index e093f145f7..a518adb42b 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-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+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:201 FacebookBridgePlugin.php:240
-#: FacebookBridgePlugin.php:281
+#: FacebookBridgePlugin.php:224 FacebookBridgePlugin.php:263
+#: FacebookBridgePlugin.php:304
 msgctxt "MENU"
 msgid "Facebook"
 msgstr ""
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:203
+#: FacebookBridgePlugin.php:226
 msgid "Login or register using Facebook"
 msgstr ""
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:242
+#: FacebookBridgePlugin.php:265
 msgid "Facebook integration configuration"
 msgstr ""
 
 #. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:283 actions/facebooksettings.php:105
+#: FacebookBridgePlugin.php:306 actions/facebooksettings.php:105
 msgid "Facebook settings"
 msgstr ""
 
-#: FacebookBridgePlugin.php:547
+#: FacebookBridgePlugin.php:570
 msgid "A plugin for integrating StatusNet with Facebook."
 msgstr ""
 
-#: lib/facebookclient.php:776
+#: lib/facebookclient.php:760
 msgid "Your Facebook connection has been removed"
 msgstr ""
 
-#: lib/facebookclient.php:835
+#: lib/facebookclient.php:819
 #, 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 a0d6d25c3e..c0b564b12f 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:48+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:07:52+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:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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:201 FacebookBridgePlugin.php:240
-#: FacebookBridgePlugin.php:281
+#: FacebookBridgePlugin.php:224 FacebookBridgePlugin.php:263
+#: FacebookBridgePlugin.php:304
 msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:203
+#: FacebookBridgePlugin.php:226
 msgid "Login or register using Facebook"
 msgstr "Kevreañ pe en em enskrivañ dre Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:242
+#: FacebookBridgePlugin.php:265
 msgid "Facebook integration configuration"
 msgstr ""
 
 #. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:283 actions/facebooksettings.php:105
+#: FacebookBridgePlugin.php:306 actions/facebooksettings.php:105
 msgid "Facebook settings"
 msgstr "Arventennoù Facebook"
 
-#: FacebookBridgePlugin.php:547
+#: FacebookBridgePlugin.php:570
 msgid "A plugin for integrating StatusNet with Facebook."
 msgstr ""
 
-#: lib/facebookclient.php:776
+#: lib/facebookclient.php:760
 msgid "Your Facebook connection has been removed"
 msgstr ""
 
-#: lib/facebookclient.php:835
+#: lib/facebookclient.php:819
 #, 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 1c93e7168c..6605725e98 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:48+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:07:53+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:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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:201 FacebookBridgePlugin.php:240
-#: FacebookBridgePlugin.php:281
+#: FacebookBridgePlugin.php:224 FacebookBridgePlugin.php:263
+#: FacebookBridgePlugin.php:304
 msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:203
+#: FacebookBridgePlugin.php:226
 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:242
+#: FacebookBridgePlugin.php:265
 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:283 actions/facebooksettings.php:105
+#: FacebookBridgePlugin.php:306 actions/facebooksettings.php:105
 msgid "Facebook settings"
 msgstr "Paràmetres del Facebook"
 
-#: FacebookBridgePlugin.php:547
+#: FacebookBridgePlugin.php:570
 msgid "A plugin for integrating StatusNet with Facebook."
 msgstr "Un connector per integrar l'StatusNet amb el Facebook"
 
-#: lib/facebookclient.php:776
+#: lib/facebookclient.php:760
 msgid "Your Facebook connection has been removed"
 msgstr "S'ha eliminat la connexió amb el Facebook"
 
-#: lib/facebookclient.php:835
+#: lib/facebookclient.php:819
 #, 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
new file mode 100644
index 0000000000..add1e26513
--- /dev/null
+++ b/plugins/FacebookBridge/locale/de/LC_MESSAGES/FacebookBridge.po
@@ -0,0 +1,318 @@
+# Translation of StatusNet - FacebookBridge to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Fujnky
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+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"
+"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-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:224 FacebookBridgePlugin.php:263
+#: FacebookBridgePlugin.php:304
+msgctxt "MENU"
+msgid "Facebook"
+msgstr "Facebook"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#: FacebookBridgePlugin.php:226
+msgid "Login or register using Facebook"
+msgstr "Über Facebook anmelden oder registrieren"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#: FacebookBridgePlugin.php:265
+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
+msgid "Facebook settings"
+msgstr "Facebook-Einstellungen"
+
+#: FacebookBridgePlugin.php:570
+msgid "A plugin for integrating StatusNet with Facebook."
+msgstr "Ein Plugin zur Integration von StatusNet mit Facebook."
+
+#: lib/facebookclient.php:760
+msgid "Your Facebook connection has been removed"
+msgstr "Ihre Facebook-Verbindung wurde entfernt"
+
+#: lib/facebookclient.php:819
+#, php-format
+msgid "Contact the %s administrator to retrieve your account"
+msgstr "Kontaktiere den %s-Administrator um dein Konto zurück zu bekommen"
+
+#: 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 "
+"Facebook to a local account. You can either create a new local account, or "
+"connect with an existing local account."
+msgstr ""
+"Dies ist das erste Mal, dass du dich bei %s angemeldet hast, also müssen wir "
+"Facebook mit deinem lokalen Konto verbinden. Du kannst entweder ein neues "
+"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, "
+"email address, IM address, and phone number."
+msgstr ""
+"Mein Text und meine Dateien sind mit Ausnahme dieser privaten Daten unter %s "
+"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."
+msgstr ""
+"Falls de bereits ein Konto hast, melde dich mit deinem Benutzernamen und "
+"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
+msgid "Facebook"
+msgstr "Facebook"
+
+#: actions/facebookadminpanel.php:62
+msgid "Facebook integration settings"
+msgstr "Einstellungen der Facebook-Integration"
+
+#: 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."
+
+#: 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."
+
+#: actions/facebookadminpanel.php:178
+msgid "Facebook application settings"
+msgstr "Einstellungen der Facebook-Anwendung"
+
+#: 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."
diff --git a/plugins/FacebookBridge/locale/ia/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/ia/LC_MESSAGES/FacebookBridge.po
index 9dfd77afcf..7b47ff711f 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:48+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:07: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-14 13:21:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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:201 FacebookBridgePlugin.php:240
-#: FacebookBridgePlugin.php:281
+#: FacebookBridgePlugin.php:224 FacebookBridgePlugin.php:263
+#: FacebookBridgePlugin.php:304
 msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:203
+#: FacebookBridgePlugin.php:226
 msgid "Login or register using Facebook"
 msgstr "Aperir session o crear conto usante Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:242
+#: FacebookBridgePlugin.php:265
 msgid "Facebook integration configuration"
 msgstr "Configuration del integration de Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:283 actions/facebooksettings.php:105
+#: FacebookBridgePlugin.php:306 actions/facebooksettings.php:105
 msgid "Facebook settings"
 msgstr "Configuration de Facebook"
 
-#: FacebookBridgePlugin.php:547
+#: FacebookBridgePlugin.php:570
 msgid "A plugin for integrating StatusNet with Facebook."
 msgstr "Un plug-in pro integrar StatusNet con Facebook."
 
-#: lib/facebookclient.php:776
+#: lib/facebookclient.php:760
 msgid "Your Facebook connection has been removed"
 msgstr "Tu connexion a Facebook ha essite removite"
 
-#: lib/facebookclient.php:835
+#: lib/facebookclient.php:819
 #, 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 89dc2dc0be..17f23e2bd8 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:48+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:07: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-14 13:21:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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:201 FacebookBridgePlugin.php:240
-#: FacebookBridgePlugin.php:281
+#: FacebookBridgePlugin.php:224 FacebookBridgePlugin.php:263
+#: FacebookBridgePlugin.php:304
 msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:203
+#: FacebookBridgePlugin.php:226
 msgid "Login or register using Facebook"
 msgstr "Најава или регистрација со Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:242
+#: FacebookBridgePlugin.php:265
 msgid "Facebook integration configuration"
 msgstr "Поставки за обединување со Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:283 actions/facebooksettings.php:105
+#: FacebookBridgePlugin.php:306 actions/facebooksettings.php:105
 msgid "Facebook settings"
 msgstr "Поставки за Facebook"
 
-#: FacebookBridgePlugin.php:547
+#: FacebookBridgePlugin.php:570
 msgid "A plugin for integrating StatusNet with Facebook."
 msgstr "Приклучок за обединување на StatusNet со Facebook."
 
-#: lib/facebookclient.php:776
+#: lib/facebookclient.php:760
 msgid "Your Facebook connection has been removed"
 msgstr "Вашата врска со Facebook е отстранета"
 
-#: lib/facebookclient.php:835
+#: lib/facebookclient.php:819
 #, 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 07d0b07a7a..05f7977828 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:48+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:07: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-14 13:21:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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:201 FacebookBridgePlugin.php:240
-#: FacebookBridgePlugin.php:281
+#: FacebookBridgePlugin.php:224 FacebookBridgePlugin.php:263
+#: FacebookBridgePlugin.php:304
 msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:203
+#: FacebookBridgePlugin.php:226
 msgid "Login or register using Facebook"
 msgstr "Aanmelden of registreren via Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:242
+#: FacebookBridgePlugin.php:265
 msgid "Facebook integration configuration"
 msgstr "Instellingen voor Facebookintegratie"
 
 #. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:283 actions/facebooksettings.php:105
+#: FacebookBridgePlugin.php:306 actions/facebooksettings.php:105
 msgid "Facebook settings"
 msgstr "Facebookinstellingen"
 
-#: FacebookBridgePlugin.php:547
+#: FacebookBridgePlugin.php:570
 msgid "A plugin for integrating StatusNet with Facebook."
 msgstr "Een plug-in voor het integreren van StatusNet met Facebook."
 
-#: lib/facebookclient.php:776
+#: lib/facebookclient.php:760
 msgid "Your Facebook connection has been removed"
 msgstr "Uw koppeling met Facebook is verwijderd"
 
-#: lib/facebookclient.php:835
+#: lib/facebookclient.php:819
 #, 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 6954d44c81..54dd7663e3 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:49:48+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:07: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-14 13:21:17+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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:201 FacebookBridgePlugin.php:240
-#: FacebookBridgePlugin.php:281
+#: FacebookBridgePlugin.php:224 FacebookBridgePlugin.php:263
+#: FacebookBridgePlugin.php:304
 msgctxt "MENU"
 msgid "Facebook"
 msgstr "Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:203
+#: FacebookBridgePlugin.php:226
 msgid "Login or register using Facebook"
 msgstr "Увійти або зареєструватись з Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
-#: FacebookBridgePlugin.php:242
+#: FacebookBridgePlugin.php:265
 msgid "Facebook integration configuration"
 msgstr "Налаштування інтеграції з Facebook"
 
 #. TRANS: Tooltip for menu item "Facebook".
 #. TRANS: Page title for Facebook settings.
-#: FacebookBridgePlugin.php:283 actions/facebooksettings.php:105
+#: FacebookBridgePlugin.php:306 actions/facebooksettings.php:105
 msgid "Facebook settings"
 msgstr "Налаштування Facebook"
 
-#: FacebookBridgePlugin.php:547
+#: FacebookBridgePlugin.php:570
 msgid "A plugin for integrating StatusNet with Facebook."
 msgstr "Додаток для інтеграції StatusNet з Facebook."
 
-#: lib/facebookclient.php:776
+#: lib/facebookclient.php:760
 msgid "Your Facebook connection has been removed"
 msgstr "З’єднання з Facebook було видалено"
 
-#: lib/facebookclient.php:835
+#: lib/facebookclient.php:819
 #, php-format
 msgid "Contact the %s administrator to retrieve your account"
 msgstr "Зверніться до адміністратора %s, аби відновити свій обліковий запис"
diff --git a/plugins/GroupPrivateMessage/locale/GroupPrivateMessage.pot b/plugins/GroupPrivateMessage/locale/GroupPrivateMessage.pot
new file mode 100644
index 0000000000..c6be0d5ddd
--- /dev/null
+++ b/plugins/GroupPrivateMessage/locale/GroupPrivateMessage.pot
@@ -0,0 +1,53 @@
+# 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-02-14 16:01+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"
+"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 ""
+
+#: 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 ""
diff --git a/plugins/Imap/locale/de/LC_MESSAGES/Imap.po b/plugins/Imap/locale/de/LC_MESSAGES/Imap.po
new file mode 100644
index 0000000000..c0fba4194f
--- /dev/null
+++ b/plugins/Imap/locale/de/LC_MESSAGES/Imap.po
@@ -0,0 +1,59 @@
+# Translation of StatusNet - Imap to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Fujnky
+# Author: Michael
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+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"
+"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-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."
+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."
+msgstr ""
+"Das IMAP-Plugin ermöglicht es StatusNet, ein POP- oder IMAP-Postfach auf "
+"empfangene E-Mails mit Benutzer-Posts zu überprüfen."
diff --git a/plugins/InProcessCache/locale/de/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/de/LC_MESSAGES/InProcessCache.po
new file mode 100644
index 0000000000..6dec48a6f6
--- /dev/null
+++ b/plugins/InProcessCache/locale/de/LC_MESSAGES/InProcessCache.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - InProcessCache to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Fujnky
+# --
+# 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-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:08: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-29 22:25:53+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-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/InfiniteScroll/locale/de/LC_MESSAGES/InfiniteScroll.po b/plugins/InfiniteScroll/locale/de/LC_MESSAGES/InfiniteScroll.po
index 9438631b21..ce957eda4e 100644
--- a/plugins/InfiniteScroll/locale/de/LC_MESSAGES/InfiniteScroll.po
+++ b/plugins/InfiniteScroll/locale/de/LC_MESSAGES/InfiniteScroll.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - InfiniteScroll to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: Fujnky
 # Author: The Evil IP address
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,13 +10,13 @@ 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-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:08: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-01-29 22:23:43+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-infinitescroll\n"
@@ -31,5 +32,5 @@ msgstr ""
 "Infinite Scroll fügt die folgende Funktionalität zu deiner StatusNet-"
 "Installation hinzu: Wenn ein Benutzer Richtung Seitenende scrollt, wird die "
 "nächste Nachrichtenseite automatisch geladen und angefügt. Das bedeutet, "
-"dass sie nie „Nächste Seite“ klicken müssen, was die Attraktivität "
-"dramatisch erhöht."
+"dass du nie „Nächste Seite“ klicken musst, was die Attraktivität dramatisch "
+"erhöht."
diff --git a/plugins/LdapAuthentication/locale/de/LC_MESSAGES/LdapAuthentication.po b/plugins/LdapAuthentication/locale/de/LC_MESSAGES/LdapAuthentication.po
new file mode 100644
index 0000000000..fdbde0055f
--- /dev/null
+++ b/plugins/LdapAuthentication/locale/de/LC_MESSAGES/LdapAuthentication.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - LdapAuthentication to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Fujnky
+# --
+# 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-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:08: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:25:28+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-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 ""
+"Das LDAP-Authentifizierungs-Plugin erlaubt es StatusNet, die "
+"Authentifizierung durch LDAP abzuwickeln."
diff --git a/plugins/LdapAuthorization/locale/de/LC_MESSAGES/LdapAuthorization.po b/plugins/LdapAuthorization/locale/de/LC_MESSAGES/LdapAuthorization.po
new file mode 100644
index 0000000000..a1a8aa94a6
--- /dev/null
+++ b/plugins/LdapAuthorization/locale/de/LC_MESSAGES/LdapAuthorization.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - LdapAuthorization to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Fujnky
+# --
+# 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-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:08:22+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-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."
+msgstr ""
+"Das LDAP-Berechtigungs-Plugin erlaubt es StatusNet, Berechtigungen durch "
+"LDAP abzuwickeln."
diff --git a/plugins/LinkPreview/locale/de/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/de/LC_MESSAGES/LinkPreview.po
new file mode 100644
index 0000000000..031e6f2216
--- /dev/null
+++ b/plugins/LinkPreview/locale/de/LC_MESSAGES/LinkPreview.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - LinkPreview to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Fujnky
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+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"
+"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-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 "
+"anzuzeigen."
diff --git a/plugins/LogFilter/locale/de/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/de/LC_MESSAGES/LogFilter.po
new file mode 100644
index 0000000000..71200d954f
--- /dev/null
+++ b/plugins/LogFilter/locale/de/LC_MESSAGES/LogFilter.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - LogFilter to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Fujnky
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+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"
+"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-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 "
+"Schlüsselwort zur Verfügung"
diff --git a/plugins/MobileProfile/locale/MobileProfile.pot b/plugins/MobileProfile/locale/MobileProfile.pot
index 3a8917f406..dfd2daf7f0 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-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+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"
@@ -60,11 +60,11 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: MobileProfilePlugin.php:361
+#: MobileProfilePlugin.php:362
 msgid "Attach"
 msgstr ""
 
-#: MobileProfilePlugin.php:365
+#: MobileProfilePlugin.php:366
 msgid "Attach a file"
 msgstr ""
 
diff --git a/plugins/MobileProfile/locale/de/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/de/LC_MESSAGES/MobileProfile.po
new file mode 100644
index 0000000000..866307052b
--- /dev/null
+++ b/plugins/MobileProfile/locale/de/LC_MESSAGES/MobileProfile.po
@@ -0,0 +1,78 @@
+# Translation of StatusNet - MobileProfile to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Fujnky
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+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"
+"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-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
+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
+msgid "Home"
+msgstr "Startseite"
+
+#: MobileProfilePlugin.php:312
+msgid "Account"
+msgstr "Konto"
+
+#: MobileProfilePlugin.php:314
+msgid "Connect"
+msgstr "Verbinden"
+
+#: MobileProfilePlugin.php:317
+msgid "Admin"
+msgstr "Administration"
+
+#: MobileProfilePlugin.php:317
+msgid "Change site configuration"
+msgstr "Seitenkonfiguration ändern"
+
+#: MobileProfilePlugin.php:321
+msgid "Invite"
+msgstr "Einladen"
+
+#: MobileProfilePlugin.php:324
+msgid "Logout"
+msgstr "Abmelden"
+
+#: MobileProfilePlugin.php:328
+msgid "Register"
+msgstr "Registrieren"
+
+#: MobileProfilePlugin.php:331
+msgid "Login"
+msgstr "Anmelden"
+
+#: MobileProfilePlugin.php:335
+msgid "Search"
+msgstr "Suche"
+
+#: MobileProfilePlugin.php:362
+msgid "Attach"
+msgstr "Anhängen"
+
+#: MobileProfilePlugin.php:366
+msgid "Attach a file"
+msgstr "Datei anhängen"
+
+#: MobileProfilePlugin.php:417
+msgid "XHTML MobileProfile output for supporting user agents."
+msgstr "XHTML-MobileProfile-Ausgabe zur Unterstützung von User-Agents."
diff --git a/plugins/MobileProfile/locale/ps/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/ps/LC_MESSAGES/MobileProfile.po
index c58fa20d7d..ef7e62fb29 100644
--- a/plugins/MobileProfile/locale/ps/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/ps/LC_MESSAGES/MobileProfile.po
@@ -1,5 +1,5 @@
 # Translation of StatusNet - MobileProfile to Pashto (پښتو)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: Ahmed-Najib-Biabani-Ibrahimkhel
 # --
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-16 15:08+0000\n"
-"PO-Revision-Date: 2010-12-16 15:12:19+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:08:51+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: 2010-11-30 20:43:45+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r78478); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ps\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
@@ -31,7 +31,7 @@ msgstr "کور"
 
 #: MobileProfilePlugin.php:312
 msgid "Account"
-msgstr ""
+msgstr "ګڼون"
 
 #: MobileProfilePlugin.php:314
 msgid "Connect"
@@ -39,7 +39,7 @@ msgstr ""
 
 #: MobileProfilePlugin.php:317
 msgid "Admin"
-msgstr ""
+msgstr "پازوال"
 
 #: MobileProfilePlugin.php:317
 msgid "Change site configuration"
@@ -55,7 +55,7 @@ msgstr "وتل"
 
 #: MobileProfilePlugin.php:328
 msgid "Register"
-msgstr ""
+msgstr "نومليکل"
 
 #: MobileProfilePlugin.php:331
 msgid "Login"
@@ -65,11 +65,11 @@ msgstr "ننوتل"
 msgid "Search"
 msgstr "پلټل"
 
-#: MobileProfilePlugin.php:361
+#: MobileProfilePlugin.php:362
 msgid "Attach"
 msgstr ""
 
-#: MobileProfilePlugin.php:365
+#: MobileProfilePlugin.php:366
 msgid "Attach a file"
 msgstr ""
 
diff --git a/plugins/ModHelper/locale/de/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/de/LC_MESSAGES/ModHelper.po
new file mode 100644
index 0000000000..32123bf1c9
--- /dev/null
+++ b/plugins/ModHelper/locale/de/LC_MESSAGES/ModHelper.po
@@ -0,0 +1,29 @@
+# Translation of StatusNet - ModHelper to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Fujnky
+# --
+# 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-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:08: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:25:42+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-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 ""
+"Ermöglicht es Benutzern, die manuell als „Modhelfer“ markiert wurden, Konten "
+"stumm zu stellen."
diff --git a/plugins/ModPlus/locale/de/LC_MESSAGES/ModPlus.po b/plugins/ModPlus/locale/de/LC_MESSAGES/ModPlus.po
new file mode 100644
index 0000000000..2e55da6617
--- /dev/null
+++ b/plugins/ModPlus/locale/de/LC_MESSAGES/ModPlus.po
@@ -0,0 +1,52 @@
+# Translation of StatusNet - ModPlus to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Fujnky
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+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"
+"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-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 "
+"profile page on %s](%s)."
+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."
diff --git a/plugins/NewMenu/locale/br/LC_MESSAGES/NewMenu.po b/plugins/NewMenu/locale/br/LC_MESSAGES/NewMenu.po
new file mode 100644
index 0000000000..083cd48165
--- /dev/null
+++ b/plugins/NewMenu/locale/br/LC_MESSAGES/NewMenu.po
@@ -0,0 +1,98 @@
+# Translation of StatusNet - NewMenu 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 - 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"
+"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-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 ""
+
+#: NewMenuPlugin.php:91
+msgid "Change your personal settings"
+msgstr ""
+
+#: NewMenuPlugin.php:96
+msgid "Admin"
+msgstr "Merour"
+
+#: NewMenuPlugin.php:97
+msgid "Site configuration"
+msgstr ""
+
+#: NewMenuPlugin.php:102
+msgid "Logout"
+msgstr "Digevreañ"
+
+#: NewMenuPlugin.php:103
+msgid "Logout from the site"
+msgstr ""
+
+#: NewMenuPlugin.php:113
+msgid "Login"
+msgstr "Kevreañ"
+
+#: NewMenuPlugin.php:114
+msgid "Login to the site"
+msgstr ""
+
+#: NewMenuPlugin.php:121
+msgid "Search"
+msgstr "Klask"
+
+#: NewMenuPlugin.php:122
+msgid "Search the site"
+msgstr ""
+
+#: NewMenuPlugin.php:307
+msgid "IM"
+msgstr ""
+
+#: 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
new file mode 100644
index 0000000000..16bc9b5d8a
--- /dev/null
+++ b/plugins/NewMenu/locale/de/LC_MESSAGES/NewMenu.po
@@ -0,0 +1,98 @@
+# Translation of StatusNet - NewMenu to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Fujnky
+# --
+# 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-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:08: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-02-03 23:18:45+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-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/OStatus/locale/OStatus.pot b/plugins/OStatus/locale/OStatus.pot
index 4c6208d262..2cd394d529 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-02 23:30+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+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"
@@ -208,50 +208,50 @@ msgid "Unable to fetch avatar from %s."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1234
+#: classes/Ostatus_profile.php:1235
 msgid "Local user can't be referenced as remote."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1239
+#: classes/Ostatus_profile.php:1240
 msgid "Local group can't be referenced as remote."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1291 classes/Ostatus_profile.php:1302
+#: classes/Ostatus_profile.php:1292 classes/Ostatus_profile.php:1303
 msgid "Can't save local profile."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1310
+#: classes/Ostatus_profile.php:1311
 msgid "Can't save OStatus profile."
 msgstr ""
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1574 classes/Ostatus_profile.php:1602
+#: classes/Ostatus_profile.php:1599 classes/Ostatus_profile.php:1627
 msgid "Not a valid webfinger address."
 msgstr ""
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1684
+#: classes/Ostatus_profile.php:1709
 #, php-format
 msgid "Couldn't save profile for \"%s\"."
 msgstr ""
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1703
+#: classes/Ostatus_profile.php:1728
 #, php-format
 msgid "Couldn't save ostatus_profile for \"%s\"."
 msgstr ""
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1711
+#: classes/Ostatus_profile.php:1736
 #, php-format
 msgid "Couldn't find a valid profile for \"%s\"."
 msgstr ""
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1754
+#: classes/Ostatus_profile.php:1779
 msgid "Could not store HTML content of long post as file."
 msgstr ""
 
diff --git a/plugins/OStatus/locale/de/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/de/LC_MESSAGES/OStatus.po
new file mode 100644
index 0000000000..89697d90b6
--- /dev/null
+++ b/plugins/OStatus/locale/de/LC_MESSAGES/OStatus.po
@@ -0,0 +1,792 @@
+# Translation of StatusNet - OStatus to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Fujnky
+# Author: Michael
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+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"
+"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-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"
+
+#. 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>."
+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:192
+#, 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:195
+#, 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:285
+#, 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
+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:410
+msgid "Unknown feed format."
+msgstr "Unbekanntes Feed-Format."
+
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:434
+msgid "RSS feed without a channel."
+msgstr "RSS-Feed ohne einen Kanal."
+
+#. TRANS: Client exception.
+#: classes/Ostatus_profile.php:480
+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
+#, 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
+msgid "Show more"
+msgstr "Mehr anzeigen"
+
+#. TRANS: Exception. %s is a profile URL.
+#: classes/Ostatus_profile.php:766
+#, 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
+#, 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
+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
+#, 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
+#, 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:1008
+#, php-format
+msgid "Unable to fetch avatar from %s."
+msgstr "Kann den Avatar von %s nicht abrufen."
+
+#. TRANS: Exception.
+#: classes/Ostatus_profile.php:1235
+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
+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
+msgid "Can't save local profile."
+msgstr "Lokales Profil kann nicht gespeichert werden."
+
+#. TRANS: Server exception.
+#: classes/Ostatus_profile.php:1311
+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
+msgid "Not a valid webfinger address."
+msgstr "Ungültige Webfinger-Adresse."
+
+#. TRANS: Exception. %s is a webfinger address.
+#: classes/Ostatus_profile.php:1709
+#, 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
+#, 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
+#, 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
+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 "
+"feeds."
+msgstr ""
+"Nicht unterstütztes hub.topic %s. Dieser Hub stellt nur Atom-Feeds lokaler "
+"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 "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"
+msgstr ""
+"Adresse des OStatus-Benutzers, wie nickname@example.com oder http://example."
+"net/nickname"
+
+#. 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:"
+
+#: 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
+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 ""
+"Entschuldigung, wir konnte  diese Adresse nicht erreichen. Bitte überprüfe, "
+"ob die OStatus-Adresse gültig ist. Beispiele: nickname@example.com oder "
+"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
+msgid ""
+"Sorry, we could not reach that feed. Please try that OStatus address again "
+"later."
+msgstr ""
+"Entschuldigung, wir konnten diesen Feed nicht erreichen. Bitte versuche "
+"diese OStatus-Adresse später noch einmal."
+
+#. TRANS: OStatus remote subscription dialog error.
+#: actions/ostatussub.php:317
+msgid "Already subscribed!"
+msgstr "Bereits abonniert!"
+
+#. TRANS: OStatus remote subscription dialog error.
+#: actions/ostatussub.php:322
+msgid "Remote subscription failed!"
+msgstr "Remoteabonnement fehlgeschlagen!"
+
+#: actions/ostatussub.php:369 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
+msgid "Subscribe to user"
+msgstr "Abonniere diesen Benutzer"
+
+#. TRANS: Page title for OStatus remote subscription form
+#: actions/ostatussub.php:417
+msgid "Confirm"
+msgstr "Bestätigen"
+
+#. TRANS: Instructions.
+#: actions/ostatussub.php:429
+msgid ""
+"You can subscribe to users from other supported sites. Paste their address "
+"or profile URI below:"
+msgstr ""
+"Du kannst Benutzer von anderen unterstützten Websites abonnieren. Füge ihre "
+"Adresse oder Profil-URI unten ein:"
+
+#. 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."
+
+#. TRANS: Server exception. %s is a feed ID.
+#: actions/pushcallback.php:56
+#, php-format
+msgid "Unknown PuSH feed id %s"
+msgstr "Unbekannte PuSH Feed-ID %s"
+
+#. TRANS: Client exception. %s is an invalid feed name.
+#: actions/pushcallback.php:96
+#, 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.
+#: actions/pushcallback.php:101
+#, 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.
+#: actions/pushcallback.php:108
+#, php-format
+msgid "Unexpected subscribe request for %s."
+msgstr "Unerwartete Deabonnement-Anfrage für %s."
+
+#. TRANS: Client exception. %s is an invalid topic.
+#: actions/pushcallback.php:113
+#, php-format
+msgid "Unexpected unsubscribe request for %s."
+msgstr "Unerwartete Deabonnement-Anfrage für %s."
diff --git a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
index 98cbb31248..ac126fd904 100644
--- a/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
+++ b/plugins/OStatus/locale/fr/LC_MESSAGES/OStatus.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - OStatus to French (Français)
 # Exported from translatewiki.net
 #
+# Author: IAlex
 # Author: Peter17
 # Author: Verdy p
 # --
@@ -10,13 +11,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - OStatus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-02 23:30+0000\n"
-"PO-Revision-Date: 2011-02-02 23:37:57+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:09: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-30 23:08:42+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -232,50 +233,50 @@ msgid "Unable to fetch avatar from %s."
 msgstr "Impossible de récupérer l’avatar depuis « %s »."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1234
+#: classes/Ostatus_profile.php:1235
 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:1239
+#: classes/Ostatus_profile.php:1240
 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:1291 classes/Ostatus_profile.php:1302
+#: classes/Ostatus_profile.php:1292 classes/Ostatus_profile.php:1303
 msgid "Can't save local profile."
 msgstr "Impossible de sauvegarder le profil local."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1310
+#: classes/Ostatus_profile.php:1311
 msgid "Can't save OStatus profile."
 msgstr "Impossible de sauvegarder le profil OStatus."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1574 classes/Ostatus_profile.php:1602
+#: classes/Ostatus_profile.php:1599 classes/Ostatus_profile.php:1627
 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:1684
+#: classes/Ostatus_profile.php:1709
 #, 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:1703
+#: classes/Ostatus_profile.php:1728
 #, 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:1711
+#: classes/Ostatus_profile.php:1736
 #, 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:1754
+#: classes/Ostatus_profile.php:1779
 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."
@@ -729,14 +730,12 @@ msgstr "S’abonner"
 
 #. TRANS: Field label.
 #: actions/ostatusinit.php:119
-#, fuzzy
 msgid "Group nickname"
-msgstr "Pseudonyme de l’utilisateur"
+msgstr "Pseudonyme du groupe"
 
 #: actions/ostatusinit.php:120
-#, fuzzy
 msgid "Nickname of the group you want to join."
-msgstr "Pseudonyme de l’utilisateur que vous voulez suivre."
+msgstr "Pseudonyme du groupe que vous voulez rejoindre."
 
 #. TRANS: Field label.
 #: actions/ostatusinit.php:123
diff --git a/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/ia/LC_MESSAGES/OStatus.po
index cbb803a5d6..8d533cb771 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-02 23:30+0000\n"
-"PO-Revision-Date: 2011-02-02 23:37:58+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:09: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-30 23:08:42+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -220,50 +220,50 @@ msgid "Unable to fetch avatar from %s."
 msgstr "Incapace de obtener avatar ab %s."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1234
+#: classes/Ostatus_profile.php:1235
 msgid "Local user can't be referenced as remote."
 msgstr "Usator local non pote esser referentiate como remote."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1239
+#: classes/Ostatus_profile.php:1240
 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:1291 classes/Ostatus_profile.php:1302
+#: classes/Ostatus_profile.php:1292 classes/Ostatus_profile.php:1303
 msgid "Can't save local profile."
 msgstr "Non pote salveguardar profilo local."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1310
+#: classes/Ostatus_profile.php:1311
 msgid "Can't save OStatus profile."
 msgstr "Non pote salveguardar profilo OStatus."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1574 classes/Ostatus_profile.php:1602
+#: classes/Ostatus_profile.php:1599 classes/Ostatus_profile.php:1627
 msgid "Not a valid webfinger address."
 msgstr "Adresse webfinger invalide."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1684
+#: classes/Ostatus_profile.php:1709
 #, 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:1703
+#: classes/Ostatus_profile.php:1728
 #, 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:1711
+#: classes/Ostatus_profile.php:1736
 #, 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:1754
+#: classes/Ostatus_profile.php:1779
 msgid "Could not store HTML content of long post as file."
 msgstr "Non poteva immagazinar contento HTML de longe message como file."
 
@@ -702,14 +702,12 @@ msgstr "Subscriber"
 
 #. TRANS: Field label.
 #: actions/ostatusinit.php:119
-#, fuzzy
 msgid "Group nickname"
-msgstr "Pseudonymo del usator"
+msgstr "Pseudonymo del gruppo"
 
 #: actions/ostatusinit.php:120
-#, fuzzy
 msgid "Nickname of the group you want to join."
-msgstr "Le pseudonymo del usator que tu vole sequer."
+msgstr "Le pseudonymo del gruppo a que tu vole adherer."
 
 #. TRANS: Field label.
 #: actions/ostatusinit.php:123
diff --git a/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/mk/LC_MESSAGES/OStatus.po
index 0a65f67f2c..86d0f996fa 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-02 23:30+0000\n"
-"PO-Revision-Date: 2011-02-02 23:37:58+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:09: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-30 23:08:42+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -223,50 +223,50 @@ msgid "Unable to fetch avatar from %s."
 msgstr "Не можам да го добијам аватарот од %s."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1234
+#: classes/Ostatus_profile.php:1235
 msgid "Local user can't be referenced as remote."
 msgstr "Локалниот корисник не може да се наведе како далечински."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1239
+#: classes/Ostatus_profile.php:1240
 msgid "Local group can't be referenced as remote."
 msgstr "Локалната група не може да се наведе како далечинска."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1291 classes/Ostatus_profile.php:1302
+#: classes/Ostatus_profile.php:1292 classes/Ostatus_profile.php:1303
 msgid "Can't save local profile."
 msgstr "Не можам да го зачувам локалниот профил."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1310
+#: classes/Ostatus_profile.php:1311
 msgid "Can't save OStatus profile."
 msgstr "Не можам да го зачувам профилот од OStatus."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1574 classes/Ostatus_profile.php:1602
+#: classes/Ostatus_profile.php:1599 classes/Ostatus_profile.php:1627
 msgid "Not a valid webfinger address."
 msgstr "Ова не е важечка Webfinger-адреса"
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1684
+#: classes/Ostatus_profile.php:1709
 #, php-format
 msgid "Couldn't save profile for \"%s\"."
 msgstr "Не можам да го зачувам профилот за „%s“."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1703
+#: classes/Ostatus_profile.php:1728
 #, 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:1711
+#: classes/Ostatus_profile.php:1736
 #, php-format
 msgid "Couldn't find a valid profile for \"%s\"."
 msgstr "Не можев да пронајдам важечки профил за „%s“."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1754
+#: classes/Ostatus_profile.php:1779
 msgid "Could not store HTML content of long post as file."
 msgstr ""
 "Не можам да ја складирам HTML-содржината на долгата објава како податотека."
@@ -705,14 +705,12 @@ msgstr "Претплати се"
 
 #. TRANS: Field label.
 #: actions/ostatusinit.php:119
-#, fuzzy
 msgid "Group nickname"
-msgstr "Прекар на корисникот"
+msgstr "Прекар на групата"
 
 #: actions/ostatusinit.php:120
-#, fuzzy
 msgid "Nickname of the group you want to join."
-msgstr "Прекарот на корисникот што сакате да го следите."
+msgstr "Прекар на групата кајшто сакате да се зачлените."
 
 #. TRANS: Field label.
 #: actions/ostatusinit.php:123
diff --git a/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/nl/LC_MESSAGES/OStatus.po
index 0f87ee4108..6164e0e957 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-02 23:30+0000\n"
-"PO-Revision-Date: 2011-02-02 23:37:58+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:09: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-30 23:08:42+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -231,54 +231,54 @@ 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:1234
+#: classes/Ostatus_profile.php:1235
 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:1239
+#: classes/Ostatus_profile.php:1240
 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:1291 classes/Ostatus_profile.php:1302
+#: classes/Ostatus_profile.php:1292 classes/Ostatus_profile.php:1303
 msgid "Can't save local profile."
 msgstr "Het was niet mogelijk het lokale profiel op te slaan."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1310
+#: classes/Ostatus_profile.php:1311
 msgid "Can't save OStatus profile."
 msgstr "Het was niet mogelijk het Ostatusprofiel op te slaan."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1574 classes/Ostatus_profile.php:1602
+#: classes/Ostatus_profile.php:1599 classes/Ostatus_profile.php:1627
 msgid "Not a valid webfinger address."
 msgstr "Geen geldig webfingeradres."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1684
+#: classes/Ostatus_profile.php:1709
 #, 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:1703
+#: classes/Ostatus_profile.php:1728
 #, 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:1711
+#: classes/Ostatus_profile.php:1736
 #, 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:1754
+#: classes/Ostatus_profile.php:1779
 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 "
@@ -733,14 +733,12 @@ msgstr "Abonneren"
 
 #. TRANS: Field label.
 #: actions/ostatusinit.php:119
-#, fuzzy
 msgid "Group nickname"
-msgstr "Gebruikersnaam"
+msgstr "Korte groepsnaam"
 
 #: actions/ostatusinit.php:120
-#, fuzzy
 msgid "Nickname of the group you want to join."
-msgstr "Gebruikersnaam van de gebruiker waarop u wilt abonneren."
+msgstr "De naam van de groep die u wilt volgen."
 
 #. TRANS: Field label.
 #: actions/ostatusinit.php:123
diff --git a/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po b/plugins/OStatus/locale/uk/LC_MESSAGES/OStatus.po
index 75939d51ee..6e3eb52be4 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-02 23:30+0000\n"
-"PO-Revision-Date: 2011-02-02 23:37:59+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:09: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-30 23:08:42+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81409); Translate extension (2011-02-01)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-ostatus\n"
@@ -226,50 +226,50 @@ msgid "Unable to fetch avatar from %s."
 msgstr "Неможливо завантажити аватару з %s."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1234
+#: classes/Ostatus_profile.php:1235
 msgid "Local user can't be referenced as remote."
 msgstr "Місцевий користувач не може бути зазначеним у якості віддаленого."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1239
+#: classes/Ostatus_profile.php:1240
 msgid "Local group can't be referenced as remote."
 msgstr "Локальну спільноту не можна зазначити у якості віддаленої."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1291 classes/Ostatus_profile.php:1302
+#: classes/Ostatus_profile.php:1292 classes/Ostatus_profile.php:1303
 msgid "Can't save local profile."
 msgstr "Не вдається зберегти місцевий профіль."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1310
+#: classes/Ostatus_profile.php:1311
 msgid "Can't save OStatus profile."
 msgstr "Не вдається зберегти профіль OStatus."
 
 #. TRANS: Exception.
-#: classes/Ostatus_profile.php:1574 classes/Ostatus_profile.php:1602
+#: classes/Ostatus_profile.php:1599 classes/Ostatus_profile.php:1627
 msgid "Not a valid webfinger address."
 msgstr "Це недійсна адреса для протоколу WebFinger."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1684
+#: classes/Ostatus_profile.php:1709
 #, php-format
 msgid "Couldn't save profile for \"%s\"."
 msgstr "Не можу зберегти профіль для «%s»."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1703
+#: classes/Ostatus_profile.php:1728
 #, php-format
 msgid "Couldn't save ostatus_profile for \"%s\"."
 msgstr "Не можу зберегти профіль OStatus для «%s»."
 
 #. TRANS: Exception. %s is a webfinger address.
-#: classes/Ostatus_profile.php:1711
+#: classes/Ostatus_profile.php:1736
 #, php-format
 msgid "Couldn't find a valid profile for \"%s\"."
 msgstr "не можу знайти відповідний й профіль для «%s»."
 
 #. TRANS: Server exception.
-#: classes/Ostatus_profile.php:1754
+#: classes/Ostatus_profile.php:1779
 msgid "Could not store HTML content of long post as file."
 msgstr "Не можу зберегти HTML місткого допису у якості файлу."
 
@@ -716,14 +716,12 @@ msgstr "Підписатись"
 
 #. TRANS: Field label.
 #: actions/ostatusinit.php:119
-#, fuzzy
 msgid "Group nickname"
-msgstr "Ім’я користувача"
+msgstr "Назва спільноти"
 
 #: actions/ostatusinit.php:120
-#, fuzzy
 msgid "Nickname of the group you want to join."
-msgstr "Ім’я користувача, дописи якого ви хотіли б читати."
+msgstr "Назва спільноти, до якої ви хотіли б приєднатися."
 
 #. TRANS: Field label.
 #: actions/ostatusinit.php:123
diff --git a/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
index 3dbceea822..555c799786 100644
--- a/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
+++ b/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 #
 # Author: Apmon
+# Author: Fujnky
 # 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 - 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-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:09: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-22 19:30:33+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-openid\n"
@@ -210,7 +211,7 @@ msgstr "OpenId-Einstellungen speichern"
 #. TRANS: OpenID plugin server error.
 #: openid.php:138
 msgid "Cannot instantiate OpenID consumer object."
-msgstr ""
+msgstr "OpenID-Consumer-Objekt kann nicht instanziiert werden."
 
 #. TRANS: OpenID plugin message. Given when an OpenID is not valid.
 #: openid.php:150
@@ -237,6 +238,9 @@ 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
@@ -347,12 +351,12 @@ msgstr "Weiter"
 #. TRANS: OpenID plugin logon form legend.
 #: OpenIDPlugin.php:658 openidlogin.php:140
 msgid "OpenID login"
-msgstr ""
+msgstr "OpenID-Benutzername"
 
 #. TRANS: Field label.
 #: OpenIDPlugin.php:666 openidlogin.php:148
 msgid "OpenID provider"
-msgstr ""
+msgstr "OpenID-Provider"
 
 #. TRANS: Form guide.
 #: OpenIDPlugin.php:675 openidlogin.php:156
@@ -363,6 +367,8 @@ msgstr "Gib deinen Benutzernamen ein."
 #: OpenIDPlugin.php:677 openidlogin.php:157
 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
@@ -413,7 +419,7 @@ msgstr ""
 #. TRANS: Title
 #: finishopenidlogin.php:80
 msgid "OpenID Account Setup"
-msgstr ""
+msgstr "OpenID Konto-Setup"
 
 #: finishopenidlogin.php:117
 msgid "Create new account"
@@ -512,7 +518,7 @@ msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
 #. TRANS: OpenID plugin server error. A stored OpenID cannot be found.
 #: finishopenidlogin.php:363 finishopenidlogin.php:449
 msgid "Stored OpenID not found."
-msgstr ""
+msgstr "Gespeicherte OpenID nicht gefunden."
 
 #. TRANS: OpenID plugin server error.
 #: finishopenidlogin.php:373
@@ -527,7 +533,7 @@ 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 ""
+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%%)".
@@ -551,7 +557,7 @@ msgstr "Mit einem [OpenID](%%doc.openid%%)-Benutzerkonto anmelden."
 #. TRANS: Title after getting the status of the OpenID authorisation request.
 #: openidlogin.php:122 finishaddopenid.php:187
 msgid "OpenID Login"
-msgstr ""
+msgstr "OpenID-Anmeldung"
 
 #. TRANS: OpenID plugin logon form checkbox label for setting to put the OpenID information in a cookie.
 #: openidlogin.php:169
@@ -571,12 +577,14 @@ msgstr "Anmelden"
 
 #: openidtrust.php:52
 msgid "OpenID Identity Verification"
-msgstr ""
+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
@@ -614,9 +622,9 @@ 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 ""
+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 ""
+msgstr "Fehler beim Aktualisieren des Profils"
diff --git a/plugins/RSSCloud/locale/de/LC_MESSAGES/RSSCloud.po b/plugins/RSSCloud/locale/de/LC_MESSAGES/RSSCloud.po
index 7cd3a26247..e3cddb8a9b 100644
--- a/plugins/RSSCloud/locale/de/LC_MESSAGES/RSSCloud.po
+++ b/plugins/RSSCloud/locale/de/LC_MESSAGES/RSSCloud.po
@@ -1,7 +1,8 @@
 # Translation of StatusNet - RSSCloud to German (Deutsch)
-# Expored from translatewiki.net
+# Exported from translatewiki.net
 #
 # Author: David Güdel
+# Author: Fujnky
 # Author: Umherirrender
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -10,13 +11,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - RSSCloud\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-14 10:29+0000\n"
-"PO-Revision-Date: 2011-01-14 10:33:58+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10: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:27:21+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r80246); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-rsscloud\n"
@@ -24,50 +25,52 @@ msgstr ""
 
 #: RSSCloudRequestNotify.php:90
 msgid "Request must be POST."
-msgstr ""
+msgstr "Anfrage muss ein POST sein."
 
 #: RSSCloudRequestNotify.php:107
 msgid "Only http-post notifications are supported at this time."
-msgstr ""
+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 ""
+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)."
 msgstr ""
-"Sie müssen mindestens eine gültige Profil-Feed-URL angeben (url1, url2, url3 "
-"… urlN)."
+"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 ""
+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."
 msgstr ""
-"Vielen Dank für das Abonnement. Sie werden benachrichtigt, wenn der Feed "
+"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 ""
+msgstr "Diese Ressource erfordert eine HTTP-GET-Anfrage."
 
 #: LoggingAggregator.php:104
 msgid "This resource requires an HTTP POST."
-msgstr ""
+msgstr "Diese Ressource erfordert eine HTTP-POST-Anfrage."
 
 #: RSSCloudPlugin.php:248
 msgid ""
@@ -75,3 +78,6 @@ msgid ""
 "updates for profile RSS feeds using the <a href=\"http://rsscloud.org/"
 "\">RSSCloud protocol</a>."
 msgstr ""
+"Das RSSClound-Plugin ermöglicht ihrere StatusNet-Instanz, in Echtzeit "
+"Updates für Profil-RSS-Feeds mit Hilfe des <a href=\"http://rsscloud.org/"
+"\">RSSCloud-Protokolls< /a> zu veröffentlichen."
diff --git a/plugins/Realtime/locale/Realtime.pot b/plugins/Realtime/locale/Realtime.pot
index 8142b2f7b0..5c1cc212b2 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-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+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,37 +17,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
-#: RealtimePlugin.php:339
+#: RealtimePlugin.php:340
 msgctxt "BUTTON"
 msgid "Play"
 msgstr ""
 
 #. TRANS: Tooltip for realtime view "play" button.
-#: RealtimePlugin.php:341
+#: RealtimePlugin.php:342
 msgctxt "TOOLTIP"
 msgid "Play"
 msgstr ""
 
 #. TRANS: Text label for realtime view "pause" button
-#: RealtimePlugin.php:343
+#: RealtimePlugin.php:344
 msgctxt "BUTTON"
 msgid "Pause"
 msgstr ""
 
 #. TRANS: Tooltip for realtime view "pause" button
-#: RealtimePlugin.php:345
+#: RealtimePlugin.php:346
 msgctxt "TOOLTIP"
 msgid "Pause"
 msgstr ""
 
 #. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
-#: RealtimePlugin.php:347
+#: RealtimePlugin.php:348
 msgctxt "BUTTON"
 msgid "Pop up"
 msgstr ""
 
 #. TRANS: Tooltip for realtime view "popup" button.
-#: RealtimePlugin.php:349
+#: RealtimePlugin.php:350
 msgctxt "TOOLTIP"
 msgid "Pop up in a window"
 msgstr ""
diff --git a/plugins/Realtime/locale/af/LC_MESSAGES/Realtime.po b/plugins/Realtime/locale/af/LC_MESSAGES/Realtime.po
index 17160d942b..d0a6aa22ab 100644
--- a/plugins/Realtime/locale/af/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/af/LC_MESSAGES/Realtime.po
@@ -9,50 +9,50 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:12+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:09:47+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-15 11:02:42+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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:339
+#: RealtimePlugin.php:340
 msgctxt "BUTTON"
 msgid "Play"
 msgstr "Speel"
 
 #. TRANS: Tooltip for realtime view "play" button.
-#: RealtimePlugin.php:341
+#: RealtimePlugin.php:342
 msgctxt "TOOLTIP"
 msgid "Play"
 msgstr "Speel"
 
 #. TRANS: Text label for realtime view "pause" button
-#: RealtimePlugin.php:343
+#: RealtimePlugin.php:344
 msgctxt "BUTTON"
 msgid "Pause"
 msgstr "Wag"
 
 #. TRANS: Tooltip for realtime view "pause" button
-#: RealtimePlugin.php:345
+#: RealtimePlugin.php:346
 msgctxt "TOOLTIP"
 msgid "Pause"
 msgstr "Wag"
 
 #. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
-#: RealtimePlugin.php:347
+#: RealtimePlugin.php:348
 msgctxt "BUTTON"
 msgid "Pop up"
 msgstr "Pop-up"
 
 #. TRANS: Tooltip for realtime view "popup" button.
-#: RealtimePlugin.php:349
+#: 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 a00de6fb23..c4d56d85e2 100644
--- a/plugins/Realtime/locale/br/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/br/LC_MESSAGES/Realtime.po
@@ -9,50 +9,50 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:12+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:09: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-15 11:02:42+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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:339
+#: RealtimePlugin.php:340
 msgctxt "BUTTON"
 msgid "Play"
 msgstr "Lenn"
 
 #. TRANS: Tooltip for realtime view "play" button.
-#: RealtimePlugin.php:341
+#: RealtimePlugin.php:342
 msgctxt "TOOLTIP"
 msgid "Play"
 msgstr "Lenn"
 
 #. TRANS: Text label for realtime view "pause" button
-#: RealtimePlugin.php:343
+#: RealtimePlugin.php:344
 msgctxt "BUTTON"
 msgid "Pause"
 msgstr "Ehan"
 
 #. TRANS: Tooltip for realtime view "pause" button
-#: RealtimePlugin.php:345
+#: RealtimePlugin.php:346
 msgctxt "TOOLTIP"
 msgid "Pause"
 msgstr "Ehan"
 
 #. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
-#: RealtimePlugin.php:347
+#: RealtimePlugin.php:348
 msgctxt "BUTTON"
 msgid "Pop up"
 msgstr ""
 
 #. TRANS: Tooltip for realtime view "popup" button.
-#: RealtimePlugin.php:349
+#: 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 59193cf28e..07c8da8217 100644
--- a/plugins/Realtime/locale/ca/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/ca/LC_MESSAGES/Realtime.po
@@ -9,50 +9,50 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:12+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:09:48+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-15 11:02:42+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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:339
+#: RealtimePlugin.php:340
 msgctxt "BUTTON"
 msgid "Play"
 msgstr "Reprodueix"
 
 #. TRANS: Tooltip for realtime view "play" button.
-#: RealtimePlugin.php:341
+#: RealtimePlugin.php:342
 msgctxt "TOOLTIP"
 msgid "Play"
 msgstr "Reprodueix"
 
 #. TRANS: Text label for realtime view "pause" button
-#: RealtimePlugin.php:343
+#: RealtimePlugin.php:344
 msgctxt "BUTTON"
 msgid "Pause"
 msgstr "Pausa"
 
 #. TRANS: Tooltip for realtime view "pause" button
-#: RealtimePlugin.php:345
+#: RealtimePlugin.php:346
 msgctxt "TOOLTIP"
 msgid "Pause"
 msgstr "Pausa"
 
 #. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
-#: RealtimePlugin.php:347
+#: RealtimePlugin.php:348
 msgctxt "BUTTON"
 msgid "Pop up"
 msgstr "Emergent"
 
 #. TRANS: Tooltip for realtime view "popup" button.
-#: RealtimePlugin.php:349
+#: 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
new file mode 100644
index 0000000000..174e1510c5
--- /dev/null
+++ b/plugins/Realtime/locale/de/LC_MESSAGES/Realtime.po
@@ -0,0 +1,58 @@
+# Translation of StatusNet - Realtime to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Fujnky
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Realtime\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:09: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-29 22:28:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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-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 5657a32516..ce1eccf70e 100644
--- a/plugins/Realtime/locale/fr/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/fr/LC_MESSAGES/Realtime.po
@@ -9,50 +9,50 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:12+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:09: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-15 11:02:42+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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:339
+#: RealtimePlugin.php:340
 msgctxt "BUTTON"
 msgid "Play"
 msgstr "Jouer"
 
 #. TRANS: Tooltip for realtime view "play" button.
-#: RealtimePlugin.php:341
+#: RealtimePlugin.php:342
 msgctxt "TOOLTIP"
 msgid "Play"
 msgstr "Jouer"
 
 #. TRANS: Text label for realtime view "pause" button
-#: RealtimePlugin.php:343
+#: RealtimePlugin.php:344
 msgctxt "BUTTON"
 msgid "Pause"
 msgstr "Pause"
 
 #. TRANS: Tooltip for realtime view "pause" button
-#: RealtimePlugin.php:345
+#: RealtimePlugin.php:346
 msgctxt "TOOLTIP"
 msgid "Pause"
 msgstr "Pause"
 
 #. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
-#: RealtimePlugin.php:347
+#: RealtimePlugin.php:348
 msgctxt "BUTTON"
 msgid "Pop up"
 msgstr "Nouvelle fenêtre"
 
 #. TRANS: Tooltip for realtime view "popup" button.
-#: RealtimePlugin.php:349
+#: 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 1089753097..6e3e4a82bb 100644
--- a/plugins/Realtime/locale/ia/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/ia/LC_MESSAGES/Realtime.po
@@ -9,50 +9,50 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:12+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:09: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-15 11:02:42+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
-#: RealtimePlugin.php:339
+#: RealtimePlugin.php:340
 msgctxt "BUTTON"
 msgid "Play"
 msgstr "Reproducer"
 
 #. TRANS: Tooltip for realtime view "play" button.
-#: RealtimePlugin.php:341
+#: RealtimePlugin.php:342
 msgctxt "TOOLTIP"
 msgid "Play"
 msgstr "Reproducer"
 
 #. TRANS: Text label for realtime view "pause" button
-#: RealtimePlugin.php:343
+#: RealtimePlugin.php:344
 msgctxt "BUTTON"
 msgid "Pause"
 msgstr "Pausar"
 
 #. TRANS: Tooltip for realtime view "pause" button
-#: RealtimePlugin.php:345
+#: RealtimePlugin.php:346
 msgctxt "TOOLTIP"
 msgid "Pause"
 msgstr "Pausar"
 
 #. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
-#: RealtimePlugin.php:347
+#: RealtimePlugin.php:348
 msgctxt "BUTTON"
 msgid "Pop up"
 msgstr "Fenestra"
 
 #. TRANS: Tooltip for realtime view "popup" button.
-#: RealtimePlugin.php:349
+#: 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 e01767e97b..3f82d15605 100644
--- a/plugins/Realtime/locale/mk/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/mk/LC_MESSAGES/Realtime.po
@@ -9,50 +9,50 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:12+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:09: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-15 11:02:42+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
 
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
-#: RealtimePlugin.php:339
+#: RealtimePlugin.php:340
 msgctxt "BUTTON"
 msgid "Play"
 msgstr "Пушти"
 
 #. TRANS: Tooltip for realtime view "play" button.
-#: RealtimePlugin.php:341
+#: RealtimePlugin.php:342
 msgctxt "TOOLTIP"
 msgid "Play"
 msgstr "Пушти"
 
 #. TRANS: Text label for realtime view "pause" button
-#: RealtimePlugin.php:343
+#: RealtimePlugin.php:344
 msgctxt "BUTTON"
 msgid "Pause"
 msgstr "Паузирај"
 
 #. TRANS: Tooltip for realtime view "pause" button
-#: RealtimePlugin.php:345
+#: RealtimePlugin.php:346
 msgctxt "TOOLTIP"
 msgid "Pause"
 msgstr "Паузирај"
 
 #. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
-#: RealtimePlugin.php:347
+#: RealtimePlugin.php:348
 msgctxt "BUTTON"
 msgid "Pop up"
 msgstr "Прозорче"
 
 #. TRANS: Tooltip for realtime view "popup" button.
-#: RealtimePlugin.php:349
+#: 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 4b37193306..04ac2dbbc0 100644
--- a/plugins/Realtime/locale/ne/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/ne/LC_MESSAGES/Realtime.po
@@ -9,50 +9,50 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:12+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:09:53+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-15 11:02:42+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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:339
+#: RealtimePlugin.php:340
 msgctxt "BUTTON"
 msgid "Play"
 msgstr "बजाउ"
 
 #. TRANS: Tooltip for realtime view "play" button.
-#: RealtimePlugin.php:341
+#: RealtimePlugin.php:342
 msgctxt "TOOLTIP"
 msgid "Play"
 msgstr "बजाउ"
 
 #. TRANS: Text label for realtime view "pause" button
-#: RealtimePlugin.php:343
+#: RealtimePlugin.php:344
 msgctxt "BUTTON"
 msgid "Pause"
 msgstr "बिसाउ"
 
 #. TRANS: Tooltip for realtime view "pause" button
-#: RealtimePlugin.php:345
+#: RealtimePlugin.php:346
 msgctxt "TOOLTIP"
 msgid "Pause"
 msgstr "बिसाउ"
 
 #. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
-#: RealtimePlugin.php:347
+#: RealtimePlugin.php:348
 msgctxt "BUTTON"
 msgid "Pop up"
 msgstr "चम्काउ"
 
 #. TRANS: Tooltip for realtime view "popup" button.
-#: RealtimePlugin.php:349
+#: 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 0e8cf32832..afb1e6f269 100644
--- a/plugins/Realtime/locale/nl/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/nl/LC_MESSAGES/Realtime.po
@@ -9,50 +9,50 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:12+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:09: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-15 11:02:42+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-realtime\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANS: Text label for realtime view "play" button, usually replaced by an icon.
-#: RealtimePlugin.php:339
+#: RealtimePlugin.php:340
 msgctxt "BUTTON"
 msgid "Play"
 msgstr "Afspelen"
 
 #. TRANS: Tooltip for realtime view "play" button.
-#: RealtimePlugin.php:341
+#: RealtimePlugin.php:342
 msgctxt "TOOLTIP"
 msgid "Play"
 msgstr "Afspelen"
 
 #. TRANS: Text label for realtime view "pause" button
-#: RealtimePlugin.php:343
+#: RealtimePlugin.php:344
 msgctxt "BUTTON"
 msgid "Pause"
 msgstr "Pauzeren"
 
 #. TRANS: Tooltip for realtime view "pause" button
-#: RealtimePlugin.php:345
+#: RealtimePlugin.php:346
 msgctxt "TOOLTIP"
 msgid "Pause"
 msgstr "Pauzeren"
 
 #. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
-#: RealtimePlugin.php:347
+#: RealtimePlugin.php:348
 msgctxt "BUTTON"
 msgid "Pop up"
 msgstr "Pop-up"
 
 #. TRANS: Tooltip for realtime view "popup" button.
-#: RealtimePlugin.php:349
+#: 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 1331993240..8da3949897 100644
--- a/plugins/Realtime/locale/tr/LC_MESSAGES/Realtime.po
+++ b/plugins/Realtime/locale/tr/LC_MESSAGES/Realtime.po
@@ -9,50 +9,50 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Realtime\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:12+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:09:53+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-15 11:02:42+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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:339
+#: RealtimePlugin.php:340
 msgctxt "BUTTON"
 msgid "Play"
 msgstr "Oynat"
 
 #. TRANS: Tooltip for realtime view "play" button.
-#: RealtimePlugin.php:341
+#: RealtimePlugin.php:342
 msgctxt "TOOLTIP"
 msgid "Play"
 msgstr "Oynat"
 
 #. TRANS: Text label for realtime view "pause" button
-#: RealtimePlugin.php:343
+#: RealtimePlugin.php:344
 msgctxt "BUTTON"
 msgid "Pause"
 msgstr "Duraklat"
 
 #. TRANS: Tooltip for realtime view "pause" button
-#: RealtimePlugin.php:345
+#: RealtimePlugin.php:346
 msgctxt "TOOLTIP"
 msgid "Pause"
 msgstr "Duraklat"
 
 #. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
-#: RealtimePlugin.php:347
+#: RealtimePlugin.php:348
 msgctxt "BUTTON"
 msgid "Pop up"
 msgstr ""
 
 #. TRANS: Tooltip for realtime view "popup" button.
-#: RealtimePlugin.php:349
+#: 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 ac14280b9e..be409b8f4a 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:12+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:09: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-15 11:02:42+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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,37 @@ 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:339
+#: RealtimePlugin.php:340
 msgctxt "BUTTON"
 msgid "Play"
 msgstr "Оновлювати"
 
 #. TRANS: Tooltip for realtime view "play" button.
-#: RealtimePlugin.php:341
+#: RealtimePlugin.php:342
 msgctxt "TOOLTIP"
 msgid "Play"
 msgstr "Оновлювати"
 
 #. TRANS: Text label for realtime view "pause" button
-#: RealtimePlugin.php:343
+#: RealtimePlugin.php:344
 msgctxt "BUTTON"
 msgid "Pause"
 msgstr "Пауза"
 
 #. TRANS: Tooltip for realtime view "pause" button
-#: RealtimePlugin.php:345
+#: RealtimePlugin.php:346
 msgctxt "TOOLTIP"
 msgid "Pause"
 msgstr "Пауза"
 
 #. TRANS: Text label for realtime view "popup" button, usually replaced by an icon.
-#: RealtimePlugin.php:347
+#: RealtimePlugin.php:348
 msgctxt "BUTTON"
 msgid "Pop up"
 msgstr "Окреме вікно"
 
 #. TRANS: Tooltip for realtime view "popup" button.
-#: RealtimePlugin.php:349
+#: RealtimePlugin.php:350
 msgctxt "TOOLTIP"
 msgid "Pop up in a window"
 msgstr "Стрічка окремим вікном"
diff --git a/plugins/ReverseUsernameAuthentication/locale/de/LC_MESSAGES/ReverseUsernameAuthentication.po b/plugins/ReverseUsernameAuthentication/locale/de/LC_MESSAGES/ReverseUsernameAuthentication.po
new file mode 100644
index 0000000000..078e5d52bb
--- /dev/null
+++ b/plugins/ReverseUsernameAuthentication/locale/de/LC_MESSAGES/ReverseUsernameAuthentication.po
@@ -0,0 +1,32 @@
+# Translation of StatusNet - ReverseUsernameAuthentication to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Fujnky
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+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"
+"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-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 "
+"reverse of the username."
+msgstr ""
+"Das Reverse-Username-Authentication-Plugin ermöglicht es StatusNet, die "
+"Authentifizierung dadurch zu behandeln, dass überprüft wird of das "
+"angegebene Passwort der umgekehrte Benutzername ist."
diff --git a/plugins/SQLProfile/locale/de/LC_MESSAGES/SQLProfile.po b/plugins/SQLProfile/locale/de/LC_MESSAGES/SQLProfile.po
new file mode 100644
index 0000000000..f7d98c8012
--- /dev/null
+++ b/plugins/SQLProfile/locale/de/LC_MESSAGES/SQLProfile.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - SQLProfile to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Fujnky
+# --
+# 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-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10: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-01-29 22:28:31+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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"
+"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
new file mode 100644
index 0000000000..4d65dd0709
--- /dev/null
+++ b/plugins/SQLProfile/locale/fr/LC_MESSAGES/SQLProfile.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - SQLProfile to French (Français)
+# Exported from translatewiki.net
+#
+# Author: IAlex
+# --
+# 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-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10: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-POT-Import-Date: 2011-01-29 22:28:31+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82114); 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"
+"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 "
+"indexées."
diff --git a/plugins/Sitemap/locale/de/LC_MESSAGES/Sitemap.po b/plugins/Sitemap/locale/de/LC_MESSAGES/Sitemap.po
new file mode 100644
index 0000000000..4c482fd9da
--- /dev/null
+++ b/plugins/Sitemap/locale/de/LC_MESSAGES/Sitemap.po
@@ -0,0 +1,92 @@
+# Translation of StatusNet - Sitemap to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Fujnky
+# Author: Michael
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+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"
+"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-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 "
+"Google."
diff --git a/plugins/SlicedFavorites/locale/de/LC_MESSAGES/SlicedFavorites.po b/plugins/SlicedFavorites/locale/de/LC_MESSAGES/SlicedFavorites.po
new file mode 100644
index 0000000000..52e0713dd5
--- /dev/null
+++ b/plugins/SlicedFavorites/locale/de/LC_MESSAGES/SlicedFavorites.po
@@ -0,0 +1,34 @@
+# Translation of StatusNet - SlicedFavorites to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Fujnky
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+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"
+"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-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/SphinxSearch/locale/de/LC_MESSAGES/SphinxSearch.po b/plugins/SphinxSearch/locale/de/LC_MESSAGES/SphinxSearch.po
new file mode 100644
index 0000000000..0fbfb5b411
--- /dev/null
+++ b/plugins/SphinxSearch/locale/de/LC_MESSAGES/SphinxSearch.po
@@ -0,0 +1,37 @@
+# Translation of StatusNet - SphinxSearch to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Fujnky
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+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"
+"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-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.
+#: 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/SubMirror/locale/de/LC_MESSAGES/SubMirror.po b/plugins/SubMirror/locale/de/LC_MESSAGES/SubMirror.po
new file mode 100644
index 0000000000..6d6036e465
--- /dev/null
+++ b/plugins/SubMirror/locale/de/LC_MESSAGES/SubMirror.po
@@ -0,0 +1,141 @@
+# Translation of StatusNet - SubMirror to German (Deutsch)
+# Exported from translatewiki.net
+#
+# Author: Fujnky
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+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"
+"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-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 "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
+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 cf43e65b0c..4075cb55af 100644
--- a/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po
+++ b/plugins/SubMirror/locale/fr/LC_MESSAGES/SubMirror.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - SubMirror to French (Français)
 # Exported from translatewiki.net
 #
+# Author: IAlex
 # Author: Verdy p
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,13 +10,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-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10: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-15 11:02:40+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-submirror\n"
@@ -38,7 +39,7 @@ msgstr "Configurer la mise en miroir de messages provenant d’autres flux"
 
 #: SubMirrorPlugin.php:183
 msgid "Mirrored feeds"
-msgstr ""
+msgstr "Flux en miroir"
 
 #: lib/editmirrorform.php:83
 msgctxt "LABEL"
diff --git a/plugins/TinyMCE/locale/TinyMCE.pot b/plugins/TinyMCE/locale/TinyMCE.pot
index 76fa38cbf9..50903d25bd 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-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+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,6 +16,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: TinyMCEPlugin.php:83
+#: TinyMCEPlugin.php:87
 msgid "Use TinyMCE library to allow rich text editing in the browser."
 msgstr ""
diff --git a/plugins/TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po
index 7da0ee58cb..c020d47af6 100644
--- a/plugins/TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\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-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10:18+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:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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:83
+#: 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 47204bda03..8a8bc66647 100644
--- a/plugins/TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\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-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10:18+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-14 13:22:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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:83
+#: 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 f49b5ddc6f..e88a76b674 100644
--- a/plugins/TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\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-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10: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-14 13:22:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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:83
+#: 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 8a6ed2106f..a459db080e 100644
--- a/plugins/TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:30+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10: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-14 13:22:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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:83
+#: 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 63b00f3e74..fe86b85389 100644
--- a/plugins/TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po
@@ -9,18 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:30+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10: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-14 13:22:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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:83
+#: 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 48eead30f0..e86a224f08 100644
--- a/plugins/TinyMCE/locale/ia/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/ia/LC_MESSAGES/TinyMCE.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:30+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10: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-14 13:22:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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:83
+#: 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 e410f6ff10..ff45822089 100644
--- a/plugins/TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:30+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10: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-14 13:22:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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:83
+#: 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 eca025cd62..8841220f8b 100644
--- a/plugins/TinyMCE/locale/mk/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/mk/LC_MESSAGES/TinyMCE.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:30+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10: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-14 13:22:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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:83
+#: 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 43ff3a9046..2f84655eb9 100644
--- a/plugins/TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:30+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10: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-14 13:22:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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:83
+#: 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 62d3f521c5..25469e91a6 100644
--- a/plugins/TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po
@@ -9,18 +9,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:30+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10: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-14 13:22:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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:83
+#: 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_BR/LC_MESSAGES/TinyMCE.po b/plugins/TinyMCE/locale/pt_BR/LC_MESSAGES/TinyMCE.po
index 7622a699ee..0cb97a604f 100644
--- a/plugins/TinyMCE/locale/pt_BR/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/pt_BR/LC_MESSAGES/TinyMCE.po
@@ -9,20 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:30+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10: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-14 13:22:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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:83
+#: 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 341e79e8bd..d336492d3a 100644
--- a/plugins/TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po
@@ -9,20 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:30+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10: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-14 13:22:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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:83
+#: 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 15abe9636b..9f2d643d3c 100644
--- a/plugins/TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po
@@ -9,19 +9,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:30+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10: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-14 13:22:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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:83
+#: 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 eb5729a26e..5ea66da3b0 100644
--- a/plugins/TinyMCE/locale/uk/LC_MESSAGES/TinyMCE.po
+++ b/plugins/TinyMCE/locale/uk/LC_MESSAGES/TinyMCE.po
@@ -9,20 +9,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - TinyMCE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:30+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10: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-14 13:22:20+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-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:83
+#: 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 5f7fa1ab42..35adf08e1a 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-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+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"
@@ -23,11 +23,11 @@ msgstr ""
 msgid "RT @%1$s %2$s"
 msgstr ""
 
-#: twitter.php:407
+#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr ""
 
-#: twitter.php:411
+#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
diff --git a/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/br/LC_MESSAGES/TwitterBridge.po
index 2b9d999505..6674b57c2f 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:36+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10: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-01-22 19:30:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -28,11 +28,11 @@ msgstr ""
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
-#: twitter.php:407
+#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr ""
 
-#: twitter.php:411
+#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
diff --git a/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/ca/LC_MESSAGES/TwitterBridge.po
index 979270f17d..77f3fc6f31 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:36+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10: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-01-22 19:30:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -28,11 +28,11 @@ msgstr ""
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
-#: twitter.php:407
+#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr "S'ha inhabilitat el vostre pont del Twitter."
 
-#: twitter.php:411
+#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
diff --git a/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/fa/LC_MESSAGES/TwitterBridge.po
index c1b24026fc..599b026dcd 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:36+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10: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-01-22 19:30:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fa\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -28,11 +28,11 @@ msgstr ""
 msgid "RT @%1$s %2$s"
 msgstr ""
 
-#: twitter.php:407
+#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr "پل توییتر شما غیر فعال شده است."
 
-#: twitter.php:411
+#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
diff --git a/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/fr/LC_MESSAGES/TwitterBridge.po
index 67ace72cf6..c265ca668d 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:36+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10: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-22 19:30:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -29,11 +29,11 @@ msgstr ""
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
-#: twitter.php:407
+#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr "Votre passerelle Twitter a été désactivée."
 
-#: twitter.php:411
+#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
diff --git a/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/ia/LC_MESSAGES/TwitterBridge.po
index 09f0842500..696005b31c 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:36+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10: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-22 19:30:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -28,11 +28,11 @@ msgstr ""
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
-#: twitter.php:407
+#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr "Tu ponte a Twitter ha essite disactivate."
 
-#: twitter.php:411
+#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
diff --git a/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/mk/LC_MESSAGES/TwitterBridge.po
index bd7cf0c237..5120942bc9 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:36+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10: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-22 19:30:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -28,11 +28,11 @@ msgstr ""
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
-#: twitter.php:407
+#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr "Вашиот мост до Twitter е оневозможен."
 
-#: twitter.php:411
+#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
diff --git a/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/nl/LC_MESSAGES/TwitterBridge.po
index 59a496cccb..37b3b77f52 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:36+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10: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-22 19:30:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -28,11 +28,11 @@ msgstr ""
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
-#: twitter.php:407
+#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr "Uw koppeling naar Twitter is uitgeschakeld."
 
-#: twitter.php:411
+#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
diff --git a/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/tr/LC_MESSAGES/TwitterBridge.po
index 4a702f844a..8741adf4b4 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:37+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10: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-POT-Import-Date: 2011-01-22 19:30:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -28,11 +28,11 @@ msgstr ""
 msgid "RT @%1$s %2$s"
 msgstr ""
 
-#: twitter.php:407
+#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr ""
 
-#: twitter.php:411
+#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
diff --git a/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/uk/LC_MESSAGES/TwitterBridge.po
index 5f81c11849..fa2b4acc51 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:37+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10: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-22 19:30:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -29,11 +29,11 @@ msgstr ""
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
-#: twitter.php:407
+#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr "Ваш місток до Twitter було відключено."
 
-#: twitter.php:411
+#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
diff --git a/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po b/plugins/TwitterBridge/locale/zh_CN/LC_MESSAGES/TwitterBridge.po
index 84feaae135..51d528f2a4 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:37+0000\n"
+"POT-Creation-Date: 2011-02-14 16:01+0000\n"
+"PO-Revision-Date: 2011-02-14 16:10: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-22 19:30:56+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-twitterbridge\n"
@@ -30,11 +30,11 @@ msgstr ""
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
-#: twitter.php:407
+#: twitter.php:409
 msgid "Your Twitter bridge has been disabled."
 msgstr "你的 Twitter bridge 已被禁用。"
 
-#: twitter.php:411
+#: twitter.php:413
 #, php-format
 msgid ""
 "Hi, %1$s. We're sorry to inform you that your link to Twitter has been "

From 96d0141848e6965d0e588b151054737495fb4900 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 15 Feb 2011 12:26:40 -0500
Subject: [PATCH 252/314] New version, dev cycle

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

diff --git a/lib/common.php b/lib/common.php
index 35a5391052..db111df5f9 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -22,13 +22,13 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 //exit with 200 response, if this is checking fancy from the installer
 if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') {  exit; }
 
-define('STATUSNET_BASE_VERSION', '0.9.7');
-define('STATUSNET_LIFECYCLE', 'beta2'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
+define('STATUSNET_BASE_VERSION', '0.9.8');
+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', 'World Leader Pretend');
+define('STATUSNET_CODENAME', 'Letter Never Sent');
 
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);

From ff502bb14841a65725b2a1f6aabcb5ffc3899ee3 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 15 Feb 2011 12:53:02 -0500
Subject: [PATCH 253/314] Get correct size for default avatar in email summary

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

diff --git a/plugins/EmailSummary/useremailsummaryhandler.php b/plugins/EmailSummary/useremailsummaryhandler.php
index b1ebd0c425..c6079d5371 100644
--- a/plugins/EmailSummary/useremailsummaryhandler.php
+++ b/plugins/EmailSummary/useremailsummaryhandler.php
@@ -148,7 +148,7 @@ class UserEmailSummaryHandler extends QueueHandler
 					   'valign' => 'top'));
 	    $out->element('img', array('src' => ($avatar) ?
 				       $avatar->displayUrl() :
-				       Avatar::defaultImage($avatar_size),
+				       Avatar::defaultImage(AVATAR_STREAM_SIZE),
 				       'class' => 'avatar photo',
 				       'width' => AVATAR_STREAM_SIZE,
 				       'height' => AVATAR_STREAM_SIZE,

From 128bfd70119d4fccad8636bb0af353214f8e9aec Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 15 Feb 2011 16:25:37 -0500
Subject: [PATCH 254/314] fix indentation in usermailsummaryhandler.php

---
 .../EmailSummary/useremailsummaryhandler.php  | 226 +++++++++---------
 1 file changed, 113 insertions(+), 113 deletions(-)

diff --git a/plugins/EmailSummary/useremailsummaryhandler.php b/plugins/EmailSummary/useremailsummaryhandler.php
index c6079d5371..7372a27943 100644
--- a/plugins/EmailSummary/useremailsummaryhandler.php
+++ b/plugins/EmailSummary/useremailsummaryhandler.php
@@ -72,155 +72,155 @@ class UserEmailSummaryHandler extends QueueHandler
     
     function handle($user_id)
     {
-	// Skip if they've asked not to get summaries
+        // Skip if they've asked not to get summaries
 
-	$ess = Email_summary_status::staticGet('user_id', $user_id);
+        $ess = Email_summary_status::staticGet('user_id', $user_id);
 	
-	if (!empty($ess) && !$ess->send_summary) {
-	    common_log(LOG_INFO, sprintf('Not sending email summary for user %s by request.', $user_id));
-	    return true;
-	}
+        if (!empty($ess) && !$ess->send_summary) {
+            common_log(LOG_INFO, sprintf('Not sending email summary for user %s by request.', $user_id));
+            return true;
+        }
 
-	$since_id = null;
+        $since_id = null;
 	
-	if (!empty($ess)) {
-	    $since_id = $ess->last_summary_id;
-	}
+        if (!empty($ess)) {
+            $since_id = $ess->last_summary_id;
+        }
 	  
-	$user = User::staticGet('id', $user_id);
+        $user = User::staticGet('id', $user_id);
 
-	if (empty($user)) {
-	    common_log(LOG_INFO, sprintf('Not sending email summary for user %s; no such user.', $user_id));
-	    return true;
-	}
+        if (empty($user)) {
+            common_log(LOG_INFO, sprintf('Not sending email summary for user %s; no such user.', $user_id));
+            return true;
+        }
 	
-	if (empty($user->email)) {
-	    common_log(LOG_INFO, sprintf('Not sending email summary for user %s; no email address.', $user_id));
-	    return true;
-	}
+        if (empty($user->email)) {
+            common_log(LOG_INFO, sprintf('Not sending email summary for user %s; no email address.', $user_id));
+            return true;
+        }
 	
-	$profile = $user->getProfile();
+        $profile = $user->getProfile();
 	
-	if (empty($profile)) {
-	    common_log(LOG_WARNING, sprintf('Not sending email summary for user %s; no profile.', $user_id));
-	    return true;
-	}
+        if (empty($profile)) {
+            common_log(LOG_WARNING, sprintf('Not sending email summary for user %s; no profile.', $user_id));
+            return true;
+        }
 	
-	$notice = $user->ownFriendsTimeline(0, self::MAX_NOTICES, $since_id);
+        $notice = $user->ownFriendsTimeline(0, self::MAX_NOTICES, $since_id);
 
-	if (empty($notice) || $notice->N == 0) {
-	    common_log(LOG_WARNING, sprintf('Not sending email summary for user %s; no notices.', $user_id));
-	    return true;
-	}
+        if (empty($notice) || $notice->N == 0) {
+            common_log(LOG_WARNING, sprintf('Not sending email summary for user %s; no notices.', $user_id));
+            return true;
+        }
 
-	// XXX: This is risky fingerpoken in der objektvars, but I didn't feel like
-	// figuring out a better way. -ESP
+        // XXX: This is risky fingerpoken in der objektvars, but I didn't feel like
+        // figuring out a better way. -ESP
 
-	$new_top = null;
+        $new_top = null;
 	
-	if ($notice instanceof ArrayWrapper) {
-	    $new_top = $notice->_items[0]->id;
-	}
+        if ($notice instanceof ArrayWrapper) {
+            $new_top = $notice->_items[0]->id;
+        }
 	
-	$out = new XMLStringer();
+        $out = new XMLStringer();
 
-	$out->raw(sprintf(_('<p>Recent updates from %1s for %2s:</p>'),
-			  common_config('site', 'name'),
-			  $profile->getBestName()));
+        $out->raw(sprintf(_('<p>Recent updates from %1s for %2s:</p>'),
+                          common_config('site', 'name'),
+                          $profile->getBestName()));
 	
 
-	$out->elementStart('table', array('width' => '541px', 'style' => 'border: none'));
+        $out->elementStart('table', array('width' => '541px', 'style' => 'border: none'));
 	
-	while ($notice->fetch()) {
+        while ($notice->fetch()) {
 	    
-	    $profile = Profile::staticGet('id', $notice->profile_id);
+            $profile = Profile::staticGet('id', $notice->profile_id);
 	    
-	    if (empty($profile)) {
-		continue;
-	    }
+            if (empty($profile)) {
+                continue;
+            }
 	    
-	    $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
+            $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
 
-	    $out->elementStart('tr');
-	    $out->elementStart('td', array('width' => AVATAR_STREAM_SIZE,
-					   'height' => AVATAR_STREAM_SIZE,
-					   'align' => 'left',
-					   'valign' => 'top'));
-	    $out->element('img', array('src' => ($avatar) ?
-				       $avatar->displayUrl() :
-				       Avatar::defaultImage(AVATAR_STREAM_SIZE),
-				       'class' => 'avatar photo',
-				       'width' => AVATAR_STREAM_SIZE,
-				       'height' => AVATAR_STREAM_SIZE,
-				       'alt' => $profile->getBestName()));
-	    $out->elementEnd('td');
-	    $out->elementStart('td', array('align' => 'left',
-					   'valign' => 'top'));
-	    $out->element('a', array('href' => $profile->profileurl),
-			  $profile->nickname);
-	    $out->text(' ');
-	    $out->raw($notice->rendered);
-	    $out->element('br'); // yeah, you know it. I just wrote a <br> in the middle of my table layout.
-	    $noticeurl = $notice->bestUrl();
-	    // above should always return an URL
-	    assert(!empty($noticeurl));
-	    $out->elementStart('a', array('rel' => 'bookmark',
-					  'class' => 'timestamp',
-					  'href' => $noticeurl));
-	    $dt = common_date_iso8601($notice->created);
-	    $out->element('abbr', array('class' => 'published',
-					'title' => $dt),
-			  common_date_string($notice->created));
-	    $out->elementEnd('a');
-	    if ($notice->hasConversation()) {
-		$conv = Conversation::staticGet('id', $notice->conversation);
-		$convurl = $conv->uri;
-		if (!empty($convurl)) {
-				  $out->text(' ');
-				  $out->element('a',
-						array('href' => $convurl.'#notice-'.$notice->id,
-						      'class' => 'response'),
-						_('in context'));
-		}
-	    }
-	    $out->elementEnd('td');
-	    $out->elementEnd('tr');
-	}
+            $out->elementStart('tr');
+            $out->elementStart('td', array('width' => AVATAR_STREAM_SIZE,
+                                           'height' => AVATAR_STREAM_SIZE,
+                                           'align' => 'left',
+                                           'valign' => 'top'));
+            $out->element('img', array('src' => ($avatar) ?
+                                       $avatar->displayUrl() :
+                                       Avatar::defaultImage(AVATAR_STREAM_SIZE),
+                                       'class' => 'avatar photo',
+                                       'width' => AVATAR_STREAM_SIZE,
+                                       'height' => AVATAR_STREAM_SIZE,
+                                       'alt' => $profile->getBestName()));
+            $out->elementEnd('td');
+            $out->elementStart('td', array('align' => 'left',
+                                           'valign' => 'top'));
+            $out->element('a', array('href' => $profile->profileurl),
+                          $profile->nickname);
+            $out->text(' ');
+            $out->raw($notice->rendered);
+            $out->element('br'); // yeah, you know it. I just wrote a <br> in the middle of my table layout.
+            $noticeurl = $notice->bestUrl();
+            // above should always return an URL
+            assert(!empty($noticeurl));
+            $out->elementStart('a', array('rel' => 'bookmark',
+                                          'class' => 'timestamp',
+                                          'href' => $noticeurl));
+            $dt = common_date_iso8601($notice->created);
+            $out->element('abbr', array('class' => 'published',
+                                        'title' => $dt),
+                          common_date_string($notice->created));
+            $out->elementEnd('a');
+            if ($notice->hasConversation()) {
+                $conv = Conversation::staticGet('id', $notice->conversation);
+                $convurl = $conv->uri;
+                if (!empty($convurl)) {
+                    $out->text(' ');
+                    $out->element('a',
+                                  array('href' => $convurl.'#notice-'.$notice->id,
+                                        'class' => 'response'),
+                                  _('in context'));
+                }
+            }
+            $out->elementEnd('td');
+            $out->elementEnd('tr');
+        }
 	
-	$out->elementEnd('table');
+        $out->elementEnd('table');
 	
-	$out->raw(sprintf(_('<p><a href="%1s">change your email settings for %2s</a></p>'),
-			  common_local_url('emailsettings'),
-			  common_config('site', 'name')));
+        $out->raw(sprintf(_('<p><a href="%1s">change your email settings for %2s</a></p>'),
+                          common_local_url('emailsettings'),
+                          common_config('site', 'name')));
 
-	$body = $out->getString();
+        $body = $out->getString();
 	
-	// FIXME: do something for people who don't like HTML email
+        // FIXME: do something for people who don't like HTML email
 	
-	mail_to_user($user, _('Updates from your network'), $body,
-		     array('Content-Type' => 'text/html; charset=UTF-8'));
+        mail_to_user($user, _('Updates from your network'), $body,
+                     array('Content-Type' => 'text/html; charset=UTF-8'));
 
-	if (empty($ess)) {
+        if (empty($ess)) {
 	    
-	    $ess = new Email_summary_status();
+            $ess = new Email_summary_status();
 	    
-	    $ess->user_id         = $user_id;
-	    $ess->created         = common_sql_now();
-	    $ess->last_summary_id = $new_top;
-	    $ess->modified        = common_sql_now();
+            $ess->user_id         = $user_id;
+            $ess->created         = common_sql_now();
+            $ess->last_summary_id = $new_top;
+            $ess->modified        = common_sql_now();
 
-	    $ess->insert();
+            $ess->insert();
 	    
-	} else {
+        } else {
 	    
-	    $orig = clone($ess);
+            $orig = clone($ess);
 	    
-	    $ess->last_summary_id = $new_top;
-	    $ess->modified        = common_sql_now();
+            $ess->last_summary_id = $new_top;
+            $ess->modified        = common_sql_now();
 
-	    $ess->update($orig);
-	}
+            $ess->update($orig);
+        }
 	
-	return true;
+        return true;
     }
 }

From 59afc4aa5631d69bd00a45377f955216a5826148 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 15 Feb 2011 16:26:15 -0500
Subject: [PATCH 255/314] fix indentation in EmailSummaryPlugin.php

---
 plugins/EmailSummary/EmailSummaryPlugin.php | 92 ++++++++++-----------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/plugins/EmailSummary/EmailSummaryPlugin.php b/plugins/EmailSummary/EmailSummaryPlugin.php
index 58c40e43c5..c37e4864d1 100644
--- a/plugins/EmailSummary/EmailSummaryPlugin.php
+++ b/plugins/EmailSummary/EmailSummaryPlugin.php
@@ -62,15 +62,15 @@ class EmailSummaryPlugin extends Plugin
                              array(new ColumnDef('user_id', 'integer', null,
                                                  false, 'PRI'),
                                    new ColumnDef('send_summary', 'tinyint', null,
-						 false, null, 1),
+                                                 false, null, 1),
                                    new ColumnDef('last_summary_id', 'integer', null,
-						 true),
+                                                 true),
                                    new ColumnDef('created', 'datetime', null,
-						 false),
+                                                 false),
                                    new ColumnDef('modified', 'datetime', null,
-						 false),
-				   )
-			     );
+                                                 false),
+                             )
+        );
         return true;
     }
 
@@ -88,17 +88,17 @@ class EmailSummaryPlugin extends Plugin
         $dir = dirname(__FILE__);
 
         switch ($cls)
-        {
-	 case 'SiteEmailSummaryHandler':
-	 case 'UserEmailSummaryHandler':
-            include_once $dir . '/'.strtolower($cls).'.php';
-	    return false;
-	 case 'Email_summary_status':
-            include_once $dir . '/'.$cls.'.php';
+            {
+            case 'SiteEmailSummaryHandler':
+            case 'UserEmailSummaryHandler':
+                include_once $dir . '/'.strtolower($cls).'.php';
             return false;
-	 default:
-            return true;
-        }
+            case 'Email_summary_status':
+                include_once $dir . '/'.$cls.'.php';
+                return false;
+            default:
+                return true;
+            }
     }
 
     /**
@@ -131,9 +131,9 @@ class EmailSummaryPlugin extends Plugin
     
     function onEndInitializeQueueManager($qm)
     {
-	$qm->connect('sitesum', 'SiteEmailSummaryHandler');
-	$qm->connect('usersum', 'UserEmailSummaryHandler');
-	return true;
+        $qm->connect('sitesum', 'SiteEmailSummaryHandler');
+        $qm->connect('usersum', 'UserEmailSummaryHandler');
+        return true;
     }
     
     /**
@@ -146,15 +146,15 @@ class EmailSummaryPlugin extends Plugin
     
     function onEndEmailFormData($action)
     {
-	$user = common_current_user();
+        $user = common_current_user();
 	
-	$action->elementStart('li');
-	$action->checkbox('emailsummary',
-			  // TRANS: Checkbox label in e-mail preferences form.
-			  _('Send me a periodic summary of updates from my network.'),
-			  Email_summary_status::getSendSummary($user->id));
-	$action->elementEnd('li');
-	return true;
+        $action->elementStart('li');
+        $action->checkbox('emailsummary',
+                          // TRANS: Checkbox label in e-mail preferences form.
+                          _('Send me a periodic summary of updates from my network.'),
+                          Email_summary_status::getSendSummary($user->id));
+        $action->elementEnd('li');
+        return true;
     }
     
     /**
@@ -167,36 +167,36 @@ class EmailSummaryPlugin extends Plugin
     
     function onEndEmailSaveForm($action)
     {
-	$sendSummary = $action->boolean('emailsummary');
+        $sendSummary = $action->boolean('emailsummary');
 	
-	$user = common_current_user();
+        $user = common_current_user();
 	
-	if (!empty($user)) {
+        if (!empty($user)) {
 	    
-	    $ess = Email_summary_status::staticGet('user_id', $user->id);
+            $ess = Email_summary_status::staticGet('user_id', $user->id);
 	    
-	    if (empty($ess)) {
+            if (empty($ess)) {
 		
-		$ess = new Email_summary_status();
+                $ess = new Email_summary_status();
 
-		$ess->user_id      = $user->id;
-		$ess->send_summary = $sendSummary;
-		$ess->created      = common_sql_now();
-		$ess->modified     = common_sql_now();
+                $ess->user_id      = $user->id;
+                $ess->send_summary = $sendSummary;
+                $ess->created      = common_sql_now();
+                $ess->modified     = common_sql_now();
 		
-		$ess->insert();
+                $ess->insert();
 		
-	    } else {
+            } else {
 		
-		$orig = clone($ess);
+                $orig = clone($ess);
 		
-		$ess->send_summary = $sendSummary;
-		$ess->modified     = common_sql_now();
+                $ess->send_summary = $sendSummary;
+                $ess->modified     = common_sql_now();
 		
-		$ess->update($orig);
-	    }
-	}
+                $ess->update($orig);
+            }
+        }
 	
-	return true;
+        return true;
     }
 }

From 845b1cff72e6022b95db6f4792bb0287879e38e6 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 15 Feb 2011 16:26:44 -0500
Subject: [PATCH 256/314] fix indentation in Email_summary_status.php

---
 plugins/EmailSummary/Email_summary_status.php | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/plugins/EmailSummary/Email_summary_status.php b/plugins/EmailSummary/Email_summary_status.php
index 5b5b231e34..7072370faf 100644
--- a/plugins/EmailSummary/Email_summary_status.php
+++ b/plugins/EmailSummary/Email_summary_status.php
@@ -82,10 +82,10 @@ class Email_summary_status extends Memcached_DataObject
     function table()
     {
         return array('user_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
-		     'send_summary' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
-		     'last_summary_id' => DB_DATAOBJECT_INT,
-		     'created' => DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
-		     'modified' => DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL);
+                     'send_summary' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+                     'last_summary_id' => DB_DATAOBJECT_INT,
+                     'created' => DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
+                     'modified' => DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL);
     }
 
     /**
@@ -139,11 +139,11 @@ class Email_summary_status extends Memcached_DataObject
     {
         $ess = Email_summary_status::staticGet('user_id', $user_id);
 
-	if (!empty($ess)) {
-	    return $ess->send_summary;
-	} else {
-	    return 1;
-	}
+        if (!empty($ess)) {
+            return $ess->send_summary;
+        } else {
+            return 1;
+        }
     }
 
     /**
@@ -158,10 +158,10 @@ class Email_summary_status extends Memcached_DataObject
     {
         $ess = Email_summary_status::staticGet('user_id', $user_id);
 	
-	if (!empty($ess)) {
-	    return $ess->last_summary_id;
-	} else {
-	    return null;
-	}
+        if (!empty($ess)) {
+            return $ess->last_summary_id;
+        } else {
+            return null;
+        }
     }
 }

From f31db669b0fed67a5a49415dcbbcbd5d9766a70b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 15 Feb 2011 16:27:51 -0500
Subject: [PATCH 257/314] fix indentation in sendemailsummary.php

---
 plugins/EmailSummary/sendemailsummary.php | 43 ++++++++++++-----------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/plugins/EmailSummary/sendemailsummary.php b/plugins/EmailSummary/sendemailsummary.php
index 37bfdcfbd1..d3773b74c0 100644
--- a/plugins/EmailSummary/sendemailsummary.php
+++ b/plugins/EmailSummary/sendemailsummary.php
@@ -1,22 +1,22 @@
 #!/usr/bin/env php
-<?php
-/*
- * StatusNet - a 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/>.
- */
+   <?php
+   /*
+    * StatusNet - a 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/>.
+    */
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/../..'));
 
@@ -27,9 +27,9 @@ $helptext = <<<END_OF_SENDEMAILSUMMARY_HELP
 sendemailsummary.php [options]
 Send an email summary of the inbox to users
 
-  -i --id       ID of user to send summary to
-  -n --nickname nickname of the user to send summary to
-  -a --all      send summary to all users
+ -i --id       ID of user to send summary to
+ -n --nickname nickname of the user to send summary to
+ -a --all      send summary to all users
 
 END_OF_SENDEMAILSUMMARY_HELP;
 
@@ -45,3 +45,4 @@ try {
 } catch (NoUserArgumentException $nuae) {
     $qm->enqueue(null, 'sitesum');
 }
+

From 10bb94807b5e56fe77fb95492e3c40637e084530 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 15 Feb 2011 16:28:20 -0500
Subject: [PATCH 258/314] fix indentation in siteemailsummaryhandler

---
 .../EmailSummary/siteemailsummaryhandler.php  | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/plugins/EmailSummary/siteemailsummaryhandler.php b/plugins/EmailSummary/siteemailsummaryhandler.php
index 595c3267a1..1c0d4997de 100644
--- a/plugins/EmailSummary/siteemailsummaryhandler.php
+++ b/plugins/EmailSummary/siteemailsummaryhandler.php
@@ -70,27 +70,27 @@ class SiteEmailSummaryHandler extends QueueHandler
     
     function handle($object)
     {
-	$qm = QueueManager::get();
+        $qm = QueueManager::get();
 
-	try {
-	    // Enqueue a summary for all users
+        try {
+            // Enqueue a summary for all users
 	    
-	    $user = new User();
-	    $user->find();
+            $user = new User();
+            $user->find();
 	    
-	    while ($user->fetch()) {
-		try {
-		    $qm->enqueue($user->id, 'usersum');
-		} catch (Exception $e) {
-		    common_log(LOG_WARNING, $e->getMessage());
-		    continue;
-		}
-	    }
-	} catch (Exception $e) {
-	    common_log(LOG_WARNING, $e->getMessage());
-	}
+            while ($user->fetch()) {
+                try {
+                    $qm->enqueue($user->id, 'usersum');
+                } catch (Exception $e) {
+                    common_log(LOG_WARNING, $e->getMessage());
+                    continue;
+                }
+            }
+        } catch (Exception $e) {
+            common_log(LOG_WARNING, $e->getMessage());
+        }
 	
-	return true;
+        return true;
     }
 }
 

From a1b436a8c6a733dc0c11b3b9421b4db613a62fd1 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Tue, 15 Feb 2011 20:25:39 -0800
Subject: [PATCH 259/314] First cut at some JSON Activity Streams output

---
 actions/apitimelinefriends.php     |   6 ++
 classes/Notice.php                 |   5 +-
 lib/activity.php                   |  53 ++++++++++++++
 lib/activityobject.php             |  48 ++++++++++++-
 lib/activitystreamjsondocument.php | 112 +++++++++++++++++++++++++++++
 lib/router.php                     |   2 +-
 6 files changed, 220 insertions(+), 6 deletions(-)
 create mode 100644 lib/activitystreamjsondocument.php

diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index 71049f6eb1..3833418baa 100644
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -263,6 +263,12 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
         case 'json':
             $this->showJsonTimeline($this->notices);
             break;
+        case 'as':
+            header('Content-Type: application/json; charset=utf-8');
+            $doc = new ActivityStreamJSONDocument($this->auth_user);
+            $doc->addItemsFromNotices($this->notices);
+            $this->raw($doc->asString());
+            break;
         default:
             // TRANS: Client error displayed when trying to handle an unknown API method.
             $this->clientError(_('API method not found.'), $code = 404);
diff --git a/classes/Notice.php b/classes/Notice.php
index 4522d1fc38..ed1aab0014 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1252,18 +1252,19 @@ class Notice extends Memcached_DataObject
 
     function asActivity()
     {
+                common_debug("a");
+
         $act = self::cacheGet(Cache::codeKey('notice:as-activity:'.$this->id));
 
         if (!empty($act)) {
             return $act;
         }
-
         $act = new Activity();
 
         if (Event::handle('StartNoticeAsActivity', array($this, &$act))) {
 
             $profile = $this->getProfile();
-
+            common_debug('b');
             $act->actor     = ActivityObject::fromProfile($profile);
             $act->verb      = ActivityVerb::POST;
             $act->objects[] = ActivityObject::fromNotice($this);
diff --git a/lib/activity.php b/lib/activity.php
index 17684d897b..0046469899 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -337,6 +337,59 @@ class Activity
         return null;
     }
 
+    /**
+     * Returns an array based on this activity suitable
+     * for encoding as a JSON object
+     *
+     * @return array $activity
+     */
+
+    function asArray()
+    {
+        $activity = array();
+
+        // actor
+        $activity['actor'] = $this->actor->asArray();
+
+        // body
+        $activity['body'] = $this->content;
+
+        // generator <--- might be useful; might be too much junk
+
+        // icon <-- should we use this?
+
+        // object
+        if ($this->verb == ActivityVerb::POST && count($this->objects) == 1) {
+            $activity['object'] = $this->objects[0]->asArray();
+        } else {
+            $activity['object'] = array();
+            foreach($this->objects as $object) {
+                $activity['object'][] = $object->asArray();
+            }
+        }
+
+        $activity['postedTime'] = self::iso8601Date($this->time); // Change to exactly be RFC3339?
+
+        // provider <--- again not sure we should use this
+
+        // target
+        if (!empty($this->target)) {
+            $activity['target'] = $this->target->asArray();
+        }
+
+        // title
+        $activity['title'] = $this->title;
+
+        // updatedTime <-- should we use? spec says activity MAY have this
+
+        // verb
+        $activity['verb'] = $this->verb;
+
+        // TODO: extensions (ActivityContext, OStatus stuff, etc.)
+
+        return $activity;
+    }
+
     function asString($namespace=false, $author=true, $source=false)
     {
         $xs = new XMLStringer(true);
diff --git a/lib/activityobject.php b/lib/activityobject.php
index 5898c6d050..53ffe1a172 100644
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -179,7 +179,7 @@ class ActivityObject
         if (empty($this->type)) {
             $this->type = self::PERSON; // XXX: is this fair?
         }
-        
+
         // start with <atom:title>
 
         $title = ActivityUtils::childHtmlContent($element, self::TITLE);
@@ -419,7 +419,7 @@ class ActivityObject
     static function fromNotice(Notice $notice)
     {
         $object = new ActivityObject();
-		
+
 		if (Event::handle('StartActivityObjectFromNotice', array($notice, &$object))) {
 
 			$object->type    = ActivityObject::NOTE;
@@ -526,7 +526,7 @@ class ActivityObject
 
         return $object;
     }
-	
+
 	function outputTo($xo, $tag='activity:object')
 	{
 		if (!empty($tag)) {
@@ -633,4 +633,46 @@ class ActivityObject
 
         return $xs->getString();
     }
+
+    /*
+     * Returns an array based on this Activity Object suitable for
+     * encoding as JSON.
+     *
+     * @return array $object the activity object array
+     */
+
+    function asArray()
+    {
+        $object = array();
+
+        // TODO: attachedObjects
+
+        // displayName
+        $object['displayName'] = $this->title;
+
+
+        // TODO: downstreamDuplicates
+        // TODO: embedCode
+
+        // id
+        $object['id'] = $this->id;
+
+        // TODO: image
+        // Need to make MediaLink serialization
+
+        // objectType
+        $object['type'] = $this->type;
+
+        // summary
+        $object['summary'] = $this->summary;
+
+        // TODO: upstreamDuplicates
+
+        // url (XXX: need to put the right thing here...)
+        $object['url'] = $this->id;
+
+        // TODO: extensions (OStatus stuff, etc.)
+
+        return $object;
+    }
 }
diff --git a/lib/activitystreamjsondocument.php b/lib/activitystreamjsondocument.php
new file mode 100644
index 0000000000..57ece9f6bf
--- /dev/null
+++ b/lib/activitystreamjsondocument.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Class for serializing Activity Streams in JSON
+ *
+ * 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  Feed
+ * @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);
+}
+
+/**
+ * A class for generating JSON documents that represent an Activity Streams
+ *
+ * @category Feed
+ * @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 ActivityStreamJSONDocument
+{
+    /* Top level array representing the document */
+    protected $doc = array();
+
+    /* The current authenticated user */
+    protected $cur = null;
+
+    /**
+     * Constructor
+     *
+     * @param User $cur the current authenticated user
+     */
+
+    function __construct($cur = null)
+    {
+        $this->cur = $cur;
+
+        $this->doc['items'] = array();
+    }
+
+    /**
+     * Add more than one Item to the document
+     *
+     * @param mixed $notices an array of Notice objects or handle
+     *
+     */
+
+    function addItemsFromNotices($notices)
+    {
+        common_debug("addItemsFromNotices");
+        if (is_array($notices)) {
+            foreach ($notices as $notice) {
+                $this->addItemFromNotice($notice);
+            }
+        } else {
+            while ($notices->fetch()) {
+                $this->addItemFromNotice($notices);
+            }
+        }
+    }
+
+    /**
+     * Add a single Notice to the document
+     *
+     * @param Notice $notice a Notice to add
+     */
+
+    function addItemFromNotice($notice)
+    {
+        $cur = empty($this->cur) ? common_current_user() : $this->cur;
+
+        $act          = $notice->asActivity();
+        $act->extra[] = $notice->noticeInfo($cur);
+
+        array_push($this->doc['items'], $act->asArray());
+    }
+
+    /*
+     * Return the entire document as a big string of JSON
+     *
+     * @return string encoded JSON output
+     */
+    function asString()
+    {
+        return json_encode($this->doc);
+    }
+
+}
diff --git a/lib/router.php b/lib/router.php
index c8e1c365a5..9f2b1df868 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -411,7 +411,7 @@ class Router
 
             $m->connect('api/statuses/friends_timeline.:format',
                         array('action' => 'ApiTimelineFriends',
-                              'format' => '(xml|json|rss|atom)'));
+                              'format' => '(xml|json|rss|atom|as)'));
 
             $m->connect('api/statuses/friends_timeline/:id.:format',
                         array('action' => 'ApiTimelineFriends',

From 07bc80286767b322fab247b5b4e9f77f67a770fb Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 16 Feb 2011 11:58:35 -0500
Subject: [PATCH 260/314] argument to send email summary to all users on all
 sites

---
 plugins/EmailSummary/sendemailsummary.php | 35 +++++++++++++++--------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/plugins/EmailSummary/sendemailsummary.php b/plugins/EmailSummary/sendemailsummary.php
index d3773b74c0..aad79c7360 100644
--- a/plugins/EmailSummary/sendemailsummary.php
+++ b/plugins/EmailSummary/sendemailsummary.php
@@ -20,8 +20,8 @@
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/../..'));
 
-$shortoptions = 'i:n:a';
-$longoptions = array('id=', 'nickname=', 'all');
+$shortoptions = 'i:n:au';
+$longoptions = array('id=', 'nickname=', 'all', 'universe');
 
 $helptext = <<<END_OF_SENDEMAILSUMMARY_HELP
 sendemailsummary.php [options]
@@ -30,19 +30,30 @@ Send an email summary of the inbox to users
  -i --id       ID of user to send summary to
  -n --nickname nickname of the user to send summary to
  -a --all      send summary to all users
+ -u --universe send summary to all users on all sites
 
 END_OF_SENDEMAILSUMMARY_HELP;
 
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
-$qm = QueueManager::get();
-
-// enqueue summary for user or all users
-
-try {
-    $user = getUser();
-    $qm->enqueue($user->id, 'usersum');
-} catch (NoUserArgumentException $nuae) {
-    $qm->enqueue(null, 'sitesum');
+if (have_option('u', 'universe')) {
+    $sn = new Status_network();
+    if ($sn->find()) {
+        while ($sn->fetch()) {
+            $server = $sn->getServerName();
+            StatusNet::init($server);
+            // Different queue manager, maybe!
+            $qm = QueueManager::get();
+            $qm->enqueue(null, 'sitesum');
+        }
+    }
+} else {
+    $qm = QueueManager::get();
+    // enqueue summary for user or all users
+    try {
+        $user = getUser();
+        $qm->enqueue($user->id, 'usersum');
+    } catch (NoUserArgumentException $nuae) {
+        $qm->enqueue(null, 'sitesum');
+    }
 }
-

From 39c6e34098e5adc950484633aee0b9bb7afb1d63 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 16 Feb 2011 13:56:30 -0500
Subject: [PATCH 261/314] add path separators for Plugin::path()

---
 lib/plugin.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/plugin.php b/lib/plugin.php
index 1ccf23a095..0e8c0a742d 100644
--- a/lib/plugin.php
+++ b/lib/plugin.php
@@ -162,6 +162,14 @@ class Plugin
             $path = common_config('site', 'path') . '/plugins/';
         }
 
+        if ($path[strlen($path)-1] != '/') {
+            $path .= '/';
+        }
+
+        if ($path[0] != '/') {
+            $path = '/'.$path;
+        }
+
         $protocol = ($isHTTPS) ? 'https' : 'http';
 
         return $protocol.'://'.$server.$path.$plugin.'/'.$relative;

From a159352b6553cf69420739f237a7dbfaf4bc865a Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Thu, 17 Feb 2011 00:39:53 +0100
Subject: [PATCH 262/314] * improve L10n consistency for English. For example
 proper punctuation for all button and label titles. * fix some i18n bugs
 (in-message variables). * update/add translator documentation. * remove
 superfluous whitespace.

---
 actions/apidirectmessagenew.php      |  2 +-
 actions/apioauthaccesstoken.php      |  2 +-
 actions/apistatusesshow.php          |  4 +-
 actions/apitimelineuser.php          |  2 +-
 actions/atompubshowmembership.php    |  1 -
 actions/avatarsettings.php           |  8 ++--
 actions/backupaccount.php            |  4 +-
 actions/block.php                    |  4 +-
 actions/deleteapplication.php        |  4 +-
 actions/deletegroup.php              |  4 +-
 actions/deletenotice.php             |  4 +-
 actions/deleteuser.php               |  4 +-
 actions/designadminpanel.php         | 12 ++---
 actions/emailsettings.php            |  4 +-
 actions/favor.php                    |  2 +-
 actions/groupblock.php               |  4 +-
 actions/grouplogo.php                |  8 ++--
 actions/inbox.php                    |  2 +-
 actions/login.php                    | 12 -----
 actions/oauthappssettings.php        |  1 -
 actions/oauthconnectionssettings.php |  2 -
 actions/oembed.php                   |  8 ++--
 actions/othersettings.php            |  1 +
 actions/outbox.php                   | 11 +++--
 actions/passwordsettings.php         |  7 ++-
 actions/profilesettings.php          |  8 ++--
 actions/recoverpassword.php          |  2 +-
 actions/register.php                 | 33 ++++----------
 actions/remotesubscribe.php          |  6 +--
 actions/restoreaccount.php           |  2 +-
 actions/rsd.php                      |  7 ---
 actions/showapplication.php          |  9 ----
 actions/shownotice.php               |  2 +-
 actions/showstream.php               |  2 +-
 actions/sitenoticeadminpanel.php     |  4 +-
 actions/smssettings.php              | 10 +++--
 actions/useradminpanel.php           |  4 +-
 actions/userauthorization.php        | 65 ++++++++++++++++++++++------
 actions/userxrd.php                  |  2 +-
 39 files changed, 132 insertions(+), 141 deletions(-)

diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php
index 978c753532..e33077cdac 100644
--- a/actions/apidirectmessagenew.php
+++ b/actions/apidirectmessagenew.php
@@ -141,7 +141,7 @@ class ApiDirectMessageNewAction extends ApiAuthAction
         } else if (!$this->user->mutuallySubscribed($this->other)) {
             $this->clientError(
                 // TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-                _('Can\'t send direct messages to users who aren\'t your friend.'),
+                _('Cannot send direct messages to users who aren\'t your friend.'),
                 403,
                 $this->format
             );
diff --git a/actions/apioauthaccesstoken.php b/actions/apioauthaccesstoken.php
index 6c3819c3bd..76b06c28a2 100644
--- a/actions/apioauthaccesstoken.php
+++ b/actions/apioauthaccesstoken.php
@@ -99,7 +99,7 @@ class ApiOauthAccessTokenAction extends ApiOauthAction
 
             common_log(LOG_WARNING, $msg);
             // TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-            $this->clientError(_("Invalid request token or verifier."), 400, 'text');
+            $this->clientError(_('Invalid request token or verifier.'), 400, 'text');
         } else {
             common_log(
                 LOG_INFO,
diff --git a/actions/apistatusesshow.php b/actions/apistatusesshow.php
index 9a7f36bb3a..de4c4065c1 100644
--- a/actions/apistatusesshow.php
+++ b/actions/apistatusesshow.php
@@ -141,7 +141,7 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
             default:
                 // TRANS: Exception thrown requesting an unsupported notice output format.
                 // TRANS: %s is the requested output format.
-                throw new Exception(sprintf(_("Unsupported format: %s"), $this->format));
+                throw new Exception(sprintf(_("Unsupported format: %s."), $this->format));
             }
         } else {
             // XXX: Twitter just sets a 404 header and doens't bother
@@ -224,7 +224,7 @@ class ApiStatusesShowAction extends ApiPrivateAuthAction
     {
         if ($this->format != 'atom') {
             // TRANS: Client error displayed when trying to delete a notice not using the Atom format.
-            $this->clientError(_("Can only delete using the Atom format."));
+            $this->clientError(_('Can only delete using the Atom format.'));
             return;
         }
 
diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index b3b908accc..b0ca7e923f 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -329,7 +329,6 @@ class ApiTimelineUserAction extends ApiBareAuthAction
         $saved = null;
 
         if (Event::handle('StartAtomPubNewActivity', array(&$activity, $this->user, &$saved))) {
-
             if ($activity->verb != ActivityVerb::POST) {
                 // TRANS: Client error displayed when not using the POST verb. Do not translate POST.
                 $this->clientError(_('Can only handle POST activities.'));
@@ -405,6 +404,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
 
             if (!empty($notice)) {
                 // TRANS: Client error displayed when using another format than AtomPub.
+                // TRANS: %s is the notice URI.
                 $this->clientError(sprintf(_('Notice with URI "%s" already exists.'),
                                            $note->id));
                 return;
diff --git a/actions/atompubshowmembership.php b/actions/atompubshowmembership.php
index a845ea23df..098cca8b3e 100644
--- a/actions/atompubshowmembership.php
+++ b/actions/atompubshowmembership.php
@@ -142,7 +142,6 @@ class AtompubshowmembershipAction extends ApiAuthAction
      *
      * @return void
      */
-
     function deleteMembership()
     {
         if (empty($this->auth_user) ||
diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index c81c024081..234986e5f7 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -211,7 +211,7 @@ class AvatarsettingsAction extends AccountSettingsAction
                             array('id' => 'avatar_original',
                                   'class' => 'avatar_view'));
         // TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
-        $this->element('h2', null, _("Original"));
+        $this->element('h2', null, _('Original'));
         $this->elementStart('div', array('id'=>'avatar_original_view'));
         $this->element('img', array('src' => Avatar::url($this->filedata['filename']),
                                     'width' => $this->filedata['width'],
@@ -224,7 +224,7 @@ class AvatarsettingsAction extends AccountSettingsAction
                             array('id' => 'avatar_preview',
                                   'class' => 'avatar_view'));
         // TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
-        $this->element('h2', null, _("Preview"));
+        $this->element('h2', null, _('Preview'));
         $this->elementStart('div', array('id'=>'avatar_preview_view'));
         $this->element('img', array('src' => Avatar::url($this->filedata['filename']),
                                     'width' => AVATAR_PROFILE_SIZE,
@@ -341,8 +341,8 @@ class AvatarsettingsAction extends AccountSettingsAction
 
         $this->mode = 'crop';
 
-        // TRANS: Avatar upload form unstruction after uploading a file.
-        $this->showForm(_('Pick a square area of the image to be your avatar'),
+        // TRANS: Avatar upload form instruction after uploading a file.
+        $this->showForm(_('Pick a square area of the image to be your avatar.'),
                         true);
     }
 
diff --git a/actions/backupaccount.php b/actions/backupaccount.php
index 928aba69ce..e32b8d03de 100644
--- a/actions/backupaccount.php
+++ b/actions/backupaccount.php
@@ -58,7 +58,7 @@ class BackupaccountAction extends Action
     function title()
     {
         // TRANS: Title for backup account page.
-        return _("Backup account");
+        return _('Backup account');
     }
 
     /**
@@ -249,6 +249,6 @@ class BackupAccountForm extends Form
                            'submit',
                            null,
                            // TRANS: Title for submit button to backup an account on the backup account page.
-                           _('Backup your account'));
+                           _('Backup your account.'));
     }
 }
diff --git a/actions/block.php b/actions/block.php
index e87353b4e1..f195fb5a88 100644
--- a/actions/block.php
+++ b/actions/block.php
@@ -155,14 +155,14 @@ class BlockAction extends ProfileFormAction
                       'submit form_action-primary',
                       'no',
                       // TRANS: Submit button title for 'No' when blocking a user.
-                      _('Do not block this user'));
+                      _('Do not block this user.'));
         $this->submit('form_action-yes',
                       // TRANS: Button label on the user block form.
                       _m('BUTTON','Yes'),
                       'submit form_action-secondary',
                       'yes',
                       // TRANS: Submit button title for 'Yes' when blocking a user.
-                      _('Block this user'));
+                      _('Block this user.'));
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
diff --git a/actions/deleteapplication.php b/actions/deleteapplication.php
index 272a91762c..9f9ac18971 100644
--- a/actions/deleteapplication.php
+++ b/actions/deleteapplication.php
@@ -158,13 +158,13 @@ class DeleteapplicationAction extends Action
                       'submit form_action-primary',
                       'no',
                       // TRANS: Submit button title for 'No' when deleting an application.
-                      _('Do not delete this application'));
+                      _('Do not delete this application.'));
         $this->submit('form_action-yes',
                       // TRANS: Button label on the delete application form.
                       _m('BUTTON','Yes'),
                       'submit form_action-secondary',
                       // TRANS: Submit button title for 'Yes' when deleting an application.
-                      'yes', _('Delete this application'));
+                      'yes', _('Delete this application.'));
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
diff --git a/actions/deletegroup.php b/actions/deletegroup.php
index 4e9b9851f1..637a7cba73 100644
--- a/actions/deletegroup.php
+++ b/actions/deletegroup.php
@@ -221,14 +221,14 @@ class DeletegroupAction extends RedirectingAction
                       'submit form_action-primary',
                       'no',
                       // TRANS: Submit button title for 'No' when deleting a group.
-                      _('Do not delete this group'));
+                      _('Do not delete this group.'));
         $this->submit('form_action-yes',
                       // TRANS: Button label on the delete group form.
                       _m('BUTTON','Yes'),
                       'submit form_action-secondary',
                       'yes',
                       // TRANS: Submit button title for 'Yes' when deleting a group.
-                      _('Delete this group'));
+                      _('Delete this group.'));
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
diff --git a/actions/deletenotice.php b/actions/deletenotice.php
index ff57bbd61e..c997bb756a 100644
--- a/actions/deletenotice.php
+++ b/actions/deletenotice.php
@@ -156,14 +156,14 @@ class DeletenoticeAction extends Action
                       'submit form_action-primary',
                       'no',
                       // TRANS: Submit button title for 'No' when deleting a notice.
-                      _("Do not delete this notice"));
+                      _('Do not delete this notice.'));
         $this->submit('form_action-yes',
                       // TRANS: Button label on the delete notice form.
                       _m('BUTTON','Yes'),
                       'submit form_action-secondary',
                       'yes',
                       // TRANS: Submit button title for 'Yes' when deleting a notice.
-                      _('Delete this notice'));
+                      _('Delete this notice.'));
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
diff --git a/actions/deleteuser.php b/actions/deleteuser.php
index ac96b7b5d5..19b1e20e83 100644
--- a/actions/deleteuser.php
+++ b/actions/deleteuser.php
@@ -155,14 +155,14 @@ class DeleteuserAction extends ProfileFormAction
                       'submit form_action-primary',
                       'no',
                       // TRANS: Submit button title for 'No' when deleting a user.
-                      _('Do not delete this user'));
+                      _('Do not delete this user.'));
         $this->submit('form_action-yes',
                       // TRANS: Button label on the delete user form.
                       _m('BUTTON','Yes'),
                       'submit form_action-secondary',
                       'yes',
                       // TRANS: Submit button title for 'Yes' when deleting a user.
-                      _('Delete this user'));
+                      _('Delete this user.'));
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php
index 34e6de851a..a77b842fe3 100644
--- a/actions/designadminpanel.php
+++ b/actions/designadminpanel.php
@@ -336,7 +336,7 @@ class DesignadminpanelAction extends AdminPanelAction
         if (!in_array($values['theme'], Theme::listAvailable())) {
             // 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.
-            $this->clientError(sprintf(_("Theme not available: %s."), $values['theme']));
+            $this->clientError(sprintf(_('Theme not available: %s.'), $values['theme']));
         }
     }
 
@@ -443,7 +443,7 @@ class DesignAdminPanelForm extends AdminForm
                      // TRANS: Field label for StatusNet site logo.
                      _('Site logo'),
                      // TRANS: Title for field label for StatusNet site logo.
-                     'Logo for the site (full URL)');
+                     'Logo for the site (full URL).');
         $this->unli();
 
         $this->li();
@@ -451,7 +451,7 @@ class DesignAdminPanelForm extends AdminForm
                      // TRANS: Field label for SSL StatusNet site logo.
                      _('SSL logo'),
                      // TRANS: Title for field label for SSL StatusNet site logo.
-                     'Logo to show on SSL pages');
+                     'Logo to show on SSL pages.');
         $this->unli();
 
         $this->out->elementEnd('ul');
@@ -717,7 +717,7 @@ class DesignAdminPanelForm extends AdminForm
         // TRANS: Button text for resetting theme settings.
         $this->out->submit('defaults', _m('BUTTON','Use defaults'), 'submit form_action-default',
                 // TRANS: Title for button for resetting theme settings.
-                'defaults', _('Restore default designs'));
+                'defaults', _('Restore default designs.'));
 
         $this->out->element('input', array('id' => 'settings_design_reset',
                                          'type' => 'reset',
@@ -725,7 +725,7 @@ class DesignAdminPanelForm extends AdminForm
                                          'value' => 'Reset',
                                          'class' => 'submit form_action-primary',
                                          // TRANS: Title for button for resetting theme settings.
-                                         'title' => _('Reset back to default')));
+                                         'title' => _('Reset back to default.')));
 
         $this->out->submit('save',
                            // TRANS: Button text for saving theme settings.
@@ -733,6 +733,6 @@ class DesignAdminPanelForm extends AdminForm
                            'submit form_action-secondary',
                            'save',
                            // TRANS: Title for button for saving theme settings.
-                           _('Save design'));
+                           _('Save design.'));
     }
 }
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 3e977074fc..ea35673100 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -527,7 +527,7 @@ class EmailsettingsAction extends AccountSettingsAction
         if (!$user->updateKeys($orig)) {
             common_log_db_error($user, 'UPDATE', __FILE__);
             // TRANS: Server error thrown on database error removing incoming e-mail address.
-            $this->serverError(_("Could not update user record."));
+            $this->serverError(_('Could not update user record.'));
         }
 
         // TRANS: Message given after successfully removing an incoming e-mail address.
@@ -551,7 +551,7 @@ class EmailsettingsAction extends AccountSettingsAction
         if (!$user->updateKeys($orig)) {
             common_log_db_error($user, 'UPDATE', __FILE__);
             // TRANS: Server error thrown on database error adding incoming e-mail address.
-            $this->serverError(_("Could not update user record."));
+            $this->serverError(_('Could not update user record.'));
         }
 
         // TRANS: Message given after successfully adding an incoming e-mail address.
diff --git a/actions/favor.php b/actions/favor.php
index bcefcd26e7..61db235738 100644
--- a/actions/favor.php
+++ b/actions/favor.php
@@ -92,7 +92,7 @@ class FavorAction extends Action
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
             // TRANS: Page title for page on which favorite notices can be unfavourited.
-            $this->element('title', null, _('Disfavor favorite'));
+            $this->element('title', null, _('Disfavor favorite.'));
             $this->elementEnd('head');
             $this->elementStart('body');
             $disfavor = new DisFavorForm($this, $notice);
diff --git a/actions/groupblock.php b/actions/groupblock.php
index 2ac0f633bb..d426563d8c 100644
--- a/actions/groupblock.php
+++ b/actions/groupblock.php
@@ -188,14 +188,14 @@ class GroupblockAction extends RedirectingAction
                       'submit form_action-primary',
                       'no',
                       // TRANS: Submit button title for 'No' when blocking a user from a group.
-                      _('Do not block this user from this group'));
+                      _('Do not block this user from this group.'));
         $this->submit('form_action-yes',
                       // TRANS: Button label on the form to block a user from a group.
                       _m('BUTTON','Yes'),
                       'submit form_action-secondary',
                       'yes',
                       // TRANS: Submit button title for 'Yes' when blocking a user from a group.
-                      _('Block this user from this group'));
+                      _('Block this user from this group.'));
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index 856c860a02..7cfd92130b 100644
--- a/actions/grouplogo.php
+++ b/actions/grouplogo.php
@@ -204,7 +204,7 @@ class GrouplogoAction extends GroupDesignAction
             $this->elementStart('li', array('id' => 'avatar_original',
                                             'class' => 'avatar_view'));
             // TRANS: Uploaded original file in group logo form.
-            $this->element('h2', null, _("Original"));
+            $this->element('h2', null, _('Original'));
             $this->elementStart('div', array('id'=>'avatar_original_view'));
             $this->element('img', array('src' => $this->group->original_logo,
                                         'alt' => $this->group->nickname));
@@ -216,7 +216,7 @@ class GrouplogoAction extends GroupDesignAction
             $this->elementStart('li', array('id' => 'avatar_preview',
                                             'class' => 'avatar_view'));
             // TRANS: Header for preview of to be displayed group logo.
-            $this->element('h2', null, _("Preview"));
+            $this->element('h2', null, _('Preview'));
             $this->elementStart('div', array('id'=>'avatar_preview_view'));
             $this->element('img', array('src' => $this->group->homepage_logo,
                                         'width' => AVATAR_PROFILE_SIZE,
@@ -267,7 +267,7 @@ class GrouplogoAction extends GroupDesignAction
                             array('id' => 'avatar_original',
                                   'class' => 'avatar_view'));
         // TRANS: Header for originally uploaded file before a crop on the group logo page.
-        $this->element('h2', null, _("Original"));
+        $this->element('h2', null, _('Original'));
         $this->elementStart('div', array('id'=>'avatar_original_view'));
         $this->element('img', array('src' => Avatar::url($this->filedata['filename']),
                                     'width' => $this->filedata['width'],
@@ -280,7 +280,7 @@ class GrouplogoAction extends GroupDesignAction
                             array('id' => 'avatar_preview',
                                   'class' => 'avatar_view'));
         // TRANS: Header for the cropped group logo on the group logo page.
-        $this->element('h2', null, _("Preview"));
+        $this->element('h2', null, _('Preview'));
         $this->elementStart('div', array('id'=>'avatar_preview_view'));
         $this->element('img', array('src' => Avatar::url($this->filedata['filename']),
                                     'width' => AVATAR_PROFILE_SIZE,
diff --git a/actions/inbox.php b/actions/inbox.php
index 6ab58f9751..e9aa34317d 100644
--- a/actions/inbox.php
+++ b/actions/inbox.php
@@ -126,4 +126,4 @@ class InboxMessageListItem extends MessageListItem
     {
         return $this->message->getFrom();
     }
-}
\ No newline at end of file
+}
diff --git a/actions/login.php b/actions/login.php
index d3e4312f71..fca5995a9a 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -42,13 +42,11 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class LoginAction extends Action
 {
     /**
      * Has there been an error?
      */
-
     var $error = null;
 
     /**
@@ -56,7 +54,6 @@ class LoginAction extends Action
      *
      * @return boolean false
      */
-
     function isReadOnly($args)
     {
         return false;
@@ -69,7 +66,6 @@ class LoginAction extends Action
      * @param $args
      * @return string title
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -93,7 +89,6 @@ class LoginAction extends Action
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
@@ -117,7 +112,6 @@ class LoginAction extends Action
      *
      * @return void
      */
-
     function checkLogin($user_id=null, $token=null)
     {
         // XXX: login throttle
@@ -186,7 +180,6 @@ class LoginAction extends Action
      *
      * @return void
      */
-
     function showForm($error=null)
     {
         $this->error = $error;
@@ -204,7 +197,6 @@ class LoginAction extends Action
      *
      * @return string title of the page
      */
-
     function title()
     {
         return _('Login');
@@ -218,7 +210,6 @@ class LoginAction extends Action
      *
      * @return void
      */
-
     function showPageNotice()
     {
         if ($this->error) {
@@ -238,7 +229,6 @@ class LoginAction extends Action
      *
      * @return void
      */
-
     function showContent()
     {
         $this->elementStart('form', array('method' => 'post',
@@ -278,7 +268,6 @@ class LoginAction extends Action
      *
      * @return void
      */
-
     function getInstructions()
     {
         if (common_logged_in() && !common_is_real_login() &&
@@ -306,7 +295,6 @@ class LoginAction extends Action
      *
      * @return void
      */
-
     function showLocalNav()
     {
         $nav = new LoginGroupNav($this);
diff --git a/actions/oauthappssettings.php b/actions/oauthappssettings.php
index c98c90dbf8..3c0309a489 100644
--- a/actions/oauthappssettings.php
+++ b/actions/oauthappssettings.php
@@ -166,6 +166,5 @@ class OauthappssettingsAction extends SettingsAction
                               'Try again, please.'));
             return;
         }
-
     }
 }
diff --git a/actions/oauthconnectionssettings.php b/actions/oauthconnectionssettings.php
index cdb73203f0..e95a4a5cf5 100644
--- a/actions/oauthconnectionssettings.php
+++ b/actions/oauthconnectionssettings.php
@@ -64,7 +64,6 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction
      *
      * @return string Title of the page
      */
-
     function title()
     {
         // TRANS: Title for OAuth connection settings.
@@ -76,7 +75,6 @@ class OauthconnectionssettingsAction extends ConnectSettingsAction
      *
      * @return instructions for use
      */
-
     function getInstructions()
     {
         // TRANS: Instructions for OAuth connection settings.
diff --git a/actions/oembed.php b/actions/oembed.php
index bef707f92a..0d8be55656 100644
--- a/actions/oembed.php
+++ b/actions/oembed.php
@@ -61,7 +61,7 @@ class OembedAction extends Action
             $proxy_args = $r->map($path);
 
             if (!$proxy_args) {
-                $this->serverError(_("$path not found."), 404);
+                $this->serverError(sprintf(_('"%s" not found.'),$path), 404);
             }
             $oembed=array();
             $oembed['version']='1.0';
@@ -73,7 +73,7 @@ class OembedAction extends Action
                     $id = $proxy_args['notice'];
                     $notice = Notice::staticGet($id);
                     if(empty($notice)){
-                        $this->serverError(_("Notice $id not found."), 404);
+                        $this->serverError(sprintf(_("Notice %s not found."),$id), 404);
                     }
                     $profile = $notice->getProfile();
                     if (empty($profile)) {
@@ -92,7 +92,7 @@ class OembedAction extends Action
                     $id = $proxy_args['attachment'];
                     $attachment = File::staticGet($id);
                     if(empty($attachment)){
-                        $this->serverError(_("Attachment $id not found."), 404);
+                        $this->serverError(sprintf(_('Attachment %s not found.'),$id), 404);
                     }
                     if(empty($attachment->filename) && $file_oembed = File_oembed::staticGet('file_id', $attachment->id)){
                         // Proxy the existing oembed information
@@ -133,7 +133,7 @@ class OembedAction extends Action
                     if($attachment->title) $oembed['title']=$attachment->title;
                     break;
                 default:
-                    $this->serverError(_("$path not supported for oembed requests."), 501);
+                    $this->serverError(sprintf(_('"%s" not supported for oembed requests.'),$path), 501);
             }
             switch($args['format']){
                 case 'xml':
diff --git a/actions/othersettings.php b/actions/othersettings.php
index 9b12deaae4..d8d56bcfc3 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -189,6 +189,7 @@ class OthersettingsAction extends AccountSettingsAction
 
         $user->query('COMMIT');
 
+        // TRANS: Confirmation message after saving preferences.
         $this->showForm(_('Preferences saved.'), true);
     }
 }
diff --git a/actions/outbox.php b/actions/outbox.php
index cad19bba24..6d10c8119f 100644
--- a/actions/outbox.php
+++ b/actions/outbox.php
@@ -26,7 +26,6 @@
  * @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);
 }
@@ -43,7 +42,6 @@ require_once INSTALLDIR.'/lib/mailbox.php';
  * @link     http://status.net/
  * @see      MailboxAction
  */
-
 class OutboxAction extends MailboxAction
 {
     /**
@@ -51,13 +49,15 @@ class OutboxAction extends MailboxAction
      *
      * @return string page title
      */
-
     function title()
     {
         if ($this->page > 1) {
+            // TRANS: Title for outbox for any but the fist page.
+            // TRANS: %1$s is the user nickname, %2$d is the page number.
             return sprintf(_('Outbox for %1$s - page %2$d'),
                 $this->user->nickname, $page);
         } else {
+            // TRANS: Title for first page of outbox.
             return sprintf(_('Outbox for %s'), $this->user->nickname);
         }
     }
@@ -71,7 +71,6 @@ class OutboxAction extends MailboxAction
      *
      * @see MailboxAction::getMessages()
      */
-
     function getMessages()
     {
         $message = new Message();
@@ -98,9 +97,9 @@ class OutboxAction extends MailboxAction
      *
      * @return string localised instructions for using the page
      */
-
     function getInstructions()
     {
+        // TRANS: Instructions for outbox.
         return _('This is your outbox, which lists private messages you have sent.');
     }
 }
@@ -124,4 +123,4 @@ class OutboxMessageListItem extends MessageListItem
     {
         return $this->message->getTo();
     }
-}
\ No newline at end of file
+}
diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index 3bb8e3bb9f..46d95efcbe 100644
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -106,11 +106,11 @@ class PasswordsettingsAction extends AccountSettingsAction
         }
         $this->elementStart('li');
         $this->password('newpassword', _('New password'),
-                        _('6 or more characters'));
+                        _('6 or more characters.'));
         $this->elementEnd('li');
         $this->elementStart('li');
         $this->password('confirm', _('Confirm'),
-                        _('Same as password above'));
+                        _('Same as password above.'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
 
@@ -128,7 +128,6 @@ class PasswordsettingsAction extends AccountSettingsAction
      *
      * @return void
      */
-
     function handlePost()
     {
         // CSRF protection
@@ -183,7 +182,7 @@ class PasswordsettingsAction extends AccountSettingsAction
             }
 
             if (!$user->update($original)) {
-                $this->serverError(_('Can\'t save new password.'));
+                $this->serverError(_('Cannot save new password.'));
                 return;
             }
             Event::handle('EndChangePassword', array($user));
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index ee50e104d8..259b54bd03 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -161,14 +161,14 @@ class ProfilesettingsAction extends AccountSettingsAction
             $this->input('tags', _('Tags'),
                          ($this->arg('tags')) ? $this->arg('tags') : implode(' ', $user->getSelfTags()),
                          // TRANS: Tooltip for field label in form for profile settings.
-                         _('Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated'));
+                         _('Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated.'));
             $this->elementEnd('li');
             $this->elementStart('li');
             $language = common_language();
             // TRANS: Dropdownlist label in form for profile settings.
             $this->dropdown('language', _('Language'),
                          // TRANS: Tooltip for dropdown list label in form for profile settings.
-                            get_nice_language_list(), _('Preferred language'),
+                            get_nice_language_list(), _('Preferred language.'),
                             false, $language);
             $this->elementEnd('li');
             $timezone = common_timezone();
@@ -187,7 +187,7 @@ class ProfilesettingsAction extends AccountSettingsAction
             $this->checkbox('autosubscribe',
                             // TRANS: Checkbox label in form for profile settings.
                             _('Automatically subscribe to whoever '.
-                              'subscribes to me (best for non-humans)'),
+                              'subscribes to me (best for non-humans).'),
                             ($this->arg('autosubscribe')) ?
                             $this->boolean('autosubscribe') : $user->autosubscribe);
             $this->elementEnd('li');
@@ -288,7 +288,7 @@ class ProfilesettingsAction extends AccountSettingsAction
                 if (!common_valid_profile_tag($tag)) {
                     // TRANS: Validation error in form for profile settings.
                     // TRANS: %s is an invalid tag.
-                    $this->showForm(sprintf(_('Invalid tag: "%s"'), $tag));
+                    $this->showForm(sprintf(_('Invalid tag: "%s".'), $tag));
                     return;
                 }
             }
diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php
index c41edaeea4..9019d6fb22 100644
--- a/actions/recoverpassword.php
+++ b/actions/recoverpassword.php
@@ -226,7 +226,7 @@ class RecoverpasswordAction extends Action
          // TRANS: Title for password recovery page in email sent mode.
          case 'sent': return _('Password recovery requested');
          // TRANS: Title for password recovery page in password saved mode.
-         case 'saved': return _('Password saved.');
+         case 'saved': return _('Password saved');
          default:
             // TRANS: Title for password recovery page when an unknown action has been specified.
             return _('Unknown action');
diff --git a/actions/register.php b/actions/register.php
index 488d8901fc..e386a8fc8a 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -40,25 +40,21 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class RegisterAction extends Action
 {
     /**
      * Has there been an error?
      */
-
     var $error = null;
 
     /**
      * Have we registered?
      */
-
     var $registered = false;
 
     /**
      * Are we processing an invite?
      */
-
     var $invite = null;
 
     /**
@@ -68,7 +64,6 @@ class RegisterAction extends Action
      * @param $args
      * @return string title
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -112,7 +107,6 @@ class RegisterAction extends Action
      *
      * @return string title
      */
-
     function title()
     {
         if ($this->registered) {
@@ -133,7 +127,6 @@ class RegisterAction extends Action
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
@@ -163,7 +156,6 @@ class RegisterAction extends Action
      *
      * @return void
      */
-
     function tryRegister()
     {
         if (Event::handle('StartRegistrationTry', array($this))) {
@@ -206,7 +198,7 @@ class RegisterAction extends Action
             $email    = common_canonical_email($email);
 
             if (!$this->boolean('license')) {
-                $this->showForm(_('You can\'t register if you don\'t '.
+                $this->showForm(_('You cannot register if you don\'t '.
                                   'agree to the license.'));
             } else if ($email && !Validate::email($email, common_config('email', 'check_domain'))) {
                 $this->showForm(_('Not a valid email address.'));
@@ -284,7 +276,6 @@ class RegisterAction extends Action
      *
      * @return boolean true if the nickname already exists
      */
-
     function nicknameExists($nickname)
     {
         $user = User::staticGet('nickname', $nickname);
@@ -300,7 +291,6 @@ class RegisterAction extends Action
      *
      * @return boolean true if the address already exists
      */
-
     function emailExists($email)
     {
         $email = common_canonical_email($email);
@@ -339,7 +329,6 @@ class RegisterAction extends Action
      *
      * @return void
      */
-
     function showPageNotice()
     {
         if ($this->registered) {
@@ -351,7 +340,7 @@ class RegisterAction extends Action
               common_markup_to_html(_('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.'));
 
             $this->elementStart('div', 'instructions');
             $this->raw($instr);
@@ -368,7 +357,6 @@ class RegisterAction extends Action
      *
      * @return void
      */
-
     function showForm($error=null)
     {
         $this->error = $error;
@@ -383,7 +371,6 @@ class RegisterAction extends Action
      *
      * @return void
      */
-
     function showContent()
     {
         if ($this->registered) {
@@ -398,7 +385,6 @@ class RegisterAction extends Action
      *
      * @return void
      */
-
     function showFormContent()
     {
         $code = $this->trimmed('code');
@@ -444,23 +430,23 @@ class RegisterAction extends Action
             if ($this->invite && $this->invite->address_type == 'email') {
                 $this->input('email', _('Email'), $this->invite->address,
                              _('Used only for updates, announcements, '.
-                               'and password recovery'));
+                               'and password recovery.'));
             } else {
                 $this->input('email', _('Email'), $this->trimmed('email'),
                              _('Used only for updates, announcements, '.
-                               'and password recovery'));
+                               'and password recovery.'));
             }
             $this->elementEnd('li');
             $this->elementStart('li');
             $this->input('fullname', _('Full name'),
                          $this->trimmed('fullname'),
-                         _('Longer name, preferably your "real" name'));
+                         _('Longer name, preferably your "real" name.'));
             $this->elementEnd('li');
             $this->elementStart('li');
             $this->input('homepage', _('Homepage'),
                          $this->trimmed('homepage'),
                          _('URL of your homepage, blog, '.
-                           'or profile on another site'));
+                           'or profile on another site.'));
             $this->elementEnd('li');
             $this->elementStart('li');
             $maxBio = Profile::maxBio();
@@ -483,7 +469,7 @@ class RegisterAction extends Action
             $this->input('location', _('Location'),
                          $this->trimmed('location'),
                          _('Where you are, like "City, '.
-                           'State (or Region), Country"'));
+                           'State (or Region), Country".'));
             $this->elementEnd('li');
             Event::handle('EndRegistrationFormData', array($this));
             $this->elementStart('li', array('id' => 'settings_rememberme'));
@@ -519,6 +505,7 @@ class RegisterAction extends Action
         switch (common_config('license', 'type')) {
         case 'private':
             // TRANS: Copyright checkbox label in registration dialog, for private sites.
+            // TRANS: %1$s is the StatusNet sitename.
             $out .= htmlspecialchars(sprintf(
                 _('I understand that content and data of %1$s are private and confidential.'),
                 common_config('site', 'name')));
@@ -562,7 +549,6 @@ class RegisterAction extends Action
      *
      * @return void
      */
-
     function showSuccess()
     {
         $this->registered = true;
@@ -576,7 +562,6 @@ class RegisterAction extends Action
      *
      * @return void
      */
-
     function showSuccessContent()
     {
         $nickname = $this->arg('nickname');
@@ -623,11 +608,9 @@ class RegisterAction extends Action
      *
      * @return void
      */
-
     function showLocalNav()
     {
         $nav = new LoginGroupNav($this);
         $nav->show();
     }
 }
-
diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index 63ba618c41..8200659278 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -126,11 +126,11 @@ class RemotesubscribeAction extends Action
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
         $this->input('nickname', _('User nickname'), $this->nickname,
-                     _('Nickname of the user you want to follow'));
+                     _('Nickname of the user you want to follow.'));
         $this->elementEnd('li');
         $this->elementStart('li');
         $this->input('profile_url', _('Profile URL'), $this->profile_url,
-                     _('URL of your profile on another compatible microblogging service'));
+                     _('URL of your profile on another compatible microblogging service.'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
         $this->submit('submit', _('Subscribe'));
@@ -155,7 +155,7 @@ class RemotesubscribeAction extends Action
         }
 
         if (!common_valid_http_url($this->profile_url)) {
-            $this->showForm(_('Invalid profile URL (bad format)'));
+            $this->showForm(_('Invalid profile URL (bad format).'));
             return;
         }
 
diff --git a/actions/restoreaccount.php b/actions/restoreaccount.php
index b32553a68d..22f0a8e5da 100644
--- a/actions/restoreaccount.php
+++ b/actions/restoreaccount.php
@@ -57,7 +57,7 @@ class RestoreaccountAction extends Action
     function title()
     {
         // TRANS: Page title for page where a user account can be restored from backup.
-        return _("Restore account");
+        return _('Restore account');
     }
 
     /**
diff --git a/actions/rsd.php b/actions/rsd.php
index e02c85c41b..0a70117498 100644
--- a/actions/rsd.php
+++ b/actions/rsd.php
@@ -68,13 +68,11 @@ if (!defined('STATUSNET')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
-
 class RsdAction extends Action
 {
     /**
      * Optional attribute for the personal rsd.xml file.
      */
-
     var $user = null;
 
     /**
@@ -87,7 +85,6 @@ class RsdAction extends Action
      *
      * @return boolean success flag
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -132,7 +129,6 @@ class RsdAction extends Action
      *
      * @return nothing
      */
-
     function handle($args)
     {
         header('Content-Type: application/rsd+xml');
@@ -195,7 +191,6 @@ class RsdAction extends Action
      *
      * @return string date of last change of this page
      */
-
     function lastModified()
     {
         if (!empty($this->user)) {
@@ -214,7 +209,6 @@ class RsdAction extends Action
      *
      * @return boolean true
      */
-
     function isReadOnly($args)
     {
         return true;
@@ -228,7 +222,6 @@ class RsdAction extends Action
      *
      * @return string API root URI for this site
      */
-
     private function _apiRoot()
     {
         if (common_config('site', 'fancy')) {
diff --git a/actions/showapplication.php b/actions/showapplication.php
index 10aaff538f..f16cc3259a 100644
--- a/actions/showapplication.php
+++ b/actions/showapplication.php
@@ -40,19 +40,16 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class ShowApplicationAction extends OwnerDesignAction
 {
     /**
      * Application to show
      */
-
     var $application = null;
 
     /**
      * User who owns the app
      */
-
     var $owner = null;
 
     var $msg = null;
@@ -68,7 +65,6 @@ class ShowApplicationAction extends OwnerDesignAction
      *
      * @return success flag
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -105,7 +101,6 @@ class ShowApplicationAction extends OwnerDesignAction
      *
      * @return void
      */
-
     function handle($args)
     {
         parent::handle($args);
@@ -132,7 +127,6 @@ class ShowApplicationAction extends OwnerDesignAction
      *
      * @return string title of the page
      */
-
     function title()
     {
         if (!empty($this->application->name)) {
@@ -301,7 +295,6 @@ class ShowApplicationAction extends OwnerDesignAction
      *
      * @return void
      */
-
     function showScripts()
     {
         parent::showScripts();
@@ -322,7 +315,6 @@ class ShowApplicationAction extends OwnerDesignAction
      * XXX: Should this be moved to its own page with a confirm?
      *
      */
-
     function resetKey()
     {
         $this->application->query('BEGIN');
@@ -382,5 +374,4 @@ class ShowApplicationAction extends OwnerDesignAction
         $this->msg = ('Consumer key and secret reset.');
         $this->showPage();
     }
-
 }
diff --git a/actions/shownotice.php b/actions/shownotice.php
index b4af7dbaa2..e2a03e2fd1 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -344,7 +344,7 @@ class SingleNoticeItem extends DoFollowListItem
      * show the avatar of the notice's author
      *
      * We use the larger size for single notice page.
-     * 
+     *
      * @return void
      */
 
diff --git a/actions/showstream.php b/actions/showstream.php
index 8a67d3fc9c..1f5d85ea4e 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -70,7 +70,7 @@ class ShowstreamAction extends ProfileAction
                 return sprintf(_('%1$s tagged %2$s'), $base, $this->tag);
             } else {
                 // 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.
                 return sprintf(_('%1$s tagged %2$s, page %3$d'), $base, $this->tag, $this->page);
             }
         } else {
diff --git a/actions/sitenoticeadminpanel.php b/actions/sitenoticeadminpanel.php
index 797a6c4f4c..b1ac441af7 100644
--- a/actions/sitenoticeadminpanel.php
+++ b/actions/sitenoticeadminpanel.php
@@ -98,7 +98,7 @@ class SitenoticeadminpanelAction extends AdminPanelAction
 
         if (!$result) {
             // TRANS: Server error displayed when saving a site-wide notice was impossible.
-            $this->ServerError(_("Unable to save site notice."));
+            $this->ServerError(_('Unable to save site notice.'));
         }
     }
 
@@ -198,7 +198,7 @@ class SiteNoticeAdminPanelForm extends AdminForm
             'submit',
             null,
             // TRANS: Title for button to save site notice in admin panel.
-            _('Save site notice')
+            _('Save site notice.')
         );
     }
 }
diff --git a/actions/smssettings.php b/actions/smssettings.php
index f9a79e1664..228c7878d2 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -150,7 +150,7 @@ class SmssettingsAction extends ConnectSettingsAction
                              ($this->arg('sms')) ? $this->arg('sms') : null,
                              // TRANS: SMS phone number input field instructions in SMS settings form.
                              _('Phone number, no punctuation or spaces, '.
-                               'with area code'));
+                               'with area code.'));
                 $this->elementEnd('li');
                 $this->elementEnd('ul');
                 $this->carrierSelect();
@@ -562,9 +562,11 @@ class SmssettingsAction extends ConnectSettingsAction
 
         if (!$user->updateKeys($orig)) {
             common_log_db_error($user, 'UPDATE', __FILE__);
-            $this->serverError(_("Could not update user record."));
+            // TRANS: Server error displayed when the user could not be updated in SMS settings.
+            $this->serverError(_('Could not update user record.'));
         }
 
+        // TRANS: Confirmation text after updating SMS settings.
         $this->showForm(_('Incoming email address removed.'), true);
     }
 
@@ -585,9 +587,11 @@ class SmssettingsAction extends ConnectSettingsAction
 
         if (!$user->updateKeys($orig)) {
             common_log_db_error($user, 'UPDATE', __FILE__);
-            $this->serverError(_("Could not update user record."));
+            // TRANS: Server error displayed when the user could not be updated in SMS settings.
+            $this->serverError(_('Could not update user record.'));
         }
 
+        // TRANS: Confirmation text after updating SMS settings.
         $this->showForm(_('New incoming email address added.'), true);
     }
 }
diff --git a/actions/useradminpanel.php b/actions/useradminpanel.php
index fc75e83b2d..c8861bd834 100644
--- a/actions/useradminpanel.php
+++ b/actions/useradminpanel.php
@@ -163,7 +163,7 @@ class UseradminpanelAction extends AdminPanelAction
                     sprintf(
                         // 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.
-                        _('Invalid default subscripton: \'%1$s\' is not a user.'),
+                        _('Invalid default subscripton: "%1$s" is not a user.'),
                         $values['newuser']['default']
                     )
                 );
@@ -299,6 +299,6 @@ class UserAdminPanelForm extends AdminForm
                            'submit',
                            null,
                            // TRANS: Title for button to save user settings in user admin panel.
-                           _('Save user settings'));
+                           _('Save user settings.'));
     }
 }
diff --git a/actions/userauthorization.php b/actions/userauthorization.php
index e896ff96ca..b7192ccdb2 100644
--- a/actions/userauthorization.php
+++ b/actions/userauthorization.php
@@ -35,6 +35,7 @@ require_once INSTALLDIR.'/extlib/libomb/service_provider.php';
 require_once INSTALLDIR.'/extlib/libomb/profile.php';
 define('TIMESTAMP_THRESHOLD', 300);
 
+// @todo FIXME: Missing documentation.
 class UserauthorizationAction extends Action
 {
     var $error;
@@ -69,6 +70,8 @@ class UserauthorizationAction extends Action
             $profile = $user->getProfile();
             if (!$profile) {
                 common_log_db_error($user, 'SELECT', __FILE__);
+                // TRANS: Server error displayed when trying to authorise a remote subscription request
+                // TRANS: while the user has no profile.
                 $this->serverError(_('User without matching profile.'));
                 return;
             }
@@ -102,16 +105,18 @@ class UserauthorizationAction extends Action
 
     function title()
     {
+        // TRANS: Page title.
         return _('Authorize subscription');
     }
 
     function showPageNotice()
     {
+        // TRANS: Page notice on "Auhtorize subscription" page.
         $this->element('p', null, _('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".'));
     }
 
     function showContent()
@@ -129,6 +134,7 @@ class UserauthorizationAction extends Action
 
         $this->elementStart('div', 'entity_profile vcard');
         $this->elementStart('dl', 'entity_depiction');
+        // TRANS: DT element on Authorise Subscription page.
         $this->element('dt', null, _('Photo'));
         $this->elementStart('dd');
         if ($avatar) {
@@ -142,6 +148,7 @@ class UserauthorizationAction extends Action
         $this->elementEnd('dl');
 
         $this->elementStart('dl', 'entity_nickname');
+        // TRANS: DT element on Authorise Subscription page.
         $this->element('dt', null, _('Nickname'));
         $this->elementStart('dd');
         $hasFN = ($fullname !== '') ? 'nickname' : 'fn nickname';
@@ -163,6 +170,7 @@ class UserauthorizationAction extends Action
         }
         if (!is_null($location)) {
             $this->elementStart('dl', 'entity_location');
+        // TRANS: DT element on Authorise Subscription page.
             $this->element('dt', null, _('Location'));
             $this->elementStart('dd', 'label');
             $this->raw($location);
@@ -172,6 +180,7 @@ class UserauthorizationAction extends Action
 
         if (!is_null($homepage)) {
             $this->elementStart('dl', 'entity_url');
+        // TRANS: DT element on Authorise Subscription page.
             $this->element('dt', null, _('URL'));
             $this->elementStart('dd');
             $this->elementStart('a', array('href' => $homepage,
@@ -184,6 +193,7 @@ class UserauthorizationAction extends Action
 
         if (!is_null($bio)) {
             $this->elementStart('dl', 'entity_note');
+            // TRANS: DT element on Authorise Subscription page where bio is displayed.
             $this->element('dt', null, _('Note'));
             $this->elementStart('dd', 'note');
             $this->raw($bio);
@@ -193,6 +203,7 @@ class UserauthorizationAction extends Action
 
         if (!is_null($license)) {
             $this->elementStart('dl', 'entity_license');
+            // TRANS: DT element on Authorise Subscription page where license is displayed.
             $this->element('dt', null, _('License'));
             $this->elementStart('dd', 'license');
             $this->element('a', array('href' => $license,
@@ -214,10 +225,14 @@ class UserauthorizationAction extends Action
                                                          'userauthorization')));
         $this->hidden('token', common_session_token());
 
-        $this->submit('accept', _('Accept'), 'submit accept', null,
-                      _('Subscribe to this user'));
-        $this->submit('reject', _('Reject'), 'submit reject', null,
-                      _('Reject this subscription'));
+        // TRANS: Button text on Authorise Subscription page.
+        $this->submit('accept', _m('BUTTON','Accept'), 'submit accept', null,
+                      // TRANS: Title for button on Authorise Subscription page.
+                      _('Subscribe to this user.'));
+        // TRANS: Button text on Authorise Subscription page.
+        $this->submit('reject', _m('BUTTON','Reject'), 'submit reject', null,
+                      // TRANS: Title for button on Authorise Subscription page.
+                      _('Reject this subscription.'));
         $this->elementEnd('form');
         $this->elementEnd('li');
         $this->elementEnd('ul');
@@ -229,6 +244,7 @@ class UserauthorizationAction extends Action
         $srv = $this->getStoredParams();
 
         if (is_null($srv)) {
+            // TRANS: Client error displayed for an empty authorisation request.
             $this->clientError(_('No authorization request!'));
             return;
         }
@@ -251,7 +267,9 @@ class UserauthorizationAction extends Action
 
     function showAcceptMessage($tok)
     {
+        // TRANS: Accept message header from Authorise subscription page.
         common_show_header(_('Subscription authorized'));
+        // TRANS: Accept message text from Authorise subscription page.
         $this->element('p', null,
                        _('The subscription has been authorized, but no '.
                          'callback URL was passed. Check with the site’s ' .
@@ -263,7 +281,9 @@ class UserauthorizationAction extends Action
 
     function showRejectMessage()
     {
+        // TRANS: Reject message header from Authorise subscription page.
         common_show_header(_('Subscription rejected'));
+        // TRANS: Reject message from Authorise subscription page.
         $this->element('p', null,
                        _('The subscription has been rejected, but no '.
                          'callback URL was passed. Check with the site’s ' .
@@ -300,18 +320,24 @@ class UserauthorizationAction extends Action
 
         $user = User::staticGet('uri', $listener);
         if (!$user) {
-            throw new Exception(sprintf(_('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.
+            throw new Exception(sprintf(_('Listener URI "%s" not found here.'),
                                         $listener));
         }
 
         if (strlen($listenee) > 255) {
-            throw new Exception(sprintf(_('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.
+            throw new Exception(sprintf(_('Listenee URI "%s" is too long.'),
                                         $listenee));
         }
 
         $other = User::staticGet('uri', $listenee);
         if ($other) {
-            throw new Exception(sprintf(_('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.
+            throw new Exception(sprintf(_('Listenee URI "%s" is a local user.'),
                                         $listenee));
         }
 
@@ -321,12 +347,15 @@ class UserauthorizationAction extends Action
             $sub->subscriber = $user->id;
             $sub->subscribed = $remote->id;
             if ($sub->find(true)) {
+                // TRANS: Exception thrown when already subscribed.
                 throw new Exception('You are already subscribed to this user.');
             }
         }
 
         if ($profile == common_profile_url($nickname)) {
-            throw new Exception(sprintf(_('Profile URL ‘%s’ is for a local user.'),
+            // TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+            // TRANS: %s is a profile URL.
+            throw new Exception(sprintf(_('Profile URL "%s" is for a local user.'),
                                         $profile));
 
         }
@@ -334,26 +363,34 @@ class UserauthorizationAction extends Action
         $license      = $_GET['omb_listenee_license'];
         $site_license = common_config('license', 'url');
         if (!common_compatible_license($license, $site_license)) {
-            throw new Exception(sprintf(_('Listenee stream license ‘%1$s’ is not ' .
-                                          'compatible with site license ‘%2$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.
+            throw new Exception(sprintf(_('Listenee stream license "%1$s" is not ' .
+                                          'compatible with site license "%2$s".'),
                                         $license, $site_license));
         }
 
         $avatar = $_GET['omb_listenee_avatar'];
         if ($avatar) {
             if (!common_valid_http_url($avatar) || strlen($avatar) > 255) {
-                throw new Exception(sprintf(_('Avatar URL ‘%s’ is not valid.'),
+                // TRANS: Exception thrown when avatar URL is invalid for an authorisation request.
+                // TRANS: %s is an avatar URL.
+                throw new Exception(sprintf(_('Avatar URL "%s" is not valid.'),
                                             $avatar));
             }
             $size = @getimagesize($avatar);
             if (!$size) {
-                throw new Exception(sprintf(_('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.
+                throw new Exception(sprintf(_('Cannot read avatar URL "%s".'),
                                             $avatar));
             }
             if (!in_array($size[2], array(IMAGETYPE_GIF, IMAGETYPE_JPEG,
                                           IMAGETYPE_PNG))) {
+                // TRANS: Exception thrown when avatar URL return an invalid image type for an authorisation request.
+                // TRANS: %s is an avatar URL.
                 throw new Exception(sprintf(_('Wrong image type for avatar URL '.
-                                              '‘%s’.'), $avatar));
+                                              '"%s".'), $avatar));
             }
         }
     }
diff --git a/actions/userxrd.php b/actions/userxrd.php
index 582f7a35e7..7691ff155b 100644
--- a/actions/userxrd.php
+++ b/actions/userxrd.php
@@ -56,7 +56,7 @@ class UserxrdAction extends XrdAction
         }
 
         if (!$this->user) {
-            $this->clientError(_m('No such user.'), 404);
+            $this->clientError(_('No such user.'), 404);
             return false;
         }
 

From 764a29e2ff0010eda99a6ced14172045b41751bf Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 16 Feb 2011 16:21:31 -0800
Subject: [PATCH 263/314] Remove debugging statements I accidentally left in

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

diff --git a/classes/Notice.php b/classes/Notice.php
index ed1aab0014..007eb55f85 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1252,8 +1252,6 @@ class Notice extends Memcached_DataObject
 
     function asActivity()
     {
-                common_debug("a");
-
         $act = self::cacheGet(Cache::codeKey('notice:as-activity:'.$this->id));
 
         if (!empty($act)) {
@@ -1264,7 +1262,6 @@ class Notice extends Memcached_DataObject
         if (Event::handle('StartNoticeAsActivity', array($this, &$act))) {
 
             $profile = $this->getProfile();
-            common_debug('b');
             $act->actor     = ActivityObject::fromProfile($profile);
             $act->verb      = ActivityVerb::POST;
             $act->objects[] = ActivityObject::fromNotice($this);

From e4d5c47ebf60adcc08a4ca48dd6e398c3c419993 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 16 Feb 2011 16:21:46 -0800
Subject: [PATCH 264/314] Add image to JSON ActivityObject and title + links to
 the JSON document

---
 actions/apitimelinefriends.php     |   2 +
 lib/activity.php                   |   2 +-
 lib/activityobject.php             |  30 ++++++--
 lib/activitystreamjsondocument.php | 108 ++++++++++++++++++++++++++++-
 4 files changed, 136 insertions(+), 6 deletions(-)

diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index 3833418baa..0e356bb18b 100644
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -266,6 +266,8 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
         case 'as':
             header('Content-Type: application/json; charset=utf-8');
             $doc = new ActivityStreamJSONDocument($this->auth_user);
+            $doc->setTitle($title);
+            $doc->addLink($link,'alternate', 'text/html');
             $doc->addItemsFromNotices($this->notices);
             $this->raw($doc->asString());
             break;
diff --git a/lib/activity.php b/lib/activity.php
index 0046469899..e6fefca28f 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -387,7 +387,7 @@ class Activity
 
         // TODO: extensions (ActivityContext, OStatus stuff, etc.)
 
-        return $activity;
+        return array_filter($activity);
     }
 
     function asString($namespace=false, $author=true, $source=false)
diff --git a/lib/activityobject.php b/lib/activityobject.php
index 53ffe1a172..17753f0df4 100644
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -652,13 +652,35 @@ class ActivityObject
 
 
         // TODO: downstreamDuplicates
-        // TODO: embedCode
+        // TODO: embedCode (video)
 
         // id
         $object['id'] = $this->id;
 
-        // TODO: image
-        // Need to make MediaLink serialization
+        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 stream size
+            // one, but possibly it should be large
+            $avatarLink = null;
+
+            foreach ($this->avatarLinks as $a) {
+                if ($a->height == AVATAR_STREAM_SIZE) {
+                    $avatarLink = $a;
+                    break;
+                }
+            }
+
+            $imgLink = new ActivityStreamsMediaLink(
+                $avatarLink->url,
+                $avatarLink->width,
+                $avatarLink->height,
+                $avatarLink->type
+            );
+
+            $object['image']  = $imgLink->asArray();
+        }
 
         // objectType
         $object['type'] = $this->type;
@@ -673,6 +695,6 @@ class ActivityObject
 
         // TODO: extensions (OStatus stuff, etc.)
 
-        return $object;
+        return array_filter($object);
     }
 }
diff --git a/lib/activitystreamjsondocument.php b/lib/activitystreamjsondocument.php
index 57ece9f6bf..4fa456470e 100644
--- a/lib/activitystreamjsondocument.php
+++ b/lib/activitystreamjsondocument.php
@@ -43,6 +43,7 @@ if (!defined('STATUSNET'))
  */
 class ActivityStreamJSONDocument
 {
+
     /* Top level array representing the document */
     protected $doc = array();
 
@@ -57,9 +58,28 @@ class ActivityStreamJSONDocument
 
     function __construct($cur = null)
     {
+
         $this->cur = $cur;
 
+        /* Title of the JSON document */
+        $this->doc['title'] = null;
+
+        /* Array of activity items */
         $this->doc['items'] = array();
+
+        /* Array of links associated with the document */
+        $this->doc['links'] = array();
+
+    }
+
+    /**
+     * Set the title of the document
+     *
+     * @param String $title the title
+     */
+    function setTitle($title)
+    {
+        $this->doc['title'] = $title;
     }
 
     /**
@@ -99,6 +119,18 @@ class ActivityStreamJSONDocument
         array_push($this->doc['items'], $act->asArray());
     }
 
+    /**
+     * Add a link to the JSON document
+     *
+     * @param string $url the URL for the link
+     * @param string $rel the link relationship
+     */
+    function addLink($url = null, $rel = null, $mediaType = null)
+    {
+        $link = new ActivityStreamsLink($url, $rel, $mediaType);
+        $this->doc['link'][] = $link->asArray();
+    }
+
     /*
      * Return the entire document as a big string of JSON
      *
@@ -106,7 +138,81 @@ class ActivityStreamJSONDocument
      */
     function asString()
     {
-        return json_encode($this->doc);
+        return json_encode(array_filter($this->doc));
     }
 
 }
+
+/**
+ * A class for representing MediaLinks in JSON Activities
+ *
+ * @category Feed
+ * @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 ActivityStreamsMediaLink extends ActivityStreamsLink
+{
+    private $linkDict;
+
+    function __construct(
+        $url       = null,
+        $width     = null,
+        $height    = null,
+        $mediaType = null,
+        $rel       = null,
+        $duration  = null
+    )
+    {
+        parent::__construct($url, $rel, $mediaType);
+        $this->linkDict = array(
+            'width'      => $width,
+            'height'     => $height,
+            'duration'   => $duration
+        );
+    }
+
+    function asArray()
+    {
+        return array_merge(
+            parent::asArray(),
+            array_filter($this->linkDict)
+        );
+    }
+}
+
+/**
+ * A class for representing links in JSON Activities
+ *
+ * @category Feed
+ * @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 ActivityStreamsLink
+{
+    private $linkDict;
+
+    function __construct($url = null, $rel = null, $mediaType = null)
+    {
+        // links MUST have a URL
+        if (empty($url)) {
+            throw new Exception('Links must have a URL.');
+        }
+
+        $this->linkDict = array(
+            'url'        => $url,
+            'rel'        => $rel,      // extension
+            'media_type' => $mediaType // extension
+       );
+    }
+
+    function asArray()
+    {
+        return array_filter($this->linkDict);
+    }
+}

From ddda31038e0db5836f22cf22b61e4229b556c91e Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 16 Feb 2011 16:44:02 -0800
Subject: [PATCH 265/314] Use simple relative object and verb references

---
 lib/activity.php       | 5 ++++-
 lib/activityobject.php | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/activity.php b/lib/activity.php
index e6fefca28f..e1d5e25e5e 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -383,7 +383,10 @@ class Activity
         // updatedTime <-- should we use? spec says activity MAY have this
 
         // verb
-        $activity['verb'] = $this->verb;
+        //
+        // We can probably use the whole schema URL here but probably the
+        // relative simple name is easier to parse
+        $activity['verb'] = substr($this->verb, strrpos($this->verb, '/') + 1);
 
         // TODO: extensions (ActivityContext, OStatus stuff, etc.)
 
diff --git a/lib/activityobject.php b/lib/activityobject.php
index 17753f0df4..7847a5d640 100644
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -683,7 +683,10 @@ class ActivityObject
         }
 
         // objectType
-        $object['type'] = $this->type;
+        //
+        // We can probably use the whole schema URL here but probably the
+        // relative simple name is easier to parse
+        $object['type'] = substr($this->type, strrpos($this->type, '/') + 1);
 
         // summary
         $object['summary'] = $this->summary;

From b1675ff175cf54e4d9b97f24608d341551469ca8 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 16 Feb 2011 18:14:58 -0800
Subject: [PATCH 266/314] Rudimentary support for enclosures and some fiddling

---
 lib/activity.php                   | 62 +++++++++++++++++++++++++++---
 lib/activityobject.php             |  8 ++--
 lib/activitystreamjsondocument.php |  2 +-
 3 files changed, 63 insertions(+), 9 deletions(-)

diff --git a/lib/activity.php b/lib/activity.php
index e1d5e25e5e..6b3b121087 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -354,13 +354,58 @@ class Activity
         // body
         $activity['body'] = $this->content;
 
-        // generator <--- might be useful; might be too much junk
+        // generator <-- We should use this when we know a notice is created
+        //               locally
 
-        // icon <-- should we use this?
+        // icon <-- Should we use this? Maybe a little bubble like we have
+        //          on Facebook posts?
 
         // object
         if ($this->verb == ActivityVerb::POST && count($this->objects) == 1) {
             $activity['object'] = $this->objects[0]->asArray();
+
+            // Instead of adding enclosures as an extension to JSON
+            // Activities, it seems like we should be using the
+            // attachedObjects property of ActivityObject
+
+            $attachedObjects = array();
+
+            // XXX: OK, this is kinda cheating. We should probably figure out
+            // what kind of objects these are based on mime-type and then
+            // create specific object types. Right now this rely on
+            // duck-typing.  Also, we should include an embed code for
+            // video attachments.
+
+            foreach ($this->enclosures as $enclosure) {
+
+                if (is_string($enclosure)) {
+
+                    $attachedObjects[]['id']  = $enclosure;
+
+                } else {
+
+                    $attachedObjects[]['id']  = $enclosure->url;
+
+                    $mediaLink = new ActivityStreamsMediaLink(
+                        $enclosure->url,
+                        null,
+                        null,
+                        $enclosure->mimetype
+                        // XXX: Add 'size' as an extension to MediaLink?
+                    );
+
+                    $attachedObjects[]['mediaLink'] = $mediaLink->asArray(); // extension
+
+                    if ($enclosure->title) {
+                        $attachedObjects[]['displayName'] = $enclosure->title;
+                    }
+               }
+            }
+
+            if (!empty($attachedObjects)) {
+                $activity['object']['attachedObjects'] = $attachedObjects;
+            }
+
         } else {
             $activity['object'] = array();
             foreach($this->objects as $object) {
@@ -370,7 +415,8 @@ class Activity
 
         $activity['postedTime'] = self::iso8601Date($this->time); // Change to exactly be RFC3339?
 
-        // provider <--- again not sure we should use this
+        // provider <-- We should probably use this for showing the the source
+        //              of remote notices, if known
 
         // target
         if (!empty($this->target)) {
@@ -380,7 +426,8 @@ class Activity
         // title
         $activity['title'] = $this->title;
 
-        // updatedTime <-- should we use? spec says activity MAY have this
+        // updatedTime <-- Should we use this to indicate the time we received
+        //                 a remote notice? Probably not.
 
         // verb
         //
@@ -388,7 +435,12 @@ class Activity
         // relative simple name is easier to parse
         $activity['verb'] = substr($this->verb, strrpos($this->verb, '/') + 1);
 
-        // TODO: extensions (ActivityContext, OStatus stuff, etc.)
+        /* Purely extensions hereafter */
+
+        if ($this->verb == ActivityVerb::POST) {
+            $activity['noticeInfo'] = $this->noticeInfo;
+        }
+
 
         return array_filter($activity);
     }
diff --git a/lib/activityobject.php b/lib/activityobject.php
index 7847a5d640..d6356ed6fb 100644
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -645,16 +645,18 @@ class ActivityObject
     {
         $object = array();
 
-        // TODO: attachedObjects
+        // XXX: attachedObjects are added by Activity
 
         // displayName
         $object['displayName'] = $this->title;
 
-
         // TODO: downstreamDuplicates
-        // TODO: embedCode (video)
+
+        // embedCode (used for video)
 
         // id
+        //
+        // XXX: Should we use URL here? or a crazy tag URI?
         $object['id'] = $this->id;
 
         if ($this->type == ActivityObject::PERSON
diff --git a/lib/activitystreamjsondocument.php b/lib/activitystreamjsondocument.php
index 4fa456470e..00029f85f9 100644
--- a/lib/activitystreamjsondocument.php
+++ b/lib/activitystreamjsondocument.php
@@ -207,7 +207,7 @@ class ActivityStreamsLink
         $this->linkDict = array(
             'url'        => $url,
             'rel'        => $rel,      // extension
-            'media_type' => $mediaType // extension
+            'mediaType'  => $mediaType // extension
        );
     }
 

From a199192ebf67a8c2b961bab540918d8e19e8e47e Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 16 Feb 2011 18:55:13 -0800
Subject: [PATCH 267/314] Add avatars and notice info

---
 lib/activity.php                   | 10 +++++---
 lib/activityobject.php             | 40 ++++++++++++++++++++----------
 lib/activitystreamjsondocument.php |  9 ++++---
 3 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/lib/activity.php b/lib/activity.php
index 6b3b121087..b9bd8c31fe 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -437,10 +437,14 @@ class Activity
 
         /* Purely extensions hereafter */
 
-        if ($this->verb == ActivityVerb::POST) {
-            $activity['noticeInfo'] = $this->noticeInfo;
-        }
+        // XXX: a bit of a hack... Since JSON isn't namespaced we probably
+        // shouldn't be using 'statusnet:notice_info', but this will work
+        // for the moment.
 
+        foreach ($this->extra as $e) {
+            list($objectName, $props, $txt) = $e;
+            $activity[$objectName] = $props;
+        }
 
         return array_filter($activity);
     }
diff --git a/lib/activityobject.php b/lib/activityobject.php
index d6356ed6fb..0df9999454 100644
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -663,24 +663,33 @@ class ActivityObject
             || $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 stream size
-            // one, but possibly it should be large
-            $avatarLink = null;
+            // author's "image". For now, I'm using the large size.
+
+            $avatarLarge      = null;
+            $avatarMediaLinks = array();
 
             foreach ($this->avatarLinks as $a) {
-                if ($a->height == AVATAR_STREAM_SIZE) {
-                    $avatarLink = $a;
-                    break;
+
+                // 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;
                 }
+
+                $avatarMediaLinks[] = $avatar->asArray();
             }
 
-            $imgLink = new ActivityStreamsMediaLink(
-                $avatarLink->url,
-                $avatarLink->width,
-                $avatarLink->height,
-                $avatarLink->type
-            );
+            $object['avatars'] = $avatarMediaLinks; // extension
 
+            // image
             $object['image']  = $imgLink->asArray();
         }
 
@@ -698,7 +707,12 @@ class ActivityObject
         // url (XXX: need to put the right thing here...)
         $object['url'] = $this->id;
 
-        // TODO: extensions (OStatus stuff, etc.)
+        /* Extensions */
+
+        foreach ($this->extra as $e) {
+            list($objectName, $props, $txt) = $e;
+            $object[$objectName] = $props;
+        }
 
         return array_filter($object);
     }
diff --git a/lib/activitystreamjsondocument.php b/lib/activitystreamjsondocument.php
index 00029f85f9..7e06652a45 100644
--- a/lib/activitystreamjsondocument.php
+++ b/lib/activitystreamjsondocument.php
@@ -77,6 +77,7 @@ class ActivityStreamJSONDocument
      *
      * @param String $title the title
      */
+
     function setTitle($title)
     {
         $this->doc['title'] = $title;
@@ -205,10 +206,10 @@ class ActivityStreamsLink
         }
 
         $this->linkDict = array(
-            'url'        => $url,
-            'rel'        => $rel,      // extension
-            'mediaType'  => $mediaType // extension
-       );
+            'url'   => $url,
+            'rel'   => $rel,      // extension
+            'type'  => $mediaType // extension
+        );
     }
 
     function asArray()

From db4213a9e048dfb4ef1063df7bd588b5bdc756ab Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Thu, 17 Feb 2011 09:58:07 +0100
Subject: [PATCH 268/314] Double quotes to single quotes.

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

diff --git a/actions/repeat.php b/actions/repeat.php
index 60b238f3a7..2ec641578b 100644
--- a/actions/repeat.php
+++ b/actions/repeat.php
@@ -72,7 +72,7 @@ class RepeatAction extends Action
         }
 
         if ($this->user->id == $this->notice->profile_id) {
-            $this->clientError(_("You cannot repeat your own notice."));
+            $this->clientError(_('You cannot repeat your own notice.'));
             return false;
         }
 

From 3e7e6138a8d49418918c0e1b78103b3c8b363e33 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Thu, 17 Feb 2011 12:27:14 +0100
Subject: [PATCH 269/314] Localisation updates from http://translatewiki.net.

---
 locale/ar/LC_MESSAGES/statusnet.po            | 606 ++++++++++------
 locale/arz/LC_MESSAGES/statusnet.po           | 589 +++++++++------
 locale/bg/LC_MESSAGES/statusnet.po            | 612 +++++++++-------
 locale/br/LC_MESSAGES/statusnet.po            | 609 ++++++++++------
 locale/ca/LC_MESSAGES/statusnet.po            | 668 +++++++++++-------
 locale/cs/LC_MESSAGES/statusnet.po            | 606 ++++++++++------
 locale/de/LC_MESSAGES/statusnet.po            | 619 ++++++++++------
 locale/en_GB/LC_MESSAGES/statusnet.po         | 601 ++++++++++------
 locale/eo/LC_MESSAGES/statusnet.po            | 606 ++++++++++------
 locale/es/LC_MESSAGES/statusnet.po            | 610 ++++++++++------
 locale/fa/LC_MESSAGES/statusnet.po            | 599 ++++++++++------
 locale/fi/LC_MESSAGES/statusnet.po            | 585 +++++++++------
 locale/fr/LC_MESSAGES/statusnet.po            | 615 ++++++++++------
 locale/gl/LC_MESSAGES/statusnet.po            | 605 ++++++++++------
 locale/hsb/LC_MESSAGES/statusnet.po           | 618 +++++++++-------
 locale/hu/LC_MESSAGES/statusnet.po            | 616 +++++++++-------
 locale/ia/LC_MESSAGES/statusnet.po            | 622 +++++++++-------
 locale/it/LC_MESSAGES/statusnet.po            | 605 ++++++++++------
 locale/ja/LC_MESSAGES/statusnet.po            | 605 ++++++++++------
 locale/ka/LC_MESSAGES/statusnet.po            | 613 ++++++++++------
 locale/ko/LC_MESSAGES/statusnet.po            | 611 +++++++++-------
 locale/mk/LC_MESSAGES/statusnet.po            | 617 ++++++++++------
 locale/ml/LC_MESSAGES/statusnet.po            | 655 ++++++++++-------
 locale/nb/LC_MESSAGES/statusnet.po            | 614 ++++++++++------
 locale/nl/LC_MESSAGES/statusnet.po            | 618 ++++++++++------
 locale/nn/LC_MESSAGES/statusnet.po            | 587 +++++++++------
 locale/pl/LC_MESSAGES/statusnet.po            | 619 ++++++++++------
 locale/pt/LC_MESSAGES/statusnet.po            | 607 ++++++++++------
 locale/pt_BR/LC_MESSAGES/statusnet.po         | 627 +++++++++-------
 locale/ru/LC_MESSAGES/statusnet.po            | 616 ++++++++++------
 locale/statusnet.pot                          | 525 ++++++++------
 locale/sv/LC_MESSAGES/statusnet.po            | 609 ++++++++++------
 locale/te/LC_MESSAGES/statusnet.po            | 587 +++++++++------
 locale/tr/LC_MESSAGES/statusnet.po            | 618 +++++++++-------
 locale/uk/LC_MESSAGES/statusnet.po            | 617 ++++++++++------
 locale/zh_CN/LC_MESSAGES/statusnet.po         | 619 +++++++++-------
 .../locale/ca/LC_MESSAGES/BitlyUrl.po         |  83 +++
 .../ca/LC_MESSAGES/EmailAuthentication.po     |  30 +
 .../locale/ca/LC_MESSAGES/EmailSummary.po     |  26 +
 .../locale/ca/LC_MESSAGES/Gravatar.po         |  75 ++
 plugins/OpenX/locale/de/LC_MESSAGES/OpenX.po  |  15 +-
 41 files changed, 13752 insertions(+), 8432 deletions(-)
 create mode 100644 plugins/BitlyUrl/locale/ca/LC_MESSAGES/BitlyUrl.po
 create mode 100644 plugins/EmailAuthentication/locale/ca/LC_MESSAGES/EmailAuthentication.po
 create mode 100644 plugins/EmailSummary/locale/ca/LC_MESSAGES/EmailSummary.po
 create mode 100644 plugins/Gravatar/locale/ca/LC_MESSAGES/Gravatar.po

diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index bb965033a4..c69f9f73c2 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:05:12+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:26:59+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 (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -156,7 +156,7 @@ msgstr "لا صفحة كهذه."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -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).
@@ -599,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "الاسم المستعار مستخدم بالفعل. جرّب اسمًا آخرًا."
 
@@ -609,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "ليس اسمًا مستعارًا صحيحًا."
 
@@ -622,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "الصفحة الرئيسية ليست عنونًا صالحًا."
 
@@ -632,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:226
+#: actions/register.php:218
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "الاسم الكامل طويل جدًا (الحد الأقصى 255 حرفًا)."
 
@@ -664,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:235
+#: actions/register.php:227
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "المنظمة طويلة جدا (الأقصى 255 حرفا)."
@@ -830,15 +830,15 @@ msgstr "لا تملك تصريحًا."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -870,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr ""
@@ -915,19 +915,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "كلمة السر"
 
@@ -1051,7 +1052,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.
@@ -1237,25 +1238,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1423,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
 #, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "تعذّر حفظ الاشتراك."
@@ -1528,9 +1530,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,9 +1592,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
-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.
@@ -1650,7 +1655,7 @@ msgstr "الخلفية"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1690,7 +1695,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.
@@ -1707,9 +1713,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.
@@ -1875,7 +1881,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:426
 msgid "Confirm"
 msgstr "أكّد"
 
@@ -1905,13 +1911,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr ""
@@ -1932,12 +1938,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.
@@ -1993,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 "لا تحذف هذا الإشعار"
 
 #. 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.
@@ -2040,12 +2048,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 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.
@@ -2080,13 +2090,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.
-#. 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.
@@ -2253,21 +2263,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 +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:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "لا تطبيق كهذا."
 
@@ -2581,7 +2591,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "ليس عنوان بريد صالح."
@@ -2656,20 +2666,23 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 #, 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:534 actions/smssettings.php:570
 #, 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:558 actions/smssettings.php:595
 #, fuzzy
 msgid "New incoming email address added."
 msgstr "لا عنوان بريد إلكتروني وارد."
@@ -2681,7 +2694,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.
@@ -2916,12 +2930,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.
@@ -3234,7 +3250,8 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "انشر هوية مصغّرة لعنوان بريدي الإلكتروني."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "حُفِظت التفضيلات."
 
@@ -3628,51 +3645,51 @@ msgstr "أرسل"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "والج بالفعل."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "اسم المستخدم أو كلمة السر غير صحيحان."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "لُج"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "لُج إلى الموقع"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "تذكّرني"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "لُج تلقائيًا في المستقبل؛ هذا الخيار ليس مُعدًا للحواسيب المشتركة!"
 
-#: actions/login.php:269
+#: actions/login.php:259
 msgid "Lost or forgotten password?"
 msgstr "أنسيت كلمة السر؟"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 "لأسباب أمنية، من فضلك أعد إدخال اسم مستخدمك وكلمة سرك قبل تغيير إعداداتك."
 
-#: actions/login.php:292
+#: actions/login.php:281
 #, fuzzy
 msgid "Login with your username and password."
 msgstr "لُج باسم مستخدم وكلمة سر"
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3875,31 +3892,31 @@ msgid "You have not registered any applications yet."
 msgstr "يجب أن تكون مسجل الدخول لتسجل تطبيقا."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:70
 #, fuzzy
 msgid "Connected applications"
 msgstr "احذف هذا التطبيق"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3907,20 +3924,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, 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."
@@ -3931,6 +3958,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
@@ -4021,17 +4058,21 @@ msgstr "توكن دخول غير صحيح محدد."
 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 "هذا صندوق بريدك الصادر، والذي يسرد الرسائل الخاصة التي أرسلتها."
 
@@ -4057,40 +4098,45 @@ msgstr "كلمة السر القديمة"
 msgid "New password"
 msgstr "كلمة السر الجديدة"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+#, fuzzy
+msgid "6 or more characters."
 msgstr "6 أحرف أو أكثر"
 
-#: 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:427
+#, fuzzy
+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:230
 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:233
 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
+#, fuzzy
+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 "حُفظت كلمة السر."
 
@@ -4430,7 +4476,7 @@ 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:109 actions/register.php:419
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
@@ -4438,7 +4484,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:455
+#: actions/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4446,13 +4492,13 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "مسار صفحتك الرئيسية أو مدونتك أو ملفك الشخصي على موقع آخر"
@@ -4460,7 +4506,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:129 actions/register.php:457
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4472,28 +4518,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "مكان تواجدك، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\""
 
@@ -4512,8 +4559,10 @@ 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 ""
 "سِم نفسك (حروف وأرقام و \"-\" و \".\" و \"_\")، افصلها بفاصلة (',') أو مسافة."
 
@@ -4524,7 +4573,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.
@@ -4539,14 +4589,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:229
+#: actions/profilesettings.php:258 actions/register.php:221
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4570,9 +4621,9 @@ 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:291
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "وسم غير صالح: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4809,6 +4860,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"
@@ -4820,12 +4877,6 @@ 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
@@ -4880,14 +4931,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:248
 msgid "Error setting user."
 msgstr "خطأ أثناء ضبط المستخدم."
 
@@ -4896,98 +4941,96 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr "عذرًا، الأشخاص المدعوون وحدهم يستطيعون التسجيل."
 
-#: actions/register.php:99
+#: actions/register.php:94
 msgid "Sorry, invalid invitation code."
 msgstr "عذرا، رمز دعوة غير صالح."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "نجح التسجيل"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "سجّل"
 
-#: actions/register.php:142
+#: actions/register.php:135
 msgid "Registration not allowed."
 msgstr "لا يُسمح بالتسجيل."
 
-#: actions/register.php:209
+#: actions/register.php:201
 #, 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:210
 msgid "Email address already exists."
 msgstr "عنوان البريد الإلكتروني موجود مسبقًا."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "اسم مستخدم أو كلمة سر غير صالحة."
 
-#: actions/register.php:351
+#: actions/register.php:340
 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "البريد الإلكتروني"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, fuzzy
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "لا يُستخدم إلا عند التحديثات، والتعميمات، ولاستعادة كلمة السر"
 
-#: actions/register.php:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "اسم أطول. يُفضَّل استخدام اسمك الحقيقي"
 
-#: actions/register.php:462
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "مسار صفحتك الرئيسية أو مدونتك أو ملفك الشخصي على موقع آخر"
+#: actions/register.php:471
+#, fuzzy
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "مكان تواجدك، على سبيل المثال \"المدينة، الولاية (أو المنطقة)، الدولة\""
 
-#: actions/register.php:523
+#: actions/register.php:510
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:533
+#: actions/register.php:520
 #, 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:524
 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:527
 msgid "All rights reserved."
 msgstr "جميع الحقوق محفوظة."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:532
 #, 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:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5006,7 +5049,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5033,7 +5076,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
@@ -5041,7 +5084,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.
@@ -5051,8 +5094,9 @@ msgid "Subscribe"
 msgstr "اشترك"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)"
-msgstr ""
+#, 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)."
@@ -5243,7 +5287,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 "ستاتس نت"
 
@@ -5288,95 +5332,95 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "أيقونة"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "الاسم"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "المنظمة"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "إحصاءات"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:207
 #, fuzzy
 msgid "Application actions"
 msgstr "معلومات التطبيق"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "احذف"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "معلومات التطبيق"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr ""
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr "اسمح بالمسار"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:302
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "أمتأكد من أنك تريد إعادة ضبط مفتاح المستهلك وكلمة سره؟"
 
@@ -5466,16 +5510,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "ملاحظة"
 
@@ -5622,7 +5668,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"
@@ -5866,7 +5912,8 @@ msgstr "نص إشعار عام للموقع (255 حرف كحد أقصى؛ يسم
 
 #. 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.
@@ -5926,7 +5973,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.
@@ -6256,8 +6304,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "صورة"
@@ -6274,6 +6323,11 @@ 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."
@@ -6309,7 +6363,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’."
@@ -6341,7 +6395,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.
@@ -6402,106 +6456,146 @@ 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 "احفظ إعدادات المستخدم"
 
-#: 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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "اشترك بهذا المستخدم"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "ارفض"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+msgid "Reject this subscription."
 msgstr "ارفض هذا الاشتراك"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:248
 msgid "No authorization request!"
 msgstr "لا طلب استيثاق!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 #, fuzzy
 msgid "Subscription authorized"
 msgstr "رُفض الاشتراك"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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:285
 msgid "Subscription rejected"
 msgstr "رُفض الاشتراك"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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:325
 #, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
-#: actions/userauthorization.php:308
-#, php-format
-msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
-
-#: actions/userauthorization.php:314
-#, php-format
-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
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:332
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+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
+#, fuzzy, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "مسار المصدر ليس صحيحا."
 
-#: actions/userauthorization.php:350
-#, 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:385
+#, fuzzy, php-format
+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: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.
@@ -7720,6 +7814,11 @@ 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"
@@ -8198,6 +8297,11 @@ 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
@@ -8234,6 +8338,21 @@ 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
@@ -8341,7 +8460,6 @@ msgid "Grant this user the \"%s\" role"
 msgstr ""
 
 #: lib/groupeditform.php:147
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 حرفًا إنجليزيًا أو رقمًا بدون نقاط أو مسافات"
 
@@ -9060,6 +9178,10 @@ msgstr "رُد على هذا الإشعار"
 msgid "Reply"
 msgstr "رُد"
 
+#: lib/noticelist.php:673
+msgid "Delete this notice"
+msgstr "احذف هذا الإشعار"
+
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "الإشعار مكرر"
@@ -9342,6 +9464,10 @@ 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"
@@ -9637,3 +9763,15 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "6 or more characters"
+#~ msgstr "6 أحرف أو أكثر"
+
+#~ msgid "Same as password above"
+#~ msgstr "نفس كلمة السر أعلاه"
+
+#~ msgid "Can't save new password."
+#~ msgstr "تعذّر حفظ كلمة السر الجديدة."
+
+#~ msgid "URL of your homepage, blog, or profile on another site"
+#~ msgstr "مسار صفحتك الرئيسية أو مدونتك أو ملفك الشخصي على موقع آخر"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index 65fb7a4bb2..0786c3d391 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:05:15+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27:00+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 (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -159,7 +159,7 @@ msgstr "لا وسم كهذا."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -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).
@@ -607,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr ""
 
@@ -617,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "ليس اسمًا مستعارًا صحيحًا."
 
@@ -630,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "الصفحه الرئيسيه ليست عنونًا صالحًا."
 
@@ -640,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:226
+#: actions/register.php:218
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
@@ -673,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:235
+#: actions/register.php:227
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "المنظمه طويله جدا (اكتر حاجه 255 رمز)."
@@ -840,15 +840,15 @@ msgstr "لا تملك تصريحًا."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -880,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr ""
@@ -926,19 +926,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "كلمه السر"
 
@@ -1064,7 +1065,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.
@@ -1251,25 +1252,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1439,7 +1441,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 "تعذّر حفظ الاشتراك."
@@ -1544,9 +1546,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 +1609,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.
@@ -1667,7 +1671,7 @@ msgstr "الخلفية"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1705,7 +1709,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.
@@ -1723,9 +1728,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.
@@ -1892,7 +1897,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:426
 msgid "Confirm"
 msgstr "أكّد"
 
@@ -1923,13 +1928,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr ""
@@ -1951,13 +1956,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.
@@ -2013,13 +2018,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.
@@ -2060,12 +2065,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 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.
@@ -2100,13 +2107,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.
-#. 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.
@@ -2274,21 +2281,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.
@@ -2321,7 +2328,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 زى كده."
 
@@ -2609,7 +2616,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "ليس عنوان بريد صالح."
@@ -2686,20 +2693,23 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 #, 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:534 actions/smssettings.php:570
 #, 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:558 actions/smssettings.php:595
 #, fuzzy
 msgid "New incoming email address added."
 msgstr "لا عنوان بريد إلكترونى."
@@ -2711,7 +2721,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.
@@ -2950,12 +2961,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.
@@ -3263,7 +3276,8 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "هذا ليس عنوان بريدك الإلكترونى."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "حُفِظت التفضيلات."
 
@@ -3662,50 +3676,50 @@ msgstr "أرسل"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "والج بالفعل."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "اسم المستخدم أو كلمه السر غير صحيحان."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "لُج"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "لُج إلى الموقع"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "تذكّرني"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
-#: actions/login.php:269
+#: actions/login.php:259
 msgid "Lost or forgotten password?"
 msgstr "أنسيت كلمه السر؟"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 
-#: actions/login.php:292
+#: actions/login.php:281
 #, fuzzy
 msgid "Login with your username and password."
 msgstr "اسم المستخدم أو كلمه السر غير صحيحان."
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3908,31 +3922,31 @@ msgid "You have not registered any applications yet."
 msgstr "لازم تكون مسجل دخوللك علشان تسجل application."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:70
 #, fuzzy
 msgid "Connected applications"
 msgstr "مش ممكن إنشاء الapplication."
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3940,20 +3954,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, 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."
@@ -3964,6 +3988,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
@@ -4054,17 +4088,21 @@ msgstr "امارة تسجيل الدخول اللى اتحطت مش موجوده
 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 ""
 
@@ -4090,41 +4128,45 @@ msgstr "كلمه السر القديمة"
 msgid "New password"
 msgstr "كلمه سر جديدة"
 
-#: actions/passwordsettings.php:109
+#: actions/passwordsettings.php:109 actions/register.php:423
 #, fuzzy
-msgid "6 or more characters"
+msgid "6 or more characters."
 msgstr "6 حروف أو أكثر. مطلوب."
 
-#: 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:427
+#, fuzzy
+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:230
 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:233
 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
+#, fuzzy
+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 "حُفظت كلمه السر."
 
@@ -4462,14 +4504,14 @@ 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:109 actions/register.php:419
 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/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4477,20 +4519,20 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 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:129 actions/register.php:457
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4502,28 +4544,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
@@ -4543,7 +4586,8 @@ 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.
@@ -4553,7 +4597,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.
@@ -4570,13 +4615,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:229
+#: actions/profilesettings.php:258 actions/register.php:221
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4600,9 +4645,9 @@ 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:291
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "وسم غير صالح: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4839,6 +4884,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"
@@ -4850,12 +4901,6 @@ 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
@@ -4911,14 +4956,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:248
 msgid "Error setting user."
 msgstr "خطأ أثناء ضبط المستخدم."
 
@@ -4927,98 +4966,93 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr "عذرًا، الأشخاص المدعوون وحدهم يستطيعون التسجيل."
 
-#: actions/register.php:99
+#: actions/register.php:94
 msgid "Sorry, invalid invitation code."
 msgstr "عذرا، رمز دعوه غير صالح."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "نجح التسجيل"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "سجّل"
 
-#: actions/register.php:142
+#: actions/register.php:135
 msgid "Registration not allowed."
 msgstr "لا يُسمح بالتسجيل."
 
-#: actions/register.php:209
+#: actions/register.php:201
 #, 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:210
 msgid "Email address already exists."
 msgstr "عنوان البريد الإلكترونى موجود مسبقًا."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "اسم مستخدم أو كلمه سر غير صالحه."
 
-#: actions/register.php:351
+#: actions/register.php:340
 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "البريد الإلكتروني"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 
-#: actions/register.php:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+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:471
+msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr ""
 
-#: actions/register.php:523
+#: actions/register.php:510
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:533
+#: actions/register.php:520
 #, 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:524
 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:527
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:532
 #, 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:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5037,7 +5071,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5064,7 +5098,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
@@ -5072,7 +5106,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.
@@ -5082,8 +5116,9 @@ msgid "Subscribe"
 msgstr "اشترك"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)"
-msgstr ""
+#, 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)."
@@ -5276,7 +5311,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"
 
@@ -5321,95 +5356,95 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "الاسم"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "المنظمه"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "إحصاءات"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:207
 #, fuzzy
 msgid "Application actions"
 msgstr "OAuth applications"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "احذف"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 #, fuzzy
 msgid "Application info"
 msgstr "OAuth applications"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr ""
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr "اسمح للURL"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:302
 #, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "أمتأكد من أنك تريد حذف هذا الإشعار؟"
@@ -5500,16 +5535,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "ملاحظة"
 
@@ -5654,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"
@@ -5900,7 +5937,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.
@@ -5962,7 +5999,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.
@@ -6292,8 +6329,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "صورة"
@@ -6308,6 +6346,11 @@ 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."
@@ -6344,7 +6387,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’."
@@ -6377,7 +6420,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.
@@ -6438,104 +6481,143 @@ msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-msgid "Save user settings"
-msgstr ""
+#, fuzzy
+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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "اشترك بهذا المستخدم"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "ارفض"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+msgid "Reject this subscription."
 msgstr "ارفض هذا الاشتراك"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:248
 msgid "No authorization request!"
 msgstr "لا طلب استيثاق!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 #, fuzzy
 msgid "Subscription authorized"
 msgstr "رُفض الاشتراك"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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:285
 msgid "Subscription rejected"
 msgstr "رُفض الاشتراك"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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:325
 #, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
-#: actions/userauthorization.php:308
-#, php-format
-msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
-
-#: actions/userauthorization.php:314
-#, php-format
-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
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:332
 #, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "الSource URL مش مظبوط."
 
-#: actions/userauthorization.php:350
+#. 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 "Can’t read avatar URL ‘%s’."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
 
-#: actions/userauthorization.php:355
+#. 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 "Wrong image type for avatar URL ‘%s’."
+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
+#, 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: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\"."
 msgstr ""
 
 #. TRANS: Page title for profile design page.
@@ -7773,6 +7855,11 @@ 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"
@@ -8216,6 +8303,11 @@ 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
@@ -8252,6 +8344,21 @@ 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
@@ -9056,6 +9163,10 @@ msgstr "رُد على هذا الإشعار"
 msgid "Reply"
 msgstr "رُد"
 
+#: lib/noticelist.php:673
+msgid "Delete this notice"
+msgstr "احذف هذا الإشعار"
+
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "الإشعار مكرر"
@@ -9339,6 +9450,10 @@ 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"
@@ -9636,3 +9751,13 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#, fuzzy
+#~ msgid "6 or more characters"
+#~ msgstr "6 حروف أو أكثر. مطلوب."
+
+#~ msgid "Same as password above"
+#~ msgstr "نفس كلمه السر أعلاه"
+
+#~ msgid "Can't save new password."
+#~ msgstr "تعذّر حفظ كلمه السر الجديده."
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 3ea62a4545..3bd053bcaf 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:05:18+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27:01+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 (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -152,7 +152,7 @@ msgstr "Няма такака страница."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -504,7 +504,8 @@ 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."
+#, fuzzy
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Не може да изпращате преки съобщения до хора, които не са в списъка ви с "
 "приятели."
@@ -593,7 +594,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "Опитайте друг псевдоним, този вече е зает."
 
@@ -603,7 +604,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "Неправилен псевдоним."
 
@@ -616,7 +617,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "Адресът на личната страница не е правилен URL."
 
@@ -626,7 +627,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:226
+#: actions/register.php:218
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Пълното име е твърде дълго (макс. 255 знака)"
@@ -655,7 +656,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:235
+#: actions/register.php:227
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Името на местоположението е твърде дълго (макс. 255 знака)."
@@ -816,15 +817,15 @@ msgstr "Не сте абонирани за никого."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Имаше проблем със сесията ви в сайта. Моля, опитайте отново!"
@@ -856,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Неочаквано изпращане на форма."
@@ -902,19 +903,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Парола"
 
@@ -1037,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.
@@ -1215,25 +1217,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1400,7 +1403,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 "Грешка при добавяне на нов абонамент."
@@ -1506,9 +1509,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 "Потребителят няма профил."
 
@@ -1566,9 +1571,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
-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.
@@ -1628,7 +1634,7 @@ msgstr "Фон"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1666,7 +1672,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.
@@ -1683,9 +1690,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.
@@ -1851,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:440
+#: actions/recoverpassword.php:262 actions/register.php:426
 msgid "Confirm"
 msgstr "Потвърждаване"
 
@@ -1881,13 +1888,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Имаше проблем със сесията ви в сайта."
@@ -1908,12 +1915,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.
@@ -1969,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 "Да не се изтрива бележката"
 
 #. 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.
@@ -2016,12 +2025,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 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.
@@ -2056,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 "Да не се изтрива бележката"
 
 #. 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.
@@ -2236,22 +2247,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.
@@ -2284,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:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Няма такова приложение."
 
@@ -2575,7 +2584,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Неправилен адрес на е-поща."
@@ -2653,19 +2662,22 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 #, 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "Добавен е нов входящ адрес на е-поща."
 
@@ -2676,7 +2688,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.
@@ -2914,12 +2927,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.
@@ -3241,7 +3256,8 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Публикуване на MicroID за адреса в Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "Настройките са запазени."
 
@@ -3657,40 +3673,40 @@ msgstr "Запазване"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "Вече сте влезли."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "Грешно име или парола."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 actions/otp.php:120
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Забранено."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "Вход"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "Вход в сайта"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "Запомни ме"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Автоматично влизане занапред. Да не се ползва на общи компютри!"
 
-#: actions/login.php:269
+#: actions/login.php:259
 msgid "Lost or forgotten password?"
 msgstr "Загубена или забравена парола"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3698,12 +3714,12 @@ msgstr ""
 "За по-голяма сигурност, моля въведете отново потребителското си име и парола "
 "при промяна на настройките."
 
-#: actions/login.php:292
+#: actions/login.php:281
 #, fuzzy
 msgid "Login with your username and password."
 msgstr "Вход с име и парола"
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, fuzzy, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3915,31 +3931,31 @@ msgid "You have not registered any applications yet."
 msgstr "Не сте собственик на това приложение."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:70
 #, fuzzy
 msgid "Connected applications"
 msgstr "Изтриване на приложението"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3947,20 +3963,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, 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 "Потребителят няма профил."
@@ -3970,6 +3996,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
@@ -4062,17 +4098,21 @@ msgstr "Не е указана бележка."
 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 "Това е изходящата ви кутия с лични съобщения до други потребители."
 
@@ -4099,40 +4139,45 @@ msgstr "Стара парола"
 msgid "New password"
 msgstr "Нова парола"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+#, fuzzy
+msgid "6 or more characters."
 msgstr "6 или повече знака"
 
-#: 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:427
+#, fuzzy
+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:230
 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:233
 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
+#, fuzzy
+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 "Паролата е записана."
 
@@ -4468,7 +4513,7 @@ 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:109 actions/register.php:419
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "От 1 до 64 малки букви или цифри, без пунктоация и интервали"
@@ -4476,7 +4521,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:455
+#: actions/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4484,13 +4529,13 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "Адрес на личната ви страница, блог или профил в друг сайт"
@@ -4498,7 +4543,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:129 actions/register.php:457
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4506,28 +4551,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Къде се намирате (град, община, държава и т.н.)"
 
@@ -4547,7 +4593,8 @@ 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.
@@ -4557,7 +4604,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.
@@ -4572,8 +4620,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 ""
 "Автоматично абониране за всеки, който се абонира за мен (подходящо за "
 "ботове)."
@@ -4581,7 +4630,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:258 actions/register.php:221
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4601,9 +4650,9 @@ 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:291
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Неправилен етикет: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4836,6 +4885,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"
@@ -4847,12 +4902,6 @@ 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
@@ -4906,14 +4955,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:248
 msgid "Error setting user."
 msgstr "Грешка в настройките на потребителя."
 
@@ -4922,98 +4965,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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/register.php:99
+#: actions/register.php:94
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Грешка в кода за потвърждение."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "Записването е успешно."
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "Регистриране"
 
-#: actions/register.php:142
+#: actions/register.php:135
 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:201
+#, fuzzy
+msgid "You cannot register if you don't agree to the license."
 msgstr "Не можете да се регистрате, ако не сте съгласни с  лиценза."
 
-#: actions/register.php:218
+#: actions/register.php:210
 msgid "Email address already exists."
 msgstr "Адресът на е-поща вече се използва."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "Неправилно име или парола."
 
-#: actions/register.php:351
+#: actions/register.php:340
 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Е-поща"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, fuzzy
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "Използва се само за промени, обяви или възстановяване на паролата"
 
-#: actions/register.php:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "По-дълго име, за предпочитане \"истинското\" ви име."
 
-#: actions/register.php:462
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "Адрес на личната ви страница, блог или профил в друг сайт"
+#: actions/register.php:471
+#, fuzzy
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Къде се намирате (град, община, държава и т.н.)"
 
-#: actions/register.php:523
+#: actions/register.php:510
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:533
+#: actions/register.php:520
 #, 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:524
 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:527
 msgid "All rights reserved."
 msgstr "Всички права запазени."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:532
 #, 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:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5046,7 +5088,7 @@ msgstr ""
 "Благодарим, че се включихте в сайта и дано ползването на услугата ви носи "
 "само приятни мигове!"
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5079,7 +5121,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
@@ -5087,7 +5130,8 @@ msgid "Profile URL"
 msgstr "Адрес на профила"
 
 #: 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 "Адрес на профила ви в друга, съвместима услуга за микроблогване"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5097,7 +5141,8 @@ msgid "Subscribe"
 msgstr "Абониране"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)"
+#, fuzzy
+msgid "Invalid profile URL (bad format)."
 msgstr "Неправилен адрес на профил (грешен формат)"
 
 #: actions/remotesubscribe.php:167
@@ -5292,7 +5337,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"
 
@@ -5334,95 +5379,95 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Икона"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Име"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Организация"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Статистики"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:207
 #, fuzzy
 msgid "Application actions"
 msgstr "Данни за приложението"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Изтриване"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "Данни за приложението"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr ""
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 #, fuzzy
 msgid "Authorize URL"
 msgstr "Автор"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:302
 #, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Наистина ли искате да изтриете тази бележка?"
@@ -5508,16 +5553,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "Бележка"
 
@@ -5656,7 +5703,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"
@@ -5892,7 +5939,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.
@@ -5952,7 +6000,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.
@@ -6285,8 +6334,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Снимка"
@@ -6302,6 +6352,11 @@ 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."
@@ -6336,7 +6391,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’."
@@ -6367,7 +6422,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.
@@ -6434,56 +6489,70 @@ msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-msgid "Save user settings"
-msgstr ""
+#, fuzzy
+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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "Абониране за този потребител"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Охвърляне"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
 #, 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:248
 msgid "No authorization request!"
 msgstr "Няма заявка за одобрение."
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 msgid "Subscription authorized"
 msgstr "Абонаментът е одобрен"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 #, fuzzy
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
@@ -6493,11 +6562,12 @@ msgstr ""
 "Абонаментът е одобрен, но не е зададен callback URL. За да завършите "
 "одобряването, проверете инструкциите на сайта. Вашият token за абонамент е:"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:285
 msgid "Subscription rejected"
 msgstr "Абонаментът е отказан"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 #, fuzzy
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
@@ -6507,39 +6577,62 @@ 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:325
 #, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
-#: actions/userauthorization.php:308
-#, php-format
-msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
-
-#: actions/userauthorization.php:314
-#, php-format
-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
-#, php-format
-msgid "Avatar URL ‘%s’ is not valid."
-msgstr ""
-
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:332
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+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
+#, 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
+#, fuzzy, php-format
+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:392
 #, 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.
@@ -7763,6 +7856,11 @@ 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"
@@ -8191,6 +8289,11 @@ 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
@@ -8229,6 +8332,22 @@ 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
@@ -8337,7 +8456,6 @@ msgid "Grant this user the \"%s\" role"
 msgstr ""
 
 #: lib/groupeditform.php:147
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "От 1 до 64 малки букви или цифри, без пунктоация и интервали"
 
@@ -9018,6 +9136,10 @@ msgstr "Отговаряне на тази бележка"
 msgid "Reply"
 msgstr "Отговор"
 
+#: lib/noticelist.php:673
+msgid "Delete this notice"
+msgstr "Изтриване на бележката"
+
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Бележката е повторена."
@@ -9302,6 +9424,10 @@ 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"
@@ -9579,3 +9705,15 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "6 or more characters"
+#~ msgstr "6 или повече знака"
+
+#~ msgid "Same as password above"
+#~ msgstr "Също като паролата по-горе"
+
+#~ msgid "Can't save new password."
+#~ msgstr "Грешка при запазване на новата парола."
+
+#~ msgid "URL of your homepage, blog, or profile on another site"
+#~ msgstr "Адрес на личната ви страница, блог или профил в друг сайт"
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 307400d8ca..eb56630387 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:05:20+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27: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-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -155,7 +155,7 @@ msgstr "N'eus ket eus ar bajenn-se."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -511,7 +511,8 @@ 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
-msgid "Can't send direct messages to users who aren't your friend."
+#, fuzzy
+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."
@@ -599,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "Implijet eo dija al lesanv-se. Klaskit unan all."
 
@@ -609,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "N'eo ket ul lesanv mat."
 
@@ -622,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "N'eo ket chomlec'h al lec'hienn personel un URL reizh."
 
@@ -632,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:226
+#: actions/register.php:218
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Re hir eo an anv klok (255 arouezenn d'ar muiañ)."
 
@@ -660,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:235
+#: actions/register.php:227
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Re hir eo al lec'hiadur (255 arouezenn d'ar muiañ)."
 
@@ -816,15 +817,15 @@ msgstr "Aotreet eo bet ar jedouer reked dija."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: 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."
@@ -856,7 +857,7 @@ msgstr "Ur fazi 'zo bet en ur ensoc'hañ an avatar"
 #: 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/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Kinnig ar furmskrid dic'hortoz."
@@ -901,19 +902,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Ger-tremen"
 
@@ -1035,8 +1037,8 @@ 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
-#, php-format
-msgid "Unsupported format: %s"
+#, fuzzy, php-format
+msgid "Unsupported format: %s."
 msgstr "Diembreget eo ar furmad : %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1213,25 +1215,26 @@ 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:334
 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:345
 #, 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:379
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Klask alioù en danvez"
 
 #. 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."
@@ -1391,7 +1394,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."
@@ -1496,9 +1499,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."
 
@@ -1553,9 +1558,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
-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 "Diuzit ur zonenn gant ur stumm karrez evit tremeniñ ho avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1613,7 +1619,8 @@ msgstr "Eilenn savete"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+#, fuzzy
+msgid "Backup your account."
 msgstr "Saveteiñ ho kont"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1651,7 +1658,8 @@ msgstr "Ket"
 
 #. 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 "Arabat stankañ an implijer-mañ"
 
 #. TRANS: Button label on the user block form.
@@ -1668,9 +1676,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.
@@ -1830,7 +1838,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:426
 msgid "Confirm"
 msgstr "Kadarnaat"
 
@@ -1859,13 +1867,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h."
@@ -1886,12 +1894,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 "Arabat eo dilemel ar poellad-mañ"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-msgid "Delete this application"
+#, fuzzy
+msgid "Delete this application."
 msgstr "Dilemel ar poelad-se"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1942,12 +1952,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 "Arabat dilemel ar strollad-mañ"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-msgid "Delete this group"
+#, fuzzy
+msgid "Delete this group."
 msgstr "Dilemel ar strollad-mañ"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -1988,12 +2000,14 @@ 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
-msgid "Do not delete this notice"
+#, 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 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.
@@ -2026,13 +2040,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 "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.
@@ -2196,21 +2211,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.
@@ -2242,7 +2257,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ñ."
 
@@ -2524,7 +2539,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "N'eo ket ur chomlec'h postel reizh."
@@ -2598,19 +2613,22 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 #, fuzzy
 msgid "Could not update user record."
 msgstr "Dibosupl eo hizivaat doser 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "Ouzhpennet ez eus bet ur chomlec'h postel nevez o tont tre"
 
@@ -2621,7 +2639,8 @@ 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
-msgid "Disfavor favorite"
+#, fuzzy
+msgid "Disfavor favorite."
 msgstr "Tennañ ar pennroll"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2859,12 +2878,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ñ eus ar strollad."
 
 #. 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ñ eus ar strollad-se"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
@@ -3181,7 +3202,8 @@ 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.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "Penndibaboù enrollet"
 
@@ -3568,43 +3590,43 @@ msgstr "Enrollañ"
 msgid "Save license settings"
 msgstr "Enrollañ arventennoù an aotre-implijout"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "Kevreet oc'h dija."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "Anv implijer pe ger-tremen direizh."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 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:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "Kevreañ"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "Kevreañ d'al lec'hienn"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "Kaout soñj"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 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:259
 msgid "Lost or forgotten password?"
 msgstr "Ha kollet ho peus ho ker-tremen ?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3612,11 +3634,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:281
 msgid "Login with your username and password."
 msgstr "Kevreit gant ho anv implijer hag ho ker-tremen."
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3826,30 +3848,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:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr "Poeladoù kevreet."
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3857,20 +3879,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, 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."
@@ -3880,6 +3912,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
@@ -3976,17 +4018,21 @@ msgstr "Fichenn direizh."
 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 ""
 
@@ -4012,40 +4058,45 @@ msgstr "Ger-tremen kozh"
 msgid "New password"
 msgstr "Ger-tremen nevez"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+#, fuzzy
+msgid "6 or more characters."
 msgstr "6 arouezenn pe muioc'h"
 
-#: 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:427
+#, 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:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:230
 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:233
 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
-msgid "Can't save new password."
+#. 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."
 
-#. 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."
 
@@ -4385,7 +4436,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:433
+#: actions/profilesettings.php:109 actions/register.php:419
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
@@ -4393,7 +4444,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:455
+#: actions/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4401,13 +4452,13 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 #, 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"
@@ -4415,7 +4466,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:129 actions/register.php:457
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4423,28 +4474,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 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\""
 
@@ -4463,8 +4515,10 @@ msgstr "Balizennoù"
 
 #. 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 ""
 "Merkoù evidoc'h oc'h unan (lizherennoù, sifroù, -, ., ha _), dispartiet gant "
 "virgulennoù pe esaouennoù"
@@ -4476,7 +4530,8 @@ msgstr "Yezh"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-msgid "Preferred language"
+#, fuzzy
+msgid "Preferred language."
 msgstr "Yezh d'ober ganti da gentañ"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4491,8 +4546,9 @@ msgstr "Pehini eo gwerzhid-eur boaz ?"
 
 #. 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 ""
 "En em enskrivañ ez emgefre d'an holl re hag en em goumanant din (erbedet "
 "evit an implijerien nann-denel)"
@@ -4500,7 +4556,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:258 actions/register.php:221
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4520,9 +4576,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 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:291
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Balizenn direizh : \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4669,7 +4725,7 @@ msgstr ""
 
 #: actions/publictagcloud.php:146
 msgid "Tag cloud"
-msgstr "Koumoulenn merkoù"
+msgstr "Nivlennad tikedennoù"
 
 #. TRANS: Client error displayed trying to recover password while already logged in.
 #: actions/recoverpassword.php:37
@@ -4763,6 +4819,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"
@@ -4774,12 +4836,6 @@ 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
@@ -4832,14 +4888,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:248
 msgid "Error setting user."
 msgstr "Ur fazi 'zo bet e-pad kefluniadur an implijer."
 
@@ -4848,103 +4898,102 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 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:94
 msgid "Sorry, invalid invitation code."
 msgstr "Digarezit, kod pedadenn direizh."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "Krouet eo bet ar gont."
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "Krouiñ ur gont"
 
-#: actions/register.php:142
+#: actions/register.php:135
 msgid "Registration not allowed."
 msgstr "N'eo ket aotreet krouiñ kontoù."
 
-#: actions/register.php:209
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:201
+#, 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:218
+#: actions/register.php:210
 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:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "Anv implijer pe ger-tremen direizh."
 
-#: actions/register.php:351
+#: actions/register.php:340
 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Postel"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, 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:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Anv hiroc'h, ho anv \"gwir\" a zo gwelloc'h"
 
-#: actions/register.php:462
-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:471
+#, 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:523
+#: actions/register.php:510
 #, 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:520
 #, 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:524
 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:527
 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:532
 #, 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:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4963,7 +5012,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -4992,7 +5041,8 @@ msgid "User nickname"
 msgstr "Lesanv an implijer"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow"
+#, fuzzy
+msgid "Nickname of the user you want to follow."
 msgstr "Lesanv an implijer ho peus c'hoant heuliañ"
 
 #: actions/remotesubscribe.php:132
@@ -5000,7 +5050,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.
@@ -5010,7 +5060,8 @@ msgid "Subscribe"
 msgstr "En em enskrivañ"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)"
+#, fuzzy
+msgid "Invalid profile URL (bad format)."
 msgstr "URL direizh evit ar profil (furmad fall)"
 
 #: actions/remotesubscribe.php:167
@@ -5204,7 +5255,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"
 
@@ -5247,93 +5298,93 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Arlun"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 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
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Aozadur"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Stadegoù"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, 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:207
 msgid "Application actions"
 msgstr "Obererezhioù ar poellad"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 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
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Diverkañ"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "Titouroù ar poelad"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr "Alc'hwez implijer"
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr "Sekred an implijer"
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr "URL ar jedouer reked"
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr "URL ar jedouer moned"
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr "aotren an URL"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:302
 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 ?"
@@ -5419,16 +5470,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "Notenn"
 
@@ -5570,7 +5623,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"
@@ -5814,7 +5867,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 "Enrollañ ali ul lec'hienn"
 
 #. TRANS: Title for SMS settings.
@@ -5875,7 +5929,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.
@@ -6206,8 +6260,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Skeudenn"
@@ -6224,6 +6279,11 @@ 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."
@@ -6261,7 +6321,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’."
@@ -6294,7 +6354,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.
@@ -6359,102 +6419,143 @@ 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
-msgid "Save user settings"
+#, fuzzy
+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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, 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:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Disteurel"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+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:248
 msgid "No authorization request!"
 msgstr "Reked aotreañ ebet !"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 msgid "Subscription authorized"
 msgstr "Koumanant aotreet"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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:285
 msgid "Subscription rejected"
 msgstr "Koumanant bet nac'het"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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
-#, 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:325
+#, fuzzy, php-format
+msgid "Listener URI \"%s\" not found here."
 msgstr "N'eo ket bet kavet amañ URI ar selaouer \"%s\"."
 
-#: actions/userauthorization.php:308
-#, 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:332
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is too long."
 msgstr "Re hir eo an URI \"%s\" ez oc'h koumanantet dezhi."
 
-#: actions/userauthorization.php:314
-#, 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:340
+#, 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."
 
-#: actions/userauthorization.php:329
-#, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
+#: actions/userauthorization.php:358
+#, fuzzy, php-format
+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
-#, 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:368
+#, 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."
 msgstr "N'eo ket reizh URL an avatar \"%s\"."
 
-#: actions/userauthorization.php:350
-#, 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:385
+#, fuzzy, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Dibosupl eo lenn URL an avatar \"%s\"."
 
-#: actions/userauthorization.php:355
-#, 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:392
+#, 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.
@@ -7640,6 +7741,11 @@ 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"
@@ -8071,6 +8177,11 @@ 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
@@ -8105,6 +8216,21 @@ 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
@@ -8214,7 +8340,6 @@ msgid "Grant this user the \"%s\" role"
 msgstr ""
 
 #: lib/groupeditform.php:147
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
 
@@ -8894,6 +9019,10 @@ 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"
@@ -9179,6 +9308,10 @@ 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"
@@ -9456,3 +9589,15 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "6 or more characters"
+#~ msgstr "6 arouezenn pe muioc'h"
+
+#~ msgid "Same as password above"
+#~ msgstr "Memestra eget ar ger tremen a-us"
+
+#~ msgid "Can't save new password."
+#~ msgstr "Dibosupl eo enrollañ ar ger-tremen nevez."
+
+#~ 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"
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index aa29515d86..eef3ab2ee3 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:05:23+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27: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-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -160,7 +160,7 @@ msgstr "No existeix la pàgina."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -524,7 +524,8 @@ 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 "Can't send direct messages to users who aren't your friend."
+#, fuzzy
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "No es pot enviar missatges directes a usuaris que no siguin els vostres "
 "amics."
@@ -609,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "Aquest sobrenom ja existeix. Prova un altre. "
 
@@ -619,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "Sobrenom no vàlid."
 
@@ -632,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "La pàgina personal no és un URL vàlid."
 
@@ -642,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:226
+#: actions/register.php:218
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "El vostre nom sencer és massa llarg (màx. 255 caràcters)."
 
@@ -670,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:235
+#: actions/register.php:227
 msgid "Location is too long (maximum 255 characters)."
 msgstr "La localització és massa llarga (màx. 255 caràcters)."
 
@@ -825,15 +826,15 @@ msgstr "El testimoni de sol·licitud ja està autoritzat."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -866,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Enviament de formulari inesperat."
@@ -917,19 +918,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Contrasenya"
 
@@ -1050,8 +1052,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
-#, php-format
-msgid "Unsupported format: %s"
+#, fuzzy, php-format
+msgid "Unsupported format: %s."
 msgstr "Format no permès: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1227,25 +1229,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1400,7 +1403,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."
 
@@ -1428,9 +1431,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "People %1$s has subscribed to on %2$s"
-msgstr "Gent subscrita a %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
@@ -1504,9 +1507,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"
 
@@ -1561,9 +1566,10 @@ 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
-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 ""
 "Selecciona un quadrat de l'àrea de la imatge que vols que sigui el teu "
 "avatar."
@@ -1631,7 +1637,8 @@ msgstr "Còpia de seguretat"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+#, fuzzy
+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.
@@ -1672,7 +1679,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 bloquis l'usuari"
 
 #. TRANS: Button label on the user block form.
@@ -1689,9 +1697,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 "Bloca aquest usuari"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1854,7 +1862,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:426
 msgid "Confirm"
 msgstr "Confirma"
 
@@ -1883,13 +1891,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "S'ha produït un problema amb el testimoni de la vostra sessió."
@@ -1913,12 +1921,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 "No eliminis l'aplicació"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-msgid "Delete this application"
+#, fuzzy
+msgid "Delete this application."
 msgstr "Elimina aquesta aplicació"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1972,12 +1982,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 "No eliminis aquest grup"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-msgid "Delete this group"
+#, fuzzy
+msgid "Delete this group."
 msgstr "Elimina aquest grup"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2020,12 +2032,14 @@ 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"
+#, fuzzy
+msgid "Do not delete this notice."
 msgstr "No eliminis aquest avís"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+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.
@@ -2060,13 +2074,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 eliminis aquest 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"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "Elimina l'usuari"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2229,21 +2244,21 @@ 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"
+#: actions/designadminpanel.php:720
+#, fuzzy
+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"
+#: actions/designadminpanel.php:728
+#, fuzzy
+msgid "Reset back to default."
 msgstr "Torna a restaurar al valor 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"
+#: actions/designadminpanel.php:736
+#, fuzzy
+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.
@@ -2275,7 +2290,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ó."
 
@@ -2557,7 +2572,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Adreça de correu electrònic no vàlida."
@@ -2632,18 +2647,21 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "Nou correu electrònic entrant afegit."
 
@@ -2654,7 +2672,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
-msgid "Disfavor favorite"
+#, fuzzy
+msgid "Disfavor favorite."
 msgstr "Fes que deixi de ser preferit"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2894,12 +2913,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 "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"
+#, fuzzy
+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.
@@ -2933,9 +2954,8 @@ 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 "No s'han pogut desar els paràmetres de disseny."
+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
@@ -3044,7 +3064,6 @@ msgstr "Actualitzacions dels membres de %1$s el %2$s!"
 
 #. TRANS: Title for first page of the groups list.
 #: actions/groups.php:62
-#, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "Grups"
@@ -3052,7 +3071,7 @@ msgstr "Grups"
 #. 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
+#, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
 msgstr "Grups, pàgina %d"
@@ -3061,7 +3080,7 @@ msgstr "Grups, pàgina %d"
 #. 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
+#, 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 "
@@ -3073,7 +3092,7 @@ msgstr ""
 "d'interessos semblants. Després d'unir-vos a un grup, podeu enviar missatges "
 "a altres membres emprant la sintaxi «!groupname». No veieu cap grup que us "
 "agradi? Proveu de [cercar-ne un](%%%%action.groupsearch%%%%) o [comenceu-ne "
-"un de propi!](%%%%action.newgroup%%%%)"
+"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
@@ -3104,7 +3123,7 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "If you cannot find the group you're looking for, you can [create it](%%"
 "action.newgroup%%) yourself."
@@ -3147,7 +3166,7 @@ msgstr "Paràmetres de missatgeria instantània"
 #. 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
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can send and receive notices through Jabber/Google Talk [instant "
 "messages](%%doc.im%%). Configure your address and settings below."
@@ -3167,21 +3186,20 @@ msgid "IM address"
 msgstr "Adreça de missatgeria instantània"
 
 #: actions/imsettings.php:109
-#, fuzzy
 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
-#, 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 ""
-"A l'espera d'una confirmació per a aquesta adreça. Busca al teu compte "
-"Jabber/GTalk un missatge amb més instruccions. (Has afegit a %s a la teva "
-"llista d'amics?)"
+"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.
@@ -3189,7 +3207,7 @@ 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."
@@ -3205,19 +3223,16 @@ msgstr "Preferències de MI"
 
 #. TRANS: Checkbox label in Instant Messaging preferences form.
 #: actions/imsettings.php:159
-#, fuzzy
 msgid "Send me notices through Jabber/Google Talk."
 msgstr "Envia'm avisos per Jabber/GTalk."
 
 #. 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 "Envia'm un avís quan el meu estat Jabber/GTalk canvii."
+msgstr "Envia un avís quan el meu estat Jabber/GTalk canviï."
 
 #. 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 ""
@@ -3226,12 +3241,12 @@ 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 "Publica una MicroID per al meu compte de Jabber/GTalk."
+msgstr "Publica una MicroID per a la meva adreça de Jabber/GTalk."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "S'han desat les preferències."
 
@@ -3242,15 +3257,13 @@ msgstr "Cap 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 "Impossible normalitzar aquest Jabber ID"
+msgstr "No es pot normalitzar aquest 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 no vàlid"
+msgstr "No és un ID de Jabber vàlid."
 
 #. TRANS: Message given saving Instant Messaging address that is already set.
 #: actions/imsettings.php:321
@@ -3413,9 +3426,8 @@ msgstr "Adreces de correu electrònic"
 
 #. 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 "Adreces d'amics per convidar (una per línia)"
+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
@@ -3647,43 +3659,43 @@ 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
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "Ja hi heu iniciat una sessió."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "Nom d'usuari o contrasenya incorrectes."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 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:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "Inici de sessió"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "Accedir al lloc"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "Recorda'm"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 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:259
 msgid "Lost or forgotten password?"
 msgstr "Contrasenya oblidada o perduda?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3691,11 +3703,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:281
 msgid "Login with your username and password."
 msgstr "Inicieu una sessió amb nom d'usuari i contrasenya"
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3905,30 +3917,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:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr "Aplicacions connectades"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3938,14 +3950,14 @@ msgstr ""
 "2$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -3954,6 +3966,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
+#, 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."
@@ -3963,6 +3985,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
+#, 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
@@ -4053,17 +4085,21 @@ msgstr "No s'ha especificat un testimoni d'inici de sessió vàlid."
 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 "
@@ -4091,40 +4127,42 @@ msgstr "Antiga contrasenya"
 msgid "New password"
 msgstr "Nova contrasenya"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
-msgstr "6 o més caràcters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+msgid "6 or more characters."
+msgstr "6 o més caràcters."
 
-#: actions/passwordsettings.php:113
-msgid "Same as password above"
-msgstr "Igual a la contrasenya de dalt"
+#. 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."
+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:230
 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:233
 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
-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."
 
@@ -4451,7 +4489,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:433
+#: actions/profilesettings.php:109 actions/register.php:419
 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."
@@ -4459,7 +4497,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:455
+#: actions/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4467,20 +4505,20 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 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:129 actions/register.php:457
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4488,28 +4526,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "On us trobeu, per exemple «ciutat, comarca (o illa), país»"
 
@@ -4528,8 +4567,10 @@ msgstr "Etiquetes"
 
 #. 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 ""
 "Etiquetes pròpies (lletres, nombres, -, ., i _), per comes o separades amb "
 "espais"
@@ -4541,7 +4582,8 @@ msgstr "Llengua"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-msgid "Preferred language"
+#, fuzzy
+msgid "Preferred language."
 msgstr "Llengua preferida"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4556,8 +4598,9 @@ msgstr "En quin fus horari us trobeu normalment?"
 
 #. 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 ""
 "Subscripció automàtica a qualsevol qui em tingui subscrit (ideal per no-"
 "humans)"
@@ -4565,7 +4608,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:258 actions/register.php:221
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4584,9 +4627,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 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:291
+#, fuzzy, 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
@@ -4829,6 +4872,12 @@ 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"
@@ -4839,11 +4888,6 @@ 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
@@ -4895,13 +4939,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:248
 msgid "Error setting user."
 msgstr "Error en configurar l'usuari."
 
@@ -4910,93 +4949,94 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 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:94
 msgid "Sorry, invalid invitation code."
 msgstr "El codi d'invitació no és vàlid."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "Registre satisfactori"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "Registre"
 
-#: actions/register.php:142
+#: actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Registre no permès."
 
-#: actions/register.php:209
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:201
+#, 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."
 
-#: actions/register.php:218
+#: actions/register.php:210
 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:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "El nom d'usuari o la contrasenya no són vàlids."
 
-#: actions/register.php:351
+#: actions/register.php:340
+#, 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. "
 
-#: 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, fuzzy
+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
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Nom llarg, preferiblement el vostre nom «real»"
 
-#: actions/register.php:462
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL del teu web, blog o perfil en un altre lloc"
+#: actions/register.php:471
+#, fuzzy
+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:510
 #, 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:520
 #, 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:524
 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:527
 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:532
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5006,7 +5046,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:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5039,7 +5079,7 @@ msgstr ""
 "\n"
 "Gràcies per registrar-vos-hi i esperem que en gaudiu."
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5072,7 +5112,8 @@ msgid "User nickname"
 msgstr "Sobrenom de l'usuari"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow"
+#, fuzzy
+msgid "Nickname of the user you want to follow."
 msgstr "Sobrenom de l'usuari que vols seguir"
 
 #: actions/remotesubscribe.php:132
@@ -5080,7 +5121,8 @@ msgid "Profile URL"
 msgstr "URL del perfil"
 
 #: 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 del teu perfil en un altre servei de microblogging compatible"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5090,7 +5132,8 @@ msgid "Subscribe"
 msgstr "Subscriu-m'hi"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)"
+#, fuzzy
+msgid "Invalid profile URL (bad format)."
 msgstr "L'URL del perfil és invàlid (format incorrecte)"
 
 #: actions/remotesubscribe.php:167
@@ -5290,7 +5333,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"
 
@@ -5332,87 +5375,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: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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icona"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 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
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organització"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Estadístiques"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, 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:207
 msgid "Application actions"
 msgstr "Accions d'aplicació"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 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
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Elimina"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "Informació de l'aplicació"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr "Clau del consumidor"
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr "Secreta del consumidor"
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr "Sol·licita l'URL del testimoni"
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr "Accedeix a l'URL del testimoni"
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr "Autoritza l'URL"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5420,7 +5463,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:302
 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?"
@@ -5512,16 +5555,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "Avisos"
 
@@ -5667,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"
@@ -5917,7 +5962,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
-msgid "Save site notice"
+#, fuzzy
+msgid "Save site notice."
 msgstr "Desa l'avís per a tot el lloc"
 
 #. TRANS: Title for SMS settings.
@@ -5977,7 +6023,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
-msgid "Phone number, no punctuation or spaces, with area code"
+#, 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"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6314,8 +6361,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
@@ -6332,6 +6380,11 @@ 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."
@@ -6369,7 +6422,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’."
@@ -6402,8 +6455,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 "La subscripció per defecte no és vàlida: «%1$s» no és cap usuari."
 
 #. TRANS: Link description in user account settings menu.
@@ -6463,55 +6516,71 @@ 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"
+#, fuzzy
+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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Llicència"
 
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:229
+#, fuzzy
+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:231
+#, fuzzy
+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:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rebutja"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+msgid "Reject this subscription."
 msgstr "Rebutja la subscripció"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:248
 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:271
 msgid "Subscription authorized"
 msgstr "Subscripció autoritzada"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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 +6590,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:285
 msgid "Subscription rejected"
 msgstr "Subscripció rebutjada"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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,39 +6605,64 @@ msgstr ""
 "retorn. Reviseu les instruccions del lloc per tal de tenir més detalls de "
 "com rebutjar la subscripció completament."
 
-#: actions/userauthorization.php:303
-#, 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:325
+#, fuzzy, php-format
+msgid "Listener URI \"%s\" not found here."
 msgstr "No s'hi ha trobat l'URI de qui us escolta, «%s»."
 
-#: actions/userauthorization.php:308
-#, 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:332
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is too long."
 msgstr "L'URI de qui escolteu, «%s», és massa llarga."
 
-#: actions/userauthorization.php:314
-#, 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:340
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "L'URI de qui escolteu, «%s», és un usuari local."
 
-#: actions/userauthorization.php:329
-#, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
+#: actions/userauthorization.php:358
+#, 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."
 
-#: actions/userauthorization.php:345
-#, 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:368
+#, 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."
 msgstr "L'URL de l'avatar «%s» no és vàlid."
 
-#: actions/userauthorization.php:350
-#, 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:385
+#, fuzzy, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "No es pot llegir l'URL de l'avatar «%s»."
 
-#: actions/userauthorization.php:355
-#, 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:392
+#, fuzzy, 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.
@@ -7421,7 +7516,7 @@ msgstr "L'usuari ja és membre d'aquest grup."
 #: lib/activityimporter.php:201
 #, php-format
 msgid "Already know about notice %1$s and  it has a different author %2$s."
-msgstr ""
+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
@@ -7784,6 +7879,11 @@ 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"
@@ -8239,6 +8339,11 @@ 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
@@ -8275,6 +8380,21 @@ 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
@@ -8379,7 +8499,6 @@ msgid "Grant this user the \"%s\" role"
 msgstr "Atorga a l'usuari el rol «%s»"
 
 #: lib/groupeditform.php:147
-#, fuzzy
 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."
@@ -8393,11 +8512,11 @@ msgid "Describe the group or topic"
 msgstr "Descriviu el grup o la temàtica"
 
 #: lib/groupeditform.php:163
-#, fuzzy, php-format
+#, 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 o menys."
-msgstr[1] "Descriviu el grup o la temàtica en %d caràcters o menys."
+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 ""
@@ -9048,9 +9167,8 @@ msgid "Send"
 msgstr "Envia"
 
 #: lib/messagelist.php:77
-#, fuzzy
 msgid "Messages"
-msgstr "Missatge"
+msgstr "Missatges"
 
 #: lib/messagelistitem.php:123 lib/noticelist.php:522
 msgid "from"
@@ -9158,6 +9276,10 @@ 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"
@@ -9433,6 +9555,10 @@ 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"
@@ -9705,3 +9831,15 @@ 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 "6 or more characters"
+#~ msgstr "6 o més caràcters"
+
+#~ msgid "Same as password above"
+#~ msgstr "Igual a la contrasenya de dalt"
+
+#~ msgid "Can't save new password."
+#~ msgstr "No es pot desar la nova contrasenya."
+
+#~ msgid "URL of your homepage, blog, or profile on another site"
+#~ msgstr "URL del teu web, blog o perfil en un altre lloc"
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index fc84189c16..acfd4bc67e 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:05:25+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27:05+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 (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -154,7 +154,7 @@ msgstr "Tady žádná taková stránka není."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -521,7 +521,8 @@ 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
-msgid "Can't send direct messages to users who aren't your friend."
+#, 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).
@@ -606,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "Přezdívku již někdo používá. Zkuste jinou."
 
@@ -616,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "Není platnou přezdívkou."
 
@@ -629,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "Domovská stránka není platná URL."
 
@@ -639,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:226
+#: actions/register.php:218
 #, 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,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:235
+#: actions/register.php:227
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Umístění je příliš dlouhé (maximálně 255 znaků)."
@@ -829,15 +830,15 @@ msgstr "Nejste autorizován."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: 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."
@@ -869,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Nečekaný požadavek."
@@ -921,19 +922,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Heslo"
 
@@ -1057,7 +1059,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.
@@ -1237,25 +1239,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1423,7 +1426,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"
@@ -1528,9 +1531,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."
 
@@ -1588,9 +1593,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
-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 "Vyberte čtvercovou plochu obrázku, která bude váš avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1650,7 +1656,7 @@ msgstr "Pozadí"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1691,7 +1697,8 @@ msgstr "Poznámka"
 
 #. 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 "Zablokovat tohoto uživatele"
 
 #. TRANS: Button label on the user block form.
@@ -1708,9 +1715,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.
@@ -1875,7 +1882,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:426
 msgid "Confirm"
 msgstr "Potvrdit"
 
@@ -1905,13 +1912,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Nastal problém s vaším session tokenem."
@@ -1934,12 +1941,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 "Neodstraňujte tuto aplikaci"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-msgid "Delete this application"
+#, fuzzy
+msgid "Delete this application."
 msgstr "Odstranit tuto aplikaci"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1997,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 "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.
@@ -2046,12 +2055,14 @@ msgstr "Jste si jisti, že chcete smazat tohoto oznámení?"
 
 #. 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 "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.
@@ -2088,13 +2099,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.
-#. 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.
@@ -2261,21 +2272,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.
@@ -2307,7 +2318,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."
 
@@ -2588,7 +2599,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Není platnou mailovou adresou."
@@ -2665,19 +2676,22 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 #, 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "Přidána nová příchozí e-mailová adresa."
 
@@ -2688,7 +2702,8 @@ 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
-msgid "Disfavor favorite"
+#, fuzzy
+msgid "Disfavor favorite."
 msgstr "Znemilostnit oblíbenou"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2928,12 +2943,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 "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
-msgid "Block this user from this group"
+#, 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.
@@ -3263,7 +3280,8 @@ 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.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "Nastavení uloženo"
 
@@ -3681,40 +3699,40 @@ msgstr "Uložit"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "Již přihlášen"
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "Neplatné jméno nebo heslo"
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 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:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "Přihlásit"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "Přihlásit se na stránky"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "Zapamatuj si mě"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 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:259
 msgid "Lost or forgotten password?"
 msgstr "Ztracené nebo zapomenuté heslo?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3722,11 +3740,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:281
 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:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3939,30 +3957,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:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr "Propojené aplikace"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3970,20 +3988,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, 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."
@@ -3993,6 +4021,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
@@ -4083,17 +4121,21 @@ msgstr "Neplatný přihlašovací token."
 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 "
@@ -4121,40 +4163,45 @@ msgstr "Staré heslo"
 msgid "New password"
 msgstr "Nové heslo"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+#, fuzzy
+msgid "6 or more characters."
 msgstr "6 a více znaků"
 
-#: 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:427
+#, fuzzy
+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:230
 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:233
 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
-msgid "Can't save new password."
+#. 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"
 
-#. 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"
 
@@ -4497,7 +4544,7 @@ 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:109 actions/register.php:419
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer"
@@ -4505,7 +4552,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:455
+#: actions/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4513,13 +4560,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:460
+#: actions/profilesettings.php:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 #, 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."
@@ -4527,7 +4574,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:129 actions/register.php:457
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4536,28 +4583,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Místo. Město, stát."
 
@@ -4576,8 +4624,10 @@ msgstr "Tagy"
 
 #. 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 "Otagujte se (písmena, čísla, -, . a _), oddělené čárkami nebo mezerami"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4587,7 +4637,8 @@ msgstr "Jazyk"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-msgid "Preferred language"
+#, fuzzy
+msgid "Preferred language."
 msgstr "Preferovaný jazyk"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4602,8 +4653,9 @@ msgstr "V jaké časové zóně se obyčejně nacházíte?"
 
 #. 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 ""
 "Automaticky se přihlásit k odběru toho kdo se přihlásil ke mně (nejlepší pro "
 "ne-lidi)"
@@ -4611,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:258 actions/register.php:221
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4632,9 +4684,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 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:291
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Neplatná velikost"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4875,6 +4927,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"
@@ -4886,12 +4944,6 @@ 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
@@ -4945,14 +4997,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:248
 msgid "Error setting user."
 msgstr "Chyba nastavení uživatele"
 
@@ -4961,92 +5007,92 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr "Litujeme, jen pozvaní se mohou registrovat."
 
-#: actions/register.php:99
+#: actions/register.php:94
 msgid "Sorry, invalid invitation code."
 msgstr "Litujeme, neplatný kód pozvánky."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "Registrace úspěšná"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "Registrovat"
 
-#: actions/register.php:142
+#: actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Registrace není povolena."
 
-#: actions/register.php:209
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:201
+#, 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:218
+#: actions/register.php:210
 msgid "Email address already exists."
 msgstr "Emailová adresa již existuje"
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "Neplatné jméno nebo heslo"
 
-#: actions/register.php:351
+#: actions/register.php:340
+#, 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Email"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, 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:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Delší jméno, nejlépe vaše \"skutečné\" jméno"
 
-#: actions/register.php:462
-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:471
+#, fuzzy
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Místo. Město, stát."
 
-#: actions/register.php:523
+#: actions/register.php:510
 #, 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:520
 #, 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:524
 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:527
 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:532
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5055,7 +5101,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:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5088,7 +5134,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:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5120,7 +5166,8 @@ msgid "User nickname"
 msgstr "Přezdívka uživatele"
 
 #: 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řezdívka uživatele, kterého chcete sledovat"
 
 #: actions/remotesubscribe.php:132
@@ -5128,7 +5175,8 @@ msgid "Profile URL"
 msgstr "Adresa Profilu"
 
 #: 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 "Adresa profilu na jiných kompatibilních mikroblozích."
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5138,7 +5186,8 @@ msgid "Subscribe"
 msgstr "Odebírat"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)"
+#, fuzzy
+msgid "Invalid profile URL (bad format)."
 msgstr "Neplatná adresa profilu (špatný formát)"
 
 #: actions/remotesubscribe.php:167
@@ -5341,7 +5390,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"
 
@@ -5383,94 +5432,94 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ikona"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 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
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organizace"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistiky"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, 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:207
 msgid "Application actions"
 msgstr "Akce aplikace"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 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
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Odstranit"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "Info o aplikaci"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr "Spotřebitelský klíč"
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr "Spotřebitelské tajemství"
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr "Adresa řetězce požadavku"
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr "URL Access tokenu"
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr "Authorizační URL"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 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:302
 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í?"
@@ -5563,16 +5612,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "Poznámka"
 
@@ -5719,7 +5770,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"
@@ -5965,7 +6016,8 @@ 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
-msgid "Save site notice"
+#, fuzzy
+msgid "Save site notice."
 msgstr "Uložit oznámení stránky"
 
 #. TRANS: Title for SMS settings.
@@ -6023,7 +6075,8 @@ msgstr "SMS telefonní číslo"
 
 #. 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 "Telefonní číslo, Nepoužívej interpunkci nebo mezery, s předčíslím"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6360,8 +6413,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Fotka"
@@ -6378,6 +6432,11 @@ 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."
@@ -6415,7 +6474,7 @@ 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’."
@@ -6448,7 +6507,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.
@@ -6509,55 +6568,71 @@ 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
-msgid "Save user settings"
-msgstr ""
+#, fuzzy
+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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, 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:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Odmítnout"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+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:248
 msgid "No authorization request!"
 msgstr "Žádná žádost o autorizaci!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 msgid "Subscription authorized"
 msgstr "Odběr autorizován"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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 +6642,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:285
 msgid "Subscription rejected"
 msgstr "Odběr odmítnut"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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,39 +6656,63 @@ 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
-#, 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:325
+#, fuzzy, php-format
+msgid "Listener URI \"%s\" not found here."
 msgstr "Naslouchací URI ‘%s’ zde nebyl nalezen."
 
-#: actions/userauthorization.php:308
-#, 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:332
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is too long."
 msgstr "Naslouchací URI ‘%s’ je příliš dlouhý."
 
-#: actions/userauthorization.php:314
-#, 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:340
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "Naslouchací URI ‘%s’ je místní uživatel."
 
-#: actions/userauthorization.php:329
-#, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
+#: actions/userauthorization.php:358
+#, fuzzy, php-format
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "URL profilu '%s' je pro místního uživatele."
 
-#: actions/userauthorization.php:345
-#, 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:368
+#, 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."
 msgstr "URL avataru ‘%s’ není platný."
 
-#: actions/userauthorization.php:350
-#, 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:385
+#, fuzzy, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Nelze načíst avatara z URL '%s'"
 
-#: actions/userauthorization.php:355
-#, 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:392
+#, 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.
@@ -7827,6 +7927,11 @@ 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"
@@ -8287,6 +8392,11 @@ 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
@@ -8325,6 +8435,21 @@ 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
@@ -8432,7 +8557,6 @@ msgid "Grant this user the \"%s\" role"
 msgstr "Dát tomuto uživateli roli \"%s\""
 
 #: lib/groupeditform.php:147
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 znaků nebo čísel, bez teček, čárek a mezer"
 
@@ -9212,6 +9336,10 @@ 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"
@@ -9493,6 +9621,10 @@ 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"
@@ -9773,3 +9905,15 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "6 or more characters"
+#~ msgstr "6 a více znaků"
+
+#~ msgid "Same as password above"
+#~ msgstr "Stejné jako heslo výše"
+
+#~ msgid "Can't save new password."
+#~ msgstr "Nelze uložit nové heslo"
+
+#~ 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."
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 791799f3d1..ad4bd485ef 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:05:27+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27: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-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -163,7 +163,7 @@ msgstr "Seite nicht vorhanden"
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -529,7 +529,8 @@ 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
-msgid "Can't send direct messages to users who aren't your friend."
+#, 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 "
 "du nicht befreundet bist."
@@ -616,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
 
@@ -626,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "Ungültiger Benutzername."
 
@@ -639,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr ""
 "Homepage ist keine gültige URL. URLs müssen ein Präfix wie http enthalten."
@@ -650,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:226
+#: actions/register.php:218
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Der bürgerliche Name ist zu lang (maximal 255 Zeichen)."
 
@@ -678,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:235
+#: actions/register.php:227
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
 
@@ -833,15 +834,15 @@ msgstr "Anfrage-Token bereits autorisiert."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: 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."
@@ -872,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Unerwartete Formulareingabe."
@@ -923,19 +924,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Passwort"
 
@@ -1057,8 +1059,8 @@ 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
-#, php-format
-msgid "Unsupported format: %s"
+#, fuzzy, php-format
+msgid "Unsupported format: %s."
 msgstr "Nicht unterstütztes Bildformat: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1240,25 +1242,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1419,7 +1422,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."
@@ -1525,9 +1528,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"
 
@@ -1582,9 +1587,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
-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 ""
 "Wähle eine quadratische Fläche aus dem Bild, um dein Avatar zu speichern"
 
@@ -1644,8 +1650,9 @@ msgstr "Backup"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
-msgstr ""
+#, 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
@@ -1685,7 +1692,8 @@ msgstr "Nein"
 
 #. 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 "Diesen Benutzer freigeben"
 
 #. TRANS: Button label on the user block form.
@@ -1702,9 +1710,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 "Diesen Benutzer blockieren"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1864,7 +1872,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:426
 msgid "Confirm"
 msgstr "Bestätigen"
 
@@ -1894,13 +1902,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Es gab ein Problem mit deinem Sessiontoken."
@@ -1923,12 +1931,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 "Dieses Programm nicht löschen"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-msgid "Delete this application"
+#, fuzzy
+msgid "Delete this application."
 msgstr "Programm löschen"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1982,12 +1992,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 "Diese Gruppe nicht löschen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-msgid "Delete this group"
+#, fuzzy
+msgid "Delete this group."
 msgstr "Diese Gruppe löschen"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2030,12 +2042,14 @@ 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
-msgid "Do not delete this notice"
+#, 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 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.
@@ -2070,13 +2084,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 "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.
@@ -2241,21 +2256,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.
@@ -2287,7 +2302,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."
 
@@ -2571,7 +2586,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Ungültige E-Mail-Adresse."
@@ -2648,19 +2663,22 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 #, 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "Neue Eingangs-E-Mail-Adresse hinzugefügt."
 
@@ -2671,7 +2689,8 @@ msgstr "Diese Nachricht ist bereits ein Favorit!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-msgid "Disfavor favorite"
+#, fuzzy
+msgid "Disfavor favorite."
 msgstr "Aus Favoriten entfernen"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2912,12 +2931,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 "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
-msgid "Block this user from this group"
+#, 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.
@@ -3251,7 +3272,8 @@ 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.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "Einstellungen gesichert."
 
@@ -3671,40 +3693,40 @@ msgstr "Speichern"
 msgid "Save license settings"
 msgstr "Lizenz-Einstellungen speichern"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "Bereits angemeldet."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "Falscher Benutzername oder Passwort."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 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:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "Anmelden"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "An Seite anmelden"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "Anmeldedaten merken"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 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:259
 msgid "Lost or forgotten password?"
 msgstr "Passwort vergessen?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3712,11 +3734,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:281
 msgid "Login with your username and password."
 msgstr "Mit Benutzernamen und Passwort anmelden."
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3930,31 +3952,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:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr "Verbundene Programme"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3963,7 +3985,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:211
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 "Du hast noch keinem Programm die Erlaubnis gegeben, dein Profil zu benutzen."
@@ -3971,7 +3993,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:231
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -3980,6 +4002,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"
@@ -3989,6 +4021,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
@@ -4078,17 +4120,21 @@ msgstr "Login-Token ungültig oder abgelaufen."
 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."
@@ -4115,40 +4161,43 @@ msgstr "Altes Passwort"
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+msgid "6 or more characters."
 msgstr "6 oder mehr Zeichen"
 
-#: 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:427
+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:230
 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:233
 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
-msgid "Can't save new password."
+#. 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"
 
-#. 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."
 
@@ -4476,14 +4525,14 @@ 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:109 actions/register.php:419
 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/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4491,13 +4540,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:460
+#: actions/profilesettings.php:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
 "URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen "
@@ -4506,7 +4555,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:129 actions/register.php:457
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4514,28 +4563,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Wo du bist, beispielsweise „Stadt, Region, Land“"
 
@@ -4554,8 +4604,10 @@ msgstr "Tags"
 
 #. 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 ""
 "Tags über dich selbst (Buchstaben, Zahlen, -, ., und _) durch Kommas oder "
 "Leerzeichen getrennt"
@@ -4567,7 +4619,8 @@ msgstr "Sprache"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-msgid "Preferred language"
+#, fuzzy
+msgid "Preferred language."
 msgstr "Bevorzugte Sprache"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4582,8 +4635,9 @@ msgstr "In welcher Zeitzone befindest du dich üblicherweise?"
 
 #. 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 ""
 "Abonniere automatisch alle Kontakte, die mich abonnieren (sinnvoll für Nicht-"
 "Menschen)"
@@ -4591,7 +4645,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:258 actions/register.php:221
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4610,9 +4664,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 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:291
+#, 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
@@ -4859,6 +4913,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"
@@ -4870,11 +4930,6 @@ 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
@@ -4926,14 +4981,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:248
 msgid "Error setting user."
 msgstr "Fehler bei den Benutzereinstellungen."
 
@@ -4942,97 +4991,96 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 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:94
 msgid "Sorry, invalid invitation code."
 msgstr "Entschuldigung, ungültiger Einladungscode."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "Registrierung erfolgreich"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "Registrieren"
 
-#: actions/register.php:142
+#: actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Registrierung nicht erlaubt."
 
-#: actions/register.php:209
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:201
+#, 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:218
+#: actions/register.php:210
 msgid "Email address already exists."
 msgstr "Diese E-Mail-Adresse existiert bereits."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "Benutzername oder Passwort falsch."
 
-#: actions/register.php:351
+#: actions/register.php:340
+#, 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-Mail"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, 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:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Längerer Name, bevorzugt dein bürgerlicher Name"
 
-#: actions/register.php:462
-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:471
+#, fuzzy
+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:510
 #, 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:520
 #, 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:524
 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:527
 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:532
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5041,7 +5089,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:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5074,7 +5122,7 @@ msgstr ""
 "\n"
 "Danke für deine Anmeldung, wir hoffen, dass dir der Service gefällt."
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5107,7 +5155,8 @@ msgid "User nickname"
 msgstr "Benutzername"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow"
+#, fuzzy
+msgid "Nickname of the user you want to follow."
 msgstr "Name des Benutzers, dem du folgen möchtest"
 
 #: actions/remotesubscribe.php:132
@@ -5115,7 +5164,8 @@ msgid "Profile URL"
 msgstr "Profil-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 "Profil-URL bei einem anderen kompatiblen Mikrobloggingdienst"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5125,7 +5175,8 @@ msgid "Subscribe"
 msgstr "Abonnieren"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)"
+#, fuzzy
+msgid "Invalid profile URL (bad format)."
 msgstr "Ungültige Profil-URL (falsches Format)"
 
 #: actions/remotesubscribe.php:167
@@ -5327,7 +5378,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"
 
@@ -5369,87 +5420,87 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Symbol"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 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
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organisation"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistik"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, 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:207
 msgid "Application actions"
 msgstr "Programmaktionen"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 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
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Löschen"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "Programminformation"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr "Anwender-Schlüssel"
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr "Anwender-Geheimnis"
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr "Anfrage-Token Adresse"
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr "Zugriffs-Token-Adresse"
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr "Autorisationadresse"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5457,7 +5508,7 @@ msgstr ""
 "Hinweis: Wir unterstützen HMAC-SHA1-Signaturen. Wir unterstützen keine "
 "Klartext-Signaturen."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:302
 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?"
 
@@ -5550,16 +5601,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "Nachricht"
 
@@ -5704,7 +5757,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"
@@ -5955,7 +6008,8 @@ msgstr "Systembenachrichtigung (maximal 255 Zeichen; HTML erlaubt)"
 
 #. 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 "Systemnachricht speichern"
 
 #. TRANS: Title for SMS settings.
@@ -6013,7 +6067,8 @@ msgstr "SMS-Telefonnummer"
 
 #. 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 "Telefonnummer, keine Sonder- oder Leerzeichen mit Vorwahl"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6350,8 +6405,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
@@ -6368,6 +6424,11 @@ 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."
@@ -6405,7 +6466,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’."
@@ -6437,8 +6498,8 @@ msgstr "Willkommens-Nachricht ungültig. Maximale Länge sind 255 Zeichen."
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+#, fuzzy, php-format
+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.
@@ -6498,55 +6559,71 @@ msgstr "Ist es Benutzern erlaubt, neue Benutzer einzuladen."
 
 #. 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 "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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "Abonniere diesen Benutzer"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Ablehnen"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+msgid "Reject this subscription."
 msgstr "Abonnement ablehnen"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:248
 msgid "No authorization request!"
 msgstr "Keine Bestätigungsanfrage!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 msgid "Subscription authorized"
 msgstr "Abonnement autorisiert"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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 "
@@ -6556,11 +6633,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:285
 msgid "Subscription rejected"
 msgstr "Abonnement abgelehnt"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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 "
@@ -6570,39 +6648,64 @@ msgstr ""
 "zurückgegeben. Lies nochmal die Anweisungen der Seite, wie Abonnements "
 "vollständig abgelehnt werden. Dein Abonnement-Token ist:"
 
-#: actions/userauthorization.php:303
-#, 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:325
+#, fuzzy, php-format
+msgid "Listener URI \"%s\" not found here."
 msgstr "Eine Listener-URI „%s“ wurde hier nicht gefunden."
 
-#: actions/userauthorization.php:308
-#, 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:332
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is too long."
 msgstr "Die URI „%s“ für den Stream ist zu lang."
 
-#: actions/userauthorization.php:314
-#, 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:340
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "Die URI „%s“ für den Stream ist ein lokaler Benutzer."
 
-#: actions/userauthorization.php:329
-#, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
+#: actions/userauthorization.php:358
+#, fuzzy, php-format
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "Profiladresse „%s“ ist für einen lokalen Benutzer."
 
-#: actions/userauthorization.php:345
-#, 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:368
+#, 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."
 msgstr "Avataradresse „%s“ ist nicht gültig."
 
-#: actions/userauthorization.php:350
-#, 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:385
+#, fuzzy, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Konnte Avatar-URL nicht öffnen „%s“"
 
-#: actions/userauthorization.php:355
-#, 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:392
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Falscher Bildtyp für „%s“"
 
 #. TRANS: Page title for profile design page.
@@ -7824,6 +7927,11 @@ 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"
@@ -8277,6 +8385,11 @@ 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
@@ -8313,6 +8426,21 @@ 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
@@ -8420,9 +8548,8 @@ msgid "Grant this user the \"%s\" role"
 msgstr "Teile dem Benutzer die „%s“-Rolle zu"
 
 #: lib/groupeditform.php:147
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen."
+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."
@@ -8433,7 +8560,7 @@ msgid "Describe the group or topic"
 msgstr "Beschreibe die Gruppe oder das Thema"
 
 #: lib/groupeditform.php:163
-#, fuzzy, php-format
+#, 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"
@@ -9198,6 +9325,10 @@ 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"
@@ -9477,6 +9608,10 @@ 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"
@@ -9754,3 +9889,17 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Hole Backup von der Datei „%s“."
+
+#~ msgid "6 or more characters"
+#~ msgstr "6 oder mehr Zeichen"
+
+#~ msgid "Same as password above"
+#~ msgstr "Gleiches Passwort wie zuvor"
+
+#~ msgid "Can't save new password."
+#~ msgstr "Konnte neues Passwort nicht speichern"
+
+#~ msgid "URL of your homepage, blog, or profile on another site"
+#~ msgstr ""
+#~ "URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen "
+#~ "Website"
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index d44b8dc215..67bb7959fc 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:05:31+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27:10+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 (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -155,7 +155,7 @@ msgstr "No such page."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -518,7 +518,8 @@ 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
-msgid "Can't send direct messages to users who aren't your friend."
+#, 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).
@@ -603,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "Nickname already in use. Try another one."
 
@@ -613,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "Not a valid nickname."
 
@@ -626,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "Homepage is not a valid URL."
 
@@ -636,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:226
+#: actions/register.php:218
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Full name is too long (max 255 chars)."
@@ -665,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:235
+#: actions/register.php:227
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Location is too long (max 255 chars)."
@@ -822,15 +823,15 @@ msgstr "You are not authorised."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: 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."
@@ -862,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Unexpected form submission."
@@ -914,19 +915,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Password"
 
@@ -1048,7 +1050,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.
@@ -1226,25 +1228,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1411,7 +1414,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."
@@ -1516,9 +1519,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."
 
@@ -1576,9 +1581,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
-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 "Pick a square area of the image to be your avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1638,7 +1644,7 @@ msgstr "Background"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1679,7 +1685,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 "Do not block this user"
 
 #. TRANS: Button label on the user block form.
@@ -1696,9 +1703,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.
@@ -1863,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:440
+#: actions/recoverpassword.php:262 actions/register.php:426
 msgid "Confirm"
 msgstr "Confirm"
 
@@ -1893,13 +1900,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "There was a problem with your session token."
@@ -1923,12 +1930,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 "Do not delete this 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 "Delete this application"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1982,12 +1991,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 "Do not delete this group"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-msgid "Delete this group"
+#, fuzzy
+msgid "Delete this group."
 msgstr "Delete this group"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2030,12 +2041,14 @@ msgstr "Are you sure you want to delete this notice?"
 
 #. 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 "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.
@@ -2072,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 "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.
@@ -2244,21 +2257,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.
@@ -2290,7 +2303,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."
 
@@ -2571,7 +2584,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Not a valid e-mail address."
@@ -2647,19 +2660,22 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 #, 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "New incoming e-mail address added."
 
@@ -2670,7 +2686,8 @@ msgstr "This notice is already a favourite!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-msgid "Disfavor favorite"
+#, fuzzy
+msgid "Disfavor favorite."
 msgstr "Disfavor favourite"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2910,12 +2927,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 "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
-msgid "Block this user from this group"
+#, 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.
@@ -3243,7 +3262,8 @@ 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.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "Preferences saved."
 
@@ -3659,39 +3679,39 @@ msgstr "Save"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "Already logged in."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "Incorrect username or password."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 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:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "Login"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "Login to site"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "Remember me"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 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:259
 msgid "Lost or forgotten password?"
 msgstr "Lost or forgotten password?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3699,11 +3719,11 @@ msgstr ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 
-#: actions/login.php:292
+#: actions/login.php:281
 msgid "Login with your username and password."
 msgstr "Login with your username and password."
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3916,30 +3936,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:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr "Connected applications"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3947,20 +3967,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, 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."
@@ -3970,6 +4000,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
@@ -4060,17 +4100,21 @@ msgstr "Invalid login token specified."
 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."
 
@@ -4096,40 +4140,45 @@ msgstr "Old password"
 msgid "New password"
 msgstr "New password"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+#, fuzzy
+msgid "6 or more characters."
 msgstr "6 or more characters"
 
-#: 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:427
+#, fuzzy
+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:230
 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:233
 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
-msgid "Can't save new password."
+#. 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."
 
-#. 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."
 
@@ -4462,7 +4511,7 @@ 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:109 actions/register.php:419
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
@@ -4470,7 +4519,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:455
+#: actions/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4478,13 +4527,13 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL of your homepage, blog, or profile on another site"
@@ -4492,7 +4541,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:129 actions/register.php:457
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4500,28 +4549,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Where you are, like \"City, State (or Region), Country\""
 
@@ -4540,8 +4590,10 @@ msgstr "Tags"
 
 #. 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 ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 
@@ -4552,7 +4604,8 @@ msgstr "Language"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-msgid "Preferred language"
+#, fuzzy
+msgid "Preferred language."
 msgstr "Preferred language"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4567,15 +4620,16 @@ msgstr "In which timezone are you?"
 
 #. 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 ""
 "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:258 actions/register.php:221
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4595,9 +4649,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 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:291
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Invalid tag: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4840,6 +4894,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"
@@ -4851,12 +4911,6 @@ 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
@@ -4910,14 +4964,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:248
 msgid "Error setting user."
 msgstr "Error setting user."
 
@@ -4926,90 +4974,89 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr "Sorry, only invited people can register."
 
-#: actions/register.php:99
+#: actions/register.php:94
 msgid "Sorry, invalid invitation code."
 msgstr "Sorry, invalid invitation code."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "Registration successful"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "Register"
 
-#: actions/register.php:142
+#: actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Registration not allowed."
 
-#: actions/register.php:209
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:201
+#, 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:218
+#: actions/register.php:210
 msgid "Email address already exists."
 msgstr "E-mail address already exists."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "Invalid username or password."
 
-#: actions/register.php:351
+#: actions/register.php:340
 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, fuzzy
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "Used only for updates, announcements, and password recovery"
 
-#: actions/register.php:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Longer name, preferably your \"real\" name"
 
-#: actions/register.php:462
-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:471
+#, fuzzy
+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:510
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:533
+#: actions/register.php:520
 #, 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:524
 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:527
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:532
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5018,7 +5065,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:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5051,7 +5098,7 @@ msgstr ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5083,7 +5130,8 @@ msgid "User nickname"
 msgstr "User nickname"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow"
+#, fuzzy
+msgid "Nickname of the user you want to follow."
 msgstr "Nickname of the user you want to follow"
 
 #: actions/remotesubscribe.php:132
@@ -5091,7 +5139,8 @@ msgid "Profile URL"
 msgstr "Profile 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 of your profile on another compatible microblogging service"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5101,7 +5150,8 @@ msgid "Subscribe"
 msgstr "Subscribe"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)"
+#, fuzzy
+msgid "Invalid profile URL (bad format)."
 msgstr "Invalid profile URL (bad format)"
 
 #: actions/remotesubscribe.php:167
@@ -5297,7 +5347,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"
 
@@ -5339,93 +5389,93 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 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
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organization"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistics"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:207
 msgid "Application actions"
 msgstr "Application actions"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Delete"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "Application information"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr ""
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr "Authorise URL"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:302
 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?"
 
@@ -5517,16 +5567,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "Note"
 
@@ -5673,7 +5725,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"
@@ -5914,7 +5966,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 "Save site notice"
 
 #. TRANS: Title for SMS settings.
@@ -5972,7 +6025,8 @@ msgstr "SMS phone number"
 
 #. 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 "Phone number, no punctuation or spaces, with area code"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6303,8 +6357,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Photo"
@@ -6321,6 +6376,11 @@ 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."
@@ -6355,7 +6415,7 @@ 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’."
@@ -6387,7 +6447,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.
@@ -6448,55 +6508,71 @@ msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-msgid "Save user settings"
-msgstr ""
+#, fuzzy
+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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, 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:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Reject"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+msgid "Reject this subscription."
 msgstr "Reject this subscription"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:248
 msgid "No authorization request!"
 msgstr "No authorisation request!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 msgid "Subscription authorized"
 msgstr "Subscription authorised"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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 "
@@ -6506,11 +6582,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:285
 msgid "Subscription rejected"
 msgstr "Subscription rejected"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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 "
@@ -6520,39 +6597,63 @@ 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:325
 #, 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:332
+#, 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:340
 #, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
 
-#: actions/userauthorization.php:314
+#. 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 "Listenee URI ‘%s’ is a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
-#: actions/userauthorization.php:329
-#, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#. 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
+#, 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’."
 
-#: actions/userauthorization.php:345
-#, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+#. 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."
 msgstr "Avatar URL ‘%s’ is not valid."
 
-#: actions/userauthorization.php:350
-#, 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:385
+#, fuzzy, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Can’t read avatar URL ‘%s’."
 
-#: actions/userauthorization.php:355
-#, 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:392
+#, 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.
@@ -7748,6 +7849,11 @@ 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"
@@ -8194,6 +8300,11 @@ 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
@@ -8231,6 +8342,21 @@ 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
@@ -8338,7 +8464,6 @@ msgid "Grant this user the \"%s\" role"
 msgstr ""
 
 #: lib/groupeditform.php:147
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 lowercase letters or numbers, no punctuation or spaces"
 
@@ -9023,6 +9148,10 @@ 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"
@@ -9304,6 +9433,10 @@ 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"
@@ -9573,3 +9706,15 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "6 or more characters"
+#~ msgstr "6 or more characters"
+
+#~ msgid "Same as password above"
+#~ msgstr "Same as password above"
+
+#~ msgid "Can't save new password."
+#~ msgstr "Can't save new password."
+
+#~ msgid "URL of your homepage, blog, or profile on another site"
+#~ msgstr "URL of your homepage, blog, or profile on another site"
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index 85d2fb32e5..6253bc381a 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:05:33+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27:11+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 (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -159,7 +159,7 @@ msgstr "Ne estas tiu paĝo."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -523,7 +523,8 @@ 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
-msgid "Can't send direct messages to users who aren't your friend."
+#, 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).
@@ -606,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "La uzantnomo jam uziĝis. Provu ion alian."
 
@@ -616,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "Ne valida kromnomo."
 
@@ -629,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "Ĉefpaĝo ne estas valida URL."
 
@@ -639,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:226
+#: actions/register.php:218
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Kompleta nomo tro longas (maksimume 255 signoj)"
 
@@ -667,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:235
+#: actions/register.php:227
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Lokonomo tro longas (maksimume 255 signoj)"
 
@@ -822,15 +823,15 @@ msgstr ""
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: 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."
@@ -862,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Neatendita formo-sendo."
@@ -913,19 +914,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Pasvorto"
 
@@ -1049,7 +1051,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.
@@ -1229,25 +1231,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1415,7 +1418,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."
@@ -1520,9 +1523,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."
 
@@ -1580,9 +1585,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
-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 "Elektu kvadratan parton de la bildo kiel via vizaĝbildo"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1642,7 +1648,7 @@ msgstr "Fono"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1682,7 +1688,8 @@ msgstr "Ne"
 
 #. 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 "Ne bloki la uzanton"
 
 #. TRANS: Button label on the user block form.
@@ -1699,9 +1706,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.
@@ -1866,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:440
+#: actions/recoverpassword.php:262 actions/register.php:426
 msgid "Confirm"
 msgstr "Konfirmi"
 
@@ -1896,13 +1903,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Problemo okazas pri via seancĵetono."
@@ -1925,12 +1932,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 "Ne forigu ĉi tiun aplikaĵon."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-msgid "Delete this application"
+#, fuzzy
+msgid "Delete this application."
 msgstr "Viŝi ĉi tiun aplikon"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1988,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 "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.
@@ -2036,12 +2045,14 @@ msgstr "Ĉu vi certe volas forigi la avizon?"
 
 #. 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 "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.
@@ -2078,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 "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.
@@ -2250,21 +2261,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.
@@ -2296,7 +2307,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."
 
@@ -2577,7 +2588,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Retpoŝta adreso ne valida"
@@ -2653,19 +2664,22 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 #, 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "Nova alvena retpoŝtadreso aldonita."
 
@@ -2676,7 +2690,8 @@ msgstr "Ĉi tiu avizo jam estas ŝatata."
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-msgid "Disfavor favorite"
+#, fuzzy
+msgid "Disfavor favorite."
 msgstr "Malŝati ŝataton."
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2914,12 +2929,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 "Ne bloki la uzanton de la grupo"
 
 #. 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 "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.
@@ -3245,7 +3262,8 @@ 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.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "Prefero konservita."
 
@@ -3658,39 +3676,39 @@ msgstr "Konservi"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "Vi jam ensalutis."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "Malĝusta uzantnomo aŭ pasvorto."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 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:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "Ensaluti"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "Ensaluti al la retejo"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "Memoru min"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 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:259
 msgid "Lost or forgotten password?"
 msgstr "Ĉi via pasvorto perdiĝas?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3698,11 +3716,11 @@ msgstr ""
 "Por sekureca kialo, bonvole re-entajpi vian uzantnomon kaj pasvorton antaŭ "
 "ŝanĝi vian agordon."
 
-#: actions/login.php:292
+#: actions/login.php:281
 msgid "Login with your username and password."
 msgstr "Ensaluti per via uzantnomo kaj pasvorto."
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3913,30 +3931,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:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr "Konektita aplikaĵo"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3944,20 +3962,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, 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"
@@ -3967,6 +3995,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
@@ -4057,17 +4095,21 @@ msgstr "Specifita ensalutado-ĵetono nevalidas."
 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."
@@ -4094,40 +4136,45 @@ msgstr "Malnova pasvorto"
 msgid "New password"
 msgstr "Nova pasvorto"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+#, fuzzy
+msgid "6 or more characters."
 msgstr "6 aŭ pli da literoj"
 
-#: 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:427
+#, fuzzy
+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:230
 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:233
 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
-msgid "Can't save new password."
+#. 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."
 
-#. 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."
 
@@ -4453,7 +4500,7 @@ 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:109 actions/register.php:419
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 minusklaj literoj aŭ ciferoj, neniu interpunkcio aŭ spaco"
@@ -4461,7 +4508,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:455
+#: actions/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4469,13 +4516,13 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL de via hejmpaĝo, blogo aŭ profilo ĉe alia retejo"
@@ -4483,7 +4530,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:129 actions/register.php:457
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4491,28 +4538,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Kie vi estas, ekzemple \"Urbo, Ŝtato (aŭ Regiono), Lando\""
 
@@ -4531,8 +4579,10 @@ msgstr "Markiloj"
 
 #. 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 ""
 "Markiloj por vi mem (literoj, ciferoj, \"-\", \".\", kaj \"_\"), dividite "
 "per komoj aŭ spacoj"
@@ -4544,7 +4594,8 @@ msgstr "Lingvo"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-msgid "Preferred language"
+#, fuzzy
+msgid "Preferred language."
 msgstr "Preferata lingvo"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4559,14 +4610,15 @@ msgstr "En kiu horzono vi kutime troviĝas?"
 
 #. 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 "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:258 actions/register.php:221
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4586,9 +4638,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 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:291
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Nevalida markilo: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4828,6 +4880,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"
@@ -4839,12 +4897,6 @@ 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
@@ -4898,14 +4950,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:248
 msgid "Error setting user."
 msgstr "Eraris agordi uzanton."
 
@@ -4914,93 +4960,93 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr "Pardonon, nur invito rajtas registri."
 
-#: actions/register.php:99
+#: actions/register.php:94
 msgid "Sorry, invalid invitation code."
 msgstr "Pardonon, nevalida invitkodo."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "Registriĝo sukcesa"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "Registri"
 
-#: actions/register.php:142
+#: actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Registriĝo ne permesita."
 
-#: actions/register.php:209
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:201
+#, 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:218
+#: actions/register.php:210
 msgid "Email address already exists."
 msgstr "Retpoŝta adreso jam ekzistas."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "Nevalida uzantnomo aŭ pasvorto."
 
-#: actions/register.php:351
+#: actions/register.php:340
+#, 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Retpoŝto"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, fuzzy
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "Uzu nur por ĝisdatigo, anonco, kaj rehavi pasvorton."
 
-#: actions/register.php:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Pli longa nomo, prefere via \"vera\" nomo."
 
-#: actions/register.php:462
-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:471
+#, fuzzy
+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:510
 #, 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:520
 #, 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:524
 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:527
 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:532
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5009,7 +5055,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:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5041,7 +5087,7 @@ msgstr ""
 "\n"
 "Dankon pro registriĝo, kaj ni esperas al vi ĝuon de uzi ĉi servon."
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5072,7 +5118,8 @@ msgid "User nickname"
 msgstr "Uzanta alinomo"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow"
+#, fuzzy
+msgid "Nickname of the user you want to follow."
 msgstr "Alnomo de la uzanto, kiun vi volas aboni."
 
 #: actions/remotesubscribe.php:132
@@ -5080,7 +5127,8 @@ msgid "Profile URL"
 msgstr "Profila 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 de via profilo ĉe alia kongrua mikroblogilo-servo"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5090,7 +5138,8 @@ msgid "Subscribe"
 msgstr "Aboni"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)"
+#, fuzzy
+msgid "Invalid profile URL (bad format)."
 msgstr "Nevalida profila URL (fuŝa formato)"
 
 #: actions/remotesubscribe.php:167
@@ -5293,7 +5342,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"
 
@@ -5335,87 +5384,87 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Bildsimbolo"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 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
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organizaĵo"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistiko"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, 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:207
 msgid "Application actions"
 msgstr "Aplikaĵa ago"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 msgid "Reset key & secret"
 msgstr "Rekomencigi ŝlosilon & sekreton"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Forigi"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "Aplikaĵa informo"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr "Konsumanta ŝlosilo"
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr "Konsumanta sekreto"
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr "Pet-ĵetona URL"
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr "Alir-ĵetona URL"
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr "Rajtigi URL"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5423,7 +5472,7 @@ msgstr ""
 "Rimarku: Ni subtenas HMAC-SHA1-subskribo. Ni ne subtenas platteksta "
 "subskribado-metodon."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:302
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Ĉu vi certe volas rekomencigi vian konsumantan ŝlosilon kaj sekreton?"
 
@@ -5513,16 +5562,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "Noto"
 
@@ -5668,7 +5719,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"
@@ -5913,7 +5964,8 @@ 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
-msgid "Save site notice"
+#, fuzzy
+msgid "Save site notice."
 msgstr "Konservi retejan agordon"
 
 #. TRANS: Title for SMS settings.
@@ -5971,7 +6023,8 @@ msgstr "SMM-a telefonnumero"
 
 #. 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 "Telefonnumero, sen interpunkcio aŭ spacoj, kun loka kodo"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6304,8 +6357,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
@@ -6322,6 +6376,11 @@ 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."
@@ -6355,7 +6414,7 @@ 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’."
@@ -6388,7 +6447,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.
@@ -6449,54 +6508,70 @@ msgstr "Ĉu permesi al uzantoj inviti novan uzantojn."
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-msgid "Save user settings"
-msgstr ""
+#, fuzzy
+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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "Aboni la uzanton"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Malakcepti"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+msgid "Reject this subscription."
 msgstr "Rifuzi la abonon"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:248
 msgid "No authorization request!"
 msgstr "Ne bezonas permesado!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 msgid "Subscription authorized"
 msgstr "Abono permesiĝis"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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 "
@@ -6505,11 +6580,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:285
 msgid "Subscription rejected"
 msgstr "Abono rifuziĝis"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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 "
@@ -6518,39 +6594,63 @@ 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
-#, 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:325
+#, fuzzy, php-format
+msgid "Listener URI \"%s\" not found here."
 msgstr "URL de aboninto ‘%s’ ne troviĝas tie ĉi."
 
-#: actions/userauthorization.php:308
-#, 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:332
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is too long."
 msgstr "URL de abonito ‘%s’ tro longas."
 
-#: actions/userauthorization.php:314
-#, 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:340
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "URL de abonito ‘%s’ estas de loka uzanto."
 
-#: actions/userauthorization.php:329
-#, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
+#: actions/userauthorization.php:358
+#, fuzzy, php-format
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "Profila URL ‘%s’ estas de loka uzanto."
 
-#: actions/userauthorization.php:345
-#, 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:368
+#, 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."
 msgstr "Vizaĝbilda URL ‘%s' ne estas valida."
 
-#: actions/userauthorization.php:350
-#, 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:385
+#, fuzzy, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Malsukcesis legi vizaĝbildan URL ‘%s’."
 
-#: actions/userauthorization.php:355
-#, 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:392
+#, 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.
@@ -7754,6 +7854,11 @@ 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"
@@ -8213,6 +8318,11 @@ 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
@@ -8250,6 +8360,21 @@ 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
@@ -8357,7 +8482,6 @@ msgid "Grant this user the \"%s\" role"
 msgstr "Donu al la uzanto rolon \"%s\""
 
 #: lib/groupeditform.php:147
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 minusklaj literoj aŭ ciferoj, neniu interpunkcio aŭ spaco"
 
@@ -9133,6 +9257,10 @@ 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"
@@ -9415,6 +9543,10 @@ 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"
@@ -9688,3 +9820,15 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "6 or more characters"
+#~ msgstr "6 aŭ pli da literoj"
+
+#~ msgid "Same as password above"
+#~ msgstr "Same kiel pasvorto supra"
+
+#~ msgid "Can't save new password."
+#~ msgstr "Malsukcesis konservi novan pasvorton."
+
+#~ msgid "URL of your homepage, blog, or profile on another site"
+#~ msgstr "URL de via hejmpaĝo, blogo aŭ profilo ĉe alia retejo"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 2051709a58..7ffdc25e70 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:05:44+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27: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-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -160,7 +160,7 @@ msgstr "No existe tal página."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -524,7 +524,8 @@ 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
-msgid "Can't send direct messages to users who aren't your friend."
+#, 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).
@@ -609,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "El usuario ya existe. Prueba con otro."
 
@@ -619,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "Usuario inválido"
 
@@ -632,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "La página de inicio no es un URL válido."
 
@@ -642,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:226
+#: actions/register.php:218
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
@@ -671,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:235
+#: actions/register.php:227
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
@@ -830,15 +831,15 @@ msgstr "No estás autorizado."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -871,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Envío de formulario inesperado."
@@ -922,19 +923,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Contraseña"
 
@@ -1058,7 +1060,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.
@@ -1238,25 +1240,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1418,7 +1421,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."
@@ -1523,9 +1526,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."
 
@@ -1581,9 +1586,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
-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 "Elige un área cuadrada para que sea tu imagen"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1643,7 +1649,7 @@ msgstr "Fondo"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1684,7 +1690,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 bloquear a este usuario"
 
 #. TRANS: Button label on the user block form.
@@ -1701,9 +1708,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.
@@ -1871,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:440
+#: actions/recoverpassword.php:262 actions/register.php:426
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -1900,13 +1907,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Hubo problemas con tu clave de sesión."
@@ -1930,12 +1937,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 "No eliminar esta aplicación"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-msgid "Delete this application"
+#, fuzzy
+msgid "Delete this application."
 msgstr "Borrar esta aplicación"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1989,12 +1998,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 "No eliminar este grupo"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-msgid "Delete this group"
+#, fuzzy
+msgid "Delete this group."
 msgstr "Borrar este grupo"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2037,12 +2048,14 @@ msgstr "¿Estás seguro de que quieres eliminar este aviso?"
 
 #. 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 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.
@@ -2077,13 +2090,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 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.
@@ -2247,21 +2261,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.
@@ -2293,7 +2307,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."
 
@@ -2577,7 +2591,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Correo electrónico no válido"
@@ -2654,19 +2668,22 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 #, 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "Nueva dirección de correo entrante agregada."
 
@@ -2677,7 +2694,8 @@ msgstr "¡Este mensaje ya está en favoritos!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-msgid "Disfavor favorite"
+#, fuzzy
+msgid "Disfavor favorite."
 msgstr "Sacar favorito"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2918,12 +2936,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 "No bloquear este usuario de este grupo"
 
 #. 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 "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.
@@ -3256,7 +3276,8 @@ 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.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "Preferencias guardadas."
 
@@ -3674,41 +3695,41 @@ msgstr "Guardar"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "Ya estás conectado."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "Nombre de usuario o contraseña incorrectos."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 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:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "Inicio de sesión"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "Ingresar a sitio"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "Recordarme"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 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:259
 msgid "Lost or forgotten password?"
 msgstr "¿Contraseña olvidada o perdida?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3716,11 +3737,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:281
 msgid "Login with your username and password."
 msgstr "Ingresar con tu nombre de usuario y contraseña."
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3936,30 +3957,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:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr "Aplicaciones conectadas"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3967,20 +3988,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, 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."
@@ -3990,6 +4021,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
@@ -4080,17 +4121,21 @@ msgstr "Token de acceso inválido especificado."
 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."
@@ -4117,40 +4162,45 @@ msgstr "Antigua contraseña"
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+#, fuzzy
+msgid "6 or more characters."
 msgstr "6 o más caracteres"
 
-#: 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:427
+#, 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:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:230
 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:233
 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
-msgid "Can't save new password."
+#. 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."
 
-#. 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."
 
@@ -4495,7 +4545,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:433
+#: actions/profilesettings.php:109 actions/register.php:419
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4504,7 +4554,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:455
+#: actions/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4512,13 +4562,13 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 #, 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"
@@ -4526,7 +4576,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:129 actions/register.php:457
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4534,28 +4584,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Dónde estás, por ejemplo \"Ciudad, Estado (o Región), País\""
 
@@ -4574,8 +4625,10 @@ msgstr "Etiquetas"
 
 #. 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 ""
 "Etiquetas para ti (letras, números, -, ., y _), separadas por comas o "
 "espacios"
@@ -4587,7 +4640,8 @@ msgstr "Idioma"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-msgid "Preferred language"
+#, fuzzy
+msgid "Preferred language."
 msgstr "Lenguaje de preferencia"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4602,8 +4656,9 @@ msgstr "En que zona horaria se encuentra 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 ""
 "Suscribirse automáticamente a quien quiera que se suscriba a mí (es mejor "
 "para no-humanos)"
@@ -4611,7 +4666,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:258 actions/register.php:221
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4631,9 +4686,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 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:291
+#, 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
@@ -4885,6 +4940,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"
@@ -4896,12 +4957,6 @@ 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
@@ -4955,14 +5010,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:248
 msgid "Error setting user."
 msgstr "Error al configurar el usuario."
 
@@ -4971,95 +5020,95 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr "Disculpa, sólo personas invitadas pueden registrarse."
 
-#: actions/register.php:99
+#: actions/register.php:94
 msgid "Sorry, invalid invitation code."
 msgstr "El código de invitación no es válido."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "Registro exitoso."
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "Registrarse"
 
-#: actions/register.php:142
+#: actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Registro de usuario no permitido."
 
-#: actions/register.php:209
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:201
+#, 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:218
+#: actions/register.php:210
 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:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "Usuario o contraseña inválidos."
 
-#: actions/register.php:351
+#: actions/register.php:340
+#, 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, 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:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Nombre más largo, preferiblemente tu nombre \"real\""
 
-#: actions/register.php:462
-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:471
+#, 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:523
+#: actions/register.php:510
 #, 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:520
 #, 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:524
 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:527
 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:532
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5069,7 +5118,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:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5102,7 +5151,7 @@ msgstr ""
 "\n"
 "¡Gracias por apuntarte! Esperamos que disfrutes usando este servicio."
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5135,7 +5184,8 @@ msgid "User nickname"
 msgstr "Usuario"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow"
+#, fuzzy
+msgid "Nickname of the user you want to follow."
 msgstr "Usuario a quien quieres seguir"
 
 #: actions/remotesubscribe.php:132
@@ -5143,7 +5193,8 @@ msgid "Profile URL"
 msgstr "URL del perfil"
 
 #: 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 "El URL de tu perfil en otro servicio de microblogueo compatible"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5153,7 +5204,8 @@ msgid "Subscribe"
 msgstr "Suscribirse"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)"
+#, fuzzy
+msgid "Invalid profile URL (bad format)."
 msgstr "El URL del perfil es inválido (formato incorrecto)"
 
 #: actions/remotesubscribe.php:167
@@ -5356,7 +5408,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"
 
@@ -5398,87 +5450,87 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icono"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 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
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organización"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Estadísticas"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, 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:207
 msgid "Application actions"
 msgstr "Acciones de la aplicación"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 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
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Borrar"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "Información de la aplicación"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr "Clave del consumidor"
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr "Secreto del consumidor"
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr "URL del token de solicitud"
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr "URL del token de acceso"
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr "Autorizar URL"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5486,7 +5538,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:302
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "¿realmente deseas reiniciar tu clave y secreto de consumidor?"
 
@@ -5578,16 +5630,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "Nota"
 
@@ -5734,7 +5788,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"
@@ -5986,7 +6040,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 "Guardar el mensaje del sitio"
 
 #. TRANS: Title for SMS settings.
@@ -6045,7 +6100,8 @@ msgstr "Número de teléfono de 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 "Número telefónico, sin puntuación ni espacios, incluya código de área"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6384,8 +6440,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
@@ -6402,6 +6459,11 @@ 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."
@@ -6439,7 +6501,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’."
@@ -6473,7 +6535,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.
@@ -6534,55 +6596,71 @@ 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
-msgid "Save user settings"
-msgstr ""
+#, fuzzy
+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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, 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:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rechazar"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+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:248
 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:271
 msgid "Subscription authorized"
 msgstr "Suscripción autorizada"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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 "
@@ -6592,11 +6670,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:285
 msgid "Subscription rejected"
 msgstr "Suscripción rechazada"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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 "
@@ -6606,39 +6685,64 @@ msgstr ""
 "de nuevo las instrucciones para saber cómo rechazar la suscripción "
 "completamente."
 
-#: actions/userauthorization.php:303
-#, 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:325
+#, fuzzy, php-format
+msgid "Listener URI \"%s\" not found here."
 msgstr "No se ha encontrado aquí el URI del oyente ‘%s’."
 
-#: actions/userauthorization.php:308
-#, 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:332
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is too long."
 msgstr "El URI ‘%s’ del receptor es muy largo."
 
-#: actions/userauthorization.php:314
-#, 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:340
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "El URI ‘%s’  del receptor es un usuario local."
 
-#: actions/userauthorization.php:329
-#, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
+#: actions/userauthorization.php:358
+#, fuzzy, php-format
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "El URL ‘%s’ de perfil es para un usuario local."
 
-#: actions/userauthorization.php:345
-#, 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:368
+#, 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."
 msgstr "La URL ‘%s’ de la imagen no es válida."
 
-#: actions/userauthorization.php:350
-#, 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:385
+#, fuzzy, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "No se puede leer la URL de la imagen ‘%s’."
 
-#: actions/userauthorization.php:355
-#, 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:392
+#, 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.
@@ -7860,6 +7964,11 @@ 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"
@@ -8320,6 +8429,11 @@ 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
@@ -8358,6 +8472,21 @@ 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
@@ -8465,7 +8594,6 @@ msgid "Grant this user the \"%s\" role"
 msgstr "Otorgar al usuario el papel de \"%$\""
 
 #: lib/groupeditform.php:147
-#, 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"
@@ -9250,6 +9378,10 @@ 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"
@@ -9531,6 +9663,10 @@ 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"
@@ -9806,3 +9942,15 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "6 or more characters"
+#~ msgstr "6 o más caracteres"
+
+#~ msgid "Same as password above"
+#~ msgstr "Igual a la contraseña de arriba"
+
+#~ msgid "Can't save new password."
+#~ msgstr "No se puede guardar la nueva contraseña."
+
+#~ 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"
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index fd7b37146d..8fbe80d9a4 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:05:47+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27:15+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 (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -159,7 +159,7 @@ msgstr "چنین صفحه‌ای وجود ندارد."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -516,7 +516,8 @@ 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."
+#, fuzzy
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "نمی‌توان پیام مستقیم را به کاربرانی که دوست شما نیستند، فرستاد."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -601,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "این لقب در حال حاضر ثبت شده است. لطفا یکی دیگر انتخاب کنید."
 
@@ -611,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "لقب نا معتبر."
 
@@ -624,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "صفحهٔ خانگی یک نشانی معتبر نیست."
 
@@ -634,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:226
+#: actions/register.php:218
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "نام کامل خیلی طولانی است (حداکثر ۲۵۵ نویسه)."
@@ -662,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:235
+#: actions/register.php:227
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "نام مکان خیلی طولانی است (حداکثر ۲۵۵ نویسه)"
@@ -820,15 +821,15 @@ msgstr "شما شناسایی نشده اید."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "مشکلی در دریافت نشست شما وجود دارد. لطفا بعدا سعی کنید."
@@ -860,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "ارسال غیر قابل انتظار فرم."
@@ -914,19 +915,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "گذرواژه"
 
@@ -1050,7 +1052,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.
@@ -1226,25 +1228,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1412,7 +1415,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 "نمی‌توان اشتراک را ذخیره کرد."
@@ -1518,9 +1521,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 "کاربر نمایهٔ تطبیق ندارد."
 
@@ -1578,9 +1583,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
-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 ""
 "یک مربع از عکس خود را انتخاب کنید تا به عنوان تصویر چهرهٔ شما انتخاب شود."
 
@@ -1641,7 +1647,7 @@ msgstr "پیش‌زمینه"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1683,7 +1689,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.
@@ -1700,9 +1707,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.
@@ -1867,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:426
 msgid "Confirm"
 msgstr "تایید"
 
@@ -1897,13 +1904,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "یک مشکل با رمز نشست شما وجود داشت."
@@ -1927,12 +1934,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.
@@ -1990,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 "این پیام را پاک نکن"
 
 #. 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,12 +2048,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 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,13 +2092,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.
-#. 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.
@@ -2257,21 +2268,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.
@@ -2303,7 +2314,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 "چنین برنامه‌ای وجود ندارد."
 
@@ -2589,7 +2600,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "یک نشانی پست الکترونیکی معتبر نیست."
@@ -2665,19 +2676,22 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 #, 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "نشانی ورودی جدید اضافه شد."
 
@@ -2688,7 +2702,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.
@@ -2929,12 +2944,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.
@@ -3258,7 +3275,8 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "یک شناسهٔ کوچک برای Jabber/Gtalk من منتشر کن."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "تنظیمات ذخیره شد."
 
@@ -3670,39 +3688,39 @@ msgstr "ذخیره‌کردن"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "قبلا وارد شده"
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "نام کاربری یا گذرواژه نادرست است."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "خطا در تنظیم کاربر. شما احتمالا اجازهٔ این کار را ندارید."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "ورود"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "ورود به وب‌گاه"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "مرا به یاد بسپار"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "وارد شدن خودکار. نه برای کامپیوترهای مشترک!"
 
-#: actions/login.php:269
+#: actions/login.php:259
 msgid "Lost or forgotten password?"
 msgstr "گذرواژهٔ خود را گم یا فراموش کرده‌اید؟"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3710,11 +3728,11 @@ msgstr ""
 "به دلایل امنیتی، لطفا نام کاربری و گذرواژهٔ خود را قبل از تغییر تنظیمات "
 "دوباره وارد نمایید."
 
-#: actions/login.php:292
+#: actions/login.php:281
 msgid "Login with your username and password."
 msgstr "با نام‌کاربری و گذرواژه‌تان وارد شوید."
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3926,30 +3944,30 @@ msgid "You have not registered any applications yet."
 msgstr "شما هنوز هیچ برنامه‌ای را ثبت نکرده‌اید."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr "برنامه‌های وصل‌شده"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3957,20 +3975,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, 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 "این پیام نمایه‌ای ندارد."
@@ -3980,6 +4008,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
@@ -4070,17 +4108,21 @@ msgstr "رمز ورود مشخص شده نامعتبر است."
 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 ""
 "این صندوق خروجی شماست، که پیام‌های خصوصی فرستاده شده به وسیلهٔ شما را فهرست "
@@ -4108,40 +4150,45 @@ msgstr "گذرواژهٔ پیشین"
 msgid "New password"
 msgstr "گذرواژهٔ تازه"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+#, fuzzy
+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:427
+#, fuzzy
+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:230
 msgid "Password must be 6 or more characters."
 msgstr "گذرواژه باید ۶ نویسه یا بیش‌تر باشد."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:233
 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
+#, fuzzy
+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 "گذرواژه ذخیره شد."
 
@@ -4484,7 +4531,7 @@ 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:109 actions/register.php:419
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "۱-۶۴ کاراکتر کوچک یا اعداد، بدون نقطه گذاری یا فاصله"
@@ -4492,7 +4539,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:455
+#: actions/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4500,13 +4547,13 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "نشانی اینترنتی صفحهٔ خانگی، وبلاگ یا نمایه‌تان در یک وب‌گاه دیگر"
@@ -4514,35 +4561,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:471
+#: actions/profilesettings.php:129 actions/register.php:457
 #, 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "مکانی که شما در آن هستید، مانند «شهر، ایالت (یا استان)، کشور»"
 
@@ -4561,8 +4609,10 @@ 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 ""
 "برچسب‌ها برای خودتان (حروف، اعداد، -، .، و _) جدا شده با کاما- یا فاصله-"
 
@@ -4573,7 +4623,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.
@@ -4588,15 +4639,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:229
+#: actions/profilesettings.php:258 actions/register.php:221
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4615,9 +4667,9 @@ 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:291
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "نشان نادرست »%s«"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4860,6 +4912,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"
@@ -4871,12 +4929,6 @@ 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
@@ -4930,14 +4982,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:248
 msgid "Error setting user."
 msgstr "هنگام گذاشتن کاربر خطا روی داد."
 
@@ -4946,92 +4992,92 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr "با عرض معذرت، تنها افراد دعوت شده می توانند ثبت نام کنند."
 
-#: actions/register.php:99
+#: actions/register.php:94
 msgid "Sorry, invalid invitation code."
 msgstr "با عرض تاسف، کد دعوت نا معتبر است."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "ثبت نام با موفقیت انجام شد."
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "ثبت نام"
 
-#: actions/register.php:142
+#: actions/register.php:135
 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:201
+#, fuzzy
+msgid "You cannot register if you don't agree to the license."
 msgstr "شما نمی توانید ثبت نام کنید اگر با لیسانس( جواز ) موافقت نکنید."
 
-#: actions/register.php:218
+#: actions/register.php:210
 msgid "Email address already exists."
 msgstr "نشانی پست الکترونیکی از قبل وجود دارد."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "نام کاربری یا گذرواژه نا معتبر است."
 
-#: actions/register.php:351
+#: actions/register.php:340
+#, 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "پست الکترونیکی"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, fuzzy
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "تنها برای به‌هنگام‌سازی‌ها، اعلامیه‌ها و بازیابی گذرواژه به کار می‌رود"
 
-#: actions/register.php:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "نام بلند تر، به طور بهتر نام واقعیتان"
 
-#: actions/register.php:462
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "نشانی اینترنتی صفحهٔ خانگی، وبلاگ یا نمایه‌تان در یک وب‌گاه دیگر"
+#: actions/register.php:471
+#, fuzzy
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "مکانی که شما در آن هستید، مانند «شهر، ایالت (یا استان)، کشور»"
 
-#: actions/register.php:523
+#: actions/register.php:510
 #, 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:520
 #, 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:524
 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:527
 msgid "All rights reserved."
 msgstr "تمام حقوق محفوظ است."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:532
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5040,7 +5086,7 @@ msgstr ""
 "نوشته‌ها و پرونده‌های من به جز داده‌های خصوصی گذرواژه، نشانی پست الکترونیک، "
 "نشانی پیام‌رسان فوری و شماره تلفن زیر مجوز %s هستند."
 
-#: actions/register.php:588
+#: actions/register.php:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5074,7 +5120,7 @@ msgstr ""
 "از این‌که نام‌نویسی کرده‌اید، تشکر می‌کنیم و امیدواریم که از استفاده از این "
 "سرویس لذت ببرید."
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5106,7 +5152,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
@@ -5114,7 +5161,8 @@ msgid "Profile URL"
 msgstr "نشانی نمایه"
 
 #: 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 "نشانی اینترنتی نمایهٔ شما در سرویس میکروبلاگینگ سازگار دیگری"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5124,7 +5172,8 @@ msgid "Subscribe"
 msgstr "اشتراک"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)"
+#, fuzzy
+msgid "Invalid profile URL (bad format)."
 msgstr "نشانی اینترنتی نمایه نامعتبر است (فرمت نامناسب است)"
 
 #: actions/remotesubscribe.php:167
@@ -5322,7 +5371,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"
 
@@ -5367,87 +5416,87 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "شمایل"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "نام"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "سازمان"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "آمار"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, 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:207
 msgid "Application actions"
 msgstr "اعمال برنامه"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "حذف"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "اطلاعات برنامه"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr "کلید مصرف‌کننده"
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr "رمز مصرف‌کننده"
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr "نشانی اینترنتی شناسهٔ درخواست"
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr "نشانی اینترنتی نشانهٔ درخواست"
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr "نشانی اجازه‌دادن"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5455,7 +5504,7 @@ msgstr ""
 "توجه: ما امضاهای HMAC-SHA1 را پشتیبانی می‌کنیم. ما روش امضای plaintext را "
 "پشتیبانی نمی‌کنیم."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:302
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "آیا مطمئن هستید که می‌خواهید کلید و رمز خریدار را دوباره تعیین کنید؟"
 
@@ -5547,16 +5596,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "یادداشت"
 
@@ -5705,7 +5756,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"
@@ -5953,7 +6004,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.
@@ -6012,7 +6064,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.
@@ -6352,8 +6405,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "تصویر"
@@ -6369,6 +6423,11 @@ 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."
@@ -6405,7 +6464,7 @@ 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’."
@@ -6437,7 +6496,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.
@@ -6498,105 +6557,145 @@ msgstr "چنان‌که به کاربران اجازهٔ دعوت‌کردن ک
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-msgid "Save user settings"
-msgstr ""
+#, fuzzy
+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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "مشترک شدن این کاربر"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "رد کردن"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+msgid "Reject this subscription."
 msgstr "رد کردن این اشتراک"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:248
 msgid "No authorization request!"
 msgstr "هیچ درخواست اجازه‌ای وجود ندارد!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 msgid "Subscription authorized"
 msgstr "اشتراک تصدیق شد"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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:285
 msgid "Subscription rejected"
 msgstr "اشتراک پذیرفته نشد"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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:325
 #, fuzzy, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr "نشانی تصویر چهره «%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:332
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr "نشانی تصویر چهره «%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:340
 #, fuzzy, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "نشانی اینترنتی نمایهٔ «%s» برای یک کاربر محلی است."
 
-#: actions/userauthorization.php:329
-#, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
+#: actions/userauthorization.php:358
+#, fuzzy, php-format
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "نشانی اینترنتی نمایهٔ «%s» برای یک کاربر محلی است."
 
-#: actions/userauthorization.php:345
-#, 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:368
+#, 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."
 msgstr "نشانی تصویر چهره «%s» معتبر نیست."
 
-#: actions/userauthorization.php:350
-#, 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:385
+#, fuzzy, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "نمی‌توان نشانی اینترنتی چهره را خواند«%s»."
 
-#: actions/userauthorization.php:355
-#, 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:392
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "نوع تصویر برای نشانی اینترنتی چهره نادرست است «%s»."
 
 #. TRANS: Page title for profile design page.
@@ -7804,6 +7903,11 @@ 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"
@@ -8260,6 +8364,11 @@ 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
@@ -8298,6 +8407,21 @@ 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
@@ -8406,7 +8530,6 @@ msgid "Grant this user the \"%s\" role"
 msgstr ""
 
 #: lib/groupeditform.php:147
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "۱-۶۴ کاراکتر کوچک یا اعداد، بدون نقطه گذاری یا فاصله"
 
@@ -9173,6 +9296,10 @@ msgstr "به این پیام پاسخ دهید"
 msgid "Reply"
 msgstr "پاسخ"
 
+#: lib/noticelist.php:673
+msgid "Delete this notice"
+msgstr "این پیام را پاک کن"
+
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "پیام تکرار شد"
@@ -9457,6 +9584,10 @@ 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"
@@ -9725,3 +9856,15 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "6 or more characters"
+#~ msgstr "۶ نویسه یا بیش‌تر"
+
+#~ msgid "Same as password above"
+#~ msgstr "مانند گذرواژهٔ بالا"
+
+#~ msgid "Can't save new password."
+#~ msgstr "نمی‌توان گذرواژهٔ جدید را ذخیره کرد."
+
+#~ msgid "URL of your homepage, blog, or profile on another site"
+#~ msgstr "نشانی اینترنتی صفحهٔ خانگی، وبلاگ یا نمایه‌تان در یک وب‌گاه دیگر"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 438bc2a854..e9fd7976e9 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -14,17 +14,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:05:50+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27:17+0000\n"
 "Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -162,7 +162,7 @@ msgstr "Sivua ei ole."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -520,7 +520,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."
 
@@ -608,7 +608,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
 
@@ -618,7 +618,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "Tuo ei ole kelvollinen tunnus."
 
@@ -631,7 +631,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "Kotisivun verkko-osoite ei ole toimiva."
 
@@ -641,7 +641,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:226
+#: actions/register.php:218
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
@@ -670,7 +670,7 @@ 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:235
+#: actions/register.php:227
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)."
@@ -829,15 +829,15 @@ msgstr "Sinulla ei ole valtuutusta tähän."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -872,7 +872,7 @@ msgstr "Tietokantavirhe tallennettaessa risutagiä: %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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Odottamaton lomakkeen lähetys."
@@ -918,19 +918,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Salasana"
 
@@ -1054,7 +1055,7 @@ msgstr "API-metodia ei löytynyt."
 #. TRANS: %s is the requested output format.
 #: actions/apistatusesshow.php:144
 #, fuzzy, php-format
-msgid "Unsupported format: %s"
+msgid "Unsupported format: %s."
 msgstr "Formaattia ei ole tuettu."
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1233,25 +1234,26 @@ 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:334
 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:345
 #, 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:379
 #, fuzzy, php-format
 msgid "No content for notice %d."
 msgstr "Hae päivityksien sisällöstä"
 
 #. 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."
@@ -1419,7 +1421,7 @@ msgid "Not a member."
 msgstr "Kaikki jäsenet"
 
 #. 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."
@@ -1524,9 +1526,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."
 
@@ -1584,9 +1588,10 @@ 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
-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.
@@ -1646,7 +1651,7 @@ msgstr "Tausta"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1684,7 +1689,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.
@@ -1701,9 +1707,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"
+#: actions/block.php:165
+#, fuzzy
+msgid "Block this user."
 msgstr "Estä tämä käyttäjä"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1868,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:426
 msgid "Confirm"
 msgstr "Vahvista"
 
@@ -1898,14 +1904,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
 #, fuzzy
 msgid "You are not the owner of this application."
 msgstr "Sinä et kuulu tähän ryhmään."
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:112 actions/showapplication.php:118
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Istuntoavaimesi kanssa oli ongelma."
@@ -1928,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 "Älä poista tätä päivitystä"
 
 #. 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ä päivitys"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1990,13 +1996,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 "Älä poista tätä päivitystä"
 
 #. 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 käyttäjä"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2039,12 +2045,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 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+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.
@@ -2079,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 "Ä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"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "Poista käyttäjä"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2259,24 +2267,21 @@ 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
+#: actions/designadminpanel.php:720
 #, fuzzy
-msgid "Restore default designs"
+msgid "Restore default designs."
 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 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 "Käytä oletusasetuksia"
 
 #. 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 "Ryhmän ulkoasu"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2310,7 +2315,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
 #, fuzzy
 msgid "No such application."
 msgstr "Päivitystä ei ole."
@@ -2605,7 +2610,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Tuo ei ole kelvollinen sähköpostiosoite."
@@ -2683,19 +2688,22 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 #, fuzzy
 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "Uusi saapuvan sähköpostin osoite lisätty."
 
@@ -2706,7 +2714,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
-msgid "Disfavor favorite"
+#, fuzzy
+msgid "Disfavor favorite."
 msgstr "Poista suosikeista"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2943,12 +2952,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.
@@ -3271,7 +3282,8 @@ 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.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "Asetukset tallennettu."
 
@@ -3692,42 +3704,42 @@ msgstr "Tallenna"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "Olet jo kirjautunut sisään."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "Väärä käyttäjätunnus tai salasana"
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 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:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "Kirjaudu sisään"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "Muista minut"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 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:259
 msgid "Lost or forgotten password?"
 msgstr "Oletko hukannut tai unohtanut salasanasi?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3735,12 +3747,12 @@ msgstr ""
 "Syötä turvallisuussyistä käyttäjätunnuksesi ja salasanasi uudelleen ennen "
 "asetuksiesi muuttamista."
 
-#: actions/login.php:292
+#: actions/login.php:281
 #, 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:284
 #, fuzzy, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3959,31 +3971,31 @@ msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr ""
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 #, 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3991,20 +4003,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, 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."
@@ -4014,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
@@ -4108,17 +4140,21 @@ msgstr "Päivityksen sisältö ei kelpaa"
 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."
 
@@ -4144,40 +4180,45 @@ msgstr "Vanha salasana"
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+#, fuzzy
+msgid "6 or more characters."
 msgstr "6 tai useampia merkkejä"
 
-#: 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:427
+#, fuzzy
+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:230
 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:233
 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
-msgid "Can't save new password."
+#. 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."
 
-#. 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."
 
@@ -4526,7 +4567,7 @@ 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:109 actions/register.php:419
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4536,7 +4577,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:455
+#: actions/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4544,13 +4585,13 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite."
@@ -4558,7 +4599,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:129 actions/register.php:457
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4566,28 +4607,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 #, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Olinpaikka kuten \"Kaupunki, Maakunta (tai Lääni), Maa\""
@@ -4607,8 +4649,10 @@ msgstr "Tagit"
 
 #. 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 ""
 "Kuvaa itseäsi henkilötageilla (sanoja joissa voi olla muita kirjaimia kuin "
 "ääkköset, numeroita, -, ., ja _), pilkulla tai välilyönnillä erotettuna"
@@ -4620,7 +4664,8 @@ msgstr "Kieli"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-msgid "Preferred language"
+#, fuzzy
+msgid "Preferred language."
 msgstr "Ensisijainen kieli"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4635,8 +4680,9 @@ msgstr "Millä aikavyöhykkeellä olet tavallisesti?"
 
 #. 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 ""
 "Tilaa automaattisesti kaikki, jotka tilaavat päivitykseni (ei sovi hyvin "
 "ihmiskäyttäjille)"
@@ -4644,7 +4690,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:258 actions/register.php:221
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4664,9 +4710,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 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:291
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Virheellinen tagi: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4905,6 +4951,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"
@@ -4916,12 +4968,6 @@ 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
@@ -4975,14 +5021,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:248
 msgid "Error setting user."
 msgstr "Virhe tapahtui käyttäjän asettamisessa."
 
@@ -4992,92 +5032,91 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr "Valitettavasti vain kutsutut ihmiset voivat rekisteröityä."
 
-#: actions/register.php:99
+#: actions/register.php:94
 msgid "Sorry, invalid invitation code."
 msgstr "Virheellinen kutsukoodin."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "Rekisteröityminen onnistui"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "Rekisteröidy"
 
-#: actions/register.php:142
+#: actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Rekisteröityminen ei ole sallittu."
 
-#: actions/register.php:209
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:201
+#, 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:218
+#: actions/register.php:210
 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:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "Käyttäjätunnus tai salasana ei kelpaa."
 
-#: actions/register.php:351
+#: actions/register.php:340
 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Sähköposti"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, 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:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Pitempi nimi, mieluiten oikea nimesi"
 
-#: actions/register.php:462
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite."
+#: actions/register.php:471
+#, fuzzy
+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:510
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:533
+#: actions/register.php:520
 #, 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:524
 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:527
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:532
 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5086,7 +5125,7 @@ msgstr ""
 "poislukien yksityinen tieto: salasana, sähköpostiosoite, IM-osoite, "
 "puhelinnumero."
 
-#: actions/register.php:588
+#: actions/register.php:573
 #, fuzzy, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5119,7 +5158,7 @@ msgstr ""
 "\n"
 "Kiitokset rekisteröitymisestäsi ja toivomme että pidät palvelustamme."
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5152,7 +5191,8 @@ msgid "User nickname"
 msgstr "Käyttäjätunnus"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow"
+#, 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
@@ -5160,7 +5200,8 @@ msgid "Profile URL"
 msgstr "Profiilin 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 "Profiilisi URL-osoite toisessa yhteensopivassa mikroblogauspalvelussa"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5170,7 +5211,8 @@ msgid "Subscribe"
 msgstr "Tilaa"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)"
+#, fuzzy
+msgid "Invalid profile URL (bad format)."
 msgstr "Profiilin URL-osoite '%s' ei kelpaa (virheellinen muoto)."
 
 #: actions/remotesubscribe.php:167
@@ -5375,7 +5417,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."
@@ -5421,97 +5463,97 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 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
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 #, fuzzy
 msgid "Organization"
 msgstr "Sivutus"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Tilastot"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:207
 msgid "Application actions"
 msgstr ""
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Poista"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr ""
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr ""
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr ""
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:302
 #, 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?"
@@ -5597,16 +5639,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "Huomaa"
 
@@ -5747,7 +5791,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"
@@ -5997,7 +6041,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.
@@ -6057,7 +6101,8 @@ msgstr "Puhelinnumeroa ei ole."
 
 #. 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 "Puhelinnumero, ei välimerkkejä tai välilyöntejä, suuntanumerollinen"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6389,8 +6434,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Kuva"
@@ -6407,6 +6453,11 @@ 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."
@@ -6446,7 +6497,7 @@ 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’."
@@ -6478,7 +6529,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.
@@ -6546,57 +6597,71 @@ msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-msgid "Save user settings"
-msgstr ""
+#, fuzzy
+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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, 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:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Hylkää"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
 #, 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:248
 msgid "No authorization request!"
 msgstr "Ei valtuutuspyyntöä!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 msgid "Subscription authorized"
 msgstr "Tilaus sallittu"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 #, fuzzy
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
@@ -6607,11 +6672,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:285
 msgid "Subscription rejected"
 msgstr "Tilaus hylätty"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 #, fuzzy
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
@@ -6621,39 +6687,62 @@ 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."
 
-#: 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:325
 #, 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:332
 #, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr ""
 
-#: 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:340
 #, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
 
-#: actions/userauthorization.php:329
+#. 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."
+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:368
 #, 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:378
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+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
+#, fuzzy, php-format
+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:392
 #, 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.
@@ -7889,6 +7978,11 @@ 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"
@@ -8313,6 +8407,11 @@ 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
@@ -8351,6 +8450,24 @@ 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
@@ -8460,7 +8577,6 @@ msgid "Grant this user the \"%s\" role"
 msgstr ""
 
 #: lib/groupeditform.php:147
-#, fuzzy
 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 "
@@ -9157,6 +9273,10 @@ 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"
@@ -9450,6 +9570,10 @@ 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"
@@ -9726,3 +9850,16 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "6 or more characters"
+#~ msgstr "6 tai useampia merkkejä"
+
+#~ msgid "Same as password above"
+#~ msgstr "Sama kuin ylläoleva salasana"
+
+#~ msgid "Can't save new password."
+#~ msgstr "Uutta salasanaa ei voida tallentaa."
+
+#~ msgid "URL of your homepage, blog, or profile on another site"
+#~ msgstr ""
+#~ "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite."
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 03f7adecd5..6692f47d3f 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:05:53+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27:18+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -163,7 +163,7 @@ msgstr "Page non trouvée."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -528,7 +528,8 @@ msgstr "Destinataire non trouvé."
 
 #. 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."
+#, fuzzy
+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."
@@ -615,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudo déjà utilisé. Essayez-en un autre."
 
@@ -625,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "Pseudo invalide."
 
@@ -638,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "L’adresse du site personnel n’est pas un URL valide. "
 
@@ -648,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:226
+#: actions/register.php:218
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Le nom complet est trop long (limité à 255 caractères maximum)."
 
@@ -676,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:235
+#: actions/register.php:227
 msgid "Location is too long (maximum 255 characters)."
 msgstr "L’emplacement est trop long (limité à 255 caractères maximum)."
 
@@ -831,15 +832,15 @@ msgstr "Le jeton de requête a déjà été autorisé."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -874,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Soumission de formulaire inattendue."
@@ -927,19 +928,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -1061,8 +1063,8 @@ 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
-#, php-format
-msgid "Unsupported format: %s"
+#, fuzzy, php-format
+msgid "Unsupported format: %s."
 msgstr "Format non supporté : %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1244,26 +1246,27 @@ 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:334
 #, 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:345
 #, 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:379
 #, 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."
@@ -1430,7 +1433,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."
@@ -1538,9 +1541,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."
 
@@ -1595,9 +1600,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
-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 "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.
@@ -1657,7 +1663,7 @@ 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"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1698,7 +1704,8 @@ msgstr "Non"
 
 #. 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 "Ne pas bloquer cet utilisateur"
 
 #. TRANS: Button label on the user block form.
@@ -1715,9 +1722,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.
@@ -1880,7 +1887,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:426
 msgid "Confirm"
 msgstr "Confirmer"
 
@@ -1910,13 +1917,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Un problème est survenu avec votre jeton de session."
@@ -1940,12 +1947,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 "Ne pas supprimer cette 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 "Supprimer cette application"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -2000,12 +2009,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 "Ne pas supprimer ce groupe"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-msgid "Delete this group"
+#, fuzzy
+msgid "Delete this group."
 msgstr "Supprimer ce groupe"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2048,12 +2059,14 @@ msgstr "Voulez-vous vraiment supprimer cet avis ?"
 
 #. 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 "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.
@@ -2090,13 +2103,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.
-#. 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.
@@ -2263,21 +2276,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.
@@ -2309,7 +2322,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."
 
@@ -2590,7 +2603,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Adresse courriel invalide."
@@ -2666,19 +2679,22 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 #, 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "Nouvelle adresse de courriel entrant ajoutée."
 
@@ -2689,7 +2705,8 @@ 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
-msgid "Disfavor favorite"
+#, fuzzy
+msgid "Disfavor favorite."
 msgstr "Retirer ce favori"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2930,12 +2947,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 "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
-msgid "Block this user from this group"
+#, 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.
@@ -3272,7 +3291,8 @@ 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.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "Préférences enregistrées"
 
@@ -3694,43 +3714,43 @@ 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
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "Déjà connecté."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "Identifiant ou mot de passe incorrect."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 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:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "Ouvrir une session"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "Ouverture de session"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "Se souvenir de moi"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 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:259
 msgid "Lost or forgotten password?"
 msgstr "Mot de passe perdu ?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3738,11 +3758,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:281
 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:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3958,31 +3978,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:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr "Applications connectées."
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3992,14 +4012,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:211
 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:231
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -4008,6 +4028,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."
@@ -4017,6 +4047,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
@@ -4106,17 +4146,21 @@ msgstr "Jeton d’identification invalide."
 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."
@@ -4143,40 +4187,45 @@ msgstr "Ancien mot de passe"
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+#, fuzzy
+msgid "6 or more characters."
 msgstr "6 caractères ou plus"
 
-#: 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:427
+#, 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:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:230
 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:233
 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
-msgid "Can't save new password."
+#. 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."
 
-#. 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é."
 
@@ -4504,14 +4553,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:433
+#: actions/profilesettings.php:109 actions/register.php:419
 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/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4519,13 +4568,13 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 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."
@@ -4533,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:129 actions/register.php:457
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4541,28 +4590,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Indiquez votre emplacement, ex.: « Ville, État (ou région), Pays »"
 
@@ -4581,8 +4631,10 @@ msgstr "Balises"
 
 #. 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 ""
 "Marques pour vous-même (lettres, chiffres, -, ., et _), séparées par des "
 "virgules ou des espaces"
@@ -4594,7 +4646,8 @@ msgstr "Langue"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-msgid "Preferred language"
+#, fuzzy
+msgid "Preferred language."
 msgstr "Langue préférée"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4609,8 +4662,9 @@ msgstr "Quel est votre fuseau horaire habituel ?"
 
 #. 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 ""
 "M’abonner automatiquement à tous ceux qui s’abonnent à moi (recommandé pour "
 "les utilisateurs non-humains)"
@@ -4618,7 +4672,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:258 actions/register.php:221
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4637,9 +4691,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 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:291
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Marque invalide : « %s »"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4887,6 +4941,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"
@@ -4898,12 +4958,6 @@ 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
@@ -4955,14 +5009,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:248
 msgid "Error setting user."
 msgstr "Erreur lors de la configuration de l’utilisateur."
 
@@ -4972,73 +5020,72 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 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:94
 msgid "Sorry, invalid invitation code."
 msgstr "Désolé, code d’invitation invalide."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "Compte créé avec succès"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "Créer un compte"
 
-#: actions/register.php:142
+#: actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Inscription non autorisée."
 
-#: actions/register.php:209
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:201
+#, 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:218
+#: actions/register.php:210
 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:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "Identifiant ou mot de passe incorrect."
 
-#: actions/register.php:351
+#: actions/register.php:340
+#, 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Courriel"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, 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:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Nom plus long, votre \"vrai\" nom de préférence"
 
-#: actions/register.php:462
-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:471
+#, 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:523
+#: actions/register.php:510
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
@@ -5046,23 +5093,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:520
 #, 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:524
 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:527
 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:532
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5072,7 +5119,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:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5106,7 +5153,7 @@ msgstr ""
 "Merci pour votre inscription ! Nous vous souhaitons d’apprécier notre "
 "service."
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5139,7 +5186,8 @@ msgid "User nickname"
 msgstr "Pseudo de l’utilisateur"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow"
+#, fuzzy
+msgid "Nickname of the user you want to follow."
 msgstr "Pseudo de l’utilisateur que vous voulez suivre"
 
 #: actions/remotesubscribe.php:132
@@ -5147,7 +5195,8 @@ msgid "Profile URL"
 msgstr "URL du profil"
 
 #: 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 votre profil sur un autre service de micro-blogging compatible"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5157,7 +5206,8 @@ msgid "Subscribe"
 msgstr "S’abonner"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)"
+#, fuzzy
+msgid "Invalid profile URL (bad format)."
 msgstr "URL du profil invalide (mauvais format)"
 
 #: actions/remotesubscribe.php:167
@@ -5360,7 +5410,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"
 
@@ -5403,87 +5453,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: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
+#: actions/showapplication.php:153 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
+#: actions/showapplication.php:163 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
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organisation"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, 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:207
 msgid "Application actions"
 msgstr "Actions de l’application"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 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
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Supprimer"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "Informations sur l’application"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr "Clé de l’utilisateur"
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr "Secret de l’utilisateur"
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr "URL du jeton de requête"
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr "URL du jeton d’accès"
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr "Autoriser l’URL"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5491,7 +5541,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:302
 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 ?"
 
@@ -5584,16 +5634,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "Note"
 
@@ -5741,7 +5793,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"
@@ -5994,7 +6046,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 "Enregistrer l'avis du site"
 
 #. TRANS: Title for SMS settings.
@@ -6054,7 +6107,8 @@ 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
-msgid "Phone number, no punctuation or spaces, with area code"
+#, 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"
 
@@ -6395,8 +6449,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Photo"
@@ -6413,6 +6468,11 @@ 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."
@@ -6449,7 +6509,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’."
@@ -6481,8 +6541,8 @@ msgstr "Texte de bienvenue invalide. La taille maximale est de 255 caractères."
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Abonnement par défaut invalide : « %1$s » n’est pas un utilisateur."
 
 #. TRANS: Link description in user account settings menu.
@@ -6544,55 +6604,71 @@ 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 "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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, 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:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Refuser"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+msgid "Reject this subscription."
 msgstr "Rejeter cet abonnement"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:248
 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:271
 msgid "Subscription authorized"
 msgstr "Abonnement autorisé"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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,11 +6678,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:285
 msgid "Subscription rejected"
 msgstr "Abonnement refusé"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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 "
@@ -6616,40 +6693,65 @@ msgstr ""
 "Vérifiez les instructions du site pour savoir comment refuser pleinement "
 "l’abonnement."
 
-#: actions/userauthorization.php:303
-#, 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:325
+#, fuzzy, php-format
+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
-#, 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:332
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is too long."
 msgstr "L’URI à laquelle vous vous êtes abonné(e) ‘%s’ est trop longue."
 
-#: actions/userauthorization.php:314
-#, 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:340
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
 "L’URI à laquelle vous vous êtes abonné(e) ‘%s’ est un utilisateur local."
 
-#: actions/userauthorization.php:329
-#, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
+#: actions/userauthorization.php:358
+#, fuzzy, php-format
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "L’URL du profil ‘%s’ est pour un utilisateur local."
 
-#: actions/userauthorization.php:345
-#, 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:368
+#, 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."
 msgstr "L’URL de l’avatar ‘%s’ n’est pas valide."
 
-#: actions/userauthorization.php:350
-#, 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:385
+#, fuzzy, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Impossible de lire l’URL de l’avatar « %s »."
 
-#: actions/userauthorization.php:355
-#, 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:392
+#, 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.
@@ -7873,6 +7975,11 @@ 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"
@@ -8335,6 +8442,11 @@ 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
@@ -8371,6 +8483,21 @@ 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
@@ -8478,7 +8605,6 @@ msgid "Grant this user the \"%s\" role"
 msgstr "Accorder le rôle « %s » à cet utilisateur"
 
 #: lib/groupeditform.php:147
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1 à 64 lettres minuscules ou chiffres, sans ponctuation ni espaces."
 
@@ -8491,7 +8617,7 @@ msgid "Describe the group or topic"
 msgstr "Description du groupe ou du sujet"
 
 #: lib/groupeditform.php:163
-#, fuzzy, php-format
+#, 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"
@@ -9262,6 +9388,10 @@ 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"
@@ -9542,6 +9672,10 @@ 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"
@@ -9824,3 +9958,16 @@ msgstr "XML invalide, racine XRD manquante."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Obtention de la sauvegarde depuis le fichier « %s »."
+
+#~ msgid "6 or more characters"
+#~ msgstr "6 caractères ou plus"
+
+#~ msgid "Same as password above"
+#~ msgstr "Identique au mot de passe ci-dessus"
+
+#~ msgid "Can't save new password."
+#~ msgstr "Impossible de sauvegarder le nouveau mot de passe."
+
+#~ 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"
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index 206923ad36..da0cc3bdef 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:05:56+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27:20+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -153,7 +153,7 @@ msgstr "Esa páxina non existe."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -519,7 +519,8 @@ 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
-msgid "Can't send direct messages to users who aren't your friend."
+#, 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."
 
@@ -605,7 +606,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "Ese alcume xa está en uso. Probe con outro."
 
@@ -615,7 +616,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "O formato do alcume non é correcto."
 
@@ -628,7 +629,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "O URL da páxina persoal non é correcto."
 
@@ -638,7 +639,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:226
+#: actions/register.php:218
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "O nome completo é longo de máis (o máximo son 255 caracteres)."
@@ -667,7 +668,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:235
+#: actions/register.php:227
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "A localidade é longa de máis (o máximo son 255 caracteres)."
@@ -825,15 +826,15 @@ msgstr "Non está autorizado."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: 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."
@@ -867,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Envío de formulario inesperado."
@@ -918,19 +919,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Contrasinal"
 
@@ -1051,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.
@@ -1233,25 +1235,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1419,7 +1422,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."
@@ -1526,9 +1529,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."
 
@@ -1583,9 +1588,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
-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 "Escolla unha zona cadrada da imaxe para usala como avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1645,7 +1651,7 @@ msgstr "Fondo"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1686,7 +1692,8 @@ msgstr "Non"
 
 #. 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 bloquear este usuario"
 
 #. TRANS: Button label on the user block form.
@@ -1703,9 +1710,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.
@@ -1869,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:440
+#: actions/recoverpassword.php:262 actions/register.php:426
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -1899,13 +1906,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Houbo un problema co seu pase."
@@ -1929,12 +1936,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 borrar a aplicación"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-msgid "Delete this application"
+#, fuzzy
+msgid "Delete this application."
 msgstr "Borrar a aplicación"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1991,13 +2000,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.
@@ -2040,12 +2049,14 @@ msgstr "Está seguro de querer borrar esta 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 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.
@@ -2082,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 "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.
@@ -2257,21 +2268,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.
@@ -2303,7 +2314,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."
 
@@ -2591,7 +2602,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "O enderezo de correo electrónico é incorrecto."
@@ -2668,19 +2679,22 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 #, 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "Engadiuse un novo enderezo de correo electrónico entrante."
 
@@ -2691,7 +2705,8 @@ 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
-msgid "Disfavor favorite"
+#, fuzzy
+msgid "Disfavor favorite."
 msgstr "Desmarcar como favorita"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2930,12 +2945,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 excluír deste grupo a este usuario"
 
 #. 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 "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.
@@ -3266,7 +3283,8 @@ 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.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "Gardáronse as preferencias."
 
@@ -3685,43 +3703,43 @@ 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
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "Xa se identificou."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "Nome de usuario ou contrasinal incorrectos."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 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:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "Identificarse"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "Identificarse no sitio"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "Lembrádeme"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 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:259
 msgid "Lost or forgotten password?"
 msgstr "Esqueceu ou perdeu o contrasinal?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3729,11 +3747,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:281
 msgid "Login with your username and password."
 msgstr "Identifíquese co seu nome de usuario e contrasinal."
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3947,31 +3965,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:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr "Aplicacións conectadas"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 #, 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3979,20 +3997,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, 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."
@@ -4002,6 +4030,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
@@ -4094,17 +4132,21 @@ msgstr "O pase especificado é incorrecto."
 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."
@@ -4131,40 +4173,45 @@ msgstr "Contrasinal anterior"
 msgid "New password"
 msgstr "Novo contrasinal"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+#, fuzzy
+msgid "6 or more characters."
 msgstr "Seis ou máis caracteres"
 
-#: 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:427
+#, fuzzy
+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:230
 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:233
 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
-msgid "Can't save new password."
+#. 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."
 
-#. 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."
 
@@ -4503,7 +4550,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:433
+#: actions/profilesettings.php:109 actions/register.php:419
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4513,7 +4560,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:455
+#: actions/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4521,13 +4568,13 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 #, 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"
@@ -4535,7 +4582,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:129 actions/register.php:457
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4543,28 +4590,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Onde está a vivir, coma “localidade, provincia (ou comunidade), país”"
 
@@ -4583,8 +4631,10 @@ msgstr "Etiquetas"
 
 #. 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 ""
 "Etiquetas para vostede (letras salvo eñes e tiles, números, puntos, guións e "
 "guións baixos), separados por comas ou espazos"
@@ -4596,7 +4646,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 escollida"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4611,8 +4662,9 @@ msgstr "En que fuso horario adoita estar?"
 
 #. 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 ""
 "Subscribirse automaticamente a quen se subscriba a min (o mellor para os "
 "bots)"
@@ -4620,7 +4672,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:258 actions/register.php:221
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4640,9 +4692,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 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:291
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Etiqueta incorrecta: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4891,6 +4943,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"
@@ -4902,12 +4960,6 @@ 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
@@ -4963,14 +5015,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:248
 msgid "Error setting user."
 msgstr "Houbo un erro ao configurar o usuario."
 
@@ -4979,96 +5025,96 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr "Só se pode rexistrar mediante invitación."
 
-#: actions/register.php:99
+#: actions/register.php:94
 msgid "Sorry, invalid invitation code."
 msgstr "O código da invitación é incorrecto."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "Rexistrouse correctamente"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "Rexistrarse"
 
-#: actions/register.php:142
+#: actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Non se permite o rexistro."
 
-#: actions/register.php:209
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:201
+#, 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:218
+#: actions/register.php:210
 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:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "O nome de usuario ou contrasinal non son correctos."
 
-#: actions/register.php:351
+#: actions/register.php:340
+#, 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, 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:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Nome longo, preferiblemente o seu nome \"real\""
 
-#: actions/register.php:462
-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:471
+#, 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:523
+#: actions/register.php:510
 #, 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:520
 #, 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:524
 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:527
 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:532
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5078,7 +5124,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:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5110,7 +5156,7 @@ msgstr ""
 "\n"
 "Grazas por rexistrarse. Esperamos que goce deste servizo."
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5143,7 +5189,8 @@ msgid "User nickname"
 msgstr "Alcume do usuario"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow"
+#, fuzzy
+msgid "Nickname of the user you want to follow."
 msgstr "Alcume do usuario ao que quere seguir"
 
 #: actions/remotesubscribe.php:132
@@ -5151,7 +5198,8 @@ msgid "Profile URL"
 msgstr "URL do perfil"
 
 #: 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 do seu perfil noutro servizo de mensaxes de blogue curtas compatible"
 
@@ -5162,7 +5210,8 @@ msgid "Subscribe"
 msgstr "Subscribirse"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)"
+#, fuzzy
+msgid "Invalid profile URL (bad format)."
 msgstr "O enderezo URL do perfil é incorrecto (formato erróneo)"
 
 #: actions/remotesubscribe.php:167
@@ -5364,7 +5413,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"
 
@@ -5406,87 +5455,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: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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icona"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 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
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organización"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Estatísticas"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, 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:207
 msgid "Application actions"
 msgstr "Accións da aplicación"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 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
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Borrar"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "Información da aplicación"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr "Clave do consumidor"
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr "Pregunta secreta do consumidor"
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr "Solicitar un URL de pase"
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr "Acceder ao URL do pase"
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr "Autorizar o URL"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5494,7 +5543,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:302
 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 "
@@ -5588,16 +5637,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "Nota"
 
@@ -5745,7 +5796,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"
@@ -5998,7 +6049,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 "Gardar a nota do sitio"
 
 #. TRANS: Title for SMS settings.
@@ -6056,7 +6108,8 @@ msgstr "Número de teléfono para os 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 ""
 "Número de teléfono, sen signos de puntuación nin espazos en branco, co "
 "código da zona"
@@ -6395,8 +6448,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Fotografía"
@@ -6413,6 +6467,11 @@ 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."
@@ -6450,7 +6509,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,7 +6543,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.
@@ -6545,55 +6604,71 @@ 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
-msgid "Save user settings"
+#, fuzzy
+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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, 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:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rexeitar"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+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:248
 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:271
 msgid "Subscription authorized"
 msgstr "Autorizouse a subscrición"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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,11 +6678,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:285
 msgid "Subscription rejected"
 msgstr "Rexeitouse a subscrición"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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,39 +6693,64 @@ msgstr ""
 "ás instrucións do sitio para obter máis información sobre como rexeitar "
 "completamente a subscrición."
 
-#: actions/userauthorization.php:303
-#, 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:325
+#, fuzzy, php-format
+msgid "Listener URI \"%s\" not found here."
 msgstr "Non se atopou o URI do seguidor, \"%s\", aquí."
 
-#: actions/userauthorization.php:308
-#, 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:332
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is too long."
 msgstr "O URI do seguidor, \"%s\", é longo de máis."
 
-#: actions/userauthorization.php:314
-#, 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:340
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "O URI do seguidor, \"%s\", é dun usuario local."
 
-#: actions/userauthorization.php:329
-#, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
+#: actions/userauthorization.php:358
+#, fuzzy, php-format
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "O URL do perfil, \"%s\", pertence a un usuario local."
 
-#: actions/userauthorization.php:345
-#, 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:368
+#, 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."
 msgstr "O URL do avatar, \"%s\", é incorrecto."
 
-#: actions/userauthorization.php:350
-#, 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:385
+#, fuzzy, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Non se puido ler o URL do avatar, \"%s\"."
 
-#: actions/userauthorization.php:355
-#, 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:392
+#, 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.
@@ -7873,6 +7974,11 @@ 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"
@@ -8334,6 +8440,11 @@ 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
@@ -8372,6 +8483,21 @@ 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
@@ -8479,7 +8605,6 @@ msgid "Grant this user the \"%s\" role"
 msgstr "Outorgarlle a este usuario o rol \"%s\""
 
 #: lib/groupeditform.php:147
-#, fuzzy
 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, "
@@ -9264,6 +9389,10 @@ 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"
@@ -9545,6 +9674,10 @@ 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"
@@ -9824,3 +9957,15 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "6 or more characters"
+#~ msgstr "Seis ou máis caracteres"
+
+#~ msgid "Same as password above"
+#~ msgstr "Igual ao contrasinal anterior"
+
+#~ msgid "Can't save new password."
+#~ msgstr "Non se puido gardar o novo contrasinal."
+
+#~ msgid "URL of your homepage, blog, or profile on another site"
+#~ msgstr "URL da súa páxina persoal, blogue ou perfil noutro sitio"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index 5267a12241..5e75fc995d 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:05:58+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27:21+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 (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -154,7 +154,7 @@ msgstr "Strona njeeksistuje."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -510,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 "Can't send direct messages to users who aren't your friend."
+#, fuzzy
+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."
@@ -595,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "Přimjeno so hižo wužiwa. Spytaj druhe."
 
@@ -605,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "Žane płaćiwe přimjeno."
 
@@ -618,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "Startowa strona njeje płaćiwy URL."
 
@@ -628,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:226
+#: actions/register.php:218
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Dospołne mjeno je předołho (maks. 255 znamješkow)."
 
@@ -658,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:235
+#: actions/register.php:227
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Městno je předołho (maks. 255 znamješkow)."
 
@@ -815,15 +816,15 @@ msgstr "Naprašowanski token hižo awtorizowany."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -854,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Njewočakowane wotpósłanje formulara."
@@ -899,19 +900,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Hesło"
 
@@ -1029,8 +1031,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.
@@ -1208,25 +1210,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1381,7 +1384,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ć."
 
@@ -1485,9 +1488,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."
 
@@ -1542,9 +1547,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.
@@ -1602,7 +1607,8 @@ 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"
+#, fuzzy
+msgid "Backup your account."
 msgstr "Twoje konto zawěsćić"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1640,7 +1646,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.
@@ -1657,9 +1664,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"
+#: actions/block.php:165
+#, fuzzy
+msgid "Block this user."
 msgstr "Tutoho wužiwarja blokować"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1818,7 +1825,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:426
 msgid "Confirm"
 msgstr "Wobkrućić"
 
@@ -1847,13 +1854,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr ""
@@ -1874,12 +1881,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 njezničić"
 
 #. 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 zničić"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1930,12 +1939,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 "Tuitu 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.
@@ -1977,12 +1988,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 njewušmórnyć"
 
 #. 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 "Tutu zdźělenku wušmórnyć"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
@@ -2015,13 +2028,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 "Tutu skupinu 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"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "Tutoho wužiwarja wušmórnyć"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2184,21 +2198,21 @@ 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"
+#: actions/designadminpanel.php:720
+#, fuzzy
+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"
+#: actions/designadminpanel.php:728
+#, fuzzy
+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"
+#: actions/designadminpanel.php:736
+#, fuzzy
+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.
@@ -2230,7 +2244,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."
 
@@ -2506,7 +2520,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Njepłaćiwa e-mejlowa adresa."
@@ -2578,18 +2592,21 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "Nowa adresa za dochadźace e-mejle přidata."
 
@@ -2600,7 +2617,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
-msgid "Disfavor favorite"
+#, fuzzy
+msgid "Disfavor favorite."
 msgstr "Z faworitow wotstronić"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2832,12 +2850,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 blokować"
 
 #. 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.
@@ -3143,7 +3163,8 @@ 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.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "Nastajenja składowane."
 
@@ -3529,39 +3550,39 @@ msgstr "Składować"
 msgid "Save license settings"
 msgstr "Licencne nastajenja składować"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "Hižo přizjewjeny."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "Wopačne wužiwarske mjeno abo hesło."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 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:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "Přizjewić"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "Při sydle přizjewić"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "Składować"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
-#: actions/login.php:269
+#: actions/login.php:259
 msgid "Lost or forgotten password?"
 msgstr "Hesło zhubjene abo zabyte?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3569,11 +3590,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:281
 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:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3773,30 +3794,30 @@ 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:70
 msgid "Connected applications"
 msgstr "Zwjazane aplikacije"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3804,20 +3825,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, 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 "Wužiwar njenamakany."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "Wotpowědna zdźělenka njenamakana."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Zdźělenka nima profil."
@@ -3827,6 +3858,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
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "Přijimowar 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
@@ -3916,17 +3957,21 @@ msgstr "Njepłaćiwe přizjewjenske znamješko podate."
 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 "
@@ -3954,40 +3999,42 @@ msgstr "Stare hesło"
 msgid "New password"
 msgstr "Nowe hesło"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
-msgstr "6 abo wjace znamješkow"
+#: actions/passwordsettings.php:109 actions/register.php:423
+msgid "6 or more characters."
+msgstr "6 abo wjace znamješkow."
 
-#: actions/passwordsettings.php:113
-msgid "Same as password above"
-msgstr "Samsne hesło kaž horjeka"
+#. 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."
+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:230
 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:233
 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
-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."
 
@@ -4310,7 +4357,7 @@ 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:109 actions/register.php:419
 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 "
@@ -4319,7 +4366,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:455
+#: actions/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4327,20 +4374,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:460
+#: actions/profilesettings.php:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 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:129 actions/register.php:457
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4350,28 +4397,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Hdźež sy, na př. \"město, zwjazkowy kraj (abo region) , kraj\""
 
@@ -4391,7 +4439,8 @@ 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.
@@ -4401,7 +4450,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.
@@ -4416,14 +4466,15 @@ 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)"
-msgstr ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)."
+msgstr "Nowych wužiwarjow za tutoho wužiwarja abonować."
 
 #. 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:258 actions/register.php:221
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4444,9 +4495,9 @@ 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
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:291
+#, fuzzy, 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
@@ -4672,6 +4723,12 @@ 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
+#, fuzzy
+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"
@@ -4682,11 +4739,6 @@ 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
@@ -4737,13 +4789,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:248
 msgid "Error setting user."
 msgstr "Zmylk při nastajenju wužiwarja."
 
@@ -4752,96 +4799,95 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 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:94
 msgid "Sorry, invalid invitation code."
 msgstr "Wodaj, njepłaćiwy přeprošenski kod."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "Registrowanje wuspěšne"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "Registrować"
 
-#: actions/register.php:142
+#: actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Registracija njedowolena."
 
-#: actions/register.php:209
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:201
+#, fuzzy
+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:210
 msgid "Email address already exists."
 msgstr "E-mejlowa adresa hižo eksistuje."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "Njepłaćiwe wužiwarske mjeno abo hesło."
 
-#: actions/register.php:351
+#: actions/register.php:340
 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 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:432 actions/register.php:436
+msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 
-#: actions/register.php:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Dlěše mjeno, wosebje twoje \"woprawdźite\" mjeno"
 
-#: actions/register.php:462
-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:471
+#, fuzzy
+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:510
 #, 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:520
 #, 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:524
 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:527
 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:532
 #, 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:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4860,7 +4906,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -4887,7 +4933,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
@@ -4895,7 +4942,7 @@ msgid "Profile URL"
 msgstr "URL profila"
 
 #: 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.
@@ -4905,7 +4952,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
@@ -5089,7 +5137,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"
 
@@ -5131,93 +5179,93 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Symbol"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 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
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organizacija"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistika"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:207
 msgid "Application actions"
 msgstr "Aplikaciske akcije"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Zničić"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "Aplikaciske informacije"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr "Kluč přetrjebowarja"
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr "Potajnstwo přetrjebowarja"
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr "URL awtorizować"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:302
 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ć?"
 
@@ -5302,16 +5350,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "Přispomnjenka"
 
@@ -5447,7 +5497,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"
@@ -5681,7 +5731,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.
@@ -5739,7 +5790,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.
@@ -6060,8 +6112,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
@@ -6076,6 +6129,11 @@ 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."
@@ -6110,7 +6168,7 @@ 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’."
@@ -6140,8 +6198,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.
@@ -6201,102 +6259,141 @@ 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ć"
 
-#: 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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licenca"
 
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:229
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Akceptować"
 
-#: 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:231
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "Tutoho wužiwarja abonować"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Wotpokazać"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+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:248
 msgid "No authorization request!"
 msgstr "Žane awtorizaciske naprašowanje!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 msgid "Subscription authorized"
 msgstr "Abonement awtorizowany"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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:285
 msgid "Subscription rejected"
 msgstr "Abonement wotpokazany"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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
-#, 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:325
+#, fuzzy, php-format
+msgid "Listener URI \"%s\" not found here."
 msgstr "URI posłucharja'%s' njebu tu namakany"
 
-#: actions/userauthorization.php:308
-#, 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:332
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is too long."
 msgstr "URI posłucharki '%s' je předołhi."
 
-#: actions/userauthorization.php:314
-#, 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:340
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is a local user."
+msgstr "URI posłucharki '%s' je předołhi."
 
-#: actions/userauthorization.php:329
-#, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
+#: actions/userauthorization.php:358
+#, fuzzy, php-format
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "Profilowy URL '%s' je za lokalneho wužiwarja."
 
-#: 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:368
 #, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+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
+#, fuzzy, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "URL awatara '%s' njeje płaćiwy"
 
-#: actions/userauthorization.php:350
-#, 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:385
+#, fuzzy, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Awatarowy URL '%s' njeda so čitać."
 
-#: actions/userauthorization.php:355
-#, 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:392
+#, 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.
@@ -7472,6 +7569,11 @@ 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"
@@ -7905,6 +8007,11 @@ 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
@@ -7941,6 +8048,21 @@ 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
@@ -8045,7 +8167,6 @@ msgid "Grant this user the \"%s\" role"
 msgstr "Tutomu wužiwarjej rólu \"%s\" dać"
 
 #: lib/groupeditform.php:147
-#, fuzzy
 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 "
@@ -8060,13 +8181,13 @@ msgid "Describe the group or topic"
 msgstr "Skupinu abo temu wopisać"
 
 #: lib/groupeditform.php:163
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
-msgstr[0] "Skupinu abo temu w %d znamješce abo mjenje wopisać"
-msgstr[1] "Skupinu abo temu w %d znamješkomaj abo mjenje wopisać"
-msgstr[2] "Skupinu abo temu w %d znamješkach abo mjenje wopisać"
-msgstr[3] "Skupinu abo temu w %d znamješkach abo mjenje wopisać"
+msgstr[0] "Skupinu abo temu w %d znamješce wopisać"
+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 ""
@@ -8624,9 +8745,8 @@ msgid "Send"
 msgstr "Pósłać"
 
 #: lib/messagelist.php:77
-#, fuzzy
 msgid "Messages"
-msgstr "Powěsć"
+msgstr "Powěsće"
 
 #: lib/messagelistitem.php:123 lib/noticelist.php:522
 msgid "from"
@@ -8733,6 +8853,10 @@ 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"
@@ -9008,6 +9132,10 @@ 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"
@@ -9292,3 +9420,15 @@ 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 "6 or more characters"
+#~ msgstr "6 abo wjace znamješkow"
+
+#~ msgid "Same as password above"
+#~ msgstr "Samsne hesło kaž horjeka"
+
+#~ msgid "Can't save new password."
+#~ msgstr "Nowe hesło njeda so składować."
+
+#~ msgid "URL of your homepage, blog, or profile on another site"
+#~ msgstr "URL twojeje startoweje strony, bloga abo profila na druhim sydle"
diff --git a/locale/hu/LC_MESSAGES/statusnet.po b/locale/hu/LC_MESSAGES/statusnet.po
index 49690a28c4..d07beb9f12 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:06:01+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27:22+0000\n"
 "Language-Team: Hungarian <http://translatewiki.net/wiki/Portal:hu>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-02-03 00:48:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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"
@@ -156,7 +156,7 @@ msgstr "Nincs ilyen lap."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -514,7 +514,8 @@ 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
-msgid "Can't send direct messages to users who aren't your friend."
+#, 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."
 
@@ -599,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "A becenév már foglalt. Próbálj meg egy másikat."
 
@@ -609,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "Nem érvényes becenév."
 
@@ -622,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "A honlap érvénytelen URL-cím."
 
@@ -632,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:226
+#: actions/register.php:218
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "A teljes név túl hosszú (legfeljebb 255 karakter lehet)."
@@ -661,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:235
+#: actions/register.php:227
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "A hely túl hosszú (legfeljebb 255 karakter lehet)."
@@ -819,15 +820,15 @@ msgstr "Nincs jogosultságod."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: 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."
@@ -858,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Váratlan űrlapbeküldés."
@@ -904,19 +905,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Jelszó"
 
@@ -1039,7 +1041,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.
@@ -1218,25 +1220,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1404,7 +1407,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."
@@ -1509,9 +1512,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 ""
 
@@ -1569,9 +1574,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
-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 "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.
@@ -1631,7 +1637,7 @@ 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"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1669,7 +1675,8 @@ msgstr "Nem"
 
 #. 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 "Ne blokkoljuk ezt a felhasználót"
 
 #. TRANS: Button label on the user block form.
@@ -1686,9 +1693,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.
@@ -1853,7 +1860,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:426
 msgid "Confirm"
 msgstr "Megerősítés"
 
@@ -1883,13 +1890,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr ""
@@ -1910,13 +1917,15 @@ 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 "Ne töröljük ezt a hírt"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-msgid "Delete this application"
-msgstr ""
+#, 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
@@ -1973,13 +1982,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.
@@ -2020,12 +2029,14 @@ 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
-msgid "Do not delete this notice"
+#, 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 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.
@@ -2062,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 "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.
@@ -2234,21 +2245,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.
@@ -2280,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 "Nincs ilyen alkalmazás."
 
@@ -2564,7 +2575,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Érvénytelen email cím."
@@ -2641,19 +2652,22 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 #, 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "Új bejövő e-mail cím hozzáadva."
 
@@ -2664,7 +2678,8 @@ 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
-msgid "Disfavor favorite"
+#, fuzzy
+msgid "Disfavor favorite."
 msgstr "Kedvenc eltávolítása"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2901,12 +2916,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 "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
-msgid "Block this user from this group"
+#, 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.
@@ -3219,7 +3236,8 @@ 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.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "Beállítások elmentve."
 
@@ -3606,51 +3624,51 @@ msgstr "Mentés"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "Már be vagy jelentkezve."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "Rossz felhasználónév vagy jelszó."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "Bejelentkezés"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "Bejelentkezés az oldalra"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "Emlékezz rám"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 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:259
 msgid "Lost or forgotten password?"
 msgstr "Elvesztetted vagy elfelejtetted a jelszavad?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 
-#: actions/login.php:292
+#: actions/login.php:281
 msgid "Login with your username and password."
 msgstr ""
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3852,30 +3870,30 @@ msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr ""
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3883,20 +3901,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, 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 ""
@@ -3906,6 +3934,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
@@ -3996,17 +4034,21 @@ msgstr ""
 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."
 
@@ -4032,40 +4074,45 @@ msgstr "Régi jelszó"
 msgid "New password"
 msgstr "Új jelszó"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+#, fuzzy
+msgid "6 or more characters."
 msgstr "6 vagy több karakter"
 
-#: 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:427
+#, fuzzy
+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:230
 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:233
 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
-msgid "Can't save new password."
+#. 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."
 
-#. 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."
 
@@ -4408,7 +4455,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:433
+#: actions/profilesettings.php:109 actions/register.php:419
 #, 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"
@@ -4416,7 +4463,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:455
+#: actions/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4424,13 +4471,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:460
+#: actions/profilesettings.php:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
@@ -4440,7 +4487,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:129 actions/register.php:457
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4448,28 +4495,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Merre vagy, mint pl. \"Város, Megye, Ország\""
 
@@ -4488,8 +4536,10 @@ msgstr "Címkék"
 
 #. 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 ""
 "Címkék magadhoz (betűk, számok, -, ., és _), vesszővel vagy szóközzel "
 "elválasztva"
@@ -4501,7 +4551,8 @@ msgstr "Nyelv"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-msgid "Preferred language"
+#, fuzzy
+msgid "Preferred language."
 msgstr "Előnyben részesített nyelv"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4516,8 +4567,9 @@ msgstr "Általában melyik időzónában vagy?"
 
 #. 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 ""
 "Automatikusan iratkozzunk fel mindazok híreire, aki feliratkoznak a mieinkre "
 "(nem embereknek való)"
@@ -4525,7 +4577,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:258 actions/register.php:221
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4545,9 +4597,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 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:291
+#, 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
@@ -4780,6 +4832,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"
@@ -4791,12 +4849,6 @@ 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
@@ -4848,14 +4900,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:248
 msgid "Error setting user."
 msgstr "Hiba a felhasználó beállításakor."
 
@@ -4864,101 +4910,98 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 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:94
 msgid "Sorry, invalid invitation code."
 msgstr ""
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "A regisztráció sikeres"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "Regisztráció"
 
-#: actions/register.php:142
+#: actions/register.php:135
 msgid "Registration not allowed."
 msgstr "A regisztráció nem megengedett."
 
-#: actions/register.php:209
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:201
+#, 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:218
+#: actions/register.php:210
 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:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "Érvénytelen felhasználónév vagy jelszó."
 
-#: actions/register.php:351
+#: actions/register.php:340
 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, 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:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Hosszabb név, célszerűen a \"valódi\" neved"
 
-#: actions/register.php:462
-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:471
+#, fuzzy
+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:510
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:533
+#: actions/register.php:520
 #, 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:524
 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:527
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:532
 #, 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:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4977,7 +5020,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5006,7 +5049,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
@@ -5014,7 +5057,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.
@@ -5024,7 +5067,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
@@ -5216,7 +5259,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"
 
@@ -5258,93 +5301,93 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ikon"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 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
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Szervezet"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statisztika"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:207
 msgid "Application actions"
 msgstr ""
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Törlés"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr ""
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr ""
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr ""
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:302
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
@@ -5429,16 +5472,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "Megjegyzés"
 
@@ -5582,7 +5627,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"
@@ -5822,8 +5867,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 "A webhely híre"
 
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:57
@@ -5880,8 +5926,9 @@ msgstr "SMS telefonszám"
 
 #. 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"
-msgstr ""
+#, 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:191
@@ -6200,8 +6247,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Fénykép"
@@ -6216,6 +6264,11 @@ 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."
@@ -6249,7 +6302,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’."
@@ -6281,7 +6334,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.
@@ -6342,102 +6395,141 @@ msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-msgid "Save user settings"
-msgstr ""
+#, fuzzy
+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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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 ""
+#. 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:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Visszautasítás"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
-msgstr ""
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+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:248
 msgid "No authorization request!"
 msgstr ""
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 msgid "Subscription authorized"
 msgstr ""
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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:285
 msgid "Subscription rejected"
 msgstr ""
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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:325
 #, 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:332
+#, 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:340
 #, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
 
-#: actions/userauthorization.php:314
+#. 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 "Listenee URI ‘%s’ is a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
-#: actions/userauthorization.php:329
+#. 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
+#, 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."
+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
 #, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr ""
 
-#: actions/userauthorization.php:345
+#. 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 "Avatar URL ‘%s’ is not valid."
-msgstr ""
-
-#: actions/userauthorization.php:350
-#, php-format
-msgid "Can’t read avatar URL ‘%s’."
-msgstr ""
-
-#: 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.
@@ -7614,6 +7706,11 @@ 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"
@@ -8028,6 +8125,11 @@ 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
@@ -8064,6 +8166,21 @@ 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
@@ -8171,7 +8288,6 @@ msgid "Grant this user the \"%s\" role"
 msgstr ""
 
 #: lib/groupeditform.php:147
-#, 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"
 
@@ -8911,6 +9027,10 @@ 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"
@@ -9192,6 +9312,10 @@ 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"
@@ -9461,3 +9585,17 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "6 or more characters"
+#~ msgstr "6 vagy több karakter"
+
+#~ msgid "Same as password above"
+#~ msgstr "Ugyanaz mint a fenti jelszó"
+
+#~ msgid "Can't save new password."
+#~ msgstr "Az új jelszót nem sikerült elmenteni."
+
+#~ 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"
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index e8d10886ae..f8a3c85483 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:06:04+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27: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-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -151,7 +151,7 @@ msgstr "Pagina non existe."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -517,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 "Can't send direct messages to users who aren't your friend."
+#, fuzzy
+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).
@@ -600,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonymo ja in uso. Proba un altere."
 
@@ -610,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "Non un pseudonymo valide."
 
@@ -623,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "Le pagina personal non es un URL valide."
 
@@ -633,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:226
+#: actions/register.php:218
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Le nomine complete es troppo longe (maximo 255 characteres)."
 
@@ -661,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:235
+#: actions/register.php:227
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Loco es troppo longe (maximo 255 characteres)."
 
@@ -816,15 +817,15 @@ msgstr "Indicio de requesta jam autorisate."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: 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."
@@ -856,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Submission de formulario inexpectate."
@@ -907,19 +908,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Contrasigno"
 
@@ -1041,8 +1043,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.
@@ -1221,25 +1223,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1394,7 +1397,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."
 
@@ -1498,9 +1501,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"
 
@@ -1555,9 +1560,10 @@ 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
-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.
@@ -1621,7 +1627,8 @@ 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"
+#, 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.
@@ -1662,7 +1669,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.
@@ -1679,9 +1687,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 "Blocar iste usator"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1844,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:440
+#: actions/recoverpassword.php:262 actions/register.php:426
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -1873,13 +1881,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Il habeva un problema con tu indicio de session."
@@ -1903,12 +1911,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.
@@ -1962,12 +1972,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.
@@ -2010,12 +2022,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 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+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.
@@ -2050,13 +2064,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 "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"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "Deler iste usator"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2222,21 +2237,21 @@ 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"
+#: actions/designadminpanel.php:720
+#, fuzzy
+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"
+#: actions/designadminpanel.php:728
+#, fuzzy
+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"
+#: actions/designadminpanel.php:736
+#, fuzzy
+msgid "Save design."
 msgstr "Salveguardar apparentia"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2268,7 +2283,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."
 
@@ -2549,7 +2564,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Adresse de e-mail invalide."
@@ -2624,18 +2639,21 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "Nove adresse de e-mail entrante addite."
 
@@ -2646,7 +2664,8 @@ 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"
+#, fuzzy
+msgid "Disfavor favorite."
 msgstr "Disfavorir favorite"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2886,12 +2905,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.
@@ -3215,7 +3236,8 @@ 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.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "Preferentias confirmate."
 
@@ -3627,42 +3649,42 @@ msgstr "Salveguardar"
 msgid "Save license settings"
 msgstr "Salveguardar configurationes de licentia"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "Tu es jam authenticate."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "Nomine de usator o contrasigno incorrecte."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 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:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "Aperir session"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "Authenticar te a iste sito"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "Memorar me"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 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:259
 msgid "Lost or forgotten password?"
 msgstr "Contrasigno perdite o oblidate?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3670,11 +3692,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:281
 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:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3883,30 +3905,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:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr "Applicationes connectite"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3916,14 +3938,14 @@ msgstr ""
 "comenciante con %2$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -3932,6 +3954,16 @@ msgstr ""
 "Es tu un programmator? [Registra un application cliente OAuth](%s) a usar "
 "con iste installation de StatusNet."
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "Usator non trovate."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "Nota genitor non trovate."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Le nota ha nulle profilo."
@@ -3941,6 +3973,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
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "Usator destinatario non trovate."
+
+#: 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,17 +4073,21 @@ msgstr "Indicio de identification invalide specificate."
 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."
@@ -4068,40 +4114,42 @@ msgstr "Ancian contrasigno"
 msgid "New password"
 msgstr "Nove contrasigno"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
-msgstr "6 o plus characteres"
+#: actions/passwordsettings.php:109 actions/register.php:423
+msgid "6 or more characters."
+msgstr "6 o plus characteres."
 
-#: actions/passwordsettings.php:113
-msgid "Same as password above"
-msgstr "Identic al contrasigno hic supra"
+#. 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."
+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:230
 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:233
 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
-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."
 
@@ -4428,14 +4476,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:433
+#: actions/profilesettings.php:109 actions/register.php:419
 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/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4443,20 +4491,20 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 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:129 actions/register.php:457
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4464,28 +4512,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Ubi tu es, como \"Citate, Stato (o Region), Pais\""
 
@@ -4504,8 +4553,10 @@ 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"
@@ -4517,7 +4568,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.
@@ -4532,15 +4584,16 @@ 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)"
 
 #. 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:258 actions/register.php:221
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4559,9 +4612,9 @@ 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
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:291
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Etiquetta invalide: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4801,6 +4854,12 @@ 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
+#, fuzzy
+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"
@@ -4811,11 +4870,6 @@ 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
@@ -4867,13 +4921,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:248
 msgid "Error setting user."
 msgstr "Error durante le configuration del usator."
 
@@ -4882,94 +4931,95 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr "Pardono, solmente le personas invitate pote registrar se."
 
-#: actions/register.php:99
+#: actions/register.php:94
 msgid "Sorry, invalid invitation code."
 msgstr "Pardono, le codice de invitation es invalide."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "Registration succedite"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "Crear conto"
 
-#: actions/register.php:142
+#: actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Creation de conto non permittite."
 
-#: actions/register.php:209
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:201
+#, fuzzy
+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:210
 msgid "Email address already exists."
 msgstr "Le adresse de e-mail existe ja."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "Nomine de usator o contrasigno invalide."
 
-#: actions/register.php:351
+#: actions/register.php:340
+#, 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:445 actions/register.php:449
+#: actions/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, fuzzy
+msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "Usate solmente pro actualisationes, notificationes e recuperation de "
 "contrasigno"
 
-#: actions/register.php:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Nomine plus longe, preferibilemente tu nomine \"real\""
 
-#: actions/register.php:462
-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:471
+#, fuzzy
+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:510
 #, 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:520
 #, 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:524
 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:527
 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:532
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4979,7 +5029,7 @@ msgstr ""
 "contrasigno, adresse de e-mail, adresse de messageria instantanee, numero de "
 "telephono."
 
-#: actions/register.php:588
+#: actions/register.php:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5011,7 +5061,7 @@ msgstr ""
 "\n"
 "Gratias pro inscriber te, e nos spera que iste servicio te place."
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5044,7 +5094,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
@@ -5052,7 +5103,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.
@@ -5062,7 +5114,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
@@ -5260,7 +5313,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"
 
@@ -5302,87 +5355,87 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icone"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 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
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organisation"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statisticas"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, 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:207
 msgid "Application actions"
 msgstr "Actiones de application"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 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
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Deler"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "Info del application"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr "Clave de consumitor"
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr "Secreto de consumitor"
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr "URL del indicio de requesta"
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr "URL del indicio de accesso"
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr "URL de autorisation"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5390,7 +5443,7 @@ msgstr ""
 "Nota: Nos supporta le signaturas HMAC-SHA1. Nos non accepta signaturas in "
 "texto simple."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:302
 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?"
 
@@ -5483,16 +5536,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "Nota"
 
@@ -5637,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"
@@ -5887,7 +5942,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.
@@ -5945,7 +6001,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.
@@ -6281,8 +6338,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Photo"
@@ -6299,6 +6357,11 @@ 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."
@@ -6335,7 +6398,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’."
@@ -6367,8 +6430,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.
@@ -6428,54 +6491,70 @@ 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"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Autorisar 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 ""
 "Per favor verifica iste detalios pro assecurar te que tu vole subscriber te "
 "al notas de iste usator. Si tu non ha requestate isto, clicca \"Rejectar\"."
 
+#. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licentia"
 
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:229
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Acceptar"
 
-#: 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:231
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "Subscriber a iste usator"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rejectar"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+msgid "Reject this subscription."
 msgstr "Rejectar iste subscription"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:248
 msgid "No authorization request!"
 msgstr "Nulle requesta de autorisation!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 msgid "Subscription authorized"
 msgstr "Subscription autorisate"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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 "
@@ -6485,11 +6564,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:285
 msgid "Subscription rejected"
 msgstr "Subscription rejectate"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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 "
@@ -6499,39 +6579,64 @@ msgstr ""
 "recipite. Lege in le instructiones del sito in question como rejectar "
 "completemente le subscription."
 
-#: actions/userauthorization.php:303
-#, 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:325
+#, fuzzy, php-format
+msgid "Listener URI \"%s\" not found here."
 msgstr "URI de ascoltator ‘%s’ non trovate hic."
 
-#: actions/userauthorization.php:308
-#, 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:332
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is too long."
 msgstr "URI de ascoltato ‘%s’ es troppo longe."
 
-#: actions/userauthorization.php:314
-#, 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:340
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "URI de ascoltato ‘%s’ es un usator local."
 
-#: actions/userauthorization.php:329
-#, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
+#: actions/userauthorization.php:358
+#, fuzzy, 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
-#, 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:368
+#, fuzzy, 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
+#, fuzzy, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "URL de avatar ‘%s’ non es valide."
 
-#: actions/userauthorization.php:350
-#, 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:385
+#, fuzzy, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Non pote leger URL de avatar ‘%s’."
 
-#: actions/userauthorization.php:355
-#, 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:392
+#, 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.
@@ -7744,6 +7849,11 @@ 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"
@@ -8195,6 +8305,11 @@ 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
@@ -8231,6 +8346,21 @@ 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
@@ -8335,9 +8465,8 @@ msgid "Grant this user the \"%s\" role"
 msgstr "Conceder le rolo \"%s\" a iste usator"
 
 #: lib/groupeditform.php:147
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 minusculas o numeros, sin punctuation o spatios."
+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."
@@ -8348,11 +8477,11 @@ msgid "Describe the group or topic"
 msgstr "Describe le gruppo o topico"
 
 #: lib/groupeditform.php:163
-#, fuzzy, php-format
+#, 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."
+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 ""
@@ -9002,9 +9131,8 @@ msgid "Send"
 msgstr "Inviar"
 
 #: lib/messagelist.php:77
-#, fuzzy
 msgid "Messages"
-msgstr "Message"
+msgstr "Messages"
 
 #: lib/messagelistitem.php:123 lib/noticelist.php:522
 msgid "from"
@@ -9110,6 +9238,10 @@ 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"
@@ -9385,6 +9517,10 @@ 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"
@@ -9661,3 +9797,15 @@ msgstr "XML invalide, radice XRD mancante."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Obtene copia de reserva ex file '%s'."
+
+#~ msgid "6 or more characters"
+#~ msgstr "6 o plus characteres"
+
+#~ msgid "Same as password above"
+#~ msgstr "Identic al contrasigno hic supra"
+
+#~ msgid "Can't save new password."
+#~ msgstr "Non pote salveguardar le nove contrasigno."
+
+#~ msgid "URL of your homepage, blog, or profile on another site"
+#~ msgstr "URL de tu pagina personal, blog o profilo in un altere sito"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 22b17fa0fc..c821a9be37 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:06:06+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27: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 (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -155,7 +155,7 @@ msgstr "Pagina inesistente."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -519,7 +519,8 @@ msgstr "Destinatario non trovato."
 
 #. 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."
+#, 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).
@@ -604,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "Soprannome già in uso. Prova con un altro."
 
@@ -614,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "Non è un soprannome valido."
 
@@ -627,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "L'indirizzo della pagina web non è valido."
 
@@ -637,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:226
+#: actions/register.php:218
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Nome troppo lungo (max 255 caratteri)."
@@ -666,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:235
+#: actions/register.php:227
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Ubicazione troppo lunga (max 255 caratteri)."
@@ -825,15 +826,15 @@ msgstr "Autorizzazione non presente."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -866,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Invio del modulo inaspettato."
@@ -918,19 +919,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Password"
 
@@ -1054,7 +1056,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.
@@ -1234,25 +1236,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1419,7 +1422,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."
@@ -1525,9 +1528,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."
 
@@ -1585,9 +1590,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
-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 "Scegli un'area quadrata per la tua immagine personale"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1647,7 +1653,7 @@ msgstr "Sfondo"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1688,7 +1694,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 bloccare questo utente"
 
 #. TRANS: Button label on the user block form.
@@ -1705,9 +1712,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.
@@ -1872,7 +1879,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:426
 msgid "Confirm"
 msgstr "Conferma"
 
@@ -1902,13 +1909,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Si è verificato un problema con il tuo token di sessione."
@@ -1931,12 +1938,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 eliminare l'applicazione"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-msgid "Delete this application"
+#, fuzzy
+msgid "Delete this application."
 msgstr "Elimina l'applicazione"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1994,13 +2003,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.
@@ -2043,12 +2052,14 @@ msgstr "Vuoi eliminare questo messaggio?"
 
 #. 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 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.
@@ -2085,13 +2096,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.
-#. 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.
@@ -2259,21 +2270,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.
@@ -2305,7 +2316,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."
 
@@ -2590,7 +2601,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Non è un indirizzo email valido."
@@ -2667,19 +2678,22 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 #, 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "Nuovo indirizzo email di ricezione aggiunto."
 
@@ -2690,7 +2704,8 @@ msgstr "Questo messaggio è già un preferito!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-msgid "Disfavor favorite"
+#, fuzzy
+msgid "Disfavor favorite."
 msgstr "Rimuovi preferito"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2931,12 +2946,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 bloccare l'utente da questo 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 "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.
@@ -3267,7 +3284,8 @@ 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.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "Preferenze salvate."
 
@@ -3688,39 +3706,39 @@ msgstr "Salva"
 msgid "Save license settings"
 msgstr "Salva impostazioni licenza"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "Accesso già effettuato."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "Nome utente o password non corretto."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 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:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "Accedi"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "Accedi al sito"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "Ricordami"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 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:259
 msgid "Lost or forgotten password?"
 msgstr "Password persa o dimenticata?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3728,11 +3746,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:281
 msgid "Login with your username and password."
 msgstr "Accedi con nome utente e password."
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3945,31 +3963,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:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr "Applicazioni collegate"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 #, 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3977,20 +3995,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, 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."
@@ -4000,6 +4028,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
@@ -4090,17 +4128,21 @@ msgstr "Token di accesso specificato non valido."
 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 "
@@ -4128,40 +4170,45 @@ msgstr "Vecchia password"
 msgid "New password"
 msgstr "Nuova password"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+#, fuzzy
+msgid "6 or more characters."
 msgstr "6 o più caratteri"
 
-#: 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:427
+#, fuzzy
+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:230
 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:233
 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
-msgid "Can't save new password."
+#. 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."
 
-#. 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."
 
@@ -4506,7 +4553,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:433
+#: actions/profilesettings.php:109 actions/register.php:419
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4515,7 +4562,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:455
+#: actions/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4523,13 +4570,13 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 #, 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"
@@ -4537,7 +4584,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:129 actions/register.php:457
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4545,28 +4592,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Dove ti trovi, tipo \"città, regione, stato\""
 
@@ -4585,8 +4633,10 @@ msgstr "Etichette"
 
 #. 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 ""
 "Le tue etichette (lettere, numeri, -, . e _), separate da virgole o spazi"
 
@@ -4597,7 +4647,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 preferita"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4612,8 +4663,9 @@ msgstr "In che fuso orario risiedi solitamente?"
 
 #. 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 ""
 "Abbonami automaticamente a chi si abbona ai miei messaggi (utile per i non-"
 "umani)"
@@ -4621,7 +4673,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:258 actions/register.php:221
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4641,9 +4693,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 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:291
+#, 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
@@ -4885,6 +4937,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"
@@ -4896,12 +4954,6 @@ 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
@@ -4955,14 +5007,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:248
 msgid "Error setting user."
 msgstr "Errore nell'impostare l'utente."
 
@@ -4971,94 +5017,94 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr "Solo le persone invitate possono registrarsi."
 
-#: actions/register.php:99
+#: actions/register.php:94
 msgid "Sorry, invalid invitation code."
 msgstr "Codice di invito non valido."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "Registrazione riuscita"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "Registrati"
 
-#: actions/register.php:142
+#: actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Registrazione non consentita."
 
-#: actions/register.php:209
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:201
+#, 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:218
+#: actions/register.php:210
 msgid "Email address already exists."
 msgstr "Indirizzo email già esistente."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "Nome utente o password non valido."
 
-#: actions/register.php:351
+#: actions/register.php:340
+#, 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Email"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, fuzzy
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "Usata solo per aggiornamenti, annunci e recupero password"
 
-#: actions/register.php:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Nome completo, preferibilmente il tuo \"vero\" nome"
 
-#: actions/register.php:462
-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:471
+#, fuzzy
+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:510
 #, 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:520
 #, 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:524
 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:527
 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:532
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5068,7 +5114,7 @@ msgstr ""
 "dati personali: password, indirizzo email, indirizzo messaggistica "
 "istantanea e numero di telefono."
 
-#: actions/register.php:588
+#: actions/register.php:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5102,7 +5148,7 @@ msgstr ""
 "Grazie per la tua iscrizione e speriamo tu possa divertiti usando questo "
 "servizio."
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5135,7 +5181,8 @@ msgid "User nickname"
 msgstr "Soprannome dell'utente"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow"
+#, fuzzy
+msgid "Nickname of the user you want to follow."
 msgstr "Soprannome dell'utente che vuoi seguire"
 
 #: actions/remotesubscribe.php:132
@@ -5143,7 +5190,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 del tuo profilo su un altro servizio di microblog compatibile"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5153,7 +5201,8 @@ msgid "Subscribe"
 msgstr "Abbonati"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)"
+#, fuzzy
+msgid "Invalid profile URL (bad format)."
 msgstr "URL del profilo non valido (formato errato)"
 
 #: actions/remotesubscribe.php:167
@@ -5353,7 +5402,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"
 
@@ -5395,87 +5444,87 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icona"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 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
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organizzazione"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistiche"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, 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:207
 msgid "Application actions"
 msgstr "Azioni applicazione"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 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
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Elimina"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "Informazioni applicazione"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr "Chiave consumatore"
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr "Segreto consumatore"
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr "URL token di richiesta"
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr "URL token di accesso"
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr "URL di autorizzazione"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5483,7 +5532,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:302
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Ripristinare la chiave e il segreto?"
 
@@ -5574,16 +5623,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "Nota"
 
@@ -5730,7 +5781,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"
@@ -5980,7 +6031,8 @@ 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
-msgid "Save site notice"
+#, fuzzy
+msgid "Save site notice."
 msgstr "Salva messaggio"
 
 #. TRANS: Title for SMS settings.
@@ -6038,7 +6090,8 @@ msgstr "Numero di telefono per 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 di telefono, senza punteggiatura o spazi, con il prefisso"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6376,8 +6429,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Fotografia"
@@ -6394,6 +6448,11 @@ 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."
@@ -6431,7 +6490,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’."
@@ -6466,7 +6525,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.
@@ -6527,54 +6586,70 @@ 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
-msgid "Save user settings"
+#, fuzzy
+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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, 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:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rifiuta"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+msgid "Reject this subscription."
 msgstr "Rifiuta questo abbonamento"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:248
 msgid "No authorization request!"
 msgstr "Nessuna richiesta di autorizzazione!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 msgid "Subscription authorized"
 msgstr "Abbonamento autorizzato"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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 "
@@ -6584,11 +6659,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:285
 msgid "Subscription rejected"
 msgstr "Abbonamento rifiutato"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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,39 +6674,64 @@ msgstr ""
 "richiamo. Controlla le istruzioni del sito per i dettagli su come rifiutare "
 "completamente l'abbonamento."
 
-#: actions/userauthorization.php:303
-#, 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:325
+#, fuzzy, php-format
+msgid "Listener URI \"%s\" not found here."
 msgstr "URL \"%s\" dell'ascoltatore non trovato qui."
 
-#: actions/userauthorization.php:308
-#, 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:332
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is too long."
 msgstr "L'URI \"%s\" di colui che si ascolta è troppo lungo."
 
-#: actions/userauthorization.php:314
-#, 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:340
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "L'URI \"%s\" di colui che si ascolta è un utente locale."
 
-#: actions/userauthorization.php:329
-#, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
+#: actions/userauthorization.php:358
+#, fuzzy, php-format
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "L'URL \"%s\" del profilo è per un utente locale."
 
-#: actions/userauthorization.php:345
-#, 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:368
+#, 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."
 msgstr "L'URL \"%s\" dell'immagine non è valido."
 
-#: actions/userauthorization.php:350
-#, 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:385
+#, fuzzy, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Impossibile leggere l'URL \"%s\" dell'immagine."
 
-#: actions/userauthorization.php:355
-#, 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:392
+#, 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.
@@ -7852,6 +7953,11 @@ 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"
@@ -8313,6 +8419,11 @@ 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
@@ -8351,6 +8462,21 @@ 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
@@ -8458,7 +8584,6 @@ msgid "Grant this user the \"%s\" role"
 msgstr "Concedi a questo utente il ruolo \"%s\""
 
 #: lib/groupeditform.php:147
-#, 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"
@@ -9240,6 +9365,10 @@ 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"
@@ -9521,6 +9650,10 @@ 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"
@@ -9796,3 +9929,15 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "6 or more characters"
+#~ msgstr "6 o più caratteri"
+
+#~ msgid "Same as password above"
+#~ msgstr "Stessa password di sopra"
+
+#~ msgid "Can't save new password."
+#~ msgstr "Impossibile salvare la nuova password."
+
+#~ msgid "URL of your homepage, blog, or profile on another site"
+#~ msgstr "URL della tua pagina web, blog o profilo su un altro sito"
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 68a8bd19d5..8134a5b1d5 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:06:08+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27: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 (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -157,7 +157,7 @@ msgstr "そのようなページはありません。"
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -516,7 +516,8 @@ 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."
+#, fuzzy
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "友人でないユーザにダイレクトメッセージを送ることはできません。"
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -603,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "そのニックネームは既に使用されています。他のものを試してみて下さい。"
 
@@ -613,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "有効なニックネームではありません。"
 
@@ -626,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "ホームページのURLが不適切です。"
 
@@ -636,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:226
+#: actions/register.php:218
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "フルネームが長すぎます。（255字まで）"
@@ -664,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:235
+#: actions/register.php:227
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "場所が長すぎます。（255字まで）"
@@ -823,15 +824,15 @@ msgstr "認証されていません。"
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "あなたのセッショントークンに問題がありました。再度お試しください。"
@@ -863,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "予期せぬフォーム送信です。"
@@ -909,19 +910,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "パスワード"
 
@@ -1046,7 +1048,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.
@@ -1222,25 +1224,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1409,7 +1412,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 "フォローを保存できません。"
@@ -1514,9 +1517,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 "合っているプロフィールのないユーザ"
 
@@ -1575,9 +1580,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
-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.
@@ -1637,7 +1643,7 @@ msgstr "バックグラウンド"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1679,7 +1685,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.
@@ -1696,9 +1703,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.
@@ -1863,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:440
+#: actions/recoverpassword.php:262 actions/register.php:426
 msgid "Confirm"
 msgstr "パスワード確認"
 
@@ -1893,13 +1900,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "あなたのセッショントークンに関する問題がありました。"
@@ -1923,12 +1930,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.
@@ -1987,13 +1996,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.
@@ -2036,12 +2045,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 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.
@@ -2078,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 "このつぶやきを削除できません。"
 
 #. 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.
@@ -2253,21 +2264,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 +2310,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 "そのようなアプリケーションはありません。"
 
@@ -2586,7 +2597,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "有効なメールアドレスではありません。"
@@ -2664,19 +2675,22 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 #, 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "新しい入ってくるメールアドレスが追加されました。"
 
@@ -2687,7 +2701,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.
@@ -2932,12 +2947,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.
@@ -3267,7 +3284,8 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "私のJabber/GTalkアドレスのためにMicroIDを発行してください。"
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "設定が保存されました。"
 
@@ -3682,39 +3700,39 @@ msgstr "保存"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "既にログインしています。"
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "ユーザ名またはパスワードが間違っています。"
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "ユーザ設定エラー。 あなたはたぶん承認されていません。"
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "ログイン"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "サイトへログイン"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "ログイン状態を保持"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "以降は自動的にログインする。共用コンピューターでは避けましょう！"
 
-#: actions/login.php:269
+#: actions/login.php:259
 msgid "Lost or forgotten password?"
 msgstr "パスワードを紛失、忘れた？"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3722,12 +3740,12 @@ msgstr ""
 "セキュリティー上の理由により、設定を変更する前にユーザ名とパスワードを入力し"
 "て下さい。"
 
-#: actions/login.php:292
+#: actions/login.php:281
 #, fuzzy
 msgid "Login with your username and password."
 msgstr "ユーザ名とパスワードでログイン"
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, fuzzy, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3939,30 +3957,30 @@ msgid "You have not registered any applications yet."
 msgstr "あなたはまだなんのアプリケーションも登録していません。"
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr "接続されたアプリケーション"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3970,7 +3988,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 "あなたは、どんなアプリケーションもあなたのアカウントを使用するのを認可してい"
@@ -3979,13 +3997,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:231
 #, 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 "ユーザはプロフィールをもっていません。"
@@ -3995,6 +4023,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
@@ -4085,17 +4123,21 @@ msgstr "不正なログイントークンが指定されています。"
 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 ""
 "これはあなたの送信箱です、あなたが送ったプライベート・メッセージをリストしま"
@@ -4123,40 +4165,45 @@ msgstr "古いパスワード"
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+#, fuzzy
+msgid "6 or more characters."
 msgstr "6文字以上"
 
-#: 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:427
+#, fuzzy
+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:230
 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:233
 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
+#, fuzzy
+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 "パスワードが保存されました。"
 
@@ -4500,7 +4547,7 @@ 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:109 actions/register.php:419
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く"
@@ -4508,7 +4555,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:455
+#: actions/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4516,13 +4563,13 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"
@@ -4530,35 +4577,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:471
+#: actions/profilesettings.php:129 actions/register.php:457
 #, 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "自分のいる場所。例：「都市, 都道府県 (または地域), 国」"
 
@@ -4577,8 +4625,10 @@ 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 ""
 "自分自身についてのタグ (アルファベット、数字、-、.、_)、カンマまたは空白区切"
 "りで"
@@ -4590,7 +4640,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.
@@ -4605,14 +4656,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 "自分をフォローしている者を自動的にフォローする (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:258 actions/register.php:221
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4631,9 +4683,9 @@ 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:291
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "不正なタグ: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4879,6 +4931,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"
@@ -4890,12 +4948,6 @@ 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
@@ -4947,14 +4999,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:248
 msgid "Error setting user."
 msgstr "ユーザ設定エラー"
 
@@ -4963,100 +5009,99 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr "すみません、招待された人々だけが登録できます。"
 
-#: actions/register.php:99
+#: actions/register.php:94
 msgid "Sorry, invalid invitation code."
 msgstr "すみません、不正な招待コード。"
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "登録成功"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "登録"
 
-#: actions/register.php:142
+#: actions/register.php:135
 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:201
+#, fuzzy
+msgid "You cannot register if you don't agree to the license."
 msgstr "ライセンスに同意頂けない場合は登録できません。"
 
-#: actions/register.php:218
+#: actions/register.php:210
 msgid "Email address already exists."
 msgstr "メールアドレスが既に存在します。"
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "不正なユーザ名またはパスワード。"
 
-#: actions/register.php:351
+#: actions/register.php:340
 #, 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "メール"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, fuzzy
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "更新、アナウンス、パスワードリカバリーでのみ使用されます。"
 
-#: actions/register.php:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "長い名前"
 
-#: actions/register.php:462
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"
+#: actions/register.php:471
+#, fuzzy
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "自分のいる場所。例：「都市, 都道府県 (または地域), 国」"
 
-#: actions/register.php:523
+#: actions/register.php:510
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:533
+#: actions/register.php:520
 #, 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:524
 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:527
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:532
 #, 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:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5089,7 +5134,7 @@ msgstr ""
 "参加してくださってありがとうございます。私たちはあなたがこのサービスを楽しん"
 "で使ってくれることを願っています。"
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5122,7 +5167,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
@@ -5130,7 +5176,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.
@@ -5140,7 +5187,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
@@ -5345,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"
 
@@ -5387,87 +5435,87 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "アイコン"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "名前"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "組織"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "統計データ"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:207
 msgid "Application actions"
 msgstr "アプリケーションアクション"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 msgid "Reset key & secret"
 msgstr "key と secret のリセット"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "削除"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "アプリケーション情報"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr ""
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr "リクエストトークンURL"
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr "アクセストークンURL"
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr "承認URL"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5475,7 +5523,7 @@ msgstr ""
 "注意: 私たちはHMAC-SHA1署名をサポートします。 私たちは平文署名メソッドをサ"
 "ポートしません。"
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:302
 #, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "本当にこのつぶやきを削除しますか？"
@@ -5568,16 +5616,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "ノート"
 
@@ -5724,7 +5774,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"
@@ -5981,7 +6031,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.
@@ -6042,7 +6092,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.
@@ -6384,8 +6435,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "写真"
@@ -6401,6 +6453,11 @@ 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."
@@ -6436,7 +6493,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’."
@@ -6471,7 +6528,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.
@@ -6532,54 +6589,70 @@ msgstr "ユーザが新しいユーザを招待するのを許容するかどう
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-msgid "Save user settings"
-msgstr ""
+#, fuzzy
+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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "このユーザーをフォロー"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "拒否"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+msgid "Reject this subscription."
 msgstr "このフォローを拒否"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:248
 msgid "No authorization request!"
 msgstr "認証のリクエストがありません。"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 msgid "Subscription authorized"
 msgstr "フォローが承認されました"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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 +6662,12 @@ msgstr ""
 "フォローを承認するかに関する詳細のためのサイトの指示をチェックしてください。"
 "あなたのフォロートークンは:"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:285
 msgid "Subscription rejected"
 msgstr "フォローが拒否"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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,39 +6677,64 @@ msgstr ""
 "フォローを完全に拒絶するかに関する詳細のためのサイトの指示をチェックしてくだ"
 "さい。"
 
-#: actions/userauthorization.php:303
-#, 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:325
+#, fuzzy, php-format
+msgid "Listener URI \"%s\" not found here."
 msgstr "リスナー URI  ‘%s’ はここでは見つかりません。"
 
-#: actions/userauthorization.php:308
-#, 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:332
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is too long."
 msgstr "リスニー URI  ‘%s’ が長すぎます。"
 
-#: actions/userauthorization.php:314
-#, 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:340
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "リスニー URI  ‘%s’ はローカルユーザーではありません。"
 
-#: actions/userauthorization.php:329
-#, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
+#: actions/userauthorization.php:358
+#, fuzzy, php-format
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "プロファイル URL  ‘%s’ はローカルユーザーではありません。"
 
-#: actions/userauthorization.php:345
-#, 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:368
+#, 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."
 msgstr "アバター URL  ‘%s’ が正しくありません。"
 
-#: actions/userauthorization.php:350
-#, 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:385
+#, fuzzy, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "アバターURL　を読み取れません '%s'"
 
-#: actions/userauthorization.php:355
-#, 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:392
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "アバター URL '%s' は不正な画像形式。"
 
 #. TRANS: Page title for profile design page.
@@ -7850,6 +7949,11 @@ 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"
@@ -8268,6 +8372,11 @@ 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
@@ -8306,6 +8415,21 @@ 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
@@ -8413,7 +8537,6 @@ msgid "Grant this user the \"%s\" role"
 msgstr ""
 
 #: lib/groupeditform.php:147
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64文字の、小文字アルファベットか数字で、スペースや句読点は除く"
 
@@ -9160,6 +9283,10 @@ msgstr "このつぶやきへ返信"
 msgid "Reply"
 msgstr "返信"
 
+#: lib/noticelist.php:673
+msgid "Delete this notice"
+msgstr "このつぶやきを削除"
+
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "つぶやきを繰り返しました"
@@ -9441,6 +9568,10 @@ 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"
@@ -9709,3 +9840,15 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "6 or more characters"
+#~ msgstr "6文字以上"
+
+#~ msgid "Same as password above"
+#~ msgstr "上と同じパスワード"
+
+#~ msgid "Can't save new password."
+#~ msgstr "新しいパスワードを保存できません。"
+
+#~ msgid "URL of your homepage, blog, or profile on another site"
+#~ msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
index b567fda9dd..89634276b9 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:06:11+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27: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 (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -151,7 +151,7 @@ msgstr "ასეთი გვერდი არ არსებობს."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -509,7 +509,8 @@ 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."
+#, fuzzy
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "ვერ გაუგზავნი პირდაპირ შეტყობინებას იმას, ვისთანაც არ მეგობრობ."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -594,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "მეტსახელი უკვე გამოყენებულია. სცადე სხვა."
 
@@ -604,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "მეტსახელი არასწორია."
 
@@ -617,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "სასტარტო გვერდი არასწორი URL-ია."
 
@@ -627,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:226
+#: actions/register.php:218
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "სრული სახელი ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
@@ -655,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:235
+#: actions/register.php:227
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "ადგილმდებარეობა ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
@@ -812,15 +813,15 @@ msgstr "თქვენ არ ხართ ავტორიზირებუ
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -852,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr ""
@@ -898,19 +899,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "პაროლი"
 
@@ -1034,7 +1036,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.
@@ -1210,25 +1212,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1395,7 +1398,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 "საკუთარი გამოწერის წაშლა ვერ ხერხდება."
@@ -1501,9 +1504,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 "მომხმარებელი შესაბამისი პროფილის გარეშე."
 
@@ -1561,9 +1566,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
-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.
@@ -1623,7 +1629,7 @@ msgstr "ფონი"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1661,7 +1667,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.
@@ -1678,9 +1685,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.
@@ -1845,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:440
+#: actions/recoverpassword.php:262 actions/register.php:426
 msgid "Confirm"
 msgstr "ვადასტურებ"
 
@@ -1875,13 +1882,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr ""
@@ -1904,12 +1911,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.
@@ -1967,13 +1976,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,12 +2023,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 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.
@@ -2056,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 "არ წაშალო ეს შეტყობინება"
 
 #. 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.
@@ -2231,21 +2242,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.
@@ -2277,7 +2288,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 "ასეთი აპლიკაცია არ არის."
 
@@ -2560,7 +2571,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "არასწორი ელ. ფოსტის მისამართი."
@@ -2637,19 +2648,22 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 #, 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "დამატებულია ახალი შემომავალი ელ. ფოსტა."
 
@@ -2660,7 +2674,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.
@@ -2900,12 +2915,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.
@@ -3234,7 +3251,8 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "გამოაქვეყნე  MicroID ჩემი Jabber/GTalk მისამართისთვის."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "პარამეტრები შენახულია."
 
@@ -3650,39 +3668,39 @@ msgstr "შენახვა"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "უკვე ავტორიზირებული ხართ."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "არასწორი მომხმარებლის სახელი ან პაროლი."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "შესვლა"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "საიტზე შესვლა"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "დამიმახსოვრე"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "მომავალში ავტომატურად შემიყვანე; არა საზიარო კომპიუტერებისათვის!"
 
-#: actions/login.php:269
+#: actions/login.php:259
 msgid "Lost or forgotten password?"
 msgstr "დაკარგეთ ან დაგავიწყდათ პაროლი?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3690,11 +3708,11 @@ msgstr ""
 "უსაფრთხოების მიზნებისათვის, გთხოვთ შეიყვანოთ თქვენი მომხ. სახელი და პაროლი "
 "პარამეტრების შეცვლამდე."
 
-#: actions/login.php:292
+#: actions/login.php:281
 msgid "Login with your username and password."
 msgstr "შედი საკუთარი მომხ. სახელით და პაროლით."
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3902,30 +3920,30 @@ msgid "You have not registered any applications yet."
 msgstr "თქვენ ჯერჯერობით არცერთი აპლიკაცია არ დაგირეგისტრირებიათ."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr "მიერთებული აპლიკაციები"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3933,7 +3951,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 "თქვენ არცერთი აპლიკაციისთვის არ მიგიციათ თქვენი ანგარიშის გამოყენების უფლება."
@@ -3941,13 +3959,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:231
 #, 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 "შეტყობინებას პრფილი არ გააჩნია."
@@ -3957,6 +3985,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
@@ -4047,17 +4085,21 @@ msgstr ""
 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 ""
 "ეს არის თქვენი გამავალი ფოსტა, რომელშიც ჩამოთვლილია პირადი შეტყობინებები "
@@ -4085,40 +4127,45 @@ msgstr "ძველი პაროლი"
 msgid "New password"
 msgstr "ახალი პაროლი"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+#, fuzzy
+msgid "6 or more characters."
 msgstr "6 ან მეტი სიმბოლო"
 
-#: 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:427
+#, fuzzy
+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:230
 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:233
 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
+#, fuzzy
+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 "პაროლი შენახულია."
 
@@ -4458,7 +4505,7 @@ 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:109 actions/register.php:419
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1–64 პატარა ასოები ან ციფრები. პუნქტუაციები ან სივრცეები დაუშვებელია"
@@ -4466,7 +4513,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:455
+#: actions/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4474,13 +4521,13 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "თქვენი ვებ. გვერდის URL, ბლოგი, ან პროფილი სხვა საიტზე"
@@ -4488,35 +4535,36 @@ 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:129 actions/register.php:457
 #, 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "რომელ ქალაქში, რეგიონში, ქვეყანაში ხართ?"
 
@@ -4535,8 +4583,10 @@ 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 ""
 "საკუთარი სანიშნეები (ასოები, ციფრები, -, ., და _). გამოყავით მძიმით ან "
 "სივრცით"
@@ -4548,7 +4598,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.
@@ -4563,15 +4614,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:229
+#: actions/profilesettings.php:258 actions/register.php:221
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4590,9 +4642,9 @@ 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:291
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "არასწორი სანიშნე: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4831,6 +4883,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"
@@ -4842,12 +4900,6 @@ 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
@@ -4901,14 +4953,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:248
 msgid "Error setting user."
 msgstr "მომხმარებელის დაყენებისას მოხდა შეცდომა."
 
@@ -4917,71 +4963,71 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr "ბოდიშს გიხდით, დარეგისტრირება მხოლოდ მოწვევითაა შესაძლებელი."
 
-#: actions/register.php:99
+#: actions/register.php:94
 msgid "Sorry, invalid invitation code."
 msgstr "ბოდიშს გიხდით, მოსაწვევი კოდი არასწორია."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "რეგისტრაცია წარმატებით დასრულდა"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "რეგისტრაცია"
 
-#: actions/register.php:142
+#: actions/register.php:135
 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:201
+#, fuzzy
+msgid "You cannot register if you don't agree to the license."
 msgstr "ვერ დარეგისტრირდებით თუ არ დაეთანხმებით ლიცენზიის პირობებს."
 
-#: actions/register.php:218
+#: actions/register.php:210
 msgid "Email address already exists."
 msgstr "ელ. ფოსტის მისამართი უკვე არსებობს."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "არასწორი მომხმარებლის სახელი ან პაროლი."
 
-#: actions/register.php:351
+#: actions/register.php:340
+#, 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "ელ. ფოსტა"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, fuzzy
+msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "გამოიყენება მხოლოდ განახლებებისთვის, განცხადებებისთვის და პაროლის აღსადგენად"
 
-#: actions/register.php:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "გრძელი სახელი, სასურველია თქვენი ნამდვილი სახელი"
 
-#: actions/register.php:462
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "თქვენი ვებ. გვერდის URL, ბლოგი, ან პროფილი სხვა საიტზე"
+#: actions/register.php:471
+#, fuzzy
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "რომელ ქალაქში, რეგიონში, ქვეყანაში ხართ?"
 
-#: actions/register.php:523
+#: actions/register.php:510
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
@@ -4989,23 +5035,23 @@ msgstr ""
 "მე ვაცნობიერებ, რომ %1$s–ის შიგთავსი და მონაცემები არის პირადული და "
 "კონციდენციალური."
 
-#: actions/register.php:533
+#: actions/register.php:520
 #, 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:524
 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:527
 msgid "All rights reserved."
 msgstr "ყველა უფლება დაცულია."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:532
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5014,7 +5060,7 @@ msgstr ""
 "ჩემი ტექსტი და ფაილები ხელმისაწვდომია %s–ით, გარდა ამ პირადი ინფორმაციისა: "
 "პაროლი, ელ. ფოსტის მისამართი, IM მისამართი და ტელეფონის ნომერი."
 
-#: actions/register.php:588
+#: actions/register.php:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5047,7 +5093,7 @@ msgstr ""
 "\n"
 "გმადლობთ რომ დარეგისტრირდით. იმედი გვაქვს ისიამოვნებთ ამ სერვისით."
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5080,7 +5126,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
@@ -5088,7 +5135,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.
@@ -5098,7 +5146,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
@@ -5299,7 +5348,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"
 
@@ -5341,87 +5390,87 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "დასახელება"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "ორგანიზაცია"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "სტატისტიკა"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:207
 msgid "Application actions"
 msgstr "აპლიკაციის მოქმედებები"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 msgid "Reset key & secret"
 msgstr "გასაღების და საიდუმლოს გადაყენება"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "წაშლა"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "ინფო აპლიკაციაზე"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr "მომხმარებლის გასაღები"
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr "მომხმარებლის საიდუმლო"
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr "URL-ის ავტორიზაცია"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5429,7 +5478,7 @@ msgstr ""
 "შენიშვნა: ჩვენ მხარს ვუჭერთ HMAC-SHA1 ხელმოწერებს. ჩვენ არ ვუჭერთ მხარს "
 "მხოლოდ ტექსტური ხელმოწერის მეთოდს."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:302
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "დარწმუნებული ხართ რომ გნებავთ თქვენი მომხმარებლის გასაღების და საიდუმლოს "
@@ -5518,16 +5567,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "შენიშვნა"
 
@@ -5665,7 +5716,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"
@@ -5902,7 +5953,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.
@@ -5962,7 +6014,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.
@@ -6302,8 +6355,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "ფოტო"
@@ -6320,6 +6374,11 @@ 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."
@@ -6357,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’."
@@ -6391,7 +6450,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.
@@ -6452,55 +6511,71 @@ msgstr "მიეცეთ თუ არა მომხმარებლებ
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-msgid "Save user settings"
-msgstr ""
+#, fuzzy
+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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "გამოიწერე ეს მომხმარებელი"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "უარყოფა"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+msgid "Reject this subscription."
 msgstr "ამ გამოწერის უარყოფა"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:248
 msgid "No authorization request!"
 msgstr "ავტორიზაციის მოთხოვნა არ არის!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 msgid "Subscription authorized"
 msgstr "გამოწერა ავტორიზირებულია"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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 "
@@ -6510,11 +6585,12 @@ msgstr ""
 "გადაამოწმეთ საიტის ინსტრუქციებში გამოწერის ავტორიზირების დეტალები. თქვენი "
 "გამოწერის ტოკენია:"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:285
 msgid "Subscription rejected"
 msgstr "გამოწერა უარყოფილია"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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 "
@@ -6524,39 +6600,64 @@ msgstr ""
 "გადაამოწმეთ საიტის ინსტრუქციებში გამოწერის მთლიანად უარყოფის შესახებ "
 "დეტალები."
 
-#: actions/userauthorization.php:303
-#, 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:325
+#, fuzzy, php-format
+msgid "Listener URI \"%s\" not found here."
 msgstr "მსმენელის  URI ‘%s’ აქ ვერ მოიძებნა."
 
-#: actions/userauthorization.php:308
-#, php-format
-msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:332
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is too long."
+msgstr "წყაროს URL ძალიან გრძელია."
 
-#: actions/userauthorization.php:314
-#, php-format
-msgid "Listenee URI ‘%s’ is a local user."
-msgstr ""
-
-#: actions/userauthorization.php:329
-#, php-format
-msgid "Profile URL ‘%s’ is for 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:340
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "პროფილის URL ‘%s’ ლოკალური მომხმარებლისთვისაა განკუთვნილი."
 
-#: actions/userauthorization.php:345
-#, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
+#: actions/userauthorization.php:358
+#, 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
+#, 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."
 msgstr "ავატარის URL ‘%s’ არ არის სწორი."
 
-#: actions/userauthorization.php:350
-#, 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:385
+#, fuzzy, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "ვერ ვკითხულობ ავატარის URL ‘%s’."
 
-#: actions/userauthorization.php:355
-#, 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:392
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "ავატარის სურათის ფორმატი არასწორია URL ‘%s’."
 
 #. TRANS: Page title for profile design page.
@@ -7767,6 +7868,11 @@ 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"
@@ -8183,6 +8289,11 @@ 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
@@ -8221,6 +8332,21 @@ 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
@@ -8327,7 +8453,6 @@ msgid "Grant this user the \"%s\" role"
 msgstr "მიანიჭე ამ მომხმარებელს \"%s\" როლი"
 
 #: lib/groupeditform.php:147
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1–64 პატარა ასოები ან ციფრები. პუნქტუაციები ან სივრცეები დაუშვებელია"
 
@@ -9077,6 +9202,10 @@ msgstr "უპასუხე ამ შეტყობინებას"
 msgid "Reply"
 msgstr "პასუხი"
 
+#: lib/noticelist.php:673
+msgid "Delete this notice"
+msgstr "შეტყობინების წაშლა"
+
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "შეტყობინება გამეორებულია"
@@ -9358,6 +9487,10 @@ 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"
@@ -9628,3 +9761,15 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "6 or more characters"
+#~ msgstr "6 ან მეტი სიმბოლო"
+
+#~ msgid "Same as password above"
+#~ msgstr "იგივე რაც ზედა პაროლი"
+
+#~ msgid "Can't save new password."
+#~ msgstr "ვერ ვინახავ ახალ პაროლს."
+
+#~ msgid "URL of your homepage, blog, or profile on another site"
+#~ msgstr "თქვენი ვებ. გვერდის URL, ბლოგი, ან პროფილი სხვა საიტზე"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 9c65877cfc..bc7acc4d39 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:06:13+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27:29+0000\n"
 "Language-Team: Korean <http://translatewiki.net/wiki/Portal:ko>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -153,7 +153,7 @@ msgstr "해당하는 페이지 없음"
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -505,7 +505,8 @@ 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."
+#, fuzzy
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "당신의 친구가 아닌 사용자에게 직접 메시지를 보낼 수 없습니다."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -591,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "별명이 이미 사용중 입니다. 다른 별명을 시도해 보십시오."
 
@@ -601,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "유효한 별명이 아닙니다"
 
@@ -614,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "홈페이지 주소형식이 올바르지 않습니다."
 
@@ -624,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:226
+#: actions/register.php:218
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "실명이 너무 깁니다. (최대 255글자)"
@@ -652,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:235
+#: actions/register.php:227
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "위치가 너무 깁니다. (최대 255글자)"
@@ -810,15 +811,15 @@ msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "세션토큰에 문제가 있습니다. 다시 시도해주십시오."
@@ -850,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "잘못된 폼 제출"
@@ -902,19 +903,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "비밀 번호"
 
@@ -1038,7 +1040,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.
@@ -1214,25 +1216,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1399,7 +1402,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 "구독을 저장할 수 없습니다."
@@ -1504,9 +1507,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 "이용자가 프로필을 가지고 있지 않습니다."
 
@@ -1564,9 +1569,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
-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.
@@ -1626,7 +1632,7 @@ msgstr "배경"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1666,7 +1672,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.
@@ -1683,9 +1690,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.
@@ -1851,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:440
+#: actions/recoverpassword.php:262 actions/register.php:426
 msgid "Confirm"
 msgstr "인증"
 
@@ -1881,13 +1888,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "당신의 세션토큰관련 문제가 있습니다."
@@ -1908,12 +1915,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.
@@ -1969,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 "이 통지를 지울 수 없습니다."
 
 #. 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.
@@ -2019,12 +2028,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.
@@ -2059,13 +2069,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.
-#. 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.
@@ -2232,21 +2242,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.
@@ -2278,7 +2287,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 "신규 응용 프로그램"
 
@@ -2561,7 +2570,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "올바른 메일 주소가 아닙니다."
@@ -2638,19 +2647,22 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 #, 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "새로운 받는 메일 주소를 추가했습니다."
 
@@ -2661,7 +2673,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.
@@ -2901,12 +2914,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.
@@ -3225,7 +3240,8 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Jabber/GTalk 계정을 위한 MicroID의 생성"
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "설정이 저장되었습니다."
 
@@ -3631,51 +3647,51 @@ msgstr "저장"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "이미 로그인 하셨습니다."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "틀린 계정 또는 비밀 번호"
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "로그인"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "사이트에 로그인하세요."
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "자동 로그인"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "앞으로는 자동으로 로그인합니다. 공용 컴퓨터에서는 이용하지 마십시오!"
 
-#: actions/login.php:269
+#: actions/login.php:259
 msgid "Lost or forgotten password?"
 msgstr "비밀 번호를 잊으셨나요?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 "보안을 위해 세팅을 저장하기 전에 계정과 비밀 번호를 다시 입력 해 주십시오."
 
-#: actions/login.php:292
+#: actions/login.php:281
 #, fuzzy
 msgid "Login with your username and password."
 msgstr "사용자 이름과 비밀번호로 로그인"
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, fuzzy, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3885,31 +3901,31 @@ msgid "You have not registered any applications yet."
 msgstr "응용 프로그램 수정을 위해서는 로그인해야 합니다."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr "연결한 응용프로그램"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 #, 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3917,20 +3933,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, 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 "이용자가 프로필을 가지고 있지 않습니다."
@@ -3940,6 +3966,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
@@ -4032,17 +4068,21 @@ msgstr "허용되지 않는 요청입니다."
 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 "당신의 보낸 쪽지함입니다. 이곳엔 당신이 보냈던 비밀 쪽지가 있습니다."
 
@@ -4068,40 +4108,45 @@ msgstr "기존 비밀 번호"
 msgid "New password"
 msgstr "새로운 비밀 번호"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+#, fuzzy
+msgid "6 or more characters."
 msgstr "6글자 이상"
 
-#: 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:427
+#, fuzzy
+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:230
 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:233
 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
+#, fuzzy
+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 "비밀 번호 저장"
 
@@ -4438,7 +4483,7 @@ 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:109 actions/register.php:419
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다."
@@ -4446,7 +4491,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:455
+#: actions/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4454,13 +4499,13 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "귀하의 홈페이지, 블로그 혹은 다른 사이트의 프로필 페이지 URL"
@@ -4468,35 +4513,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:471
+#: actions/profilesettings.php:129 actions/register.php:457
 #, 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "당신은 어디에 삽니까? \"시, 도 (or 군,구), 나라\""
 
@@ -4515,8 +4561,10 @@ 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 "당신을 위한 태그, (문자,숫자,-, ., _로 구성) 콤마 혹은 공백으로 구분."
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4526,7 +4574,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.
@@ -4541,14 +4590,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:229
+#: actions/profilesettings.php:258 actions/register.php:221
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4567,9 +4617,9 @@ 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:291
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "올바르지 않은 태그: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4805,6 +4855,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"
@@ -4816,12 +4872,6 @@ 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
@@ -4873,14 +4923,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:248
 msgid "Error setting user."
 msgstr "사용자 세팅 오류"
 
@@ -4890,98 +4934,97 @@ msgid "New password successfully saved. You are now logged in."
 msgstr ""
 "새로운 비밀 번호를 성공적으로 저장했습니다. 귀하는 이제 로그인 되었습니다."
 
-#: actions/register.php:92 actions/register.php:196 actions/register.php:413
+#: actions/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr "죄송합니다. 단지 초대된 사람들만 등록할 수 있습니다."
 
-#: actions/register.php:99
+#: actions/register.php:94
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "확인 코드 오류"
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "회원 가입이 성공적입니다."
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "등록"
 
-#: actions/register.php:142
+#: actions/register.php:135
 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:201
+#, fuzzy
+msgid "You cannot register if you don't agree to the license."
 msgstr "라이선스에 동의하지 않는다면 등록할 수 없습니다."
 
-#: actions/register.php:218
+#: actions/register.php:210
 msgid "Email address already exists."
 msgstr "이메일 주소가 이미 존재 합니다."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "사용자 이름이나 비밀 번호가 틀렸습니다."
 
-#: actions/register.php:351
+#: actions/register.php:340
 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "메일"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, fuzzy
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "업데이트나 공지, 비밀번호 찾기에 사용하세요."
 
-#: actions/register.php:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "더욱 긴 이름을 요구합니다."
 
-#: actions/register.php:462
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "귀하의 홈페이지, 블로그 혹은 다른 사이트의 프로필 페이지 URL"
+#: actions/register.php:471
+#, fuzzy
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "당신은 어디에 삽니까? \"시, 도 (or 군,구), 나라\""
 
-#: actions/register.php:523
+#: actions/register.php:510
 #, 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:520
 #, 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:524
 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:527
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:532
 #, 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:573
 #, fuzzy, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5014,7 +5057,7 @@ msgstr ""
 "\n"
 "다시 한번 가입하신 것을 환영하면서 즐거운 서비스가 되셨으면 합니다."
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5046,7 +5089,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
@@ -5054,7 +5098,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.
@@ -5064,7 +5109,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
@@ -5260,7 +5306,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"
 
@@ -5302,94 +5348,94 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "아이콘"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "이름"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "기관 이름이 필요합니다."
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "통계"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:207
 msgid "Application actions"
 msgstr "인증 코드가 없습니다."
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "삭제"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "인증 코드가 없습니다."
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr ""
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 #, fuzzy
 msgid "Authorize URL"
 msgstr "작성자"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:302
 #, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "정말로 통지를 삭제하시겠습니까?"
@@ -5475,16 +5521,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "설명"
 
@@ -5626,7 +5674,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"
@@ -5868,7 +5916,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.
@@ -5927,7 +5975,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.
@@ -6256,8 +6305,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "사진"
@@ -6274,6 +6324,11 @@ 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."
@@ -6308,7 +6363,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’."
@@ -6339,7 +6394,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.
@@ -6404,56 +6459,70 @@ msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-msgid "Save user settings"
-msgstr ""
+#, fuzzy
+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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "이 회원을 구독합니다."
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "거부"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
 #, 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:248
 msgid "No authorization request!"
 msgstr "허용되지 않는 요청입니다."
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 msgid "Subscription authorized"
 msgstr "구독 허가"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 #, fuzzy
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
@@ -6463,11 +6532,12 @@ msgstr ""
 "구독이 승인 되었습니다. 하지만 콜백 URL이 통과 되지 않았습니다. 웹사이트의 지"
 "시를 찾아 구독 승인 방법에 대하여 읽어보십시오. 귀하의 구독 토큰은 : "
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:285
 msgid "Subscription rejected"
 msgstr "구독 거부"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 #, fuzzy
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
@@ -6477,39 +6547,62 @@ 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:325
 #, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
-#: actions/userauthorization.php:308
-#, php-format
-msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
-
-#: actions/userauthorization.php:314
-#, php-format
-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
-#, php-format
-msgid "Avatar URL ‘%s’ is not valid."
-msgstr ""
-
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:332
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+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
+#, 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
+#, fuzzy, php-format
+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:392
 #, 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.
@@ -7723,6 +7816,11 @@ 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"
@@ -8138,6 +8236,11 @@ 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
@@ -8174,6 +8277,21 @@ 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
@@ -8283,7 +8401,6 @@ msgid "Grant this user the \"%s\" role"
 msgstr ""
 
 #: lib/groupeditform.php:147
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64자 사이에 영소문자, 숫자로만 씁니다. 기호나 공백을 쓰면 안 됩니다."
 
@@ -8951,6 +9068,10 @@ msgstr "이 게시글에 대해 답장하기"
 msgid "Reply"
 msgstr "답장하기"
 
+#: lib/noticelist.php:673
+msgid "Delete this notice"
+msgstr "이 게시글 삭제하기"
+
 #: lib/noticelist.php:691
 #, fuzzy
 msgid "Notice repeated"
@@ -9239,6 +9360,10 @@ 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"
@@ -9505,3 +9630,15 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "6 or more characters"
+#~ msgstr "6글자 이상"
+
+#~ msgid "Same as password above"
+#~ msgstr "위와 같은 비밀 번호"
+
+#~ msgid "Can't save new password."
+#~ msgstr "새 비밀번호를 저장 할 수 없습니다."
+
+#~ msgid "URL of your homepage, blog, or profile on another site"
+#~ msgstr "귀하의 홈페이지, 블로그 혹은 다른 사이트의 프로필 페이지 URL"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 54fd422177..06391a5da1 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:06:20+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27: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-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -154,7 +154,7 @@ msgstr "Нема таква страница."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -517,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 "Can't send direct messages to users who aren't your friend."
+#, fuzzy
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Неможете да испраќате директни пораки на корисници што не Ви се пријатели."
 
@@ -604,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "Тој прекар е во употреба. Одберете друг."
 
@@ -614,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "Неправилен прекар."
 
@@ -627,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "Главната страница не е важечка URL-адреса."
 
@@ -637,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:226
+#: actions/register.php:218
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Полното име е предолго (највеќе 255 знаци)."
 
@@ -665,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:235
+#: actions/register.php:227
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Местоположбата е предолга (највеќе 255 знаци)."
 
@@ -820,15 +821,15 @@ msgstr "Жетонот за барање е веќе овластен."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Се поајви проблем со Вашиот сесиски жетон. Обидете се повторно."
@@ -859,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Неочекувано поднесување на образец."
@@ -910,19 +911,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Лозинка"
 
@@ -1044,8 +1046,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.
@@ -1223,25 +1225,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1396,7 +1399,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 "Не можам да избришам туѓо членство."
 
@@ -1501,9 +1504,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 "Корисник без соодветен профил."
 
@@ -1558,9 +1563,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
-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.
@@ -1623,7 +1629,8 @@ msgstr "Резерва"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+#, fuzzy
+msgid "Backup your account."
 msgstr "Направете резервна верзија на сметката"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1665,7 +1672,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.
@@ -1682,9 +1690,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.
@@ -1846,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:440
+#: actions/recoverpassword.php:262 actions/register.php:426
 msgid "Confirm"
 msgstr "Потврди"
 
@@ -1875,13 +1883,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Се појави проблем со Вашиот сесиски жетон."
@@ -1905,12 +1913,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.
@@ -1964,12 +1974,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.
@@ -2012,12 +2024,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 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.
@@ -2052,13 +2066,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 "Не ја бриши групава"
 
 #. 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.
@@ -2222,21 +2237,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.
@@ -2268,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:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Нема таков програм."
 
@@ -2551,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Неправилна адреса за е-пошта."
@@ -2626,18 +2641,21 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "Додадена е нова влезна е-поштенска адреса."
 
@@ -2648,7 +2666,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.
@@ -2889,12 +2908,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.
@@ -3223,7 +3244,8 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Објави MicroID за мојата адреса на Jabber/Google Talk."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "Нагодувањата се зачувани."
 
@@ -3639,40 +3661,40 @@ msgstr "Зачувај"
 msgid "Save license settings"
 msgstr "Зачувај нагодувања на лиценцата"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "Веќе сте најавени."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "Неточно корисничко име или лозинка"
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "Грешка при поставувањето на корисникот. Веројатно не се заверени."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "Најава"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "Најавете се"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "Запамети ме"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Отсега врши автоматска најава. Не треба да се користи за јавни сметачи!"
 
-#: actions/login.php:269
+#: actions/login.php:259
 msgid "Lost or forgotten password?"
 msgstr "Ја загубивте или заборавивте лозинката?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3680,11 +3702,11 @@ msgstr ""
 "Поради безбедносни причини треба повторно да го внесете Вашето корисничко "
 "име и лозинка пред да ги смените Вашите нагодувања."
 
-#: actions/login.php:292
+#: actions/login.php:281
 msgid "Login with your username and password."
 msgstr "Најавете се со корисничко име и лозинка."
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3895,30 +3917,30 @@ msgid "You have not registered any applications yet."
 msgstr "Сè уште немате регистрирано ниеден програм,"
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr "Поврзани програми"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3927,14 +3949,14 @@ msgstr ""
 "Успешно одземавте пристап за %1$s и пристапниот жетон што почнува со %2$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -3943,6 +3965,16 @@ msgstr ""
 "Дали сте програмер? [Регистрирајте клиентски програм за OAuth](%s) за да го "
 "користите овој примерок на StatusNet."
 
+#: 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 "Забелешката нема профил."
@@ -3952,6 +3984,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
@@ -4041,17 +4083,21 @@ msgstr "Назначен е неважечки најавен жетон."
 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 ""
 "Ова е Вашето излезно сандче, во кое се наведени приватните пораки кои ги "
@@ -4079,40 +4125,42 @@ msgstr "Стара лозинка"
 msgid "New password"
 msgstr "Нова лозинка"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
-msgstr "6 или повеќе знаци"
+#: actions/passwordsettings.php:109 actions/register.php:423
+msgid "6 or more characters."
+msgstr "6 или повеќе знаци."
 
-#: actions/passwordsettings.php:113
-msgid "Same as password above"
-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."
+msgstr "Исто како лозинката погоре."
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Промени"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:230
 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:233
 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 "Лозинката е зачувана."
 
@@ -4440,14 +4488,14 @@ 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:109 actions/register.php:419
 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/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4455,13 +4503,13 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
 "URL-адреса на Вашата домашна страница, блог или профил на друго мрежно место."
@@ -4469,7 +4517,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:129 actions/register.php:457
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4477,28 +4525,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Каде се наоѓате, на пр. „Град, Област, Земја“."
 
@@ -4518,8 +4567,10 @@ 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 ""
 "Ознаки за Вас самите (букви, бројки, -, . и _), одделени со запирка или "
 "празно место"
@@ -4531,7 +4582,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.
@@ -4546,8 +4598,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 ""
 "Автоматски претплаќај ме на секој што се претплаќа на мене (најдобро за "
 "ботови и сл.)"
@@ -4555,7 +4608,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:258 actions/register.php:221
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4574,9 +4627,9 @@ 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:291
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Неважечка ознака: „%s“"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4819,6 +4872,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"
@@ -4829,11 +4888,6 @@ 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
@@ -4885,13 +4939,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:248
 msgid "Error setting user."
 msgstr "Грешка во поставувањето на корисникот."
 
@@ -4900,93 +4949,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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr "Жалиме, регистрацијата е само со покана."
 
-#: actions/register.php:99
+#: actions/register.php:94
 msgid "Sorry, invalid invitation code."
 msgstr "Жалиме, неважечки код за поканата."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "Регистрацијата е успешна"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "Регистрирај се"
 
-#: actions/register.php:142
+#: actions/register.php:135
 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:201
+#, fuzzy
+msgid "You cannot register if you don't agree to the license."
 msgstr "Не може да се регистрирате ако не ја прифаќате лиценцата."
 
-#: actions/register.php:218
+#: actions/register.php:210
 msgid "Email address already exists."
 msgstr "Адресата веќе постои."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "Погрешно име или лозинка."
 
-#: actions/register.php:351
+#: actions/register.php:340
+#, 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:445 actions/register.php:449
+#: actions/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Е-пошта"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, fuzzy
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "Се користи само за подновувања, објави и повраќање на лозинка."
 
-#: actions/register.php:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Подолго име, по можност Вашето вистинско име и презиме"
 
-#: actions/register.php:462
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL на Вашата домашна страница, блог или профил на друго мрежно место."
+#: actions/register.php:471
+#, fuzzy
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Каде се наоѓате, на пр. „Град, Област, Земја“."
 
-#: actions/register.php:523
+#: actions/register.php:510
 #, 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:520
 #, 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:524
 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:527
 msgid "All rights reserved."
 msgstr "Сите права задржани."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:532
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4995,7 +5045,7 @@ msgstr ""
 "Мојот текст и податотеки се достапни под %s, освен следниве приватни "
 "податоци: лозинка, е-пошта, IM-адреса и телефонски број."
 
-#: actions/register.php:588
+#: actions/register.php:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5029,7 +5079,7 @@ msgstr ""
 "Ви благодариме што се зачленивте и Ви пожелуваме пријатни мигови со оваа "
 "служба."
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5062,7 +5112,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
@@ -5070,7 +5121,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.
@@ -5080,7 +5132,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
@@ -5281,7 +5334,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"
 
@@ -5323,87 +5376,87 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Икона"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Име"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Организација"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Статистики"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, 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:207
 msgid "Application actions"
 msgstr "Дејства на програмот"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 msgid "Reset key & secret"
 msgstr "Клуч за промена и тајна"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Избриши"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "Инфо за програмот"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr "Потрошувачки клуч"
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr "Потрошувачка тајна"
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr "URL на жетонот на барањето"
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr "URL на пристапниот жетон"
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr "Одобри URL"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5411,7 +5464,7 @@ msgstr ""
 "Напомена: Поддржуваме HMAC-SHA1 потписи. Не поддржуваме потпишување со прост "
 "текст."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:302
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Дали сте сигурни дека сакате да го смените Вашиот кориснички клуч и тајна?"
@@ -5505,16 +5558,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "Забелешка"
 
@@ -5660,7 +5715,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"
@@ -5912,7 +5967,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.
@@ -5970,7 +6026,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 ""
 "Телефонски број, без интерпункциски знаци и празни места, со повикувачки код"
 
@@ -6307,8 +6364,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Фото"
@@ -6325,6 +6383,11 @@ 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."
@@ -6360,7 +6423,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’."
@@ -6392,8 +6455,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.
@@ -6453,55 +6516,71 @@ 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 "Зачувај кориснички нагодувања"
 
-#: 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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "Претплати се на корисников"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Одбиј"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+msgid "Reject this subscription."
 msgstr "Одбиј ја оваа претплата"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:248
 msgid "No authorization request!"
 msgstr "Нема барање за проверка!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 msgid "Subscription authorized"
 msgstr "Претплатата е одобрена"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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 "
@@ -6511,11 +6590,12 @@ msgstr ""
 "инструкциите на мрежното место за да дознаете како се одобрува претплата. "
 "Жетонот на Вашата претплата е:"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:285
 msgid "Subscription rejected"
 msgstr "Претплатата е одбиена"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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 "
@@ -6525,39 +6605,64 @@ msgstr ""
 "инструкциите на мрежното место за да дознаете како се одбива претплата во "
 "потполност."
 
-#: actions/userauthorization.php:303
-#, 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:325
+#, fuzzy, php-format
+msgid "Listener URI \"%s\" not found here."
 msgstr "URI-то на следачот „%s“ не е пронајдено тука."
 
-#: actions/userauthorization.php:308
-#, 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:332
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is too long."
 msgstr "Следениот URI „%s“ е предолг."
 
-#: actions/userauthorization.php:314
-#, 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:340
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "Следеното URI „%s“ е за локален корисник."
 
-#: actions/userauthorization.php:329
-#, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
+#: actions/userauthorization.php:358
+#, fuzzy, php-format
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "Профилната URL-адреса „%s“ е за локален корисник."
 
-#: actions/userauthorization.php:345
-#, 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:368
+#, 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."
 msgstr "URL-адресата „%s“ за аватар е неважечка."
 
-#: actions/userauthorization.php:350
-#, 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:385
+#, fuzzy, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Не можам да ја прочитам URL на аватарот „%s“."
 
-#: actions/userauthorization.php:355
-#, 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:392
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Погрешен тип на слика за URL на аватарот „%s“."
 
 #. TRANS: Page title for profile design page.
@@ -7772,6 +7877,11 @@ 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"
@@ -8226,6 +8336,11 @@ 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
@@ -8262,6 +8377,21 @@ 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
@@ -8366,7 +8496,6 @@ msgid "Grant this user the \"%s\" role"
 msgstr "Додели улога „%s“ на корисников"
 
 #: lib/groupeditform.php:147
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 мали букви или бројки, без интерпукциски знаци и празни места."
 
@@ -8379,7 +8508,7 @@ msgid "Describe the group or topic"
 msgstr "Опишете ја групата или темата"
 
 #: lib/groupeditform.php:163
-#, fuzzy, php-format
+#, 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 знак"
@@ -9036,9 +9165,8 @@ msgid "Send"
 msgstr "Испрати"
 
 #: lib/messagelist.php:77
-#, fuzzy
 msgid "Messages"
-msgstr "Порака"
+msgstr "Пораки"
 
 #: lib/messagelistitem.php:123 lib/noticelist.php:522
 msgid "from"
@@ -9144,6 +9272,10 @@ msgstr "Одговори на забелешкава"
 msgid "Reply"
 msgstr "Одговор"
 
+#: lib/noticelist.php:673
+msgid "Delete this notice"
+msgstr "Избриши ја оваа забелешка"
+
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Забелешката е повторена"
@@ -9419,6 +9551,10 @@ 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"
@@ -9693,3 +9829,16 @@ msgstr "Неважечки XML. Нема XRD-корен."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Земам резерва на податотеката „%s“."
+
+#~ msgid "6 or more characters"
+#~ msgstr "6 или повеќе знаци"
+
+#~ msgid "Same as password above"
+#~ msgstr "Исто како лозинката погоре"
+
+#~ msgid "Can't save new password."
+#~ msgstr "Не можам да ја зачувам новата лозинка."
+
+#~ msgid "URL of your homepage, blog, or profile on another site"
+#~ msgstr ""
+#~ "URL на Вашата домашна страница, блог или профил на друго мрежно место."
diff --git a/locale/ml/LC_MESSAGES/statusnet.po b/locale/ml/LC_MESSAGES/statusnet.po
index a30ab2d388..1da28a6543 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:06:22+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27:32+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-03 00:48:08+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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"
@@ -151,7 +151,7 @@ msgstr "അത്തരത്തിൽ ഒരു താളില്ല."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -423,7 +423,7 @@ msgstr "%s എന്ന ഉപയോക്താവിന്റെ സമയര
 #: actions/subscriptions.php:51
 #, php-format
 msgid "%s subscriptions"
-msgstr ""
+msgstr "%s എന്ന ഉപയോക്താവിന്റെ വരിക്കാരനാകലുകൾ"
 
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
@@ -501,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 "Can't send direct messages to users who aren't your friend."
+#, fuzzy
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "താങ്കളുടെ സുഹൃത്തുക്കളല്ലാത്തവർക്ക് നേരിട്ടുള്ള സന്ദേശങ്ങൾ അയയ്ക്കാൻ കഴിയില്ല."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -584,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "വിളിപ്പേര് മുമ്പേ ഉപയോഗത്തിലുണ്ട്. മറ്റൊരെണ്ണം ശ്രമിക്കുക."
 
@@ -594,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "സാധുവായ വിളിപ്പേര് അല്ല."
 
@@ -607,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "ഹോംപേജിന്റെ യൂ.ആർ.എൽ. സാധുവല്ല."
 
@@ -617,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:226
+#: actions/register.php:218
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "പൂർണ്ണ നാമത്തിന്റെ നീളം വളരെ കൂടുതലാണ് (പരമാവധി 255 അക്ഷരങ്ങൾ)."
 
@@ -645,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:235
+#: actions/register.php:227
 msgid "Location is too long (maximum 255 characters)."
 msgstr ""
 
@@ -800,15 +801,15 @@ msgstr "അഭ്യർത്ഥനാ ചീട്ട് മുമ്പേ ത
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "താങ്കളുടെ സെഷൻ ചീട്ടിൽ ഒരു ചെറിയ പ്രശ്നം. ദയവായി വീണ്ടും ശ്രമിക്കുക."
@@ -839,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "അപ്രതീക്ഷിത ഫോം സമർപ്പിക്കൽ."
@@ -884,19 +885,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "രഹസ്യവാക്ക്"
 
@@ -1014,8 +1016,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.
@@ -1191,25 +1193,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1365,7 +1368,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 "മറ്റൊരാളുടെ അംഗത്വം മായ്ക്കാനാവില്ല."
 
@@ -1468,9 +1471,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 ""
 
@@ -1525,10 +1530,11 @@ 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"
-msgstr ""
+#, 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.
@@ -1585,7 +1591,8 @@ msgstr "ബാക്ക്അപ്"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+#, fuzzy
+msgid "Backup your account."
 msgstr "താങ്കളുടെ അംഗത്വത്തിന്റെ ബാക്ക്അപ് എടുക്കുക"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1623,7 +1630,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.
@@ -1640,9 +1648,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.
@@ -1802,7 +1810,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:426
 msgid "Confirm"
 msgstr "സ്ഥിരീകരിക്കുക"
 
@@ -1831,13 +1839,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "താങ്കളുടെ സെഷൻ ചീട്ടിൽ ഒരു പ്രശ്നമുണ്ടായിരുന്നു."
@@ -1858,13 +1866,15 @@ 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 "ഈ അറിയിപ്പ് മായ്ക്കരുത്"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-msgid "Delete this application"
-msgstr ""
+#, fuzzy
+msgid "Delete this application."
+msgstr "ഈ അറിയിപ്പ് മായ്ക്കുക"
 
 #. TRANS: Client error when trying to delete group while not logged in.
 #: actions/deletegroup.php:64
@@ -1914,12 +1924,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.
@@ -1962,12 +1974,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 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.
@@ -2002,13 +2016,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 "ഈ ഉപയോക്താവിനെ നീക്കം ചെയ്യരുത്"
 
 #. 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.
@@ -2174,21 +2189,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.
@@ -2220,7 +2235,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 ""
 
@@ -2501,7 +2516,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "സാധുവായ ഇമെയിൽ വിലാസം അല്ല."
@@ -2576,18 +2591,21 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "സ്വീകരിക്കാനുള്ള പുതിയ ഇമെയിൽ വിലാസം കൂട്ടിച്ചേർത്തിരിക്കുന്നു."
 
@@ -2598,7 +2616,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.
@@ -2832,12 +2851,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.
@@ -3159,7 +3180,8 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "ഇപ്പോഴത്തെ സ്ഥിരീകരിക്കപ്പെട്ട ജാബ്ബർ/ജിറ്റോക് വിലാസം"
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "ക്രമീകരണങ്ങൾ സേവ് ചെയ്തു."
 
@@ -3540,39 +3562,39 @@ msgstr "സേവ് ചെയ്യുക"
 msgid "Save license settings"
 msgstr "അനുമതി സജ്ജീകരണങ്ങൾ സേവ് ചെയ്യുക"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "മുമ്പേ തന്നെ ലോഗിൻ ചെയ്തിട്ടുണ്ട്."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "ഉപയോക്തൃനാമമോ രഹസ്യവാക്കോ തെറ്റാണ്."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "ഉപയോക്തൃ സജ്ജീകരണത്തിൽ പിഴവുണ്ടായി. താങ്കൾക്ക് മിക്കവാറും അനുമതിയുണ്ടാവില്ല."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "പ്രവേശിക്കുക"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "സൈറ്റിലേക്ക് പ്രവേശിക്കുക"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "എന്നെ ഓർത്തുവെയ്ക്കുക"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "ഭാവിയിൽ സ്വയം ലോഗിൻ ചെയ്യുക; പങ്ക് വെച്ച് ഉപയോഗിക്കുന്ന കമ്പ്യൂട്ടറുകളിൽ പാടില്ല!"
 
-#: actions/login.php:269
+#: actions/login.php:259
 msgid "Lost or forgotten password?"
 msgstr "രഹസ്യവാക്ക് നഷ്ടപ്പെടുകയോ മറക്കുകയോ ചെയ്തോ?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3580,11 +3602,11 @@ msgstr ""
 "സുരക്ഷാകാരണങ്ങളാൽ, താങ്കളുടെ ഉപയോക്തൃനാമവും രഹസ്യവാക്കും സജ്ജീകരണങ്ങളിൽ മാറ്റം വരുത്തുന്നതിനു "
 "മുമ്പ് ഒരു പ്രാവശ്യം നൽകേണ്ടതാണ്."
 
-#: actions/login.php:292
+#: actions/login.php:281
 msgid "Login with your username and password."
 msgstr "താങ്കളുടെ ഉപയോക്തൃനാമവും രഹസ്യവാക്കും ഉപയോഗിച്ച് ലോഗിൻ ചെയ്യുക."
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3783,30 +3805,30 @@ msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr ""
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3814,20 +3836,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, 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 ""
@@ -3837,6 +3869,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
@@ -3926,17 +3968,21 @@ msgstr "വ്യക്തമാക്കിയത് അസാധുവായ 
 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 "ഇത് താങ്കളുടെ ഔട്ട്ബോക്സ് ആണ്, താങ്കൾ അയച്ച സ്വകാര്യ സന്ദേശങ്ങൾ ഇവിടെ കാണാം."
 
@@ -3962,40 +4008,42 @@ msgstr "പഴയ രഹസ്യവാക്ക്"
 msgid "New password"
 msgstr "പുതിയ രഹസ്യവാക്ക്"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
-msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ"
+#: actions/passwordsettings.php:109 actions/register.php:423
+msgid "6 or more characters."
+msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ."
 
-#: actions/passwordsettings.php:113
-msgid "Same as password above"
-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."
+msgstr "മുകളിൽ നൽകിയ അതേ രഹസ്യവാക്ക്."
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "മാറ്റുക"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:230
 msgid "Password must be 6 or more characters."
 msgstr "രഹസ്യവാക്കിന് ആറോ അതിലധികമോ അക്ഷരങ്ങളുണ്ടായിരിക്കണം."
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:233
 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."
-msgstr "പുതിയ രഹസ്യവാക്ക് സേവ് ചെയ്യാനായില്ല."
+#. 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 "രഹസ്യവാക്ക് സേവ് ചെയ്തിരിക്കുന്നു."
 
@@ -4081,11 +4129,11 @@ msgstr ""
 #. TRANS: Checkbox label in Paths admin panel.
 #: actions/pathsadminpanel.php:263
 msgid "Fancy URLs"
-msgstr ""
+msgstr "അലങ്കൃത യൂ.ആർ.എല്ലുകൾ"
 
 #: actions/pathsadminpanel.php:265
 msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
+msgstr "അലങ്കൃത (വായിക്കാനും ഓർത്തിരിക്കാനും എളുപ്പമായവ) യൂ.ആർ.എല്ലുകൾ ഉപയോഗിക്കണോ?"
 
 #: actions/pathsadminpanel.php:272
 msgid "Theme"
@@ -4318,14 +4366,14 @@ 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:109 actions/register.php:419
 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/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4333,13 +4381,13 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
 "താങ്കളുടെ ഹോംപേജിന്റെ, ബ്ലോഗിന്റെ അല്ലെങ്കിൽ മറ്റൊരു സൈറ്റിലെ താങ്കളെക്കുറിച്ചുള്ള "
@@ -4348,7 +4396,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:129 actions/register.php:457
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4356,28 +4404,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "താങ്കളെവിടെയാണ്, അതായത് \"നഗരം, സംസ്ഥാനം (അഥവ പ്രദേശം), രാജ്യം\" എന്ന്"
 
@@ -4397,7 +4446,8 @@ 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.
@@ -4407,7 +4457,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.
@@ -4423,13 +4474,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:229
+#: actions/profilesettings.php:258 actions/register.php:221
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4448,9 +4499,9 @@ 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:291
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "അസാധുവായ റ്റാഗ്: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4688,6 +4739,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"
@@ -4698,11 +4755,6 @@ 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
@@ -4754,13 +4806,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:248
 msgid "Error setting user."
 msgstr "ഉപയോക്താവിനെ സജ്ജീകരിക്കുന്നതിൽ പിഴവുണ്ടായി."
 
@@ -4769,102 +4816,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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr "ക്ഷമിക്കുക, ക്ഷണിക്കപ്പെട്ടവർക്കു മാത്രമേ അംഗത്വമെടുക്കാനാകൂ."
 
-#: actions/register.php:99
+#: actions/register.php:94
 msgid "Sorry, invalid invitation code."
 msgstr "ക്ഷമിക്കുക, ക്ഷണത്തിന്റെ കോഡ് അസാധുവാണ്."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "അംഗത്വമെടുക്കൽ വിജയകരം"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "അംഗത്വമെടുക്കുക"
 
-#: actions/register.php:142
+#: actions/register.php:135
 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:201
+#, fuzzy
+msgid "You cannot register if you don't agree to the license."
 msgstr "താങ്കൾ അനുവാദ പത്രം അംഗീകരിക്കുകയില്ലെങ്കിൽ അംഗത്വമെടുക്കാനുകുകയില്ല."
 
-#: actions/register.php:218
+#: actions/register.php:210
 msgid "Email address already exists."
 msgstr "ഇമെയിൽ വിലാസം മുമ്പേ നിലവിലുണ്ട്."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "ഉപയോക്തൃനാമമോ രഹസ്യവാക്കോ അസാധുവാണ്."
 
-#: actions/register.php:351
+#: actions/register.php:340
+#, 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:445 actions/register.php:449
+#: actions/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "ഇമെയിൽ"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, fuzzy
+msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "പുതുക്കൽ വിവരങ്ങൾക്കും, അറിയിപ്പുകൾക്കും, രഹസ്യവാക്ക് വീണ്ടെടുക്കൽ പ്രവർത്തനത്തിനും മാത്രം "
 "ഉപയോഗിച്ചത്"
 
-#: actions/register.php:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "വലിയ പേര്, താങ്കളുടെ \"യഥാർത്ഥ\" പേര് നൽകാൻ താത്പര്യപ്പെടുന്നു"
 
-#: actions/register.php:462
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr ""
-"താങ്കളുടെ ഹോംപേജിന്റെ, ബ്ലോഗിന്റെ അല്ലെങ്കിൽ മറ്റൊരു സൈറ്റിലെ താങ്കളെക്കുറിച്ചുള്ള "
-"താളിലേയ്ക്കുള്ള യൂ.ആർ.എൽ."
+#: actions/register.php:471
+#, fuzzy
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "താങ്കളെവിടെയാണ്, അതായത് \"നഗരം, സംസ്ഥാനം (അഥവ പ്രദേശം), രാജ്യം\" എന്ന്"
 
-#: actions/register.php:523
+#: actions/register.php:510
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:533
+#: actions/register.php:520
 #, 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:524
 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:527
 msgid "All rights reserved."
 msgstr "എല്ലാ അവകാശങ്ങളും സംരക്ഷിതം."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:532
 #, 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:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4883,7 +4929,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -4912,7 +4958,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
@@ -4920,7 +4967,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.
@@ -4930,8 +4977,9 @@ msgid "Subscribe"
 msgstr "വരിക്കാരാകുക"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)"
-msgstr ""
+#, 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)."
@@ -5115,7 +5163,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 "സ്റ്റാറ്റസ്‌നെറ്റ്"
 
@@ -5157,87 +5205,87 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "ഐകോൺ"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "പേര്"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "സംഘടന"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "സ്ഥിതിവിവരക്കണക്കുകൾ"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:207
 msgid "Application actions"
 msgstr ""
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 msgid "Reset key & secret"
 msgstr "പുനഃക്രമീകരണ ചാവിയും രഹസ്യവും"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "മായ്ക്കുക"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr ""
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr "ഉപയോക്തൃ രഹസ്യം"
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr "അഭ്യർത്ഥനാ ചീട്ടിന്റെ യൂ.ആർ.എൽ."
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr "അഭിഗമ്യതാ ചീട്ടിന്റെ യൂ.ആർ.എൽ."
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr "അംഗീകരണത്തിനുള്ള യൂ.ആർ.എൽ."
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5245,7 +5293,7 @@ msgstr ""
 "ശ്രദ്ധിക്കുക: HMAC-SHA1 ഒപ്പുകളാണ് ഞങ്ങൾ പിന്തുണയ്ക്കുന്നത്. പ്ലെയിൻ-ടെക്സ്റ്റ് ഒപ്പ് രീതി ഞങ്ങൾ "
 "പിന്തുണയ്ക്കുന്നില്ല."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:302
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "ഉപയോക്തൃ ചാവിയും രഹസ്യവും പുനഃക്രമീകരണം എന്ന് താങ്കൾക്ക് തീർച്ചയാണോ?"
 
@@ -5333,16 +5381,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "കുറിപ്പ്"
 
@@ -5478,7 +5528,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"
@@ -5722,7 +5772,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.
@@ -5782,7 +5833,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.
@@ -6107,8 +6158,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "ഛായാചിത്രം"
@@ -6123,6 +6175,11 @@ 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."
@@ -6156,7 +6213,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’."
@@ -6187,7 +6244,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.
@@ -6247,102 +6304,143 @@ 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 "ഉപയോക്തൃ സജ്ജീകരണങ്ങൾ സേവ് ചെയ്യുക"
 
-#: 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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "ഈ ഉപയോക്താവിന്റെ വരിക്കാരൻ/വരിക്കാരി ആകുക"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "നിരാകരിക്കുക"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+msgid "Reject this subscription."
 msgstr "ഈ വരിക്കാരനാകൽ നിരസിക്കുക"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:248
 msgid "No authorization request!"
 msgstr ""
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 msgid "Subscription authorized"
 msgstr "വരിക്കാരനാകൽ അംഗീകരിക്കപ്പെട്ടു"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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:285
 msgid "Subscription rejected"
 msgstr "വരിക്കാരനാകൽ നിരസിക്കപ്പെട്ടു"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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:325
 #, 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:332
+#, 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:340
 #, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
 
-#: actions/userauthorization.php:314
+#. 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 "Listenee URI ‘%s’ is a local user."
+msgid "Profile URL \"%s\" is for a local user."
 msgstr ""
 
-#: actions/userauthorization.php:329
+#. 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
+#, 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."
+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 "Profile URL ‘%s’ is for a local user."
+msgid "Cannot read avatar URL \"%s\"."
 msgstr ""
 
-#: actions/userauthorization.php:345
+#. 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 "Avatar URL ‘%s’ is not valid."
-msgstr ""
-
-#: actions/userauthorization.php:350
-#, php-format
-msgid "Can’t read avatar URL ‘%s’."
-msgstr ""
-
-#: 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.
@@ -7515,6 +7613,11 @@ 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"
@@ -7538,7 +7641,7 @@ 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 ""
+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.
@@ -7588,25 +7691,28 @@ msgid ""
 "Subscribers: %2$s\n"
 "Notices: %3$s"
 msgstr ""
+"വരിക്കാരനാകലുകൾ: %1$s\n"
+"വരിക്കാർ: %2$s\n"
+"അറിയിപ്പുകൾ: %3$s"
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
 #: lib/command.php:312
 msgid "Notice marked as fave."
-msgstr ""
+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
 #, php-format
 msgid "%1$s joined group %2$s."
-msgstr ""
+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
 #, php-format
 msgid "%1$s left group %2$s."
-msgstr ""
+msgstr "%2$s എന്ന സംഘത്തിൽ നിന്ന് %1$s എന്ന ഉപയോക്താവ് വിട്ടുപോയി."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
@@ -7642,7 +7748,7 @@ msgstr "പ്രധാനതാൾ: %s"
 #: lib/command.php:442
 #, php-format
 msgid "About: %s"
-msgstr ""
+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.
@@ -7923,6 +8029,11 @@ 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
@@ -7957,6 +8068,21 @@ 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
@@ -8617,7 +8743,7 @@ msgstr "സ്വീകർത്താവ്"
 
 #: lib/messageform.php:166 lib/noticeform.php:186
 msgid "Available characters"
-msgstr ""
+msgstr "ലഭ്യമായ അക്ഷരങ്ങൾ"
 
 #: lib/messageform.php:185 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
@@ -8625,9 +8751,8 @@ msgid "Send"
 msgstr "അയക്കുക"
 
 #: lib/messagelist.php:77
-#, fuzzy
 msgid "Messages"
-msgstr "സന്ദേശം"
+msgstr "സന്ദേശങ്ങൾ"
 
 #: lib/messagelistitem.php:123 lib/noticelist.php:522
 msgid "from"
@@ -8636,20 +8761,20 @@ 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 ""
+msgstr "വിളിപ്പേരിൽ ഇംഗ്ലീഷ് ചെറിയക്ഷരങ്ങളും അക്കങ്ങളും ഇടവിടാതെ നൽകുക."
 
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
-msgstr ""
+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] ""
+msgstr[0] "വിളിപ്പേര് %d അക്ഷരത്തിലധികം ഉണ്ടാകരുത്."
+msgstr[1] "വിളിപ്പേര് %d അക്ഷരങ്ങളിലധികം ഉണ്ടാകരുത്."
 
 #: lib/noticeform.php:160
 msgid "Send a notice"
@@ -8662,7 +8787,7 @@ msgstr "എന്തൊക്കെയുണ്ട്, %s?"
 
 #: lib/noticeform.php:194
 msgid "Attach"
-msgstr ""
+msgstr "ചേർത്തുവെയ്ക്കുക"
 
 #: lib/noticeform.php:198
 msgid "Attach a file"
@@ -8733,6 +8858,10 @@ msgstr "ഈ അറിയിപ്പിന് മറുപടിയിടുക"
 msgid "Reply"
 msgstr "മറുപടി"
 
+#: lib/noticelist.php:673
+msgid "Delete this notice"
+msgstr "ഈ അറിയിപ്പ് മായ്ക്കുക"
+
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "അറിയിപ്പ് ആവർത്തിച്ചിരിക്കുന്നു"
@@ -8887,7 +9016,7 @@ msgstr "ഉപയോക്തൃ സംഘങ്ങൾ"
 
 #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
-msgstr ""
+msgstr "സമീപകാല റ്റാഗുകൾ"
 
 #: lib/publicgroupnav.php:88
 msgid "Featured"
@@ -8911,7 +9040,7 @@ msgstr "അതെ"
 
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
-msgstr ""
+msgstr "ഈ അറിയിപ്പ് ആവർത്തിക്കുക"
 
 #: lib/revokeroleform.php:91
 #, php-format
@@ -8940,7 +9069,7 @@ msgstr "സൈറ്റിൽ തിരയുക"
 #. TRANS: for searching can be entered.
 #: lib/searchaction.php:128
 msgid "Keyword(s)"
-msgstr ""
+msgstr "അടയാളവാക്ക്(വാക്കുകൾ)"
 
 #. TRANS: Button text for searching site.
 #: lib/searchaction.php:130
@@ -9009,6 +9138,10 @@ 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"
@@ -9279,3 +9412,17 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "6 or more characters"
+#~ msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ"
+
+#~ msgid "Same as password above"
+#~ msgstr "മുകളിൽ നൽകിയ അതേ രഹസ്യവാക്ക്"
+
+#~ msgid "Can't save new password."
+#~ msgstr "പുതിയ രഹസ്യവാക്ക് സേവ് ചെയ്യാനായില്ല."
+
+#~ msgid "URL of your homepage, blog, or profile on another site"
+#~ msgstr ""
+#~ "താങ്കളുടെ ഹോംപേജിന്റെ, ബ്ലോഗിന്റെ അല്ലെങ്കിൽ മറ്റൊരു സൈറ്റിലെ താങ്കളെക്കുറിച്ചുള്ള "
+#~ "താളിലേയ്ക്കുള്ള യൂ.ആർ.എൽ."
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 774401abeb..49f3b4053d 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:06:30+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27:36+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 (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -153,7 +153,7 @@ msgstr "Ingen slik side."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -514,7 +514,8 @@ msgstr "Fant ikke mottakeren."
 
 #. 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."
+#, 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).
@@ -598,7 +599,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "Det nicket er allerede i bruk. Prøv et annet."
 
@@ -608,7 +609,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "Ugyldig nick."
 
@@ -621,7 +622,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "Hjemmesiden er ikke en gyldig URL."
 
@@ -631,7 +632,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:226
+#: actions/register.php:218
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Fullt navn er for langt (maks 255 tegn)."
 
@@ -659,7 +660,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:235
+#: actions/register.php:227
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Plasseringen er for lang (maks 255 tegn)."
 
@@ -817,15 +818,15 @@ msgstr "Du er ikke autorisert."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: 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."
@@ -856,7 +857,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Uventet skjemainnsending."
@@ -907,19 +908,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Passord"
 
@@ -1041,8 +1043,8 @@ 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
-#, php-format
-msgid "Unsupported format: %s"
+#, fuzzy, php-format
+msgid "Unsupported format: %s."
 msgstr "Formatet støttes ikke: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1217,25 +1219,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1401,7 +1404,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."
@@ -1506,9 +1509,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."
 
@@ -1563,9 +1568,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
-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 "Velg et kvadratisk utsnitt av bildet som din avatar."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1625,7 +1631,7 @@ msgstr "Bakgrunn"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1666,7 +1672,8 @@ msgstr "Nei"
 
 #. 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 "Ikke blokker denne brukeren"
 
 #. TRANS: Button label on the user block form.
@@ -1683,9 +1690,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.
@@ -1848,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:440
+#: actions/recoverpassword.php:262 actions/register.php:426
 msgid "Confirm"
 msgstr "Bekreft"
 
@@ -1878,13 +1885,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 #, fuzzy
 msgid "There was a problem with your session token."
@@ -1909,12 +1916,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 "Ikke slett dette programmet"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-msgid "Delete this application"
+#, fuzzy
+msgid "Delete this application."
 msgstr "Slett dette programmet"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1968,12 +1977,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 "Ikke slett denne gruppen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-msgid "Delete this group"
+#, fuzzy
+msgid "Delete this group."
 msgstr "Slett denne gruppen"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2016,12 +2027,14 @@ 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
-msgid "Do not delete this notice"
+#, 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 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.
@@ -2058,13 +2071,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.
-#. 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.
@@ -2229,21 +2242,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.
@@ -2275,7 +2288,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."
 
@@ -2554,7 +2567,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Ugyldig e-postadresse."
@@ -2630,19 +2643,22 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 #, 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "Ny innkommende e-postadresse lagt til."
 
@@ -2653,7 +2669,8 @@ msgstr "Denne notisen er allerede en favoritt."
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-msgid "Disfavor favorite"
+#, fuzzy
+msgid "Disfavor favorite."
 msgstr "Fjern favoritt"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2894,12 +2911,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 "Ikke blokker denne brukeren fra denne gruppa"
 
 #. 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 "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.
@@ -3225,7 +3244,8 @@ 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.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "Innstillinger lagret."
 
@@ -3634,40 +3654,40 @@ msgstr "Lagre"
 msgid "Save license settings"
 msgstr "Lagre lisensinnstillinger"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "Allerede innlogget."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "Feil brukernavn eller passord."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 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:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "Logg inn"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "Logg inn på nettstedet"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "Husk meg"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 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:259
 msgid "Lost or forgotten password?"
 msgstr "Mistet eller glemt passordet?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3675,11 +3695,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:281
 msgid "Login with your username and password."
 msgstr "Logg inn med brukernavn og passord."
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3891,30 +3911,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:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr "Tilkoblede program"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3923,20 +3943,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:211
 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:231
 #, 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."
@@ -3946,6 +3976,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
@@ -4036,17 +4076,21 @@ msgstr "Ugyldig symbol."
 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."
 
@@ -4072,40 +4116,45 @@ msgstr "Gammelt passord"
 msgid "New password"
 msgstr "Nytt passord"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+#, fuzzy
+msgid "6 or more characters."
 msgstr "6 eller flere tegn"
 
-#: 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:427
+#, fuzzy
+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:230
 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:233
 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
-msgid "Can't save new password."
+#. 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."
 
-#. 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"
 
@@ -4432,14 +4481,14 @@ 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:109 actions/register.php:419
 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/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4447,20 +4496,20 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 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:129 actions/register.php:457
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4468,28 +4517,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Hvor du er, for eksempel «By, fylke (eller region), land»"
 
@@ -4508,8 +4558,10 @@ msgstr "Tagger"
 
 #. 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 ""
 "Merkelapper for degselv (bokstaver, nummer, -, ., og _), adskilt med komma "
 "eller mellomrom"
@@ -4521,7 +4573,8 @@ msgstr "Språk"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-msgid "Preferred language"
+#, fuzzy
+msgid "Preferred language."
 msgstr "Foretrukket språk"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4536,15 +4589,16 @@ msgstr "Hvilken tidssone er du vanligvis i?"
 
 #. 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 ""
 "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:258 actions/register.php:221
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4563,9 +4617,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 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:291
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Ugyldig merkelapp: «%s»"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4809,6 +4863,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"
@@ -4820,12 +4880,6 @@ 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
@@ -4878,14 +4932,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:248
 msgid "Error setting user."
 msgstr "Feil ved innstilling av bruker."
 
@@ -4894,92 +4942,92 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr "Beklager, kun inviterte personer kan registrere seg."
 
-#: actions/register.php:99
+#: actions/register.php:94
 msgid "Sorry, invalid invitation code."
 msgstr "Beklager, ugyldig invitasjonskode."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "Registrering vellykket"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "Registrer"
 
-#: actions/register.php:142
+#: actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Registrering ikke tillatt."
 
-#: actions/register.php:209
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:201
+#, 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:218
+#: actions/register.php:210
 msgid "Email address already exists."
 msgstr "E-postadressen finnes allerede."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "Ugyldig brukernavn eller passord."
 
-#: actions/register.php:351
+#: actions/register.php:340
+#, 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-post"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, fuzzy
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "Kun brukt for oppdateringer, kunngjøringer og passordgjenoppretting"
 
-#: actions/register.php:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Lengre navn, helst ditt \"ekte\" navn"
 
-#: actions/register.php:462
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
+#: actions/register.php:471
+#, 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:523
+#: actions/register.php:510
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:533
+#: actions/register.php:520
 #, 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:524
 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:527
 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:532
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4988,7 +5036,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:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5021,7 +5069,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:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5054,7 +5102,8 @@ msgid "User nickname"
 msgstr "Brukerens kallenavn"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow"
+#, fuzzy
+msgid "Nickname of the user you want to follow."
 msgstr "Kallenavn på brukeren du vil følge"
 
 #: actions/remotesubscribe.php:132
@@ -5062,7 +5111,8 @@ msgid "Profile URL"
 msgstr "Profilnettadresse"
 
 #: 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 ""
 "Nettadresse til profilen din på en annen kompatibel mikrobloggingstjeneste"
 
@@ -5073,7 +5123,8 @@ msgid "Subscribe"
 msgstr "Abonner"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)"
+#, fuzzy
+msgid "Invalid profile URL (bad format)."
 msgstr "Ugyldig profilnettadresse (dårlig format)"
 
 #: actions/remotesubscribe.php:167
@@ -5271,7 +5322,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"
 
@@ -5313,88 +5364,88 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ikon"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 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
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organisasjon"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistikk"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, 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:207
 msgid "Application actions"
 msgstr "Programhandlinger"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 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
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Slett"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "Programinformasjon"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr "Forbrukernøkkel"
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr "Forbrukerhemmelighet"
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 #, fuzzy
 msgid "Authorize URL"
 msgstr "Forfatter"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5402,7 +5453,7 @@ msgstr ""
 "Merk: Vi støtter HMAC-SHA1-signaturer. Vi støtter ikke metoden for "
 "klartekstsignatur."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:302
 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?"
@@ -5495,16 +5546,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "Merk"
 
@@ -5650,7 +5703,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"
@@ -5896,7 +5949,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 "Lagre nettstedsnotis"
 
 #. TRANS: Title for SMS settings.
@@ -5954,7 +6008,8 @@ msgstr "Telefonnummer for 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 "Telefonnummer, ingen tegnsetting eller mellomrom, med retningsnummer"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6290,8 +6345,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
@@ -6309,6 +6365,11 @@ 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."
@@ -6348,7 +6409,7 @@ 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’."
@@ -6380,7 +6441,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.
@@ -6441,104 +6502,143 @@ msgstr "Hvorvidt brukere tillates å invitere nye brukere."
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-msgid "Save user settings"
-msgstr ""
+#, fuzzy
+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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, 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:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Avvis"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+msgid "Reject this subscription."
 msgstr "Avvis dette abonnementet"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:248
 msgid "No authorization request!"
 msgstr ""
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 #, fuzzy
 msgid "Subscription authorized"
 msgstr "Abonnement"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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:285
 #, fuzzy
 msgid "Subscription rejected"
 msgstr "Abonnement"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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:325
 #, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
-#: actions/userauthorization.php:308
-#, php-format
-msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:332
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is too long."
+msgstr "Kilde-URL er for lang."
 
-#: actions/userauthorization.php:314
-#, php-format
-msgid "Listenee URI ‘%s’ is a local user."
-msgstr ""
-
-#: actions/userauthorization.php:329
-#, php-format
-msgid "Profile URL ‘%s’ is for 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:340
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "Profil-URL ‘%s’ er for en lokal bruker."
 
-#: actions/userauthorization.php:345
-#, php-format
-msgid "Avatar URL ‘%s’ is not valid."
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
+#: actions/userauthorization.php:358
+#, 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:368
+#, 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."
 msgstr "Avatar-URL ‘%s’ er ikke gyldig."
 
-#: actions/userauthorization.php:350
-#, 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:385
+#, fuzzy, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Kan ikke lese avatar-URL ‘%s’"
 
-#: actions/userauthorization.php:355
-#, 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:392
+#, 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.
@@ -7745,6 +7845,11 @@ 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"
@@ -8168,6 +8273,11 @@ 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
@@ -8205,6 +8315,21 @@ 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
@@ -8318,9 +8443,8 @@ msgid "Grant this user the \"%s\" role"
 msgstr "Innvilg denne brukeren rollen «%s»"
 
 #: lib/groupeditform.php:147
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1‒64 små bokstaver eller tall, ingen tegnsetting eller mellomrom."
+msgstr "1-64 små bokstaver eller tall, ingen punktum eller mellomrom"
 
 #: lib/groupeditform.php:156
 #, fuzzy
@@ -9089,6 +9213,10 @@ 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"
@@ -9378,6 +9506,10 @@ 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"
@@ -9653,3 +9785,15 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "6 or more characters"
+#~ msgstr "6 eller flere tegn"
+
+#~ msgid "Same as password above"
+#~ msgstr "Samme som passord ovenfor"
+
+#~ msgid "Can't save new password."
+#~ msgstr "Klarer ikke å lagre nytt passord."
+
+#~ msgid "URL of your homepage, blog, or profile on another site"
+#~ msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 8883b62de7..51ff6ac80a 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:06:25+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27: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-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -154,7 +154,7 @@ msgstr "Deze pagina bestaat niet."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -519,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 "Can't send direct messages to users who aren't your friend."
+#, fuzzy
+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."
@@ -607,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr ""
 "De opgegeven gebruikersnaam is al in gebruik. Kies een andere gebruikersnaam."
@@ -618,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "Ongeldige gebruikersnaam!"
 
@@ -631,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "De thuispagina is geen geldige URL."
 
@@ -641,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:226
+#: actions/register.php:218
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "De volledige naam is te lang (maximaal 255 tekens)."
 
@@ -669,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:235
+#: actions/register.php:227
 msgid "Location is too long (maximum 255 characters)."
 msgstr "De locatie is te lang (maximaal 255 tekens)."
 
@@ -824,15 +825,15 @@ msgstr "Het verzoektoken is al geautoriseerd."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -867,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Het formulier is onverwacht ingezonden."
@@ -918,19 +919,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -1052,8 +1054,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.
@@ -1232,25 +1234,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1409,7 +1412,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."
 
@@ -1516,9 +1519,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."
 
@@ -1573,9 +1578,10 @@ 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
-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"
 
@@ -1639,7 +1645,8 @@ msgstr "Reservekopie"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+#, fuzzy
+msgid "Backup your account."
 msgstr "Uw gebruiker back-uppen"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1680,7 +1687,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 "Gebruiker niet blokkeren"
 
 #. TRANS: Button label on the user block form.
@@ -1697,9 +1705,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 "Deze gebruiker blokkeren"
 
 #. TRANS: Server error displayed when blocking a user fails.
@@ -1862,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:440
+#: actions/recoverpassword.php:262 actions/register.php:426
 msgid "Confirm"
 msgstr "Bevestigen"
 
@@ -1893,13 +1901,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Er is een probleem met uw sessietoken."
@@ -1923,12 +1931,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.
@@ -1983,12 +1993,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 "Verwijder deze groep niet"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-msgid "Delete this group"
+#, fuzzy
+msgid "Delete this group."
 msgstr "Groep verwijderen"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2031,12 +2043,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 lib/noticelist.php:673
-msgid "Delete this notice"
+#: actions/deletenotice.php:166
+#, fuzzy
+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.
@@ -2072,13 +2086,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 "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"
+#: actions/deleteuser.php:165
+#, fuzzy
+msgid "Delete this user."
 msgstr "Gebruiker verwijderen"
 
 #. TRANS: Message used as title for design settings for the site.
@@ -2242,21 +2257,21 @@ 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"
+#: actions/designadminpanel.php:720
+#, fuzzy
+msgid "Restore default designs."
 msgstr "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"
+#: actions/designadminpanel.php:728
+#, fuzzy
+msgid "Reset back to default."
 msgstr "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"
+#: actions/designadminpanel.php:736
+#, fuzzy
+msgid "Save design."
 msgstr "Ontwerp opslaan"
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
@@ -2288,7 +2303,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."
 
@@ -2570,7 +2585,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Geen geldig e-mailadres."
@@ -2645,18 +2660,21 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "Het nieuwe binnenkomende e-mailadres is toegevoegd."
 
@@ -2667,7 +2685,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
-msgid "Disfavor favorite"
+#, fuzzy
+msgid "Disfavor favorite."
 msgstr "Van favorietenlijst verwijderen"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2913,12 +2932,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.
@@ -3249,7 +3270,8 @@ 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.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "Uw voorkeuren zijn opgeslagen."
 
@@ -3661,41 +3683,41 @@ msgstr "Opslaan"
 msgid "Save license settings"
 msgstr "Licentieinstellingen opslaan"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "U bent al aangemeld."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "De gebruikersnaam of wachtwoord is onjuist."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 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:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "Aanmelden"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "Aanmelden"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "Aanmeldgegevens onthouden"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 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:259
 msgid "Lost or forgotten password?"
 msgstr "Wachtwoord kwijt of vergeten?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3703,11 +3725,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:281
 msgid "Login with your username and password."
 msgstr "Aanmelden met uw gebruikersnaam en wachtwoord."
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3917,24 +3939,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:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr "Verbonden applicaties"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, php-format
 msgid "Unable to revoke access for application: %s."
 msgstr ""
@@ -3943,7 +3965,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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3953,7 +3975,7 @@ msgstr ""
 "ingetrokken."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 msgid "You have not authorized any applications to use your account."
 msgstr ""
 "U hebt geen enkele applicatie geautoriseerd voor toegang tot uw "
@@ -3962,7 +3984,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:231
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -3971,6 +3993,16 @@ msgstr ""
 "Bet u ontwikkelaar? [Registreer dan een OAuthprogramma](%s) om te gebruiken "
 "met deze Statusnetsite."
 
+#: actions/oembed.php:64
+#, fuzzy, php-format
+msgid "\"%s\" not found."
+msgstr "De pagina is niet aangetroffen."
+
+#: actions/oembed.php:76
+#, fuzzy, php-format
+msgid "Notice %s not found."
+msgstr "De bovenliggende mededeling is niet aangetroffen."
+
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
 msgstr "Mededeling heeft geen profiel."
@@ -3980,6 +4012,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
+#, fuzzy, php-format
+msgid "Attachment %s not found."
+msgstr "De ontvanger is niet aangetroffen."
+
+#: 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
@@ -4069,17 +4111,21 @@ msgstr "Het opgegeven token is ongeldig."
 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."
 
@@ -4105,40 +4151,42 @@ msgstr "Huidige wachtwoord"
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+msgid "6 or more characters."
 msgstr "Zes of meer tekens"
 
-#: actions/passwordsettings.php:113
-msgid "Same as password above"
-msgstr "Gelijk aan het wachtwoord hierboven"
+#. 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."
+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:230
 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:233
 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
-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."
 
@@ -4466,14 +4514,14 @@ 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:109 actions/register.php:419
 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/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4481,20 +4529,20 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 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:129 actions/register.php:457
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4502,28 +4550,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Waar u bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\""
 
@@ -4542,8 +4591,10 @@ 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"
@@ -4555,7 +4606,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 "Voorkeurstaal"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4570,8 +4622,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)"
@@ -4579,7 +4632,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:258 actions/register.php:221
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4598,9 +4651,9 @@ 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
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:291
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Ongeldig label: '%s'"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4846,6 +4899,12 @@ msgstr "Wachtwoord herstellen"
 msgid "Password recovery requested"
 msgstr "Wachtwoordherstel aangevraagd"
 
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/recoverpassword.php:229
+#, fuzzy
+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"
@@ -4856,11 +4915,6 @@ 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
@@ -4914,13 +4968,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:248
 msgid "Error setting user."
 msgstr "Er is een fout opgetreden tijdens het instellen van de gebruiker."
 
@@ -4929,92 +4978,93 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr "U kunt zich alleen registreren als u wordt uitgenodigd."
 
-#: actions/register.php:99
+#: actions/register.php:94
 msgid "Sorry, invalid invitation code."
 msgstr "Sorry. De uitnodigingscode is ongeldig."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "De registratie is voltooid"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "Registreren"
 
-#: actions/register.php:142
+#: actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Registratie is niet toegestaan."
 
-#: actions/register.php:209
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:201
+#, fuzzy
+msgid "You cannot register if you don't agree to the license."
 msgstr "U kunt zich niet registreren als u niet met de licentie akkoord gaat."
 
-#: actions/register.php:218
+#: actions/register.php:210
 msgid "Email address already exists."
 msgstr "Het e-mailadres bestaat al."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
-#: actions/register.php:351
+#: actions/register.php:340
+#, 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:445 actions/register.php:449
+#: actions/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, fuzzy
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel"
 
-#: actions/register.php:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Een langere naam, mogelijk uw echte naam"
 
-#: actions/register.php:462
-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:471
+#, fuzzy
+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:510
 #, 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:520
 #, 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:524
 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:527
 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:532
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5023,7 +5073,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:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5057,7 +5107,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:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5090,7 +5140,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 "De gebruikersnaam van de gebruiker die u wilt volgen"
 
 #: actions/remotesubscribe.php:132
@@ -5098,7 +5149,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.
@@ -5108,7 +5160,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
@@ -5309,7 +5362,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"
 
@@ -5351,87 +5404,87 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Icoon"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 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
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organisatie"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistieken"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, 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:207
 msgid "Application actions"
 msgstr "Applicatiehandelingen"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 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
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "Applicatieinformatie"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr "Gebruikerssleutel"
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr "Gebruikersgeheim"
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr "URL voor verzoektoken"
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr "URL voor toegangstoken"
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr "Autorisatie-URL"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5439,7 +5492,7 @@ msgstr ""
 "Opmerking: HMAC-SHA1 ondertekening wordt ondersteund. Ondertekening in "
 "platte tekst is niet mogelijk."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:302
 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?"
@@ -5534,16 +5587,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "Opmerking"
 
@@ -5689,7 +5744,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"
@@ -5945,7 +6000,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.
@@ -6003,7 +6059,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.
@@ -6342,8 +6399,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
@@ -6360,6 +6418,11 @@ 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."
@@ -6397,7 +6460,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’."
@@ -6429,8 +6492,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.
@@ -6490,56 +6553,72 @@ 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"
 
-#: actions/userauthorization.php:105
+#. TRANS: Page title.
+#: actions/userauthorization.php:109
 msgid "Authorize subscription"
 msgstr "Abonneren"
 
-#: 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 ""
 "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:196 actions/version.php:167
+#: actions/userauthorization.php:207 actions/version.php:167
 #: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Licentie"
 
-#: actions/userauthorization.php:217
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:229
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Aanvaarden"
 
-#: 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:231
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "Abonneren op deze gebruiker"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Afwijzen"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+msgid "Reject this subscription."
 msgstr "Dit abonnement weigeren"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:248
 msgid "No authorization request!"
 msgstr "Geen autorisatieverzoek!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 msgid "Subscription authorized"
 msgstr "Het abonnement is geautoriseerd"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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 "
@@ -6549,11 +6628,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:285
 msgid "Subscription rejected"
 msgstr "Het abonnement is afgewezen"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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 "
@@ -6563,39 +6643,64 @@ msgstr ""
 "Controleer de instructies van de site voor informatie over het volledig "
 "afwijzen van een abonnement."
 
-#: actions/userauthorization.php:303
-#, 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:325
+#, fuzzy, php-format
+msgid "Listener URI \"%s\" not found here."
 msgstr "De abonnee-URI \"%s\" is hier niet te vinden."
 
-#: actions/userauthorization.php:308
-#, 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:332
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is too long."
 msgstr "De URI \"%s\" voor de stream is te lang."
 
-#: actions/userauthorization.php:314
-#, 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:340
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "de URI \"%s\" voor de stream is een lokale gebruiker."
 
-#: actions/userauthorization.php:329
-#, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
+#: actions/userauthorization.php:358
+#, fuzzy, 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
-#, 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:368
+#, fuzzy, 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
+#, fuzzy, php-format
+msgid "Avatar URL \"%s\" is not valid."
 msgstr "De avatar-URL \"%s\" is niet geldig."
 
-#: actions/userauthorization.php:350
-#, 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:385
+#, fuzzy, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Het was niet mogelijk de avatar-URL \"%s\" te lezen."
 
-#: actions/userauthorization.php:355
-#, 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:392
+#, 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.
@@ -7826,6 +7931,11 @@ 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"
@@ -8289,6 +8399,11 @@ 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
@@ -8325,6 +8440,21 @@ 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
@@ -8429,7 +8559,6 @@ msgid "Grant this user the \"%s\" role"
 msgstr "Deze gebruiker de rol \"%s\" geven"
 
 #: lib/groupeditform.php:147
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 kleine letters of cijfers, geen leestekens of spaties."
 
@@ -8442,11 +8571,11 @@ msgid "Describe the group or topic"
 msgstr "Beschrijf de groep of het onderwerp"
 
 #: lib/groupeditform.php:163
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
-msgstr[0] "Beschrijf de groep in %d teken of minder."
-msgstr[1] "Beschrijf de groep in %d tekens of minder."
+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 ""
@@ -9097,9 +9226,8 @@ msgid "Send"
 msgstr "Verzenden"
 
 #: lib/messagelist.php:77
-#, fuzzy
 msgid "Messages"
-msgstr "Bericht"
+msgstr "Berichten"
 
 #: lib/messagelistitem.php:123 lib/noticelist.php:522
 msgid "from"
@@ -9207,6 +9335,10 @@ 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"
@@ -9482,6 +9614,10 @@ 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"
@@ -9765,3 +9901,15 @@ 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 "6 or more characters"
+#~ msgstr "Zes of meer tekens"
+
+#~ msgid "Same as password above"
+#~ msgstr "Gelijk aan het wachtwoord hierboven"
+
+#~ msgid "Can't save new password."
+#~ msgstr "Het was niet mogelijk het nieuwe wachtwoord op te slaan."
+
+#~ msgid "URL of your homepage, blog, or profile on another site"
+#~ msgstr "De URL van uw thuispagina, blog of profiel bij een andere website"
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 5049240890..e056304c47 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:06:27+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27:35+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 (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -161,7 +161,7 @@ msgstr "Dette emneord finst ikkje."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -515,7 +515,8 @@ 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
-msgid "Can't send direct messages to users who aren't your friend."
+#, 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).
@@ -605,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
 
@@ -615,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "Ikkje eit gyldig brukarnamn."
 
@@ -628,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "Heimesida er ikkje ei gyldig internettadresse."
 
@@ -638,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:226
+#: actions/register.php:218
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
@@ -667,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:235
+#: actions/register.php:227
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Plassering er for lang (maksimalt 255 teikn)."
@@ -829,15 +830,15 @@ msgstr "Du tingar ikkje oppdateringar til den profilen."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: 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."
@@ -870,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Uventa skjemasending."
@@ -916,19 +917,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Passord"
 
@@ -1053,7 +1055,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.
@@ -1233,25 +1235,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1419,7 +1422,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."
@@ -1524,9 +1527,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."
 
@@ -1585,9 +1590,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
-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 "Velg eit utvalg av bildet som vil blir din avatar."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1647,7 +1653,7 @@ msgstr ""
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1686,7 +1692,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.
@@ -1704,9 +1710,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.
@@ -1874,7 +1880,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:426
 msgid "Confirm"
 msgstr "Godta"
 
@@ -1904,14 +1910,14 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Det var eit problem med sesjons billetten din."
@@ -1934,13 +1940,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.
@@ -1995,12 +2001,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 "Ikkje slett denne gruppa"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-msgid "Delete this group"
+#, fuzzy
+msgid "Delete this group."
 msgstr "Slett denne gruppa"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2045,12 +2053,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.
@@ -2088,14 +2097,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 "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.
@@ -2266,22 +2274,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
@@ -2313,7 +2320,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."
@@ -2606,7 +2613,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Ikkje ei gyldig epostadresse."
@@ -2683,19 +2690,22 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 #, 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "La til ny innkomande epostadresse."
 
@@ -2706,7 +2716,8 @@ msgstr "Denne notisen er alt ein favoritt!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-msgid "Disfavor favorite"
+#, fuzzy
+msgid "Disfavor favorite."
 msgstr "Fjern favoritt"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2952,13 +2963,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.
@@ -3279,7 +3290,8 @@ 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.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "Lagra brukarval."
 
@@ -3693,40 +3705,40 @@ msgstr "Lagra"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "Allereie logga inn."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "Feil brukarnamn eller passord."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 actions/otp.php:120
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Ikkje autorisert."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "Logg inn"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "Logg inn "
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "Hugs meg"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 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:259
 msgid "Lost or forgotten password?"
 msgstr "Mista eller gløymd passord?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3734,12 +3746,12 @@ msgstr ""
 "Skriv inn brukarnam og passord før du endrar innstillingar (av "
 "tryggleiksomsyn)."
 
-#: actions/login.php:292
+#: actions/login.php:281
 #, fuzzy
 msgid "Login with your username and password."
 msgstr "Log inn med brukarnamn og passord."
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, fuzzy, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3956,31 +3968,31 @@ msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr ""
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 #, 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3988,20 +4000,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, 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."
@@ -4011,6 +4033,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
@@ -4106,17 +4138,21 @@ msgstr "Ugyldig notisinnhald"
 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."
 
@@ -4142,40 +4178,45 @@ msgstr "Gamalt passord"
 msgid "New password"
 msgstr "Nytt passord"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+#, fuzzy
+msgid "6 or more characters."
 msgstr "6 eller fleire teikn"
 
-#: 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:427
+#, fuzzy
+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:230
 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:233
 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
-msgid "Can't save new password."
+#. 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."
 
-#. 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."
 
@@ -4519,7 +4560,7 @@ 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:109 actions/register.php:419
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4528,7 +4569,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:455
+#: actions/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4536,13 +4577,13 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 #, 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."
@@ -4550,7 +4591,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:129 actions/register.php:457
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4558,29 +4599,30 @@ 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:135 actions/register.php:462
 #, 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Kvar er du, t.d. «By, Fylke (eller Region), Land»"
 
@@ -4599,8 +4641,10 @@ msgstr "Merkelappar"
 
 #. 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 ""
 "merkelappar for deg sjølv ( bokstavar, nummer, -, ., og _ ), komma eller "
 "mellomroms separert."
@@ -4612,7 +4656,8 @@ msgstr "Språk"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-msgid "Preferred language"
+#, fuzzy
+msgid "Preferred language."
 msgstr "Foretrukke språk"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4627,15 +4672,16 @@ msgstr "Kva tidssone er du vanlegvis i?"
 
 #. 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 ""
 "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:258 actions/register.php:221
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4655,9 +4701,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 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:291
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Ugyldig merkelapp: %s"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4896,6 +4942,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"
@@ -4907,12 +4959,6 @@ 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
@@ -4965,14 +5011,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:248
 msgid "Error setting user."
 msgstr "Feil ved å setja brukar."
 
@@ -4981,92 +5021,91 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr "Beklage, men kun inviterte kan registrere seg."
 
-#: actions/register.php:99
+#: actions/register.php:94
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Feil med stadfestingskode."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "Registreringa gikk bra"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "Registrér"
 
-#: actions/register.php:142
+#: actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Registrering ikkje tillatt."
 
-#: actions/register.php:209
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:201
+#, 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:218
+#: actions/register.php:210
 msgid "Email address already exists."
 msgstr "Epostadressa finst allereie."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "Ugyldig brukarnamn eller passord."
 
-#: actions/register.php:351
+#: actions/register.php:340
 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Epost"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, 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:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Lengre namn, fortrinnsvis ditt «ekte» namn"
 
-#: actions/register.php:462
-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:471
+#, 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:523
+#: actions/register.php:510
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:533
+#: actions/register.php:520
 #, 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:524
 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:527
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:532
 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5075,7 +5114,7 @@ msgstr ""
 " unnateke privatdata: passord, epostadresse, ljonmeldingsadresse og "
 "telefonnummer."
 
-#: actions/register.php:588
+#: actions/register.php:573
 #, fuzzy, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5107,7 +5146,7 @@ msgstr ""
 "\n"
 "Takk for at du blei med, og vi håpar du vil lika tenesta!"
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5141,7 +5180,8 @@ msgid "User nickname"
 msgstr "Brukaren sitt kallenamn"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow"
+#, fuzzy
+msgid "Nickname of the user you want to follow."
 msgstr "Kallenamnet til brukaren du vil fylgja"
 
 #: actions/remotesubscribe.php:132
@@ -5149,7 +5189,8 @@ msgid "Profile URL"
 msgstr "Profil-adresse"
 
 #: 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 til profilsida di på ei anna kompatibel mikrobloggingteneste."
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5159,7 +5200,8 @@ msgid "Subscribe"
 msgstr "Ting"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)"
+#, fuzzy
+msgid "Invalid profile URL (bad format)."
 msgstr "Ugyldig profil-nettadresse (feil format)"
 
 #: actions/remotesubscribe.php:167
@@ -5357,7 +5399,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"
 
@@ -5402,97 +5444,97 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 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
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 #, fuzzy
 msgid "Organization"
 msgstr "Paginering"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistikk"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:207
 msgid "Application actions"
 msgstr ""
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Slett"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr ""
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr ""
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr ""
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:302
 #, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Sikker på at du vil sletta notisen?"
@@ -5578,16 +5620,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "Merknad"
 
@@ -5727,7 +5771,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"
@@ -5972,7 +6016,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.
@@ -6032,7 +6076,8 @@ msgstr "Ingen telefonnummer."
 
 #. 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 "Telefonnummer, kun tall, med landskode"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6363,8 +6408,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Bilete"
@@ -6381,6 +6427,11 @@ 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."
@@ -6419,7 +6470,7 @@ 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’."
@@ -6451,7 +6502,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.
@@ -6518,57 +6569,71 @@ msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-msgid "Save user settings"
-msgstr ""
+#, fuzzy
+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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, 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:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Avslå"
 
-#: actions/userauthorization.php:220
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
 #, 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:248
 msgid "No authorization request!"
 msgstr "Ingen autoriserings-spørjing!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 msgid "Subscription authorized"
 msgstr "Tinging autorisert"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 #, fuzzy
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
@@ -6579,11 +6644,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:285
 msgid "Subscription rejected"
 msgstr "Tinging avvist"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 #, fuzzy
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
@@ -6593,39 +6659,62 @@ msgstr ""
 "Tingina har blitt avvist, men ingen henvisnings URL er tilgjengleg. Sjekk "
 "med sida sine instruksjonar for korleis ein skal avvise tinginga."
 
-#: 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:325
 #, 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:332
 #, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr ""
 
-#: 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:340
 #, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
 
-#: actions/userauthorization.php:329
+#. 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."
+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:368
 #, 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:378
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+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
+#, fuzzy, php-format
+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:392
 #, 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.
@@ -7859,6 +7948,11 @@ 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"
@@ -8281,6 +8375,12 @@ 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
@@ -8316,6 +8416,21 @@ 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
@@ -8425,7 +8540,6 @@ msgid "Grant this user the \"%s\" role"
 msgstr ""
 
 #: lib/groupeditform.php:147
-#, 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"
@@ -9114,6 +9228,10 @@ 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"
@@ -9407,6 +9525,10 @@ 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"
@@ -9683,3 +9805,16 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "6 or more characters"
+#~ msgstr "6 eller fleire teikn"
+
+#~ msgid "Same as password above"
+#~ msgstr "Samme passord som over"
+
+#~ msgid "Can't save new password."
+#~ msgstr "Klarar ikkje lagra nytt passord."
+
+#~ 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."
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index a50e613282..f857b5d746 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:06:32+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27:38+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 (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -156,7 +156,7 @@ msgstr "Nie ma takiej strony."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -523,7 +523,8 @@ msgstr "Nie odnaleziono odbiorcy."
 
 #. 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."
+#, fuzzy
+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."
@@ -609,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "Pseudonim jest już używany. Spróbuj innego."
 
@@ -619,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "To nie jest prawidłowy pseudonim."
 
@@ -632,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "Strona domowa nie jest prawidłowym adresem URL."
 
@@ -642,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:226
+#: actions/register.php:218
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
 
@@ -671,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:235
+#: actions/register.php:227
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
 
@@ -827,15 +828,15 @@ msgstr "Token żądania został już upoważniony."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: 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."
@@ -866,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Nieoczekiwane wysłanie formularza."
@@ -917,19 +918,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Hasło"
 
@@ -1051,8 +1053,8 @@ 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
-#, php-format
-msgid "Unsupported format: %s"
+#, fuzzy, php-format
+msgid "Unsupported format: %s."
 msgstr "Nieobsługiwany format: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1231,25 +1233,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1404,7 +1407,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."
 
@@ -1507,9 +1510,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."
 
@@ -1564,9 +1569,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
-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 "Wybierz kwadratowy obszar obrazu do awatara"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1631,7 +1637,8 @@ msgstr "Kopia zapasowa"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+#, fuzzy
+msgid "Backup your account."
 msgstr "Wykonuje kopię zapasową konta"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1672,7 +1679,8 @@ msgstr "Nie"
 
 #. 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 "Nie blokuj tego użytkownika"
 
 #. TRANS: Button label on the user block form.
@@ -1689,9 +1697,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.
@@ -1853,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:426
 msgid "Confirm"
 msgstr "Potwierdź"
 
@@ -1882,13 +1890,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Wystąpił problem z tokenem sesji."
@@ -1911,12 +1919,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 "Nie usuwaj tej aplikacji"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-msgid "Delete this application"
+#, fuzzy
+msgid "Delete this application."
 msgstr "Usuń tę aplikację"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1970,12 +1980,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 "Nie usuwaj tej grupy"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-msgid "Delete this group"
+#, fuzzy
+msgid "Delete this group."
 msgstr "Usuń tę grupę"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2018,12 +2030,14 @@ msgstr "Jesteś pewien, że chcesz usunąć ten wpis?"
 
 #. 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 "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.
@@ -2058,13 +2072,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 "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.
@@ -2226,21 +2241,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.
@@ -2272,7 +2287,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."
 
@@ -2554,7 +2569,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "To nie jest prawidłowy adres e-mail."
@@ -2629,18 +2644,21 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "Dodano nowy przychodzący adres e-mail."
 
@@ -2651,7 +2669,8 @@ msgstr "Ten wpis jest już ulubiony."
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-msgid "Disfavor favorite"
+#, fuzzy
+msgid "Disfavor favorite."
 msgstr "Usuń wpis z ulubionych"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2892,12 +2911,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 "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
-msgid "Block this user from this group"
+#, 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.
@@ -3223,7 +3244,8 @@ 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.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "Zapisano preferencje."
 
@@ -3643,41 +3665,41 @@ msgstr "Zapisz"
 msgid "Save license settings"
 msgstr "Zapisz ustawienia licencji"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "Jesteś już zalogowany."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "Niepoprawna nazwa użytkownika lub hasło."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 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:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "Zaloguj się"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "Zaloguj się na witrynie"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "Zapamiętaj mnie"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 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:259
 msgid "Lost or forgotten password?"
 msgstr "Zgubione lub zapomniane hasło?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3685,11 +3707,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:281
 msgid "Login with your username and password."
 msgstr "Logowanie za pomocą nazwy użytkownika i hasła."
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3899,30 +3921,30 @@ 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:70
 msgid "Connected applications"
 msgstr "Połączone aplikacje"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3932,14 +3954,14 @@ msgstr ""
 "$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -3948,6 +3970,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."
@@ -3957,6 +3989,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
@@ -4046,17 +4088,21 @@ msgstr "Podano nieprawidłowy token logowania."
 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ś."
 
@@ -4082,40 +4128,42 @@ msgstr "Poprzednie hasło"
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
-msgstr "6 lub więcej znaków"
+#: actions/passwordsettings.php:109 actions/register.php:423
+msgid "6 or more characters."
+msgstr "6 lub więcej znaków."
 
-#: actions/passwordsettings.php:113
-msgid "Same as password above"
-msgstr "Takie samo jak powyższe hasło"
+#. 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."
+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:230
 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:233
 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
-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."
 
@@ -4443,14 +4491,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:433
+#: actions/profilesettings.php:109 actions/register.php:419
 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/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4458,20 +4506,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:460
+#: actions/profilesettings.php:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 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:129 actions/register.php:457
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4480,28 +4528,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Gdzie jesteś, np. \"miasto, województwo (lub region), kraj\""
 
@@ -4520,8 +4569,10 @@ msgstr "Znaczniki"
 
 #. 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 ""
 "Znaczniki dla siebie (litery, liczby, -, . i _), oddzielone przecinkami lub "
 "spacjami"
@@ -4533,7 +4584,8 @@ msgstr "Język"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-msgid "Preferred language"
+#, fuzzy
+msgid "Preferred language."
 msgstr "Preferowany język"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4548,15 +4600,16 @@ msgstr "W jakiej strefie czasowej zwykle się znajdujesz?"
 
 #. 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 ""
 "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:258 actions/register.php:221
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4576,9 +4629,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 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:291
+#, 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
@@ -4818,6 +4871,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"
@@ -4828,11 +4887,6 @@ 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
@@ -4884,13 +4938,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:248
 msgid "Error setting user."
 msgstr "Błąd podczas ustawiania użytkownika."
 
@@ -4899,92 +4948,93 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr "Tylko zaproszone osoby mogą się rejestrować."
 
-#: actions/register.php:99
+#: actions/register.php:94
 msgid "Sorry, invalid invitation code."
 msgstr "Nieprawidłowy kod zaproszenia."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "Rejestracja powiodła się"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "Zarejestruj się"
 
-#: actions/register.php:142
+#: actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Rejestracja nie jest dozwolona."
 
-#: actions/register.php:209
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:201
+#, 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:218
+#: actions/register.php:210
 msgid "Email address already exists."
 msgstr "Adres e-mail już istnieje."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "Nieprawidłowa nazwa użytkownika lub hasło."
 
-#: actions/register.php:351
+#: actions/register.php:340
+#, 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, 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:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Dłuższa nazwa, najlepiej twoje \"prawdziwe\" imię i nazwisko"
 
-#: actions/register.php:462
-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:471
+#, fuzzy
+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:510
 #, 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:520
 #, 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:524
 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:527
 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:532
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4993,7 +5043,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:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5026,7 +5076,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:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5059,7 +5109,8 @@ msgid "User nickname"
 msgstr "Pseudonim użytkownika"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow"
+#, fuzzy
+msgid "Nickname of the user you want to follow."
 msgstr "Pseudonim użytkownika którego chcesz obserwować"
 
 #: actions/remotesubscribe.php:132
@@ -5067,7 +5118,8 @@ msgid "Profile URL"
 msgstr "Adres URL profilu"
 
 #: 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 "Adres URL profilu na innej, zgodnej usłudze mikroblogowania"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5077,7 +5129,8 @@ msgid "Subscribe"
 msgstr "Subskrybuj"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)"
+#, fuzzy
+msgid "Invalid profile URL (bad format)."
 msgstr "Nieprawidłowy adres URL profilu (błędny format)"
 
 #: actions/remotesubscribe.php:167
@@ -5274,7 +5327,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"
 
@@ -5316,87 +5369,87 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ikona"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 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
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organizacja"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statystyki"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, 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:207
 msgid "Application actions"
 msgstr "Czynności aplikacji"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 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
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Usuń"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "Informacje o aplikacji"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr "Klucz klienta"
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr "Sekret klienta"
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr "Adres URL tokenu żądania"
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr "Adres URL tokenu żądania"
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr "Adres URL upoważnienia"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5404,7 +5457,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:302
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Jesteś pewien, że chcesz przywrócić klucz i sekret klienta?"
 
@@ -5497,16 +5550,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "Wpis"
 
@@ -5652,7 +5707,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"
@@ -5902,7 +5957,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 "Zapisz wpis witryny"
 
 #. TRANS: Title for SMS settings.
@@ -5960,7 +6016,8 @@ msgstr "Numer telefonu 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 "Numer telefonu, bez znaków przestankowych i spacji, z kodem państwa"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6299,8 +6356,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Zdjęcie"
@@ -6317,6 +6375,11 @@ 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."
@@ -6353,7 +6416,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’."
@@ -6385,8 +6448,8 @@ msgstr "Nieprawidłowy tekst powitania. Maksymalna długość to 255 znaków."
 #. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
 #. TRANS: users in user admin panel. %1$s is the invalid nickname.
 #: actions/useradminpanel.php:166
-#, php-format
-msgid "Invalid default subscripton: '%1$s' is not a user."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Nieprawidłowa domyślna subskrypcja: \"%1$s\" nie jest użytkownikiem."
 
 #. TRANS: Link description in user account settings menu.
@@ -6446,55 +6509,71 @@ 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
-msgid "Save user settings"
+#, fuzzy
+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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, 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:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Odrzuć"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+msgid "Reject this subscription."
 msgstr "Odrzuć tę subskrypcję"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:248
 msgid "No authorization request!"
 msgstr "Brak żądania upoważnienia."
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 msgid "Subscription authorized"
 msgstr "Upoważniono subskrypcję"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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 "
@@ -6503,11 +6582,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:285
 msgid "Subscription rejected"
 msgstr "Odrzucono subskrypcję"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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 "
@@ -6516,39 +6596,64 @@ 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
-#, 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:325
+#, fuzzy, php-format
+msgid "Listener URI \"%s\" not found here."
 msgstr "Adres URI nasłuchującego \"%s\" nie został tutaj odnaleziony."
 
-#: actions/userauthorization.php:308
-#, 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:332
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is too long."
 msgstr "Adres URI nasłuchującego \"%s\" jest za długi."
 
-#: actions/userauthorization.php:314
-#, 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:340
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "Adres URI nasłuchującego \"%s\" jest lokalnym użytkownikiem."
 
-#: actions/userauthorization.php:329
-#, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
+#: actions/userauthorization.php:358
+#, fuzzy, php-format
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "Adres URL profilu \"%s\" jest dla lokalnego użytkownika."
 
-#: actions/userauthorization.php:345
-#, 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:368
+#, 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."
 msgstr "Adres URL \"%s\" jest nieprawidłowy."
 
-#: actions/userauthorization.php:350
-#, 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:385
+#, fuzzy, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Nie można odczytać adresu URL awatara \"%s\"."
 
-#: actions/userauthorization.php:355
-#, 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:392
+#, 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.
@@ -7771,6 +7876,11 @@ 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"
@@ -8228,6 +8338,11 @@ 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
@@ -8262,6 +8377,21 @@ 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
@@ -8368,7 +8498,6 @@ msgid "Grant this user the \"%s\" role"
 msgstr "Nadaj użytkownikowi rolę \"%s\""
 
 #: lib/groupeditform.php:147
-#, fuzzy
 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."
 
@@ -8381,12 +8510,12 @@ msgid "Describe the group or topic"
 msgstr "Opisz grupę lub temat"
 
 #: lib/groupeditform.php:163
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the group or topic in %d character or less"
 msgid_plural "Describe the group or topic in %d characters or less"
-msgstr[0] "Opisz grupę lub temat w %d znaku."
-msgstr[1] "Opisz grupę lub temat w %d znakach lub mniej."
-msgstr[2] "Opisz grupę lub temat w %d znakach lub mniej."
+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 ""
@@ -9153,6 +9282,10 @@ 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"
@@ -9433,6 +9566,10 @@ 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"
@@ -9719,3 +9856,15 @@ 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 "6 or more characters"
+#~ msgstr "6 lub więcej znaków"
+
+#~ msgid "Same as password above"
+#~ msgstr "Takie samo jak powyższe hasło"
+
+#~ msgid "Can't save new password."
+#~ msgstr "Nie można zapisać nowego hasła."
+
+#~ msgid "URL of your homepage, blog, or profile on another site"
+#~ msgstr "Adres URL strony domowej, bloga lub profilu na innej witrynie"
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index af8af1c4e5..03e225030f 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:06:34+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27: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-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -157,7 +157,7 @@ msgstr "Página não foi encontrada."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -520,7 +520,8 @@ 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
-msgid "Can't send direct messages to users who aren't your friend."
+#, 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."
 
@@ -607,7 +608,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "Utilizador já é usado. Tente outro."
 
@@ -617,7 +618,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "Utilizador não é válido."
 
@@ -630,7 +631,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "Página de ínicio não é uma URL válida."
 
@@ -640,7 +641,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:226
+#: actions/register.php:218
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
@@ -669,7 +670,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:235
+#: actions/register.php:227
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Localidade demasiado longa (máx. 255 caracteres)."
@@ -828,15 +829,15 @@ msgstr "Não tem autorização."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: 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."
@@ -868,7 +869,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Envio inesperado de formulário."
@@ -920,19 +921,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Senha"
 
@@ -1056,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.
@@ -1234,25 +1236,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1420,7 +1423,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."
@@ -1525,9 +1528,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."
 
@@ -1585,9 +1590,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
-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 "Escolha uma área quadrada da imagem para ser o seu avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1647,7 +1653,7 @@ msgstr "Fundo"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1688,7 +1694,8 @@ msgstr "Não"
 
 #. 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 "Não bloquear este utilizador"
 
 #. TRANS: Button label on the user block form.
@@ -1705,9 +1712,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.
@@ -1872,7 +1879,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:426
 msgid "Confirm"
 msgstr "Confirmação"
 
@@ -1902,13 +1909,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Ocorreu um problema com a sua sessão."
@@ -1932,12 +1939,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 "Não apagar esta aplicação"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-msgid "Delete this application"
+#, fuzzy
+msgid "Delete this application."
 msgstr "Apagar esta aplicação"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1995,13 +2004,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.
@@ -2044,12 +2053,14 @@ msgstr "Tem a certeza de que quer apagar esta 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 "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.
@@ -2086,13 +2097,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.
-#. 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.
@@ -2262,21 +2273,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.
@@ -2308,7 +2319,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."
 
@@ -2594,7 +2605,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Correio electrónico é inválido."
@@ -2671,19 +2682,22 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 #, 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "Adicionado endereço electrónico de entrada novo."
 
@@ -2694,7 +2708,8 @@ msgstr "Esta nota já é uma favorita!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-msgid "Disfavor favorite"
+#, fuzzy
+msgid "Disfavor favorite."
 msgstr "Retirar das favoritas"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2934,12 +2949,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 "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
-msgid "Block this user from this group"
+#, 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.
@@ -3269,7 +3286,8 @@ 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.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "Preferências gravadas."
 
@@ -3688,41 +3706,41 @@ msgstr "Gravar"
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "Sessão já foi iniciada."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "Nome de utilizador ou senha incorrectos."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 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:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "Entrar"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "Iniciar sessão no site"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "Lembrar-me neste computador"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 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:259
 msgid "Lost or forgotten password?"
 msgstr "Perdeu ou esqueceu-se da senha?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3730,11 +3748,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:281
 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:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3945,30 +3963,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:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr "Aplicações ligadas"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3976,20 +3994,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, 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."
@@ -3999,6 +4027,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
@@ -4089,17 +4127,21 @@ msgstr "Chave de entrada especificada é inválida."
 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."
@@ -4126,40 +4168,45 @@ msgstr "Antiga"
 msgid "New password"
 msgstr "Nova"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+#, fuzzy
+msgid "6 or more characters."
 msgstr "6 ou mais caracteres"
 
-#: 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:427
+#, fuzzy
+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:230
 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:233
 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
-msgid "Can't save new password."
+#. 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."
 
-#. 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."
 
@@ -4504,7 +4551,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:433
+#: actions/profilesettings.php:109 actions/register.php:419
 #, 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"
@@ -4512,7 +4559,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:455
+#: actions/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4520,13 +4567,13 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 #, 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"
@@ -4534,7 +4581,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:129 actions/register.php:457
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4542,28 +4589,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Onde está, por ex. \"Cidade, Região, País\""
 
@@ -4582,8 +4630,10 @@ msgstr "Categorias"
 
 #. 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 ""
 "Categorias para si (letras, números, -, ., _), separadas por vírgulas ou "
 "espaços"
@@ -4595,7 +4645,8 @@ msgstr "Língua"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-msgid "Preferred language"
+#, fuzzy
+msgid "Preferred language."
 msgstr "Língua preferida"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4610,14 +4661,15 @@ msgstr "Em que fuso horário se encontra 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 "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:258 actions/register.php:221
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4637,9 +4689,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 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:291
+#, 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
@@ -4886,6 +4938,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"
@@ -4897,12 +4955,6 @@ 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
@@ -4957,14 +5009,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:248
 msgid "Error setting user."
 msgstr "Erro ao configurar utilizador."
 
@@ -4973,96 +5019,96 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr "Desculpe, só pessoas convidadas se podem registar."
 
-#: actions/register.php:99
+#: actions/register.php:94
 msgid "Sorry, invalid invitation code."
 msgstr "Desculpe, código de convite inválido."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "Registo efectuado"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "Registar"
 
-#: actions/register.php:142
+#: actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Registo não é permitido."
 
-#: actions/register.php:209
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:201
+#, 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:218
+#: actions/register.php:210
 msgid "Email address already exists."
 msgstr "Correio electrónico já existe."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "Nome de utilizador ou senha inválidos."
 
-#: actions/register.php:351
+#: actions/register.php:340
+#, 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Correio"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, 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:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Nome mais longo, de preferência o seu nome \"verdadeiro\""
 
-#: actions/register.php:462
-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:471
+#, fuzzy
+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:510
 #, 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:520
 #, 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:524
 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:527
 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:532
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5072,7 +5118,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:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5105,7 +5151,7 @@ msgstr ""
 "\n"
 "Obrigado por se ter registado e esperamos que se divirta usando este serviço."
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5138,7 +5184,8 @@ msgid "User nickname"
 msgstr "Nome do utilizador"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow"
+#, fuzzy
+msgid "Nickname of the user you want to follow."
 msgstr "Nome do utilizador que pretende seguir"
 
 #: actions/remotesubscribe.php:132
@@ -5146,7 +5193,8 @@ msgid "Profile URL"
 msgstr "URL do perfil"
 
 #: 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 do seu perfil noutro serviço de microblogues compatível"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5156,7 +5204,8 @@ msgid "Subscribe"
 msgstr "Subscrever"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)"
+#, fuzzy
+msgid "Invalid profile URL (bad format)."
 msgstr "URL de perfil inválido (formato incorrecto)"
 
 #: actions/remotesubscribe.php:167
@@ -5357,7 +5406,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"
 
@@ -5399,87 +5448,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: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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ícone"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 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
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organização"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Estatísticas"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, 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:207
 msgid "Application actions"
 msgstr "Operações da aplicação"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 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
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Apagar"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "Informação da aplicação"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr "Chave do consumidor"
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr "Segredo do consumidor"
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr "URL da chave de pedido"
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr "URL da chave de acesso"
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr "Autorizar URL"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5487,7 +5536,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:302
 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?"
@@ -5581,16 +5630,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "Anotação"
 
@@ -5738,7 +5789,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"
@@ -5988,7 +6039,8 @@ 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
-msgid "Save site notice"
+#, fuzzy
+msgid "Save site notice."
 msgstr "Gravar aviso do site"
 
 #. TRANS: Title for SMS settings.
@@ -6046,7 +6098,8 @@ msgstr "Número de telefone para 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 "Número de telefone, sem pontuação ou espaços, com código de área"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6385,8 +6438,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
@@ -6403,6 +6457,11 @@ 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."
@@ -6438,7 +6497,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,7 +6531,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.
@@ -6533,55 +6592,71 @@ 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
-msgid "Save user settings"
-msgstr ""
+#, fuzzy
+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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "Subscrever este utilizador"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rejeitar"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+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:248
 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:271
 msgid "Subscription authorized"
 msgstr "Subscrição autorizada"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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 "
@@ -6591,11 +6666,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:285
 msgid "Subscription rejected"
 msgstr "Subscrição rejeitada"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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 "
@@ -6605,39 +6681,64 @@ msgstr ""
 "Verifique as instruções do site para saber como rejeitar completamente a "
 "subscrição."
 
-#: actions/userauthorization.php:303
-#, 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:325
+#, fuzzy, php-format
+msgid "Listener URI \"%s\" not found here."
 msgstr "A listener URI ‘%s’ não foi encontrada aqui."
 
-#: actions/userauthorization.php:308
-#, 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:332
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is too long."
 msgstr "URI do escutado ‘%s’ é demasiado longo."
 
-#: actions/userauthorization.php:314
-#, 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:340
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "URI do ouvido ‘%s’ é um utilizador local."
 
-#: actions/userauthorization.php:329
-#, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
+#: actions/userauthorization.php:358
+#, fuzzy, php-format
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "A URL ‘%s’ do perfil é de um utilizador local."
 
-#: actions/userauthorization.php:345
-#, 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:368
+#, 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."
 msgstr "A URL ‘%s’ do avatar é inválida."
 
-#: actions/userauthorization.php:350
-#, 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:385
+#, fuzzy, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Não é possível ler a URL do avatar ‘%s’."
 
-#: actions/userauthorization.php:355
-#, 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:392
+#, 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.
@@ -7857,6 +7958,11 @@ 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"
@@ -8312,6 +8418,11 @@ 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
@@ -8350,6 +8461,21 @@ 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
@@ -8457,7 +8583,6 @@ msgid "Grant this user the \"%s\" role"
 msgstr "Atribuir a este utilizador a função \"%s\""
 
 #: lib/groupeditform.php:147
-#, 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"
 
@@ -9235,6 +9360,10 @@ 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"
@@ -9516,6 +9645,10 @@ 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"
@@ -9792,3 +9925,15 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "6 or more characters"
+#~ msgstr "6 ou mais caracteres"
+
+#~ msgid "Same as password above"
+#~ msgstr "Repita a senha nova"
+
+#~ msgid "Can't save new password."
+#~ msgstr "Não é possível guardar a nova senha."
+
+#~ 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"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 80a66372b3..775137fb08 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:06:37+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27:41+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -158,7 +158,7 @@ msgstr "Esta página não existe."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -420,7 +420,6 @@ msgstr "Não foi possível atualizar a sua aparência."
 
 #. TRANS: Title for Atom feed.
 #: actions/apiatomservice.php:85
-#, fuzzy
 msgctxt "ATOM"
 msgid "Main"
 msgstr "Principal"
@@ -457,9 +456,9 @@ 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
+#, php-format
 msgid "%s memberships"
-msgstr "Membros do grupo %s"
+msgstr "Associações de %s"
 
 #. TRANS: Client error displayed when users try to block themselves.
 #: actions/apiblockcreate.php:105
@@ -525,7 +524,8 @@ 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
-msgid "Can't send direct messages to users who aren't your friend."
+#, fuzzy
+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."
@@ -612,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "Esta identificação já está em uso. Tente outro."
 
@@ -622,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "Não é uma identificação válida."
 
@@ -635,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "A URL informada não é válida."
 
@@ -645,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:226
+#: actions/register.php:218
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "O nome completo é muito extenso (máx. 255 caracteres)"
 
@@ -673,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:235
+#: actions/register.php:227
 msgid "Location is too long (maximum 255 characters)."
 msgstr "A localização é muito extensa (máx. 255 caracteres)."
 
@@ -828,15 +828,15 @@ msgstr "O token solicitado já foi autorizado."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -868,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Submissão inesperada de formulário."
@@ -920,19 +920,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Senha"
 
@@ -1054,8 +1055,8 @@ 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
-#, php-format
-msgid "Unsupported format: %s"
+#, fuzzy, php-format
+msgid "Unsupported format: %s."
 msgstr "Formato não suportado: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1076,7 +1077,6 @@ 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
-#, fuzzy
 msgid "Cannot delete this notice."
 msgstr "Não é possível excluir esta mensagem."
 
@@ -1230,25 +1230,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1275,16 +1276,15 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Notices %1$s has favorited on %2$s"
-msgstr "Atualizações de %1$s e amigos no %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
-#, fuzzy
 msgid "Cannot add someone else's subscription."
-msgstr "Não é possível adicionar a assinatura de outra pessoa"
+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
@@ -1409,7 +1409,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"
@@ -1515,9 +1515,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"
 
@@ -1572,9 +1574,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
-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 "Selecione uma área quadrada da imagem para ser seu avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1639,8 +1642,9 @@ msgstr "Fundo"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
-msgstr ""
+#, 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
@@ -1681,7 +1685,8 @@ msgstr "Não"
 
 #. 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 "Não bloquear este usuário"
 
 #. TRANS: Button label on the user block form.
@@ -1698,9 +1703,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.
@@ -1863,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:440
+#: actions/recoverpassword.php:262 actions/register.php:426
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -1893,13 +1898,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Ocorreu um problema com o seu token de sessão."
@@ -1923,12 +1928,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 "Não excluir esta aplicação"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-msgid "Delete this application"
+#, fuzzy
+msgid "Delete this application."
 msgstr "Excluir esta aplicação"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1982,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 "Não excluir este grupo"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-msgid "Delete this group"
+#, fuzzy
+msgid "Delete this group."
 msgstr "Excluir este grupo"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2030,12 +2039,14 @@ msgstr "Tem certeza que deseja excluir esta mensagem?"
 
 #. 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 "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.
@@ -2072,13 +2083,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.
-#. 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.
@@ -2246,21 +2257,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.
@@ -2292,7 +2303,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."
 
@@ -2575,7 +2586,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Não é um endereço de e-mail válido."
@@ -2652,19 +2663,22 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 #, 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr ""
 "Foi adicionado um novo endereço de e-mail para recebimento de mensagens."
@@ -2676,7 +2690,8 @@ msgstr "Essa mensagem já é uma favorita!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-msgid "Disfavor favorite"
+#, fuzzy
+msgid "Disfavor favorite."
 msgstr "Desmarcar a favorita"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2917,12 +2932,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 "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
-msgid "Block this user from this group"
+#, 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.
@@ -3255,7 +3272,8 @@ 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.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "As preferências foram salvas."
 
@@ -3675,42 +3693,42 @@ 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
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "Já está autenticado."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "Nome de usuário e/ou senha incorreto(s)."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 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:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "Entrar"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "Autenticar-se no site"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "Lembrar neste computador"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 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:259
 msgid "Lost or forgotten password?"
 msgstr "Perdeu ou esqueceu sua senha?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3718,11 +3736,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:281
 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:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3937,30 +3955,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:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr "Aplicações conectadas"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3969,14 +3987,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:211
 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:231
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -3985,6 +4003,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."
@@ -3994,6 +4022,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
@@ -4083,17 +4121,21 @@ msgstr "O token de autenticação especificado é inválido."
 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 "
@@ -4121,40 +4163,45 @@ msgstr "Senha anterior"
 msgid "New password"
 msgstr "Senha nova"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+#, fuzzy
+msgid "6 or more characters."
 msgstr "No mínimo 6 caracteres"
 
-#: 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:427
+#, fuzzy
+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:230
 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:233
 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
-msgid "Can't save new password."
+#. 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."
 
-#. 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."
 
@@ -4481,14 +4528,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:433
+#: actions/profilesettings.php:109 actions/register.php:419
 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/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4496,20 +4543,20 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 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:129 actions/register.php:457
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4517,28 +4564,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Onde você está, ex: \"cidade, estado (ou região), país\""
 
@@ -4557,8 +4605,10 @@ msgstr "Etiquetas"
 
 #. 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 ""
 "Suas etiquetas (letras, números, -, ., e _), separadas por vírgulas ou "
 "espaços"
@@ -4570,7 +4620,8 @@ msgstr "Idioma"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-msgid "Preferred language"
+#, fuzzy
+msgid "Preferred language."
 msgstr "Idioma preferencial"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4585,15 +4636,16 @@ msgstr "Em que fuso horário você normalmente está?"
 
 #. 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 ""
 "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:258 actions/register.php:221
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4612,9 +4664,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 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:291
+#, 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
@@ -4859,6 +4911,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"
@@ -4870,12 +4928,6 @@ 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
@@ -4930,14 +4982,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:248
 msgid "Error setting user."
 msgstr "Erro na configuração do usuário."
 
@@ -4948,70 +4994,70 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr "Desculpe, mas somente convidados podem se registrar."
 
-#: actions/register.php:99
+#: actions/register.php:94
 msgid "Sorry, invalid invitation code."
 msgstr "Desculpe, mas o código do convite é inválido."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "Registro realizado com sucesso"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "Registrar-se"
 
-#: actions/register.php:142
+#: actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Não é permitido o registro."
 
-#: actions/register.php:209
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:201
+#, 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:218
+#: actions/register.php:210
 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:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "Nome de usuário e/ou senha inválido(s)"
 
-#: actions/register.php:351
+#: actions/register.php:340
+#, 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-mail"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, 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:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Nome completo, de preferência seu nome \"real\""
 
-#: actions/register.php:462
-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:471
+#, 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:523
+#: actions/register.php:510
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
@@ -5019,23 +5065,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:520
 #, 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:524
 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:527
 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:532
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5045,7 +5091,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:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5078,7 +5124,7 @@ msgstr ""
 "\n"
 "Obrigado por se registrar e esperamos que você aproveite o serviço."
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5111,7 +5157,8 @@ msgid "User nickname"
 msgstr "Identificação do usuário"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow"
+#, fuzzy
+msgid "Nickname of the user you want to follow."
 msgstr "Identificação do usuário que você quer seguir"
 
 #: actions/remotesubscribe.php:132
@@ -5119,7 +5166,8 @@ msgid "Profile URL"
 msgstr "URL do perfil"
 
 #: 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 do seu perfil em outro serviço de microblog compatível"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5129,7 +5177,8 @@ msgid "Subscribe"
 msgstr "Assinar"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)"
+#, fuzzy
+msgid "Invalid profile URL (bad format)."
 msgstr "A URL do perfil é inválida (formato inválido)"
 
 #: actions/remotesubscribe.php:167
@@ -5332,7 +5381,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"
 
@@ -5374,87 +5423,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: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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ícone"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 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
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organização"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Estatísticas"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, 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:207
 msgid "Application actions"
 msgstr "Ações da aplicação"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 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
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Excluir"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "Informação da aplicação"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr "Chave do consumidor"
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr "Segredo do consumidor"
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr "URL do token de requisição"
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr "URL do token de acesso"
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr "Autorizar a URL"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5462,7 +5511,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:302
 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?"
 
@@ -5554,16 +5603,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "Mensagem"
 
@@ -5709,7 +5760,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"
@@ -5960,7 +6011,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 "Salvar os avisos do site"
 
 #. TRANS: Title for SMS settings.
@@ -6018,7 +6070,8 @@ msgstr "Telefone para 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 "Número de telefone, sem pontuação ou espaços, com código de área"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6354,8 +6407,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Imagem"
@@ -6372,6 +6426,11 @@ 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."
@@ -6407,7 +6466,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,8 +6499,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 "Assinatura padrão inválida: '%1$s' não é um usuário."
 
 #. TRANS: Link description in user account settings menu.
@@ -6501,55 +6560,71 @@ 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
-msgid "Save user settings"
+#, fuzzy
+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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, 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:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Recusar"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+msgid "Reject this subscription."
 msgstr "Recusar esta assinatura"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:248
 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:271
 msgid "Subscription authorized"
 msgstr "A assinatura foi autorizada"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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 "
@@ -6559,11 +6634,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:285
 msgid "Subscription rejected"
 msgstr "A assinatura foi recusada"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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 "
@@ -6573,39 +6649,64 @@ msgstr ""
 "Verifique as instruções do site para detalhes sobre como rejeitar "
 "completamente a assinatura."
 
-#: actions/userauthorization.php:303
-#, 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:325
+#, fuzzy, php-format
+msgid "Listener URI \"%s\" not found here."
 msgstr "A URI ‘%s’ do usuário não foi encontrada aqui."
 
-#: actions/userauthorization.php:308
-#, 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:332
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is too long."
 msgstr "A URI ‘%s’ do usuário é muito extensa."
 
-#: actions/userauthorization.php:314
-#, 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:340
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "A URI ‘%s’ é de um usuário local."
 
-#: actions/userauthorization.php:329
-#, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
+#: actions/userauthorization.php:358
+#, fuzzy, php-format
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "A URL ‘%s’ do perfil é de um usuário local."
 
-#: actions/userauthorization.php:345
-#, 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:368
+#, 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."
 msgstr "A URL ‘%s’ do avatar não é válida."
 
-#: actions/userauthorization.php:350
-#, 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:385
+#, fuzzy, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Não é possível ler a URL '%s' do avatar."
 
-#: actions/userauthorization.php:355
-#, 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:392
+#, 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.
@@ -7824,6 +7925,11 @@ 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"
@@ -8287,6 +8393,11 @@ 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
@@ -8324,6 +8435,21 @@ 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
@@ -8431,7 +8557,6 @@ msgid "Grant this user the \"%s\" role"
 msgstr "Associa o papel \"%s\" a este usuário"
 
 #: lib/groupeditform.php:147
-#, fuzzy
 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."
 
@@ -9214,6 +9339,10 @@ 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"
@@ -9495,6 +9624,10 @@ 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"
@@ -9771,3 +9904,15 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "6 or more characters"
+#~ msgstr "No mínimo 6 caracteres"
+
+#~ msgid "Same as password above"
+#~ msgstr "Igual à senha acima"
+
+#~ msgid "Can't save new password."
+#~ msgstr "Não é possível salvar a nova senha."
+
+#~ msgid "URL of your homepage, blog, or profile on another site"
+#~ msgstr "URL do seu site, blog ou perfil em outro site"
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 03126770f7..7fb26f6dfd 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:06:39+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27:42+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -162,7 +162,7 @@ msgstr "Нет такой страницы."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -528,7 +528,8 @@ 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."
+#, fuzzy
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Не удаётся посылать прямые сообщения пользователям, которые не являются "
 "Вашими друзьями."
@@ -615,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "Такое имя уже используется. Попробуйте какое-нибудь другое."
 
@@ -625,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "Неверное имя."
 
@@ -638,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "URL Главной страницы неверен."
 
@@ -648,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:226
+#: actions/register.php:218
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Полное имя слишком длинное (максимум 255 символов)."
 
@@ -677,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:235
+#: actions/register.php:227
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Слишком длинное месторасположение (максимум 255 символов)."
 
@@ -833,15 +834,15 @@ msgstr "Ключ запроса уже авторизован."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Проблема с вашим ключом сессии. Пожалуйста, попробуйте ещё раз."
@@ -872,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Нетиповое подтверждение формы."
@@ -924,19 +925,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Пароль"
 
@@ -1058,8 +1060,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.
@@ -1235,25 +1237,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1414,7 +1417,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 "Невозможно удалить подписку на самого себя."
@@ -1521,9 +1524,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 "Пользователь без соответствующего профиля."
 
@@ -1578,9 +1583,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
-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.
@@ -1640,7 +1646,8 @@ msgstr "Фон"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+#, fuzzy
+msgid "Backup your account."
 msgstr "Резервное копирование учетной записи"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1681,7 +1688,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.
@@ -1698,9 +1706,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.
@@ -1863,7 +1871,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:426
 msgid "Confirm"
 msgstr "Подтверждение"
 
@@ -1893,13 +1901,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Проблема с вашим ключом сессии."
@@ -1923,12 +1931,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.
@@ -1982,12 +1992,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.
@@ -2030,12 +2042,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 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.
@@ -2072,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 "Не удаляйте эту группу"
 
 #. 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.
@@ -2244,21 +2258,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.
@@ -2290,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:87
+#: actions/editapplication.php:83 actions/showapplication.php:83
 msgid "No such application."
 msgstr "Нет такого приложения."
 
@@ -2579,7 +2593,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Неверный электронный адрес."
@@ -2656,19 +2670,22 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 #, 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "Новый входящий электронный адрес добавлен."
 
@@ -2679,7 +2696,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.
@@ -2920,12 +2938,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.
@@ -3256,7 +3276,8 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Опубликовать MicroID для моего Jabber/GTalk - адреса."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "Предпочтения сохранены."
 
@@ -3679,39 +3700,39 @@ msgstr "Сохранить"
 msgid "Save license settings"
 msgstr "Сохранить настройки лицензии"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "Вы уже авторизовались."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "Некорректное имя или пароль."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "Ошибка установки пользователя. Вы, вероятно, не авторизованы."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "Вход"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "Авторизоваться"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "Запомнить меня"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Автоматическии входить в дальнейшем. Не для общедоступных компьютеров!"
 
-#: actions/login.php:269
+#: actions/login.php:259
 msgid "Lost or forgotten password?"
 msgstr "Потеряли или забыли пароль?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3719,11 +3740,11 @@ msgstr ""
 "По причинам сохранения безопасности введите имя и пароль ещё раз, прежде чем "
 "изменять Ваши установки."
 
-#: actions/login.php:292
+#: actions/login.php:281
 msgid "Login with your username and password."
 msgstr "Войти с вашим именем участника и паролем."
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3935,30 +3956,30 @@ msgid "You have not registered any applications yet."
 msgstr "Вы пока не зарегистрировали ни одного приложения."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr "Подключённые приложения"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3967,14 +3988,14 @@ msgstr ""
 "Доступ для %1$s и ключ доступа, начинающийся на %2$s, успешно отозваны."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -3983,6 +4004,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 "Уведомление не имеет профиля."
@@ -3992,6 +4023,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
@@ -4081,17 +4122,21 @@ msgstr "Задан неверный ключ для входа."
 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 ""
 "Это список исходящих писем, в котором перечислены отправленные вами личные "
@@ -4119,40 +4164,45 @@ msgstr "Старый пароль"
 msgid "New password"
 msgstr "Новый пароль"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+#, fuzzy
+msgid "6 or more characters."
 msgstr "6 или больше знаков"
 
-#: 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:427
+#, fuzzy
+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:230
 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:233
 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
+#, fuzzy
+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 "Пароль сохранён."
 
@@ -4477,7 +4527,7 @@ 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:109 actions/register.php:419
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
 "1-64 латинских строчных буквы или цифры, без знаков препинания и пробелов"
@@ -4485,7 +4535,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:455
+#: actions/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4493,20 +4543,20 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 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:129 actions/register.php:457
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4515,28 +4565,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Где вы находитесь, например «Город, область, страна»"
 
@@ -4555,8 +4606,10 @@ 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 ""
 "Теги для самого себя (буквы, цифры, -, ., и _), разделенные запятой или "
 "пробелом"
@@ -4568,7 +4621,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.
@@ -4583,14 +4637,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:229
+#: actions/profilesettings.php:258 actions/register.php:221
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4610,9 +4665,9 @@ 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:291
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Неверный тег: «%s»"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4855,6 +4910,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"
@@ -4866,12 +4927,6 @@ 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
@@ -4923,14 +4978,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:248
 msgid "Error setting user."
 msgstr "Ошибка в установках пользователя."
 
@@ -4939,73 +4988,73 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr "Простите, регистрация только по приглашению."
 
-#: actions/register.php:99
+#: actions/register.php:94
 msgid "Sorry, invalid invitation code."
 msgstr "Извините, неверный пригласительный код."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "Регистрация успешна!"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "Регистрация"
 
-#: actions/register.php:142
+#: actions/register.php:135
 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:201
+#, fuzzy
+msgid "You cannot register if you don't agree to the license."
 msgstr ""
 "Вы не можете зарегистрироваться, если Вы не подтверждаете лицензионного "
 "соглашения."
 
-#: actions/register.php:218
+#: actions/register.php:210
 msgid "Email address already exists."
 msgstr "Такой электронный адрес уже задействован."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "Неверное имя или пароль."
 
-#: actions/register.php:351
+#: actions/register.php:340
+#, 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Email"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, fuzzy
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "Нужна только для обновлений, осведомлений и восстановления пароля."
 
-#: actions/register.php:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Полное имя, предпочтительно Ваше настоящее имя"
 
-#: actions/register.php:462
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "Адрес твоей страницы, дневника или профиля на другом портале"
+#: actions/register.php:471
+#, fuzzy
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Где вы находитесь, например «Город, область, страна»"
 
-#: actions/register.php:523
+#: actions/register.php:510
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
@@ -5013,23 +5062,23 @@ msgstr ""
 "Я понимаю, что содержание и данные %1$s являются частными и "
 "конфиденциальными."
 
-#: actions/register.php:533
+#: actions/register.php:520
 #, 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:524
 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:527
 msgid "All rights reserved."
 msgstr "Все права защищены."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:532
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5038,7 +5087,7 @@ msgstr ""
 "Мои тексты и файлы доступны на условиях %s, за исключением следующей личной "
 "информации: пароля, почтового адреса, номера мессенджера и номера телефона."
 
-#: actions/register.php:588
+#: actions/register.php:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5072,7 +5121,7 @@ msgstr ""
 "Спасибо за то, что присоединились к нам, надеемся, что вы получите "
 "удовольствие от использования данного сервиса!"
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5103,7 +5152,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
@@ -5111,7 +5161,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.
@@ -5121,7 +5172,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
@@ -5320,7 +5372,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"
 
@@ -5363,87 +5415,87 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Иконка"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Имя"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Организация"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Статистика"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, 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:207
 msgid "Application actions"
 msgstr "Действия приложения"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 msgid "Reset key & secret"
 msgstr "Сбросить ключ и секретную фразу"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Удалить"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "Информация о приложении"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr "Потребительский ключ"
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr "Секретная фраза потребителя"
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr "URL ключа запроса"
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr "URL ключа доступа"
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr "URL авторизации"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5451,7 +5503,7 @@ msgstr ""
 "Примечание: Мы поддерживаем подписи HMAC-SHA1. Мы не поддерживаем метод "
 "подписи открытым текстом."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:302
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 "Вы уверены, что хотите сбросить ваш ключ потребителя и секретную фразу?"
@@ -5544,16 +5596,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "Запись"
 
@@ -5699,7 +5753,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"
@@ -5949,7 +6003,8 @@ msgstr "Текст уведомления сайта (максимум 255 си
 
 #. 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.
@@ -6009,7 +6064,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.
@@ -6348,8 +6404,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Фото"
@@ -6366,6 +6423,11 @@ 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."
@@ -6402,7 +6464,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’."
@@ -6434,8 +6496,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.
@@ -6495,55 +6557,71 @@ 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 "Сохранить пользовательские настройки"
 
-#: 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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "Подписаться на этого пользователя"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Отбросить"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+msgid "Reject this subscription."
 msgstr "Отвергнуть эту подписку"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:248
 msgid "No authorization request!"
 msgstr "Не авторизованный запрос!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 msgid "Subscription authorized"
 msgstr "Подписка авторизована"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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 "
@@ -6552,11 +6630,12 @@ msgstr ""
 "Подписка авторизована, но нет обратного URL. Посмотрите инструкции на сайте "
 "о том, как авторизовать подписку. Ваш ключ подписки:"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:285
 msgid "Subscription rejected"
 msgstr "Подписка отменена"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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 "
@@ -6565,39 +6644,63 @@ msgstr ""
 "Подписка отвергнута, но не бы передан URL обратного вызова. Проверьте "
 "инструкции на сайте, чтобы полностью отказаться от подписки."
 
-#: actions/userauthorization.php:303
-#, 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:325
+#, fuzzy, php-format
+msgid "Listener URI \"%s\" not found here."
 msgstr "Смотрящий URI «%s» здесь не найден."
 
-#: actions/userauthorization.php:308
-#, 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:332
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is too long."
 msgstr "Просматриваемый URI «%s» слишком длинный."
 
-#: actions/userauthorization.php:314
-#, 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:340
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "Просматриваемый URI «%s» — локальный пользователь."
 
-#: actions/userauthorization.php:329
-#, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
+#: actions/userauthorization.php:358
+#, fuzzy, php-format
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "URL профиля «%s» предназначен только для локального пользователя."
 
-#: actions/userauthorization.php:345
-#, 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:368
+#, 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."
 msgstr "URL аватары «%s» недействителен."
 
-#: actions/userauthorization.php:350
-#, 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:385
+#, fuzzy, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Не удаётся прочитать URL аватары «%s»"
 
-#: actions/userauthorization.php:355
-#, 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:392
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Неверный тип изображения для URL аватары «%s»."
 
 #. TRANS: Page title for profile design page.
@@ -7816,6 +7919,11 @@ 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"
@@ -8277,6 +8385,11 @@ 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
@@ -8313,6 +8426,21 @@ 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
@@ -8420,10 +8548,8 @@ msgid "Grant this user the \"%s\" role"
 msgstr "Назначить этому пользователю роль «%s»"
 
 #: lib/groupeditform.php:147
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-"1-64 латинских строчных буквы или цифры, без знаков препинания и пробелов"
+msgstr "1-64 латинских строчных буквы или цифры, без пробелов"
 
 #: lib/groupeditform.php:156
 msgid "URL of the homepage or blog of the group or topic."
@@ -8434,7 +8560,7 @@ msgid "Describe the group or topic"
 msgstr "Опишите группу или тему"
 
 #: lib/groupeditform.php:163
-#, fuzzy, php-format
+#, 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 символов"
@@ -9207,6 +9333,10 @@ msgstr "Ответить на эту запись"
 msgid "Reply"
 msgstr "Ответить"
 
+#: lib/noticelist.php:673
+msgid "Delete this notice"
+msgstr "Удалить эту запись"
+
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Запись повторена"
@@ -9487,6 +9617,10 @@ 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"
@@ -9774,3 +9908,15 @@ msgstr "Неверный XML, отсутствует корень XRD."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Получение резервной копии из файла «%s»."
+
+#~ msgid "6 or more characters"
+#~ msgstr "6 или больше знаков"
+
+#~ msgid "Same as password above"
+#~ msgstr "Тот же пароль, что и выше"
+
+#~ msgid "Can't save new password."
+#~ msgstr "Не удаётся сохранить новый пароль."
+
+#~ msgid "URL of your homepage, blog, or profile on another site"
+#~ msgstr "Адрес твоей страницы, дневника или профиля на другом портале"
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 15d455b818..e5a81630d6 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-14 16:00+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+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"
@@ -147,7 +147,7 @@ msgstr ""
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -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).
@@ -580,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr ""
 
@@ -590,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr ""
 
@@ -603,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr ""
 
@@ -613,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:226
+#: actions/register.php:218
 msgid "Full name is too long (maximum 255 characters)."
 msgstr ""
 
@@ -641,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:235
+#: actions/register.php:227
 msgid "Location is too long (maximum 255 characters)."
 msgstr ""
 
@@ -796,15 +796,15 @@ msgstr ""
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -835,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr ""
@@ -880,19 +880,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr ""
 
@@ -1011,7 +1012,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.
@@ -1185,25 +1186,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1358,7 +1360,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 ""
 
@@ -1461,9 +1463,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 +1522,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.
@@ -1578,7 +1582,7 @@ msgstr ""
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1616,7 +1620,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 +1637,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.
@@ -1794,7 +1797,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:426
 msgid "Confirm"
 msgstr ""
 
@@ -1823,13 +1826,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr ""
@@ -1850,12 +1853,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 +1909,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.
@@ -1952,12 +1955,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,13 +1993,12 @@ 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.
@@ -2158,21 +2160,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 +2203,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 ""
 
@@ -2480,7 +2479,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr ""
@@ -2552,18 +2551,21 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr ""
 
@@ -2574,7 +2576,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.
@@ -2806,12 +2808,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.
@@ -3111,7 +3113,8 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr ""
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr ""
 
@@ -3485,49 +3488,49 @@ msgstr ""
 msgid "Save license settings"
 msgstr ""
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr ""
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr ""
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr ""
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr ""
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr ""
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 
-#: actions/login.php:269
+#: actions/login.php:259
 msgid "Lost or forgotten password?"
 msgstr ""
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 
-#: actions/login.php:292
+#: actions/login.php:281
 msgid "Login with your username and password."
 msgstr ""
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3726,30 +3729,30 @@ msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr ""
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3757,20 +3760,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, 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 +3793,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
@@ -3869,17 +3892,21 @@ msgstr ""
 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 +3932,42 @@ msgstr ""
 msgid "New password"
 msgstr ""
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+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:427
+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:230
 msgid "Password must be 6 or more characters."
 msgstr ""
 
-#: actions/passwordsettings.php:157 actions/register.php:241
+#: actions/passwordsettings.php:156 actions/register.php:233
 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 ""
 
@@ -4259,14 +4288,14 @@ 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:109 actions/register.php:419
 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/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4274,20 +4303,20 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 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:129 actions/register.php:457
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4295,28 +4324,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
 
@@ -4336,7 +4366,8 @@ 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.
@@ -4346,7 +4377,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.
@@ -4362,13 +4393,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:229
+#: actions/profilesettings.php:258 actions/register.php:221
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4387,9 +4418,9 @@ 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:291
 #, php-format
-msgid "Invalid tag: \"%s\""
+msgid "Invalid tag: \"%s\"."
 msgstr ""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4614,6 +4645,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,11 +4660,6 @@ 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
@@ -4678,13 +4709,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:248
 msgid "Error setting user."
 msgstr ""
 
@@ -4693,96 +4719,92 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/register.php:99
+#: actions/register.php:94
 msgid "Sorry, invalid invitation code."
 msgstr ""
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr ""
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr ""
 
-#: actions/register.php:142
+#: actions/register.php:135
 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:201
+msgid "You cannot register if you don't agree to the license."
 msgstr ""
 
-#: actions/register.php:218
+#: actions/register.php:210
 msgid "Email address already exists."
 msgstr ""
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr ""
 
-#: actions/register.php:351
+#: actions/register.php:340
 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:437
-msgid "6 or more characters."
+"link up to friends and colleagues."
 msgstr ""
 
 #. TRANS: Link description in user account settings menu.
-#: actions/register.php:445 actions/register.php:449
+#: actions/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr ""
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 
-#: actions/register.php:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+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:471
+msgid "Where you are, like \"City, State (or Region), Country\"."
 msgstr ""
 
-#: actions/register.php:523
+#: actions/register.php:510
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:533
+#: actions/register.php:520
 #, 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:524
 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:527
 msgid "All rights reserved."
 msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:532
 #, 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:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4801,7 +4823,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -4828,7 +4850,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,7 +4858,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.
@@ -4846,7 +4868,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
@@ -5030,7 +5052,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 +5094,93 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr ""
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr ""
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr ""
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr ""
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:207
 msgid "Application actions"
 msgstr ""
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr ""
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr ""
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr ""
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr ""
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:302
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
@@ -5243,16 +5265,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr ""
 
@@ -5388,7 +5412,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"
@@ -5620,7 +5644,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.
@@ -5678,7 +5702,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.
@@ -5997,8 +6021,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr ""
@@ -6013,6 +6038,11 @@ 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."
@@ -6046,7 +6076,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’."
@@ -6077,7 +6107,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.
@@ -6137,102 +6167,136 @@ 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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+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:231
+msgid "Subscribe to this user."
 msgstr ""
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:233
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr ""
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+msgid "Reject this subscription."
 msgstr ""
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:248
 msgid "No authorization request!"
 msgstr ""
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 msgid "Subscription authorized"
 msgstr ""
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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:285
 msgid "Subscription rejected"
 msgstr ""
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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:325
 #, 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:332
 #, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr ""
 
-#: 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:340
 #, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
 
-#: actions/userauthorization.php:329
+#. 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."
+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:368
 #, 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:378
 #, 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:385
 #, 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:392
+#, php-format
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr ""
 
 #. TRANS: Page title for profile design page.
@@ -7400,6 +7464,11 @@ 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"
@@ -7806,6 +7875,11 @@ 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
@@ -7840,6 +7914,21 @@ 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
@@ -8604,6 +8693,10 @@ msgstr ""
 msgid "Reply"
 msgstr ""
 
+#: lib/noticelist.php:673
+msgid "Delete this notice"
+msgstr ""
+
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr ""
@@ -8879,6 +8972,10 @@ 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"
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index b5f95764bf..3ef9e7fe9b 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:06:42+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27:46+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 (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -155,7 +155,7 @@ msgstr "Ingen sådan sida"
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -515,7 +515,8 @@ msgstr "Mottagare hittades inte."
 
 #. 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."
+#, 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).
@@ -601,7 +602,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "Smeknamnet används redan. Försök med ett annat."
 
@@ -611,7 +612,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "Inte ett giltigt smeknamn."
 
@@ -624,7 +625,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "Hemsida är inte en giltig webbadress."
 
@@ -634,7 +635,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:226
+#: actions/register.php:218
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Fullständigt namn är för långt (max 255 tecken)."
 
@@ -662,7 +663,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:235
+#: actions/register.php:227
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Beskrivning av plats är för lång (max 255 tecken)."
 
@@ -818,15 +819,15 @@ msgstr "Begäran-token är redan auktoriserad."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: 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."
@@ -858,7 +859,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Oväntat inskick av formulär."
@@ -909,19 +910,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Lösenord"
 
@@ -1044,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.
@@ -1221,25 +1223,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1406,7 +1409,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."
@@ -1512,9 +1515,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."
 
@@ -1569,9 +1574,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
-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 "Välj ett kvadratiskt område i bilden som din avatar"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1631,7 +1637,7 @@ msgstr "Bakgrund"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1672,7 +1678,8 @@ msgstr "Nej"
 
 #. 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 "Blockera inte denna användare"
 
 #. TRANS: Button label on the user block form.
@@ -1689,9 +1696,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.
@@ -1855,7 +1862,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:426
 msgid "Confirm"
 msgstr "Bekräfta"
 
@@ -1885,13 +1892,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Det var ett problem med din sessions-token."
@@ -1915,12 +1922,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 "Ta inte bort denna applikation"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-msgid "Delete this application"
+#, fuzzy
+msgid "Delete this application."
 msgstr "Ta bort denna applikation"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1974,12 +1983,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 "Ta inte bort denna grupp"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-msgid "Delete this group"
+#, fuzzy
+msgid "Delete this group."
 msgstr "Ta bort denna grupp"
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
@@ -2022,12 +2033,14 @@ 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
-msgid "Do not delete this notice"
+#, 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 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.
@@ -2064,13 +2077,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.
-#. 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.
@@ -2236,21 +2249,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.
@@ -2282,7 +2295,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."
 
@@ -2562,7 +2575,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Inte en giltig e-postadress."
@@ -2639,19 +2652,22 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 #, 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "Ny inkommande e-postadress tillagd."
 
@@ -2662,7 +2678,8 @@ msgstr "Denna notis är redan en favorit!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-msgid "Disfavor favorite"
+#, fuzzy
+msgid "Disfavor favorite."
 msgstr "Ta bort märkning som favorit"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2903,12 +2920,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 "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
-msgid "Block this user from this group"
+#, 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.
@@ -3238,7 +3257,8 @@ 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.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "Inställningar sparade."
 
@@ -3656,39 +3676,39 @@ msgstr "Spara"
 msgid "Save license settings"
 msgstr "Spara licensinsällningar"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "Redan inloggad."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "Felaktigt användarnamn eller lösenord."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 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:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "Logga in"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "Logga in på webbplatsen"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "Kom ihåg mig"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 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:259
 msgid "Lost or forgotten password?"
 msgstr "Tappat bort eller glömt ditt lösenord?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3696,11 +3716,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:281
 msgid "Login with your username and password."
 msgstr "Logga in med ditt användarnamn och lösenord."
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3914,30 +3934,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:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr "Anslutna applikationer"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3945,20 +3965,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, 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."
@@ -3968,6 +3998,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
@@ -4058,17 +4098,21 @@ msgstr "Ogiltig inloggnings-token angiven."
 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."
 
@@ -4094,40 +4138,45 @@ msgstr "Gammalt lösenord"
 msgid "New password"
 msgstr "Nytt lösenord"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+#, fuzzy
+msgid "6 or more characters."
 msgstr "Minst 6 tecken"
 
-#: 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:427
+#, fuzzy
+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:230
 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:233
 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
-msgid "Can't save new password."
+#. 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."
 
-#. 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."
 
@@ -4463,7 +4512,7 @@ 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:109 actions/register.php:419
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
@@ -4471,7 +4520,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:455
+#: actions/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4479,13 +4528,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:460
+#: actions/profilesettings.php:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "URL till din hemsida, blogg eller profil på en annan webbplats."
@@ -4493,7 +4542,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:129 actions/register.php:457
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4501,28 +4550,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Var du håller till, såsom \"Stad, Län, Land\""
 
@@ -4541,8 +4591,10 @@ msgstr "Taggar"
 
 #. 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 ""
 "Taggar för dig själv (bokstäver, nummer, -, ., och _), separerade med "
 "kommatecken eller mellanslag"
@@ -4554,7 +4606,8 @@ msgstr "Språk"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-msgid "Preferred language"
+#, fuzzy
+msgid "Preferred language."
 msgstr "Föredraget språk"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4569,8 +4622,9 @@ msgstr "I vilken tidszon befinner du dig normalt?"
 
 #. 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 ""
 "Prenumerera automatiskt på den som prenumererar på mig (bäst för icke-"
 "människa) "
@@ -4578,7 +4632,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:258 actions/register.php:221
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4598,9 +4652,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 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:291
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Ogiltig tagg: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4845,6 +4899,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"
@@ -4856,12 +4916,6 @@ 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
@@ -4914,14 +4968,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:248
 msgid "Error setting user."
 msgstr "Fel uppstog i användarens inställning"
 
@@ -4930,95 +4978,95 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr "Tyvärr, bara inbjudna personer kan registrera sig."
 
-#: actions/register.php:99
+#: actions/register.php:94
 msgid "Sorry, invalid invitation code."
 msgstr "Tyvärr, ogiltig inbjudningskod."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "Registreringen genomförd"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "Registrera"
 
-#: actions/register.php:142
+#: actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Registrering inte tillåten."
 
-#: actions/register.php:209
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:201
+#, 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:218
+#: actions/register.php:210
 msgid "Email address already exists."
 msgstr "E-postadressen finns redan."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "Ogiltigt användarnamn eller lösenord."
 
-#: actions/register.php:351
+#: actions/register.php:340
+#, 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-post"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, 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:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Längre namn, förslagsvis ditt \"verkliga\" namn"
 
-#: actions/register.php:462
-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:471
+#, 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:523
+#: actions/register.php:510
 #, 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:520
 #, 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:524
 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:527
 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:532
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5027,7 +5075,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:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5060,7 +5108,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:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5093,7 +5141,8 @@ msgid "User nickname"
 msgstr "Användarens smeknamn"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow"
+#, fuzzy
+msgid "Nickname of the user you want to follow."
 msgstr "Smeknamnet på användaren du vill följa"
 
 #: actions/remotesubscribe.php:132
@@ -5101,7 +5150,8 @@ msgid "Profile URL"
 msgstr "Profil-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 till din profil på en annan kompatibel mikrobloggtjänst"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
@@ -5111,7 +5161,8 @@ msgid "Subscribe"
 msgstr "Prenumerera"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)"
+#, fuzzy
+msgid "Invalid profile URL (bad format)."
 msgstr "Ogiltig profil-URL (dåligt format)"
 
 #: actions/remotesubscribe.php:167
@@ -5312,7 +5363,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"
 
@@ -5354,87 +5405,87 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Ikon"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 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
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organisation"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Statistik"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, 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:207
 msgid "Application actions"
 msgstr "Åtgärder för applikation"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 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
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Ta bort"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "Information om applikation"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr "Nyckel för konsument"
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr "Hemlighet för konsument"
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr "URL för begäran-token"
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr "URL för åtkomst-token"
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr "Tillåt URL"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5442,7 +5493,7 @@ msgstr ""
 "Notera: Vi stöjder HMAC-SHA1-signaturer. Vi stödjer inte metoden med "
 "klartextsignatur."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:302
 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?"
@@ -5535,16 +5586,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "Notis"
 
@@ -5689,7 +5742,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"
@@ -5937,7 +5990,8 @@ 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
-msgid "Save site notice"
+#, fuzzy
+msgid "Save site notice."
 msgstr "Spara webbplatsnotis"
 
 #. TRANS: Title for SMS settings.
@@ -5995,7 +6049,8 @@ msgstr "Telefonnummer för 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 "Telefonnummer, inga punkter eller mellanslag, med landskod"
 
 #. TRANS: Form legend for SMS preferences form.
@@ -6333,8 +6388,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Foto"
@@ -6351,6 +6407,11 @@ 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."
@@ -6387,7 +6448,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’."
@@ -6421,7 +6482,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.
@@ -6484,55 +6545,71 @@ 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
-msgid "Save user settings"
-msgstr ""
+#, fuzzy
+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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, 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:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Avvisa"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+msgid "Reject this subscription."
 msgstr "Avvisa denna prenumeration"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:248
 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:271
 msgid "Subscription authorized"
 msgstr "Prenumeration godkänd"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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 "
@@ -6542,11 +6619,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:285
 msgid "Subscription rejected"
 msgstr "Prenumeration avvisad"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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 "
@@ -6556,39 +6634,64 @@ msgstr ""
 "webbplatsens instruktioner för detaljer om hur du fullständingt avvisar "
 "prenumerationen."
 
-#: actions/userauthorization.php:303
-#, 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:325
+#, fuzzy, php-format
+msgid "Listener URI \"%s\" not found here."
 msgstr "URI för lyssnare '%s' hittades inte här."
 
-#: actions/userauthorization.php:308
-#, 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:332
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is too long."
 msgstr "Lyssnar-URI '%s' är för lång."
 
-#: actions/userauthorization.php:314
-#, 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:340
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "Lyssnar-URI '%s' är en lokal användare."
 
-#: actions/userauthorization.php:329
-#, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
+#: actions/userauthorization.php:358
+#, fuzzy, php-format
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "Profil-URL ‘%s’ är för en lokal användare."
 
-#: actions/userauthorization.php:345
-#, 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:368
+#, 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."
 msgstr "Avatar-URL ‘%s’ är inte giltig."
 
-#: actions/userauthorization.php:350
-#, 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:385
+#, fuzzy, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Kan inte läsa avatar-URL '%s'."
 
-#: actions/userauthorization.php:355
-#, 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:392
+#, 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.
@@ -7797,6 +7900,11 @@ 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"
@@ -8249,6 +8357,11 @@ 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
@@ -8285,6 +8398,21 @@ 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
@@ -8392,7 +8520,6 @@ msgid "Grant this user the \"%s\" role"
 msgstr "Bevilja denna användare \"%s\"-rollen"
 
 #: lib/groupeditform.php:147
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 små bokstäver eller nummer, inga punkter eller mellanslag"
 
@@ -9168,6 +9295,10 @@ 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"
@@ -9449,6 +9580,10 @@ 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"
@@ -9721,3 +9856,15 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "6 or more characters"
+#~ msgstr "Minst 6 tecken"
+
+#~ msgid "Same as password above"
+#~ msgstr "Samma som lösenordet ovan"
+
+#~ msgid "Can't save new password."
+#~ msgstr "Kan inte spara nytt lösenord."
+
+#~ msgid "URL of your homepage, blog, or profile on another site"
+#~ msgstr "URL till din hemsida, blogg eller profil på en annan webbplats."
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 25f7457be0..39eff5867e 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:06:44+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27:47+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 (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -152,7 +152,7 @@ msgstr "అటువంటి పేజీ లేదు."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -508,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 "Can't send direct messages to users who aren't your friend."
+#, fuzzy
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "మీ స్నేహితులు కాని వాడుకరులకి నేరు సందేశాలు పంపించలేరు."
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -592,7 +593,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "ఆ పేరుని ఇప్పటికే వాడుతున్నారు. మరోటి ప్రయత్నించండి."
 
@@ -602,7 +603,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "సరైన పేరు కాదు."
 
@@ -615,7 +616,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "హోమ్ పేజీ URL సరైనది కాదు."
 
@@ -625,7 +626,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:226
+#: actions/register.php:218
 #, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "పూర్తి పేరు చాలా పెద్దగా ఉంది (గరిష్ఠంగా 255 అక్షరాలు)."
@@ -654,7 +655,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:235
+#: actions/register.php:227
 #, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)."
@@ -813,15 +814,15 @@ msgstr "మీకు అధీకరణ లేదు."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -853,7 +854,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr ""
@@ -898,19 +899,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "సంకేతపదం"
 
@@ -1032,7 +1034,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.
@@ -1208,25 +1210,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1394,7 +1397,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,9 +1502,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 "వాడుకరికి ప్రొఫైలు లేదు."
@@ -1557,9 +1562,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
-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.
@@ -1619,7 +1625,7 @@ msgstr "నేపథ్యం"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1659,7 +1665,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.
@@ -1676,9 +1683,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.
@@ -1843,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:440
+#: actions/recoverpassword.php:262 actions/register.php:426
 msgid "Confirm"
 msgstr "నిర్థారించు"
 
@@ -1873,13 +1880,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr ""
@@ -1902,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.
@@ -1961,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.
@@ -2007,12 +2018,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 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.
@@ -2049,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.
-#. 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.
@@ -2222,23 +2235,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.
@@ -2270,7 +2281,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 "అటువంటి ఉపకరణం లేదు."
 
@@ -2557,7 +2568,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "సరైన ఈమెయిల్ చిరునామా కాదు:"
@@ -2635,20 +2646,23 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 #, 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:534 actions/smssettings.php:570
 #, 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:558 actions/smssettings.php:595
 #, fuzzy
 msgid "New incoming email address added."
 msgstr "ఈమెయిలు చిరునామా లేదు."
@@ -2661,7 +2675,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.
@@ -2898,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.
@@ -3219,7 +3235,8 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "ప్రస్తుతం నిర్ధారించిన Jabber/GTalk చిరునామా"
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "అభిరుచులు భద్రమయ్యాయి."
 
@@ -3625,50 +3642,50 @@ msgstr "భద్రపరచు"
 msgid "Save license settings"
 msgstr "లైసెన్సు అమరికలను భద్రపరచు"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "ఇప్పటికే లోనికి ప్రవేశించారు."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "వాడుకరిని అమర్చడంలో పొరపాటు. బహుశా మీకు అధీకరణ లేకపోవచ్చు."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "ప్రవేశించండి"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "సైటు లోనికి ప్రవేశించు"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "నన్ను గుర్తుంచుకో"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "భవిష్యత్తులో ఆటోమెటిగ్గా లోనికి ప్రవేశించు; బయటి కంప్యూర్ల కొరకు కాదు!"
 
-#: actions/login.php:269
+#: actions/login.php:259
 msgid "Lost or forgotten password?"
 msgstr "మీ సంకేతపదం మర్చిపోయారా?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr ""
 "భద్రతా కారణాల దృష్ట్యా, అమరికలు మార్చే ముందు మీ వాడుకరి పేరుని మరియు సంకేతపదాన్ని మరోసారి ఇవ్వండి."
 
-#: actions/login.php:292
+#: actions/login.php:281
 msgid "Login with your username and password."
 msgstr "మీ వాడుకరిపేరు మరియు సంకేతపదాలతో ప్రవేశించండి."
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3877,30 +3894,30 @@ msgid "You have not registered any applications yet."
 msgstr "మీరు ఇంకా ఏ ఉపకరణాన్నీ నమోదు చేసుకోలేదు."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr "సంధానిత ఉపకరణాలు"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3908,20 +3925,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, 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 "నోటీసుకి ప్రొఫైలు లేదు."
@@ -3931,6 +3958,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
@@ -4025,17 +4062,21 @@ msgstr "సందేశపు విషయం సరైనది కాదు"
 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 "ఇవి మీరు పంపివున్న అంతరంగిక సందేశాలు."
 
@@ -4061,40 +4102,45 @@ msgstr "పాత సంకేతపదం"
 msgid "New password"
 msgstr "కొత్త సంకేతపదం"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+#, fuzzy
+msgid "6 or more characters."
 msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు"
 
-#: 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:427
+#, fuzzy
+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:230
 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:233
 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
+#, fuzzy
+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 "సంకేతపదం భద్రమయ్యింది."
 
@@ -4435,7 +4481,7 @@ 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:109 actions/register.php:419
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామచిహ్నాలు మరియు ఖాళీలు తప్ప"
@@ -4443,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:455
+#: actions/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4451,13 +4497,13 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా"
@@ -4465,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:471
+#: actions/profilesettings.php:129 actions/register.php:457
 #, fuzzy, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4473,28 +4519,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
 
@@ -4514,7 +4561,8 @@ 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.
@@ -4524,7 +4572,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.
@@ -4539,14 +4588,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)"
-msgstr ""
+"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:258 actions/register.php:221
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4566,9 +4616,9 @@ 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:291
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "తప్పుడు మారుపేరు: \"%s\""
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4813,6 +4863,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"
@@ -4824,12 +4880,6 @@ 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
@@ -4880,14 +4930,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:248
 #, fuzzy
 msgid "Error setting user."
 msgstr "వాడుకరిని భద్రపరచడంలో పొరపాటు: సరికాదు."
@@ -4897,90 +4941,89 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr "క్షమించండి, ఆహ్వానితులు మాత్రమే నమోదుకాగలరు."
 
-#: actions/register.php:99
+#: actions/register.php:94
 msgid "Sorry, invalid invitation code."
 msgstr "క్షమించండి, తప్పు ఆహ్వాన సంకేతం."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "నమోదు విజయవంతం"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "నమోదు"
 
-#: actions/register.php:142
+#: actions/register.php:135
 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:201
+#, fuzzy
+msgid "You cannot register if you don't agree to the license."
 msgstr "ఈ లైసెన్సుకి అంగీకరించకపోతే మీరు నమోదుచేసుకోలేరు."
 
-#: actions/register.php:218
+#: actions/register.php:210
 msgid "Email address already exists."
 msgstr "ఈమెయిల్ చిరునామా ఇప్పటికే ఉంది."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు."
 
-#: actions/register.php:351
+#: actions/register.php:340
 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "ఈమెయిల్"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, fuzzy
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "తాజా విశేషాలు, ప్రకటనలు, మరియు సంకేతపదం పోయినప్పుడు మాత్రమే ఉపయోగిస్తాం."
 
-#: actions/register.php:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "పొడుగాటి పేరు, మీ \"అసలు\" పేరైతే మంచిది"
 
-#: actions/register.php:462
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా"
+#: actions/register.php:471
+#, fuzzy
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "మీరు ఎక్కడ నుండి, \"నగరం, రాష్ట్రం (లేదా ప్రాంతం), దేశం\""
 
-#: actions/register.php:523
+#: actions/register.php:510
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:533
+#: actions/register.php:520
 #, 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:524
 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:527
 msgid "All rights reserved."
 msgstr "సర్వహక్కులూ సురక్షితం."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:532
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4989,7 +5032,7 @@ msgstr ""
 "నా పాఠ్యం మరియు దస్త్రాలు %s క్రింద లభ్యం, ఈ అంతరంగిక భోగట్టా తప్ప: సంకేతపదం, ఈమెయిల్ చిరునామా, IM "
 "చిరునామా, మరియు ఫోన్ నంబర్."
 
-#: actions/register.php:588
+#: actions/register.php:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5020,7 +5063,7 @@ msgstr ""
 "\n"
 "నమోదుచేసుకున్నందుకు కృతజ్ఞతలు మరియు ఈ సేవని ఉపయోగిస్తూ మీరు ఆనందిస్తారని మేం ఆశిస్తున్నాం."
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5052,7 +5095,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
@@ -5060,7 +5104,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.
@@ -5070,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
@@ -5266,7 +5311,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 "స్టేటస్‌నెట్"
 
@@ -5311,94 +5356,94 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "ప్రతీకం"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "పేరు"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "సంస్ధ"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "గణాంకాలు"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, 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:207
 msgid "Application actions"
 msgstr "ఉపకరణ చర్యలు"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "తొలగించు"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "ఉపకరణ సమాచారం"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr ""
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 #, fuzzy
 msgid "Authorize URL"
 msgstr "రచయిత"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:302
 #, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "మీరు నిజంగానే ఈ నోటీసుని తొలగించాలనుకుంటున్నారా?"
@@ -5487,16 +5532,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "గమనిక"
 
@@ -5645,7 +5692,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"
@@ -5893,7 +5940,8 @@ msgstr "సైటు-వారీ నోటీసు పాఠ్యం (255 అ
 
 #. 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.
@@ -5954,7 +6002,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.
@@ -6285,8 +6333,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "ఫొటో"
@@ -6302,6 +6351,11 @@ 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."
@@ -6338,7 +6392,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’."
@@ -6369,7 +6423,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.
@@ -6431,102 +6485,141 @@ 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 "వాడుకరి అమరికలను భద్రపరచు"
 
-#: 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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "ఈ వాడుకరికి చందాచేరు"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "తిరస్కరించు"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+msgid "Reject this subscription."
 msgstr "ఈ చందాని తిరస్కరించు"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:248
 msgid "No authorization request!"
 msgstr "అధీకరణ అభ్యర్థన లేదు!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 msgid "Subscription authorized"
 msgstr "చందాని అధీకరించారు"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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:285
 msgid "Subscription rejected"
 msgstr "చందాని తిరస్కరించారు."
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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:325
 #, 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:332
 #, php-format
-msgid "Listenee URI ‘%s’ is too long."
+msgid "Listenee URI \"%s\" is too long."
 msgstr ""
 
-#: 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:340
 #, php-format
-msgid "Listenee URI ‘%s’ is a local user."
+msgid "Listenee URI \"%s\" is a local user."
 msgstr ""
 
-#: actions/userauthorization.php:329
+#. 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."
+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:368
 #, 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:378
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+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
+#, fuzzy, php-format
+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:392
 #, 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.
@@ -7726,6 +7819,11 @@ 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"
@@ -8148,6 +8246,11 @@ 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
@@ -8182,6 +8285,23 @@ 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
@@ -8291,7 +8411,6 @@ msgid "Grant this user the \"%s\" role"
 msgstr ""
 
 #: lib/groupeditform.php:147
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1-64 చిన్నబడి అక్షరాలు లేదా అంకెలు, విరామచిహ్నాలు మరియు ఖాళీలు తప్ప"
 
@@ -9051,6 +9170,10 @@ msgstr "ఈ నోటీసుపై స్పందించండి"
 msgid "Reply"
 msgstr "స్పందించండి"
 
+#: lib/noticelist.php:673
+msgid "Delete this notice"
+msgstr "ఈ నోటీసుని తొలగించు"
+
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "నోటీసుని పునరావృతించారు"
@@ -9337,6 +9460,10 @@ 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"
@@ -9607,3 +9734,15 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "6 or more characters"
+#~ msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు"
+
+#~ msgid "Same as password above"
+#~ msgstr "పై సంకేతపదం వలెనే"
+
+#~ msgid "Can't save new password."
+#~ msgstr "కొత్త సంకేతపదాన్ని భద్రపరచలేము."
+
+#~ msgid "URL of your homepage, blog, or profile on another site"
+#~ msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 32ee491927..d4cb84ef60 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:06:46+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27:48+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 (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -155,7 +155,7 @@ msgstr "Böyle bir sayfa yok."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -516,7 +516,8 @@ 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
-msgid "Can't send direct messages to users who aren't your friend."
+#, 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).
@@ -601,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "Takma ad kullanımda. Başka bir tane deneyin."
 
@@ -611,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "Geçersiz bir takma ad."
 
@@ -624,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
 
@@ -634,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:226
+#: actions/register.php:218
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Tam isim çok uzun (en fazla: 255 karakter)."
 
@@ -661,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:235
+#: actions/register.php:227
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Yer bilgisi çok uzun (en fazla 255 karakter)."
 
@@ -815,15 +816,15 @@ msgstr "İstek belirteci zaten yetkili."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: 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."
@@ -854,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Beklenmeğen form girdisi."
@@ -907,19 +908,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Parola"
 
@@ -1041,8 +1043,8 @@ 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
-#, php-format
-msgid "Unsupported format: %s"
+#, fuzzy, php-format
+msgid "Unsupported format: %s."
 msgstr "Desteklenmeyen biçim: %s"
 
 #. TRANS: Client error displayed requesting a deleted status.
@@ -1217,25 +1219,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1404,7 +1407,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."
@@ -1510,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
 #, fuzzy
 msgid "User without matching profile."
 msgstr "Kullanıcının profili yok."
@@ -1569,9 +1574,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
-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 "Resimden kullanıcı resminiz olacak bir kare alanı seçin"
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
@@ -1630,7 +1636,7 @@ msgstr "Arkaplan"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+msgid "Backup your account."
 msgstr ""
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1672,7 +1678,8 @@ msgstr "Hayır"
 
 #. 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 "Bu kullanıcıyı engelleme"
 
 #. TRANS: Button label on the user block form.
@@ -1689,9 +1696,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.
@@ -1855,7 +1862,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:426
 msgid "Confirm"
 msgstr "Onayla"
 
@@ -1885,13 +1892,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr ""
@@ -1915,12 +1922,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 "Bu uygulamayı silme"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-msgid "Delete this application"
+#, fuzzy
+msgid "Delete this application."
 msgstr "Bu uygulamayı sil"
 
 #. TRANS: Client error when trying to delete group while not logged in.
@@ -1979,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 "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.
@@ -2028,12 +2037,14 @@ msgstr "Bu durum mesajını silmek istediğinizden emin misiniz?"
 
 #. 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 "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.
@@ -2070,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 "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.
@@ -2243,21 +2254,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.
@@ -2289,7 +2300,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."
 
@@ -2576,7 +2587,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Geçersiz bir eposta adresi."
@@ -2655,19 +2666,22 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 #, 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "Yeni gelen e-posta adresi eklendi."
 
@@ -2678,7 +2692,8 @@ msgstr "Bu durum mesajı zaten bir favori!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-msgid "Disfavor favorite"
+#, fuzzy
+msgid "Disfavor favorite."
 msgstr "Favoriliğini kaldır"
 
 #. TRANS: Page title for first page of favorited notices.
@@ -2917,12 +2932,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 "Bu kullanıcıyı bu gruptan engellemeyin"
 
 #. 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 "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.
@@ -3243,7 +3260,8 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Onaylanmış Jabber/Gtalk adresi."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "Tercihler kaydedildi."
 
@@ -3625,41 +3643,41 @@ msgstr "Kaydet"
 msgid "Save license settings"
 msgstr "Lisans ayarlarını kaydet"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "Zaten giriş yapılmış."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "Yanlış kullanıcı adı veya parola."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 actions/otp.php:120
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Yetkilendirilmemiş."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "Giriş"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "Siteye giriş"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "Beni hatırla"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 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:259
 msgid "Lost or forgotten password?"
 msgstr "Parolamı unuttum veya kaybettim"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3667,11 +3685,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:281
 msgid "Login with your username and password."
 msgstr "Yanlış kullanıcı adı veya parola."
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, fuzzy, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3880,30 +3898,30 @@ msgid "You have not registered any applications yet."
 msgstr ""
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr "Bağlı uygulamalar"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3911,20 +3929,30 @@ msgid ""
 msgstr ""
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, 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."
@@ -3934,6 +3962,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
@@ -4028,17 +4066,21 @@ msgstr "Geçersiz durum mesajı"
 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 ""
 
@@ -4064,40 +4106,45 @@ msgstr "Eski parola"
 msgid "New password"
 msgstr "Yeni parola"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+#, fuzzy
+msgid "6 or more characters."
 msgstr "6 veya daha fazla karakter"
 
-#: 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:427
+#, 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:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:230
 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:233
 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
-msgid "Can't save new password."
+#. 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."
 
-#. 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."
 
@@ -4439,7 +4486,7 @@ 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:109 actions/register.php:419
 #, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
 msgstr ""
@@ -4449,7 +4496,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:455
+#: actions/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4457,13 +4504,13 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 #, fuzzy
 msgid "URL of your homepage, blog, or profile on another site."
 msgstr ""
@@ -4472,36 +4519,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:129 actions/register.php:471
+#: actions/profilesettings.php:129 actions/register.php:457
 #, 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:135 actions/register.php:462
 #, 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
 
@@ -4520,8 +4568,10 @@ msgstr "Etiketler"
 
 #. 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 ""
 "Kendiniz için etiketler (harf, sayı, -. ., ve _ kullanılabilir), virgül veya "
 "boşlukla ayırabilirsiniz"
@@ -4533,7 +4583,8 @@ msgstr "Dil"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-msgid "Preferred language"
+#, fuzzy
+msgid "Preferred language."
 msgstr "Tercih edilen dil"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4548,14 +4599,15 @@ msgstr "Normalde hangi zaman dilimi içindesiniz?"
 
 #. 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 "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:258 actions/register.php:221
 #, fuzzy, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4574,9 +4626,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 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
+#: actions/profilesettings.php:291
+#, 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
@@ -4816,6 +4868,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"
@@ -4827,12 +4885,6 @@ 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
@@ -4887,14 +4939,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:248
 msgid "Error setting user."
 msgstr "Kullanıcı ayarlamada hata oluştu."
 
@@ -4903,93 +4949,90 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/register.php:99
+#: actions/register.php:94
 #, fuzzy
 msgid "Sorry, invalid invitation code."
 msgstr "Onay kodu hatası."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "Kayıt başarılı"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "Kayıt"
 
-#: actions/register.php:142
+#: actions/register.php:135
 msgid "Registration not allowed."
 msgstr "Kayıt yapılmasına izin verilmiyor."
 
-#: actions/register.php:209
-msgid "You can't register if you don't agree to the license."
+#: actions/register.php:201
+#, 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:218
+#: actions/register.php:210
 msgid "Email address already exists."
 msgstr "Eposta adresi zaten var."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "Geçersiz kullanıcı adı veya parola."
 
-#: actions/register.php:351
+#: actions/register.php:340
 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/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Eposta"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, 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:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+msgid "Longer name, preferably your \"real\" name."
 msgstr ""
 
-#: actions/register.php:462
-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:471
+#, 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:523
+#: actions/register.php:510
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
 
-#: actions/register.php:533
+#: actions/register.php:520
 #, 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:524
 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:527
 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:532
 #, fuzzy, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4998,7 +5041,7 @@ msgstr ""
 "bu özel veriler haricinde: parola, eposta adresi, IM adresi, telefon "
 "numarası."
 
-#: actions/register.php:588
+#: actions/register.php:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5017,7 +5060,7 @@ msgid ""
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5045,7 +5088,8 @@ msgid "User nickname"
 msgstr "Kullanıcı takma adı"
 
 #: actions/remotesubscribe.php:129
-msgid "Nickname of the user you want to follow"
+#, 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
@@ -5053,7 +5097,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.
@@ -5063,8 +5107,9 @@ msgid "Subscribe"
 msgstr "Abone ol"
 
 #: actions/remotesubscribe.php:158
-msgid "Invalid profile URL (bad format)"
-msgstr ""
+#, fuzzy
+msgid "Invalid profile URL (bad format)."
+msgstr "Geçersiz dosya ismi."
 
 #: actions/remotesubscribe.php:167
 #, fuzzy
@@ -5259,7 +5304,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"
 
@@ -5303,95 +5348,95 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Simge"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 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
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organizasyon"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "İstatistikler"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
+#: actions/showapplication.php:207
 msgid "Application actions"
 msgstr ""
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 msgid "Reset key & secret"
 msgstr ""
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Sil"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr ""
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr ""
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr ""
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr ""
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr ""
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:302
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
@@ -5477,16 +5522,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "Not"
 
@@ -5624,7 +5671,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"
@@ -5865,7 +5912,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.
@@ -5928,7 +5975,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"
@@ -6265,8 +6312,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Fotoğraf"
@@ -6281,6 +6329,11 @@ 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."
@@ -6319,7 +6372,7 @@ 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’."
@@ -6351,7 +6404,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.
@@ -6415,106 +6468,145 @@ msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-msgid "Save user settings"
-msgstr ""
+#, fuzzy
+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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, 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:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Reddet"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+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:248
 msgid "No authorization request!"
 msgstr "Yetkilendirme isteği yok!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 msgid "Subscription authorized"
 msgstr "Takip talebine izin verildi"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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:285
 msgid "Subscription rejected"
 msgstr "Abonelik reddedildi."
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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:325
 #, php-format
-msgid "Listener URI ‘%s’ not found here."
+msgid "Listener URI \"%s\" not found here."
 msgstr ""
 
-#: actions/userauthorization.php:308
-#, php-format
-msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
-
-#: actions/userauthorization.php:314
-#, php-format
-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
-#, php-format
-msgid "Avatar URL ‘%s’ is not valid."
-msgstr ""
-
-#: actions/userauthorization.php:350
+#. TRANS: Exception thrown when listenee URI is too long for an authorisation request.
+#. TRANS: %s is a listenee URI.
+#: actions/userauthorization.php:332
 #, fuzzy, php-format
-msgid "Can’t read avatar URL ‘%s’."
+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
+#, 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
+#, fuzzy, php-format
+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:392
 #, 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.
@@ -7718,6 +7810,11 @@ 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"
@@ -8130,6 +8227,11 @@ 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
@@ -8169,6 +8271,21 @@ 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
@@ -8277,7 +8394,6 @@ msgid "Grant this user the \"%s\" role"
 msgstr ""
 
 #: lib/groupeditform.php:147
-#, fuzzy
 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 "
@@ -8961,6 +9077,10 @@ 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"
@@ -9252,6 +9372,10 @@ 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"
@@ -9523,3 +9647,17 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
+
+#~ msgid "6 or more characters"
+#~ msgstr "6 veya daha fazla karakter"
+
+#~ msgid "Same as password above"
+#~ msgstr "yukarıdaki parolanın aynısı"
+
+#~ msgid "Can't save new password."
+#~ msgstr "Yeni parola kaydedilemedi."
+
+#~ msgid "URL of your homepage, blog, or profile on another site"
+#~ msgstr ""
+#~ "Web Sitenizin, blogunuzun ya da varsa başka bir sitedeki profilinizin "
+#~ "adresi"
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 2a437e7d6e..edf502beb3 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:06:49+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27: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-Generator: MediaWiki 1.18alpha (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -157,7 +157,7 @@ msgstr "Немає такої сторінки."
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -522,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 "Can't send direct messages to users who aren't your friend."
+#, fuzzy
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Не можна надіслати пряме повідомлення користувачеві, який не є вашим другом."
 
@@ -610,7 +611,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "Це ім’я вже використовується. Спробуйте інше."
 
@@ -620,7 +621,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "Це недійсне ім’я користувача."
 
@@ -633,7 +634,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "Веб-сторінка має недійсну URL-адресу."
 
@@ -643,7 +644,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:226
+#: actions/register.php:218
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Повне ім’я надто довге (не більше 255 символів)."
 
@@ -672,7 +673,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:235
+#: actions/register.php:227
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Розташування надто довге (не більше 255 символів)."
 
@@ -828,15 +829,15 @@ msgstr "Токен запиту вже авторизовано."
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
@@ -868,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "Несподіване представлення форми."
@@ -920,19 +921,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Пароль"
 
@@ -1054,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.
@@ -1237,25 +1239,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1410,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 "Неможливо позбавити когось членства."
 
@@ -1513,9 +1516,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 "Користувач без відповідного профілю."
 
@@ -1570,9 +1575,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
-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.
@@ -1638,7 +1644,8 @@ msgstr "Резерв. копія"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+#, fuzzy
+msgid "Backup your account."
 msgstr "Резервне копіювання вашого акаунту"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1679,7 +1686,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.
@@ -1696,9 +1704,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.
@@ -1862,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:440
+#: actions/recoverpassword.php:262 actions/register.php:426
 msgid "Confirm"
 msgstr "Підтвердити"
 
@@ -1891,13 +1899,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "Виникли певні проблеми з токеном поточної сесії."
@@ -1921,12 +1929,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.
@@ -1980,12 +1990,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.
@@ -2026,12 +2038,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 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.
@@ -2066,13 +2080,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 "Не видаляти цього користувача"
 
 #. 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.
@@ -2236,21 +2251,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.
@@ -2282,7 +2297,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 "Такого додатку немає."
 
@@ -2564,7 +2579,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Це недійсна електронна адреса."
@@ -2639,18 +2654,21 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "Нову адресу для вхідних повідомлень додано."
 
@@ -2661,7 +2679,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.
@@ -2900,12 +2919,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.
@@ -3234,7 +3255,8 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "Позначати міткою MicroID мою адресу Jabber/Google Talk."
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "Преференції збережно."
 
@@ -3651,41 +3673,41 @@ msgstr "Зберегти"
 msgid "Save license settings"
 msgstr "Зберегти налаштування ліцензії"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "Тепер ви увійшли."
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "Неточне ім’я або пароль."
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "Помилка. Можливо, ви не авторизовані."
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "Увійти"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "Вхід на сайт"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "Пам’ятати мене"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
 "Автоматично входити у майбутньому; не для комп’ютерів загального "
 "користування!"
 
-#: actions/login.php:269
+#: actions/login.php:259
 msgid "Lost or forgotten password?"
 msgstr "Загубили або забули пароль?"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -3693,11 +3715,11 @@ msgstr ""
 "З міркувань безпеки, будь ласка, введіть ще раз ім’я та пароль, перед тим як "
 "змінювати налаштування."
 
-#: actions/login.php:292
+#: actions/login.php:281
 msgid "Login with your username and password."
 msgstr "Увійти використовуючи ім’я та пароль."
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3910,30 +3932,30 @@ msgid "You have not registered any applications yet."
 msgstr "Поки що ви не зареєстрували жодних додатків."
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr "Під’єднані додатки"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3943,14 +3965,14 @@ msgstr ""
 "$s."
 
 #. TRANS: Empty list message when no applications have been authorised yet.
-#: actions/oauthconnectionssettings.php:213
+#: actions/oauthconnectionssettings.php:211
 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:231
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -3959,6 +3981,16 @@ msgstr ""
 "Ви — розробник? [Зареєструйте клієнтський додаток OAuth](%s) щоб "
 "користуватися ним на даному сайті StatusNet."
 
+#: 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 "Допис не має профілю."
@@ -3968,6 +4000,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
@@ -4057,17 +4099,21 @@ msgstr "Токен для входу визначено як неправиль
 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 ""
 "Це ваші вихідні повідомлення, тут містяться повідомлення, які ви надіслали "
@@ -4095,40 +4141,42 @@ msgstr "Старий пароль"
 msgid "New password"
 msgstr "Новий пароль"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
-msgstr "6 або більше знаків"
+#: actions/passwordsettings.php:109 actions/register.php:423
+msgid "6 or more characters."
+msgstr "6 або більше знаків."
 
-#: actions/passwordsettings.php:113
-msgid "Same as password above"
-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."
+msgstr "Такий само, як і пароль вище."
 
 #: actions/passwordsettings.php:117
 msgid "Change"
 msgstr "Змінити"
 
-#: actions/passwordsettings.php:154 actions/register.php:238
+#: actions/passwordsettings.php:153 actions/register.php:230
 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:233
 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."
-msgstr "Неможна зберегти новий пароль."
+#. 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 "Пароль збережено."
 
@@ -4453,14 +4501,14 @@ 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:109 actions/register.php:419
 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/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4468,20 +4516,20 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 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:129 actions/register.php:457
 #, php-format
 msgid "Describe yourself and your interests in %d character"
 msgid_plural "Describe yourself and your interests in %d characters"
@@ -4490,28 +4538,29 @@ 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "Де ви живете, на кшталт «Місто, область (регіон), країна»"
 
@@ -4530,8 +4579,10 @@ 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 ""
 "Позначте себе теґами (літери, цифри, -, . та _), відокремлюючи кожен комою "
 "або пробілом"
@@ -4543,7 +4594,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.
@@ -4558,15 +4610,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:229
+#: actions/profilesettings.php:258 actions/register.php:221
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4586,9 +4639,9 @@ 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:291
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "Недійсний теґ: «%s»"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4829,6 +4882,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"
@@ -4839,11 +4898,6 @@ 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
@@ -4895,13 +4949,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:248
 msgid "Error setting user."
 msgstr "Помилка в налаштуваннях користувача."
 
@@ -4910,92 +4959,93 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr ""
 "Пробачте, але лише ті, кого було запрошено, мають змогу зареєструватись тут."
 
-#: actions/register.php:99
+#: actions/register.php:94
 msgid "Sorry, invalid invitation code."
 msgstr "Даруйте, помилка у коді запрошення."
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "Реєстрація успішна"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "Реєстрація"
 
-#: actions/register.php:142
+#: actions/register.php:135
 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:201
+#, fuzzy
+msgid "You cannot register if you don't agree to the license."
 msgstr "Ви не зможете зареєструватись, якщо не погодитесь з умовами ліцензії."
 
-#: actions/register.php:218
+#: actions/register.php:210
 msgid "Email address already exists."
 msgstr "Ця адреса вже використовується."
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "Недійсне ім’я або пароль."
 
-#: actions/register.php:351
+#: actions/register.php:340
+#, 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:445 actions/register.php:449
+#: actions/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "Пошта"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, fuzzy
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "Використовується лише для оновлень, оголошень та відновлення паролю"
 
-#: actions/register.php:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "Повне ім’я, звісно ж ваше справжнє ім’я"
 
-#: actions/register.php:462
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "URL-адреса вашої веб-сторінки, блоґу, або профілю на іншому сайті"
+#: actions/register.php:471
+#, fuzzy
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "Де ви живете, на кшталт «Місто, область (регіон), країна»"
 
-#: actions/register.php:523
+#: actions/register.php:510
 #, 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:520
 #, 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:524
 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:527
 msgid "All rights reserved."
 msgstr "Всі права захищені."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:532
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -5004,7 +5054,7 @@ msgstr ""
 "Мої дописи і файли доступні на умовах %s, окрім цих приватних даних: пароль, "
 "електронна адреса, адреса IM, телефонний номер."
 
-#: actions/register.php:588
+#: actions/register.php:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -5037,7 +5087,7 @@ msgstr ""
 "Дякуємо, що зареєструвались у нас, і, сподіваємось, вам сподобається наш "
 "сервіс."
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -5069,7 +5119,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
@@ -5077,7 +5128,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.
@@ -5087,7 +5139,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
@@ -5286,7 +5339,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"
 
@@ -5328,87 +5381,87 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "Іконка"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "Ім’я"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Організація"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "Статистика"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, 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:207
 msgid "Application actions"
 msgstr "Можливості додатку"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 msgid "Reset key & secret"
 msgstr "Призначити новий ключ і таємне слово"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "Видалити"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "Інфо додатку"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr "Ключ споживача"
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr "Таємно слово споживача"
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr "URL-адреса токена запиту"
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr "URL-адреса токена дозволу"
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr "Авторизувати URL-адресу"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
@@ -5416,7 +5469,7 @@ msgstr ""
 "До уваги: Всі підписи шифруються за методом HMAC-SHA1. Ми не підтримуємо "
 "шифрування підписів відкритим текстом."
 
-#: actions/showapplication.php:309
+#: actions/showapplication.php:302
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "Ви впевнені, що бажаєте скинути ваш ключ споживача і секретний код?"
 
@@ -5509,16 +5562,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "Зауваження"
 
@@ -5664,7 +5719,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"
@@ -5915,7 +5970,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.
@@ -5973,7 +6029,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.
@@ -6309,8 +6366,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "Фото"
@@ -6327,6 +6385,11 @@ 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."
@@ -6362,7 +6425,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’."
@@ -6392,8 +6455,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.
@@ -6454,55 +6517,71 @@ 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 "Зберегти налаштування користувача"
 
-#: 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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "Підписатись до цього користувача"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Забраковано"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+msgid "Reject this subscription."
 msgstr "Відмінити цю підписку"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:248
 msgid "No authorization request!"
 msgstr "Немає запиту на авторизацію!"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 msgid "Subscription authorized"
 msgstr "Підписку авторизовано"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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 "
@@ -6512,11 +6591,12 @@ msgstr ""
 "Звіртесь з інструкціями на сайті для більш конкретної інформації про те, як "
 "авторизувати підписку. Ваш підписний токен:"
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:285
 msgid "Subscription rejected"
 msgstr "Підписку скинуто"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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 "
@@ -6526,39 +6606,62 @@ msgstr ""
 "з інструкціями на сайті для більш конкретної інформації про те, як скинути "
 "підписку."
 
-#: actions/userauthorization.php:303
-#, 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:325
+#, fuzzy, php-format
+msgid "Listener URI \"%s\" not found here."
 msgstr "URI слухача «%s» тут не знайдено"
 
-#: actions/userauthorization.php:308
-#, 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:332
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is too long."
 msgstr "URI слухача «%s» задовге."
 
-#: actions/userauthorization.php:314
-#, 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:340
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "URI слухача «%s» це локальний користувач"
 
-#: actions/userauthorization.php:329
-#, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
+#: actions/userauthorization.php:358
+#, fuzzy, php-format
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "URL-адреса профілю «%s» для локального користувача."
 
-#: actions/userauthorization.php:345
-#, 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:368
+#, 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."
 msgstr "URL-адреса аватари «%s» помилкова."
 
-#: actions/userauthorization.php:350
-#, 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:385
+#, fuzzy, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "Не можна прочитати URL аватари «%s»."
 
-#: actions/userauthorization.php:355
-#, 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:392
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Неправильний тип зображення для URL-адреси аватари «%s»."
 
 #. TRANS: Page title for profile design page.
@@ -7768,6 +7871,11 @@ 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"
@@ -8229,6 +8337,11 @@ 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
@@ -8265,6 +8378,21 @@ 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
@@ -8369,9 +8497,9 @@ msgid "Grant this user the \"%s\" role"
 msgstr "Надати цьому користувачеві роль «%s»"
 
 #: lib/groupeditform.php:147
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 рядкових літер і цифр, ніякої пунктуації або інтервалів."
+msgstr ""
+"1-64 літери нижнього регістру і цифри, ніякої пунктуації або інтервалів"
 
 #: lib/groupeditform.php:156
 msgid "URL of the homepage or blog of the group or topic."
@@ -8382,7 +8510,7 @@ msgid "Describe the group or topic"
 msgstr "Опишіть спільноту або тему"
 
 #: lib/groupeditform.php:163
-#, fuzzy, php-format
+#, 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 знак"
@@ -9045,7 +9173,6 @@ msgid "Send"
 msgstr "Так"
 
 #: lib/messagelist.php:77
-#, fuzzy
 msgid "Messages"
 msgstr "Повідомлення"
 
@@ -9156,6 +9283,10 @@ msgstr "Відповісти на цей допис"
 msgid "Reply"
 msgstr "Відповісти"
 
+#: lib/noticelist.php:673
+msgid "Delete this notice"
+msgstr "Видалити допис"
+
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "Допис повторили"
@@ -9431,6 +9562,10 @@ 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"
@@ -9720,3 +9855,15 @@ msgstr "Неправильний XML, корінь XRD відсутній."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Отримання резервної копії файлу «%s»."
+
+#~ msgid "6 or more characters"
+#~ msgstr "6 або більше знаків"
+
+#~ msgid "Same as password above"
+#~ msgstr "Такий само, як і пароль вище"
+
+#~ msgid "Can't save new password."
+#~ msgstr "Неможна зберегти новий пароль."
+
+#~ msgid "URL of your homepage, blog, or profile on another site"
+#~ msgstr "URL-адреса вашої веб-сторінки, блоґу, або профілю на іншому сайті"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 398a1102c7..327597f732 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-14 16:00+0000\n"
-"PO-Revision-Date: 2011-02-14 16:06:51+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:27:51+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 (r82114); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-03 00:48:08+0000\n"
+"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -158,7 +158,7 @@ msgstr "没有这个页面。"
 #: 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/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:113
 #: 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
@@ -511,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 "Can't send direct messages to users who aren't your friend."
+#, fuzzy
+msgid "Cannot send direct messages to users who aren't your friend."
 msgstr "不能给未成为好友的用户发送私信。"
 
 #. TRANS: Client error displayed trying to direct message self (403).
@@ -594,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:214
+#: actions/register.php:206
 msgid "Nickname already in use. Try another one."
 msgstr "昵称已被使用，换一个吧。"
 
@@ -604,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:216
+#: actions/register.php:208
 msgid "Not a valid nickname."
 msgstr "不是有效的昵称。"
 
@@ -617,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:223
+#: actions/register.php:215
 msgid "Homepage is not a valid URL."
 msgstr "主页的URL不正确。"
 
@@ -627,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:226
+#: actions/register.php:218
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "全名过长(不能超过 255 个字符)。"
 
@@ -654,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:235
+#: actions/register.php:227
 msgid "Location is too long (maximum 255 characters)."
 msgstr "位置过长(不能超过255个字符)。"
 
@@ -808,15 +809,15 @@ msgstr "请求 token 已被授权了。"
 #: 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:137 actions/makeadmin.php:66
+#: actions/invite.php:60 actions/login.php:131 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/oauthappssettings.php:165 actions/oauthconnectionssettings.php:136
+#: actions/othersettings.php:155 actions/passwordsettings.php:137
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
-#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/register.php:164 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
+#: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
 msgstr "你的 session 出现了一个问题，请重试。"
@@ -847,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:147 actions/recoverpassword.php:46
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
 #: actions/smssettings.php:271 lib/designsettings.php:321
 msgid "Unexpected form submission."
 msgstr "未预料的表单提交。"
@@ -896,19 +897,20 @@ 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:252
-#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/apioauthauthorize.php:459 actions/login.php:242
+#: actions/profilesettings.php:106 actions/register.php:418
 #: actions/showgroup.php:243 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: actions/userauthorization.php:152 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:245
+#: actions/register.php:422 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "密码"
 
@@ -1026,8 +1028,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.
@@ -1199,25 +1201,26 @@ 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:334
 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:345
 #, 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:379
 #, 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."
@@ -1284,9 +1287,9 @@ 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
+#, php-format
 msgid "Groups %1$s is a member of on %2$s"
-msgstr "%s 组是成员组成了"
+msgstr "组 %1$s 是在 %2$s 上的成员"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
 #: actions/atompubmembershipfeed.php:219
@@ -1372,7 +1375,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 "不能删除其他人的成员资格。"
 
@@ -1400,9 +1403,9 @@ 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
+#, php-format
 msgid "People %1$s has subscribed to on %2$s"
-msgstr "%1$在%2$s上关注的用户"
+msgstr "人 %1$s 已经订阅的 %2$s"
 
 #. TRANS: Client error displayed when not using the follow verb.
 #: actions/atompubsubscriptionfeed.php:248
@@ -1475,9 +1478,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 "用户没有相应个人信息。"
 
@@ -1532,9 +1537,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
-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.
@@ -1595,7 +1601,8 @@ msgstr "备份"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-msgid "Backup your account"
+#, fuzzy
+msgid "Backup your account."
 msgstr "备份您的帐户"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
@@ -1635,7 +1642,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 +1660,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.
@@ -1813,7 +1821,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:426
 msgid "Confirm"
 msgstr "密码确认"
 
@@ -1842,13 +1850,13 @@ 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
+#: actions/newapplication.php:112 actions/showapplication.php:113
 #: lib/action.php:1422
 msgid "There was a problem with your session token."
 msgstr "你的 session token 出现了问题。"
@@ -1871,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 "不删除该应用"
 
 #. 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.
@@ -1929,12 +1939,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.
@@ -1975,12 +1987,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 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.
@@ -2014,13 +2028,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 "不要删除此用户"
 
 #. 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.
@@ -2182,21 +2197,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.
@@ -2228,7 +2243,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 "没有这个应用。"
 
@@ -2507,7 +2522,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:212
+#: actions/emailsettings.php:393 actions/register.php:204
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "不是有效的电子邮件。"
@@ -2581,18 +2596,21 @@ 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:565 actions/smssettings.php:588
+#: actions/smssettings.php:566 actions/smssettings.php:591
 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:534 actions/smssettings.php:570
 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:558 actions/smssettings.php:595
 msgid "New incoming email address added."
 msgstr "已添加新的发布用的电子邮件地址。"
 
@@ -2603,7 +2621,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.
@@ -2837,12 +2856,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.
@@ -3160,7 +3181,8 @@ msgid "Publish a MicroID for my Jabber/Google Talk address."
 msgstr "公开 Jabber/GTalk 帐号的 MicroID。"
 
 #. TRANS: Confirmation message for successful Instant Messaging preferences save.
-#: actions/imsettings.php:283 actions/othersettings.php:192
+#. TRANS: Confirmation message after saving preferences.
+#: actions/imsettings.php:283 actions/othersettings.php:193
 msgid "Preferences saved."
 msgstr "首选项已保存。"
 
@@ -3556,49 +3578,49 @@ msgstr "保存"
 msgid "Save license settings"
 msgstr "保存许可协议设置"
 
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+#: actions/login.php:97 actions/otp.php:62 actions/register.php:137
 msgid "Already logged in."
 msgstr "已登录。"
 
-#: actions/login.php:148
+#: actions/login.php:142
 msgid "Incorrect username or password."
 msgstr "用户名或密码不正确。"
 
-#: actions/login.php:154 actions/otp.php:120
+#: actions/login.php:148 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr "设置用户时出错。你可能没有被认证。"
 
-#: actions/login.php:210 actions/login.php:263
+#: actions/login.php:202 actions/login.php:253
 msgid "Login"
 msgstr "登录"
 
-#: actions/login.php:249
+#: actions/login.php:239
 msgid "Login to site"
 msgstr "登录"
 
-#: actions/login.php:258 actions/register.php:490
+#: actions/login.php:248 actions/register.php:476
 msgid "Remember me"
 msgstr "记住登录状态"
 
-#: actions/login.php:259 actions/register.php:492
+#: actions/login.php:249 actions/register.php:478
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "下次自动登录，请不要在公共电脑上使用此选项！"
 
-#: actions/login.php:269
+#: actions/login.php:259
 msgid "Lost or forgotten password?"
 msgstr "忘记了密码？"
 
-#: actions/login.php:288
+#: actions/login.php:277
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgstr "由于安全原因，修改设置前需要输入用户名和密码。"
 
-#: actions/login.php:292
+#: actions/login.php:281
 msgid "Login with your username and password."
 msgstr "使用用户名和密码登录。"
 
-#: actions/login.php:295
+#: actions/login.php:284
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
@@ -3804,30 +3826,30 @@ msgid "You have not registered any applications yet."
 msgstr "你还没登记任何程序。"
 
 #. TRANS: Title for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:70
 msgid "Connected applications"
 msgstr "关联的应用"
 
 #. TRANS: Instructions for OAuth connection settings.
-#: actions/oauthconnectionssettings.php:83
+#: actions/oauthconnectionssettings.php:81
 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:166
 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:181
 #, 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:200
 #, php-format
 msgid ""
 "You have successfully revoked access for %1$s and the access token starting "
@@ -3835,14 +3857,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:211
 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:231
 #, php-format
 msgid ""
 "Are you a developer? [Register an OAuth client application](%s) to use with "
@@ -3850,6 +3872,16 @@ msgid ""
 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 "消息没有对应用户。"
@@ -3859,6 +3891,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
@@ -3948,17 +3990,21 @@ msgstr "指定的登录 token 无效。"
 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 "这是你的发件箱，包含你发送的私信。"
 
@@ -3984,40 +4030,42 @@ msgstr "旧密码"
 msgid "New password"
 msgstr "新密码"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
+#: actions/passwordsettings.php:109 actions/register.php:423
+msgid "6 or more characters."
 msgstr "6 个或更多字符"
 
-#: 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:427
+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:230
 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:233
 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 "密码已保存。"
 
@@ -4340,14 +4388,14 @@ 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:109 actions/register.php:419
 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/profilesettings.php:113 actions/register.php:441
 #: actions/showgroup.php:255 actions/tagother.php:104
 #: lib/groupeditform.php:150 lib/userprofile.php:156
 msgid "Full name"
@@ -4355,48 +4403,49 @@ 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:118 actions/register.php:446
 #: 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:121 actions/register.php:448
 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:129 actions/register.php:457
 #, 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:135 actions/register.php:462
 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:139 actions/register.php:464
 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:483
+#: actions/profilesettings.php:145 actions/register.php:469
 #: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: actions/userauthorization.php:174 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/register.php:485
+#: actions/profilesettings.php:148
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "你的地理位置，格式类似\"城市，省份，国家\""
 
@@ -4415,8 +4464,10 @@ 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 "你的标签 (字母、数字、“-”、“. ”和“ _”)， 以逗号或空格分隔"
 
 #. TRANS: Dropdownlist label in form for profile settings.
@@ -4426,7 +4477,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.
@@ -4441,14 +4493,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:229
+#: actions/profilesettings.php:258 actions/register.php:221
 #, php-format
 msgid "Bio is too long (maximum %d character)."
 msgid_plural "Bio is too long (maximum %d characters)."
@@ -4466,9 +4519,9 @@ 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:291
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\"."
 msgstr "无效的标签：\"%s\"。"
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
@@ -4699,6 +4752,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"
@@ -4709,11 +4768,6 @@ 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
@@ -4763,13 +4817,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:248
 msgid "Error setting user."
 msgstr "保存用户设置时出错。"
 
@@ -4778,91 +4827,92 @@ 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/register.php:87 actions/register.php:188 actions/register.php:399
 msgid "Sorry, only invited people can register."
 msgstr "对不起，只有被邀请的用户才能注册。"
 
-#: actions/register.php:99
+#: actions/register.php:94
 msgid "Sorry, invalid invitation code."
 msgstr "对不起，无效的邀请码。"
 
-#: actions/register.php:119
+#: actions/register.php:113
 msgid "Registration successful"
 msgstr "注册成功"
 
-#: actions/register.php:121 actions/register.php:511
+#: actions/register.php:115 actions/register.php:497
 msgid "Register"
 msgstr "注册"
 
-#: actions/register.php:142
+#: actions/register.php:135
 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:201
+#, fuzzy
+msgid "You cannot register if you don't agree to the license."
 msgstr "你必须同意许可协议才能注册。"
 
-#: actions/register.php:218
+#: actions/register.php:210
 msgid "Email address already exists."
 msgstr "电子邮件地址已存在。"
 
-#: actions/register.php:251 actions/register.php:273
+#: actions/register.php:243 actions/register.php:265
 msgid "Invalid username or password."
 msgstr "用户名或密码不正确。"
 
-#: actions/register.php:351
+#: actions/register.php:340
+#, 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:445 actions/register.php:449
+#: actions/register.php:431 actions/register.php:435
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "电子邮件"
 
-#: actions/register.php:446 actions/register.php:450
-msgid "Used only for updates, announcements, and password recovery"
+#: actions/register.php:432 actions/register.php:436
+#, fuzzy
+msgid "Used only for updates, announcements, and password recovery."
 msgstr "只用于更新、通知及密码恢复"
 
-#: actions/register.php:457
-msgid "Longer name, preferably your \"real\" name"
+#: actions/register.php:443
+#, fuzzy
+msgid "Longer name, preferably your \"real\" name."
 msgstr "更长的名字，最好是“真实姓名”"
 
-#: actions/register.php:462
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "你的主页、博客或在其他网站的URL"
+#: actions/register.php:471
+#, fuzzy
+msgid "Where you are, like \"City, State (or Region), Country\"."
+msgstr "你的地理位置，格式类似\"城市，省份，国家\""
 
-#: actions/register.php:523
+#: actions/register.php:510
 #, 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:520
 #, 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:524
 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:527
 msgid "All rights reserved."
 msgstr "保留所有权利。"
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:545
+#: actions/register.php:532
 #, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
@@ -4871,7 +4921,7 @@ msgstr ""
 "我的文字和文件在%s下提供，除了如下隐私内容：密码、电子邮件地址、IM 地址和电话"
 "号码。"
 
-#: actions/register.php:588
+#: actions/register.php:573
 #, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -4901,7 +4951,7 @@ msgstr ""
 "\n"
 "感谢你的注册，希望你喜欢这个服务。"
 
-#: actions/register.php:612
+#: actions/register.php:597
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
@@ -4931,7 +4981,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
@@ -4939,7 +4990,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.
@@ -4949,7 +5001,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
@@ -5138,7 +5191,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"
 
@@ -5180,93 +5233,93 @@ 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
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
 msgid "Icon"
 msgstr "图标"
 
 #. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
+#: actions/showapplication.php:163 actions/version.php:197
 #: lib/applicationeditform.php:190
 msgid "Name"
 msgstr "名称"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:227
+#: actions/showapplication.php:172 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "组织名称必填。"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
+#: actions/showapplication.php:181 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
+#: actions/showapplication.php:186 actions/showgroup.php:460
 #: lib/profileaction.php:205
 msgid "Statistics"
 msgstr "统计"
 
-#: actions/showapplication.php:203
+#: actions/showapplication.php:197
 #, 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:207
 msgid "Application actions"
 msgstr "应用程序动作"
 
-#: actions/showapplication.php:236
+#: actions/showapplication.php:230
 msgid "Reset key & secret"
 msgstr "重置key和secret"
 
 #. TRANS: Title of form for deleting a user.
-#: actions/showapplication.php:252 lib/deletegroupform.php:121
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
 #: lib/deleteuserform.php:64 lib/noticelist.php:673
 msgid "Delete"
 msgstr "删除"
 
-#: actions/showapplication.php:261
+#: actions/showapplication.php:255
 msgid "Application info"
 msgstr "应用程序信息"
 
-#: actions/showapplication.php:263
+#: actions/showapplication.php:257
 msgid "Consumer key"
 msgstr "Consumer key"
 
-#: actions/showapplication.php:268
+#: actions/showapplication.php:262
 msgid "Consumer secret"
 msgstr "Consumer secret"
 
-#: actions/showapplication.php:273
+#: actions/showapplication.php:267
 msgid "Request token URL"
 msgstr "请求令牌URL"
 
-#: actions/showapplication.php:278
+#: actions/showapplication.php:272
 msgid "Access token URL"
 msgstr "访问令牌URL"
 
-#: actions/showapplication.php:283
+#: actions/showapplication.php:277
 msgid "Authorize URL"
 msgstr "授权URL"
 
-#: actions/showapplication.php:288
+#: actions/showapplication.php:282
 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:302
 msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr "你确定要重置你的consumer key和secret吗？"
 
@@ -5355,16 +5408,18 @@ 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:175 lib/userprofile.php:186
+#: actions/userauthorization.php:184 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:187 lib/userprofile.php:204
+#: actions/userauthorization.php:197 lib/userprofile.php:204
 msgid "Note"
 msgstr "注释"
 
@@ -5509,7 +5564,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"
@@ -5750,7 +5805,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.
@@ -5808,7 +5864,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.
@@ -6137,8 +6194,9 @@ 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:132
+#: actions/tagother.php:81 actions/userauthorization.php:138
 #: lib/userprofile.php:108
 msgid "Photo"
 msgstr "相片"
@@ -6154,6 +6212,11 @@ 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."
@@ -6187,7 +6250,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’."
@@ -6217,8 +6280,8 @@ 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."
+#, fuzzy, php-format
+msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "无效的默认关注：“%1$s”不是一个用户。"
 
 #. TRANS: Link description in user account settings menu.
@@ -6278,54 +6341,70 @@ 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 "保存用户设置"
 
-#: 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: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
-#: actions/userauthorization.php:196 actions/version.php:167
+#: actions/userauthorization.php:207 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:229
+#, 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:231
+#, fuzzy
+msgid "Subscribe to this user."
 msgstr "关注这个用户"
 
-#: actions/userauthorization.php:219
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:233
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Reject"
 msgstr "拒绝"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+#, fuzzy
+msgid "Reject this subscription."
 msgstr "拒绝此关注"
 
-#: actions/userauthorization.php:232
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:248
 msgid "No authorization request!"
 msgstr "没有授权请求！"
 
-#: actions/userauthorization.php:254
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
 msgid "Subscription authorized"
 msgstr "已授权关注"
 
-#: actions/userauthorization.php:256
+#: actions/userauthorization.php:274
 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 "
@@ -6334,50 +6413,74 @@ msgstr ""
 "已授权关注，但是没有回传 URL。请到网站查看如何授权关注。你的 subscription "
 "token 是："
 
-#: actions/userauthorization.php:266
+#. TRANS: Reject message header from Authorise subscription page.
+#: actions/userauthorization.php:285
 msgid "Subscription rejected"
 msgstr "关注已拒绝"
 
-#: actions/userauthorization.php:268
+#: actions/userauthorization.php:288
 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
-#, 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:325
+#, fuzzy, php-format
+msgid "Listener URI \"%s\" not found here."
 msgstr "Listener URI ‘%s’ 没有找到。"
 
-#: actions/userauthorization.php:308
-#, 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:332
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is too long."
 msgstr "Listenee URI ‘%s’ 过长。"
 
-#: actions/userauthorization.php:314
-#, 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:340
+#, fuzzy, php-format
+msgid "Listenee URI \"%s\" is a local user."
 msgstr "Listenee URI ‘%s’ 是一个本地用户。"
 
-#: actions/userauthorization.php:329
-#, php-format
-msgid "Profile URL ‘%s’ is for a local user."
+#. TRANS: Exception thrown when profile URL is a local user for an authorisation request.
+#. TRANS: %s is a profile URL.
+#: actions/userauthorization.php:358
+#, fuzzy, php-format
+msgid "Profile URL \"%s\" is for a local user."
 msgstr "个人信息 URL “%s” 是为本地用户的。"
 
-#: actions/userauthorization.php:345
-#, 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:368
+#, 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."
 msgstr "头像地址‘%s’无效。"
 
-#: actions/userauthorization.php:350
-#, 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:385
+#, fuzzy, php-format
+msgid "Cannot read avatar URL \"%s\"."
 msgstr "无法读取头像 URL '%s'。"
 
-#: actions/userauthorization.php:355
-#, 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:392
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "头像 URL ‘%s’ 图像格式错误。"
 
 #. TRANS: Page title for profile design page.
@@ -7550,6 +7653,11 @@ 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"
@@ -7992,6 +8100,11 @@ 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
@@ -8026,6 +8139,21 @@ 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
@@ -8132,9 +8260,8 @@ msgid "Grant this user the \"%s\" role"
 msgstr "给这个用户添加\\\"%s\\\"权限"
 
 #: lib/groupeditform.php:147
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1 到 64 个小写字母或数字，不包含标点或空格。"
+msgstr "1 到 64 个小写字母或数字，不包含标点或空格"
 
 #: lib/groupeditform.php:156
 msgid "URL of the homepage or blog of the group or topic."
@@ -8145,10 +8272,10 @@ msgid "Describe the group or topic"
 msgstr "小组或主题的描述"
 
 #: lib/groupeditform.php:163
-#, fuzzy, php-format
+#, 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[0] "用不超过%d个字符描述下这个小组或者主题"
 
 #: lib/groupeditform.php:175
 msgid ""
@@ -8888,6 +9015,10 @@ msgstr "回复"
 msgid "Reply"
 msgstr "回复"
 
+#: lib/noticelist.php:673
+msgid "Delete this notice"
+msgstr "删除"
+
 #: lib/noticelist.php:691
 msgid "Notice repeated"
 msgstr "消息已转发"
@@ -9168,6 +9299,10 @@ 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"
@@ -9429,3 +9564,15 @@ msgstr "不合法的XML, 缺少XRD根"
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "从文件'%s'获取备份。"
+
+#~ msgid "6 or more characters"
+#~ msgstr "6 个或更多字符"
+
+#~ msgid "Same as password above"
+#~ msgstr "与上面相同的密码"
+
+#~ msgid "Can't save new password."
+#~ msgstr "无法保存新密码。"
+
+#~ msgid "URL of your homepage, blog, or profile on another site"
+#~ msgstr "你的主页、博客或在其他网站的URL"
diff --git a/plugins/BitlyUrl/locale/ca/LC_MESSAGES/BitlyUrl.po b/plugins/BitlyUrl/locale/ca/LC_MESSAGES/BitlyUrl.po
new file mode 100644
index 0000000000..c9281c84df
--- /dev/null
+++ b/plugins/BitlyUrl/locale/ca/LC_MESSAGES/BitlyUrl.po
@@ -0,0 +1,83 @@
+# Translation of StatusNet - BitlyUrl to Catalan (Català)
+# Exported from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+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"
+"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-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
+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
+#, 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
+msgid "bit.ly"
+msgstr "bit.ly"
+
+#: BitlyUrlPlugin.php:217 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, "
+"and allow you to use bit.ly's tracking features and custom domains."
+msgstr ""
+"L'escurçament d'URL amb bit.ly necessita [un compte i clau API de bit.ly]"
+"(http://bit.ly/a/your_api_key). Això verifica que és un compte autoritzat, i "
+"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"
diff --git a/plugins/EmailAuthentication/locale/ca/LC_MESSAGES/EmailAuthentication.po b/plugins/EmailAuthentication/locale/ca/LC_MESSAGES/EmailAuthentication.po
new file mode 100644
index 0000000000..23077e5b75
--- /dev/null
+++ b/plugins/EmailAuthentication/locale/ca/LC_MESSAGES/EmailAuthentication.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - EmailAuthentication to Catalan (Català)
+# Exported from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+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"
+"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-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."
+msgstr ""
+"El connector d'autenticació per correu electrònic permet als usuaris a "
+"iniciar una sessió fent servir l'adreça electrònica."
diff --git a/plugins/EmailSummary/locale/ca/LC_MESSAGES/EmailSummary.po b/plugins/EmailSummary/locale/ca/LC_MESSAGES/EmailSummary.po
new file mode 100644
index 0000000000..92a309b7f1
--- /dev/null
+++ b/plugins/EmailSummary/locale/ca/LC_MESSAGES/EmailSummary.po
@@ -0,0 +1,26 @@
+# Translation of StatusNet - EmailSummary to Catalan (Català)
+# Exported from translatewiki.net
+#
+# Author: Toniher
+# --
+# 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-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:28: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-POT-Import-Date: 2011-02-14 17:19:17+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82325); 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-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/Gravatar/locale/ca/LC_MESSAGES/Gravatar.po b/plugins/Gravatar/locale/ca/LC_MESSAGES/Gravatar.po
new file mode 100644
index 0000000000..f9a9250686
--- /dev/null
+++ b/plugins/Gravatar/locale/ca/LC_MESSAGES/Gravatar.po
@@ -0,0 +1,75 @@
+# Translation of StatusNet - Gravatar to Catalan (Català)
+# Exported from translatewiki.net
+#
+# Author: Toniher
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+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"
+"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-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."
+msgstr ""
+"El connector del Gravatar permet als usuaris fer servir llur <a href="
+"\"http://www.gravatar.com/\">Gravatar</a> amb l'StatusNet."
diff --git a/plugins/OpenX/locale/de/LC_MESSAGES/OpenX.po b/plugins/OpenX/locale/de/LC_MESSAGES/OpenX.po
index ad61f93e9e..b74df493f5 100644
--- a/plugins/OpenX/locale/de/LC_MESSAGES/OpenX.po
+++ b/plugins/OpenX/locale/de/LC_MESSAGES/OpenX.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - OpenX to German (Deutsch)
 # Exported from translatewiki.net
 #
+# Author: Fujnky
 # Author: The Evil IP address
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,13 +10,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:47+0000\n"
+"POT-Creation-Date: 2011-02-17 10:25+0000\n"
+"PO-Revision-Date: 2011-02-17 10:28: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-15 11:02:35+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r81195); Translate extension (2010-09-17)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-openx\n"
@@ -80,17 +81,17 @@ msgstr ""
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
 #: openxadminpanel.php:191
 msgid "Leaderboard"
-msgstr ""
+msgstr "Rangliste"
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
 #: openxadminpanel.php:193
 msgid "Leaderboard zone"
-msgstr ""
+msgstr "Ranglisten-Zone"
 
 #. TRANS: Form label in OpenX admin panel. Refers to advertisement format.
 #: openxadminpanel.php:199
 msgid "Skyscraper"
-msgstr ""
+msgstr "Skyscraper"
 
 #. TRANS: Tooltip for form label in OpenX admin panel. Refers to advertisement format.
 #: openxadminpanel.php:201

From ccdd47bdb47e5208f5775ec3efed09ef2b008977 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 17 Feb 2011 10:51:00 -0500
Subject: [PATCH 270/314] use fallback URIs for groups when filling in
 attention in Notice::asActivity()

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

diff --git a/classes/Notice.php b/classes/Notice.php
index 4522d1fc38..c9cca8a969 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1333,7 +1333,7 @@ class Notice extends Memcached_DataObject
             $groups = $this->getGroups();
 
             foreach ($groups as $group) {
-                $ctx->attention[] = $group->uri;
+                $ctx->attention[] = $group->getUri();
             }
 
             // XXX: deprecated; use ActivityVerb::SHARE instead

From 65045a26f3be7a958286d7f9e04f0a73e605e6d4 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Thu, 17 Feb 2011 20:58:22 +0100
Subject: [PATCH 271/314] * update translator documentation. * remove
 superfluous whitespace. * L10n updates. * small refactoring in publicrss.php.
 * remove PHP4-isms

---
 actions/logout.php          |  2 +-
 actions/noticesearch.php    | 12 ++++++++++--
 actions/noticesearchrss.php |  9 +++++----
 actions/opensearch.php      |  6 +++---
 actions/peoplesearch.php    |  5 ++++-
 actions/publicrss.php       | 16 ++++++++--------
 actions/repliesrss.php      | 10 ++++++----
 actions/requesttoken.php    |  2 --
 actions/unblock.php         |  4 ++--
 actions/userbyid.php        |  3 ++-
 actions/xrds.php            | 10 ++++------
 11 files changed, 45 insertions(+), 34 deletions(-)

diff --git a/actions/logout.php b/actions/logout.php
index 1e0adae575..f747371225 100644
--- a/actions/logout.php
+++ b/actions/logout.php
@@ -66,6 +66,7 @@ class LogoutAction extends Action
     {
         parent::handle($args);
         if (!common_logged_in()) {
+            // TRANS: Client error displayed trying to log out when not logged in.
             $this->clientError(_('Not logged in.'));
         } else {
             if (Event::handle('StartLogout', array($this))) {
@@ -83,5 +84,4 @@ class LogoutAction extends Action
         common_real_login(false); // not logged in
         common_forgetme(); // don't log back in!
     }
-
 }
diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index d0673420d6..de1e7001f4 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -48,7 +48,6 @@ require_once INSTALLDIR.'/lib/searchaction.php';
  */
 class NoticesearchAction extends SearchAction
 {
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -65,6 +64,8 @@ class NoticesearchAction extends SearchAction
      */
     function getInstructions()
     {
+        // TRANS: Instructions for Notice search page.
+        // TRANS: %%site.name%% is the name of the StatusNet site.
         return _('Search for notices on %%site.name%% by their contents. Separate search terms by spaces; they must be 3 characters or more.');
     }
 
@@ -75,6 +76,7 @@ class NoticesearchAction extends SearchAction
      */
     function title()
     {
+        // TRANS: Title of the page where users can search for notices.
         return _('Text search');
     }
 
@@ -88,6 +90,8 @@ class NoticesearchAction extends SearchAction
 
         return array(new Feed(Feed::RSS1, common_local_url('noticesearchrss',
                                                            array('q' => $q)),
+                              // TRANS: Test in RSS notice search.
+                              // TRANS: %1$s is the query, %2$s is the StatusNet site name.
                               sprintf(_('Search results for "%1$s" on %2$s'),
                                       $q, common_config('site', 'name'))));
     }
@@ -114,13 +118,18 @@ class NoticesearchAction extends SearchAction
             $cnt = $notice->find();
         }
         if ($cnt === 0) {
+            // TRANS: Text for notice search results is the query had no results.
             $this->element('p', 'error', _('No results.'));
 
             $this->searchSuggestions($q);
             if (common_logged_in()) {
+                // TRANS: Text for logged in users making a query for notices without results.
+                // TRANS: This message contains a Markdown link.
                 $message = sprintf(_('Be the first to [post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!'), urlencode($q));
             }
             else {
+                // TRANS: Text for not logged in users making a query for notices without results.
+                // TRANS: This message contains Markdown links.
                 $message = sprintf(_('Why not [register an account](%%%%action.register%%%%) and be the first to [post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!'), urlencode($q));
             }
 
@@ -203,4 +212,3 @@ class SearchNoticeListItem extends NoticeListItem {
         return $result;
     }
 }
-
diff --git a/actions/noticesearchrss.php b/actions/noticesearchrss.php
index a59e7b99be..14c280f62c 100644
--- a/actions/noticesearchrss.php
+++ b/actions/noticesearchrss.php
@@ -48,12 +48,11 @@ require_once INSTALLDIR.'/lib/rssaction.php';
  */
 class NoticesearchrssAction extends Rss10Action
 {
-
     function init()
     {
         return true;
     }
-    
+
     function prepare($args)
     {
         parent::prepare($args);
@@ -63,7 +62,6 @@ class NoticesearchrssAction extends Rss10Action
 
     function getNotices($limit=0)
     {
-
         $q = $this->trimmed('q');
         $notices = array();
 
@@ -93,9 +91,12 @@ class NoticesearchrssAction extends Rss10Action
     {
         $q = $this->trimmed('q');
         $c = array('url' => common_local_url('noticesearchrss', array('q' => $q)),
+                   // TRANS: RSS notice search feed title. %s is the query.
                    'title' => sprintf(_('Updates with "%s"'), $q),
                    'link' => common_local_url('noticesearch', array('q' => $q)),
-                   'description' => sprintf(_('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.
+                   'description' => sprintf(_('Updates matching search term "%1$s" on %2$s.'),
                                             $q, common_config('site', 'name')));
         return $c;
     }
diff --git a/actions/opensearch.php b/actions/opensearch.php
index 861b53d7d8..7bf32277bb 100644
--- a/actions/opensearch.php
+++ b/actions/opensearch.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Opensearch action class.
  *
@@ -51,7 +50,7 @@ class OpensearchAction extends Action
      * Class handler.
      *
      * @param array $args query arguments
-     * 
+     *
      * @return boolean false if user doesn't exist
      */
     function handle($args)
@@ -61,8 +60,10 @@ class OpensearchAction extends Action
         $short_name = '';
         if ($type == 'people') {
             $type       = 'peoplesearch';
+            // 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';
             $short_name = _('Notice Search');
         }
@@ -89,4 +90,3 @@ class OpensearchAction extends Action
         return true;
     }
 }
-
diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php
index 69de44859f..6bc35828ec 100644
--- a/actions/peoplesearch.php
+++ b/actions/peoplesearch.php
@@ -49,12 +49,15 @@ class PeoplesearchAction extends SearchAction
 {
     function getInstructions()
     {
+        // TRANS: Instructions for the "People search" page.
+        // 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.');
     }
 
     function title()
     {
+        // TRANS: Title of a page where users can search for other users.
         return _('People search');
     }
 
@@ -80,6 +83,7 @@ class PeoplesearchAction extends SearchAction
                           $page, 'peoplesearch', array('q' => $q));
 
         } else {
+            // TRANS: Message on the "People search" page where a query has no results.
             $this->element('p', 'error', _('No results.'));
             $this->searchSuggestions($q);
             $profile->free();
@@ -136,4 +140,3 @@ class PeopleSearchResultItem extends ProfileListItem
         return preg_replace($this->pattern, '<strong>\\1</strong>', htmlspecialchars($text));
     }
 }
-
diff --git a/actions/publicrss.php b/actions/publicrss.php
index 0c5d061cb6..11db3b37a4 100644
--- a/actions/publicrss.php
+++ b/actions/publicrss.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Public RSS action class.
  *
@@ -55,7 +54,6 @@ class PublicrssAction extends Rss10Action
      * @param array $args Arguments from $_REQUEST
      * @return boolean success
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -98,11 +96,14 @@ class PublicrssAction extends Rss10Action
      */
     function getChannel()
     {
+        $sitename = common_config('site', 'name');
         $c = array(
-              'url' => common_local_url('publicrss')
-            , 'title' => sprintf(_('%s public timeline'), common_config('site', 'name'))
-            , 'link' => common_local_url('public')
-            , 'description' => sprintf(_('%s updates from everyone!'), common_config('site', 'name')));
+              'url' => common_local_url('publicrss'),
+            // TRANS: Public RSS feed title. %s is the StatusNet site name.
+              'title' => sprintf(_('%s public timeline'), $sitename),
+              'link' => common_local_url('public'),
+            // TRANS: Public RSS feed description. %s is the StatusNet site name.
+              'description' => sprintf(_('%s updates from everyone.'), $sitename));
         return $c;
     }
 
@@ -110,7 +111,7 @@ class PublicrssAction extends Rss10Action
      * Get image.
      *
      * @return nothing
-    */
+     */
     function getImage()
     {
         // nop
@@ -121,4 +122,3 @@ class PublicrssAction extends Rss10Action
         return true;
     }
 }
-
diff --git a/actions/repliesrss.php b/actions/repliesrss.php
index 76aae21adb..86cd173d3c 100644
--- a/actions/repliesrss.php
+++ b/actions/repliesrss.php
@@ -25,7 +25,6 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
 
 class RepliesrssAction extends Rss10Action
 {
-
     var $user = null;
 
     function prepare($args)
@@ -35,6 +34,7 @@ class RepliesrssAction extends Rss10Action
         $this->user = User::staticGet('nickname', $nickname);
 
         if (!$this->user) {
+            // TRANS: Client error displayed when providing a non-existing nickname in a RSS 1.0 action.
             $this->clientError(_('No such user.'));
             return false;
         } else {
@@ -45,13 +45,12 @@ class RepliesrssAction extends Rss10Action
 
     function getNotices($limit=0)
     {
-
         $user = $this->user;
 
         $notice = $user->getReplies(0, ($limit == 0) ? 48 : $limit);
 
         $notices = array();
-        
+
         while ($notice->fetch()) {
             $notices[] = clone($notice);
         }
@@ -65,11 +64,14 @@ class RepliesrssAction extends Rss10Action
         $c = array('url' => common_local_url('repliesrss',
                                              array('nickname' =>
                                                    $user->nickname)),
+                   // TRANS: RSS reply feed title. %s is a user nickname.
                    'title' => sprintf(_("Replies to %s"), $user->nickname),
                    'link' => common_local_url('replies',
                                               array('nickname' =>
                                                     $user->nickname)),
-                   'description' => sprintf(_('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.
+                   'description' => sprintf(_('Replies to %1$s on %2$s.'),
                                               $user->nickname, common_config('site', 'name')));
         return $c;
     }
diff --git a/actions/requesttoken.php b/actions/requesttoken.php
index e095161a7d..3c8cea03c0 100644
--- a/actions/requesttoken.php
+++ b/actions/requesttoken.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Request token action class.
  *
@@ -77,4 +76,3 @@ class RequesttokenAction extends Action
         }
     }
 }
-?>
diff --git a/actions/unblock.php b/actions/unblock.php
index 0f63e1dae0..1f4d9606b8 100644
--- a/actions/unblock.php
+++ b/actions/unblock.php
@@ -42,7 +42,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
-
 class UnblockAction extends ProfileFormAction
 {
     function prepare($args)
@@ -56,6 +55,7 @@ class UnblockAction extends ProfileFormAction
         assert(!empty($cur)); // checked by parent
 
         if (!$cur->hasBlocked($this->profile)) {
+            // TRANS: Client error displayed when trying to unblock a non-blocked user.
             $this->clientError(_("You haven't blocked that user."));
             return false;
         }
@@ -68,7 +68,6 @@ class UnblockAction extends ProfileFormAction
      *
      * @return void
      */
-
     function handlePost()
     {
         $cur = common_current_user();
@@ -83,6 +82,7 @@ class UnblockAction extends ProfileFormAction
         }
 
         if (!$result) {
+            // TRANS: Server error displayed when removing a user block.
             $this->serverError(_('Error removing the block.'));
             return;
         }
diff --git a/actions/userbyid.php b/actions/userbyid.php
index f3e1556f3f..b8ccd0108e 100644
--- a/actions/userbyid.php
+++ b/actions/userbyid.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * User by ID action class.
  *
@@ -67,10 +66,12 @@ class UserbyidAction extends Action
         parent::handle($args);
         $id = $this->trimmed('id');
         if (!$id) {
+            // TRANS: Client error displayed trying to find a user by ID without providing an ID.
             $this->clientError(_('No ID.'));
         }
         $user = User::staticGet($id);
         if (!$user) {
+            // TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
             $this->clientError(_('No such user.'));
         }
 
diff --git a/actions/xrds.php b/actions/xrds.php
index 534182e3ed..818cd1032c 100644
--- a/actions/xrds.php
+++ b/actions/xrds.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * XRDS for OpenMicroBlogging
  *
@@ -61,13 +60,14 @@ class XrdsAction extends Action
     {
         return true;
     }
-    
+
     function prepare($args)
     {
         parent::prepare($args);
         $nickname = $this->trimmed('nickname');
         $this->user     = User::staticGet('nickname', $nickname);
         if (!$this->user) {
+            // TRANS: Client error displayed providing a non-existing nickname.
             $this->clientError(_('No such user.'));
             return;
         }
@@ -110,7 +110,7 @@ class XrdsAction extends Action
                             null,
                             array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY, OAUTH_HMAC_SHA1));
         $xrdsOutputter->elementEnd('XRD');
-        
+
         //omb
         $xrdsOutputter->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
                                           'xml:id' => 'omb',
@@ -122,7 +122,7 @@ class XrdsAction extends Action
         $xrdsOutputter->showXrdsService(OMB_ENDPOINT_UPDATEPROFILE,
                             common_local_url('updateprofile'));
         $xrdsOutputter->elementEnd('XRD');
-        
+
         Event::handle('EndUserXRDS', array($this,&$xrdsOutputter));
 
         //misc
@@ -135,7 +135,5 @@ class XrdsAction extends Action
         $xrdsOutputter->elementEnd('XRD');
 
         $xrdsOutputter->endXRDS();
-        
     }
 }
-?>

From 6a1b0e2375a1a267507e655c4b56c9a512e80481 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Thu, 17 Feb 2011 21:10:48 +0100
Subject: [PATCH 272/314] * update translator documentation. * remove
 superfluous whitespace. * tab to spaces. * add FIXME for undocumented class.

---
 actions/otp.php       | 11 +++++++++--
 actions/robotstxt.php |  5 -----
 actions/subscribe.php | 10 +++++++---
 actions/sup.php       |  1 +
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/actions/otp.php b/actions/otp.php
index 1e06603d43..c26965bd6a 100644
--- a/actions/otp.php
+++ b/actions/otp.php
@@ -45,7 +45,6 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
  * @link      http://status.net/
  */
-
 class OtpAction extends Action
 {
     var $user;
@@ -59,6 +58,7 @@ class OtpAction extends Action
         parent::prepare($args);
 
         if (common_is_real_login()) {
+            // TRANS: Client error displayed trying to use "one time password login" when already logged in.
             $this->clientError(_('Already logged in.'));
             return false;
         }
@@ -66,6 +66,7 @@ class OtpAction extends Action
         $id = $this->trimmed('user_id');
 
         if (empty($id)) {
+            // TRANS: Client error displayed trying to use "one time password login" without specifying a user.
             $this->clientError(_('No user ID specified.'));
             return false;
         }
@@ -73,6 +74,7 @@ class OtpAction extends Action
         $this->user = User::staticGet('id', $id);
 
         if (empty($this->user)) {
+            // TRANS: Client error displayed trying to use "one time password login" without using an existing user.
             $this->clientError(_('No such user.'));
             return false;
         }
@@ -80,6 +82,7 @@ class OtpAction extends Action
         $this->token = $this->trimmed('token');
 
         if (empty($this->token)) {
+            // TRANS: Client error displayed trying to use "one time password login" without specifying a login token.
             $this->clientError(_('No login token specified.'));
             return false;
         }
@@ -87,11 +90,13 @@ class OtpAction extends Action
         $this->lt = Login_token::staticGet('user_id', $id);
 
         if (empty($this->lt)) {
+            // TRANS: Client error displayed trying to use "one time password login" without requesting a login token.
             $this->clientError(_('No login token requested.'));
             return false;
         }
 
         if ($this->lt->token != $this->token) {
+            // TRANS: Client error displayed trying to use "one time password login" while specifying an invalid login token.
             $this->clientError(_('Invalid login token specified.'));
             return false;
         }
@@ -101,6 +106,7 @@ class OtpAction extends Action
             //delete the token as it is useless
             $this->lt->delete();
             $this->lt = null;
+            // TRANS: Client error displayed trying to use "one time password login" while specifying an expired login token.
             $this->clientError(_('Login token expired.'));
             return false;
         }
@@ -111,12 +117,13 @@ class OtpAction extends Action
         return true;
     }
 
-	function handle($args)
+    function handle($args)
     {
         parent::handle($args);
 
         // success!
         if (!common_set_user($this->user)) {
+            // TRANS: Server error displayed when a user object could not be created trying to login using "one time password login".
             $this->serverError(_('Error setting user. You are probably not authorized.'));
             return;
         }
diff --git a/actions/robotstxt.php b/actions/robotstxt.php
index 5131097c8c..d686042cb1 100644
--- a/actions/robotstxt.php
+++ b/actions/robotstxt.php
@@ -40,7 +40,6 @@ if (!defined('STATUSNET')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
-
 class RobotstxtAction extends Action
 {
     /**
@@ -53,7 +52,6 @@ class RobotstxtAction extends Action
      *
      * @return void
      */
-
     function handle($args)
     {
         if (Event::handle('StartRobotsTxt', array($this))) {
@@ -65,9 +63,7 @@ class RobotstxtAction extends Action
             if (common_config('site', 'private')) {
 
                 print "Disallow: /\n";
-
             } else {
-
                 $disallow = common_config('robotstxt', 'disallow');
 
                 foreach ($disallow as $dir) {
@@ -92,7 +88,6 @@ class RobotstxtAction extends Action
      *
      * @return boolean is read only action?
      */
-
     function isReadOnly($args)
     {
         return true;
diff --git a/actions/subscribe.php b/actions/subscribe.php
index b1243f3933..3837915d53 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -53,7 +53,6 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
  * @link      http://status.net/
  */
-
 class SubscribeAction extends Action
 {
     var $user;
@@ -66,7 +65,6 @@ class SubscribeAction extends Action
      *
      * @return boolean success flag
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -74,6 +72,8 @@ class SubscribeAction extends Action
         // 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;
         }
@@ -83,6 +83,7 @@ class SubscribeAction extends Action
         $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;
@@ -93,6 +94,7 @@ class SubscribeAction extends Action
         $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;
         }
@@ -104,6 +106,7 @@ class SubscribeAction extends Action
         $this->other = Profile::staticGet('id', $other_id);
 
         if (empty($this->other)) {
+            // TRANS: Client error displayed trying to subscribe to a non-existing profile.
             $this->clientError(_('No such profile.'));
             return false;
         }
@@ -114,6 +117,7 @@ class SubscribeAction extends Action
         $omb01 = Remote_profile::staticGet('id', $other_id);
 
         if (!empty($omb01)) {
+            // TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
             $this->clientError(_('You cannot subscribe to an OMB 0.1'.
                                  ' remote profile with this action.'));
             return false;
@@ -131,7 +135,6 @@ class SubscribeAction extends Action
      *
      * @return void
      */
-
     function handle($args)
     {
         // Throws exception on error
@@ -142,6 +145,7 @@ class SubscribeAction extends Action
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
+            // TRANS: Page title when subscription succeeded.
             $this->element('title', null, _('Subscribed'));
             $this->elementEnd('head');
             $this->elementStart('body');
diff --git a/actions/sup.php b/actions/sup.php
index 4e428dfa58..c4da9d3db6 100644
--- a/actions/sup.php
+++ b/actions/sup.php
@@ -19,6 +19,7 @@
 
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
+// @todo FIXME: documentation needed.
 class SupAction extends Action
 {
     function handle($args)

From 98b1fe07c65339ce8fe92659b8a4aee92a0e1e22 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 17 Feb 2011 16:46:08 -0800
Subject: [PATCH 273/314] Blow user:site_owner cache when granting/revoking
 'owner' role

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

diff --git a/classes/Profile.php b/classes/Profile.php
index bdac3ba453..fd41c6139a 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -752,6 +752,10 @@ class Profile extends Memcached_DataObject
                 throw new Exception("Can't save role '$name' for profile '{$this->id}'");
             }
 
+            if ($name == 'owner') {
+                User::blow('user:site_owner');
+            }
+
             Event::handle('EndGrantRole', array($this, $name));
         }
 
@@ -780,6 +784,10 @@ class Profile extends Memcached_DataObject
                 throw new Exception(sprintf(_('Cannot revoke role "%1$s" for user #%2$d; database error.'),$name, $this->id));
             }
 
+            if ($name == 'owner') {
+                User::blow('user:site_owner');
+            }
+
             Event::handle('EndRevokeRole', array($this, $name));
 
             return true;

From 29ce5dd19a5f3d395aeddddaab0350f8818199b5 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 17 Feb 2011 19:02:57 -0800
Subject: [PATCH 274/314] Reinstate profile_info in author/actor

---
 classes/Notice.php                 | 12 +++++++-----
 classes/Profile.php                |  4 ++--
 lib/activity.php                   |  5 +++--
 lib/activitystreamjsondocument.php |  3 +--
 lib/atomusernoticefeed.php         |  2 +-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/classes/Notice.php b/classes/Notice.php
index 007eb55f85..95b3d5b480 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1250,7 +1250,7 @@ class Notice extends Memcached_DataObject
      * @return Activity activity object representing this Notice.
      */
 
-    function asActivity()
+    function asActivity($cur)
     {
         $act = self::cacheGet(Cache::codeKey('notice:as-activity:'.$this->id));
 
@@ -1262,9 +1262,11 @@ class Notice extends Memcached_DataObject
         if (Event::handle('StartNoticeAsActivity', array($this, &$act))) {
 
             $profile = $this->getProfile();
-            $act->actor     = ActivityObject::fromProfile($profile);
-            $act->verb      = ActivityVerb::POST;
-            $act->objects[] = ActivityObject::fromNotice($this);
+
+            $act->actor            = ActivityObject::fromProfile($profile);
+            $act->actor->extra[]   = $profile->profileInfo($cur);
+            $act->verb             = ActivityVerb::POST;
+            $act->objects[]        = ActivityObject::fromNotice($this);
 
             // XXX: should this be handled by default processing for object entry?
 
@@ -1402,7 +1404,7 @@ class Notice extends Memcached_DataObject
                          $author=true,
                          $cur=null)
     {
-        $act = $this->asActivity();
+        $act = $this->asActivity($cur);
         $act->extra[] = $this->noticeInfo($cur);
         return $act->asString($namespace, $author, $source);
     }
diff --git a/classes/Profile.php b/classes/Profile.php
index bdac3ba453..ad01581d5f 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -932,12 +932,12 @@ class Profile extends Memcached_DataObject
      *
      * @param User $cur Current user
      *
-     * @return array representation of <statusnet:profile_info> element
+     * @return array representation of <statusnet:profile_info> element or null
      */
 
     function profileInfo($cur)
     {
-        $profileInfoAttr = array();
+        $profileInfoAttr = array('local_id' => $this->id);
 
         if ($cur != null) {
             // Whether the current user is a subscribed to this profile
diff --git a/lib/activity.php b/lib/activity.php
index b9bd8c31fe..a8e6d25af9 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -443,9 +443,10 @@ class Activity
 
         foreach ($this->extra as $e) {
             list($objectName, $props, $txt) = $e;
-            $activity[$objectName] = $props;
+            if (!empty($objectName)) {
+                $activity[$objectName] = $props;
+            }
         }
-
         return array_filter($activity);
     }
 
diff --git a/lib/activitystreamjsondocument.php b/lib/activitystreamjsondocument.php
index 7e06652a45..f74bb6d2e6 100644
--- a/lib/activitystreamjsondocument.php
+++ b/lib/activitystreamjsondocument.php
@@ -92,7 +92,6 @@ class ActivityStreamJSONDocument
 
     function addItemsFromNotices($notices)
     {
-        common_debug("addItemsFromNotices");
         if (is_array($notices)) {
             foreach ($notices as $notice) {
                 $this->addItemFromNotice($notice);
@@ -114,7 +113,7 @@ class ActivityStreamJSONDocument
     {
         $cur = empty($this->cur) ? common_current_user() : $this->cur;
 
-        $act          = $notice->asActivity();
+        $act          = $notice->asActivity($cur);
         $act->extra[] = $notice->noticeInfo($cur);
 
         array_push($this->doc['items'], $act->asArray());
diff --git a/lib/atomusernoticefeed.php b/lib/atomusernoticefeed.php
index 3398cc8b4d..fb0ac5f831 100644
--- a/lib/atomusernoticefeed.php
+++ b/lib/atomusernoticefeed.php
@@ -64,7 +64,7 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
 
             $ao = ActivityObject::fromProfile($profile);
 
-            $ao->extra[] = $profile->profileInfo($cur);
+            array_push($ao->extra, $profile->profileInfo($cur));
 
             // XXX: For users, we generate an author _AND_ an <activity:subject>
             // This is for backward compatibility with clients (especially

From e84b01c76f5c5c35912bf0a4d6146e4af6511524 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 17 Feb 2011 19:34:39 -0800
Subject: [PATCH 275/314] avatars -> avatarLinks

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

diff --git a/lib/activityobject.php b/lib/activityobject.php
index 0df9999454..0f151ec298 100644
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -687,7 +687,7 @@ class ActivityObject
                 $avatarMediaLinks[] = $avatar->asArray();
             }
 
-            $object['avatars'] = $avatarMediaLinks; // extension
+            $object['avatarLinks'] = $avatarMediaLinks; // extension
 
             // image
             $object['image']  = $imgLink->asArray();

From 97af5e195421591265094685d9fa86af8d464794 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 17 Feb 2011 20:12:28 -0800
Subject: [PATCH 276/314] Add geopoint (GeoJSON) extension to AS JSON output

---
 lib/activity.php       | 18 ++++++++++++++++++
 lib/activityobject.php | 12 ++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/lib/activity.php b/lib/activity.php
index a8e6d25af9..e2699ebadc 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -447,6 +447,24 @@ class Activity
                 $activity[$objectName] = $props;
             }
         }
+
+        /* more extensions */
+
+        if (!empty($this->context)) {
+
+            if (!empty($this->context->location)) {
+                $loc = $this->context->location;
+
+                // GeoJSON
+
+                $activity['geopoint'] = array(
+                    'type'        => 'Point',
+                    'coordinates' => array($loc->lat, $loc->lon)
+                );
+            }
+
+        }
+
         return array_filter($activity);
     }
 
diff --git a/lib/activityobject.php b/lib/activityobject.php
index 0f151ec298..ae2f4649e5 100644
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -714,6 +714,18 @@ class ActivityObject
             $object[$objectName] = $props;
         }
 
+        // GeoJSON
+
+        if (!empty($this->geopoint)) {
+
+            list($lat, $long) = explode(' ', $this->geopoint);
+
+            $object['geopoint'] = array(
+                'type'        => 'Point',
+                'coordinates' => array($lat, $long)
+            );
+        }
+
         return array_filter($object);
     }
 }

From 11f77b2fcaf2b029fb0a298253bb99b0d96cd7b8 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 17 Feb 2011 22:36:14 -0800
Subject: [PATCH 277/314] Add PoCo to Activity Streams JSON

---
 lib/activityobject.php             |  4 ++++
 lib/activitystreamjsondocument.php |  1 -
 lib/poco.php                       | 38 ++++++++++++++++++++++++++++++
 lib/pocoaddress.php                | 13 ++++++++++
 lib/pocourl.php                    | 20 ++++++++++++++++
 5 files changed, 75 insertions(+), 1 deletion(-)

diff --git a/lib/activityobject.php b/lib/activityobject.php
index ae2f4649e5..a69e1a1b42 100644
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -726,6 +726,10 @@ class ActivityObject
             );
         }
 
+        if (!empty($this->poco)) {
+            $object['contact'] = $this->poco->asArray();
+        }
+
         return array_filter($object);
     }
 }
diff --git a/lib/activitystreamjsondocument.php b/lib/activitystreamjsondocument.php
index f74bb6d2e6..2b99d19eb7 100644
--- a/lib/activitystreamjsondocument.php
+++ b/lib/activitystreamjsondocument.php
@@ -115,7 +115,6 @@ class ActivityStreamJSONDocument
 
         $act          = $notice->asActivity($cur);
         $act->extra[] = $notice->noticeInfo($cur);
-
         array_push($this->doc['items'], $act->asArray());
     }
 
diff --git a/lib/poco.php b/lib/poco.php
index d7b082163e..baea5b33b0 100644
--- a/lib/poco.php
+++ b/lib/poco.php
@@ -241,4 +241,42 @@ class PoCo
             $url->outputTo($xo);
         }
     }
+
+    /**
+     * Output a Portable Contact as an array suitable for serializing
+     * as JSON
+     *
+     * @return $array the PoCo array
+     */
+
+    function asArray()
+    {
+        $poco = array();
+
+        $poco['preferredUsername'] = $this->preferredUsername;
+        $poco['displayName']       = $this->displayName;
+
+        if (!empty($this->note)) {
+            $poco['note'] = $this->note;
+        }
+
+        if (!empty($this->address)) {
+            $poco['addresses'] = $this->address->asArray();
+        }
+
+        if (!empty($this->urls)) {
+
+            $urls = array();
+
+            foreach ($this->urls as $url) {
+                $urls[] = $url->asArray();
+            }
+
+            $poco['urls'] = $urls;
+        }
+
+        return $poco;
+    }
+
 }
+
diff --git a/lib/pocoaddress.php b/lib/pocoaddress.php
index d9f6ff2bde..22d4d02b13 100644
--- a/lib/pocoaddress.php
+++ b/lib/pocoaddress.php
@@ -56,4 +56,17 @@ class PoCoAddress
             $xo->elementEnd('poco:address');
         }
     }
+
+    /**
+     * Return this PoCo address as an array suitable for serializing in JSON
+     *
+     * @return array the address
+     */
+
+    function asArray()
+    {
+        if (!empty($this->formatted)) {
+            return array('formatted' => $this->formatted);
+        }
+    }
 }
diff --git a/lib/pocourl.php b/lib/pocourl.php
index 786793b280..e375f125a0 100644
--- a/lib/pocourl.php
+++ b/lib/pocourl.php
@@ -67,4 +67,24 @@ class PoCoURL
         }
         $xo->elementEnd('poco:urls');
     }
+
+    /**
+     * Return this PoCo URL as an array suitable for serializing in JSON
+     *
+     * @array $url the url
+     */
+
+    function asArray()
+    {
+        $url = array();
+
+        $url['type']  = $this->type;
+        $url['value'] = $this->value;
+
+        if (!empty($this->primary)) {
+            $url['primary'] = 'true';
+        }
+
+        return $url;
+    }
 }

From 60f62199a1f65ba0192430034980d5ca49a7da1f Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 18 Feb 2011 00:51:08 -0800
Subject: [PATCH 278/314] Add context to Activity Streams JSON

---
 lib/activity.php        |  6 ++++++
 lib/activitycontext.php | 46 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/lib/activity.php b/lib/activity.php
index e2699ebadc..218c965c4d 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -450,6 +450,9 @@ class Activity
 
         /* more extensions */
 
+        // Context stuff. For now I'm just sticking most of it
+        // in a property called "context"
+
         if (!empty($this->context)) {
 
             if (!empty($this->context->location)) {
@@ -461,8 +464,11 @@ class Activity
                     'type'        => 'Point',
                     'coordinates' => array($loc->lat, $loc->lon)
                 );
+
             }
 
+            $activity['to']      = $this->context->getToArray();
+            $activity['context'] = $this->context->asArray();
         }
 
         return array_filter($activity);
diff --git a/lib/activitycontext.php b/lib/activitycontext.php
index fd0dfe06c1..3dc53d869d 100644
--- a/lib/activitycontext.php
+++ b/lib/activitycontext.php
@@ -130,4 +130,50 @@ class ActivityContext
         common_log(LOG_ERR, "Ignoring bogus georss:point value $point");
         return null;
     }
+
+    /**
+     * Returns context (StatusNet stuff) as an array suitable for serializing
+     * in JSON. Right now context stuff is an extension to Activity.
+     *
+     * @return array the context
+     */
+    function asArray()
+    {
+        $context = array();
+
+        $context['replyToId']    = $this->replyToID;
+        $context['replyToUrl']   = $this->replyToUrl;
+        $context['conversation'] = $this->conversation;
+        $context['forwardId']    = $this->forwardID;
+        $context['forwardUrl']   = $this->forwardUrl;
+
+        // XXX: We might want to have the attention to stuff
+        //      in here like we do with Atom
+
+        return array_filter($context);
+    }
+
+    /**
+     * Returns an array of arrays representing Activity Objects (intended to be
+     * serialized in JSON) that represent WHO the Activity is supposed to
+     * be received by. This is not really specified but appears in an example
+     * of the current spec as an extension. We might want to figure out a JSON
+     * serialization for OStatus and use that to express mentions instead.
+     *
+     * XXX: People's ideas on how to do this are all over the place
+     *
+     * @return array the array of recipients
+     */
+    function getToArray()
+    {
+        $tos = array();
+
+        foreach ($this->attention as $attnUrl) {
+            $to = array('id' => $attnUrl, 'url' => $attnUrl);
+            $tos[] = $to;
+        }
+
+        return $tos;
+    }
+
 }

From 20e414665d418edd5d62f5863a36e38a6c2f2284 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 18 Feb 2011 09:29:49 -0800
Subject: [PATCH 279/314] Add tags to Activity Streams JSON

---
 lib/activity.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/activity.php b/lib/activity.php
index 218c965c4d..25d70c982b 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -437,6 +437,15 @@ class Activity
 
         /* Purely extensions hereafter */
 
+        $tags = array();
+
+        // Use an Activity Object for term? Which object? Note?
+        foreach ($this->categories as $cat) {
+            $tags[] = $cat->term;
+        }
+
+        $activity['tags'] = $tags;
+
         // XXX: a bit of a hack... Since JSON isn't namespaced we probably
         // shouldn't be using 'statusnet:notice_info', but this will work
         // for the moment.
@@ -448,12 +457,11 @@ class Activity
             }
         }
 
-        /* more extensions */
 
         // Context stuff. For now I'm just sticking most of it
         // in a property called "context"
 
-        if (!empty($this->context)) {
+   if (!empty($this->context)) {
 
             if (!empty($this->context->location)) {
                 $loc = $this->context->location;

From da42d36d7f42c2357c21f71034f9c1cd04220c99 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 18 Feb 2011 10:02:41 -0800
Subject: [PATCH 280/314] Activity Streams JSON - express to and in-reply-to
 stuff as person objects

---
 lib/activity.php        | 43 ++++++++++++++++++++---------------------
 lib/activitycontext.php | 31 +++++++++++++++++++++++------
 2 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/lib/activity.php b/lib/activity.php
index 25d70c982b..11af98abb5 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -364,6 +364,27 @@ class Activity
         if ($this->verb == ActivityVerb::POST && count($this->objects) == 1) {
             $activity['object'] = $this->objects[0]->asArray();
 
+            // Context stuff. For now I'm just sticking most of it
+            // in a property called "context"
+
+            if (!empty($this->context)) {
+
+                if (!empty($this->context->location)) {
+                    $loc = $this->context->location;
+
+                    // GeoJSON
+
+                    $activity['geopoint'] = array(
+                        'type'        => 'Point',
+                        'coordinates' => array($loc->lat, $loc->lon)
+                    );
+
+                }
+
+                $activity['to']      = $this->context->getToArray();
+                $activity['context'] = $this->context->asArray();
+            }
+
             // Instead of adding enclosures as an extension to JSON
             // Activities, it seems like we should be using the
             // attachedObjects property of ActivityObject
@@ -457,28 +478,6 @@ class Activity
             }
         }
 
-
-        // Context stuff. For now I'm just sticking most of it
-        // in a property called "context"
-
-   if (!empty($this->context)) {
-
-            if (!empty($this->context->location)) {
-                $loc = $this->context->location;
-
-                // GeoJSON
-
-                $activity['geopoint'] = array(
-                    'type'        => 'Point',
-                    'coordinates' => array($loc->lat, $loc->lon)
-                );
-
-            }
-
-            $activity['to']      = $this->context->getToArray();
-            $activity['context'] = $this->context->asArray();
-        }
-
         return array_filter($activity);
     }
 
diff --git a/lib/activitycontext.php b/lib/activitycontext.php
index 3dc53d869d..acbd0e599f 100644
--- a/lib/activitycontext.php
+++ b/lib/activitycontext.php
@@ -137,19 +137,16 @@ class ActivityContext
      *
      * @return array the context
      */
+
     function asArray()
     {
         $context = array();
 
-        $context['replyToId']    = $this->replyToID;
-        $context['replyToUrl']   = $this->replyToUrl;
+        $context['replyTo']    =   $this->getInReplyToArray();
         $context['conversation'] = $this->conversation;
         $context['forwardId']    = $this->forwardID;
         $context['forwardUrl']   = $this->forwardUrl;
 
-        // XXX: We might want to have the attention to stuff
-        //      in here like we do with Atom
-
         return array_filter($context);
     }
 
@@ -164,16 +161,38 @@ class ActivityContext
      *
      * @return array the array of recipients
      */
+
     function getToArray()
     {
         $tos = array();
 
         foreach ($this->attention as $attnUrl) {
-            $to = array('id' => $attnUrl, 'url' => $attnUrl);
+            $to = array(
+                'objectType' => 'person',
+                'id'         => $attnUrl,
+                'url'        => $attnUrl
+            );
             $tos[] = $to;
         }
 
         return $tos;
     }
 
+    /*
+     * Show replyTo
+     */
+
+     function getInReplyToArray()
+     {
+         $replyToObj = array('objectType' => 'note');
+
+         $replyToObj['id'] = $this->replyToID;
+
+         if (!empty($this->replyToUrl)) {
+             $replyToObj['url'] = $this->replyToUrl;
+         }
+
+     }
+
 }
+

From e9184dd775325e635bda5123486ba5c6d91331a6 Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Fri, 18 Feb 2011 13:49:29 -0500
Subject: [PATCH 281/314] HTML and style cleanup for EmailSummary plugin.

---
 .../EmailSummary/useremailsummaryhandler.php  | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/plugins/EmailSummary/useremailsummaryhandler.php b/plugins/EmailSummary/useremailsummaryhandler.php
index 7372a27943..8ba8a7a20b 100644
--- a/plugins/EmailSummary/useremailsummaryhandler.php
+++ b/plugins/EmailSummary/useremailsummaryhandler.php
@@ -124,13 +124,18 @@ class UserEmailSummaryHandler extends QueueHandler
 	
         $out = new XMLStringer();
 
-        $out->raw(sprintf(_('<p>Recent updates from %1s for %2s:</p>'),
+        $out->elementStart('div', array('width' => '100%',
+                                        'style' => 'background-color: #ffffff; border: 4px solid #4c609a; padding: 10px;'));
+
+        $out->elementStart('div', array('style' => 'color: #ffffff; background-color: #4c609a; font-weight: bold; margin-bottom: 10px; padding: 4px;'));
+    	$out->raw(sprintf(_('Recent updates from %1s for %2s:'),
                           common_config('site', 'name'),
                           $profile->getBestName()));
-	
+        $out->elementEnd('div');
+
+        $out->elementStart('table', array('width' => '550px',
+                                          'style' => 'border: none; border-collapse: collapse;', 'cellpadding' => '6'));
 
-        $out->elementStart('table', array('width' => '541px', 'style' => 'border: none'));
-	
         while ($notice->fetch()) {
 	    
             $profile = Profile::staticGet('id', $notice->profile_id);
@@ -145,30 +150,30 @@ class UserEmailSummaryHandler extends QueueHandler
             $out->elementStart('td', array('width' => AVATAR_STREAM_SIZE,
                                            'height' => AVATAR_STREAM_SIZE,
                                            'align' => 'left',
-                                           'valign' => 'top'));
+                                           'valign' => 'top',
+                                           'style' => 'border-bottom: 1px dotted #C5CEE3; padding: 10px 6px 10px 6px;'));
             $out->element('img', array('src' => ($avatar) ?
                                        $avatar->displayUrl() :
                                        Avatar::defaultImage(AVATAR_STREAM_SIZE),
-                                       'class' => 'avatar photo',
                                        'width' => AVATAR_STREAM_SIZE,
                                        'height' => AVATAR_STREAM_SIZE,
                                        'alt' => $profile->getBestName()));
             $out->elementEnd('td');
             $out->elementStart('td', array('align' => 'left',
-                                           'valign' => 'top'));
+                                           'valign' => 'top',
+                                           'style' => 'border-bottom: 1px dotted #C5CEE3; padding: 10px 6px 10px 6px;'));
             $out->element('a', array('href' => $profile->profileurl),
                           $profile->nickname);
             $out->text(' ');
             $out->raw($notice->rendered);
-            $out->element('br'); // yeah, you know it. I just wrote a <br> in the middle of my table layout.
+            $out->elementStart('div', array('style' => 'font-size: 0.8em; padding-top: 4px;'));
             $noticeurl = $notice->bestUrl();
             // above should always return an URL
             assert(!empty($noticeurl));
             $out->elementStart('a', array('rel' => 'bookmark',
-                                          'class' => 'timestamp',
                                           'href' => $noticeurl));
             $dt = common_date_iso8601($notice->created);
-            $out->element('abbr', array('class' => 'published',
+            $out->element('abbr', array('style' => 'border-bottom: none;',
                                         'title' => $dt),
                           common_date_string($notice->created));
             $out->elementEnd('a');
@@ -178,21 +183,23 @@ class UserEmailSummaryHandler extends QueueHandler
                 if (!empty($convurl)) {
                     $out->text(' ');
                     $out->element('a',
-                                  array('href' => $convurl.'#notice-'.$notice->id,
-                                        'class' => 'response'),
+                                  array('href' => $convurl.'#notice-'.$notice->id),
                                   _('in context'));
                 }
             }
+            $out->elementEnd('div');
             $out->elementEnd('td');
             $out->elementEnd('tr');
         }
 	
         $out->elementEnd('table');
-	
+
         $out->raw(sprintf(_('<p><a href="%1s">change your email settings for %2s</a></p>'),
                           common_local_url('emailsettings'),
                           common_config('site', 'name')));
 
+        $out->elementEnd('div');
+	
         $body = $out->getString();
 	
         // FIXME: do something for people who don't like HTML email

From 68017392ffd35ce93defb4600a17f9d7203b753f Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 18 Feb 2011 15:43:40 -0800
Subject: [PATCH 282/314] Make other timeline API endpoints output Activity
 Streams JSON

---
 actions/apitimelinefavorites.php     |  8 ++++
 actions/apitimelinegroup.php         | 25 ++++++-----
 actions/apitimelinehome.php          |  8 ++++
 actions/apitimelinementions.php      |  8 ++++
 actions/apitimelinepublic.php        |  8 ++++
 actions/apitimelineretweetedtome.php | 45 +++++++++++++++----
 actions/apitimelineretweetsofme.php  | 65 +++++++++++++---------------
 actions/apitimelinetag.php           | 12 +++--
 actions/apitimelineuser.php          | 11 +++++
 lib/router.php                       | 34 +++++++--------
 10 files changed, 150 insertions(+), 74 deletions(-)

diff --git a/actions/apitimelinefavorites.php b/actions/apitimelinefavorites.php
index c952c46238..36fc3089f5 100644
--- a/actions/apitimelinefavorites.php
+++ b/actions/apitimelinefavorites.php
@@ -169,6 +169,14 @@ class ApiTimelineFavoritesAction extends ApiBareAuthAction
         case 'json':
             $this->showJsonTimeline($this->notices);
             break;
+        case 'as':
+            header('Content-Type: application/json; charset=utf-8');
+            $doc = new ActivityStreamJSONDocument($this->auth_user);
+            $doc->setTitle($title);
+            $doc->addLink($link,'alternate', 'text/html');
+            $doc->addItemsFromNotices($this->notices);
+            $this->raw($doc->asString());
+            break;
         default:
             // TRANS: Client error displayed when trying to handle an unknown API method.
             $this->clientError(_('API method not found.'), $code = 404);
diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index e1bc102e45..3fc930fa08 100644
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -106,6 +106,11 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
 
         $self = $this->getSelfUri();
 
+        $link = common_local_url(
+            'ApiTimelineGroup',
+            array('nickname' => $this->group->nickname)
+        );
+
         switch($this->format) {
         case 'xml':
             $this->showXmlTimeline($this->notices);
@@ -123,24 +128,20 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
             break;
         case 'atom':
             header('Content-Type: application/atom+xml; charset=utf-8');
-
-            try {
                 $atom->addEntryFromNotices($this->notices);
                 $this->raw($atom->getString());
-            } catch (Atom10FeedException $e) {
-                $this->serverError(
-                    // TRANS: Server error displayed when generating an Atom feed fails.
-                    // TRANS: %s is the error.
-                    sprintf(_('Could not generate feed for group - %s'),$e->getMessage()),
-		    400,
-		    $this->format
-                );
-                return;
-            }
             break;
         case 'json':
             $this->showJsonTimeline($this->notices);
             break;
+        case 'as':
+            header('Content-Type: application/json; charset=utf-8');
+            $doc = new ActivityStreamJSONDocument($this->auth_user);
+            $doc->setTitle($atom->title);
+            $doc->addLink($link, 'alternate', 'text/html');
+            $doc->addItemsFromNotices($this->notices);
+            $this->raw($doc->asString());
+            break;
         default:
             $this->clientError(
                 // TRANS: Client error displayed when trying to handle an unknown API method.
diff --git a/actions/apitimelinehome.php b/actions/apitimelinehome.php
index 75a9f72580..023c9698a1 100644
--- a/actions/apitimelinehome.php
+++ b/actions/apitimelinehome.php
@@ -168,6 +168,14 @@ class ApiTimelineHomeAction extends ApiBareAuthAction
         case 'json':
             $this->showJsonTimeline($this->notices);
             break;
+        case 'as':
+            header('Content-Type: application/json; charset=utf-8');
+            $doc = new ActivityStreamJSONDocument($this->auth_user);
+            $doc->setTitle($title);
+            $doc->addLink($link, 'alternate', 'text/html');
+            $doc->addItemsFromNotices($this->notices);
+            $this->raw($doc->asString());
+            break;
         default:
             // TRANS: Client error displayed when trying to handle an unknown API method.
             $this->clientError(_('API method not found.'), $code = 404);
diff --git a/actions/apitimelinementions.php b/actions/apitimelinementions.php
index a9b6d0b3df..2857bd41ea 100644
--- a/actions/apitimelinementions.php
+++ b/actions/apitimelinementions.php
@@ -169,6 +169,14 @@ class ApiTimelineMentionsAction extends ApiBareAuthAction
         case 'json':
             $this->showJsonTimeline($this->notices);
             break;
+        case 'as':
+            header('Content-Type: application/json; charset=utf-8');
+            $doc = new ActivityStreamJSONDocument($this->auth_user);
+            $doc->setTitle($title);
+            $doc->addLink($link, 'alternate', 'text/html');
+            $doc->addItemsFromNotices($this->notices);
+            $this->raw($doc->asString());
+            break;
         default:
             // TRANS: Client error displayed when trying to handle an unknown API method.
             $this->clientError(_('API method not found.'), $code = 404);
diff --git a/actions/apitimelinepublic.php b/actions/apitimelinepublic.php
index 2745e5d3fe..353973b653 100644
--- a/actions/apitimelinepublic.php
+++ b/actions/apitimelinepublic.php
@@ -234,6 +234,14 @@ class ApiTimelinePublicAction extends ApiPrivateAuthAction
         case 'json':
             $this->showJsonTimeline($this->notices);
             break;
+        case 'as':
+            header('Content-Type: application/json; charset=utf-8');
+            $doc = new ActivityStreamJSONDocument($this->auth_user);
+            $doc->setTitle($title);
+            $doc->addLink($link, 'alternate', 'text/html');
+            $doc->addItemsFromNotices($this->notices);
+            $this->raw($doc->asString());
+            break;
         default:
             // TRANS: Client error displayed when trying to handle an unknown API method.
             $this->clientError(_('API method not found.'), $code = 404);
diff --git a/actions/apitimelineretweetedtome.php b/actions/apitimelineretweetedtome.php
index 6213a08eac..b9f9be1dda 100644
--- a/actions/apitimelineretweetedtome.php
+++ b/actions/apitimelineretweetedtome.php
@@ -92,6 +92,20 @@ class ApiTimelineRetweetedToMeAction extends ApiAuthAction
         $offset = ($this->page-1) * $this->cnt;
         $limit  = $this->cnt;
 
+        // TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
+        $title      = sprintf(_("Repeated to %s"), $this->auth_user->nickname);
+        $subtitle   = sprintf(
+            _('%1$s notices that were to repeated to %2$s / %3$s.'),
+            $sitename, $this->user->nickname, $profile->getBestName()
+        );
+        $taguribase = TagURI::base();
+        $id         = "tag:$taguribase:RepeatedToMe:" . $this->auth_user->id;
+
+        $link = common_local_url(
+            'all',
+             array('nickname' => $this->auth_user->nickname)
+        );
+
         $strm = $this->auth_user->repeatedToMe($offset, $limit, $this->since_id, $this->max_id);
 
         switch ($this->format) {
@@ -102,16 +116,31 @@ class ApiTimelineRetweetedToMeAction extends ApiAuthAction
             $this->showJsonTimeline($strm);
             break;
         case 'atom':
-            $profile    = $this->auth_user->getProfile();
+            header('Content-Type: application/atom+xml; charset=utf-8');
 
-            // TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
-            $title      = sprintf(_("Repeated to %s"), $this->auth_user->nickname);
-            $taguribase = TagURI::base();
-            $id         = "tag:$taguribase:RepeatedToMe:" . $this->auth_user->id;
-            $link       = common_local_url('all',
-                                           array('nickname' => $this->auth_user->nickname));
+            $atom = new AtomNoticeFeed($this->auth_user);
 
-            $this->showAtomTimeline($strm, $title, $id, $link);
+            $atom->setId($id);
+            $atom->setTitle($title);
+            $atom->setSubtitle($subtitle);
+            $atom->setUpdated('now');
+            $atom->addLink($link);
+
+            $id = $this->arg('id');
+
+            $atom->setSelfLink($self);
+            $atom->addEntryFromNotices($strm);
+
+            $this->raw($atom->getString());
+
+            break;
+        case 'as':
+            header('Content-Type: application/json; charset=utf-8');
+            $doc = new ActivityStreamJSONDocument($this->auth_user);
+            $doc->setTitle($title);
+            $doc->addLink($link, 'alternate', 'text/html');
+            $doc->addItemsFromNotices($strm);
+            $this->raw($doc->asString());
             break;
         default:
             // TRANS: Client error displayed when trying to handle an unknown API method.
diff --git a/actions/apitimelineretweetsofme.php b/actions/apitimelineretweetsofme.php
index 9cb277279f..aec6877f15 100644
--- a/actions/apitimelineretweetsofme.php
+++ b/actions/apitimelineretweetsofme.php
@@ -93,9 +93,27 @@ class ApiTimelineRetweetsOfMeAction extends ApiAuthAction
         $offset = ($this->page-1) * $this->cnt;
         $limit  = $this->cnt;
 
-        $strm = $this->auth_user->repeatsOfMe($offset, $limit, $this->since_id, $this->max_id);
+        // TRANS: Title of list of repeated notices of the logged in user.
+        // TRANS: %s is the nickname of the logged in user.
+        $title      = sprintf(_("Repeats of %s"), $this->auth_user->nickname);
+        $sitename   = common_config('site', 'name');
 
-        common_debug(var_export($strm, true));
+        $profile = $this->auth_user->getProfile();
+
+        $subtitle   = sprintf(
+            _('%1$s notices that %2$s / %3$s has repeated.'),
+            $sitename, $this->auth_user->nickname, $profile->getBestName()
+        );
+
+        $taguribase = TagURI::base();
+        $id         = "tag:$taguribase:RepeatsOfMe:" . $this->auth_user->id;
+
+        $link = common_local_url(
+            'all',
+             array('nickname' => $this->auth_user->nickname)
+        );
+
+        $strm = $this->auth_user->repeatsOfMe($offset, $limit, $this->since_id, $this->max_id);
 
         switch ($this->format) {
         case 'xml':
@@ -105,49 +123,28 @@ class ApiTimelineRetweetsOfMeAction extends ApiAuthAction
             $this->showJsonTimeline($strm);
             break;
         case 'atom':
-            $profile    = $this->auth_user->getProfile();
-
-            // TRANS: Title of list of repeated notices of the logged in user.
-            // TRANS: %s is the nickname of the logged in user.
-            $title      = sprintf(_("Repeats of %s"), $this->auth_user->nickname);
-            $taguribase = TagURI::base();
-            $id         = "tag:$taguribase:RepeatsOfMe:" . $this->auth_user->id;
-
             header('Content-Type: application/atom+xml; charset=utf-8');
-
             $atom = new AtomNoticeFeed($this->auth_user);
-
             $atom->setId($id);
             $atom->setTitle($title);
             $atom->setSubtitle($subtitle);
             $atom->setUpdated('now');
-
-            $atom->addLink(
-                common_local_url(
-                    'showstream',
-                    array('nickname' => $this->auth_user->nickname)
-                )
-            );
-
-            $id = $this->arg('id');
-            $aargs = array('format' => 'atom');
-            if (!empty($id)) {
-                $aargs['id'] = $id;
-            }
-
-            $atom->addLink(
-                $this->getSelfUri('ApiTimelineRetweetsOfMe', $aargs),
-                array('rel' => 'self', 'type' => 'application/atom+xml')
-            );
-
+            $atom->addLink($link);
+            $atom->setSelfLink($this->getSelfUri());
             $atom->addEntryFromNotices($strm);
-
             $this->raw($atom->getString());
-
+            break;
+        case 'as':
+            header('Content-Type: application/json; charset=utf-8');
+            $doc = new ActivityStreamJSONDocument($this->auth_user);
+            $doc->setTitle($title);
+            $doc->addLink($link, 'alternate', 'text/html');
+            $doc->addItemsFromNotices($strm);
+            $this->raw($doc->asString());
             break;
         default:
             // TRANS: Client error displayed when trying to handle an unknown API method.
-            $this->clientError(_('API method not found.'), $code = 404);
+            $this->clientError(_('API method not found.'), 404);
             break;
         }
     }
diff --git a/actions/apitimelinetag.php b/actions/apitimelinetag.php
index 4dbe1fc0db..5fa76d0cd0 100644
--- a/actions/apitimelinetag.php
+++ b/actions/apitimelinetag.php
@@ -107,7 +107,7 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction
             $sitename
         );
         $taguribase = TagURI::base();
-        $id         = "tag:$taguribase:TagTimeline:".$tag;
+        $id         = "tag:$taguribase:TagTimeline:".$this->tag;
 
         $link = common_local_url(
             'tag',
@@ -116,8 +116,6 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction
 
         $self = $this->getSelfUri();
 
-        common_debug("self link is: $self");
-
         switch($this->format) {
         case 'xml':
             $this->showXmlTimeline($this->notices);
@@ -154,6 +152,14 @@ class ApiTimelineTagAction extends ApiPrivateAuthAction
         case 'json':
             $this->showJsonTimeline($this->notices);
             break;
+        case 'as':
+            header('Content-Type: application/json; charset=utf-8');
+            $doc = new ActivityStreamJSONDocument($this->auth_user);
+            $doc->setTitle($title);
+            $doc->addLink($link, 'alternate', 'text/html');
+            $doc->addItemsFromNotices($this->notices);
+            $this->raw($doc->asString());
+            break;
         default:
             // TRANS: Client error displayed when trying to handle an unknown API method.
             $this->clientError(_('API method not found.'), $code = 404);
diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php
index b0ca7e923f..66984b5abd 100644
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@ -201,6 +201,17 @@ class ApiTimelineUserAction extends ApiBareAuthAction
         case 'json':
             $this->showJsonTimeline($this->notices);
             break;
+        case 'as':
+            header('Content-Type: application/json; charset=utf-8');
+            $doc = new ActivityStreamJSONDocument($this->auth_user);
+            $doc->setTitle($atom->title);
+            $doc->addLink($link, 'alternate', 'text/html');
+            $doc->addItemsFromNotices($this->notices);
+
+            // XXX: Add paging extension?
+
+            $this->raw($doc->asString());
+            break;
         default:
             // TRANS: Client error displayed when trying to handle an unknown API method.
             $this->clientError(_('API method not found.'), $code = 404);
diff --git a/lib/router.php b/lib/router.php
index 9f2b1df868..a4547b3258 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -407,7 +407,7 @@ class Router
 
             $m->connect('api/statuses/public_timeline.:format',
                         array('action' => 'ApiTimelinePublic',
-                              'format' => '(xml|json|rss|atom)'));
+                              'format' => '(xml|json|rss|atom|as)'));
 
             $m->connect('api/statuses/friends_timeline.:format',
                         array('action' => 'ApiTimelineFriends',
@@ -416,55 +416,55 @@ class Router
             $m->connect('api/statuses/friends_timeline/:id.:format',
                         array('action' => 'ApiTimelineFriends',
                               'id' => Nickname::INPUT_FMT,
-                              'format' => '(xml|json|rss|atom)'));
+                              'format' => '(xml|json|rss|atom|as)'));
 
             $m->connect('api/statuses/home_timeline.:format',
                         array('action' => 'ApiTimelineHome',
-                              'format' => '(xml|json|rss|atom)'));
+                              'format' => '(xml|json|rss|atom|as)'));
 
             $m->connect('api/statuses/home_timeline/:id.:format',
                         array('action' => 'ApiTimelineHome',
                               'id' => Nickname::INPUT_FMT,
-                              'format' => '(xml|json|rss|atom)'));
+                              'format' => '(xml|json|rss|atom|as)'));
 
             $m->connect('api/statuses/user_timeline.:format',
                         array('action' => 'ApiTimelineUser',
-                              'format' => '(xml|json|rss|atom)'));
+                              'format' => '(xml|json|rss|atom|as)'));
 
             $m->connect('api/statuses/user_timeline/:id.:format',
                         array('action' => 'ApiTimelineUser',
                               'id' => Nickname::INPUT_FMT,
-                              'format' => '(xml|json|rss|atom)'));
+                              'format' => '(xml|json|rss|atom|as)'));
 
             $m->connect('api/statuses/mentions.:format',
                         array('action' => 'ApiTimelineMentions',
-                              'format' => '(xml|json|rss|atom)'));
+                              'format' => '(xml|json|rss|atom|as)'));
 
             $m->connect('api/statuses/mentions/:id.:format',
                         array('action' => 'ApiTimelineMentions',
                               'id' => Nickname::INPUT_FMT,
-                              'format' => '(xml|json|rss|atom)'));
+                              'format' => '(xml|json|rss|atom|as)'));
 
             $m->connect('api/statuses/replies.:format',
                         array('action' => 'ApiTimelineMentions',
-                              'format' => '(xml|json|rss|atom)'));
+                              'format' => '(xml|json|rss|atom|as)'));
 
             $m->connect('api/statuses/replies/:id.:format',
                         array('action' => 'ApiTimelineMentions',
                               'id' => Nickname::INPUT_FMT,
-                              'format' => '(xml|json|rss|atom)'));
+                              'format' => '(xml|json|rss|atom|as)'));
 
             $m->connect('api/statuses/retweeted_by_me.:format',
                         array('action' => 'ApiTimelineRetweetedByMe',
-                              'format' => '(xml|json|atom)'));
+                              'format' => '(xml|json|atom|as)'));
 
             $m->connect('api/statuses/retweeted_to_me.:format',
                         array('action' => 'ApiTimelineRetweetedToMe',
-                              'format' => '(xml|json|atom)'));
+                              'format' => '(xml|json|atom|as)'));
 
             $m->connect('api/statuses/retweets_of_me.:format',
                         array('action' => 'ApiTimelineRetweetsOfMe',
-                              'format' => '(xml|json|atom)'));
+                              'format' => '(xml|json|atom|as)'));
 
             $m->connect('api/statuses/friends.:format',
                         array('action' => 'ApiUserFriends',
@@ -625,12 +625,12 @@ class Router
 
             $m->connect('api/favorites.:format',
                         array('action' => 'ApiTimelineFavorites',
-                              'format' => '(xml|json|rss|atom)'));
+                              'format' => '(xml|json|rss|atom|as)'));
 
             $m->connect('api/favorites/:id.:format',
                         array('action' => 'ApiTimelineFavorites',
                               'id' => Nickname::INPUT_FMT,
-                              'format' => '(xml|json|rss|atom)'));
+                              'format' => '(xml|json|rss|atom|as)'));
 
             $m->connect('api/favorites/create/:id.:format',
                         array('action' => 'ApiFavoriteCreate',
@@ -695,7 +695,7 @@ class Router
             $m->connect('api/statusnet/groups/timeline/:id.:format',
                         array('action' => 'ApiTimelineGroup',
                               'id' => Nickname::INPUT_FMT,
-                              'format' => '(xml|json|rss|atom)'));
+                              'format' => '(xml|json|rss|atom|as)'));
 
             $m->connect('api/statusnet/groups/show.:format',
                         array('action' => 'ApiGroupShow',
@@ -756,7 +756,7 @@ class Router
             // Tags
             $m->connect('api/statusnet/tags/timeline/:tag.:format',
                         array('action' => 'ApiTimelineTag',
-                              'format' => '(xml|json|rss|atom)'));
+                              'format' => '(xml|json|rss|atom|as)'));
 
             // media related
             $m->connect(

From b741184d9b8fc5cd341b0a7e24f02cf8a176d4b7 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 18 Feb 2011 18:10:21 -0800
Subject: [PATCH 283/314] Add provider to Activity Streams JSON

---
 lib/activity.php | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/lib/activity.php b/lib/activity.php
index 11af98abb5..b781e49846 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -354,11 +354,12 @@ class Activity
         // body
         $activity['body'] = $this->content;
 
-        // generator <-- We should use this when we know a notice is created
-        //               locally
+        // generator <-- We could use this when we know a notice is created
+        //               locally. Or if we know the upstream Generator.
+
+        // icon <-- I've decided to use the posting user's stream avatar here
+        //          for now (also included in the avatarLinks extension)
 
-        // icon <-- Should we use this? Maybe a little bubble like we have
-        //          on Facebook posts?
 
         // object
         if ($this->verb == ActivityVerb::POST && count($this->objects) == 1) {
@@ -436,8 +437,14 @@ class Activity
 
         $activity['postedTime'] = self::iso8601Date($this->time); // Change to exactly be RFC3339?
 
-        // provider <-- We should probably use this for showing the the source
-        //              of remote notices, if known
+        // provider
+        $provider = array(
+            'objectType' => 'service',
+            'displayName' => common_config('site', 'name'),
+            'url' => common_root_url()
+        );
+
+        $activity['provider'] = $provider;
 
         // target
         if (!empty($this->target)) {

From 93e3d49044029856d4c9ce3710385dc5154084a1 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 18 Feb 2011 18:52:49 -0800
Subject: [PATCH 284/314] Activity Streams JSON: inReplyTo objects weren't
 being output. Fixed.

---
 lib/activitycontext.php | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/lib/activitycontext.php b/lib/activitycontext.php
index acbd0e599f..2eff3fb15f 100644
--- a/lib/activitycontext.php
+++ b/lib/activitycontext.php
@@ -142,7 +142,7 @@ class ActivityContext
     {
         $context = array();
 
-        $context['replyTo']    =   $this->getInReplyToArray();
+        $context['inReplyTo']    = $this->getInReplyToArray();
         $context['conversation'] = $this->conversation;
         $context['forwardId']    = $this->forwardID;
         $context['forwardUrl']   = $this->forwardUrl;
@@ -178,20 +178,31 @@ class ActivityContext
         return $tos;
     }
 
-    /*
-     * Show replyTo
+    /**
+     * Return an array for the notices this notice is a reply to 
+     * suitable for serializing as JSON note objects.
+     *
+     * @return array the array of notes
      */
 
      function getInReplyToArray()
      {
+         if (empty($this->replyToID) && empty($this->replyToUrl)) {
+             return null;
+         }
+
          $replyToObj = array('objectType' => 'note');
 
-         $replyToObj['id'] = $this->replyToID;
-
+         // XXX: Possibly shorten this to just the numeric ID?
+         //      Currently, it's the full URI of the notice.
+         if (!empty($this->replyToID)) {
+             $replyToObj['id'] = $this->replyToID;
+         }
          if (!empty($this->replyToUrl)) {
              $replyToObj['url'] = $this->replyToUrl;
          }
 
+         return $replyToObj;
      }
 
 }

From 1525acdca197b598e20c6c4a5636a5cc24b89b32 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 21 Feb 2011 10:20:42 -0500
Subject: [PATCH 285/314] Extend authorization framework to cover login and API
 use

I've extended the rights framework (centering on the Right class and Profile::hasRight()) to cover
Web login and API use. This will make it possible to prevent login and API use by users.

I added two new Right constants to the Right class: WEBLOGIN and API. I check these rights using
Profile::hasRight() when initializing users. If the rights check fails, I throw an exception.

I created a new AuthorizationException class for this particular
exception, in order to allow a different UI for these kinds of exceptions (or whatever).
---
 classes/Profile.php            |  6 ++++
 lib/apiauth.php                | 11 ++++++-
 lib/authorizationexception.php | 59 ++++++++++++++++++++++++++++++++++
 lib/right.php                  |  2 ++
 lib/util.php                   |  5 ++-
 5 files changed, 81 insertions(+), 2 deletions(-)
 create mode 100644 lib/authorizationexception.php

diff --git a/classes/Profile.php b/classes/Profile.php
index bdac3ba453..397b96bbc1 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -865,6 +865,12 @@ class Profile extends Memcached_DataObject
             case Right::EMAILONFAVE:
                 $result = !$this->isSandboxed();
                 break;
+            case Right::WEBLOGIN:
+                $result = !$this->isSilenced();
+                break;
+            case Right::API:
+                $result = !$this->isSilenced();
+                break;
             case Right::BACKUPACCOUNT:
                 $result = common_config('profile', 'backup');
                 break;
diff --git a/lib/apiauth.php b/lib/apiauth.php
index 0cc184c04c..8a1af8c27d 100644
--- a/lib/apiauth.php
+++ b/lib/apiauth.php
@@ -196,7 +196,13 @@ class ApiAuthAction extends ApiAction
 
                     // Set the auth user
                     if (Event::handle('StartSetApiUser', array(&$user))) {
-                        $this->auth_user = User::staticGet('id', $appUser->profile_id);
+                        $user = User::staticGet('id', $appUser->profile_id);
+                        if (!empty($user)) {
+                            if (!$user->hasRight(Right::API)) {
+                                throw new AuthorizationException(_('Not allowed to use API.'));
+                            }
+                        }
+                        $this->auth_user = $user;
                         Event::handle('EndSetApiUser', array($user));
                     }
 
@@ -274,6 +280,9 @@ class ApiAuthAction extends ApiAction
             if (Event::handle('StartSetApiUser', array(&$user))) {
 
                 if (!empty($user)) {
+                    if (!$user->hasRight(Right::API)) {
+                        throw new AuthorizationException(_('Not allowed to use API.'));
+                    }
                     $this->auth_user = $user;
                 }
 
diff --git a/lib/authorizationexception.php b/lib/authorizationexception.php
new file mode 100644
index 0000000000..a9576e3a70
--- /dev/null
+++ b/lib/authorizationexception.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * An exception for authorization errors
+ * 
+ * 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  Exception
+ * @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);
+}
+
+/**
+ * An exception for authorization issues
+ *
+ * @category  Exception
+ * @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 AuthorizationException extends ClientException
+{
+    /**
+     * Constructor
+     *
+     * @param string $message Message for the exception
+     */
+    public function __construct($message=null)
+    {
+        parent::__construct($message, 403);
+    }
+}
diff --git a/lib/right.php b/lib/right.php
index d144b21ae9..baa18d3c13 100644
--- a/lib/right.php
+++ b/lib/right.php
@@ -66,5 +66,7 @@ class Right
     const DELETEACCOUNT      = 'deleteaccount';
     const MOVEACCOUNT        = 'moveaccount';
     const CREATEGROUP        = 'creategroup';
+    const WEBLOGIN           = 'weblogin';
+    const API                = 'api';
 }
 
diff --git a/lib/util.php b/lib/util.php
index 85f49e4c59..1e73ff9ac9 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -300,7 +300,10 @@ function common_set_user($user)
 
     if ($user) {
         if (Event::handle('StartSetUser', array(&$user))) {
-            if($user){
+            if (!empty($user)) {
+                if (!$user->hasRight(Right::WEBLOGIN)) {
+                    throw new AuthorizationException(_('Not allowed to log in.'));
+                }
                 common_ensure_session();
                 $_SESSION['userid'] = $user->id;
                 $_cur = $user;

From 6b18f86e011fb4a15187177c55ea37cec9fe4773 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 21 Feb 2011 11:23:07 -0800
Subject: [PATCH 286/314] Issue #3049 - resync doc/im with the help command
 text (various additions since doc was last edited)

---
 doc-src/im | 53 +++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 37 insertions(+), 16 deletions(-)

diff --git a/doc-src/im b/doc-src/im
index 896c121879..9932632188 100644
--- a/doc-src/im
+++ b/doc-src/im
@@ -32,19 +32,40 @@ Commands
 You can do some minor management of your account through Jabber. These are the
 currently-implemented commands:
 
-* **on**: Turn on notifications. You'll receive copies of messages by people
-  you subscribe to.
-* **off**: Turn off notifications. You'll no longer receive Jabber
-  notifications.
-* **stop**: Same as 'off'
-* **quit**: Same as 'off'
-* **help**: Show this help. List available Jabber/XMPP commands
-* **follow &lt;nickname&gt;**: Subscribe to &lt;nickname&gt;
-* **sub &lt;nickname&gt;**: Same as follow
-* **leave &lt;nickname&gt;**: Unsubscribe from &lt;nickname&gt;
-* **unsub &lt;nickname&gt;**: Same as leave
-* **d &lt;nickname&gt; &lt;text&gt;**: Send direct message to &lt;nickname&gt; with message body &lt;text&gt;
-* **get &lt;nickname&gt;**: Get last notice from &lt;nickname&gt;
-* **last &lt;nickname&gt;**: Same as 'get'
-* **whois &lt;nickname&gt;**: Get Profile info on &lt;nickname&gt;
-* **fav &lt;nickname&gt;**: Add user's last notice as a favorite
+* **on** - turn on notifications
+* **off** - turn off notifications
+* **help** - show this help
+* **follow &lt;nickname&gt;** - subscribe to user
+* **groups** - lists the groups you have joined
+* **subscriptions** - list the people you follow
+* **subscribers** - list the people that follow you
+* **leave &lt;nickname&gt;** - unsubscribe from user
+* **d &lt;nickname&gt; &lt;text&gt;** - direct message to user
+* **get &lt;nickname&gt;** - get last notice from user
+* **whois &lt;nickname&gt;** - get profile info on user
+* **lose &lt;nickname&gt;** - force user to stop following you
+* **fav &lt;nickname&gt;** - add user's last notice as a 'fave'
+* **fav #&lt;notice_id&gt;** - add notice with the given id as a 'fave'
+* **repeat #&lt;notice_id&gt;** - repeat a notice with a given id
+* **repeat &lt;nickname&gt;** - repeat the last notice from user
+* **reply #&lt;notice_id&gt;** - reply to notice with a given id
+* **reply &lt;nickname&gt;** - reply to the last notice from user
+* **join &lt;group&gt;** - join group
+* **login** - Get a link to login to the web interface
+* **drop &lt;group&gt;** - leave group
+* **stats** - get your stats
+* **stop** - same as 'off'
+* **quit** - same as 'off'
+* **sub &lt;nickname&gt;** - same as 'follow'
+* **unsub &lt;nickname&gt;** - same as 'leave'
+* **last &lt;nickname&gt;** - same as 'get'
+* **on &lt;nickname&gt;** - not yet implemented.
+* **off &lt;nickname&gt;** - not yet implemented.
+* **nudge &lt;nickname&gt;** - remind a user to update.
+* **invite &lt;phone number&gt;** - not yet implemented.
+* **track &lt;word&gt;** - not yet implemented.
+* **untrack &lt;word&gt;** - not yet implemented.
+* **track off** - not yet implemented.
+* **untrack all** - not yet implemented.
+* **tracks** - not yet implemented.
+* **tracking** - not yet implemented.

From 11e033f05cd174e8e21a61aec28ed44da91ebe78 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 21 Feb 2011 12:09:54 -0800
Subject: [PATCH 287/314] CommandInterpreter test cases to guard against
 regressions

---
 tests/CommandInterperterTest.php | 174 +++++++++++++++++++++++++++++++
 1 file changed, 174 insertions(+)
 create mode 100644 tests/CommandInterperterTest.php

diff --git a/tests/CommandInterperterTest.php b/tests/CommandInterperterTest.php
new file mode 100644
index 0000000000..3ce1cc2821
--- /dev/null
+++ b/tests/CommandInterperterTest.php
@@ -0,0 +1,174 @@
+<?php
+
+if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
+    print "This script must be run from the command line\n";
+    exit();
+}
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('STATUSNET', true);
+define('LACONICA', true);
+
+require_once INSTALLDIR . '/lib/common.php';
+
+class CommandInterpreterTest extends PHPUnit_Framework_TestCase
+{
+
+    /**
+     * @dataProvider commandInterpreterCases
+     */
+    public function testCommandInterpreter($input, $expectedType, $comment='')
+    {
+        $inter = new CommandInterpreter();
+
+        $user = new User(); // fake user
+        $user->limit(1);
+        $user->find();
+        $cmd = $inter->handle_command($user, $input);
+
+        $type = $cmd ? get_class($cmd) : null;
+        $this->assertEquals(strtolower($expectedType), strtolower($type), $comment);
+    }
+
+    static public function commandInterpreterCases()
+    {
+        $sets = array(
+            array('help', 'HelpCommand'),
+            array('help me bro', null, 'help does not accept multiple params'),
+            array('HeLP', 'HelpCommand', 'case check'),
+            array('HeLP Me BRO!', null, 'case & non-params check'),
+
+            array('login', 'LoginCommand'),
+            array('login to savings!', null, 'login does not accept params'),
+
+            array('lose', null, 'lose must have at least 1 parameter'),
+            array('lose foobar', 'LoseCommand', 'lose requires 1 parameter'),
+            array('lose        foobar', 'LoseCommand', 'check for space norm'),
+            array('lose more weight', null, 'lose does not accept multiple params'),
+
+            array('subscribers', 'SubscribersCommand'),
+            array('subscribers foo', null, 'subscribers does not take params'),
+
+            array('subscriptions', 'SubscriptionsCommand'),
+            array('subscriptions foo', null, 'subscriptions does not take params'),
+
+            array('groups', 'GroupsCommand'),
+            array('groups foo', null, 'groups does not take params'),
+
+            array('off', 'OffCommand', 'off accepts 0 or 1 params'),
+            array('off foo', 'OffCommand', 'off accepts 0 or 1 params'),
+            array('off foo bar', null, 'off accepts 0 or 1 params'),
+
+            array('stop', 'OffCommand', 'stop accepts 0 params'),
+            array('stop foo', null, 'stop accepts 0 params'),
+
+            array('quit', 'OffCommand', 'quit accepts 0 params'),
+            array('quit foo', null, 'quit accepts 0 params'),
+
+            array('on', 'OnCommand', 'on accepts 0 or 1 params'),
+            array('on foo', 'OnCommand', 'on accepts 0 or 1 params'),
+            array('on foo bar', null, 'on accepts 0 or 1 params'),
+
+            array('join', null),
+            array('join foo', 'JoinCommand'),
+            array('join foo bar', null),
+
+            array('drop', null),
+            array('drop foo', 'DropCommand'),
+            array('drop foo bar', null),
+
+            array('follow', null),
+            array('follow foo', 'SubCommand'),
+            array('follow foo bar', null),
+
+            array('sub', null),
+            array('sub foo', 'SubCommand'),
+            array('sub foo bar', null),
+
+            array('leave', null),
+            array('leave foo', 'UnsubCommand'),
+            array('leave foo bar', null),
+
+            array('unsub', null),
+            array('unsub foo', 'UnsubCommand'),
+            array('unsub foo bar', null),
+
+            array('leave', null),
+            array('leave foo', 'UnsubCommand'),
+            array('leave foo bar', null),
+
+            array('d', null),
+            array('d foo', null),
+            array('d foo bar', 'MessageCommand'),
+
+            array('dm', null),
+            array('dm foo', null),
+            array('dm foo bar', 'MessageCommand'),
+
+            array('r', null),
+            array('r foo', null),
+            array('r foo bar', 'ReplyCommand'),
+
+            array('reply', null),
+            array('reply foo', null),
+            array('reply foo bar', 'ReplyCommand'),
+
+            array('repeat', null),
+            array('repeat foo', 'RepeatCommand'),
+            array('repeat foo bar', null),
+
+            array('rp', null),
+            array('rp foo', 'RepeatCommand'),
+            array('rp foo bar', null),
+
+            array('rt', null),
+            array('rt foo', 'RepeatCommand'),
+            array('rt foo bar', null),
+
+            array('rd', null),
+            array('rd foo', 'RepeatCommand'),
+            array('rd foo bar', null),
+
+            array('whois', null),
+            array('whois foo', 'WhoisCommand'),
+            array('whois foo bar', null),
+
+            array('fav', null),
+            array('fav foo', 'FavCommand'),
+            array('fav foo bar', null),
+
+            array('nudge', null),
+            array('nudge foo', 'NudgeCommand'),
+            array('nudge foo bar', null),
+
+            array('stats', 'StatsCommand'),
+            array('stats foo', null),
+
+            array('invite', null),
+            array('invite foo', 'InviteCommand'),
+            array('invite foo bar', null),
+
+            array('track', null),
+            array('track foo', 'TrackCommand'),
+            array('track off', 'TrackOffCommand'),
+            array('track foo bar', null),
+            array('track off foo', null),
+
+            array('untrack', null),
+            array('untrack foo', 'UntrackCommand'),
+            array('untrack all', 'TrackOffCommand'),
+            array('untrack foo bar', null),
+            array('untrack all foo', null),
+
+            array('tracking', 'TrackingCommand'),
+            array('tracking foo', null),
+
+            array('tracks', 'TrackingCommand'),
+            array('tracks foo', null),
+
+        );
+        return $sets;
+    }
+
+}
+

From eb7e3ee528e6276f5b7a1a090286130c30beb150 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 21 Feb 2011 11:42:32 -0800
Subject: [PATCH 288/314] Fixes for ticket #3052: some commands started
 triggering when extra text is supposed to suppress them

Regressions caused by bad refactoring in commit 21feac3bea72b0ecd88a3.
Test cases in tests/CommandInterpreterTest.php were made against the pre-refactoring code, and now check out with the fixed code.
Failures were caused by not changing logic structure when moving from multiple exit points (each if point would return directly with a null or an object) to setting a result variable and then falling through to a common exit point. Without the if statements being restructured, the result variable would just get overridden by the next case.
---
 lib/commandinterpreter.php | 140 ++++++++++++++++++++-----------------
 1 file changed, 76 insertions(+), 64 deletions(-)

diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php
index f2caf48bdb..fe426f1fcd 100644
--- a/lib/commandinterpreter.php
+++ b/lib/commandinterpreter.php
@@ -42,8 +42,9 @@ class CommandInterpreter
             case 'help':
                 if ($arg) {
                     $result = null;
+                } else {
+                    $result = new HelpCommand($user);
                 }
-                $result = new HelpCommand($user);
                 break;
             case 'login':
                 if ($arg) {
@@ -120,49 +121,51 @@ class CommandInterpreter
             case 'join':
                 if (!$arg) {
                     $result = null;
-                }
-                list($other, $extra) = $this->split_arg($arg);
-                if ($extra) {
-                    $result = null;
                 } else {
-                    $result = new JoinCommand($user, $other);
+                    list($other, $extra) = $this->split_arg($arg);
+                    if ($extra) {
+                        $result = null;
+                    } else {
+                        $result = new JoinCommand($user, $other);
+                    }
                 }
                 break;
             case 'drop':
                 if (!$arg) {
                     $result = null;
-                }
-                list($other, $extra) = $this->split_arg($arg);
-                if ($extra) {
-                    $result = null;
                 } else {
-                    $result = new DropCommand($user, $other);
+                    list($other, $extra) = $this->split_arg($arg);
+                    if ($extra) {
+                        $result = null;
+                    } else {
+                        $result = new DropCommand($user, $other);
+                    }
                 }
                 break;
             case 'follow':
             case 'sub':
                 if (!$arg) {
                     $result = null;
-                }
-
-                list($other, $extra) = $this->split_arg($arg);
-                if ($extra) {
-                    $result = null;
                 } else {
-                    $result = new SubCommand($user, $other);
+                    list($other, $extra) = $this->split_arg($arg);
+                    if ($extra) {
+                        $result = null;
+                    } else {
+                        $result = new SubCommand($user, $other);
+                    }
                 }
                 break;
             case 'leave':
             case 'unsub':
                 if (!$arg) {
                     $result = null;
-                }
-
-                list($other, $extra) = $this->split_arg($arg);
-                if ($extra) {
-                    $result = null;
                 } else {
-                    $result = new UnsubCommand($user, $other);
+                    list($other, $extra) = $this->split_arg($arg);
+                    if ($extra) {
+                        $result = null;
+                    } else {
+                        $result = new UnsubCommand($user, $other);
+                    }
                 }
                 break;
             case 'get':
@@ -207,96 +210,105 @@ class CommandInterpreter
             case 'rd':
                 if (!$arg) {
                     $result = null;
-                }
-                list($other, $extra) = $this->split_arg($arg);
-                if ($extra) {
-                    $result = null;
                 } else {
-                    $result = new RepeatCommand($user, $other);
+                    list($other, $extra) = $this->split_arg($arg);
+                    if ($extra) {
+                        $result = null;
+                    } else {
+                        $result = new RepeatCommand($user, $other);
+                    }
                 }
                 break;
             case 'whois':
                 if (!$arg) {
                     $result = null;
-                }
-                list($other, $extra) = $this->split_arg($arg);
-                if ($extra) {
-                    $result = null;
                 } else {
-                    $result = new WhoisCommand($user, $other);
+                    list($other, $extra) = $this->split_arg($arg);
+                    if ($extra) {
+                        $result = null;
+                    } else {
+                        $result = new WhoisCommand($user, $other);
+                    }
                 }
                 break;
             case 'fav':
                 if (!$arg) {
                     $result = null;
-                }
-                list($other, $extra) = $this->split_arg($arg);
-                if ($extra) {
-                    $result = null;
                 } else {
-                    $result = new FavCommand($user, $other);
+                    list($other, $extra) = $this->split_arg($arg);
+                    if ($extra) {
+                        $result = null;
+                    } else {
+                        $result = new FavCommand($user, $other);
+                    }
                 }
                 break;
             case 'nudge':
                 if (!$arg) {
                     $result = null;
-                }
-                list($other, $extra) = $this->split_arg($arg);
-                if ($extra) {
-                    $result = null;
                 } else {
-                    $result = new NudgeCommand($user, $other);
+                    list($other, $extra) = $this->split_arg($arg);
+                    if ($extra) {
+                        $result = null;
+                    } else {
+                        $result = new NudgeCommand($user, $other);
+                    }
                 }
                 break;
             case 'stats':
                 if ($arg) {
                     $result = null;
+                } else {
+                    $result = new StatsCommand($user);
                 }
-                $result = new StatsCommand($user);
                 break;
             case 'invite':
                 if (!$arg) {
                     $result = null;
-                }
-                list($other, $extra) = $this->split_arg($arg);
-                if ($extra) {
-                    $result = null;
                 } else {
-                    $result = new InviteCommand($user, $other);
+                    list($other, $extra) = $this->split_arg($arg);
+                    if ($extra) {
+                        $result = null;
+                    } else {
+                        $result = new InviteCommand($user, $other);
+                    }
                 }
                 break;
             case 'track':
                 if (!$arg) {
                     $result = null;
-                }
-                list($word, $extra) = $this->split_arg($arg);
-                if ($extra) {
-                    $result = null;
-                } else if ($word == 'off') {
-                    $result = new TrackOffCommand($user);
                 } else {
-                    $result = new TrackCommand($user, $word);
+                    list($word, $extra) = $this->split_arg($arg);
+                    if ($extra) {
+                        $result = null;
+                    } else if ($word == 'off') {
+                        $result = new TrackOffCommand($user);
+                    } else {
+                        $result = new TrackCommand($user, $word);
+                    }
                 }
                 break;
             case 'untrack':
                 if (!$arg) {
                     $result = null;
-                }
-                list($word, $extra) = $this->split_arg($arg);
-                if ($extra) {
-                    $result = null;
-                } else if ($word == 'all') {
-                    $result = new TrackOffCommand($user);
                 } else {
-                    $result = new UntrackCommand($user, $word);
+                    list($word, $extra) = $this->split_arg($arg);
+                    if ($extra) {
+                        $result = null;
+                    } else if ($word == 'all') {
+                        $result = new TrackOffCommand($user);
+                    } else {
+                        $result = new UntrackCommand($user, $word);
+                    }
                 }
                 break;
             case 'tracks':
             case 'tracking':
                 if ($arg) {
                     $result = null;
+                } else {
+                    $result = new TrackingCommand($user);
                 }
-                $result = new TrackingCommand($user);
                 break;
             default:
                 $result = false;

From bf8a3c1931f0c84fa3981e929b61d6e0b5bbc5e8 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 21 Feb 2011 16:20:10 -0500
Subject: [PATCH 289/314] disallow login for users without validated email

---
 .../RequireValidatedEmailPlugin.php                   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
index 980b7beb6e..ad6503e0b7 100644
--- a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
+++ b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
@@ -24,6 +24,8 @@
  * @package   StatusNet
  * @author    Craig Andrews <candrews@integralblue.com>
  * @author    Brion Vibber <brion@status.net>
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet Inc. http://status.net/
  * @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/
@@ -75,6 +77,12 @@ class RequireValidatedEmailPlugin extends Plugin
 
     public $trustedOpenIDs = array();
 
+    /**
+     * Whether or not to disallow login for unvalidated users.
+     */
+
+    public $disallowLogin = false;
+
     /**
      * Event handler for notice saves; rejects the notice
      * if user's address isn't validated.
@@ -246,7 +254,8 @@ class RequireValidatedEmailPlugin extends Plugin
      */
     function onUserRightsCheck(Profile $profile, $right, &$result)
     {
-        if ($right == Right::CREATEGROUP) {
+        if ($right == Right::CREATEGROUP ||
+            ($this->disallowLogin && ($right == Right::WEBLOGIN || $right == Right::API))) {
             $user = User::staticGet('id', $profile->id);
             if ($user && !$this->validated($user)) {
                 $result = false;

From 8e7c279c9eaf1db6367f5bbf8e833698f50eca92 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 21 Feb 2011 14:14:32 -0800
Subject: [PATCH 290/314] Fix issue #3035: search highlighting broke URLs in
 some imported messages (Twitter)

Search highlighting was being done with a regex on raw HTML text, followed by a second regex undoing replacements within double-quoted attribute values.
This broke on imported Twitter messages, as the way we generate the markup uses single quotes on the attributes, which didn't get matched by the second regex.
I've replaced this do-then-undo cycle by dividing up the import HTML into freetext spans and tags; the freetext gets replaced, while the tags are left untouched.
---
 actions/noticesearch.php | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index d0673420d6..5814dec8af 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -193,13 +193,20 @@ class SearchNoticeListItem extends NoticeListItem {
         $options = implode('|', array_map('preg_quote', array_map('htmlspecialchars', $terms),
                                                             array_fill(0, sizeof($terms), '/')));
         $pattern = "/($options)/i";
-        $result  = preg_replace($pattern, '<strong>\\1</strong>', $text);
+        $result = '';
+
+        /* Divide up into text (highlight me) and tags (don't touch) */
+        $chunks = preg_split('/(<[^>]+>)/', $text, 0, PREG_SPLIT_DELIM_CAPTURE);
+        foreach ($chunks as $i => $chunk) {
+            if ($i % 2 == 1) {
+                // odd: delimiter (tag)
+                $result .= $chunk;
+            } else {
+                // even: freetext between tags
+                $result .= preg_replace($pattern, '<strong>\\1</strong>', $chunk);
+            }
+        }
 
-        /* Remove highlighting from inside links, loop incase multiple highlights in links */
-        $pattern = '/(\w+="[^"]*)<strong>('.$options.')<\/strong>([^"]*")/iU';
-        do {
-            $result = preg_replace($pattern, '\\1\\2\\3', $result, -1, $count);
-        } while ($count);
         return $result;
     }
 }

From 3fb4b92cd6ed09555c558cab7e33c3df988a7bfe Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 21 Feb 2011 15:01:57 -0800
Subject: [PATCH 291/314] Fix ticket #3001: Twitter bridge was replacing
 original form of @-mentions with canonical form unexpectedly

Now using the original text form of @-mentions and #-tags, as in Twitter's own HTMLification.
Canonical forms are still used in generating links, where it's polite to match the canonical form.
---
 plugins/TwitterBridge/twitterimport.php | 29 +++++++++++++------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/plugins/TwitterBridge/twitterimport.php b/plugins/TwitterBridge/twitterimport.php
index 475a99efac..2067196d36 100644
--- a/plugins/TwitterBridge/twitterimport.php
+++ b/plugins/TwitterBridge/twitterimport.php
@@ -583,15 +583,16 @@ class TwitterImport
 
         foreach ($toReplace as $part) {
             list($type, $object) = $part;
+            $orig = mb_substr($text, $object->indices[0], $object->indices[1] - $object->indices[0]);
             switch($type) {
             case self::URL:
-                $linkText = $this->makeUrlLink($object);
+                $linkText = $this->makeUrlLink($object, $orig);
                 break;
             case self::HASHTAG:
-                $linkText = $this->makeHashtagLink($object);
+                $linkText = $this->makeHashtagLink($object, $orig);
                 break;
             case self::MENTION:
-                $linkText = $this->makeMentionLink($object);
+                $linkText = $this->makeMentionLink($object, $orig);
                 break;
             default:
                 continue;
@@ -601,32 +602,32 @@ class TwitterImport
         return $text;
     }
 
-    function makeUrlLink($object)
+    function makeUrlLink($object, $orig)
     {
-        return "<a href='{$object->url}' class='extlink'>{$object->url}</a>";
+        return "<a href='{$object->url}' class='extlink'>{$orig}</a>";
     }
 
-    function makeHashtagLink($object)
+    function makeHashtagLink($object, $orig)
     {
-        return "#" . self::tagLink($object->text);
+        return "#" . self::tagLink($object->text, substr($orig, 1));
     }
 
-    function makeMentionLink($object)
+    function makeMentionLink($object, $orig)
     {
-        return "@".self::atLink($object->screen_name, $object->name);
+        return "@".self::atLink($object->screen_name, $object->name, substr($orig, 1));
     }
 
-    static function tagLink($tag)
+    static function tagLink($tag, $orig)
     {
-        return "<a href='https://search.twitter.com/search?q=%23{$tag}' class='hashtag'>{$tag}</a>";
+        return "<a href='https://search.twitter.com/search?q=%23{$tag}' class='hashtag'>{$orig}</a>";
     }
 
-    static function atLink($screenName, $fullName=null)
+    static function atLink($screenName, $fullName, $orig)
     {
         if (!empty($fullName)) {
-            return "<a href='http://twitter.com/#!/{$screenName}' title='{$fullName}'>{$screenName}</a>";
+            return "<a href='http://twitter.com/#!/{$screenName}' title='{$fullName}'>{$orig}</a>";
         } else {
-            return "<a href='http://twitter.com/#!/{$screenName}'>{$screenName}</a>";
+            return "<a href='http://twitter.com/#!/{$screenName}'>{$orig}</a>";
         }
     }
 

From f3c822cc1520720a4bb63e3c610076571d90b520 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 21 Feb 2011 15:52:12 -0800
Subject: [PATCH 292/314] Ticket #3011: Add attachments/uploads and
 attachments/file_quota to api/statusnet/config.(xml|json)

file_quota is adjusted from the defined value to take into account the maximum upload size limits in PHP, or cropped to 0 if uploads are disabled.
This can be used by client apps to determine maximum size for an attachment.
---
 actions/apistatusnetconfig.php | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/actions/apistatusnetconfig.php b/actions/apistatusnetconfig.php
index 771a95baec..b34c6cc544 100644
--- a/actions/apistatusnetconfig.php
+++ b/actions/apistatusnetconfig.php
@@ -59,7 +59,8 @@ class ApiStatusnetConfigAction extends ApiAction
         'notice' => array('contentlimit'),
         'throttle' => array('enabled', 'count', 'timespan'),
         'xmpp' => array('enabled', 'server', 'port', 'user'),
-        'integration' => array('source')
+        'integration' => array('source'),
+        'attachments' => array('uploads', 'file_quota')
     );
 
     /**
@@ -96,7 +97,7 @@ class ApiStatusnetConfigAction extends ApiAction
             foreach ($this->keys as $section => $settings) {
                 $this->elementStart($section);
                 foreach ($settings as $setting) {
-                    $value = common_config($section, $setting);
+                    $value = $this->setting($section, $setting);
                     if (is_array($value)) {
                         $value = implode(',', $value);
                     } else if ($value === false || $value == '0') {
@@ -125,7 +126,7 @@ class ApiStatusnetConfigAction extends ApiAction
                 $result[$section] = array();
                 foreach ($settings as $setting) {
                     $result[$section][$setting]
-                        = common_config($section, $setting);
+                        = $this->setting($section, $setting);
                 }
             }
             $this->initDocument('json');
@@ -143,6 +144,20 @@ class ApiStatusnetConfigAction extends ApiAction
         }
     }
 
+    function setting($section, $key) {
+        $result = common_config($section, $key);
+        if ($key == 'file_quota') {
+            // hack: adjust for the live upload limit
+            if (common_config($section, 'uploads')) {
+                $max = ImageFile::maxFileSizeInt();
+            } else {
+                $max = 0;
+            }
+            return min($result, $max);
+        }
+        return $result;
+    }
+
     /**
      * Return true if read only.
      *

From 2a42dac72aa3000aa4b442ee722a13e12dda3319 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 21 Feb 2011 16:10:07 -0800
Subject: [PATCH 293/314] Partial implementation for ticket #2442:
 MobileProfile plugin should allow manual switching between regular and mobile
 rendering modes

http://status.net/open-source/issues/2442

Notes:
* Mapstraction causes JavaScript errors in XHTML mode, breaking our code if we're run later so the link doesn't work to get back to Desktop.
* not 100% sure how safe feature detection is here?
* Currently will be useless but visible links if no JS available; need to fall back to server-side for limited browsers
---
 lib/action.php                                |  7 ++--
 plugins/MobileProfile/MobileProfilePlugin.php | 36 ++++++++++++++++++-
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 26ebd20932..173e2c2a58 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -854,8 +854,11 @@ class Action extends HTMLOutputter // lawsuit
     function showFooter()
     {
         $this->elementStart('div', array('id' => 'footer'));
-        $this->showSecondaryNav();
-        $this->showLicenses();
+        if (Event::handle('StartShowInsideFooter', array($this))) {
+            $this->showSecondaryNav();
+            $this->showLicenses();
+            Event::handle('EndShowInsideFooter', array($this));
+        }
         $this->elementEnd('div');
     }
 
diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php
index b9c25ab998..ec08fa1e2c 100644
--- a/plugins/MobileProfile/MobileProfilePlugin.php
+++ b/plugins/MobileProfile/MobileProfilePlugin.php
@@ -68,6 +68,9 @@ class MobileProfilePlugin extends WAP20Plugin
             $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'])) {
 
             $this->serveMobile = true;
+        } else if (isset($_COOKIE['MobileOverride'])) {
+            // Cookie override is controlled by link at bottom.
+            $this->serveMobile = (bool)$_COOKIE['MobileOverride'];
         } else {
             // If they like the WAP 2.0 mimetype, serve them MP
             // @fixme $type is undefined, making this if case useless and spewing errors.
@@ -381,9 +384,40 @@ class MobileProfilePlugin extends WAP20Plugin
         }
     }
 
-    function onStartShowScripts($action)
+    function onEndShowScripts($action)
     {
+        $action->inlineScript('
+            $(function() {
+                $("#mobile-toggle-disable").click(function() {
+                    $.cookie("MobileOverride", "0", {path: "/"});
+                    window.location.reload();
+                    return false;
+                });
+                $("#mobile-toggle-enable").click(function() {
+                    $.cookie("MobileOverride", "1", {path: "/"});
+                    window.location.reload();
+                    return false;
+                });
+            });'
+        );
+    }
 
+
+    function onEndShowInsideFooter($action)
+    {
+        if ($this->serveMobile) {
+            // TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
+            $linkText = _m('Switch to desktop site layout.');
+            $key = 'mobile-toggle-disable';
+        } else {
+            // TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
+            $linkText = _m('Switch to mobile site layout.');
+            $key = 'mobile-toggle-enable';
+        }
+        $action->elementStart('p');
+        $action->element('a', array('href' => '#', 'id' => $key), $linkText);
+        $action->elementEnd('p');
+        return true;
     }
 
     function _common_path($relative, $ssl=false)

From 8eca1b8daccf722b1ad06bdc128f5742bd6b0a80 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 21 Feb 2011 16:18:45 -0800
Subject: [PATCH 294/314] Fix ticket #3057: apply HTML escaping on special
 characters in Twitter import

Changes the replacement of Twitter "entities" from in-place reverse ordering ('to preserve indices') to a forward-facing append-in-chunks that pulls in both the text and link portions, and escapes them all.
This unfortunately means first *de*-escaping the &lt; and &gt; that Twitter helpfully adds for us.... and any literal &blah;s that get written. This seems to match Twitter's web UI, however horrid it is.
---
 plugins/TwitterBridge/twitterimport.php | 42 ++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/plugins/TwitterBridge/twitterimport.php b/plugins/TwitterBridge/twitterimport.php
index 2067196d36..5ddf5380d7 100644
--- a/plugins/TwitterBridge/twitterimport.php
+++ b/plugins/TwitterBridge/twitterimport.php
@@ -554,8 +554,8 @@ class TwitterImport
         }
 
         // Move all the entities into order so we can
-        // replace them in reverse order and thus
-        // not mess up their indices
+        // replace them and escape surrounding plaintext
+        // in order
 
         $toReplace = array();
 
@@ -577,13 +577,23 @@ class TwitterImport
             }
         }
 
-        // sort in reverse order by key
+        // sort in forward order by key
 
-        krsort($toReplace);
+        ksort($toReplace);
+
+        $result = '';
+        $cursor = 0;
 
         foreach ($toReplace as $part) {
             list($type, $object) = $part;
-            $orig = mb_substr($text, $object->indices[0], $object->indices[1] - $object->indices[0]);
+            $start = $object->indices[0];
+            $end = $object->indices[1];
+            if ($cursor < $start) {
+                // Copy in the preceding plaintext
+                $result .= $this->twitEscape(mb_substr($text, $cursor, $start - $cursor));
+                $cursor = $start;
+            }
+            $orig = $this->twitEscape(mb_substr($text, $start, $end - $start));
             switch($type) {
             case self::URL:
                 $linkText = $this->makeUrlLink($object, $orig);
@@ -595,11 +605,29 @@ class TwitterImport
                 $linkText = $this->makeMentionLink($object, $orig);
                 break;
             default:
+                $linkText = $orig;
                 continue;
             }
-            $text = mb_substr($text, 0, $object->indices[0]) . $linkText . mb_substr($text, $object->indices[1]);
+            $result .= $linkText;
+            $cursor = $end;
         }
-        return $text;
+        $last = $this->twitEscape(mb_substr($text, $cursor));
+        $result .= $last;
+
+        return $result;
+    }
+
+    function twitEscape($str)
+    {
+        // Twitter seems to preemptive turn < and > into &lt; and &gt;
+        // but doesn't for &, so while you may have some magic protection
+        // against XSS by not bothing to escape manually, you still get
+        // invalid XHTML. Thanks!
+        //
+        // Looks like their web interface pretty much sends anything
+        // through intact, so.... to do equivalent, decode all entities
+        // and then re-encode the special ones.
+        return htmlspecialchars(html_entity_decode($str, ENT_COMPAT, 'UTF-8'));
     }
 
     function makeUrlLink($object, $orig)

From 1be22260197c058dead7baccbfc074d06771c4b3 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 23 Feb 2011 16:32:56 -0800
Subject: [PATCH 295/314] replace router regexes with tags with a fixed chunk
 that takes any non-/ char. This'll let other code decide what's a valid tag.

---
 lib/router.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/router.php b/lib/router.php
index c8e1c365a5..69b27da21c 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -116,6 +116,8 @@ class Router
     static $bare = array('requesttoken', 'accesstoken', 'userauthorization',
                          'postnotice', 'updateprofile', 'finishremotesubscribe');
 
+    const REGEX_TAG = '[^\/]+'; // [\pL\pN_\-\.]{1,64} better if we can do unicode regexes
+
     static function get()
     {
         if (!Router::$inst) {
@@ -348,14 +350,14 @@ class Router
             $m->connect('tag', array('action' => 'publictagcloud'));
             $m->connect('tag/:tag/rss',
                         array('action' => 'tagrss'),
-                        array('tag' => '[\pL\pN_\-\.]{1,64}'));
+                        array('tag' => self::REGEX_TAG));
             $m->connect('tag/:tag',
                         array('action' => 'tag'),
-                        array('tag' => '[\pL\pN_\-\.]{1,64}'));
+                        array('tag' => self::REGEX_TAG));
 
             $m->connect('peopletag/:tag',
                         array('action' => 'peopletag'),
-                        array('tag' => '[a-zA-Z0-9]+'));
+                        array('tag' => self::REGEX_TAG));
 
             // groups
 
@@ -812,7 +814,7 @@ class Router
                     $m->connect($a.'/:tag',
                                 array('action' => $a,
                                       'nickname' => $nickname),
-                                array('tag' => '[a-zA-Z0-9]+'));
+                                array('tag' => self::REGEX_TAG));
                 }
 
                 foreach (array('rss', 'groups') as $a) {
@@ -839,12 +841,12 @@ class Router
                 $m->connect('tag/:tag/rss',
                             array('action' => 'userrss',
                                   'nickname' => $nickname),
-                            array('tag' => '[\pL\pN_\-\.]{1,64}'));
+                            array('tag' => self::REGEX_TAG));
 
                 $m->connect('tag/:tag',
                             array('action' => 'showstream',
                                   'nickname' => $nickname),
-                            array('tag' => '[\pL\pN_\-\.]{1,64}'));
+                            array('tag' => self::REGEX_TAG));
 
                 $m->connect('rsd.xml',
                             array('action' => 'rsd',
@@ -875,7 +877,7 @@ class Router
                 foreach (array('subscriptions', 'subscribers') as $a) {
                     $m->connect(':nickname/'.$a.'/:tag',
                                 array('action' => $a),
-                                array('tag' => '[a-zA-Z0-9]+',
+                                array('tag' => self::REGEX_TAG,
                                       'nickname' => Nickname::DISPLAY_FMT));
                 }
 
@@ -903,12 +905,12 @@ class Router
                 $m->connect(':nickname/tag/:tag/rss',
                             array('action' => 'userrss'),
                             array('nickname' => Nickname::DISPLAY_FMT),
-                            array('tag' => '[\pL\pN_\-\.]{1,64}'));
+                            array('tag' => self::REGEX_TAG));
 
                 $m->connect(':nickname/tag/:tag',
                             array('action' => 'showstream'),
                             array('nickname' => Nickname::DISPLAY_FMT),
-                            array('tag' => '[\pL\pN_\-\.]{1,64}'));
+                            array('tag' => self::REGEX_TAG));
 
                 $m->connect(':nickname/rsd.xml',
                             array('action' => 'rsd'),

From 295e2bde565d9f057c4b6c3f5e4a9ae4195ede26 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 23 Feb 2011 16:37:55 -0800
Subject: [PATCH 296/314] Unicodize a couple regexes for tags: fixes linking &
 detection of non-ASCII tags that match the current regexes. (Checks for
 'letter' and 'number' characters, underscore, dash, and period.)

---
 classes/Notice.php | 2 +-
 lib/util.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/Notice.php b/classes/Notice.php
index c9cca8a969..a640919094 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -153,7 +153,7 @@ class Notice extends Memcached_DataObject
     function saveTags()
     {
         /* extract all #hastags */
-        $count = preg_match_all('/(?:^|\s)#([\pL\pN_\-\.]{1,64})/', strtolower($this->content), $match);
+        $count = preg_match_all('/(?:^|\s)#([\pL\pN_\-\.]{1,64})/u', strtolower($this->content), $match);
         if (!$count) {
             return true;
         }
diff --git a/lib/util.php b/lib/util.php
index 85f49e4c59..b710a4391b 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -784,7 +784,7 @@ function common_render_text($text)
 
     $r = preg_replace('/[\x{0}-\x{8}\x{b}-\x{c}\x{e}-\x{19}]/', '', $r);
     $r = common_replace_urls_callback($r, 'common_linkify');
-    $r = preg_replace('/(^|\&quot\;|\'|\(|\[|\{|\s+)#([\pL\pN_\-\.]{1,64})/e', "'\\1#'.common_tag_link('\\2')", $r);
+    $r = preg_replace('/(^|\&quot\;|\'|\(|\[|\{|\s+)#([\pL\pN_\-\.]{1,64})/ue', "'\\1#'.common_tag_link('\\2')", $r);
     // XXX: machine tags
     return $r;
 }

From 65dbf485e401cfd04c32acd7e635b377928e4fab Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 24 Feb 2011 12:52:31 -0800
Subject: [PATCH 297/314] FacebookBridge - make a huge fuss if we can't create
 a valid Facebookclient

---
 plugins/FacebookBridge/lib/facebookclient.php | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/plugins/FacebookBridge/lib/facebookclient.php b/plugins/FacebookBridge/lib/facebookclient.php
index 030a75caed..80e3331824 100644
--- a/plugins/FacebookBridge/lib/facebookclient.php
+++ b/plugins/FacebookBridge/lib/facebookclient.php
@@ -51,7 +51,14 @@ class Facebookclient
     function __construct($notice)
     {
         $this->facebook = self::getFacebook();
-        $this->notice   = $notice;
+
+        if (empty($this->facebook)) {
+            throw new FacebookApiException(
+                "Could not create Facebook client! Bad application ID or secret?"
+            );
+        }
+
+        $this->notice = $notice;
 
         $this->flink = Foreign_link::getByUserID(
             $notice->profile_id,
@@ -89,6 +96,22 @@ class Facebookclient
             $secret = common_config('facebook', 'global_secret');
         }
 
+        if (empty($appId)) {
+            common_log(
+                LOG_WARNING,
+                "Couldn't find Facebook application ID!",
+                __FILE__
+            );
+        }
+
+        if (empty($secret)) {
+            common_log(
+                LOG_WARNING,
+                "Couldn't find Facebook application ID!",
+                __FILE__
+            );
+        }
+
         return new Facebook(
             array(
                'appId'  => $appId,

From c44a622449757fe13dc30ce120af07aa03ac5dc4 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 24 Feb 2011 12:59:37 -0800
Subject: [PATCH 298/314] FacebookBridge - Add lots of debug output (revert me)

---
 plugins/FacebookBridge/lib/facebookclient.php | 11 ++++++++
 .../lib/facebookqueuehandler.php              | 26 +++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/plugins/FacebookBridge/lib/facebookclient.php b/plugins/FacebookBridge/lib/facebookclient.php
index 80e3331824..da8c95c9f2 100644
--- a/plugins/FacebookBridge/lib/facebookclient.php
+++ b/plugins/FacebookBridge/lib/facebookclient.php
@@ -128,6 +128,7 @@ class Facebookclient
      */
     static function facebookBroadcastNotice($notice)
     {
+        common_debug("ZZZZZ facebookBroadcastNotice() - entered ", __FILE__);
         $client = new Facebookclient($notice);
         return $client->sendNotice();
     }
@@ -137,6 +138,8 @@ class Facebookclient
      */
     function isFacebookBound() {
 
+        common_debug("ZZZZZ isFacebookBound() - entered", __FILE__);
+
         if (empty($this->flink)) {
             // User hasn't setup bridging
             return false;
@@ -175,6 +178,14 @@ class Facebookclient
             return true;
         }
 
+        common_debug(
+            sprintf(
+                "ZZZZZ isFacebookBound() - notice %d this notice does not go to Facebook",
+                $this->notice->id
+            ),
+            __FILE__
+        );
+
         return false;
     }
 
diff --git a/plugins/FacebookBridge/lib/facebookqueuehandler.php b/plugins/FacebookBridge/lib/facebookqueuehandler.php
index 1e82ff01b1..f1e857090b 100644
--- a/plugins/FacebookBridge/lib/facebookqueuehandler.php
+++ b/plugins/FacebookBridge/lib/facebookqueuehandler.php
@@ -40,9 +40,35 @@ class FacebookQueueHandler extends QueueHandler
 
     function handle($notice)
     {
+        common_debug(
+            sprintf(
+                'ZZZZZ handle() - Looking at notice %d',
+                $notice->id
+            ),
+            __FILE__
+        );
+
         if ($this->_isLocal($notice)) {
+
+            common_debug(
+                sprintf(
+                    'ZZZZZ handle() - notice %d is local; will try sending to Facebook.',
+                    $notice->id
+                ),
+                __FILE__
+            );
+
             return Facebookclient::facebookBroadcastNotice($notice);
         }
+
+        common_debug(
+            sprintf(
+                'ZZZZZ handle() - notice %d was not a local notice, so we wont rebroadcast it.',
+                $notice->id
+            ),
+            __FILE__
+        );
+
         return true;
     }
 

From de6d46ea4b2a59bdcc66333650e585703401aadb Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 24 Feb 2011 13:29:56 -0800
Subject: [PATCH 299/314] FacebookBridge - dequeue messages that aren't bound
 for Facebook

---
 plugins/FacebookBridge/lib/facebookclient.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/FacebookBridge/lib/facebookclient.php b/plugins/FacebookBridge/lib/facebookclient.php
index da8c95c9f2..6037ad0f2d 100644
--- a/plugins/FacebookBridge/lib/facebookclient.php
+++ b/plugins/FacebookBridge/lib/facebookclient.php
@@ -208,6 +208,9 @@ class Facebookclient
                 return $this->sendGraph();
             }
         }
+
+        // dequeue
+        return true;
     }
 
     /*

From 7d50189ec2d7523324a7e724715058c6fb91b7d3 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 24 Feb 2011 13:57:21 -0800
Subject: [PATCH 300/314] FacebookBridge - Don't hinder autoloading if the
 Facebook ID and secret aren't set

---
 .../FacebookBridge/FacebookBridgePlugin.php   | 38 ++++++++-----------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/plugins/FacebookBridge/FacebookBridgePlugin.php b/plugins/FacebookBridge/FacebookBridgePlugin.php
index 7e17c2d7ec..37b931e23e 100644
--- a/plugins/FacebookBridge/FacebookBridgePlugin.php
+++ b/plugins/FacebookBridge/FacebookBridgePlugin.php
@@ -179,28 +179,22 @@ class FacebookBridgePlugin extends Plugin
         // Always add the admin panel route
         $m->connect('admin/facebook', array('action' => 'facebookadminpanel'));
 
-        // Only add these routes if an application has been setup on
-        // Facebook for the plugin to use.
-        if ($this->hasApplication()) {
-
-            $m->connect(
-                'main/facebooklogin',
-                array('action' => 'facebooklogin')
-            );
-            $m->connect(
-                'main/facebookfinishlogin',
-                array('action' => 'facebookfinishlogin')
-            );
-            $m->connect(
-                'settings/facebook',
-                array('action' => 'facebooksettings')
-            );
-            $m->connect(
-                'facebook/deauthorize',
-                array('action' => 'facebookdeauthorize')
-            );
-
-        }
+        $m->connect(
+            'main/facebooklogin',
+            array('action' => 'facebooklogin')
+        );
+        $m->connect(
+            'main/facebookfinishlogin',
+            array('action' => 'facebookfinishlogin')
+        );
+        $m->connect(
+            'settings/facebook',
+            array('action' => 'facebooksettings')
+        );
+        $m->connect(
+            'facebook/deauthorize',
+            array('action' => 'facebookdeauthorize')
+        );
 
         return true;
     }

From 77c280a48b3c3a5582b20a2a1b7c1b0d045760c1 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 24 Feb 2011 14:21:50 -0800
Subject: [PATCH 301/314] Revert "FacebookBridge - Add lots of debug output
 (revert me)"

This reverts commit c44a622449757fe13dc30ce120af07aa03ac5dc4.
---
 plugins/FacebookBridge/lib/facebookclient.php | 11 --------
 .../lib/facebookqueuehandler.php              | 26 -------------------
 2 files changed, 37 deletions(-)

diff --git a/plugins/FacebookBridge/lib/facebookclient.php b/plugins/FacebookBridge/lib/facebookclient.php
index 6037ad0f2d..516f252d98 100644
--- a/plugins/FacebookBridge/lib/facebookclient.php
+++ b/plugins/FacebookBridge/lib/facebookclient.php
@@ -128,7 +128,6 @@ class Facebookclient
      */
     static function facebookBroadcastNotice($notice)
     {
-        common_debug("ZZZZZ facebookBroadcastNotice() - entered ", __FILE__);
         $client = new Facebookclient($notice);
         return $client->sendNotice();
     }
@@ -138,8 +137,6 @@ class Facebookclient
      */
     function isFacebookBound() {
 
-        common_debug("ZZZZZ isFacebookBound() - entered", __FILE__);
-
         if (empty($this->flink)) {
             // User hasn't setup bridging
             return false;
@@ -178,14 +175,6 @@ class Facebookclient
             return true;
         }
 
-        common_debug(
-            sprintf(
-                "ZZZZZ isFacebookBound() - notice %d this notice does not go to Facebook",
-                $this->notice->id
-            ),
-            __FILE__
-        );
-
         return false;
     }
 
diff --git a/plugins/FacebookBridge/lib/facebookqueuehandler.php b/plugins/FacebookBridge/lib/facebookqueuehandler.php
index f1e857090b..1e82ff01b1 100644
--- a/plugins/FacebookBridge/lib/facebookqueuehandler.php
+++ b/plugins/FacebookBridge/lib/facebookqueuehandler.php
@@ -40,35 +40,9 @@ class FacebookQueueHandler extends QueueHandler
 
     function handle($notice)
     {
-        common_debug(
-            sprintf(
-                'ZZZZZ handle() - Looking at notice %d',
-                $notice->id
-            ),
-            __FILE__
-        );
-
         if ($this->_isLocal($notice)) {
-
-            common_debug(
-                sprintf(
-                    'ZZZZZ handle() - notice %d is local; will try sending to Facebook.',
-                    $notice->id
-                ),
-                __FILE__
-            );
-
             return Facebookclient::facebookBroadcastNotice($notice);
         }
-
-        common_debug(
-            sprintf(
-                'ZZZZZ handle() - notice %d was not a local notice, so we wont rebroadcast it.',
-                $notice->id
-            ),
-            __FILE__
-        );
-
         return true;
     }
 

From ecfb3b92880808e658cce967a3a33adecc2b955e Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 25 Feb 2011 08:00:55 -0800
Subject: [PATCH 302/314] allow passing an url to email confirmation function

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

diff --git a/lib/mail.php b/lib/mail.php
index 78361a3a38..ab22de404c 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -162,8 +162,12 @@ function mail_to_user(&$user, $subject, $body, $headers=array(), $address=null)
  *
  * @return success flag
  */
-function mail_confirm_address($user, $code, $nickname, $address)
+function mail_confirm_address($user, $code, $nickname, $address, $url=null)
 {
+    if (empty($url)) {
+        $url = common_local_url('confirmaddress', array('code' => $code));
+    }
+
     // TRANS: Subject for address confirmation email.
     $subject = _('Email address confirmation');
 
@@ -178,7 +182,8 @@ function mail_confirm_address($user, $code, $nickname, $address)
                       "Thanks for your time, \n%2\$s\n"),
                     $nickname,
                     common_config('site', 'name'),
-                    common_local_url('confirmaddress', array('code' => $code)));
+                    $url);
+
     $headers = array();
 
     return mail_to_user($user, $subject, $body, $headers, $address);

From 7c192dabe23dd2256ed3fb491853e69008b46521 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 25 Feb 2011 08:01:41 -0800
Subject: [PATCH 303/314] Let users who aren't allowed to login confirm their
 email separately

---
 .../RequireValidatedEmailPlugin.php           |  21 ++
 .../confirmfirstemail.php                     | 218 ++++++++++++++++++
 .../RequireValidatedEmail/registerbyemail.php |  80 +++++++
 3 files changed, 319 insertions(+)
 create mode 100644 plugins/RequireValidatedEmail/confirmfirstemail.php
 create mode 100644 plugins/RequireValidatedEmail/registerbyemail.php

diff --git a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
index ad6503e0b7..e6508adc7e 100644
--- a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
+++ b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
@@ -83,6 +83,27 @@ class RequireValidatedEmailPlugin extends Plugin
 
     public $disallowLogin = false;
 
+    function onAutoload($cls)
+    {
+        $dir = dirname(__FILE__);
+
+        switch ($cls)
+        {
+        case 'ConfirmfirstemailAction':
+            include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
+            return false;
+        default:
+            return true;
+        }
+    }
+
+    function onRouterInitialized($m)
+    {
+        $m->connect('main/confirmfirst/:code',
+                    array('action' => 'confirmfirstemail'));
+        return true;
+    }
+
     /**
      * Event handler for notice saves; rejects the notice
      * if user's address isn't validated.
diff --git a/plugins/RequireValidatedEmail/confirmfirstemail.php b/plugins/RequireValidatedEmail/confirmfirstemail.php
new file mode 100644
index 0000000000..bdf7c43a1b
--- /dev/null
+++ b/plugins/RequireValidatedEmail/confirmfirstemail.php
@@ -0,0 +1,218 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Action for confirming first email registration
+ * 
+ * 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  Confirmation
+ * @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  Action
+ * @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 ConfirmfirstemailAction extends Action
+{
+    public $confirm;
+    public $code;
+    public $password;
+    public $user;
+
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+
+    function prepare($argarray)
+    {
+        parent::prepare($argarray);
+        $user = common_current_user();
+
+        if (!empty($user)) {
+            throw new ClientException(_('You are already logged in.'));
+        }
+
+        $this->code = $this->trimmed('code');
+
+        $this->confirm = Confirm_address::staticGet('code', $this->code);
+
+        if (empty($this->confirm)) {
+            throw new ClientException(_('Confirmation code not found.'));
+            return;
+        }
+
+        $this->user = User::staticGet('id', $this->confirm->user_id);
+
+        if (empty($this->user)) {
+            throw new ServerException(_('No user for that confirmation code.'));
+        }
+
+        $type = $this->confirm->address_type;
+
+        if ($type != 'email') {
+            throw new ServerException(sprintf(_('Unrecognized address type %s.'), $type));
+        }
+
+        if (!empty($this->user->email) && $this->user->email == $confirm->address) {
+            // TRANS: Client error for an already confirmed email/jabber/sms address.
+            throw new ClientException(_('That address has already been confirmed.'));
+        }
+
+        if ($this->isPost()) {
+
+            $this->checkSessionToken();
+
+            $password = $this->trimmed('password');
+            $confirm  = $this->trimmed('confirm');
+
+            if (strlen($password) < 6) {
+                throw new ClientException(_('Password too short.'));
+                return;
+            } else if (0 != strcmp($password, $confirm)) {
+                throw new ClientException(_("Passwords don't match."));
+                return;
+            }
+
+            $this->password = $password;
+        }
+
+        return true;
+    }
+
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return void
+     */
+
+    function handle($argarray=null)
+    {
+        $homepage = common_local_url('all', 
+                                     array('nickname' => $this->user->nickname));
+
+        if ($this->isPost()) {
+            $this->confirmUser();
+            common_set_user($this->user);
+            common_real_login(true);
+            common_redirect($homepage, 303);
+        } else {
+            $this->showPage();
+        }
+        return;
+    }
+
+    function confirmUser()
+    {
+        $orig = clone($this->user);
+
+        $this->user->email = $this->confirm->address;
+
+        $this->user->updateKeys($orig);
+
+        $this->user->emailChanged();
+
+        $orig = clone($this->user);
+
+        $this->user->password = common_munge_password($this->password, $this->user->id);
+
+        $this->user->update($orig);
+
+        $this->confirm->delete();
+    }
+
+    function showContent()
+    {
+        $this->element('p', 'instructions',
+                       sprintf(_('You have confirmed the email address for your new user account %s. '.
+                                 'Use the form below to set your new password.'),
+                               $this->user->nickname));
+
+        $form = new ConfirmFirstEmailForm($this, $this->code);
+        $form->show();
+    }
+
+    function title()
+    {
+        return _('Set a password');
+    }
+}
+
+class ConfirmFirstEmailForm extends Form
+{
+    public $code;
+
+    function __construct($out, $code)
+    {
+        parent::__construct($out);
+        $this->code = $code;
+    }
+
+    function formLegend()
+    {
+        return _('Confirm email');
+    }
+
+    function action()
+    {
+        return common_local_url('confirmfirstemail',
+                                array('code' => $this->code));
+    }
+
+    function formData()
+    {
+        $this->out->elementStart('ul', 'form_data');
+        $this->out->elementStart('li');
+        $this->out->password('password', _('New password'),
+                             _('6 or more characters.'));
+        $this->out->elementEnd('li');
+        $this->out->elementStart('li');
+        $this->out->password('confirm', _('Confirm'),
+                             _('Same as password above.'));
+        $this->out->elementEnd('li');
+        $this->out->elementEnd('ul');
+    }
+
+    function formActions()
+    {
+        $this->out->submit('save', _('Save'));
+    }
+}
diff --git a/plugins/RequireValidatedEmail/registerbyemail.php b/plugins/RequireValidatedEmail/registerbyemail.php
new file mode 100644
index 0000000000..59c229b684
--- /dev/null
+++ b/plugins/RequireValidatedEmail/registerbyemail.php
@@ -0,0 +1,80 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../..'));
+
+$shortoptions = "e:";
+
+$helptext = <<<END_OF_REGISTERBYEMAIL_HELP
+USAGE: registerbyemail.php
+Registers a new user by email address and sends a confirmation email
+
+  -e email     Email to register
+
+END_OF_REGISTERBYEMAIL_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+$email = get_option_value('e', 'email');
+
+$parts = explode('@', $email);
+$nickname = common_nicknamize($parts[0]);
+
+$user = User::staticGet('nickname', $nickname);
+
+if (!empty($user)) {
+    $confirm = new Confirm_address();
+
+    $confirm->user_id      = $user->id;
+    $confirm->address_type = 'email';
+
+    if ($confirm->find(true)) {
+        $url = common_local_url('confirmfirstemail',
+                                array('code' => $confirm->code));
+
+        print "$url\n";
+    } else {
+        print "User not waiting for confirmation.\n";
+    }
+
+    exit;
+}
+
+$user = User::register(array('nickname' => $nickname,
+                             'password' => null));
+
+$confirm = new Confirm_address();
+$confirm->code = common_confirmation_code(128);
+$confirm->user_id = $user->id;
+$confirm->address = $email;
+$confirm->address_type = 'email';
+
+$confirm->insert();
+
+$url = common_local_url('confirmfirstemail',
+                        array('code' => $confirm->code));
+
+print "$url\n";
+
+mail_confirm_address($user,
+                     $confirm->code,
+                     $user->nickname,
+                     $email,
+                     $url);

From 09a3db628c6d99262ecd3a5518ee311e9d97d957 Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Fri, 25 Feb 2011 12:00:55 -0500
Subject: [PATCH 304/314] First revision of new theme, cleaner.

---
 theme/cleaner/css/display.css            | 809 +++++++++++++++++++++++
 theme/cleaner/css/ie.css                 |  81 +++
 theme/cleaner/css/mp-screen.css          | 204 ++++++
 theme/cleaner/default-avatar-mini.png    | Bin 0 -> 857 bytes
 theme/cleaner/default-avatar-profile.png | Bin 0 -> 3737 bytes
 theme/cleaner/default-avatar-stream.png  | Bin 0 -> 1791 bytes
 theme/cleaner/logo.png                   | Bin 0 -> 34760 bytes
 theme/cleaner/mobilelogo.png             | Bin 0 -> 9357 bytes
 theme/cleaner/theme.ini                  |   1 +
 9 files changed, 1095 insertions(+)
 create mode 100644 theme/cleaner/css/display.css
 create mode 100644 theme/cleaner/css/ie.css
 create mode 100644 theme/cleaner/css/mp-screen.css
 create mode 100644 theme/cleaner/default-avatar-mini.png
 create mode 100644 theme/cleaner/default-avatar-profile.png
 create mode 100644 theme/cleaner/default-avatar-stream.png
 create mode 100644 theme/cleaner/logo.png
 create mode 100644 theme/cleaner/mobilelogo.png
 create mode 100644 theme/cleaner/theme.ini

diff --git a/theme/cleaner/css/display.css b/theme/cleaner/css/display.css
new file mode 100644
index 0000000000..2cb14702ab
--- /dev/null
+++ b/theme/cleaner/css/display.css
@@ -0,0 +1,809 @@
+/** theme: cleaner
+ *
+ * @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: #e2e2e2;
+    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: 940px;
+    margin: 0px auto;
+    padding: 0px 10px 10px 10px;
+    background-color: #fff;
+    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);
+}
+
+#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: -10px; 
+    margin-top: 0px;
+    height: 24px;
+    line-height: 20px;
+    text-align: right;
+    border-top: 10px solid #fff;
+    border-bottom: 1px solid #fff;
+}
+
+#site_nav_global_primary ul {
+    margin-right: -15px;
+    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: right;
+    margin-top: 0px;
+    width: 460px;
+    -webkit-border-radius: 6px;
+    -moz-border-radius: 6px;
+    border-radius: 6px;
+    background: #cdd1dd;
+}
+
+.form_notice fieldset {
+    width: 100%;
+}
+
+.form_notice textarea {
+    width: 328px;
+    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: 940px;
+    margin-left: 0px;
+    margin-top: 4px;
+}
+
+#content {
+    padding-top: 10px;
+    width: 610px;
+    margin-right: 0px;
+    padding-left: 10px;
+    padding-right: 20px;
+}
+
+#site_nav_local_views {
+    background-color: #7080aa;
+    -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;
+    height: 24px;
+    line-height: 20px;
+    margin-bottom: 0px;
+    padding-left: 0px;
+}
+
+#site_nav_local_views a {
+    color: #fff !important;
+    padding: 2px 12px 2px 12px;
+    display: block;
+    float: left;
+    height: 20px;
+    width: auto;
+    text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
+}
+
+#site_nav_local_views li:first-child a {
+    -webkit-border-top-left-radius: 6px;
+    -moz-border-radius-topleft: 6px;
+    border-top-left-radius: 6px;
+}
+
+#site_nav_local_views a:hover {
+    background: #8e98b4 !important;
+    color: #fff !important;
+    text-decoration: none;
+}
+
+#site_nav_local_views .current a {
+    text-decoration: none;
+    background: #8e98b4 !important;
+    color: #fff !important;
+}
+
+#aside_primary {
+    width: 290px;
+    padding-left: 10px;
+    padding-top: 14px;
+}
+
+#aside_primary .section {
+    width: 280px;
+    margin-left: 0px;
+    margin-right: 10px;
+
+}
+
+#aside_primary h2 {
+    font-size: 1.4em;
+    margin-bottom: 8px;
+    border-bottom: 2px solid #fff;
+}
+
+.section ul.entities {
+    width: 290px;
+}
+
+.section .entities li {
+    margin-right: 17px;
+    margin-bottom: 10px;
+    width: 24px;
+}
+
+#popular_notices .avatar {
+    position: relative;
+    top: 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 {
+    margin-bottom: 8px;
+    border-bottom: 2px solid #f2f2f2;
+}
+
+#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;
+}
+
+.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;
+}
+
+.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/cleaner/css/ie.css b/theme/cleaner/css/ie.css
new file mode 100644
index 0000000000..41f7dc9f88
--- /dev/null
+++ b/theme/cleaner/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/cleaner/css/mp-screen.css b/theme/cleaner/css/mp-screen.css
new file mode 100644
index 0000000000..d3f95db9b6
--- /dev/null
+++ b/theme/cleaner/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/cleaner/default-avatar-mini.png b/theme/cleaner/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/cleaner/default-avatar-profile.png b/theme/cleaner/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/cleaner/default-avatar-stream.png b/theme/cleaner/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/cleaner/logo.png b/theme/cleaner/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d6059a5d12904e686097569197246adc880443a
GIT binary patch
literal 34760
zcmeHPd2m(L89(<WAqzXQC4eM>Kotdrh#0j4h(fATb!a>8R&A}0wMxaJwZb@Bb*hy=
zv=yZ;RjZ>EajA-fOIuXbfB^*yCIpm5zy(Yo3FhV9{(dnBzMOaOecOHEVedEd%RS$6
zzH{z5-~G<H%gY^S%$(k{pr}A8)w6QOw6k!$7pTbVhQG_U4Y?Kv>(^&ZpQ@Iu9=ctr
zVpTb9%B;DTI%)p$dC&#q*9fdyQycQjSKucYfnWrJ5eP;gog-kS)A|2{Z!CF56UL3G
z_d3_=>e^9Z%bFQdk<qrY2E(=xurc^MY+G%|@xwOD`o}TjN;i1<IaqW-P^B<a2&nF;
zo{gaT+H~`JU0q(U#<r`JtuDfz_ApcL!heiddtmRL+<Pi2hBdp`WV|>CsuZROLB)Uy
zn=V#YZ#v($>{}rpX6oYO?Ro^`&Ev<7xZkoYJH9%ZV-*CIk8{E7)UzS-AO`hpU)<Vi
zX=_X5!by|L8hr8BMNWdC@@b&gtf?6oR@QTHcdSn?wVMs0NNC2<N0)5Yf=oXKLFK~?
zRaI5xSlNBwP?oCj!CjOKtbgmm&5??OC1V8->!PMGae<Z7cR{)WioL;=KPD$X^yE`d
z*;$GAuIp<AnJUFGU$v%Y2B!U`SZ;E=<)~gg^Ho7XuIiqjiz=3CYTB!sn)j;4-OZ}G
z<(pV8aARoyV!}})7sfU`uogj3r8xe$1FV9J32tr>J8EG6KB{nVUlk(bKzLTAc6_l*
z)o<I0xN*PPL+$Ok*)1c-j2W}r!A-`9g5@uTsaREAb0(_022{74Y&Cl15H+N*pKCy|
zdB)nH0e#eAqlT*d_E)yfokF+`YHrP&?X1llX%JK?%mtnyUFubR_^<)0fJ<GRl$V>M
zN{a`nP$(*+EvmiYJpC=ees7jKcR!Pvr69nPoR_Mq`T}H;sczK=^zW^D_Q-cryUMu_
zD;nI-Rgcgc_1>CIqg@R$KoJC0l9Le1X_<zqc}~@Hva{3>kHB!MBV_{-kX}n-mTjLZ
z?K7<$1XYqVVk>*RTUFleIV@*x=8kgDEN9vAzE^bgoo-<eR30OYyS$v0A8c}dPGqY?
z-Kr+Cr%KL;RpeGL6Xe;M(1{H0LwM4WrOx;JmU~d;=ko*H)TqG2M?|TN4yqtidCWb&
zMzHZjJL<Nqql)`2o^u#_v=pssi?};Mhn%x#w3`DW34$udu#X&B=V)OmtJYBgVN-J)
zPs-gYcgUMt_Ig?18?4NwAgE%@&G_-o%U{HfxCT`-Uc;nHUV(`RryEoCpU(P0P$fIM
zA@@wRyQxKm+pzOVlK9%DvC-or(1;2$Rgz<y>D4}P>tGuKYHR%$Zt9qFz7O2{O{=?I
zwzbM#dEhlcrb==S%EyjiP_1yQ{?*Ri>g$FkH?^yL53(FzG<(pB@kf-d@z5V|RS;Au
zOhL$s-04+)%ht~kSbMxoI_Y-rX;F1scHpapPU6mtt?uqD$UM&Nb~*EUnt?sS-p5+K
zcGE}bn&-Q?etmnWVMYB_R+jTM9Kqv*`fXn!Lq+{S$2e<i)A+F^Wq7Hb{D#f&m<~30
z_!-_d^_=K$0TLc-{sN|IZOvTEwx02-%w@5mp;>kBo`<g)y0w4Nz*jo_aF2I<%vP<f
zQ9ss+a*1E={4Udji=F<?W-WYCV3n5_c`YhYljbGB>zfcBj5=nE)oW{S!}2xPtA6S_
z`+*7LM*ci?Kk4`Ioeiq=58eJ2uq1{MSTEuloxWe{UkO)6bz`s4aZ^f4TKw~xK2OdI
ze)`(`PI~5&lw;-aH-I1de}dMRDioP@umlv(KL{$HqG0UU;XCbCbpitH4WC@n%_p{H
zolt&cnd_5$AKUWHRS;CZ4W&}$<s-h%&1#;G<?0C^+<us4hbzj*mi)&DUtQ`V*i)rp
zxH}#@@Y&L@l5%gWw?cO4RQy`m^NDCuzPq4Okg3uz$b8g*JH@NvdO@P@ah1P||Eo}W
zum%**HwdakXWg)WZ|z3cUpgSLu7P>nfyKMLY%6=l!Sb_rV<`5qelLG~uzC!@r_B!o
zT|qf$WFk-sJlYivCfWv`ad9bR=5i$j)H>A~o?Ko&I{CNKuHJo9l)=+vU<vRgK<Wit
z0=y1P0}A}gR1Bn-ft|oxz~w-?sR9kW0_+0#lJ`;|BdH@}J@3)EU6Jh2v<wX>X5z<y
ztpLC2x*w3=PB(z(Yb)MRv;pC4{PBYrRPw=JqaRLV_?QI!$-<^9+7!(tR*WcXPDt66
zs1-Hlc%695#4#n?67$$))_u{E`D0ddtobhiz5yNqLVjf`{`*2nW}{N)SNTA+nRMUz
ze?GCqEixTIR@b|G+dZZ{gLreC(Pd?RhQTG9udu!XzVHgFLKyS`;vxQbcS*?xRn%21
zof_p-+GP5U^+N*g)#4%cV;JBymhFDRA!|Mgo&M>DW!u-6m6dsYi=5kD+223$o*P>=
z$C>?SV8u;m!17Ii>m(}@jKa5p+kp~5(jYM0OYw=Xw&(Fv;OT4a5&ByI+GrG`>_mq_
z$PFLYY<`f&*Y<V5696~4y#bSS`<tPV?Qa3E+v9NvAn8gl4*}Hx({?c+X%v|2fW-jM
z<u`yE6+=N^wByyvelSS5&v+U*9dHb|s<pLuVH0nEi<<SYbE3l`oCCZHGy#VI^!H<6
zA;5M%10DxX1LC2HF!~$7*Gl}{l;7XzIp)UOiFmU?8#&HAPdU!#I8~&K9ex3jm7U7m
zl<~wg6{Fx}CuJM8u{fT9^71(9*1)Dn)MK$2kp7*@>uG3E3wUW;Z0P43`niT)vpjze
ztn}qn{<p3mk5$z*Q$$eRB6Xs?3}xw)7x%k{OzU|eGKk&Cf?_tn3rW{8kM+=<1emlE
z0@K#y$C#D$)pQdSr<zI!eivjfImo?4j~L2<;9mipPQox%BOq`ac+*z$k4eVIav6Lr
z0=SgMq9+{<!n;;L-o8}`MXYBXZIs$z$eA^HW8_3x5Hho8J1HT%3b+f9%O3+nQX!a!
z0N(W_LRBzc=T?E6Eg69{o&a$9nFTxyYzG*8l6WG;z@GtGpJ|zLA`dWW9t7H+1H1&_
zz)@ZYXdRDC*OGLb4?-yI$QO6OsZBpJ)on(bZ2w|_<HYge_%Nev1)TZ-u~Mtn)-FM|
z+R9fu?Skk(S3)GuO_x7`d?CQCf|luHDP$%c0)aWV>|-B*dqO4%U7yDr0Z9zDGXZJy
zIr!oZ^uy7Sm<?nlmVf48$*d-$U7FkuM*6r<DjmwaBDl2u31H@u^g}Sxmww<TZCGAl
z*pc@lKZ0sG8jyW^-=)D^7kRrF0d@7N>RMg|ZZrc5*$%fI3}~Gp>7O!bGZnl^<`~r(
z21kLHK6ZmQ=XjD~v(4}k#WGOzU`yqtV9d2L0-49}iDdPd<>n6mSKzqAuwHHOyc(FD
zGJ(w7>T&4Qg@8E`d%Zhr)mqAS3rJSwoJeAJxE|oXh(!OJSrDWHPKeZG$)Nn2!E+Vh
zTxjZ!!cfg5d*o#O7huXhRydi6G8=pccoldaSPA$^92lnmDZt^t;12Y}(Ij3?nLy8=
z6Ej6e*#C!tJAh>X_lipaGx#9dPg!=`rZy{U*M3P-C2kvHQHfzt2!6gHV|L=op=me@
zb(%@$s58J~RF*-deNjf-0IUbN=5k>Dpv&NdcO|3ZaK==h3G^H~!E9k>g+Y*A&;d@;
z;{eaC35cR_xO-hVyyw#>g}(ysr+OJKE5Q?9#Gp!vxcrgs26%_SCC-hQO&ENqxfvuN
z=SK8CAfABoYspQZd#<M3^qvH4b+u5c2Xwq(TrWQSIHRcxzDnS>AsO;z`D4S(1lI!G
z*qsgN3}rUJAiM;40Z5h@NNh(^4HzyT%!UoXqkyKcE@a4Y1^Q76@Zy>d90imES%9Qd
zzzhREmBKD8Z$Vp}SJ|(n;5WqR!#gqbG1Yqc(}uhP|Iop3zi=YJEH=JF#sdeE8#>Q@
z0}Wm1ILPIRG83^KeOFOt)blG-nfo%Qy_?arE6YAH6X|SJi1O9Ib$}%9zwVWSE-Z7I
z=H6(eX!BK+?-6`jihB8DkeI|t_!n@aq2Q*Ddk9J9gn6Z2UfGg(CF_8qJVz=~&I5Em
zr7Dp&S&vJXBxajLiF+xtfAsMga6Q0Dlw@v{sbjl$0Dl1{0_mi6hV$bMUb0LgPGpWV
z_h~XIMAhMB(HT=7@9>;X@(9Q!eGX=m6rfC*q_L7Q%DWA|7<`eC@h(sjC-P7!=qM-B
zCaW+DOPU~<@1e|nkR+!IgEk)nmjk)d80Efzd9hU)Hod`r05GFn3~=1P52TCkG#vi~
z{ON{_?2iBj;4m@<nd6)fy}6ngRlaq|Xw=w@@)N*p;8CCn&^jI$0w%Fj(uN!U$AF&#
zHv^K+1|w}*UJ0BF%mW$$Q@;Q*lg@`g+HvpoSAcEa1eo-92&6sBuLCawTq;c6GRPz`
zxS3V89sBtj@OyymZ2+{6$DM$Afm~_W(C#U~q{$FSUow+x+iJsRhE^Cy&V%&D@=L(2
zz$3tV0J6ge&wd+M%2}1urp#)$e-Uz%I0l?s>5q@2t^jTTMgyJ5vb(iER8#LkENgj{
z`M#i_lbdfDUb1oqOds-+V108&OnWEZTt|n%&u4&>EoB1%NymcO1Gw3na*n3lT%MOe
z-8R@(0w(cFGTT{b8iAi|*rgI>jP!WtxCXXz83Ef)PvfuIZ_WR*!=}@rKe#zSEuam}
zV=Hv`0p_I$(LUn3`6Xc1<p7(P)zOfB>|o2foJ?-)77P76l%0rvb^&IaOk-0VD*OO4
zr@&(BVhXwjpsxmCE|3dovQU@~JPXjj*{0^-hwc=>iSi)a4rp8Y8RuX)S=i7vm7t<~
zZVZ{KI2XEYdE}V<7Lex)b|10d{{&<mUA}jpRY!pXrHSR^fHA;mfDyX|*a*A<)B&-G
zo##X!53tNl#45ntSV7eOMDao#X<r630}Ql9z()Wx8Yj9Ba1r1}-JoDbsQ^O2y8zqd
zKsgcn#SPYp0DZHqHvxTqm!Z5A;N-i}P$(t=9H&tL_YCYiH&Dv~4!9d}=X(KA2=GE>
zhBv7P1oAen75qBGh;8Q!8IuCnXfGN7CC8iNH3Z;_LBG`i*Y8-wK5?8&0oLJI*8`ns
Y?u^BMte>-C4uzE`&z!bo>P0vI4+`<oVE_OC

literal 0
HcmV?d00001

diff --git a/theme/cleaner/mobilelogo.png b/theme/cleaner/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/cleaner/theme.ini b/theme/cleaner/theme.ini
new file mode 100644
index 0000000000..0209008d40
--- /dev/null
+++ b/theme/cleaner/theme.ini
@@ -0,0 +1 @@
+include=rebase

From 052ae2d88a8582f6e24eeb8203d426c77d8ac47e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 25 Feb 2011 10:25:13 -0800
Subject: [PATCH 305/314] Test cases for Unicode hashtags

---
 tests/HashTagDetectionTests.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tests/HashTagDetectionTests.php b/tests/HashTagDetectionTests.php
index 483d7135e1..47031d5bc4 100644
--- a/tests/HashTagDetectionTests.php
+++ b/tests/HashTagDetectionTests.php
@@ -42,6 +42,21 @@ class HashTagDetectionTests extends PHPUnit_Framework_TestCase
                            'say {#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('hello'))) . '" rel="tag">hello</a></span>} people'),
                      array('say \'#hello\' people',
                            'say \'#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('hello'))) . '" rel="tag">hello</a></span>\' people'),
+
+                     // Unicode legit letters
+                     array('#éclair yummy',
+                           '#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('éclair'))) . '" rel="tag">éclair</a></span> yummy'),
+                     array('#维基百科 zh.wikipedia!',
+                           '#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('维基百科'))) . '" rel="tag">维基百科</a></span> zh.wikipedia!'),
+                     array('#Россия russia',
+                           '#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('Россия'))) . '" rel="tag">Россия</a></span> russia'),
+
+                     // Unicode punctuators -- the ideographic "，" separates the tag, just as "," does
+                     array('#维基百科,zh.wikipedia!',
+                           '#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('维基百科'))) . '" rel="tag">维基百科</a></span>,zh.wikipedia!'),
+                     array('#维基百科，zh.wikipedia!',
+                           '#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('维基百科'))) . '" rel="tag">维基百科</a></span>，zh.wikipedia!'),
+
                      );
     }
 }

From 7f50315168338a76c02072ba64ea9f326b5c2729 Mon Sep 17 00:00:00 2001
From: Samantha Doherty <sammy@status.net>
Date: Fri, 25 Feb 2011 13:43:21 -0500
Subject: [PATCH 306/314] Quick fix for popular notices in cleaner theme.

---
 theme/cleaner/css/display.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/theme/cleaner/css/display.css b/theme/cleaner/css/display.css
index 2cb14702ab..8d27c64732 100644
--- a/theme/cleaner/css/display.css
+++ b/theme/cleaner/css/display.css
@@ -279,7 +279,8 @@ address {
 
 #popular_notices .avatar {
     position: relative;
-    top: 4px;
+    top: 2px;
+    margin-bottom: 4px;
 }
 
 #aside_primary td {

From 55b1f3d84c7390528634db5b95396a181e13003c Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 25 Feb 2011 11:04:57 -0800
Subject: [PATCH 307/314] Scalability work on user backup stream generation.

UserActivityStream -- used to create a full activity stream including subscriptions, favorites, notices, etc -- normally buffers everything into memory at once. This is infeasible for accounts with long histories of serious usage; it can take tens of seconds just to pull all records from the database, and working with them all in memory is very likely to hit resource limits.
This commit adds an alternate mode for this class which avoids pulling notices until during the actual output. Instead of pre-sorting and buffering all the notices, empty spaces between the other activities are filled in with notices as we're making output. This means more smaller queries spread out during operations, and less stuff kept in memory.

Callers (backupaccount action, and backupuser.php) which can stream their output pass an $outputMode param of UserActivityStream::OUTPUT_RAW, and during getString() it'll send straight to output as well as slurping the notices in this extra funky fashion.
Other callers will let it default to the OUTPUT_STRING mode, which keeps the previous behavior.

There should be a better way to do this, swapping out the stringer output for raw output more consitently.
---
 actions/backupaccount.php  |  4 +-
 lib/useractivitystream.php | 89 ++++++++++++++++++++++++++++++++++++--
 scripts/backupuser.php     |  2 +-
 3 files changed, 90 insertions(+), 5 deletions(-)

diff --git a/actions/backupaccount.php b/actions/backupaccount.php
index 928aba69ce..35458ca796 100644
--- a/actions/backupaccount.php
+++ b/actions/backupaccount.php
@@ -118,11 +118,13 @@ class BackupaccountAction extends Action
     {
         $cur = common_current_user();
 
-        $stream = new UserActivityStream($cur);
+        $stream = new UserActivityStream($cur, true, UserActivityStream::OUTPUT_RAW);
 
         header('Content-Disposition: attachment; filename='.$cur->nickname.'.atom');
         header('Content-Type: application/atom+xml; charset=utf-8');
 
+        // @fixme atom feed logic is in getString...
+        // but we just want it to output to the outputter.
         $this->raw($stream->getString());
     }
 
diff --git a/lib/useractivitystream.php b/lib/useractivitystream.php
index 53d0107aa9..d1e3e28fb8 100644
--- a/lib/useractivitystream.php
+++ b/lib/useractivitystream.php
@@ -29,15 +29,48 @@ class UserActivityStream extends AtomUserNoticeFeed
 {
     public $activities = array();
 
-    function __construct($user, $indent = true)
+    const OUTPUT_STRING = 1;
+    const OUTPUT_RAW = 2;
+    public $outputMode = self::OUTPUT_STRING;
+
+    /**
+     *
+     * @param User $user
+     * @param boolean $indent
+     * @param boolean $outputMode: UserActivityStream::OUTPUT_STRING to return a string,
+     *                           or UserActivityStream::OUTPUT_RAW to go to raw output.
+     *                           Raw output mode will attempt to stream, keeping less
+     *                           data in memory but will leave $this->activities incomplete.
+     */
+    function __construct($user, $indent = true, $outputMode = UserActivityStream::OUTPUT_STRING)
     {
         parent::__construct($user, null, $indent);
 
+        $this->outputMode = $outputMode;
+        if ($this->outputMode == self::OUTPUT_STRING) {
+            // String buffering? Grab all the notices now.
+            $notices = $this->getNotices();
+        } elseif ($this->outputMode == self::OUTPUT_RAW) {
+            // Raw output... need to restructure from the stringer init.
+            $this->xw = new XMLWriter();
+            $this->xw->openURI('php://output');
+            if(is_null($indent)) {
+                $indent = common_config('site', 'indent');
+            }
+            $this->xw->setIndent($indent);
+
+            // We'll fetch notices later.
+            $notices = array();
+        } else {
+            throw new Exception('Invalid outputMode provided to ' . __METHOD__);
+        }
+
+        // Assume that everything but notices is feasible
+        // to pull at once and work with in memory...
         $subscriptions = $this->getSubscriptions();
         $subscribers   = $this->getSubscribers();
         $groups        = $this->getGroups();
         $faves         = $this->getFaves();
-        $notices       = $this->getNotices();
 
         $objs = array_merge($subscriptions, $subscribers, $groups, $faves, $notices);
 
@@ -45,16 +78,44 @@ class UserActivityStream extends AtomUserNoticeFeed
 
         usort($objs, 'UserActivityStream::compareObject');
 
+        // We'll keep these around for later, and interleave them into
+        // the output stream with the user's notices.
         foreach ($objs as $obj) {
             $this->activities[] = $obj->asActivity();
         }
     }
 
+    /**
+     * Interleave the pre-sorted subs/groups/faves with the user's
+     * notices, all in reverse chron order.
+     */
     function renderEntries()
     {
+        $end = time() + 1;
         foreach ($this->activities as $act) {
+            $start = $act->time;
+
+            if ($this->outputMode == self::OUTPUT_RAW && $start != $end) {
+                // In raw mode, we haven't pre-fetched notices.
+                // Grab the chunks of notices between other activities.
+                $notices = $this->getNoticesBetween($start, $end);
+                foreach ($notices as $noticeAct) {
+                    $noticeAct->asActivity()->outputTo($this, false, false);
+                }
+            }
+
             // Only show the author sub-element if it's different from default user
             $act->outputTo($this, false, ($act->actor->id != $this->user->uri));
+
+            $end = $start;
+        }
+
+        if ($this->outputMode == self::OUTPUT_RAW) {
+            // Grab anything after the last pre-sorted activity.
+            $notices = $this->getNoticesBetween(0, $end);
+            foreach ($notices as $noticeAct) {
+                $noticeAct->asActivity()->outputTo($this, false, false);
+            }
         }
     }
 
@@ -121,7 +182,13 @@ class UserActivityStream extends AtomUserNoticeFeed
         return $faves;
     }
 
-    function getNotices()
+    /**
+     *
+     * @param int $start unix timestamp for earliest
+     * @param int $end unix timestamp for latest
+     * @return array of Notice objects
+     */
+    function getNoticesBetween($start=0, $end=0)
     {
         $notices = array();
 
@@ -129,6 +196,17 @@ class UserActivityStream extends AtomUserNoticeFeed
 
         $notice->profile_id = $this->user->id;
 
+        if ($start) {
+            $tsstart = common_sql_date($start);
+            $notice->whereAdd("created >= '$tsstart'");
+        }
+        if ($end) {
+            $tsend = common_sql_date($end);
+            $notice->whereAdd("created < '$tsend'");
+        }
+
+        $notice->orderBy('created DESC');
+
         if ($notice->find()) {
             while ($notice->fetch()) {
                 $notices[] = clone($notice);
@@ -138,6 +216,11 @@ class UserActivityStream extends AtomUserNoticeFeed
         return $notices;
     }
 
+    function getNotices()
+    {
+        return $this->getNoticesBetween();
+    }
+
     function getGroups()
     {
         $groups = array();
diff --git a/scripts/backupuser.php b/scripts/backupuser.php
index 49fc1cefdc..ee2951fc8f 100644
--- a/scripts/backupuser.php
+++ b/scripts/backupuser.php
@@ -36,7 +36,7 @@ require_once INSTALLDIR.'/scripts/commandline.inc';
 
 try {
     $user = getUser();
-    $actstr = new UserActivityStream($user);
+    $actstr = new UserActivityStream($user, true, UserActivityStream::OUTPUT_RAW);
     print $actstr->getString();
 } catch (Exception $e) {
     print $e->getMessage()."\n";

From 2b995c943f8548cbdc427f07c7e54790e5ea4672 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 25 Feb 2011 12:56:21 -0800
Subject: [PATCH 308/314] allow access to confirm first for not-logged-in users

---
 .../RequireValidatedEmailPlugin.php                      | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
index e6508adc7e..b6bd6f7e5f 100644
--- a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
+++ b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
@@ -285,4 +285,13 @@ class RequireValidatedEmailPlugin extends Plugin
         }
         return true;
     }
+
+    function onLoginAction($action, &$login)
+    {
+        if ($action == 'confirmfirstemail') {
+            $login = true;
+            return false;
+        }
+        return true;
+    }
 }

From 1508193df4ae846bdbc43cbb646e77e0eb20dc2d Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 25 Feb 2011 13:18:28 -0800
Subject: [PATCH 309/314] fix layout of form with magic hoohaw

---
 plugins/RequireValidatedEmail/confirmfirstemail.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/RequireValidatedEmail/confirmfirstemail.php b/plugins/RequireValidatedEmail/confirmfirstemail.php
index bdf7c43a1b..1f22487a68 100644
--- a/plugins/RequireValidatedEmail/confirmfirstemail.php
+++ b/plugins/RequireValidatedEmail/confirmfirstemail.php
@@ -197,6 +197,11 @@ class ConfirmFirstEmailForm extends Form
                                 array('code' => $this->code));
     }
 
+    function formClass()
+    {
+        return 'form_settings';
+    }
+
     function formData()
     {
         $this->out->elementStart('ul', 'form_data');

From 9ec395b07a8418e4540089d1c83653bee8dd40dd Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 25 Feb 2011 13:22:13 -0800
Subject: [PATCH 310/314] Workaround for reply timeline since_id issue: save
 the notice.created value into reply.modified, so we can key off it as
 expected.

As a hack this removes the mysql_timestamp bit from the field settings on reply.modified so that our value actually gets saved. This *should* work ok as long as system timezone is set correctly, which we now set to UTC to match when connecting.
---
 classes/Notice.php                      | 2 ++
 classes/statusnet.ini                   | 3 ++-
 plugins/TwitterBridge/twitterimport.php | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/classes/Notice.php b/classes/Notice.php
index c9cca8a969..a26a6f0f0d 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1072,6 +1072,7 @@ class Notice extends Memcached_DataObject
 
             $reply->notice_id  = $this->id;
             $reply->profile_id = $profile->id;
+            $reply->modified   = $this->created;
 
             common_log(LOG_INFO, __METHOD__ . ": saving reply: notice $this->id to profile $profile->id");
 
@@ -1132,6 +1133,7 @@ class Notice extends Memcached_DataObject
 
                 $reply->notice_id  = $this->id;
                 $reply->profile_id = $mentioned->id;
+                $reply->modified   = $this->created;
 
                 $id = $reply->insert();
 
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index ef631e28d3..1916c25139 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -502,7 +502,8 @@ uri = U
 [reply]
 notice_id = 129
 profile_id = 129
-modified = 384
+modified = 142
+;modified = 384 ; skipping the mysql_timestamp mode so we can override its setting
 replied_id = 1
 
 [reply__keys]
diff --git a/plugins/TwitterBridge/twitterimport.php b/plugins/TwitterBridge/twitterimport.php
index 5ddf5380d7..0eacfcd62c 100644
--- a/plugins/TwitterBridge/twitterimport.php
+++ b/plugins/TwitterBridge/twitterimport.php
@@ -675,6 +675,7 @@ class TwitterImport
                     $reply = new Reply();
                     $reply->notice_id  = $notice->id;
                     $reply->profile_id = $user->id;
+                    $reply->modified   = $notice->created;
                     common_log(LOG_INFO, __METHOD__ . ": saving reply: notice {$notice->id} to profile {$user->id}");
                     $id = $reply->insert();
                 }

From 78eed327815207a23dd1a55da18455204a612a6f Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Thu, 24 Feb 2011 12:52:28 +0100
Subject: [PATCH 311/314] Localisation updates from http://translatewiki.net.

---
 locale/ar/LC_MESSAGES/statusnet.po            |  169 +-
 locale/arz/LC_MESSAGES/statusnet.po           |  171 +-
 locale/bg/LC_MESSAGES/statusnet.po            |  173 +-
 locale/br/LC_MESSAGES/statusnet.po            |  213 +-
 locale/ca/LC_MESSAGES/statusnet.po            |  173 +-
 locale/cs/LC_MESSAGES/statusnet.po            |  173 +-
 locale/de/LC_MESSAGES/statusnet.po            |  179 +-
 locale/en_GB/LC_MESSAGES/statusnet.po         |  173 +-
 locale/eo/LC_MESSAGES/statusnet.po            |  173 +-
 locale/es/LC_MESSAGES/statusnet.po            |  173 +-
 locale/fa/LC_MESSAGES/statusnet.po            |  173 +-
 locale/fi/LC_MESSAGES/statusnet.po            |  638 +-
 locale/fr/LC_MESSAGES/statusnet.po            |  174 +-
 locale/fur/LC_MESSAGES/statusnet.po           | 9393 +++++++++++++++++
 locale/gl/LC_MESSAGES/statusnet.po            |  173 +-
 locale/hsb/LC_MESSAGES/statusnet.po           |  330 +-
 locale/hu/LC_MESSAGES/statusnet.po            |  171 +-
 locale/ia/LC_MESSAGES/statusnet.po            |  348 +-
 locale/it/LC_MESSAGES/statusnet.po            |  173 +-
 locale/ja/LC_MESSAGES/statusnet.po            |  173 +-
 locale/ka/LC_MESSAGES/statusnet.po            |  173 +-
 locale/ko/LC_MESSAGES/statusnet.po            |  173 +-
 locale/mk/LC_MESSAGES/statusnet.po            |  336 +-
 locale/ml/LC_MESSAGES/statusnet.po            |  307 +-
 locale/nb/LC_MESSAGES/statusnet.po            |  173 +-
 locale/nl/LC_MESSAGES/statusnet.po            |  328 +-
 locale/nn/LC_MESSAGES/statusnet.po            |  172 +-
 locale/pl/LC_MESSAGES/statusnet.po            |  173 +-
 locale/pt/LC_MESSAGES/statusnet.po            |  173 +-
 locale/pt_BR/LC_MESSAGES/statusnet.po         |  173 +-
 locale/ru/LC_MESSAGES/statusnet.po            |  173 +-
 locale/statusnet.pot                          |  152 +-
 locale/sv/LC_MESSAGES/statusnet.po            |  173 +-
 locale/te/LC_MESSAGES/statusnet.po            |  263 +-
 locale/tr/LC_MESSAGES/statusnet.po            |  171 +-
 locale/uk/LC_MESSAGES/statusnet.po            |  341 +-
 locale/zh_CN/LC_MESSAGES/statusnet.po         |  345 +-
 .../zh_CN/LC_MESSAGES/FacebookBridge.po       |  301 +
 .../br/LC_MESSAGES/GroupPrivateMessage.po     |   61 +
 .../ia/LC_MESSAGES/GroupPrivateMessage.po     |   61 +
 .../mk/LC_MESSAGES/GroupPrivateMessage.po     |   59 +
 .../nl/LC_MESSAGES/GroupPrivateMessage.po     |   59 +
 .../sr-ec/LC_MESSAGES/GroupPrivateMessage.po  |   58 +
 .../te/LC_MESSAGES/GroupPrivateMessage.po     |   57 +
 .../uk/LC_MESSAGES/GroupPrivateMessage.po     |   60 +
 .../zh_CN/LC_MESSAGES/GroupPrivateMessage.po  |   57 +
 .../zh_CN/LC_MESSAGES/InProcessCache.po       |   27 +
 .../locale/zh_CN/LC_MESSAGES/LinkPreview.po   |   27 +
 .../locale/zh_CN/LC_MESSAGES/LogFilter.po     |   27 +
 .../locale/zh_CN/LC_MESSAGES/NewMenu.po       |   99 +
 .../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 +-
 58 files changed, 15034 insertions(+), 3340 deletions(-)
 create mode 100644 locale/fur/LC_MESSAGES/statusnet.po
 create mode 100644 plugins/FacebookBridge/locale/zh_CN/LC_MESSAGES/FacebookBridge.po
 create mode 100644 plugins/GroupPrivateMessage/locale/br/LC_MESSAGES/GroupPrivateMessage.po
 create mode 100644 plugins/GroupPrivateMessage/locale/ia/LC_MESSAGES/GroupPrivateMessage.po
 create mode 100644 plugins/GroupPrivateMessage/locale/mk/LC_MESSAGES/GroupPrivateMessage.po
 create mode 100644 plugins/GroupPrivateMessage/locale/nl/LC_MESSAGES/GroupPrivateMessage.po
 create mode 100644 plugins/GroupPrivateMessage/locale/sr-ec/LC_MESSAGES/GroupPrivateMessage.po
 create mode 100644 plugins/GroupPrivateMessage/locale/te/LC_MESSAGES/GroupPrivateMessage.po
 create mode 100644 plugins/GroupPrivateMessage/locale/uk/LC_MESSAGES/GroupPrivateMessage.po
 create mode 100644 plugins/GroupPrivateMessage/locale/zh_CN/LC_MESSAGES/GroupPrivateMessage.po
 create mode 100644 plugins/InProcessCache/locale/zh_CN/LC_MESSAGES/InProcessCache.po
 create mode 100644 plugins/LinkPreview/locale/zh_CN/LC_MESSAGES/LinkPreview.po
 create mode 100644 plugins/LogFilter/locale/zh_CN/LC_MESSAGES/LogFilter.po
 create mode 100644 plugins/NewMenu/locale/zh_CN/LC_MESSAGES/NewMenu.po

diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index c69f9f73c2..eb9802fc22 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:26:59+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:36:00+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 (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -154,10 +158,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -825,6 +829,7 @@ 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
@@ -837,7 +842,7 @@ msgstr "لا تملك تصريحًا."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1165,13 +1170,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 ""
@@ -1276,9 +1282,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 "لا ملف كهذا."
 
@@ -2015,13 +2022,15 @@ 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/nudge.php:63 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
@@ -2946,6 +2955,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 "لا هوية."
@@ -3131,8 +3141,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 "لا نتائج."
 
@@ -3165,6 +3177,7 @@ 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 "خطأ أثناء منع الحجب."
@@ -3645,6 +3658,7 @@ 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
 msgid "Already logged in."
 msgstr "والج بالفعل."
@@ -3653,7 +3667,8 @@ msgstr "والج بالفعل."
 msgid "Incorrect username or password."
 msgstr "اسم المستخدم أو كلمة السر غير صحيحان."
 
-#: actions/login.php:148 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:148 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح."
 
@@ -3814,7 +3829,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 "
@@ -3823,37 +3840,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
@@ -3986,11 +4013,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "بحث الإشعارات"
 
@@ -4038,23 +4066,28 @@ msgstr "أظهر أو أخفِ تصاميم الملفات الشخصية."
 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 "توكن الدخول انتهى."
 
@@ -4427,7 +4460,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. "
@@ -4436,7 +4471,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 "بحث في الأشخاص"
 
@@ -4728,6 +4764,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"
@@ -5137,6 +5179,7 @@ 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
@@ -5185,9 +5228,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.
@@ -6146,15 +6191,19 @@ 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 فقط."
 
-#: 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 "مُشترك"
 
@@ -6342,6 +6391,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 "لم تمنع هذا المستخدم."
@@ -6931,14 +6981,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:771
+#: classes/Profile.php:775
 #, 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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7589,19 +7639,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 ""
 
@@ -9643,18 +9697,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9666,12 +9725,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9683,12 +9742,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9700,12 +9759,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9717,7 +9776,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:1340
 msgid "about a year ago"
 msgstr "قبل سنة تقريبًا"
 
@@ -9763,15 +9822,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "6 or more characters"
-#~ msgstr "6 أحرف أو أكثر"
-
-#~ msgid "Same as password above"
-#~ msgstr "نفس كلمة السر أعلاه"
-
-#~ msgid "Can't save new password."
-#~ msgstr "تعذّر حفظ كلمة السر الجديدة."
-
-#~ msgid "URL of your homepage, blog, or profile on another site"
-#~ msgstr "مسار صفحتك الرئيسية أو مدونتك أو ملفك الشخصي على موقع آخر"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index 0786c3d391..7c8cbf473e 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:00+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:36:04+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 (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -157,10 +161,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -835,6 +839,7 @@ 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
@@ -847,7 +852,7 @@ msgstr "لا تملك تصريحًا."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1179,13 +1184,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 ""
@@ -1291,9 +1297,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 "لا ملف كهذا."
@@ -2032,13 +2039,15 @@ 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/nudge.php:63 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
@@ -2977,6 +2986,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 "لا هويه."
@@ -3157,8 +3167,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 "لا نتائج."
 
@@ -3191,6 +3203,7 @@ 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 "خطأ أثناء منع الحجب."
@@ -3676,6 +3689,7 @@ 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
 msgid "Already logged in."
 msgstr "والج بالفعل."
@@ -3684,7 +3698,8 @@ msgstr "والج بالفعل."
 msgid "Incorrect username or password."
 msgstr "اسم المستخدم أو كلمه السر غير صحيحان."
 
-#: actions/login.php:148 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:148 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "خطأ أثناء ضبط المستخدم. لست مُصرحًا على الأرجح."
 
@@ -3846,45 +3861,57 @@ 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
-#, php-format
-msgid "Updates matching search term \"%1$s\" on %2$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
 msgid ""
@@ -4016,11 +4043,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "بحث الإشعارات"
 
@@ -4068,23 +4096,28 @@ msgstr "أظهر أو أخفِ تصاميم الملفات الشخصيه."
 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 "تاريخ صلاحية الاماره خلص."
 
@@ -4457,14 +4490,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 "بحث فى الأشخاص"
 
@@ -4752,6 +4788,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"
@@ -5159,6 +5201,7 @@ 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
@@ -5207,9 +5250,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.
@@ -6171,15 +6216,19 @@ 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 ""
 
-#: 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 "مُشترك"
 
@@ -6365,6 +6414,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 "لم تمنع هذا المستخدم."
@@ -6950,14 +7000,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:771
+#: classes/Profile.php:775
 #, 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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7628,19 +7678,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 ""
 
@@ -9631,18 +9685,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9654,12 +9713,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9671,12 +9730,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9688,12 +9747,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9705,7 +9764,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:1340
 msgid "about a year ago"
 msgstr "قبل سنه تقريبًا"
 
@@ -9751,13 +9810,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#, fuzzy
-#~ msgid "6 or more characters"
-#~ msgstr "6 حروف أو أكثر. مطلوب."
-
-#~ msgid "Same as password above"
-#~ msgstr "نفس كلمه السر أعلاه"
-
-#~ msgid "Can't save new password."
-#~ msgstr "تعذّر حفظ كلمه السر الجديده."
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 3bd053bcaf..426ad4e95b 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:01+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:36:09+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 (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -150,10 +154,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -812,6 +816,7 @@ 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
@@ -824,7 +829,7 @@ msgstr "Не сте абонирани за никого."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1144,13 +1149,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 ""
@@ -1254,9 +1260,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 "Няма такъв профил."
 
@@ -1992,13 +1999,15 @@ 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/nudge.php:63 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
@@ -2944,6 +2953,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."
@@ -3127,8 +3137,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 "Няма резултати."
 
@@ -3162,6 +3174,7 @@ 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 "Грешка при повтаряне на бележката."
@@ -3673,6 +3686,7 @@ 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
 msgid "Already logged in."
 msgstr "Вече сте влезли."
@@ -3681,7 +3695,8 @@ msgstr "Вече сте влезли."
 msgid "Incorrect username or password."
 msgstr "Грешно име или парола."
 
-#: actions/login.php:148 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:148 actions/otp.php:127
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Забранено."
@@ -3853,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 "
@@ -3862,37 +3879,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
-#, 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
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Бележки, съдържащи търсеното \"%1$s\" в %2$s!"
 
 #: actions/nudge.php:85
@@ -4024,11 +4051,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Търсене на бележки"
 
@@ -4076,25 +4104,30 @@ msgstr ""
 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 "Вход в сайта"
 
@@ -4464,7 +4497,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. "
@@ -4473,7 +4508,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 "Търсене на хора"
 
@@ -4750,6 +4786,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"
@@ -5185,6 +5227,7 @@ 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
@@ -5233,9 +5276,11 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
-#, 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
+#, 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.
@@ -6174,16 +6219,20 @@ 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 ""
 
-#: 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 "Абониране"
@@ -6370,6 +6419,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 "Не сте блокирали този потребител."
@@ -6961,14 +7011,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:771
+#: classes/Profile.php:775
 #, 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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7631,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 ""
 
@@ -9601,18 +9655,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9620,12 +9679,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9633,12 +9692,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9646,12 +9705,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9659,7 +9718,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:1340
 msgid "about a year ago"
 msgstr "преди около година"
 
@@ -9705,15 +9764,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "6 or more characters"
-#~ msgstr "6 или повече знака"
-
-#~ msgid "Same as password above"
-#~ msgstr "Също като паролата по-горе"
-
-#~ msgid "Can't save new password."
-#~ msgstr "Грешка при запазване на новата парола."
-
-#~ msgid "URL of your homepage, blog, or profile on another site"
-#~ msgstr "Адрес на личната ви страница, блог или профил в друг сайт"
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index eb56630387..430e05af94 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:03+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:36: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 (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -153,10 +157,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -337,7 +341,7 @@ msgstr ""
 #: actions/profilesettings.php:322 actions/smssettings.php:301
 #: actions/smssettings.php:454
 msgid "Could not update user."
-msgstr "Dibosupl eo hizivaat an implijer."
+msgstr "Dibosupl hizivaat an implijer."
 
 #. TRANS: Client error displayed if a user profile could not be found.
 #. TRANS: Client error displayed when a user has no profile.
@@ -498,11 +502,11 @@ msgstr "Kemenadenn hep testenn !"
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
 #: actions/apidirectmessagenew.php:127 actions/newmessage.php:152
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
-msgstr[0] "Re hir eo ! Ment hirañ ar gemenadenn a zo a %d arouezenn."
-msgstr[1] "Re hir eo ! Ment hirañ ar gemenadenn a zo a %d arouezenn."
+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
@@ -788,9 +792,8 @@ msgstr "Enporzhiadenn c'hwitet."
 
 #. 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 "Fichenn direizh."
+msgstr "Jedouer pe gwirier reked direizh."
 
 #. TRANS: Client error given when no oauth_token was passed to the OAuth API.
 #: actions/apioauthauthorize.php:107
@@ -812,6 +815,7 @@ 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
@@ -824,7 +828,7 @@ msgstr "Aotreet eo bet ar jedouer reked dija."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -837,9 +841,10 @@ msgstr "Lesanv / ger tremen direizh !"
 
 #. TRANS: Server error displayed when a database action fails.
 #: actions/apioauthauthorize.php:217
-#, fuzzy
 msgid "Database error inserting oauth_token_association."
-msgstr "Ur fazi 'zo bet en ur ensoc'hañ an avatar"
+msgstr ""
+"Fazi diaz roadennoù p'eo bet ensoc'het ar jedouer kenstrollañ implijer "
+"arload OAuth"
 
 #. 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.
@@ -1115,9 +1120,9 @@ msgstr "%1$s / Pennroll %2$s"
 #. 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
+#, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
-msgstr "%1$s statud pennroll da %2$s / %2$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.
@@ -1142,13 +1147,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 !"
@@ -1188,9 +1194,9 @@ 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
-#, fuzzy
 msgid "Only the user can add to their own timeline."
-msgstr "N'eus nemet an implijerien kevreet hag a c'hell adkemer alioù."
+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
@@ -1229,9 +1235,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "No content for notice %d."
-msgstr "Klask alioù en danvez"
+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.
@@ -1252,9 +1258,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."
 
@@ -1967,13 +1974,15 @@ 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/nudge.php:63 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
@@ -2586,9 +2595,8 @@ 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
-#, fuzzy
 msgid "Could not delete email confirmation."
-msgstr "Dibosupl eo dilemel ar postel kadarnadur."
+msgstr "Dibosupl dilemel ar postel kadarnaat."
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 #: actions/emailsettings.php:464
@@ -2616,9 +2624,8 @@ msgstr "Chomlec'h postel ebet o tont."
 #. 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
-#, fuzzy
 msgid "Could not update user record."
-msgstr "Dibosupl eo hizivaat doser an implijer."
+msgstr "Dibosupl hizivaat teuliad an implijer."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #. TRANS: Confirmation text after updating SMS settings.
@@ -2878,15 +2885,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 "Arabat stankañ an implijer-mañ eus ar strollad."
+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."
-msgstr "Stankañ an implijer-mañ eus ar strollad-se"
+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
@@ -2895,6 +2900,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"
@@ -3077,8 +3083,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."
 
@@ -3115,6 +3123,7 @@ 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."
@@ -3590,6 +3599,7 @@ 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
 msgid "Already logged in."
 msgstr "Kevreet oc'h dija."
@@ -3598,7 +3608,8 @@ msgstr "Kevreet oc'h dija."
 msgid "Incorrect username or password."
 msgstr "Anv implijer pe ger-tremen direizh."
 
-#: actions/login.php:148 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:148 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 "
@@ -3767,7 +3778,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 "
@@ -3777,23 +3790,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 "
@@ -3802,14 +3822,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
@@ -3941,11 +3964,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Klask alioù"
 
@@ -3965,7 +3989,7 @@ msgstr "Dibarzhioù all da gefluniañ."
 #. TRANS: here if it has one (most likely a single space).
 #: actions/othersettings.php:113
 msgid " (free service)"
-msgstr "  (servij digoust)"
+msgstr " (servij digoust)"
 
 #. TRANS: Label for dropdown with URL shortener services.
 #: actions/othersettings.php:122
@@ -3994,26 +4018,31 @@ 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ñ)."
 
-#: 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"
@@ -4382,7 +4411,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. "
@@ -4392,7 +4423,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"
 
@@ -4683,6 +4715,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"
@@ -5103,6 +5141,7 @@ 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
@@ -5153,9 +5192,11 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
-#, 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
+#, 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.
@@ -6097,15 +6138,19 @@ 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 ""
 
-#: 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"
 
@@ -6299,6 +6344,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ñ."
@@ -6874,14 +6920,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:771
+#: classes/Profile.php:775
 #, 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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7522,19 +7568,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 ""
 
@@ -9485,18 +9535,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9504,12 +9559,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9517,12 +9572,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9530,12 +9585,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9543,7 +9598,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:1340
 msgid "about a year ago"
 msgstr "bloaz zo well-wazh"
 
@@ -9589,15 +9644,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "6 or more characters"
-#~ msgstr "6 arouezenn pe muioc'h"
-
-#~ msgid "Same as password above"
-#~ msgstr "Memestra eget ar ger tremen a-us"
-
-#~ msgid "Can't save new password."
-#~ msgstr "Dibosupl eo enrollañ ar ger-tremen nevez."
-
-#~ 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"
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index eef3ab2ee3..afe4de11fa 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:04+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:36: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-Generator: MediaWiki 1.18alpha (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -158,10 +162,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -821,6 +825,7 @@ 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
@@ -833,7 +838,7 @@ msgstr "El testimoni de sol·licitud ja està autoritzat."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1158,13 +1163,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!"
@@ -1266,9 +1272,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."
 
@@ -1997,13 +2004,15 @@ msgstr "Elimina aquest 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/nudge.php:63 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
@@ -2929,6 +2938,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."
@@ -3115,8 +3125,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."
 
@@ -3153,6 +3165,7 @@ 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."
@@ -3659,6 +3672,7 @@ 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
 msgid "Already logged in."
 msgstr "Ja hi heu iniciat una sessió."
@@ -3667,7 +3681,8 @@ msgstr "Ja hi heu iniciat una sessió."
 msgid "Incorrect username or password."
 msgstr "Nom d'usuari o contrasenya incorrectes."
 
-#: actions/login.php:148 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:148 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 "
@@ -3832,7 +3847,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 "
@@ -3841,16 +3858,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%%%%?"
@@ -3859,7 +3881,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 "
@@ -3868,14 +3892,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
-#, 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
+#, fuzzy, 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!"
 
@@ -4013,11 +4040,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Cerca d'avisos"
 
@@ -4065,23 +4093,28 @@ 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."
 
@@ -4436,7 +4469,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. "
@@ -4445,7 +4480,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"
 
@@ -4734,6 +4770,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
+#, 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"
@@ -5174,6 +5216,7 @@ 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
@@ -5227,9 +5270,11 @@ msgstr ""
 "Sigueu el primer en [enviar sobre aquest tema](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#: actions/repliesrss.php:72
-#, 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
+#, fuzzy, 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.
@@ -6193,15 +6238,19 @@ 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."
 
-#: 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"
 
@@ -6402,6 +6451,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."
@@ -7004,14 +7054,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:771
+#: classes/Profile.php:775
 #, 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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7664,19 +7714,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 ""
+
 #. 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."
 
@@ -9730,18 +9784,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9749,12 +9808,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9762,12 +9821,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9775,12 +9834,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9788,7 +9847,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:1340
 msgid "about a year ago"
 msgstr "fa un any"
 
@@ -9831,15 +9890,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 "6 or more characters"
-#~ msgstr "6 o més caràcters"
-
-#~ msgid "Same as password above"
-#~ msgstr "Igual a la contrasenya de dalt"
-
-#~ msgid "Can't save new password."
-#~ msgstr "No es pot desar la nova contrasenya."
-
-#~ msgid "URL of your homepage, blog, or profile on another site"
-#~ msgstr "URL del teu web, blog o perfil en un altre lloc"
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index acfd4bc67e..7e092133c9 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:05+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:36:19+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 (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -152,10 +156,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -825,6 +829,7 @@ 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
@@ -837,7 +842,7 @@ msgstr "Nejste autorizován."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1166,13 +1171,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!"
@@ -1277,9 +1283,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."
 
@@ -2020,13 +2027,15 @@ 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/nudge.php:63 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
@@ -2959,6 +2968,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."
@@ -3147,8 +3157,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."
 
@@ -3185,6 +3197,7 @@ 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."
@@ -3699,6 +3712,7 @@ 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
 msgid "Already logged in."
 msgstr "Již přihlášen"
@@ -3707,7 +3721,8 @@ msgstr "Již přihlášen"
 msgid "Incorrect username or password."
 msgstr "Neplatné jméno nebo heslo"
 
-#: actions/login.php:148 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:148 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."
 
@@ -3872,7 +3887,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 "
@@ -3881,16 +3898,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%%%%?"
@@ -3899,7 +3921,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 "
@@ -3908,14 +3932,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
-#, 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
+#, 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
@@ -4049,11 +4076,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Hledání oznámení"
 
@@ -4101,23 +4129,28 @@ 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ů)."
 
-#: 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."
 
@@ -4493,7 +4526,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. "
@@ -4502,7 +4537,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í"
 
@@ -4793,6 +4829,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"
@@ -5231,6 +5273,7 @@ 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
@@ -5285,9 +5328,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
-#, 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
+#, 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.
@@ -6244,16 +6289,20 @@ 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."
 
-#: 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"
 
@@ -6454,6 +6503,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."
@@ -7056,14 +7106,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:771
+#: classes/Profile.php:775
 #, 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:780
+#: classes/Profile.php:784
 #, 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."
@@ -7708,19 +7758,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 ""
 
@@ -9800,18 +9854,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9820,12 +9879,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9834,12 +9893,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9848,12 +9907,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9862,7 +9921,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:1340
 msgid "about a year ago"
 msgstr "asi před rokem"
 
@@ -9905,15 +9964,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "6 or more characters"
-#~ msgstr "6 a více znaků"
-
-#~ msgid "Same as password above"
-#~ msgstr "Stejné jako heslo výše"
-
-#~ msgid "Can't save new password."
-#~ msgstr "Nelze uložit nové heslo"
-
-#~ 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."
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index ad4bd485ef..c6947219db 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:07+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:36:22+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 (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -161,10 +165,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -829,6 +833,7 @@ 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
@@ -841,7 +846,7 @@ msgstr "Anfrage-Token bereits autorisiert."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1171,13 +1176,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!"
@@ -1279,9 +1285,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."
 
@@ -1711,9 +1718,8 @@ msgstr "Ja"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 #: actions/block.php:165
-#, fuzzy
 msgid "Block this user."
-msgstr "Diesen Benutzer blockieren"
+msgstr "Diesen Benutzer blockieren."
 
 #. TRANS: Server error displayed when blocking a user fails.
 #: actions/block.php:189
@@ -2007,13 +2013,15 @@ 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/nudge.php:63 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
@@ -2948,6 +2956,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"
@@ -3084,7 +3093,6 @@ msgstr "Aktualisierungen von %1$s auf %2$s!"
 
 #. TRANS: Title for first page of the groups list.
 #: actions/groups.php:62
-#, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "Gruppen"
@@ -3137,8 +3145,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."
 
@@ -3175,6 +3185,7 @@ 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."
@@ -3693,6 +3704,7 @@ 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
 msgid "Already logged in."
 msgstr "Bereits angemeldet."
@@ -3701,7 +3713,8 @@ msgstr "Bereits angemeldet."
 msgid "Incorrect username or password."
 msgstr "Falscher Benutzername oder Passwort."
 
-#: actions/login.php:148 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:148 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 "Fehler beim Setzen des Benutzers. Du bist vermutlich nicht autorisiert."
@@ -3866,7 +3879,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 "
@@ -3876,16 +3891,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%%%%?"
@@ -3894,7 +3914,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 "
@@ -3904,14 +3926,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
-#, 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
+#, 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
@@ -4049,11 +4074,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Nachrichtensuche"
 
@@ -4100,23 +4126,28 @@ 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)."
 
-#: 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."
 
@@ -4471,7 +4502,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. "
@@ -4481,7 +4514,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"
 
@@ -4776,6 +4810,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"
@@ -5219,6 +5259,7 @@ 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
@@ -5273,9 +5314,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
-#, 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
+#, 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.
@@ -6238,15 +6281,19 @@ 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"
 
-#: 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"
 
@@ -6446,6 +6493,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."
@@ -7052,7 +7100,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:771
+#: classes/Profile.php:775
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7061,7 +7109,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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7710,19 +7758,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."
 
@@ -9786,18 +9838,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9805,12 +9862,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9818,12 +9875,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9831,12 +9888,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9844,7 +9901,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:1340
 msgid "about a year ago"
 msgstr "vor ca. einem Jahr"
 
@@ -9889,17 +9946,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Hole Backup von der Datei „%s“."
-
-#~ msgid "6 or more characters"
-#~ msgstr "6 oder mehr Zeichen"
-
-#~ msgid "Same as password above"
-#~ msgstr "Gleiches Passwort wie zuvor"
-
-#~ msgid "Can't save new password."
-#~ msgstr "Konnte neues Passwort nicht speichern"
-
-#~ msgid "URL of your homepage, blog, or profile on another site"
-#~ msgstr ""
-#~ "URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen "
-#~ "Website"
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 67bb7959fc..55e71e831b 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:10+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:36:25+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 (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -153,10 +157,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -818,6 +822,7 @@ 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
@@ -830,7 +835,7 @@ msgstr "You are not authorised."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1155,13 +1160,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!"
@@ -1265,9 +1271,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."
 
@@ -2006,13 +2013,15 @@ 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/nudge.php:63 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
@@ -2943,6 +2952,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."
@@ -3130,8 +3140,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."
 
@@ -3168,6 +3180,7 @@ 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."
@@ -3679,6 +3692,7 @@ 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
 msgid "Already logged in."
 msgstr "Already logged in."
@@ -3687,7 +3701,8 @@ msgstr "Already logged in."
 msgid "Incorrect username or password."
 msgstr "Incorrect username or password."
 
-#: actions/login.php:148 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:148 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Error setting user. You are probably not authorised."
 
@@ -3851,7 +3866,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 "
@@ -3860,16 +3877,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%%%%?"
@@ -3878,7 +3900,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 "
@@ -3887,14 +3911,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
-#, 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
+#, 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
@@ -4028,11 +4055,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Notice Search"
 
@@ -4080,23 +4108,28 @@ 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)."
 
-#: 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."
 
@@ -4461,7 +4494,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. "
@@ -4470,7 +4505,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"
 
@@ -4759,6 +4795,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"
@@ -5193,6 +5235,7 @@ 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
@@ -5245,9 +5288,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
-#, 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
+#, 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.
@@ -6194,15 +6239,19 @@ 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 ""
 
-#: 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"
 
@@ -6395,6 +6444,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."
@@ -6983,14 +7033,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:771
+#: classes/Profile.php:775
 #, 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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7633,19 +7683,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 ""
 
@@ -9606,18 +9660,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9625,12 +9684,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9638,12 +9697,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9651,12 +9710,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9664,7 +9723,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:1340
 msgid "about a year ago"
 msgstr "about a year ago"
 
@@ -9706,15 +9765,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "6 or more characters"
-#~ msgstr "6 or more characters"
-
-#~ msgid "Same as password above"
-#~ msgstr "Same as password above"
-
-#~ msgid "Can't save new password."
-#~ msgstr "Can't save new password."
-
-#~ msgid "URL of your homepage, blog, or profile on another site"
-#~ msgstr "URL of your homepage, blog, or profile on another site"
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index 6253bc381a..2264f654e3 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:11+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:36:28+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 (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -157,10 +161,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -818,6 +822,7 @@ 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
@@ -830,7 +835,7 @@ msgstr ""
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1158,13 +1163,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!"
@@ -1269,9 +1275,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."
 
@@ -2011,13 +2018,15 @@ 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/nudge.php:63 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
@@ -2945,6 +2954,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."
@@ -3130,8 +3140,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."
 
@@ -3168,6 +3180,7 @@ 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."
@@ -3676,6 +3689,7 @@ 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
 msgid "Already logged in."
 msgstr "Vi jam ensalutis."
@@ -3684,7 +3698,8 @@ msgstr "Vi jam ensalutis."
 msgid "Incorrect username or password."
 msgstr "Malĝusta uzantnomo aŭ pasvorto."
 
-#: actions/login.php:148 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:148 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Eraras agordi uzanton. Vi verŝajne ne rajtiĝas."
 
@@ -3846,7 +3861,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 "
@@ -3855,16 +3872,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%%%%?"
@@ -3873,7 +3895,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 "
@@ -3882,14 +3906,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
-#, 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
+#, 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
@@ -4023,11 +4050,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Avizoserĉo"
 
@@ -4075,23 +4103,28 @@ 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)."
 
-#: 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."
 
@@ -4449,7 +4482,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. "
@@ -4458,7 +4493,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"
 
@@ -4747,6 +4783,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"
@@ -5182,6 +5224,7 @@ 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
@@ -5236,9 +5279,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
-#, 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
+#, 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.
@@ -6192,15 +6237,19 @@ 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."
 
-#: 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"
 
@@ -6394,6 +6443,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."
@@ -6983,14 +7033,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:771
+#: classes/Profile.php:775
 #, 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:780
+#: classes/Profile.php:784
 #, 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."
@@ -7636,19 +7686,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."
 
@@ -9720,18 +9774,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9739,12 +9798,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9752,12 +9811,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9765,12 +9824,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9778,7 +9837,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:1340
 msgid "about a year ago"
 msgstr "antaŭ ĉirkaŭ unu jaro"
 
@@ -9820,15 +9879,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "6 or more characters"
-#~ msgstr "6 aŭ pli da literoj"
-
-#~ msgid "Same as password above"
-#~ msgstr "Same kiel pasvorto supra"
-
-#~ msgid "Can't save new password."
-#~ msgstr "Malsukcesis konservi novan pasvorton."
-
-#~ msgid "URL of your homepage, blog, or profile on another site"
-#~ msgstr "URL de via hejmpaĝo, blogo aŭ profilo ĉe alia retejo"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 7ffdc25e70..d206fc3145 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:13+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:36:31+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 (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -158,10 +162,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -826,6 +830,7 @@ 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
@@ -838,7 +843,7 @@ msgstr "No estás autorizado."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1167,13 +1172,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!"
@@ -1277,9 +1283,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."
 
@@ -2013,13 +2020,15 @@ 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/nudge.php:63 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
@@ -2954,6 +2963,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."
@@ -3142,8 +3152,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."
 
@@ -3180,6 +3192,7 @@ 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."
@@ -3695,6 +3708,7 @@ 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
 msgid "Already logged in."
 msgstr "Ya estás conectado."
@@ -3703,7 +3717,8 @@ msgstr "Ya estás conectado."
 msgid "Incorrect username or password."
 msgstr "Nombre de usuario o contraseña incorrectos."
 
-#: actions/login.php:148 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:148 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Error al configurar el usuario. Posiblemente no tengas autorización."
 
@@ -3870,7 +3885,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 "
@@ -3879,16 +3896,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%%%%?"
@@ -3897,7 +3919,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 "
@@ -3907,14 +3931,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
-#, 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
+#, 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!"
 
@@ -4049,11 +4076,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Búsqueda de mensajes"
 
@@ -4101,23 +4129,28 @@ 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)."
 
-#: 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."
 
@@ -4492,7 +4525,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. "
@@ -4501,7 +4536,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"
 
@@ -4798,6 +4834,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"
@@ -5249,6 +5291,7 @@ 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
@@ -5303,9 +5346,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
-#, 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
+#, 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.
@@ -6271,15 +6316,19 @@ 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."
 
-#: 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"
 
@@ -6481,6 +6530,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."
@@ -7084,14 +7134,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:771
+#: classes/Profile.php:775
 #, 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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7745,19 +7795,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."
 
@@ -9842,18 +9896,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9861,12 +9920,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9874,12 +9933,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9887,12 +9946,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9900,7 +9959,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:1340
 msgid "about a year ago"
 msgstr "hace un año"
 
@@ -9942,15 +10001,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "6 or more characters"
-#~ msgstr "6 o más caracteres"
-
-#~ msgid "Same as password above"
-#~ msgstr "Igual a la contraseña de arriba"
-
-#~ msgid "Can't save new password."
-#~ msgstr "No se puede guardar la nueva contraseña."
-
-#~ 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"
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index 8fbe80d9a4..bb9c9d662d 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:15+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:36:33+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 (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); Translate extension (2011-02-01)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -157,10 +161,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -816,6 +820,7 @@ 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
@@ -828,7 +833,7 @@ msgstr "شما شناسایی نشده اید."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1155,13 +1160,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 به روز رسانی های عموم"
@@ -1266,9 +1272,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 "چنین نمایه‌ای وجود ندارد."
 
@@ -2013,13 +2020,15 @@ 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/nudge.php:63 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
@@ -2960,6 +2969,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 وجود ندارد."
@@ -3144,8 +3154,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 "نتیجه‌ای وجود ندارد."
 
@@ -3182,6 +3194,7 @@ 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 "اشکال در پاکسازی"
@@ -3688,6 +3701,7 @@ 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
 msgid "Already logged in."
 msgstr "قبلا وارد شده"
@@ -3696,7 +3710,8 @@ msgstr "قبلا وارد شده"
 msgid "Incorrect username or password."
 msgstr "نام کاربری یا گذرواژه نادرست است."
 
-#: actions/login.php:148 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:148 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "خطا در تنظیم کاربر. شما احتمالا اجازهٔ این کار را ندارید."
 
@@ -3859,7 +3874,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 "
@@ -3868,16 +3885,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%%%%?"
@@ -3886,7 +3908,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 "
@@ -3895,14 +3919,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
-#, 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
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "پیام‌هایی که با جست‌و‌جوی عبارت »%1$s« در %s یافت شدند."
 
 #: actions/nudge.php:85
@@ -4036,11 +4063,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "جست‌وجوی پیام‌ها"
 
@@ -4088,23 +4116,28 @@ msgstr "نمایش دادن یا پنهان کردن طراحی‌های نما
 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 "رمز ورود منسوخ شده است."
 
@@ -4480,7 +4513,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. "
@@ -4489,7 +4524,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 "جست‌وجوی کاربران"
 
@@ -4776,6 +4812,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"
@@ -5217,6 +5259,7 @@ 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
@@ -5269,9 +5312,11 @@ msgstr ""
 "اولین کسی باشید که در [این موضوع](%%%%action.newnotice%%%%?status_textarea=%"
 "s) پیام می‌فرستد."
 
-#: actions/repliesrss.php:72
-#, 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
+#, 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.
@@ -6235,15 +6280,19 @@ 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 را می‌پذیرد."
 
-#: 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 "مشترک‌شده"
 
@@ -6443,6 +6492,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 "شما آن کاربر را مسدود نکرده اید."
@@ -7030,14 +7080,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:771
+#: classes/Profile.php:775
 #, 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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7686,19 +7736,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 ""
 
@@ -9759,61 +9813,66 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, 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:1319
 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:1323
 #, 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:1326
 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:1330
 #, 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:1333
 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:1337
 #, 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:1340
 msgid "about a year ago"
 msgstr "حدود یک سال پیش"
 
@@ -9856,15 +9915,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "6 or more characters"
-#~ msgstr "۶ نویسه یا بیش‌تر"
-
-#~ msgid "Same as password above"
-#~ msgstr "مانند گذرواژهٔ بالا"
-
-#~ msgid "Can't save new password."
-#~ msgstr "نمی‌توان گذرواژهٔ جدید را ذخیره کرد."
-
-#~ msgid "URL of your homepage, blog, or profile on another site"
-#~ msgstr "نشانی اینترنتی صفحهٔ خانگی، وبلاگ یا نمایه‌تان در یک وب‌گاه دیگر"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index e9fd7976e9..9fe9dd12da 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -7,6 +7,7 @@
 # Author: McDutchie
 # Author: Nike
 # Author: Str4nd
+# Author: Wwwwolf
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -14,64 +15,59 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:17+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:36:36+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 (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+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 "Hyväksy"
+msgstr "Käyttöoikeudet"
 
 #. TRANS: Page notice.
 #: actions/accessadminpanel.php:64
-#, fuzzy
 msgid "Site access settings"
-msgstr "Profiilikuva-asetukset"
+msgstr "Sivuston käyttöoikeusasetukset"
 
 #. TRANS: Form legend for registration form.
 #: actions/accessadminpanel.php:151
-#, fuzzy
 msgid "Registration"
-msgstr "Rekisteröidy"
+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 ""
+msgstr "Estä anonyymejä (sisäänkirjautumattomia) käyttäjiä lukemasta sivustoa?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
 #: actions/accessadminpanel.php:157
-#, fuzzy
 msgctxt "LABEL"
 msgid "Private"
-msgstr "Yksityisyys"
+msgstr "Yksityinen"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only".
 #: actions/accessadminpanel.php:164
 msgid "Make registration invitation only."
-msgstr ""
+msgstr "Salli rekisteröityminen vain kutsusta."
 
 #. TRANS: Checkbox label for configuring site as invite only.
 #: actions/accessadminpanel.php:166
-#, fuzzy
 msgid "Invite only"
-msgstr "Kutsu"
+msgstr "Vain kutsusta"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
 #: actions/accessadminpanel.php:173
 msgid "Disable new registrations."
-msgstr ""
+msgstr "Estä uusien käyttäjien rekisteröityminen."
 
 #. TRANS: Checkbox label for disabling new user registrations.
 #: actions/accessadminpanel.php:175
@@ -80,9 +76,8 @@ msgstr "Suljettu"
 
 #. TRANS: Title for button to save access settings in site admin panel.
 #: actions/accessadminpanel.php:191
-#, fuzzy
 msgid "Save access settings"
-msgstr "Profiilikuva-asetukset"
+msgstr "Tallenna käyttöoikeusasetukset"
 
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
@@ -142,7 +137,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
@@ -160,10 +159,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -172,9 +171,9 @@ msgstr "Käyttäjää ei ole."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
 #: actions/all.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s and friends, page %2$d"
-msgstr "%s ja kaverit"
+msgstr "%1$s ja kaverit, sivu %2$d"
 
 #. TRANS: Page title. %s is user nickname
 #. TRANS: H1 text for page. %s is a user nickname.
@@ -326,6 +325,7 @@ msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 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.
@@ -411,9 +411,8 @@ msgstr "Ulkoasun tallennus epäonnistui."
 #: actions/apiaccountupdateprofilebackgroundimage.php:191
 #: actions/apiaccountupdateprofilecolors.php:139
 #: actions/userdesignsettings.php:179
-#, fuzzy
 msgid "Could not update your design."
-msgstr "Ei voitu päivittää käyttäjää."
+msgstr "Ulkoasua ei voitu päivittää."
 
 #. TRANS: Title for Atom feed.
 #: actions/apiatomservice.php:85
@@ -447,13 +446,13 @@ msgstr "Käyttäjän %s tilaukset"
 #. 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 "Suosikit"
+msgstr "%s:n suosikit"
 
 #. 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 "Ryhmän %s jäsenet"
 
@@ -519,14 +518,12 @@ 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 "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
-#, fuzzy
 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."
@@ -541,9 +538,8 @@ 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
-#, fuzzy
 msgid "This status is already a favorite."
-msgstr "Tämä päivitys on jo suosikki!"
+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.
@@ -554,9 +550,8 @@ 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
-#, fuzzy
 msgid "That status is not a favorite."
-msgstr "Tämä päivitys ei ole suosikki!"
+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.
@@ -588,7 +583,6 @@ 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
-#, fuzzy
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Kaksi käyttäjätunnusta tai nimeä täytyy antaa."
 
@@ -642,7 +636,6 @@ msgstr "Kotisivun verkko-osoite ei ole toimiva."
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:218
-#, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
 
@@ -671,7 +664,6 @@ msgstr[1] "kuvaus on liian pitkä (max %d merkkiä)."
 #: actions/apigroupcreate.php:215 actions/editgroup.php:218
 #: actions/newgroup.php:164 actions/profilesettings.php:265
 #: actions/register.php:227
-#, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)."
 
@@ -692,7 +684,7 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "Virheellinen alias: \"%s\""
 
@@ -745,9 +737,9 @@ msgstr "Sinut on estetty osallistumasta tähän ryhmään ylläpitäjän toimest
 #. 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
-#, fuzzy, php-format
+#, php-format
 msgid "Could not join user %1$s to group %2$s."
-msgstr "Käyttäjä %s ei voinut liittyä ryhmään %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
@@ -774,9 +766,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s groups %2$s is a member of."
-msgstr "Ryhmät, joiden jäsen %s on"
+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.
@@ -787,9 +779,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "groups on %s"
-msgstr "Ryhmän toiminnot"
+msgstr "%s-käyttäjäryhmät"
 
 #. TRANS: Client error displayed when uploading a media file has failed.
 #: actions/apimediaupload.php:101
@@ -798,32 +790,30 @@ msgstr "Komento epäonnistui"
 
 #. 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 "Päivityksen sisältö ei kelpaa"
+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 ""
+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
-#, fuzzy
 msgid "Invalid request token."
-msgstr "Koko ei kelpaa."
+msgstr "Virheellinen pyyntötunniste."
 
 #. 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 "Sinulla ei ole valtuutusta tähän."
+msgstr "Pyyntötunniste on jo hyväksytty."
 
 #. 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.
 #. 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
@@ -836,7 +826,7 @@ msgstr "Sinulla ei ole valtuutusta tähän."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -846,15 +836,13 @@ msgstr ""
 
 #. 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 "Käyttäjätunnus tai salasana ei kelpaa."
 
 #. TRANS: Server error displayed when a database action fails.
 #: actions/apioauthauthorize.php:217
-#, fuzzy
 msgid "Database error inserting oauth_token_association."
-msgstr "Tietokantavirhe tallennettaessa risutagiä: %s"
+msgstr "Tietokantavirhe lisättäessä oauth_token_association-arvoa."
 
 #. 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.
@@ -880,12 +868,12 @@ 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 ""
+msgstr "Sovellus haluaa muodostaa yhteyden käyttäjätiliisi"
 
 #. TRANS: Fieldset legend.
 #: actions/apioauthauthorize.php:404
 msgid "Allow or deny access"
-msgstr ""
+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.
@@ -896,6 +884,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."
 
 #. 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,
@@ -907,10 +898,13 @@ 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."
 
 #. TRANS: Fieldset legend.
 #: actions/apioauthauthorize.php:455
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Käyttäjätili"
@@ -950,34 +944,31 @@ msgstr "Peruuta"
 
 #. 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 "Kaikki"
+msgstr "Salli"
 
 #. TRANS: Form instructions.
 #: actions/apioauthauthorize.php:502
 msgid "Authorize access to your account information."
-msgstr ""
+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
-#, fuzzy
 msgid "Authorization canceled."
-msgstr "Varmistuskoodia ei ole annettu."
+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 ""
+msgstr "Pyyntotunniste %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
-#, fuzzy
 msgid "You have successfully authorized the application"
-msgstr "Sinulla ei ole valtuutusta tähän."
+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
@@ -985,13 +976,15 @@ msgid ""
 "Please return to the application and enter the following security code to "
 "complete the process."
 msgstr ""
+"Ole hyvä, palaa ohjelmaan ja anna seuraava turvakoodi viimeistelläksesi "
+"hyväksymisen."
 
 #. 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 "Sinulla ei ole valtuutusta tähän."
+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.
@@ -1001,6 +994,8 @@ msgid ""
 "Please return to %s and enter the following security code to complete the "
 "process."
 msgstr ""
+"Ole hyvä, palaa ohjelmaan %s ja anna seuraava turvakoodi viimeistelläksesi "
+"hyväksymisen."
 
 #. TRANS: Client error displayed trying to delete a status not using POST or DELETE.
 #. TRANS: POST and DELETE should not be translated.
@@ -1026,9 +1021,8 @@ 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
-#, fuzzy
 msgid "Cannot repeat your own notice."
-msgstr "Ilmoituksia ei voi pistää päälle."
+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.
@@ -1047,16 +1041,15 @@ msgstr "Tätä päivitystä ei voi poistaa."
 #: actions/atompubshowmembership.php:116
 #: actions/atompubshowsubscription.php:122
 #: actions/atompubsubscriptionfeed.php:109
-#, fuzzy
 msgid "HTTP method not supported."
-msgstr "API-metodia ei löytynyt."
+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
+#, php-format
 msgid "Unsupported format: %s."
-msgstr "Formaattia ei ole tuettu."
+msgstr "Formaattia %s ei ole tuettu."
 
 #. TRANS: Client error displayed requesting a deleted status.
 #: actions/apistatusesshow.php:155
@@ -1076,20 +1069,19 @@ 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 "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
-#, fuzzy, php-format
+#, php-format
 msgid "Deleted notice %d"
-msgstr "Poista päivitys"
+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 ""
+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.
@@ -1103,9 +1095,8 @@ 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
-#, fuzzy
 msgid "Parent notice not found."
-msgstr "API-metodia ei löytynyt."
+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.
@@ -1140,9 +1131,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Could not generate feed for group - %s"
-msgstr "Ei voitu päivittää ryhmää."
+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.
@@ -1161,22 +1152,22 @@ 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
-#, fuzzy, php-format
+#: actions/apitimelinepublic.php:199
+#, php-format
 msgid "%s updates from everyone!"
 msgstr "%s päivitykset kaikilta!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
 #: actions/apitimelineretweetedbyme.php:71
-#, fuzzy
 msgid "Unimplemented."
-msgstr "Komentoa ei ole vielä toteutettu."
+msgstr "Toimintoa ei ole vielä toteutettu."
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
 #: actions/apitimelineretweetedtome.php:108
@@ -1214,43 +1205,43 @@ 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 ""
+msgstr "Atom-syötteille tuetaan vain AtomPub-muotoa."
 
 #. TRANS: Client error displayed attempting to post an empty API notice.
 #: actions/apitimelineuser.php:311
 msgid "Atom post must not be empty."
-msgstr ""
+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
 msgid "Atom post must be well-formed XML."
-msgstr ""
+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/atompubmembershipfeed.php:230
 #: actions/atompubsubscriptionfeed.php:236
 msgid "Atom post must be an Atom entry."
-msgstr ""
+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
 msgid "Can only handle POST activities."
-msgstr ""
+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
 #, php-format
 msgid "Cannot handle activity object type \"%s\"."
-msgstr ""
+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
-#, fuzzy, php-format
+#, php-format
 msgid "No content for notice %d."
-msgstr "Hae päivityksien sisällöstä"
+msgstr "Päivityksen %d sisältö puuttuu."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
@@ -1271,12 +1262,12 @@ 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
-#, fuzzy
+#: actions/subscribe.php:110
 msgid "No such profile."
-msgstr "Tiedostoa ei ole."
+msgstr "Profiilia ei löydy."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
@@ -1294,27 +1285,23 @@ 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
-#, fuzzy
 msgid "Can only handle favorite activities."
-msgstr "Hae päivityksien sisällöstä"
+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
-#, fuzzy
 msgid "Can only fave notices."
-msgstr "Hae päivityksien sisällöstä"
+msgstr "Vain päivityksiä voi merkitä suosikeiksi."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
 #: actions/atompubfavoritefeed.php:259
-#, fuzzy
 msgid "Unknown note."
-msgstr "Tuntematon toiminto"
+msgstr "Tuntematon päivitys."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
 #: actions/atompubfavoritefeed.php:267
-#, fuzzy
 msgid "Already a favorite."
-msgstr "Lisää suosikkeihin"
+msgstr "Tämä päivitys on jo suosikkina."
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
@@ -1326,9 +1313,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %1$s is a member of on %2$s"
-msgstr "Ryhmät, joiden jäsen %s on"
+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
@@ -1339,38 +1326,33 @@ 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
-#, fuzzy
 msgid "Can only handle join activities."
-msgstr "Hae päivityksien sisällöstä"
+msgstr "Vain liittymistoimintoja tuetaan."
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
 #: actions/atompubmembershipfeed.php:259
-#, fuzzy
 msgid "Unknown group."
-msgstr "Tuntematon toiminto"
+msgstr "Tuntematon ryhmä."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
 #: actions/atompubmembershipfeed.php:267
-#, fuzzy
 msgid "Already a member."
-msgstr "Kaikki jäsenet"
+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 ""
+msgstr "Ylläpitäjä esti toiminnon."
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
 #: actions/atompubshowfavorite.php:90
-#, fuzzy
 msgid "No such favorite."
-msgstr "Tiedostoa ei ole."
+msgstr "Suosikkia ei ole."
 
 #. 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 "Ei voitu poistaa suosikkia."
+msgstr "Et voi poistaa jonkin toisen käyttäjän suosikkia."
 
 #. 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.
@@ -1416,9 +1398,8 @@ msgstr "Tuota ryhmää ei ole."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
 #: actions/atompubshowmembership.php:91
-#, fuzzy
 msgid "Not a member."
-msgstr "Kaikki jäsenet"
+msgstr "Et ole jäsen."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
 #: actions/atompubshowmembership.php:150
@@ -1431,9 +1412,9 @@ msgstr "Tilausta ei onnistuttu tallentamaan."
 #: actions/atompubshowsubscription.php:72
 #: actions/atompubshowsubscription.php:83
 #: actions/atompubsubscriptionfeed.php:74
-#, fuzzy, php-format
+#, php-format
 msgid "No such profile id: %d."
-msgstr "Tiedostoa ei ole."
+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.
@@ -1458,12 +1439,12 @@ 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 ""
+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 ""
+msgstr "Vain henkilöitä voi seurata."
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
@@ -1570,14 +1551,12 @@ 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
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Lataa"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
 #: actions/avatarsettings.php:243
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Rajaa"
@@ -1590,9 +1569,8 @@ msgstr "Profiilia ei ole määritelty."
 
 #. 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 "Valitse neliön muotoinen alue kuvasta profiilikuvaksi"
+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.
@@ -1619,18 +1597,17 @@ 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 ""
+msgstr "Varmuuskopioi tili"
 
 #. 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 "Vain käyttäjä voi lukea omaa postilaatikkoaan."
+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 ""
+msgstr "Et voi varmuuskopioida käyttäjätiliäsi."
 
 #. TRANS: Information displayed on the backup account page.
 #: actions/backupaccount.php:225
@@ -1641,18 +1618,22 @@ msgid ""
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 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 "
+"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
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
-msgstr "Tausta"
+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 ""
+msgstr "Varmuuskopioi käyttäjätilisi."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 #: actions/block.php:68
@@ -1673,6 +1654,9 @@ msgid ""
 "unsubscribed from you, unable to subscribe to you in the future, and you "
 "will not be notified of any @-replies from them."
 msgstr ""
+"Haluatko varmasti estää tämän käyttäjän? Eston jälkeen heidän tilauksensa "
+"päivityksiisi poistetaan, he eivät voi tilata päivityksiäsi tulevaisuudessa, "
+"ja et saa ilmoituksia heidän tekemistään @-vastauksista."
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
@@ -1689,9 +1673,8 @@ msgstr "Ei"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
-#, fuzzy
 msgid "Do not block this user."
-msgstr "Älä estä tätä käyttäjää"
+msgstr "Älä estä tätä käyttäjää."
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
@@ -1708,9 +1691,8 @@ msgstr "Kyllä"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 #: actions/block.php:165
-#, fuzzy
 msgid "Block this user."
-msgstr "Estä tämä käyttäjä"
+msgstr "Estä tämä käyttäjä."
 
 #. TRANS: Server error displayed when blocking a user fails.
 #: actions/block.php:189
@@ -1720,16 +1702,16 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "%s blocked profiles"
-msgstr "Käyttäjän profiili"
+msgstr "%s:n 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
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s blocked profiles, page %2$d"
-msgstr "%s ja kaverit, sivu %d"
+msgstr "%1$s:n estetyt profiilit, sivu %2$d"
 
 #. TRANS: Instructions for list of users blocked from a group.
 #: actions/blockedfromgroup.php:122
@@ -1743,7 +1725,6 @@ msgstr "Poista käyttäjän esto ryhmästä"
 
 #. TRANS: Button text for unblocking a user from a group.
 #: actions/blockedfromgroup.php:323
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Poista esto"
@@ -1790,9 +1771,8 @@ msgstr "Tämä osoite on jo vahvistettu."
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
 #: actions/confirmaddress.php:132
-#, fuzzy
 msgid "Could not delete address confirmation."
-msgstr "Ei voitu poistaa sähköpostivahvistusta."
+msgstr "Osoitteen vahvistusta ei voitu poistaa."
 
 #. TRANS: Title for the contact address confirmation action.
 #: actions/confirmaddress.php:150
@@ -1826,34 +1806,31 @@ 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
-#, fuzzy
 msgid "You cannot delete your account."
-msgstr "Sinä et voi poistaa käyttäjiä."
+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 ""
+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 ""
+msgstr "Kirjoita \"%s\" laatikkoon. Tekstien täytyy vastata toisiaan."
 
 #. TRANS: Confirmation that a user account has been deleted.
 #: actions/deleteaccount.php:206
-#, fuzzy
 msgid "Account deleted."
-msgstr "Kuva poistettu."
+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
-#, fuzzy
 msgid "Delete account"
-msgstr "Luo uusi ryhmä"
+msgstr "Poista käyttäjätili"
 
 #. TRANS: Form text for user deletion form.
 #: actions/deleteaccount.php:279
@@ -1861,6 +1838,8 @@ msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
 msgstr ""
+"Tämä <strong>poistaa lopullisesti</strong> kaikki tiedot käyttäjätilistäsi "
+"tältä palvelimelta."
 
 #. 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.
@@ -1870,6 +1849,8 @@ msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
 "deletion."
 msgstr ""
+"Suosittelemme, että luot tiedoista itsellesi <a href=\"%s\">varmuuskopion</"
+"a> ennen poistoa."
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
@@ -1881,15 +1862,14 @@ msgstr "Vahvista"
 #. 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 "Sinä et voi poistaa käyttäjiä."
+msgstr "Anna \"%s\" varmistaaksesi että haluat todella poistaa käyttäjätilisi."
 
 #. TRANS: Button title for user account deletion.
 #: actions/deleteaccount.php:323
-#, fuzzy
 msgid "Permanently delete your account"
-msgstr "Sinä et voi poistaa käyttäjiä."
+msgstr "Poista käyttäjätilisi lopullisesti"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 #: actions/deleteapplication.php:62
@@ -1905,9 +1885,8 @@ msgstr "Vahvistuskoodia ei löytynyt."
 #. 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 "Sinä et kuulu tähän ryhmään."
+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
@@ -1919,9 +1898,8 @@ 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
-#, fuzzy
 msgid "Delete application"
-msgstr "Päivitystä ei ole."
+msgstr "Poista sovellus"
 
 #. TRANS: Confirmation text on delete application page.
 #: actions/deleteapplication.php:152
@@ -1930,33 +1908,32 @@ msgid ""
 "about the application from the database, including all existing user "
 "connections."
 msgstr ""
+"Oletko varma että haluat poistaa tämän sovelluksen? Tämä poistaa kaikki "
+"tietokannassa olevat tiedot tästä sovelluksesta, mukaanlukien kaikki "
+"yhteydet käyttäjätileihin."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
-#, fuzzy
 msgid "Do not delete this application."
-msgstr "Älä poista tätä päivitystä"
+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."
-msgstr "Poista tämä päivitys"
+msgstr "Poista tämä sovellus."
 
 #. 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 "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä."
+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
-#, fuzzy
 msgid "No nickname or ID."
-msgstr "Tunnusta ei ole."
+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
@@ -1974,16 +1951,15 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Deleted group %s"
-msgstr "Käyttäjän %1$s päivitys %2$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
-#, fuzzy
 msgid "Delete group"
-msgstr "Poista käyttäjä"
+msgstr "Poista ryhmä"
 
 #. TRANS: Warning in form for deleleting a group.
 #: actions/deletegroup.php:206
@@ -1992,31 +1968,34 @@ msgid ""
 "the group from the database, without a backup. Public posts to this group "
 "will still appear in individual timelines."
 msgstr ""
+"Oletko varma, että haluat poistaa tämän ryhmän? Kaikki tieto ryhmästä "
+"poistetaan tietokannasta, eikä varmuuskopiota tehdä. Tämän ryhmän julkiset "
+"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
-#, fuzzy
 msgid "Do not delete this group."
-msgstr "Älä poista tätä päivitystä"
+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."
-msgstr "Poista käyttäjä"
+msgstr "Poista tämä ryhmä."
 
 #. 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: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/nudge.php:63 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
@@ -2045,15 +2024,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."
-msgstr "Älä poista tätä päivitystä"
+msgstr "Älä poista tätä päivitystä."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
 #: actions/deletenotice.php:166
-#, fuzzy
 msgid "Delete this notice."
-msgstr "Poista tämä päivitys"
+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
@@ -2067,7 +2044,6 @@ msgstr "Sinä et voi poistaa käyttäjiä."
 
 #. TRANS: Title of delete user page.
 #: actions/deleteuser.php:110
-#, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Poista käyttäjä"
@@ -2083,6 +2059,8 @@ 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 ""
+"Oletko varma, että haluat poistaa tämän käyttäjän? Kaikki tieto käyttäjästä "
+"poistetaan tietokannasta, eikä varmuuskopiota tehdä."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
@@ -2092,9 +2070,8 @@ msgstr "Älä poista tätä päivitystä"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
 #: actions/deleteuser.php:165
-#, fuzzy
 msgid "Delete this user."
-msgstr "Poista käyttäjä"
+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.
@@ -2105,7 +2082,7 @@ msgstr "Ulkoasu"
 #. TRANS: Instructions for design adminsitration panel.
 #: actions/designadminpanel.php:71
 msgid "Design settings for this StatusNet site"
-msgstr ""
+msgstr "Ulkoasuasetukset tälle StatusNet-sivustolle"
 
 #. TRANS: Client error displayed when a logo URL does is not valid.
 #: actions/designadminpanel.php:327
@@ -2122,9 +2099,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Theme not available: %s."
-msgstr "Pikaviestin ei ole käytettävissä."
+msgstr "Teema ei ole käytettävissä: %s."
 
 #. TRANS: Fieldset legend for form to change logo.
 #: actions/designadminpanel.php:437
@@ -2138,27 +2115,23 @@ msgstr "Palvelun ilmoitus"
 
 #. TRANS: Field label for SSL StatusNet site logo.
 #: actions/designadminpanel.php:452
-#, fuzzy
 msgid "SSL logo"
-msgstr "Palvelun ilmoitus"
+msgstr "SSL-logo"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
 #: actions/designadminpanel.php:467
-#, fuzzy
 msgid "Change theme"
-msgstr "Vaihda"
+msgstr "Vaihda teema"
 
 #. TRANS: Field label for dropdown to choose site theme.
 #: actions/designadminpanel.php:485
-#, fuzzy
 msgid "Site theme"
-msgstr "Palvelun ilmoitus"
+msgstr "Sivuston teema"
 
 #. TRANS: Title for field label for dropdown to choose site theme.
 #: actions/designadminpanel.php:487
-#, fuzzy
 msgid "Theme for the site."
-msgstr "Kirjaudu ulos palvelusta"
+msgstr "Teema sivustolle."
 
 #. TRANS: Field label for uploading a cutom theme.
 #: actions/designadminpanel.php:494
@@ -2169,7 +2142,7 @@ 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 ""
+msgstr "Voit ladata mukautetun StatusNet-teeman .ZIP-pakettina."
 
 #. TRANS: Fieldset legend for theme background image.
 #. TRANS: Fieldset legend on profile design page.
@@ -2187,11 +2160,11 @@ msgstr "Tausta"
 
 #. TRANS: Form guide for background image upload form on theme designer page.
 #: actions/designadminpanel.php:531
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
 "$s."
-msgstr "Voit ladata ryhmälle logokuvan. Maksimikoko on %s."
+msgstr "Voit ladata ryhmälle taustakuvan. Maksimikoko on %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
 #: actions/designadminpanel.php:558
@@ -2207,22 +2180,19 @@ msgstr "Off"
 #. 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
-#, fuzzy
 msgid "Turn background image on or off."
-msgstr "Vaihda tautakuva"
+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
-#, fuzzy
 msgid "Tile background image"
-msgstr "Vaihda tautakuva"
+msgstr "Taustakuvan toisto vierekkäin"
 
 #. TRANS: Fieldset legend for theme colors.
 #: actions/designadminpanel.php:598
-#, fuzzy
 msgid "Change colors"
-msgstr "Vaihda väriä"
+msgstr "Vaihda värejä"
 
 #. TRANS: Field label for content color selector.
 #. TRANS: Label on profile design page for setting a profile page content colour.
@@ -2233,9 +2203,8 @@ 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
-#, fuzzy
 msgid "Sidebar"
-msgstr "Haku"
+msgstr "Sivupalkki"
 
 #. TRANS: Field label for text color selector.
 #. TRANS: Label on profile design page for setting a profile page text colour.
@@ -2252,37 +2221,33 @@ msgstr "Linkit"
 #. TRANS: Fieldset legend for advanced theme design settings.
 #: actions/designadminpanel.php:691
 msgid "Advanced"
-msgstr ""
+msgstr "Lisäasetukset"
 
 #. TRANS: Field label for custom CSS.
 #: actions/designadminpanel.php:696
 msgid "Custom CSS"
-msgstr ""
+msgstr "Mukautettu CSS"
 
 #. TRANS: Button text for resetting theme settings.
 #: actions/designadminpanel.php:718
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
 msgstr "Käytä oletusasetuksia"
 
 #. TRANS: Title for button for resetting theme settings.
 #: actions/designadminpanel.php:720
-#, fuzzy
 msgid "Restore default designs."
-msgstr "Käytä oletusasetuksia"
+msgstr "Palauta oletusulkonäkö."
 
 #. TRANS: Title for button for resetting theme settings.
 #: actions/designadminpanel.php:728
-#, fuzzy
 msgid "Reset back to default."
-msgstr "Käytä oletusasetuksia"
+msgstr "Palauta oletusulkoasu."
 
 #. TRANS: Title for button for saving theme settings.
 #: actions/designadminpanel.php:736
-#, fuzzy
 msgid "Save design."
-msgstr "Ryhmän ulkoasu"
+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
@@ -2297,15 +2262,15 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\"."
-msgstr "Liitettä ei ole."
+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 ""
+msgstr "Muokkaa sovellusta"
 
 #. TRANS: Client error displayed trying to edit an application while not logged in.
 #: actions/editapplication.php:66
@@ -2316,73 +2281,65 @@ msgstr ""
 
 #. 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 "Päivitystä ei ole."
+msgstr "Sovellusta ei ole."
 
 #. TRANS: Instructions for "Edit application" form.
 #: actions/editapplication.php:167
-#, fuzzy
 msgid "Use this form to edit your application."
-msgstr "Käytä tätä lomaketta muokataksesi ryhmää."
+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
-#, fuzzy
 msgid "Name is required."
-msgstr "Sama kuin ylläoleva salasana. Pakollinen."
+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
-#, fuzzy
 msgid "Name is too long (maximum 255 characters)."
-msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
+msgstr "Nimi on liian pitkä (max 255 merkkiä)."
 
 #. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
 #. 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 "Tunnus on jo käytössä. Yritä toista tunnusta."
+msgstr "Nimi on jo käytössä. Yritä 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
-#, fuzzy
 msgid "Description is required."
-msgstr "Kuvaus"
+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 ""
+msgstr "Lähteen 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
-#, fuzzy
 msgid "Source URL is not valid."
-msgstr "Kotisivun verkko-osoite ei ole toimiva."
+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 ""
+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
-#, fuzzy
 msgid "Organization is too long (maximum 255 characters)."
-msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)."
+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 ""
+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.
@@ -2398,9 +2355,8 @@ 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 "Ei voitu päivittää ryhmää."
+msgstr "Ei voitu päivittää sovellusta."
 
 #. TRANS: Title for form to edit a group. %s is a group nickname.
 #: actions/editgroup.php:55
@@ -2468,9 +2424,8 @@ 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
-#, fuzzy
 msgid "Email address"
-msgstr "Sähköpostiosoitteet"
+msgstr "Sähköpostiosoite"
 
 #. TRANS: Form note in e-mail settings form.
 #: actions/emailsettings.php:109
@@ -2548,11 +2503,12 @@ msgid ""
 "To send notices via email, we need to create a unique email address for you "
 "on this server:"
 msgstr ""
+"Jotta voisimme lähettää päivityksiä sähköpostitse, meidän on luotava sinulle "
+"yksilöllinen sähkopostiosoite tällä palvelimella:"
 
 #. 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
-#, fuzzy
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Uusi"
@@ -2594,9 +2550,8 @@ msgstr "Julkaise MicroID sähköpostiosoitteelleni."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
 #: actions/emailsettings.php:361
-#, fuzzy
 msgid "Email preferences saved."
-msgstr "Ulkoasuasetukset tallennettu."
+msgstr "Sähköpostiasetukset tallennettu."
 
 #. TRANS: Message given saving e-mail address without having provided one.
 #: actions/emailsettings.php:380
@@ -2654,14 +2609,12 @@ msgstr "Avoimia vahvistuksia ei ole peruutettavana."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
 #: actions/emailsettings.php:450
-#, fuzzy
 msgid "That is the wrong email address."
-msgstr "Tämä on väärä pikaviestiosoite."
+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
-#, fuzzy
 msgid "Could not delete email confirmation."
 msgstr "Ei voitu poistaa sähköpostivahvistusta."
 
@@ -2691,7 +2644,6 @@ msgstr "Saapuvan sähköpostin osoitetta ei ole."
 #. 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
-#, fuzzy
 msgid "Could not update user record."
 msgstr "Ei voitu päivittää käyttäjätietoja."
 
@@ -2714,9 +2666,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"
+msgstr "Poista suosikeista."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2850,15 +2801,13 @@ 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
-#, fuzzy
 msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Tuntematon OMB-protokollan versio."
+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
-#, fuzzy
 msgid "Error updating remote profile."
-msgstr "Virhe tapahtui etäprofiilin päivittämisessä"
+msgstr "Virhe tapahtui päivitettäessä etäprofiilia."
 
 #. TRANS: Client error displayed when requesting a non-existent file.
 #: actions/getfile.php:77
@@ -2872,9 +2821,8 @@ 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
-#, fuzzy
 msgid "Invalid role."
-msgstr "Koko ei kelpaa."
+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
@@ -2908,7 +2856,6 @@ msgstr "Profiilia ei ole määritelty."
 #: 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 "Ei profiilia tuolle ID:lle."
 
@@ -2949,26 +2896,27 @@ 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."
 
 #. 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 "Älä estä tätä käyttäjää tästä ryhmästä"
+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."
-msgstr "Estä tätä käyttäjää osallistumassa tähän ryhmään"
+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
-#, fuzzy
 msgid "Database error blocking user from group."
-msgstr "Poista käyttäjän esto ryhmästä"
+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."
@@ -3012,7 +2960,7 @@ msgstr "Ryhmän logo"
 #. TRANS: Instructions for group logo page.
 #. TRANS: %s is the maximum file size for that site.
 #: actions/grouplogo.php:156
-#, fuzzy, php-format
+#, 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."
@@ -3070,13 +3018,13 @@ msgstr "Ylläpito"
 #: actions/groupmembers.php:397
 msgctxt "BUTTON"
 msgid "Block"
-msgstr ""
+msgstr "Estä"
 
 #. TRANS: Submit button title.
 #: actions/groupmembers.php:401
 msgctxt "TOOLTIP"
 msgid "Block this user"
-msgstr ""
+msgstr "Estä tämä käyttäjä"
 
 #. TRANS: Form legend for form to make a user a group admin.
 #: actions/groupmembers.php:488
@@ -3087,13 +3035,13 @@ msgstr "Tee tästä käyttäjästä ylläpitäjä"
 #: actions/groupmembers.php:521
 msgctxt "BUTTON"
 msgid "Make Admin"
-msgstr ""
+msgstr "Tee ylläpitäjäksi"
 
 #. TRANS: Submit button title.
 #: actions/groupmembers.php:525
 msgctxt "TOOLTIP"
 msgid "Make this user an admin"
-msgstr ""
+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
@@ -3151,8 +3099,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"
 
@@ -3185,6 +3135,7 @@ 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."
@@ -3643,19 +3594,19 @@ msgstr "Yksityisyys"
 
 #: actions/licenseadminpanel.php:239
 msgid "All Rights Reserved"
-msgstr ""
+msgstr "Kaikki oikeudet pidätetään"
 
 #: actions/licenseadminpanel.php:240
 msgid "Creative Commons"
-msgstr ""
+msgstr "Creative Commons"
 
 #: actions/licenseadminpanel.php:245
 msgid "Type"
-msgstr ""
+msgstr "Tyyppi"
 
 #: actions/licenseadminpanel.php:247
 msgid "Select license"
-msgstr ""
+msgstr "Valitse lisenssi"
 
 #: actions/licenseadminpanel.php:261
 msgid "License details"
@@ -3704,6 +3655,7 @@ 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
 msgid "Already logged in."
 msgstr "Olet jo kirjautunut sisään."
@@ -3712,7 +3664,8 @@ msgstr "Olet jo kirjautunut sisään."
 msgid "Incorrect username or password."
 msgstr "Väärä käyttäjätunnus tai salasana"
 
-#: actions/login.php:148 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:148 actions/otp.php:127
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Sinulla ei ole valtuutusta tähän."
@@ -3883,7 +3836,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 "
@@ -3892,16 +3847,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%%%%?"
@@ -3910,7 +3870,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 "
@@ -3919,14 +3881,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
-#, 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
+#, 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
@@ -4064,11 +4029,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Etsi Päivityksistä"
 
@@ -4116,26 +4082,31 @@ 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ä)."
 
-#: 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"
@@ -4515,7 +4486,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. "
@@ -4525,7 +4498,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ä"
 
@@ -4814,6 +4788,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"
@@ -5262,6 +5242,7 @@ 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
@@ -5314,9 +5295,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.
@@ -6274,16 +6257,20 @@ 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 ""
 
-#: 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"
 
@@ -6475,6 +6462,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ää"
@@ -7071,14 +7059,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:771
+#: classes/Profile.php:775
 #, 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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7753,19 +7741,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 ""
 
@@ -9750,18 +9742,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9769,12 +9766,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9782,12 +9779,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9795,12 +9792,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9808,7 +9805,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:1340
 msgid "about a year ago"
 msgstr "noin vuosi sitten"
 
@@ -9850,16 +9847,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "6 or more characters"
-#~ msgstr "6 tai useampia merkkejä"
-
-#~ msgid "Same as password above"
-#~ msgstr "Sama kuin ylläoleva salasana"
-
-#~ msgid "Can't save new password."
-#~ msgstr "Uutta salasanaa ei voida tallentaa."
-
-#~ msgid "URL of your homepage, blog, or profile on another site"
-#~ msgstr ""
-#~ "Kotisivusi, blogisi tai toisella sivustolla olevan profiilisi osoite."
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 6692f47d3f..1efde04401 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:18+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:36: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-Generator: MediaWiki 1.18alpha (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -161,10 +165,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -827,6 +831,7 @@ 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
@@ -839,7 +844,7 @@ msgstr "Le jeton de requête a déjà été autorisé."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1173,13 +1178,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 !"
@@ -1284,9 +1290,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é."
 
@@ -2024,13 +2031,15 @@ 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/nudge.php:63 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
@@ -2964,6 +2973,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."
@@ -3154,8 +3164,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."
 
@@ -3192,6 +3204,7 @@ 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."
@@ -3714,6 +3727,7 @@ 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
 msgid "Already logged in."
 msgstr "Déjà connecté."
@@ -3722,7 +3736,8 @@ msgstr "Déjà connecté."
 msgid "Incorrect username or password."
 msgstr "Identifiant ou mot de passe incorrect."
 
-#: actions/login.php:148 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:148 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 "
@@ -3893,7 +3908,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 "
@@ -3902,16 +3919,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%%%%?"
@@ -3920,7 +3942,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 "
@@ -3930,14 +3954,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
-#, 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
+#, 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
@@ -4075,11 +4102,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Recherche d’avis"
 
@@ -4126,23 +4154,28 @@ 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)."
 
-#: 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é."
 
@@ -4499,7 +4532,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. "
@@ -4509,7 +4544,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"
 
@@ -4802,6 +4838,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"
@@ -5250,6 +5292,7 @@ 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
@@ -5306,9 +5349,11 @@ msgstr ""
 "quelque chose à son intention](%%%%action.newnotice%%%%?status_textarea=%3"
 "$s)."
 
-#: actions/repliesrss.php:72
-#, 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
+#, 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.
@@ -6279,17 +6324,21 @@ 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."
 
-#: 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é"
 
@@ -6489,6 +6538,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."
@@ -7094,7 +7144,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:771
+#: classes/Profile.php:775
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7103,7 +7153,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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7755,19 +7805,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."
 
@@ -9853,18 +9907,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9872,12 +9931,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9885,12 +9944,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9898,12 +9957,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9911,7 +9970,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:1340
 msgid "about a year ago"
 msgstr "il y a environ 1 an"
 
@@ -9958,16 +10017,3 @@ msgstr "XML invalide, racine XRD manquante."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Obtention de la sauvegarde depuis le fichier « %s »."
-
-#~ msgid "6 or more characters"
-#~ msgstr "6 caractères ou plus"
-
-#~ msgid "Same as password above"
-#~ msgstr "Identique au mot de passe ci-dessus"
-
-#~ msgid "Can't save new password."
-#~ msgstr "Impossible de sauvegarder le nouveau mot de passe."
-
-#~ 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"
diff --git a/locale/fur/LC_MESSAGES/statusnet.po b/locale/fur/LC_MESSAGES/statusnet.po
new file mode 100644
index 0000000000..4c127f81de
--- /dev/null
+++ b/locale/fur/LC_MESSAGES/statusnet.po
@@ -0,0 +1,9393 @@
+# Translation of StatusNet - Core 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 - 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"
+"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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: fur\n"
+"X-Message-Group: #out-statusnet-core\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\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 "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 ""
+
+#. 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 text to store form data in the Paths admin panel.
+#. TRANS: Button to save input in profile settings.
+#. TRANS: Button text for saving site notice in admin panel.
+#. TRANS: Button label to save SMS preferences.
+#. TRANS: Save button for settings for a profile in a subscriptions list.
+#. TRANS: Button text to save user settings in user admin panel.
+#. TRANS: Button label in the "Edit application" form.
+#. 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/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 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."
+
+#. TRANS: Client error when user not found for an action.
+#. TRANS: Client error when user not found for an rss related action.
+#. TRANS: Client error displayed when no existing user is provided for a user's delivery device setting.
+#. TRANS: Client error displayed if a user could not be found.
+#. TRANS: Client error when user not found updating a profile background image.
+#. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
+#. TRANS: Client error when user not found for an API action to remove a block for a user.
+#. TRANS: Client error given when a user was not found (404).
+#. TRANS: Client error when user not found for an API direct message action.
+#. TRANS: Client error given when a user was not found (404).
+#. 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 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.
+#. TRANS: Client error displayed when requesting dents of a user and friends for a user that does not exist.
+#. TRANS: Client error displayed when requesting most recent dents by user and friends for a non-existing user.
+#. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
+#. TRANS: Client error displayed requesting most recent notices for a non-existing user.
+#. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
+#. TRANS: Client error displayed trying to 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
+#: 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/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:497 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"
+
+#. TRANS: Page title. %s is user nickname
+#. 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
+#, 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."
+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 "
+"something yourself."
+msgstr ""
+"Prove a sotscriviti a plui int, [unîti a un grup](%%action.groups%%) o "
+"publicâ alc di personâl."
+
+#. 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 "
+"to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
+msgstr ""
+
+#. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+#. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
+#. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:227
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to them."
+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!"
+
+#. TRANS: Client error displayed handling a non-existing API method.
+#. TRANS: Client error displayed when trying to handle an unknown API method.
+#. TRANS: Client error displayed trying to execute an unknown API method updating profile colours.
+#. TRANS: Client error displayed trying to execute an unknown API method verifying user credentials.
+#. TRANS: Client error given when an API method was not found (404).
+#. TRANS: Client error displayed when trying to handle an unknown API method.
+#. TRANS: Client error displayed trying to execute an unknown API method showing friendship.
+#. TRANS: Client error given when an API method was not found (404).
+#. TRANS: Client error displayed trying to execute an unknown API method showing group membership.
+#. TRANS: Client error displayed trying to execute an unknown API method joining a group.
+#. TRANS: Client error displayed trying to execute an unknown API method leaving a group.
+#. 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 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:160
+#: actions/apigroupleave.php:145 actions/apigrouplist.php:134
+#: 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/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
+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/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."
+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
+msgid "Could not update user."
+msgstr ""
+
+#. TRANS: Client error displayed if a user profile could not be found.
+#. TRANS: Client error displayed when a user has no profile.
+#. TRANS: Client error displayed a user has no profile updating profile colours.
+#. TRANS: Client error displayed if a user profile could not be found updating a profile image.
+#. TRANS: Client error displayed when requesting user information for a user without a profile.
+#. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. 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:418
+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:298
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s byte) due to its "
+"current configuration."
+msgid_plural ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Client error displayed when saving design settings fails because of an empty id.
+#. TRANS: Client error displayed when saving design settings fails because of an empty result.
+#. 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:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
+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:179
+msgid "Could not update your design."
+msgstr ""
+
+#. TRANS: Title for Atom feed.
+#: actions/apiatomservice.php:85
+msgctxt "ATOM"
+msgid "Main"
+msgstr "Principâl"
+
+#. TRANS: Title for Atom feed. %s is a user nickname.
+#. 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"
+
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. 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"
+
+#. 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ç!"
+
+#. TRANS: Client error displayed when message content is too long.
+#. 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] ""
+"Test masse lunc. La lungjece massime pai messaçs e je di %d caratar."
+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 ""
+
+#. 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:294
+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: 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:206
+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: 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:208
+msgid "Not a valid nickname."
+msgstr "Nol è un sorenon valit."
+
+#. TRANS: Client error in form for group creation.
+#. 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/editapplication.php:235
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
+#: actions/register.php:215
+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: 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:252
+#: actions/register.php:218
+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: 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.
+#. TRANS: Form validation error in New application form.
+#. TRANS: %d is the maximum number of characters for the description.
+#. TRANS: Group create form validation error.
+#. TRANS: %d is the maximum number of allowed characters.
+#: actions/apigroupcreate.php: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] "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: 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:265
+#: actions/register.php:227
+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: 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."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Client error shown when providing an invalid alias during group creation.
+#. TRANS: %s is the invalid alias.
+#: actions/apigroupcreate.php:253
+#, 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: 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
+#, 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
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#. TRANS: Client error displayed when checking group membership for a non-existing group.
+#. 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 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/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:333
+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
+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:350
+#, 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."
+
+#. 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.
+#. 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
+#, 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 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 ""
+
+#. 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.
+#. 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/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/profilesettings.php:217 actions/recoverpassword.php:383
+#: actions/register.php:164 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
+#: lib/designsettings.php:310
+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 ""
+
+#. 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.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
+#. TRANS: Client error displayed submitting invalid form data for edit application.
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Form validation error message when an unsupported argument is used.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
+#. TRANS: Client error when submitting a form with unexpected information.
+#. 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:310 actions/grouplogo.php:332
+#: actions/imsettings.php:239 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:145 actions/recoverpassword.php:46
+#: actions/smssettings.php:271 lib/designsettings.php:321
+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 "
+"account data. You should only give access to your %4$s account to third "
+"parties you trust."
+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 "
+"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 ""
+
+#. 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 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/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:152 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
+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 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
+#: 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."
+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 "
+"process."
+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 ""
+
+#. 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 "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
+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
+msgid "Already repeated that notice."
+msgstr ""
+
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. 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."
+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."
+msgstr[0] ""
+"La lungjece massime pai avîs e je di %d caratar, includint la URL alegade."
+msgstr[1] ""
+"La lungjece massime pai avîs e je di %d caratars, includint la URL alegade."
+
+#. 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"
+
+#. 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: 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
+#, php-format
+msgid "%1$s / Updates mentioning %2$s"
+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:108
+#, php-format
+msgid "Repeated to %s"
+msgstr "Ripetût a %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
+#, php-format
+msgid "Repeats of %s"
+msgstr "Ripetizions di %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
+#, 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:297
+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
+msgid "Only accept AtomPub for Atom feeds."
+msgstr ""
+
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
+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
+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/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:334
+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
+#, 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
+#, 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."
+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 ""
+
+#. 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.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. 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 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:380
+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 ""
+
+#. TRANS: Client error displayed trying to get an avatar without providing a nickname.
+#. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
+#. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. 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.
+#. 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
+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 ""
+"Tu puedis cjamâ un avatar personâl. La dimension massime dal file e je di %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
+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"
+
+#. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
+#. 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"
+
+#. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
+#. 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:467
+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:225
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:248
+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."
+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 "
+"will not be notified of any @-replies from them."
+msgstr ""
+
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete group form.
+#. 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"
+
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete group form.
+#. 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 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: Client error for an already confirmed email/jabber/sms address.
+#: actions/confirmaddress.php:97
+msgid "That address has already been confirmed."
+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
+msgid "Could not delete address confirmation."
+msgstr ""
+
+#. TRANS: Title for the contact address confirmation action.
+#: actions/confirmaddress.php:150
+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
+#, 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
+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:475
+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."
+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 "
+"deletion."
+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
+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:1422
+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 "
+"connections."
+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 "
+"will still appear in individual timelines."
+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."
+
+#. 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/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
+#: actions/nudge.php:63 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."
+msgstr ""
+"Tu sês daûr a eliminâ par simpri un avîs. Une volte fat, no si pues tornâ "
+"indaûr."
+
+#. 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.
+#. TRANS: Link description in user account settings menu.
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
+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.
+#. TRANS: Fieldset legend on profile design page.
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
+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/designsettings.php:183
+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"
+"$s."
+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/designsettings.php:159
+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
+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/designsettings.php:197
+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
+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
+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
+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"
+
+#. 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: 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
+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
+#, 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
+msgid "Email address"
+msgstr "Direzion di pueste eletroniche"
+
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:109
+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 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
+msgctxt "BUTTON"
+msgid "Remove"
+msgstr "Gjave"
+
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+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."
+
+#. 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:136
+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 a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:140 actions/imsettings.php:147
+#: actions/smssettings.php:158
+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
+msgid "Incoming email"
+msgstr "Pueste in jentrade"
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:154
+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
+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
+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
+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:195 actions/smssettings.php:185
+msgctxt "BUTTON"
+msgid "New"
+msgstr "Gnûf"
+
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:204
+msgid "Email preferences"
+msgstr ""
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
+msgid "Send me notices of new subscriptions through email."
+msgstr ""
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:218
+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
+msgid "Send me email when someone sends me a private message."
+msgstr ""
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:231
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr ""
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:237
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:243
+msgid "Publish a MicroID for my email address."
+msgstr ""
+
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:361
+msgid "Email preferences saved."
+msgstr ""
+
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:380
+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
+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/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
+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
+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
+msgid "Could not insert confirmation code."
+msgstr ""
+
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:425
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+
+#. 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
+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
+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
+msgid "Could not delete email confirmation."
+msgstr ""
+
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:464
+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
+msgid "That is not your email address."
+msgstr ""
+
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:504
+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
+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:530 actions/emailsettings.php:554
+#: actions/smssettings.php:566 actions/smssettings.php:591
+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
+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
+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."
+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 "
+"notice to your favorites!"
+msgstr ""
+
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. 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
+#, 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 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 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
+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 "
+"will be removed from the group, unable to post, and unable to subscribe to "
+"the group in the future."
+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:222
+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
+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"
+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 "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
+msgstr ""
+"I grups di %%%%site.name%%%% ti permetin cjatâ e tabaiâ cun int che e à "
+"interès simîi. Daspò che tu ti unissis a un grup tu puedis mandâ messaçs a "
+"ducj chei altris membris dal grup doprant la scurte \"!groupname\". No son "
+"grups che ti plasin? Prove a [cirint un](%%%%action.groupsearch%%%%) o "
+"[scomence il to](%%%%action.newgroup%%%%)!"
+
+#. 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. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"Cîr i grups di %%site.name%% par non, lûc o descrizion. Divît i tiermins cun "
+"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](%%"
+"action.newgroup%%) yourself."
+msgstr ""
+"Se no tu cjatis il grup che tu cirivis, tu puedis [creâlu](%%action.newgroup%"
+"%) tu."
+
+#. 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](%%"
+"action.newgroup%%) yourself!"
+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:58
+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
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
+msgstr ""
+
+#. TRANS: Message given in the Instant Messaging settings if XMPP 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: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
+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"
+msgstr "Preferencis 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
+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
+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."
+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."
+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 canceling Instant Messaging address confirmation for the wrong IM address.
+#: actions/imsettings.php:382
+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: Message given after successfully canceling Instant Messaging address confirmation.
+#: actions/imsettings.php:396
+msgid "IM confirmation cancelled."
+msgstr ""
+
+#. TRANS: Message given trying to remove an Instant Messaging address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:417
+msgid "That is not your Jabber ID."
+msgstr ""
+
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
+#: actions/imsettings.php:440
+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"
+
+#. TRANS: Message displayed inviting users to use a StatusNet site while the inviting user
+#. 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] ""
+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)"
+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:"
+msgstr[0] ""
+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] ""
+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
+msgctxt "BUTTON"
+msgid "Send"
+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 ""
+
+#. TRANS: Body text 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 the
+#. 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"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+
+#. 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:147
+#, 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:386
+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
+msgid "License for this StatusNet site"
+msgstr ""
+
+#: actions/licenseadminpanel.php:134
+msgid "Invalid license selection."
+msgstr ""
+
+#: actions/licenseadminpanel.php:144
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:151
+msgid "Invalid license title. Maximum length is 255 characters."
+msgstr ""
+
+#: actions/licenseadminpanel.php:163
+msgid "Invalid license URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:166
+msgid "Invalid license image URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:174
+msgid "License URL must be blank or a valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:182
+msgid "License image must be blank or valid URL."
+msgstr ""
+
+#: actions/licenseadminpanel.php:232
+msgid "License selection"
+msgstr "Sielte de licence"
+
+#: actions/licenseadminpanel.php:238
+msgid "Private"
+msgstr "Privât"
+
+#: actions/licenseadminpanel.php:239
+msgid "All Rights Reserved"
+msgstr "Ducj i dirits riservâts"
+
+#: actions/licenseadminpanel.php:240
+msgid "Creative Commons"
+msgstr "Creative Commons"
+
+#: actions/licenseadminpanel.php:245
+msgid "Type"
+msgstr "Gjenar"
+
+#: actions/licenseadminpanel.php:247
+msgid "Select license"
+msgstr "Sielç la licence"
+
+#: actions/licenseadminpanel.php:261
+msgid "License details"
+msgstr "Detais de licence"
+
+#: actions/licenseadminpanel.php:267
+msgid "Owner"
+msgstr ""
+
+#: actions/licenseadminpanel.php:268
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr ""
+
+#: actions/licenseadminpanel.php:276
+msgid "License Title"
+msgstr "Titul de licence"
+
+#: actions/licenseadminpanel.php:277
+msgid "The title of the license."
+msgstr "Il titul de licence."
+
+#: actions/licenseadminpanel.php:285
+msgid "License URL"
+msgstr "URL de licence"
+
+#: actions/licenseadminpanel.php:286
+msgid "URL for more information about the license."
+msgstr ""
+
+#: actions/licenseadminpanel.php:293
+msgid "License Image URL"
+msgstr ""
+
+#: actions/licenseadminpanel.php:294
+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:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "Salve"
+
+#: actions/licenseadminpanel.php:311
+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
+msgid "Already logged in."
+msgstr "Tu sês za jentrât."
+
+#: actions/login.php:142
+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
+msgid "Error setting user. You are probably not authorized."
+msgstr ""
+
+#: actions/login.php:202 actions/login.php:253
+msgid "Login"
+msgstr "Jentre"
+
+#: actions/login.php:239
+msgid "Login to site"
+msgstr "Jentre tal sît"
+
+#: actions/login.php:248 actions/register.php:476
+msgid "Remember me"
+msgstr "Visiti di me"
+
+#: actions/login.php:249 actions/register.php:478
+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
+msgid "Lost or forgotten password?"
+msgstr ""
+
+#: actions/login.php:277
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+
+#: actions/login.php:281
+msgid "Login with your username and password."
+msgstr "Jentre cul to non utent e password"
+
+#: actions/login.php:284
+#, php-format
+msgid ""
+"Don't have a username yet? [Register](%%action.register%%) a new account."
+msgstr ""
+"No tu âs ancjemò un non utent? [Regjistre](%%action.register%%) une gnove "
+"identitât."
+
+#: actions/makeadmin.php:92
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:96
+#, php-format
+msgid "%1$s is already an admin for group \"%2$s\"."
+msgstr ""
+
+#: actions/makeadmin.php:133
+#, php-format
+msgid "Can't get membership record for %1$s in group %2$s."
+msgstr ""
+
+#: actions/makeadmin.php:146
+#, php-format
+msgid "Can't make %1$s an admin for group %2$s."
+msgstr ""
+
+#: actions/microsummary.php:69
+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
+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
+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
+msgid "No content!"
+msgstr ""
+
+#: actions/newmessage.php:161
+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
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly instead."
+msgstr ""
+
+#: actions/newmessage.php:184
+msgid "Message sent"
+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
+#, 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
+msgid "Ajax Error"
+msgstr ""
+
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "Gnûf avîs"
+
+#: actions/newnotice.php:230
+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 "
+"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
+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%%%%?"
+"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
+#, 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
+#, 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
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set their email "
+"address yet."
+msgstr ""
+
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr ""
+
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr ""
+
+#. TRANS: Message displayed to an anonymous user trying to view OAuth application list.
+#: actions/oauthappssettings.php:60
+msgid "You must be logged in to list your applications."
+msgstr ""
+
+#. TRANS: Page title for OAuth applications
+#: actions/oauthappssettings.php:76
+msgid "OAuth applications"
+msgstr ""
+
+#. TRANS: Page instructions for OAuth applications
+#: actions/oauthappssettings.php:88
+msgid "Applications you have registered"
+msgstr ""
+
+#. TRANS: Empty list message on page with OAuth applications.
+#: actions/oauthappssettings.php:141
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr ""
+
+#. TRANS: Title for OAuth connection settings.
+#: actions/oauthconnectionssettings.php:70
+msgid "Connected applications"
+msgstr ""
+
+#. TRANS: Instructions for OAuth connection settings.
+#: actions/oauthconnectionssettings.php:81
+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
+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
+#, 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
+#, php-format
+msgid ""
+"You have successfully revoked access for %1$s and the access token starting "
+"with %2$s."
+msgstr ""
+
+#. TRANS: Empty list message when no applications have been authorised yet.
+#: actions/oauthconnectionssettings.php:211
+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
+#, 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 ""
+
+#: actions/oembed.php:83 actions/shownotice.php:172
+#, php-format
+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
+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: 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
+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
+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 ""
+
+#. 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:423
+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."
+msgstr "Compagn che la password parsore"
+
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Cambie"
+
+#: actions/passwordsettings.php:153 actions/register.php:230
+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
+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.
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
+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. "
+"Separate the terms by spaces; they must be 3 characters or more."
+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
+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 ""
+
+#: 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:59
+msgid "Profile settings"
+msgstr "Impuestazions dal profîl"
+
+#. TRANS: Usage instructions for profile settings.
+#: actions/profilesettings.php:70
+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
+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
+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/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
+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:446
+#: 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
+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
+#, php-format
+msgid "Describe yourself and your interests in %d character"
+msgid_plural "Describe yourself and your interests in %d characters"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:135 actions/register.php:462
+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
+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/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:174 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
+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
+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
+msgid "Tags"
+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."
+msgstr ""
+
+#. TRANS: Dropdownlist label in form for profile settings.
+#: actions/profilesettings.php:169
+msgid "Language"
+msgstr "Lenghe"
+
+#. TRANS: Tooltip for dropdown list label in form for profile settings.
+#: actions/profilesettings.php:171
+msgid "Preferred language."
+msgstr "Lenghe preferide"
+
+#. TRANS: Dropdownlist label in form for profile settings.
+#: actions/profilesettings.php:181
+msgid "Timezone"
+msgstr "Fûs orari"
+
+#. TRANS: Tooltip for dropdown list label in form for profile settings.
+#: actions/profilesettings.php:183
+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
+msgid ""
+"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
+#, php-format
+msgid "Bio is too long (maximum %d character)."
+msgid_plural "Bio is too long (maximum %d characters)."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Validation error in form for profile settings.
+#: actions/profilesettings.php:269 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
+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
+#, 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:347
+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
+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
+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
+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
+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-"
+"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 ""
+"Chest al è %%site.name%%, un servizi di [microblogging](http://en.wikipedia."
+"org/wiki/Micro-blogging) basât sul imprest libar [StatusNet](http://status."
+"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-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
+msgstr ""
+"Chest al è %%site.name%%, un servizi di [microblogging](http://en.wikipedia."
+"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"
+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"
+
+#. 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 ""
+
+#. TRANS: Message shown to a anonymous user for the public tag cloud
+#. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
+#. 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 "
+"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!"
+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/designsettings.php:264
+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 ""
+
+#. 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:248
+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/register.php:87 actions/register.php:188 actions/register.php:399
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:94
+msgid "Sorry, invalid invitation code."
+msgstr ""
+
+#: actions/register.php:113
+msgid "Registration successful"
+msgstr "Regjistrât cun sucès"
+
+#: actions/register.php:115 actions/register.php:497
+msgid "Register"
+msgstr "Regjistriti"
+
+#: actions/register.php:135
+msgid "Registration not allowed."
+msgstr ""
+
+#: actions/register.php:201
+msgid "You cannot register if you don't agree to the license."
+msgstr ""
+
+#: actions/register.php:210
+msgid "Email address already exists."
+msgstr ""
+
+#: actions/register.php:243 actions/register.php:265
+msgid "Invalid username or password."
+msgstr "Il non utent o la password no son valits."
+
+#: actions/register.php:340
+msgid ""
+"With this form you can create a new account. You can then post notices and "
+"link up to friends and colleagues."
+msgstr ""
+
+#. TRANS: Link description in user account settings menu.
+#: actions/register.php:431 actions/register.php:435
+#: 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."
+msgstr ""
+
+#: actions/register.php:443
+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:510
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:520
+#, 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
+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
+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
+#, 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
+#, php-format
+msgid ""
+"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
+"\n"
+"* Go to [your profile](%2$s) and post your first message.\n"
+"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
+"notices through instant messages.\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
+"share your interests. \n"
+"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
+"others more about you. \n"
+"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
+"missed. \n"
+"\n"
+"Thanks for signing up and we hope you enjoy using this service."
+msgstr ""
+"Compliments, %1$s! Benvignût su %%%%site.name%%%%. Di culì tu puedis...\n"
+"\n"
+"* Lâ tal [tô profîl](%2$s) e publicâ il to prin messaç.\n"
+"* Zontâ une [direzion Jabber/GTalk ](%%%%action.imsettings%%%%) par mandâ "
+"avîs par mieç di messaçs istantanis.\n"
+"* [Cirî int](%%%%action.peoplesearch%%%%) che tu cognossis o che a "
+"condividin i tiei interès. \n"
+"* Inzornâ lis tôs [impuestazions de identitât](%%%%action.profilesettings%%%"
+"%) par fâ savê altris robis su di te. \n"
+"* Lei il [jutori in linee](%%%%doc.help%%%%) par funzions che no tu âs "
+"discuviert. \n"
+"\n"
+"Graziis par jessiti regjistrât e o sperìn che tu gjoldarâs a doprâ chest "
+"servizi."
+
+#: actions/register.php:597
+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."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+msgstr ""
+
+#: actions/remotesubscribe.php: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:431
+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:692
+msgid "Repeated"
+msgstr "Ripetût"
+
+#: actions/repeat.php:117
+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
+#, 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."
+"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
+#, 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
+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 ""
+
+#. TRANS: Form input field label for application icon.
+#: actions/showapplication.php:153 lib/applicationeditform.php:177
+msgid "Icon"
+msgstr "Icone"
+
+#. TRANS: Form input field label for application name.
+#: actions/showapplication.php:163 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
+msgid "Organization"
+msgstr "Organizazion"
+
+#. TRANS: Form input field label.
+#: actions/showapplication.php:181 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
+#: lib/profileaction.php:205
+msgid "Statistics"
+msgstr "Statistichis"
+
+#: actions/showapplication.php:197
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:207
+msgid "Application actions"
+msgstr ""
+
+#: actions/showapplication.php:230
+msgid "Reset key & secret"
+msgstr ""
+
+#. TRANS: Title of form for deleting a user.
+#: actions/showapplication.php:246 lib/deletegroupform.php:121
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
+msgid "Delete"
+msgstr "Elimine"
+
+#: actions/showapplication.php:255
+msgid "Application info"
+msgstr ""
+
+#: actions/showapplication.php:257
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:262
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:267
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:272
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:277
+msgid "Authorize URL"
+msgstr ""
+
+#: actions/showapplication.php:282
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:302
+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."
+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 "
+"would add to their favorites :)"
+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](%%%%"
+"action.register%%%%) and then post something interesting they would add to "
+"their favorites :)"
+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: 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 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
+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
+msgid "Note"
+msgstr "Note"
+
+#. TRANS: Label for group aliases (dt). Text hidden by default.
+#: actions/showgroup.php:296 lib/groupeditform.php:180
+msgid "Aliases"
+msgstr ""
+
+#. TRANS: Group actions header (h2). Text hidden by default.
+#: actions/showgroup.php:313
+msgid "Group actions"
+msgstr "Azions dal grup"
+
+#. TRANS: Tooltip for feed link. %s is a group nickname.
+#: actions/showgroup.php:357
+#, 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
+#, 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
+#, 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
+#, 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
+msgid "Members"
+msgstr "Membris"
+
+#. TRANS: Description for mini list of group members on a group page when the group has no 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
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
+#: lib/subscriptionlist.php:127 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
+msgid "All members"
+msgstr "Ducj i membris"
+
+#. TRANS: Label for creation date in statistics on group page.
+#: actions/showgroup.php:465
+msgctxt "LABEL"
+msgid "Created"
+msgstr "Creât"
+
+#. TRANS: Label for member count in statistics on group page.
+#: actions/showgroup.php:473
+msgctxt "LABEL"
+msgid "Members"
+msgstr "Membris"
+
+#. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
+#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %%%%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
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+
+#. 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
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
+msgstr ""
+
+#. TRANS: Header for list of group administrators on a group page (h2).
+#: actions/showgroup.php:527
+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:211
+#, 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
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+"No âstu viodût nuie di interessant tai ultins timps? No tu âs publicât "
+"ancjemò nissun avîs, cumò al sarès un bon moment par scomençâ :)"
+
+#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:221
+#, php-format
+msgid ""
+"You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
+"%?status_textarea=%2$s)."
+msgstr ""
+
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:264
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+"**%s** al à une identitât su %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
+
+#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: This message contains a Markdown link. Keep "](" together.
+#: actions/showstream.php:271
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
+msgstr ""
+"**%s** al à une identitât su %%site.name%%, un servizi di [microblogging]"
+"(http://en.wikipedia.org/wiki/Micro-blogging) basât sul imprest libar "
+"[StatusNet](http://status.net/)."
+
+#. TRANS: Link to the author of a repeated notice. %s is a linked nickname.
+#: actions/showstream.php:328
+#, php-format
+msgid "Repeat of %s"
+msgstr "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:57
+msgid "SMS settings"
+msgstr ""
+
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:71
+#, 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
+msgid "SMS is not available."
+msgstr ""
+
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:107
+msgid "SMS address"
+msgstr ""
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:116
+msgid "Current confirmed SMS-enabled phone number."
+msgstr ""
+
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:129
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:138
+msgid "Confirmation code"
+msgstr "Codiç di conferme"
+
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:140
+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
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Conferme"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:149
+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."
+msgstr ""
+
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:191
+msgid "SMS preferences"
+msgstr ""
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:197
+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
+msgid "SMS preferences saved."
+msgstr ""
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:330
+msgid "No phone number."
+msgstr ""
+
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:336
+msgid "No carrier selected."
+msgstr ""
+
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:344
+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
+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
+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
+msgid "That is the wrong confirmation number."
+msgstr ""
+
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:418
+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
+msgid "That is not your phone number."
+msgstr ""
+
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:460
+msgid "The SMS phone number was removed."
+msgstr ""
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:499
+msgid "Mobile carrier"
+msgstr ""
+
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:504
+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
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:535
+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 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
+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."
+msgstr ""
+"No tu âs sotscritôrs. Prove a sotscriviti a cualchidun che tu cognossis e "
+"magari ti tornaran il plasê."
+
+#. 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?"
+
+#. TRANS: Subscriber list text when looking at the subscribers for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#. 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%%%"
+"%) and be the first?"
+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 ""
+
+#. 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.
+#: actions/subscriptions.php:133
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
+msgstr ""
+
+#. 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: 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:239
+msgid "Jabber"
+msgstr "Jabber"
+
+#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
+#: actions/subscriptions.php:254
+msgid "SMS"
+msgstr "SMS"
+
+#: actions/tag.php:69
+#, 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
+#, 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
+#, 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
+#, 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"
+
+#. TRANS: DT element on Authorise Subscription page.
+#. TRANS: DT element in area for user avatar.
+#: actions/tagother.php:81 actions/userauthorization.php:138
+#: lib/userprofile.php:108
+msgid "Photo"
+msgstr "Foto"
+
+#: actions/tagother.php:141
+msgid "Tag user"
+msgstr "Etichete utent"
+
+#: actions/tagother.php:151
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"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."
+msgstr ""
+
+#: actions/tagother.php:236
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:35
+msgid "No such tag."
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. TRANS: Link description in user account settings menu.
+#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
+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 ""
+
+#. 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, "
+"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
+#: lib/adminpanelaction.php:403
+msgid "License"
+msgstr "Licence"
+
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:229
+msgctxt "BUTTON"
+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."
+
+#. TRANS: Button text on Authorise Subscription page.
+#: actions/userauthorization.php:233
+msgctxt "BUTTON"
+msgid "Reject"
+msgstr "Refude"
+
+#. TRANS: Title for button on Authorise Subscription page.
+#: actions/userauthorization.php:235
+msgid "Reject this subscription."
+msgstr "Refude la sotscrizion"
+
+#. TRANS: Client error displayed for an empty authorisation request.
+#: actions/userauthorization.php:248
+msgid "No authorization request!"
+msgstr ""
+
+#. TRANS: Accept message header from Authorise subscription page.
+#: actions/userauthorization.php:271
+msgid "Subscription authorized"
+msgstr "Sotscrizion autorizade"
+
+#: actions/userauthorization.php:274
+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
+msgid "Subscription rejected"
+msgstr "Sotscrizion refudade"
+
+#: actions/userauthorization.php:288
+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."
+msgstr ""
+
+#. 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."
+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
+#, 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\"."
+msgstr ""
+
+#. TRANS: Page title for profile design page.
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
+msgid "Profile design"
+msgstr ""
+
+#. TRANS: Instructions for profile design page.
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:272
+msgid "Enjoy your hotdog!"
+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."
+
+#. 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 in atom group notice feed.
+#. 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, "
+"Inc. and contributors."
+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"
+
+#: 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 "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"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 "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
+"for more details. "
+msgstr ""
+
+#: actions/version.php:182
+#, php-format
+msgid ""
+"You should have received a copy of the GNU Affero General Public License "
+"along with this program.  If not, see %s."
+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: Secondary navigation menu option leading to version information on the StatusNet site.
+#: actions/version.php:198 lib/action.php:898
+msgid "Version"
+msgstr "Version"
+
+#: actions/version.php:199
+msgid "Author(s)"
+msgstr "Autôr(s)"
+
+#. 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. "
+"Try to upload a smaller version."
+msgid_plural ""
+"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
+"Try to upload a smaller version."
+msgstr[0] ""
+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."
+msgstr[0] ""
+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."
+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:542
+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:1142
+#, 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
+#, 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)"
+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
+#, 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
+#, 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:395
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Benvignût su %1$s, @%2$s!"
+
+#. TRANS: Server exception.
+#: classes/User.php:918
+msgid "No single user defined for single-user mode."
+msgstr ""
+
+#. TRANS: Server exception.
+#: classes/User.php:922
+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: 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 "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 ""
+
+#. 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
+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: 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 "Profîl personâl e ativitât dai amîs"
+
+#. 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 ""
+
+#. 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 "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"
+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"
+
+#. 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"
+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"
+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:871
+msgid "Secondary site navigation"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+#: lib/action.php:877
+msgid "Help"
+msgstr "Jutori"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+#: lib/action.php:880
+msgid "About"
+msgstr "Informazions"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+#: lib/action.php:883
+msgid "FAQ"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+#: lib/action.php:888
+msgid "TOS"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+#: lib/action.php:892
+msgid "Privacy"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/action.php:895
+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
+msgid "Contact"
+msgstr "Contats"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/action.php:905
+msgid "Badge"
+msgstr ""
+
+#. TRANS: DT element for StatusNet software license.
+#: lib/action.php:934
+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:941
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%)."
+msgstr ""
+"**%%site.name%%** al è un servizi di microblogging ufiert di [%%site."
+"broughtby%%](%%site.broughtbyurl%%)."
+
+#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
+#: lib/action.php:944
+#, php-format
+msgid "**%%site.name%%** is a microblogging service."
+msgstr "**%%site.name%%** al è un servizi di microblogging."
+
+#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
+#. 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
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"Al dopre il software di microblogging [StatusNet](http://status.net/), "
+"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:967
+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
+#, 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
+#, 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
+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
+#, 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
+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
+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
+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 ""
+
+#. 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."
+
+#. 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.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. 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:122
+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 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: 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 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] ""
+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 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: 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"
+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:160 lib/channel.php:181
+msgid "Command results"
+msgstr ""
+
+#. TRANS: Title for command results.
+#: lib/channel.php:194
+msgid "AJAX error"
+msgstr ""
+
+#. TRANS: E-mail subject when a command has completed.
+#: lib/channel.php:233 lib/mailhandler.php:143
+msgid "Command complete"
+msgstr ""
+
+#. TRANS: E-mail subject when a command has failed.
+#: lib/channel.php:244
+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:630
+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 ""
+
+#. TRANS: User statistics text.
+#. 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"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+"Sotscrizions: %1$s\n"
+"Sotscritôrs: %2$s\n"
+"Avîs: %3$s"
+
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:312
+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
+#, 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
+#, 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
+#, php-format
+msgctxt "WHOIS"
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:430
+#, php-format
+msgid "Fullname: %s"
+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
+#, php-format
+msgid "Location: %s"
+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
+#, 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
+#, 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
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+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
+#, 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: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:516
+msgid "Error sending direct message."
+msgstr ""
+
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:553
+#, 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
+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
+#, php-format
+msgid "Notice too long - maximum is %1$d character, you sent %2$d."
+msgid_plural "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr[0] ""
+"L'avîs al è masse lunc. Il massim al è %1$d caratar, tu tu'nd âs mandâts %2"
+"$d."
+msgstr[1] ""
+"L'avîs al è masse lunc. Il massim a son %1$d caratars, tu tu'nd âs mandâts %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
+#, 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
+msgid "Error saving notice."
+msgstr ""
+
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:654
+msgid "Specify the name of the user to subscribe to."
+msgstr ""
+
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:663
+msgid "Can't subscribe to OMB profiles by command."
+msgstr ""
+
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:671
+#, 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
+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
+#, 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
+msgid "Command not yet implemented."
+msgstr ""
+
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:727
+msgid "Notification off."
+msgstr ""
+
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:730
+msgid "Can't turn off notification."
+msgstr ""
+
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:753
+msgid "Notification on."
+msgstr ""
+
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:756
+msgid "Can't turn on notification."
+msgstr ""
+
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:770
+msgid "Login command is disabled."
+msgstr ""
+
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:783
+#, php-format
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
+msgstr ""
+
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:812
+#, php-format
+msgid "Unsubscribed %s."
+msgstr ""
+
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:830
+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
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+msgstr[0] "Tu sês sotscrit a cheste persone:"
+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
+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
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "Chest al è il tô sotscritôr:"
+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
+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
+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
+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 ""
+
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#: lib/common.php:162
+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
+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
+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
+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"
+
+#. 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 "Cjame sù un file"
+
+#. 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 ""
+
+#. 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 "Ativade"
+
+#. 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 "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"
+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
+msgid "Couldn't update your design."
+msgstr ""
+
+#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
+#: lib/designsettings.php:433
+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:121
+msgid "Filter tags"
+msgstr "Filtre lis etichetis"
+
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr "Ducj"
+
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr "Sielç la etichete di filtrâ"
+
+#: lib/galleryaction.php:140
+msgid "Tag"
+msgstr "Etichete"
+
+#: lib/galleryaction.php:141
+msgid "Choose a tag to narrow list"
+msgstr "Sielç une etichete par scurtâ la liste"
+
+#: lib/galleryaction.php:143
+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 "
+"alias allowed."
+msgid_plural ""
+"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
+"aliases allowed."
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANS: Menu item in the group navigation page.
+#: lib/groupnav.php:86
+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: 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"
+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"
+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"
+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/jabber.php:387
+#, php-format
+msgid "[%s]"
+msgstr "[%s]"
+
+#: lib/jabber.php:567
+#, php-format
+msgid "Unknown inbox source %d."
+msgstr ""
+
+#: lib/leaveform.php:114
+msgid "Leave"
+msgstr "Lasse"
+
+#. 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: 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
+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
+#, php-format
+msgid ""
+"Hey, %1$s.\n"
+"\n"
+"Someone just entered this email address on %2$s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%2$s\n"
+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
+#, 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
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
+#. TRANS: Main body of new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename,
+#. 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
+#, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%2$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %7$s\n"
+msgstr ""
+
+#. TRANS: Profile info line in new-subscriber notification e-mail.
+#. TRANS: %s is biographical information.
+#: lib/mail.php:278
+#, 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
+#, php-format
+msgid "New email address for posting to %s"
+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
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%1$s"
+msgstr ""
+
+#. TRANS: Subject line for SMS-by-email notification messages.
+#. TRANS: %s is the posting user's nickname.
+#: lib/mail.php:434
+#, php-format
+msgid "%s status"
+msgstr "stât di %s"
+
+#. TRANS: Subject line for SMS-by-email address confirmation message.
+#: lib/mail.php:460
+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
+#, 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
+#, php-format
+msgid "You have been nudged by %s"
+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
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
+
+#. TRANS: Subject for direct-message notification email.
+#. TRANS: %s is the sending user's nickname.
+#: lib/mail.php:539
+#, php-format
+msgid "New private message from %s"
+msgstr "Gnûf messaç privât di %s"
+
+#. TRANS: Body for direct-message notification email.
+#. 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
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
+msgstr ""
+
+#. 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
+#, php-format
+msgid "%1$s (@%2$s) added your notice as a favorite"
+msgstr ""
+
+#. 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,
+#. 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
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:664
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+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
+#, php-format
+msgid "%1$s (@%2$s) sent a notice to your attention"
+msgstr ""
+
+#. TRANS: Body of @-reply notification e-mail.
+#. TRANS: %1$s is the sending user's long name, $2$s is the StatusNet sitename,
+#. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
+#. 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
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"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 "
+"format."
+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:166 lib/noticeform.php:186
+msgid "Available characters"
+msgstr ""
+
+#: lib/messageform.php:185 lib/noticeform.php:237
+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:522
+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."
+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
+msgid "Send a notice"
+msgstr "Mande un avîs"
+
+#: lib/noticeform.php:174
+#, php-format
+msgid "What's up, %s?"
+msgstr "Ce sucedial, %s?"
+
+#: lib/noticeform.php:194
+msgid "Attach"
+msgstr "Aleghe"
+
+#: lib/noticeform.php:198
+msgid "Attach a file"
+msgstr "Aleghe un file"
+
+#: lib/noticeform.php:213
+msgid "Share my location"
+msgstr "Condivît il lûc dulà che mi cjati"
+
+#: lib/noticeform.php:216
+msgid "Do not share my location"
+msgstr "No stâ condividi il lûc dulà che mi cjati"
+
+#: lib/noticeform.php:217
+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
+msgid "N"
+msgstr "N"
+
+#. TRANS: Used in coordinates as abbreviation of south
+#: lib/noticelist.php:454
+msgid "S"
+msgstr "S"
+
+#. TRANS: Used in coordinates as abbreviation of east
+#: lib/noticelist.php:456
+msgid "E"
+msgstr "E"
+
+#. TRANS: Used in coordinates as abbreviation of west
+#: lib/noticelist.php:458
+msgid "W"
+msgstr "O"
+
+#: lib/noticelist.php:460
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:469
+msgid "at"
+msgstr "lì di"
+
+#: lib/noticelist.php:518
+msgid "web"
+msgstr "web"
+
+#: lib/noticelist.php:584
+msgid "in context"
+msgstr ""
+
+#: lib/noticelist.php:619
+msgid "Repeated by"
+msgstr "Ripetût di"
+
+#: lib/noticelist.php:646
+msgid "Reply to this notice"
+msgstr "Rispuint a chest avîs"
+
+#: lib/noticelist.php:647
+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"
+
+#: 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 ""
+
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
+#: lib/personalgroupnav.php:107
+msgctxt "MENU"
+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"
+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"
+msgid "Inbox"
+msgstr ""
+
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
+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"
+msgid "Outbox"
+msgstr ""
+
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
+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: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
+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:90
+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:98
+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:78
+msgid "Public"
+msgstr "Public"
+
+#: 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:974
+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"
+
+#. 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"
+
+#: 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/silenceform.php:67
+msgid "Silence"
+msgstr ""
+
+#: lib/silenceform.php:78
+msgid "Silence this user"
+msgstr ""
+
+#: lib/subgroupnav.php:83
+#, php-format
+msgid "People %s subscribes to"
+msgstr ""
+
+#: lib/subgroupnav.php:91
+#, php-format
+msgid "People subscribed to %s"
+msgstr ""
+
+#: lib/subgroupnav.php:99
+#, php-format
+msgid "Groups %s is a member of"
+msgstr ""
+
+#: lib/subgroupnav.php:105
+msgid "Invite"
+msgstr ""
+
+#: 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"
+
+#: 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 ""
+"Uploaded theme is too large; must be less than %d bytes uncompressed."
+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/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 ""
+
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
+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
+msgid "User actions"
+msgstr "Azions dal utent"
+
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
+msgid "User deletion in progress..."
+msgstr ""
+
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
+msgid "Edit profile settings"
+msgstr "Cambie lis impuestazions dal profîl"
+
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
+msgid "Edit"
+msgstr "Cambie"
+
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
+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
+msgid "Message"
+msgstr "Messaç"
+
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
+msgid "Moderate"
+msgstr ""
+
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
+msgid "User role"
+msgstr "Rûl dal utent"
+
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
+msgctxt "role"
+msgid "Administrator"
+msgstr "Aministradôr"
+
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
+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
+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
+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
+#, php-format
+msgid "about one minute ago"
+msgid_plural "about %d minutes ago"
+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
+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
+#, php-format
+msgid "about one hour ago"
+msgid_plural "about %d hours ago"
+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
+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
+#, php-format
+msgid "about one day ago"
+msgid_plural "about %d days ago"
+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
+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
+#, php-format
+msgid "about one month ago"
+msgid_plural "about %d months ago"
+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
+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: %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."
+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 ""
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index da0cc3bdef..2738400467 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:20+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:36:44+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 (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -133,7 +133,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
@@ -151,10 +155,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -821,6 +825,7 @@ 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
@@ -833,7 +838,7 @@ msgstr "Non está autorizado."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1162,13 +1167,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!"
@@ -1273,9 +1279,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."
 
@@ -2014,13 +2021,15 @@ 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/nudge.php:63 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
@@ -2961,6 +2970,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."
@@ -3150,8 +3160,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."
 
@@ -3186,6 +3198,7 @@ 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."
@@ -3703,6 +3716,7 @@ 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
 msgid "Already logged in."
 msgstr "Xa se identificou."
@@ -3711,7 +3725,8 @@ msgstr "Xa se identificou."
 msgid "Incorrect username or password."
 msgstr "Nome de usuario ou contrasinal incorrectos."
 
-#: actions/login.php:148 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:148 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 "
@@ -3880,7 +3895,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 "
@@ -3889,16 +3906,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%%%%?"
@@ -3907,7 +3929,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 "
@@ -3916,14 +3940,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
-#, 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
+#, 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
@@ -4058,11 +4085,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Busca de notas"
 
@@ -4112,23 +4140,28 @@ 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."
 
@@ -4498,7 +4531,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. "
@@ -4507,7 +4542,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"
 
@@ -4804,6 +4840,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"
@@ -5255,6 +5297,7 @@ 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
@@ -5309,9 +5352,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
-#, 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
+#, 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.
@@ -6280,15 +6325,19 @@ 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."
 
-#: 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"
 
@@ -6489,6 +6538,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."
@@ -7090,7 +7140,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:771
+#: classes/Profile.php:775
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7098,7 +7148,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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7750,19 +7800,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."
 
@@ -9855,18 +9909,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9874,12 +9933,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9887,12 +9946,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9900,12 +9959,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9913,7 +9972,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:1340
 msgid "about a year ago"
 msgstr "hai como un ano"
 
@@ -9957,15 +10016,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "6 or more characters"
-#~ msgstr "Seis ou máis caracteres"
-
-#~ msgid "Same as password above"
-#~ msgstr "Igual ao contrasinal anterior"
-
-#~ msgid "Can't save new password."
-#~ msgstr "Non se puido gardar o novo contrasinal."
-
-#~ msgid "URL of your homepage, blog, or profile on another site"
-#~ msgstr "URL da súa páxina persoal, blogue ou perfil noutro sitio"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index 5e75fc995d..a520f22168 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:21+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:36:47+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 (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -152,10 +156,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -510,7 +514,6 @@ 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 "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 "
@@ -811,6 +814,7 @@ 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
@@ -823,7 +827,7 @@ msgstr "Naprašowanski token hižo awtorizowany."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1031,9 +1035,9 @@ 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
+#, php-format
 msgid "Unsupported format: %s."
-msgstr "Njepodpěrany format: %s"
+msgstr "Njepodpěrany format: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
 #: actions/apistatusesshow.php:155
@@ -1139,13 +1143,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!"
@@ -1166,14 +1171,14 @@ msgstr "Do %s wospjetowany"
 #: actions/apitimelineretweetsofme.php:112
 #, php-format
 msgid "Repeats of %s"
-msgstr ""
+msgstr "Wospjetowanja wot %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
 #, php-format
 msgid "Notices tagged with %s"
-msgstr ""
+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.
@@ -1247,9 +1252,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."
 
@@ -1424,7 +1430,7 @@ 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 ""
+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.
@@ -1607,9 +1613,8 @@ msgstr "Zawěsćenje"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-#, fuzzy
 msgid "Backup your account."
-msgstr "Twoje konto zawěsćić"
+msgstr "Twoje konto zawěsćić."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 #: actions/block.php:68
@@ -1646,9 +1651,8 @@ msgstr "Ně"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
-#, fuzzy
 msgid "Do not block this user."
-msgstr "Tutoho wužiwarja njeblokować"
+msgstr "Tutoho wužiwarja njeblokować."
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
@@ -1665,9 +1669,8 @@ msgstr "Haj"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 #: actions/block.php:165
-#, fuzzy
 msgid "Block this user."
-msgstr "Tutoho wužiwarja blokować"
+msgstr "Tutoho wužiwarja blokować."
 
 #. TRANS: Server error displayed when blocking a user fails.
 #: actions/block.php:189
@@ -1812,6 +1815,8 @@ msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
 msgstr ""
+"To budźe twoje kontowe daty <strong>na přeco</strong>z tutoho serwera "
+"<strong>zhašeć</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.
@@ -1881,15 +1886,13 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
-#, fuzzy
 msgid "Do not delete this application."
-msgstr "Tutu aplikaciju njezničić"
+msgstr "Tutu aplikaciju njezhašeć."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-#, fuzzy
 msgid "Delete this application."
-msgstr "Tutu aplikaciju zničić"
+msgstr "Tutu aplikaciju zhašeć."
 
 #. TRANS: Client error when trying to delete group while not logged in.
 #: actions/deletegroup.php:64
@@ -1939,28 +1942,28 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-#, fuzzy
 msgid "Do not delete this group."
-msgstr "Tuitu skupinu njezhašeć"
+msgstr "Tutu skupinu njezhašeć."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-#, fuzzy
 msgid "Delete this group."
-msgstr "Tutu skupinu zhašeć"
+msgstr "Tutu skupinu zhašeć."
 
 #. 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: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/nudge.php:63 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
@@ -1988,15 +1991,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."
-msgstr "Tutu zdźělenku njewušmórnyć"
+msgstr "Tutu zdźělenku njezhašeć."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
 #: actions/deletenotice.php:166
-#, fuzzy
 msgid "Delete this notice."
-msgstr "Tutu zdźělenku wušmórnyć"
+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
@@ -2028,15 +2029,13 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-#, fuzzy
 msgid "Do not delete this user."
-msgstr "Tutu skupinu njezhašeć"
+msgstr "Tutoho wužiwarja njezhašeć."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
 #: actions/deleteuser.php:165
-#, fuzzy
 msgid "Delete this user."
-msgstr "Tutoho wužiwarja wušmórnyć"
+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.
@@ -2199,21 +2198,18 @@ msgstr "Standardne hódnoty wužiwać"
 
 #. TRANS: Title for button for resetting theme settings.
 #: actions/designadminpanel.php:720
-#, fuzzy
 msgid "Restore default designs."
-msgstr "Standardne designy wobnowić"
+msgstr "Standardne designy wobnowić."
 
 #. TRANS: Title for button for resetting theme settings.
 #: actions/designadminpanel.php:728
-#, fuzzy
 msgid "Reset back to default."
-msgstr "Na standard wróćo stajić"
+msgstr "Na standard wróćo stajić."
 
 #. TRANS: Title for button for saving theme settings.
 #: actions/designadminpanel.php:736
-#, fuzzy
 msgid "Save design."
-msgstr "Design składować"
+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
@@ -2617,9 +2613,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ć"
+msgstr "Z faworitow wotstronić."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2850,15 +2845,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 "Tutoho wužiwarja za tutu skupinu blokować"
+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."
-msgstr "Tutoho wužiwarja za tutu skupinu blokować"
+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
@@ -2866,6 +2859,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."
@@ -3043,8 +3037,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."
 
@@ -3079,6 +3075,7 @@ 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."
@@ -3550,6 +3547,7 @@ 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
 msgid "Already logged in."
 msgstr "Hižo přizjewjeny."
@@ -3558,7 +3556,8 @@ msgstr "Hižo přizjewjeny."
 msgid "Incorrect username or password."
 msgstr "Wopačne wužiwarske mjeno abo hesło."
 
-#: actions/login.php:148 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:148 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Zmylk při nastajenju wužiwarja. Snano njejsy awtorizowany."
 
@@ -3718,44 +3717,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
-#, 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
+#, 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!"
 
 #: actions/nudge.php:85
@@ -3840,14 +3851,14 @@ msgid ""
 msgstr ""
 
 #: actions/oembed.php:64
-#, fuzzy, php-format
+#, php-format
 msgid "\"%s\" not found."
-msgstr "Wužiwar njenamakany."
+msgstr "\"%s\" njenamakany."
 
 #: actions/oembed.php:76
-#, fuzzy, php-format
+#, php-format
 msgid "Notice %s not found."
-msgstr "Wotpowědna zdźělenka njenamakana."
+msgstr "Zdźělenka %s njenamakana."
 
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
@@ -3859,9 +3870,9 @@ msgid "%1$s's status on %2$s"
 msgstr "Status %1$s na %2$s"
 
 #: actions/oembed.php:95
-#, fuzzy, php-format
+#, php-format
 msgid "Attachment %s not found."
-msgstr "Přijimowar njenamakany."
+msgstr "Přiwěšk %s njenamakany."
 
 #: actions/oembed.php:136
 #, php-format
@@ -3886,11 +3897,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Zdźělenku pytać"
 
@@ -3937,23 +3949,28 @@ 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)."
 
-#: 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."
 
@@ -4308,14 +4325,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ć"
 
@@ -4450,9 +4470,8 @@ msgstr "Rěč"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-#, fuzzy
 msgid "Preferred language."
-msgstr "Preferowana rěč"
+msgstr "Preferowana rěč."
 
 #. TRANS: Dropdownlist label in form for profile settings.
 #: actions/profilesettings.php:181
@@ -4466,10 +4485,10 @@ 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)."
-msgstr "Nowych wužiwarjow za tutoho wužiwarja abonować."
+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
@@ -4496,9 +4515,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid tag: \"%s\"."
-msgstr "Njepłaćiwa taflička: \"%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.
@@ -4592,6 +4611,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 aktualizacijow wote wšěch!"
+
 #. TRANS: Title for public tag cloud.
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -4725,9 +4750,8 @@ msgstr "Wobnowjenje hesła požadane"
 
 #. TRANS: Title for password recovery page in password saved mode.
 #: actions/recoverpassword.php:229
-#, fuzzy
 msgid "Password saved"
-msgstr "Hesło składowane."
+msgstr "Hesło składowane"
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
@@ -4820,7 +4844,6 @@ msgid "Registration not allowed."
 msgstr "Registracija njedowolena."
 
 #: actions/register.php:201
-#, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr "Njemóžeš so registrować, jeli njepřizwoleš do licency."
 
@@ -4849,14 +4872,12 @@ msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 
 #: actions/register.php:443
-#, fuzzy
 msgid "Longer name, preferably your \"real\" name."
-msgstr "Dlěše mjeno, wosebje twoje \"woprawdźite\" mjeno"
+msgstr "Dlěše mjeno, wosebje twoje \"woprawdźite\" mjeno."
 
 #: actions/register.php:471
-#, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Hdźež sy, na př. \"město, zwjazkowy kraj (abo region) , kraj\""
+msgstr "Hdźež sy, na př. \"město, zwjazkowy kraj (abo region) , kraj\"."
 
 #: actions/register.php:510
 #, php-format
@@ -4933,7 +4954,6 @@ msgid "User nickname"
 msgstr "Wužiwarske přimjeno"
 
 #: actions/remotesubscribe.php:129
-#, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "Přimjeno wužiwarja, kotremuž chceš slědować."
 
@@ -4944,6 +4964,7 @@ 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
@@ -4952,9 +4973,8 @@ msgid "Subscribe"
 msgstr "Abonować"
 
 #: actions/remotesubscribe.php:158
-#, fuzzy
 msgid "Invalid profile URL (bad format)."
-msgstr "Njepłaćiwy profilowy URL (wopačny 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)."
@@ -4992,6 +5012,7 @@ 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
@@ -5040,9 +5061,11 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
-#, 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
+#, fuzzy, 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.
@@ -5731,9 +5754,8 @@ msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
-#, fuzzy
 msgid "Save site notice."
-msgstr "Sydłowu zdźělenku składować"
+msgstr "Sydłowu zdźělenku składować."
 
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:57
@@ -5790,9 +5812,8 @@ 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."
-msgstr "Telefonowe čisło, bjez interpunkcije abo mjezerow, z předwolenjom"
+msgstr "Telefonowe čisło, bjez interpunkcije abo mjezerow, z předwolenjom."
 
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:191
@@ -5952,15 +5973,19 @@ 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 ""
 
-#: 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"
 
@@ -6148,6 +6173,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ł."
@@ -6198,9 +6224,9 @@ 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
+#, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
-msgstr "Njepłaćiwy standardny abonement: '%1$s' wužiwar njeje."
+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
@@ -6259,9 +6285,8 @@ msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-#, fuzzy
 msgid "Save user settings."
-msgstr "Wužiwarske nastajenja składować"
+msgstr "Wužiwarske nastajenja składować."
 
 #. TRANS: Page title.
 #: actions/userauthorization.php:109
@@ -6285,29 +6310,25 @@ msgstr "Licenca"
 
 #. TRANS: Button text on Authorise Subscription page.
 #: actions/userauthorization.php:229
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Akceptować"
 
 #. TRANS: Title for button on Authorise Subscription page.
 #: actions/userauthorization.php:231
-#, fuzzy
 msgid "Subscribe to this user."
-msgstr "Tutoho wužiwarja abonować"
+msgstr "Tutoho wužiwarja abonować."
 
 #. TRANS: Button text on Authorise Subscription page.
 #: actions/userauthorization.php:233
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Wotpokazać"
 
 #. TRANS: Title for button on Authorise Subscription page.
 #: actions/userauthorization.php:235
-#, fuzzy
 msgid "Reject this subscription."
-msgstr "Tutón abonement wotpokazać"
+msgstr "Tutón abonement wotpokazać."
 
 #. TRANS: Client error displayed for an empty authorisation request.
 #: actions/userauthorization.php:248
@@ -6341,30 +6362,30 @@ msgstr ""
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
 #: actions/userauthorization.php:325
-#, fuzzy, php-format
+#, php-format
 msgid "Listener URI \"%s\" not found here."
-msgstr "URI posłucharja'%s' njebu tu namakany"
+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
-#, fuzzy, php-format
+#, php-format
 msgid "Listenee URI \"%s\" is too long."
-msgstr "URI posłucharki '%s' je předołhi."
+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
-#, fuzzy, php-format
+#, php-format
 msgid "Listenee URI \"%s\" is a local user."
-msgstr "URI posłucharki '%s' je předołhi."
+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
-#, fuzzy, php-format
+#, php-format
 msgid "Profile URL \"%s\" is for a local user."
-msgstr "Profilowy URL '%s' je za lokalneho wužiwarja."
+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.
@@ -6378,23 +6399,23 @@ msgstr ""
 #. 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
+#, php-format
 msgid "Avatar URL \"%s\" is not valid."
-msgstr "URL awatara '%s' njeje płaćiwy"
+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
-#, fuzzy, php-format
+#, php-format
 msgid "Cannot read avatar URL \"%s\"."
-msgstr "Awatarowy URL '%s' njeda so čitać."
+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
-#, fuzzy, php-format
+#, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "Wopačny wobrazowy typ za awatarowy 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
@@ -6714,14 +6735,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:771
+#: classes/Profile.php:775
 #, 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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6839,7 +6860,7 @@ msgstr "XRD za %s njeda so namakać."
 #: lib/accountmover.php:131
 #, php-format
 msgid "No AtomPub API service for %s."
-msgstr ""
+msgstr "Žana słužba AtomPub API za %s."
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:104
@@ -7356,19 +7377,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ć."
 
@@ -8422,7 +8447,7 @@ msgstr ""
 #: lib/mail.php:238
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
-msgstr ""
+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.
@@ -9195,7 +9220,7 @@ msgstr ""
 
 #: lib/themeuploader.php:225
 msgid "Theme contains unsafe file extension names; may be unsafe."
-msgstr ""
+msgstr "Šat wobsahuje njewěste datajowe sufiksy; to móhło njewěste być."
 
 #: lib/themeuploader.php:242
 #, php-format
@@ -9305,18 +9330,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9326,12 +9356,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9341,12 +9371,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9356,12 +9386,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9371,7 +9401,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:1340
 msgid "about a year ago"
 msgstr "před něhdźe jednym lětom"
 
@@ -9420,15 +9450,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\"-"
-
-#~ msgid "6 or more characters"
-#~ msgstr "6 abo wjace znamješkow"
-
-#~ msgid "Same as password above"
-#~ msgstr "Samsne hesło kaž horjeka"
-
-#~ msgid "Can't save new password."
-#~ msgstr "Nowe hesło njeda so składować."
-
-#~ msgid "URL of your homepage, blog, or profile on another site"
-#~ msgstr "URL twojeje startoweje strony, bloga abo profila na druhim sydle"
diff --git a/locale/hu/LC_MESSAGES/statusnet.po b/locale/hu/LC_MESSAGES/statusnet.po
index d07beb9f12..52e1be1f26 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:22+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:36: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-14 17:20:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82325); Translate extension (2011-02-01)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hu\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -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
@@ -154,10 +158,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -815,6 +819,7 @@ 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
@@ -827,7 +832,7 @@ msgstr "Nincs jogosultságod."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1148,13 +1153,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!"
@@ -1258,9 +1264,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."
 
@@ -1996,13 +2003,15 @@ 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/nudge.php:63 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
@@ -2933,6 +2942,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."
@@ -3113,8 +3123,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."
 
@@ -3149,6 +3161,7 @@ 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."
@@ -3624,6 +3637,7 @@ 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
 msgid "Already logged in."
 msgstr "Már be vagy jelentkezve."
@@ -3632,7 +3646,8 @@ msgstr "Már be vagy jelentkezve."
 msgid "Incorrect username or password."
 msgstr "Rossz felhasználónév vagy jelszó."
 
-#: actions/login.php:148 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:148 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
@@ -3794,44 +3809,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
@@ -3962,11 +3989,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Hírek keresése"
 
@@ -4014,23 +4042,28 @@ msgstr ""
 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 ""
 
@@ -4403,7 +4436,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. "
@@ -4413,7 +4448,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ő"
 
@@ -4701,6 +4737,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"
@@ -5109,6 +5151,7 @@ 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
@@ -5157,9 +5200,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.
@@ -6089,15 +6134,19 @@ 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 ""
 
-#: 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"
 
@@ -6282,6 +6331,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 ""
@@ -6844,14 +6894,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:771
+#: classes/Profile.php:775
 #, 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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7489,19 +7539,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 ""
 
@@ -9485,18 +9539,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9504,12 +9563,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9517,12 +9576,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9530,12 +9589,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9543,7 +9602,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:1340
 msgid "about a year ago"
 msgstr "körülbelül egy éve"
 
@@ -9585,17 +9644,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "6 or more characters"
-#~ msgstr "6 vagy több karakter"
-
-#~ msgid "Same as password above"
-#~ msgstr "Ugyanaz mint a fenti jelszó"
-
-#~ msgid "Can't save new password."
-#~ msgstr "Az új jelszót nem sikerült elmenteni."
-
-#~ 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"
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index f8a3c85483..5c718d489c 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:23+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:36: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-Generator: MediaWiki 1.18alpha (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -149,10 +153,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -517,7 +521,6 @@ 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 "Cannot send direct messages to users who aren't your friend."
 msgstr "Non pote inviar messages directe a usatores que non es tu amicos."
 
@@ -812,6 +815,7 @@ 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
@@ -824,7 +828,7 @@ msgstr "Indicio de requesta jam autorisate."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1043,9 +1047,9 @@ 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
+#, php-format
 msgid "Unsupported format: %s."
-msgstr "Formato non supportate: %s"
+msgstr "Formato non supportate: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
 #: actions/apistatusesshow.php:155
@@ -1152,13 +1156,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!"
@@ -1260,9 +1265,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."
 
@@ -1562,9 +1568,8 @@ msgstr "Nulle file incargate."
 
 #. 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 "Selige un area quadrate del imagine pro facer lo tu 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.
@@ -1627,9 +1632,8 @@ msgstr "Copia de reserva"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-#, fuzzy
 msgid "Backup your account."
-msgstr "Facer un copia de reserva de tu conto"
+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
@@ -1669,9 +1673,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 "Non blocar iste usator"
+msgstr "Non blocar iste usator."
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
@@ -1688,9 +1691,8 @@ msgstr "Si"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 #: actions/block.php:165
-#, fuzzy
 msgid "Block this user."
-msgstr "Blocar iste usator"
+msgstr "Blocar iste usator."
 
 #. TRANS: Server error displayed when blocking a user fails.
 #: actions/block.php:189
@@ -1911,15 +1913,13 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
-#, fuzzy
 msgid "Do not delete this application."
-msgstr "Non deler iste 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."
-msgstr "Deler iste application"
+msgstr "Deler iste application."
 
 #. TRANS: Client error when trying to delete group while not logged in.
 #: actions/deletegroup.php:64
@@ -1972,28 +1972,28 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-#, fuzzy
 msgid "Do not delete this group."
-msgstr "Non deler iste gruppo"
+msgstr "Non deler iste gruppo."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-#, fuzzy
 msgid "Delete this group."
-msgstr "Deler iste gruppo"
+msgstr "Deler iste gruppo."
 
 #. 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: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/nudge.php:63 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
@@ -2022,15 +2022,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."
-msgstr "Non deler iste nota"
+msgstr "Non deler iste nota."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
 #: actions/deletenotice.php:166
-#, fuzzy
 msgid "Delete this notice."
-msgstr "Deler iste nota"
+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
@@ -2064,15 +2062,13 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-#, fuzzy
 msgid "Do not delete this user."
-msgstr "Non deler iste usator"
+msgstr "Non deler iste usator."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
 #: actions/deleteuser.php:165
-#, fuzzy
 msgid "Delete this user."
-msgstr "Deler iste usator"
+msgstr "Deler iste usator."
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
@@ -2238,21 +2234,18 @@ msgstr "Usar predefinitiones"
 
 #. TRANS: Title for button for resetting theme settings.
 #: actions/designadminpanel.php:720
-#, fuzzy
 msgid "Restore default designs."
-msgstr "Restaurar apparentias predefinite"
+msgstr "Restaurar apparentias predefinite."
 
 #. TRANS: Title for button for resetting theme settings.
 #: actions/designadminpanel.php:728
-#, fuzzy
 msgid "Reset back to default."
-msgstr "Revenir al predefinitiones"
+msgstr "Revenir al predefinitiones."
 
 #. TRANS: Title for button for saving theme settings.
 #: actions/designadminpanel.php:736
-#, fuzzy
 msgid "Save design."
-msgstr "Salveguardar apparentia"
+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
@@ -2664,9 +2657,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"
+msgstr "Disfavorir favorite."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2905,15 +2897,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 "Non blocar iste usator de iste gruppo"
+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."
-msgstr "Blocar iste usator de iste gruppo"
+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
@@ -2921,6 +2911,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."
@@ -3107,8 +3098,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."
 
@@ -3145,6 +3138,7 @@ 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."
@@ -3649,6 +3643,7 @@ 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
 msgid "Already logged in."
 msgstr "Tu es jam authenticate."
@@ -3657,7 +3652,8 @@ msgstr "Tu es jam authenticate."
 msgid "Incorrect username or password."
 msgstr "Nomine de usator o contrasigno incorrecte."
 
-#: actions/login.php:148 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:148 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."
@@ -3820,7 +3816,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 "
@@ -3829,16 +3827,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%%%%?"
@@ -3847,7 +3850,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 "
@@ -3857,14 +3862,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
-#, 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
+#, 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!"
 
 #: actions/nudge.php:85
@@ -3955,14 +3963,14 @@ msgstr ""
 "con iste installation de StatusNet."
 
 #: actions/oembed.php:64
-#, fuzzy, php-format
+#, php-format
 msgid "\"%s\" not found."
-msgstr "Usator non trovate."
+msgstr "\"%s\" non trovate."
 
 #: actions/oembed.php:76
-#, fuzzy, php-format
+#, php-format
 msgid "Notice %s not found."
-msgstr "Nota genitor non trovate."
+msgstr "Nota %s non trovate."
 
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
@@ -3974,14 +3982,14 @@ msgid "%1$s's status on %2$s"
 msgstr "Le stato de %1$s in %2$s"
 
 #: actions/oembed.php:95
-#, fuzzy, php-format
+#, php-format
 msgid "Attachment %s not found."
-msgstr "Usator destinatario non trovate."
+msgstr "Annexo %s non trovate."
 
 #: actions/oembed.php:136
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
-msgstr ""
+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
@@ -4001,11 +4009,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Rercerca de notas"
 
@@ -4025,7 +4034,7 @@ msgstr "Gestion de varie altere optiones."
 #. TRANS: here if it has one (most likely a single space).
 #: actions/othersettings.php:113
 msgid " (free service)"
-msgstr "  (servicio gratuite)"
+msgstr " (servicio libere)"
 
 #. TRANS: Label for dropdown with URL shortener services.
 #: actions/othersettings.php:122
@@ -4053,23 +4062,28 @@ 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."
 
@@ -4423,7 +4437,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. "
@@ -4432,7 +4448,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"
 
@@ -4553,13 +4570,12 @@ 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."
 msgstr ""
 "Etiquettas pro te (litteras, numeros, -, ., e _), separate per commas o "
-"spatios"
+"spatios."
 
 #. TRANS: Dropdownlist label in form for profile settings.
 #: actions/profilesettings.php:169
@@ -4568,9 +4584,8 @@ msgstr "Lingua"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-#, fuzzy
 msgid "Preferred language."
-msgstr "Lingua preferite"
+msgstr "Lingua preferite."
 
 #. TRANS: Dropdownlist label in form for profile settings.
 #: actions/profilesettings.php:181
@@ -4584,11 +4599,11 @@ 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)."
 msgstr ""
-"Subscriber me automaticamente a qui se subscribe a me (utile pro non-humanos)"
+"Subscriber me automaticamente a qui se subscribe a me (utile pro non-"
+"humanos)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
@@ -4613,9 +4628,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid tag: \"%s\"."
-msgstr "Etiquetta invalide: \"%s\""
+msgstr "Etiquetta invalide: \"%s\"."
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
@@ -4719,6 +4734,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
+#, 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"
@@ -4856,9 +4877,8 @@ msgstr "Recuperation de contrasigno requestate"
 
 #. TRANS: Title for password recovery page in password saved mode.
 #: actions/recoverpassword.php:229
-#, fuzzy
 msgid "Password saved"
-msgstr "Contrasigno salveguardate."
+msgstr "Contrasigno salveguardate"
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
@@ -4952,7 +4972,6 @@ msgid "Registration not allowed."
 msgstr "Creation de conto non permittite."
 
 #: actions/register.php:201
-#, fuzzy
 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."
 
@@ -4965,13 +4984,12 @@ msgid "Invalid username or password."
 msgstr "Nomine de usator o contrasigno invalide."
 
 #: actions/register.php:340
-#, 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 iste formulario tu pote crear un nove conto. Postea, tu pote publicar "
-"notas e mitter te in contacto con amicos e collegas. "
+"notas e mitter te in contacto con amicos e collegas."
 
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:431 actions/register.php:435
@@ -4980,21 +4998,18 @@ msgid "Email"
 msgstr "E-mail"
 
 #: actions/register.php:432 actions/register.php:436
-#, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "Usate solmente pro actualisationes, notificationes e recuperation de "
-"contrasigno"
+"contrasigno."
 
 #: actions/register.php:443
-#, fuzzy
 msgid "Longer name, preferably your \"real\" name."
-msgstr "Nomine plus longe, preferibilemente tu nomine \"real\""
+msgstr "Nomine plus longe, preferibilemente tu nomine \"real\"."
 
 #: actions/register.php:471
-#, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Ubi tu es, como \"Citate, Stato (o Region), Pais\""
+msgstr "Ubi tu es, como \"Citate, Stato (o Region), Pais\"."
 
 #: actions/register.php:510
 #, php-format
@@ -5094,18 +5109,16 @@ msgid "User nickname"
 msgstr "Pseudonymo del usator"
 
 #: actions/remotesubscribe.php:129
-#, fuzzy
 msgid "Nickname of the user you want to follow."
-msgstr "Le pseudonymo del usator que tu vole sequer"
+msgstr "Le pseudonymo del usator que tu vole sequer."
 
 #: 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 de tu profilo in un altere servicio de microblogging compatibile"
+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
@@ -5114,9 +5127,8 @@ msgid "Subscribe"
 msgstr "Subscriber"
 
 #: actions/remotesubscribe.php:158
-#, fuzzy
 msgid "Invalid profile URL (bad format)."
-msgstr "URL de profilo invalide (mal formato)"
+msgstr "URL de profilo invalide (mal formato)."
 
 #: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
@@ -5156,6 +5168,7 @@ 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
@@ -5210,9 +5223,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
-#, 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
+#, fuzzy, 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.
@@ -5942,9 +5957,8 @@ msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
-#, fuzzy
 msgid "Save site notice."
-msgstr "Salveguardar aviso del sito"
+msgstr "Salveguardar aviso del sito."
 
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:57
@@ -6001,9 +6015,8 @@ 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."
-msgstr "Numero de telephono, sin punctuation o spatios, con indicativo"
+msgstr "Numero de telephono, sin punctuation o spatios, con indicativo."
 
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:191
@@ -6170,15 +6183,19 @@ 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."
 
-#: 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"
 
@@ -6378,6 +6395,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."
@@ -6430,9 +6448,9 @@ 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
+#, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
-msgstr "Subscription predefinite invalide: '%1$s' non es usator."
+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
@@ -6491,9 +6509,8 @@ 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."
-msgstr "Salveguardar configurationes de usator"
+msgstr "Salveguardar configurationes de usator."
 
 #. TRANS: Page title.
 #: actions/userauthorization.php:109
@@ -6502,14 +6519,14 @@ msgstr "Autorisar 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 "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
 "click \"Reject\"."
 msgstr ""
-"Per favor verifica iste detalios pro assecurar te que tu vole subscriber te "
-"al notas de iste usator. Si tu non ha requestate isto, clicca \"Rejectar\"."
+"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
@@ -6520,29 +6537,25 @@ msgstr "Licentia"
 
 #. TRANS: Button text on Authorise Subscription page.
 #: actions/userauthorization.php:229
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Acceptar"
 
 #. TRANS: Title for button on Authorise Subscription page.
 #: actions/userauthorization.php:231
-#, fuzzy
 msgid "Subscribe to this user."
-msgstr "Subscriber a iste usator"
+msgstr "Subscriber a iste usator."
 
 #. TRANS: Button text on Authorise Subscription page.
 #: actions/userauthorization.php:233
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rejectar"
 
 #. TRANS: Title for button on Authorise Subscription page.
 #: actions/userauthorization.php:235
-#, fuzzy
 msgid "Reject this subscription."
-msgstr "Rejectar iste subscription"
+msgstr "Rejectar iste subscription."
 
 #. TRANS: Client error displayed for an empty authorisation request.
 #: actions/userauthorization.php:248
@@ -6582,62 +6595,62 @@ msgstr ""
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
 #: actions/userauthorization.php:325
-#, fuzzy, php-format
+#, php-format
 msgid "Listener URI \"%s\" not found here."
-msgstr "URI de ascoltator ‘%s’ non trovate hic."
+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
-#, fuzzy, php-format
+#, php-format
 msgid "Listenee URI \"%s\" is too long."
-msgstr "URI de ascoltato ‘%s’ es troppo longe."
+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
-#, fuzzy, php-format
+#, php-format
 msgid "Listenee URI \"%s\" is a local user."
-msgstr "URI de ascoltato ‘%s’ es un usator local."
+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
-#, fuzzy, php-format
+#, php-format
 msgid "Profile URL \"%s\" is for a local user."
-msgstr "URL de profilo ‘%s’ es de un usator local."
+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
-#, fuzzy, php-format
+#, 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’."
+"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
-#, fuzzy, php-format
+#, php-format
 msgid "Avatar URL \"%s\" is not valid."
-msgstr "URL de avatar ‘%s’ non es valide."
+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
-#, fuzzy, php-format
+#, php-format
 msgid "Cannot read avatar URL \"%s\"."
-msgstr "Non pote leger URL de avatar ‘%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
-#, fuzzy, php-format
+#, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "Typo de imagine incorrecte pro URL de avatar ‘%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
@@ -6974,14 +6987,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:771
+#: classes/Profile.php:775
 #, 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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7630,19 +7643,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 ""
+
 #. 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."
 
@@ -9698,18 +9715,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9717,12 +9739,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9730,12 +9752,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9743,12 +9765,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9756,7 +9778,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:1340
 msgid "about a year ago"
 msgstr "circa un anno retro"
 
@@ -9797,15 +9819,3 @@ msgstr "XML invalide, radice XRD mancante."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Obtene copia de reserva ex file '%s'."
-
-#~ msgid "6 or more characters"
-#~ msgstr "6 o plus characteres"
-
-#~ msgid "Same as password above"
-#~ msgstr "Identic al contrasigno hic supra"
-
-#~ msgid "Can't save new password."
-#~ msgstr "Non pote salveguardar le nove contrasigno."
-
-#~ msgid "URL of your homepage, blog, or profile on another site"
-#~ msgstr "URL de tu pagina personal, blog o profilo in un altere sito"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index c821a9be37..47f3c6f5d8 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:25+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:36:57+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 (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -153,10 +157,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -821,6 +825,7 @@ 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
@@ -833,7 +838,7 @@ msgstr "Autorizzazione non presente."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1163,13 +1168,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!"
@@ -1273,9 +1279,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."
 
@@ -2017,13 +2024,15 @@ 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/nudge.php:63 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
@@ -2962,6 +2971,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."
@@ -3150,8 +3160,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."
 
@@ -3188,6 +3200,7 @@ 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."
@@ -3706,6 +3719,7 @@ 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
 msgid "Already logged in."
 msgstr "Accesso già effettuato."
@@ -3714,7 +3728,8 @@ msgstr "Accesso già effettuato."
 msgid "Incorrect username or password."
 msgstr "Nome utente o password non corretto."
 
-#: actions/login.php:148 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:148 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Errore nell'impostare l'utente. Forse non hai l'autorizzazione."
 
@@ -3878,7 +3893,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 "
@@ -3887,16 +3904,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%%%%?"
@@ -3905,7 +3927,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 "
@@ -3914,14 +3938,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
-#, 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
+#, 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
@@ -4056,11 +4083,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Cerca messaggi"
 
@@ -4108,23 +4136,28 @@ 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)."
 
-#: 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."
 
@@ -4500,7 +4533,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. "
@@ -4509,7 +4544,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"
 
@@ -4803,6 +4839,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"
@@ -5246,6 +5288,7 @@ 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
@@ -5298,9 +5341,11 @@ msgstr ""
 "[Scrivi qualche cosa](%%%%action.newnotice%%%%?status_textarea=%s) su questo "
 "argomento!"
 
-#: actions/repliesrss.php:72
-#, 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
+#, 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.
@@ -6260,16 +6305,20 @@ 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."
 
-#: 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"
 
@@ -6470,6 +6519,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."
@@ -7073,7 +7123,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:771
+#: classes/Profile.php:775
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7081,7 +7131,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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7733,19 +7783,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."
 
@@ -9829,18 +9883,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9848,12 +9907,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9861,12 +9920,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9874,12 +9933,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9887,7 +9946,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:1340
 msgid "about a year ago"
 msgstr "circa un anno fa"
 
@@ -9929,15 +9988,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "6 or more characters"
-#~ msgstr "6 o più caratteri"
-
-#~ msgid "Same as password above"
-#~ msgstr "Stessa password di sopra"
-
-#~ msgid "Can't save new password."
-#~ msgstr "Impossibile salvare la nuova password."
-
-#~ msgid "URL of your homepage, blog, or profile on another site"
-#~ msgstr "URL della tua pagina web, blog o profilo su un altro sito"
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 8134a5b1d5..445a05b253 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:26+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:36:59+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 (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -155,10 +159,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -819,6 +823,7 @@ 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
@@ -831,7 +836,7 @@ msgstr "認証されていません。"
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1151,13 +1156,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 アップデート!"
@@ -1262,9 +1268,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 "そのようなファイルはありません。"
@@ -2010,13 +2017,15 @@ 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/nudge.php:63 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
@@ -2963,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 がありません。"
@@ -3151,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 "結果なし。"
 
@@ -3189,6 +3201,7 @@ 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 "ブロックの削除エラー"
@@ -3700,6 +3713,7 @@ 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
 msgid "Already logged in."
 msgstr "既にログインしています。"
@@ -3708,7 +3722,8 @@ msgstr "既にログインしています。"
 msgid "Incorrect username or password."
 msgstr "ユーザ名またはパスワードが間違っています。"
 
-#: actions/login.php:148 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:148 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "ユーザ設定エラー。 あなたはたぶん承認されていません。"
 
@@ -3873,7 +3888,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 "
@@ -3881,16 +3898,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%%%%?"
@@ -3899,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 "
@@ -3908,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
-#, 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
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "\"%2$s\" 上の検索語 \"$1$s\" に一致するすべての更新"
 
 #: actions/nudge.php:85
@@ -4051,11 +4078,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "つぶやき検索"
 
@@ -4103,23 +4131,28 @@ msgstr "プロファイルデザインの表示または非表示"
 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 "ログイントークンが期限切れです・"
 
@@ -4495,7 +4528,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. "
@@ -4504,7 +4539,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 "ピープルサーチ"
 
@@ -4795,6 +4831,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"
@@ -5233,6 +5275,7 @@ 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
@@ -5285,9 +5328,11 @@ msgstr ""
 "最初の [このトピック投稿](%%%%action.newnotice%%%%?status_textarea=%s) をして"
 "ください!"
 
-#: actions/repliesrss.php:72
-#, 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
+#, 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.
@@ -6265,16 +6310,20 @@ 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 ""
 
-#: 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 "フォローしている"
 
@@ -6473,6 +6522,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 "あなたはそのユーザをブロックしていません。"
@@ -7061,14 +7111,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:771
+#: classes/Profile.php:775
 #, 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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7728,19 +7778,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 ""
 
@@ -9745,61 +9799,66 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, 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:1319
 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:1323
 #, 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:1326
 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:1330
 #, 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:1333
 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:1337
 #, 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:1340
 msgid "about a year ago"
 msgstr "約 1 年前"
 
@@ -9840,15 +9899,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "6 or more characters"
-#~ msgstr "6文字以上"
-
-#~ msgid "Same as password above"
-#~ msgstr "上と同じパスワード"
-
-#~ msgid "Can't save new password."
-#~ msgstr "新しいパスワードを保存できません。"
-
-#~ msgid "URL of your homepage, blog, or profile on another site"
-#~ msgstr "ホームページ、ブログ、プロファイル、その他サイトの URL"
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
index 89634276b9..3659a4ef75 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:27+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:37:04+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 (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -149,10 +153,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -808,6 +812,7 @@ 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
@@ -820,7 +825,7 @@ msgstr "თქვენ არ ხართ ავტორიზირებუ
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1139,13 +1144,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 განახლებები ყველასგან!"
@@ -1250,9 +1256,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 "ასეთი პროფილი არ არსებობს."
 
@@ -1990,13 +1997,15 @@ 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/nudge.php:63 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
@@ -2931,6 +2940,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 უცნობია."
@@ -3119,8 +3129,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,6 +3169,7 @@ 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 "შეცდომა ბლოკის მოხსნისას."
@@ -3668,6 +3681,7 @@ 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
 msgid "Already logged in."
 msgstr "უკვე ავტორიზირებული ხართ."
@@ -3676,7 +3690,8 @@ msgstr "უკვე ავტორიზირებული ხართ."
 msgid "Incorrect username or password."
 msgstr "არასწორი მომხმარებლის სახელი ან პაროლი."
 
-#: actions/login.php:148 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:148 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
@@ -3839,7 +3854,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 "
@@ -3848,16 +3865,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%%%%?"
@@ -3865,7 +3887,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 "
@@ -3874,14 +3898,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
-#, 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
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "განახლებები, რომლებიც შეიცავენ საძიებო სიტყვას \"%1$s\" %2$s–ზე!"
 
 #: actions/nudge.php:85
@@ -4013,11 +4040,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "შეტყობინებების ძიება"
 
@@ -4065,23 +4093,28 @@ msgstr "აჩვენე ან დამალე პროფილის 
 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 ""
 
@@ -4452,7 +4485,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. "
@@ -4462,7 +4497,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 "პიროვნებების ძიება"
 
@@ -4749,6 +4785,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"
@@ -5191,6 +5233,7 @@ 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
@@ -5243,9 +5286,11 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
-#, 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
+#, 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.
@@ -6185,16 +6230,20 @@ 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 მოთხოვნებს იღებს."
 
-#: 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 "გამოწერილია"
 
@@ -6396,6 +6445,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 "თქვენ არ დაგიბლოკავთ ეს მომხმარებელი."
@@ -6993,7 +7043,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:771
+#: classes/Profile.php:775
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7001,7 +7051,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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7649,19 +7699,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 ""
 
@@ -9663,61 +9717,66 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, 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:1319
 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:1323
 #, 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:1326
 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:1330
 #, 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:1333
 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:1337
 #, 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:1340
 msgid "about a year ago"
 msgstr "დაახლოებით 1 წლის წინ"
 
@@ -9761,15 +9820,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "6 or more characters"
-#~ msgstr "6 ან მეტი სიმბოლო"
-
-#~ msgid "Same as password above"
-#~ msgstr "იგივე რაც ზედა პაროლი"
-
-#~ msgid "Can't save new password."
-#~ msgstr "ვერ ვინახავ ახალ პაროლს."
-
-#~ msgid "URL of your homepage, blog, or profile on another site"
-#~ msgstr "თქვენი ვებ. გვერდის URL, ბლოგი, ან პროფილი სხვა საიტზე"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index bc7acc4d39..8cd2084842 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:29+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:37:10+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 (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -151,10 +155,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -806,6 +810,7 @@ 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
@@ -818,7 +823,7 @@ msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1143,13 +1148,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개!"
@@ -1253,9 +1259,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 "해당하는 파일이 없습니다."
 
@@ -1992,13 +1999,15 @@ 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/nudge.php:63 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
@@ -2931,6 +2940,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가 없습니다."
@@ -3112,8 +3122,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 "결과 없음"
 
@@ -3146,6 +3158,7 @@ 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 "차단 제거 에러!"
@@ -3647,6 +3660,7 @@ 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
 msgid "Already logged in."
 msgstr "이미 로그인 하셨습니다."
@@ -3655,7 +3669,8 @@ msgstr "이미 로그인 하셨습니다."
 msgid "Incorrect username or password."
 msgstr "틀린 계정 또는 비밀 번호"
 
-#: actions/login.php:148 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:148 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 
@@ -3821,7 +3836,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 "
@@ -3830,37 +3847,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
-#, 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
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "%2$s에 있는 %1$s의 업데이트!"
 
 #: actions/nudge.php:85
@@ -3994,11 +4021,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "통지 검색"
 
@@ -4046,24 +4074,29 @@ msgstr "프로필 디자인 보이거나 감춥니다."
 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 "사이트에 로그인하세요."
@@ -4432,7 +4465,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 +4476,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 "사람 찾기"
 
@@ -4722,6 +4758,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"
@@ -5155,6 +5197,7 @@ 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
@@ -5203,9 +5246,11 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
-#, 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
+#, 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.
@@ -6146,16 +6191,20 @@ 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 ""
 
-#: 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 "구독하였습니다."
 
@@ -6343,6 +6392,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 "이미 차단된 이용자입니다."
@@ -6937,14 +6987,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:771
+#: classes/Profile.php:775
 #, 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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7595,19 +7645,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 ""
 
@@ -9535,61 +9589,66 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, 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:1319
 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:1323
 #, 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:1326
 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:1330
 #, 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:1333
 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:1337
 #, 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:1340
 msgid "about a year ago"
 msgstr "1년 전"
 
@@ -9630,15 +9689,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "6 or more characters"
-#~ msgstr "6글자 이상"
-
-#~ msgid "Same as password above"
-#~ msgstr "위와 같은 비밀 번호"
-
-#~ msgid "Can't save new password."
-#~ msgstr "새 비밀번호를 저장 할 수 없습니다."
-
-#~ msgid "URL of your homepage, blog, or profile on another site"
-#~ msgstr "귀하의 홈페이지, 블로그 혹은 다른 사이트의 프로필 페이지 URL"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 06391a5da1..fdc9111de8 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:30+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10: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-Generator: MediaWiki 1.18alpha (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -152,10 +156,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -517,10 +521,9 @@ 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
@@ -816,6 +819,7 @@ 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
@@ -828,7 +832,7 @@ msgstr "Жетонот за барање е веќе овластен."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1046,9 +1050,9 @@ 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
+#, php-format
 msgid "Unsupported format: %s."
-msgstr "Неподдржан формат: %s"
+msgstr "Неподдржан формат: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
 #: actions/apistatusesshow.php:155
@@ -1154,13 +1158,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 подновуввања од сите!"
@@ -1262,9 +1267,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 "Нема таков профил."
 
@@ -1565,9 +1571,8 @@ 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.
@@ -1629,9 +1634,8 @@ msgstr "Резерва"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-#, fuzzy
 msgid "Backup your account."
-msgstr "Направете резервна верзија на сметката"
+msgstr "Направете резервна верзија на сметката."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 #: actions/block.php:68
@@ -1672,9 +1676,8 @@ 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.
@@ -1691,9 +1694,8 @@ 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
@@ -1913,15 +1915,13 @@ 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
@@ -1974,28 +1974,28 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-#, fuzzy
 msgid "Do not delete this group."
-msgstr "Не ја бриши групава"
+msgstr "Не ја бриши групава."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-#, 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.
 #. 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/nudge.php:63 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
@@ -2024,15 +2024,13 @@ msgstr "Дали сте сигурни дека сакате да ја избр
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
-#, fuzzy
 msgid "Do not delete this notice."
-msgstr "Не ја бриши оваа забелешка"
+msgstr "Не ја бриши оваа забелешка."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
 #: actions/deletenotice.php:166
-#, fuzzy
 msgid "Delete this notice."
-msgstr "Избриши ја оваа забелешка"
+msgstr "Избриши ја забелешкава."
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 #: actions/deleteuser.php:66
@@ -2066,15 +2064,13 @@ 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.
 #. TRANS: Link description in user account settings menu.
@@ -2238,21 +2234,18 @@ 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 "Врати по основно"
+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
@@ -2666,9 +2659,8 @@ msgstr "Веќе сте ја бендисале оваа забелешка!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-#, fuzzy
 msgid "Disfavor favorite."
-msgstr "Тргни од бендисани"
+msgstr "Тргни од бендисани."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2908,15 +2900,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 "Не го блокирај овој корисник од оваа група"
+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 "Блокирај го овој корисник од оваа група"
+msgstr "Блокирај го овој корисник од групава."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
 #: actions/groupblock.php:215
@@ -2926,6 +2916,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."
@@ -3113,8 +3104,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 "Нема резултати."
 
@@ -3151,6 +3144,7 @@ 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 "Грешка при отстранување на блокот."
@@ -3661,6 +3655,7 @@ 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
 msgid "Already logged in."
 msgstr "Веќе сте најавени."
@@ -3669,7 +3664,8 @@ msgstr "Веќе сте најавени."
 msgid "Incorrect username or password."
 msgstr "Неточно корисничко име или лозинка"
 
-#: actions/login.php:148 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:148 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Грешка при поставувањето на корисникот. Веројатно не се заверени."
 
@@ -3832,7 +3828,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 "
@@ -3841,16 +3839,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%%%%?"
@@ -3859,7 +3862,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 "
@@ -3869,14 +3874,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
-#, 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
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Подновувања кои се совпаѓаат со пребараниот израз „%1$s“ на %2$s!"
 
 #: actions/nudge.php:85
@@ -3966,14 +3974,14 @@ msgstr ""
 "користите овој примерок на StatusNet."
 
 #: actions/oembed.php:64
-#, fuzzy, php-format
+#, php-format
 msgid "\"%s\" not found."
-msgstr "Корисникот не е пронајден."
+msgstr "„%s“ не е пронајден."
 
 #: actions/oembed.php:76
-#, fuzzy, php-format
+#, php-format
 msgid "Notice %s not found."
-msgstr "Матичната забелешка не е пронајдена."
+msgstr "Забелешката %s не е пронајдена."
 
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
@@ -3985,14 +3993,14 @@ msgid "%1$s's status on %2$s"
 msgstr "%1$s статус на %2$s"
 
 #: actions/oembed.php:95
-#, fuzzy, php-format
+#, php-format
 msgid "Attachment %s not found."
-msgstr "Примачот не е пронајден."
+msgstr "Прилогот %s не е пронајден."
 
 #: actions/oembed.php:136
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
-msgstr ""
+msgstr "„%s“ не е поддржано за oembed-барања."
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
@@ -4012,11 +4020,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Пребарување на забелешки"
 
@@ -4036,7 +4045,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
@@ -4063,23 +4072,28 @@ msgstr "Прикажи или скриј изгледи на профилот."
 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 "Најавниот жетон е истечен."
 
@@ -4434,7 +4448,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. "
@@ -4444,7 +4460,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 "Пребарување на луѓе"
 
@@ -4567,13 +4584,12 @@ 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."
 msgstr ""
 "Ознаки за Вас самите (букви, бројки, -, . и _), одделени со запирка или "
-"празно место"
+"празно место."
 
 #. TRANS: Dropdownlist label in form for profile settings.
 #: actions/profilesettings.php:169
@@ -4582,7 +4598,6 @@ msgstr "Јазик"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-#, fuzzy
 msgid "Preferred language."
 msgstr "Претпочитан јазик"
 
@@ -4598,12 +4613,11 @@ 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)."
 msgstr ""
 "Автоматски претплаќај ме на секој што се претплаќа на мене (најдобро за "
-"ботови и сл.)"
+"ботови и сл.)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
@@ -4628,9 +4642,9 @@ msgstr "Јазикот е предолг (највеќе до 50 знаци)."
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
 #: actions/profilesettings.php:291
-#, 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.
@@ -4735,6 +4749,12 @@ 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"
@@ -4874,9 +4894,8 @@ msgstr "Побарано е пронаоѓање на лозинката"
 
 #. TRANS: Title for password recovery page in password saved mode.
 #: actions/recoverpassword.php:229
-#, fuzzy
 msgid "Password saved"
-msgstr "Лозинката е зачувана."
+msgstr "Лозинката е зачувана"
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
@@ -4970,7 +4989,6 @@ msgid "Registration not allowed."
 msgstr "Регистрирањето не е дозволено."
 
 #: actions/register.php:201
-#, fuzzy
 msgid "You cannot register if you don't agree to the license."
 msgstr "Не може да се регистрирате ако не ја прифаќате лиценцата."
 
@@ -4983,13 +5001,12 @@ msgid "Invalid username or password."
 msgstr "Погрешно име или лозинка."
 
 #: actions/register.php:340
-#, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
 "Со овој образец можете да создадете нова сметка. Потоа ќе можете да "
-"објавувате забелешки и да се поврзувате со пријатели и колеги. "
+"објавувате забелешки и да се поврзувате со пријатели и колеги."
 
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:431 actions/register.php:435
@@ -4998,19 +5015,16 @@ msgid "Email"
 msgstr "Е-пошта"
 
 #: actions/register.php:432 actions/register.php:436
-#, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr "Се користи само за подновувања, објави и повраќање на лозинка."
 
 #: actions/register.php:443
-#, fuzzy
 msgid "Longer name, preferably your \"real\" name."
-msgstr "Подолго име, по можност Вашето вистинско име и презиме"
+msgstr "Подолго име, по можност Вашето „вистинско“ име и презиме"
 
 #: actions/register.php:471
-#, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Каде се наоѓате, на пр. „Град, Област, Земја“."
+msgstr "Каде се наоѓате, на пр. „Град, Сојуз. држава (или Област), Земја“."
 
 #: actions/register.php:510
 #, php-format
@@ -5112,7 +5126,6 @@ msgid "User nickname"
 msgstr "Прекар на корисникот"
 
 #: actions/remotesubscribe.php:129
-#, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "Прекар на корисникот што сакате да го следите."
 
@@ -5121,9 +5134,8 @@ msgid "Profile URL"
 msgstr "URL на профилот"
 
 #: actions/remotesubscribe.php:133
-#, fuzzy
 msgid "URL of your profile on another compatible microblogging service."
-msgstr "URL на Вашиот профил на друга соодветна служба за микроблогирање."
+msgstr "!URL на Вашиот профил на друга складна служба за микроблогирање."
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
@@ -5132,9 +5144,8 @@ msgid "Subscribe"
 msgstr "Претплати се"
 
 #: actions/remotesubscribe.php:158
-#, fuzzy
 msgid "Invalid profile URL (bad format)."
-msgstr "Неправилно URL на профил (лош формат)"
+msgstr "Неправилна URL на профилот (лош формат)."
 
 #: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
@@ -5174,6 +5185,7 @@ 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,9 +5240,11 @@ msgstr ""
 "Можете да го [подбуцнете корисникот 1$s](../%2$s) или да [му испратите нешто]"
 "(%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#: actions/repliesrss.php:72
-#, 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
+#, 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.
@@ -5967,9 +5981,8 @@ msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
-#, fuzzy
 msgid "Save site notice."
-msgstr "Зачувај ја објавава"
+msgstr "Зачувај ја објавата на мреж. место."
 
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:57
@@ -6026,10 +6039,10 @@ 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."
 msgstr ""
-"Телефонски број, без интерпункциски знаци и празни места, со повикувачки код"
+"Телефонски број, без интерпункциски знаци и празни места, со повикувачки "
+"број."
 
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:191
@@ -6196,16 +6209,20 @@ 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-барања"
 
-#: 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 "Претплатено"
 
@@ -6403,6 +6420,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 "Го немате блокирано тој корисник."
@@ -6455,7 +6473,7 @@ 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
+#, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Неважечки опис по основно: „%1$s“ не е корисник."
 
@@ -6516,9 +6534,8 @@ msgstr "Дали да им е дозволено на корисниците д
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-#, fuzzy
 msgid "Save user settings."
-msgstr "Зачувај кориснички нагодувања"
+msgstr "Зачувај кориснички нагодувања."
 
 #. TRANS: Page title.
 #: actions/userauthorization.php:109
@@ -6527,15 +6544,14 @@ 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 "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
 "click \"Reject\"."
 msgstr ""
-"Проверете ги овие податоци за да се осигурате дека сакате да се претплатите "
-"за забелешките на овој корисник. Ако не сакате да се претплатите, едноставно "
-"кликнете на „Одбиј“"
+"Проверете ги овие податоци и видете дали сакате да се претплатите на "
+"забелешките на овој корисник. Ако не сакате да се претплатите, едноставно "
+"стиснете на „Одбиј“."
 
 #. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
@@ -6546,29 +6562,25 @@ msgstr "Лиценца"
 
 #. TRANS: Button text on Authorise Subscription page.
 #: actions/userauthorization.php:229
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Прифати"
 
 #. TRANS: Title for button on Authorise Subscription page.
 #: actions/userauthorization.php:231
-#, fuzzy
 msgid "Subscribe to this user."
-msgstr "Претплати се на корисников"
+msgstr "Претплати се на корисников."
 
 #. TRANS: Button text on Authorise Subscription page.
 #: actions/userauthorization.php:233
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Одбиј"
 
 #. TRANS: Title for button on Authorise Subscription page.
 #: actions/userauthorization.php:235
-#, fuzzy
 msgid "Reject this subscription."
-msgstr "Одбиј ја оваа претплата"
+msgstr "Одбиј ја оваа претплата."
 
 #. TRANS: Client error displayed for an empty authorisation request.
 #: actions/userauthorization.php:248
@@ -6608,62 +6620,62 @@ msgstr ""
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
 #: actions/userauthorization.php:325
-#, fuzzy, php-format
+#, 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
-#, fuzzy, php-format
+#, php-format
 msgid "Listenee URI \"%s\" is too long."
-msgstr "Следениот URI „%s“ е предолг."
+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
-#, fuzzy, php-format
+#, php-format
 msgid "Listenee URI \"%s\" is a local user."
-msgstr "Следеното URI „%s“ е за локален корисник."
+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
-#, fuzzy, php-format
+#, 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
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
 "\"."
 msgstr ""
-"Лиценцата на каналот на следачот „%1$s“ не е соодветна на лиценцата на "
+"Лиценцата на каналот на следениот „%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
+#, 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
-#, fuzzy, php-format
+#, php-format
 msgid "Cannot read avatar URL \"%s\"."
-msgstr "Не можам да ја прочитам 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
-#, fuzzy, php-format
+#, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "Погрешен тип на слика за URL на аватарот „%s“."
+msgstr "Погрешен тип на слика за аватарот со URL „%s“."
 
 #. TRANS: Page title for profile design page.
 #: actions/userdesignsettings.php:74 lib/designsettings.php:63
@@ -7005,7 +7017,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:771
+#: classes/Profile.php:775
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7014,7 +7026,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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7662,19 +7674,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 "Не можевме да Ве потврдиме."
 
@@ -9727,18 +9743,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9746,12 +9767,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9759,12 +9780,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9772,12 +9793,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9785,7 +9806,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:1340
 msgid "about a year ago"
 msgstr "пред една година"
 
@@ -9829,16 +9850,3 @@ msgstr "Неважечки XML. Нема XRD-корен."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Земам резерва на податотеката „%s“."
-
-#~ msgid "6 or more characters"
-#~ msgstr "6 или повеќе знаци"
-
-#~ msgid "Same as password above"
-#~ msgstr "Исто како лозинката погоре"
-
-#~ msgid "Can't save new password."
-#~ msgstr "Не можам да ја зачувам новата лозинка."
-
-#~ msgid "URL of your homepage, blog, or profile on another site"
-#~ msgstr ""
-#~ "URL на Вашата домашна страница, блог или профил на друго мрежно место."
diff --git a/locale/ml/LC_MESSAGES/statusnet.po b/locale/ml/LC_MESSAGES/statusnet.po
index 1da28a6543..b40dcfd870 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:32+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:37: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"
-"X-POT-Import-Date: 2011-02-14 17:20:58+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r82325); Translate extension (2011-02-01)\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ml\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -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
@@ -149,10 +153,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -501,9 +505,8 @@ 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 "താങ്കളുടെ സുഹൃത്തുക്കളല്ലാത്തവർക്ക് നേരിട്ടുള്ള സന്ദേശങ്ങൾ അയയ്ക്കാൻ കഴിയില്ല."
+msgstr "താങ്കളുടെ സുഹൃത്തുക്കളല്ലാത്ത ഉപയോക്താക്കൾക്ക് നേരിട്ടുള്ള സന്ദേശങ്ങൾ അയയ്ക്കാൻ കഴിയില്ല."
 
 #. TRANS: Client error displayed trying to direct message self (403).
 #: actions/apidirectmessagenew.php:154
@@ -796,6 +799,7 @@ 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
@@ -808,7 +812,7 @@ msgstr "അഭ്യർത്ഥനാ ചീട്ട് മുമ്പേ ത
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1016,9 +1020,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
+#, php-format
 msgid "Unsupported format: %s."
-msgstr "പിന്തുണയ്ക്കാത്തയിനം തരം: %s"
+msgstr "പിന്തുണയ്ക്കാത്തയിനം തരം: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
 #: actions/apistatusesshow.php:155
@@ -1122,13 +1126,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 പദ്ധതിയിൽ എല്ലാവരും അയച്ചിട്ടുള്ള പുതിയവാർത്തകൾ!"
@@ -1230,9 +1235,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 ""
 
@@ -1591,9 +1597,8 @@ msgstr "ബാക്ക്അപ്"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-#, fuzzy
 msgid "Backup your account."
-msgstr "താങ്കളുടെ അംഗത്വത്തിന്റെ ബാക്ക്അപ് എടുക്കുക"
+msgstr "താങ്കളുടെ അംഗത്വത്തിന്റെ ബാക്ക്അപ് എടുക്കുക."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 #: actions/block.php:68
@@ -1630,9 +1635,8 @@ 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.
@@ -1649,9 +1653,8 @@ 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
@@ -1924,28 +1927,28 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-#, fuzzy
 msgid "Do not delete this group."
-msgstr "ഈ സംഘത്തെ മായ്ക്കരുത്"
+msgstr "ഈ സംഘത്തെ മായ്ക്കരുത്."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-#, 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.
 #. 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/nudge.php:63 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
@@ -1974,15 +1977,13 @@ msgstr "ഈ അറിയിപ്പ് ഒഴിവാക്കണമെന്
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
-#, fuzzy
 msgid "Do not delete this notice."
-msgstr "ഈ അറിയിപ്പ് മായ്ക്കരുത്"
+msgstr "ഈ അറിയിപ്പ് മായ്ക്കരുത്."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
 #: actions/deletenotice.php:166
-#, fuzzy
 msgid "Delete this notice."
-msgstr "ഈ അറിയിപ്പ് മായ്ക്കുക"
+msgstr "ഈ അറിയിപ്പ് മായ്ക്കുക."
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 #: actions/deleteuser.php:66
@@ -2016,15 +2017,13 @@ 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.
 #. TRANS: Link description in user account settings menu.
@@ -2190,21 +2189,18 @@ 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 "മുമ്പ് സ്വതേയുണ്ടായിരുന്നതിലേയ്ക്ക് പുനഃസ്ഥാപിക്കുക"
+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
@@ -2616,9 +2612,8 @@ msgstr "ഈ അറിയിപ്പ് മുമ്പേ തന്നെ പ
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-#, fuzzy
 msgid "Disfavor favorite."
-msgstr "പ്രിയങ്കരമാണ് എന്നത് നീക്കം ചെയ്യുക"
+msgstr "പ്രിയങ്കരമാണ് എന്നത് നീക്കം ചെയ്യുക."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2848,18 +2843,19 @@ msgid ""
 "will be removed from the group, unable to post, and unable to subscribe to "
 "the group in the future."
 msgstr ""
+"\"%2$s\" എന്ന സംഘത്തിൽ നിന്നും \"%1$s\" എന്ന ഉപയോക്താവിനെ തടയണം എന്ന് ഉറപ്പാണോ? "
+"പിന്നീടിവിടെ എഴുത്ത് ചേർക്കാനും വരിക്കാരാകാനും സാധിക്കാത്ത വിധത്തിൽ അവർ സംഘത്തിൽ നിന്ന് "
+"നീക്കം ചെയ്യപ്പെടും."
 
 #. 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 "ഈ സംഘത്തിൽ നിന്നും ഈ ഉപയോക്താവിനെ തടയരുത്"
+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 "ഈ സംഘത്തിൽ നിന്നും ഈ ഉപയോക്താവിനെ തടയുക"
+msgstr "ഈ സംഘത്തിൽ നിന്നും ഈ ഉപയോക്താവിനെ തടയുക."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
 #: actions/groupblock.php:215
@@ -2867,6 +2863,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 "ഐ.ഡി. ഇല്ല."
@@ -2886,7 +2883,7 @@ msgstr "സംഘത്തിന്റെ രൂപകല്പന"
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
-msgstr ""
+msgstr "പശ്ചാത്തല്ല ചിത്രവും വർണ്ണങ്ങളും ചേർത്ത് സംഘത്തിന്റെ ദൃശ്യരൂപം ഇച്ഛാനുസരണമാക്കുക."
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
 #: actions/groupdesignsettings.php:262
@@ -2996,7 +2993,7 @@ msgstr "ഈ ഉപയോക്താവിനെ കാര്യനിർവ്
 #: actions/grouprss.php:141
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
-msgstr ""
+msgstr "%2$s സൈറ്റിലെ %1$s സംഘാങ്ങളുടെ പുതുക്കലുകൾ!"
 
 #. TRANS: Title for first page of the groups list.
 #: actions/groups.php:62
@@ -3052,8 +3049,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 "ഫലങ്ങൾ ഒന്നുമില്ല"
 
@@ -3090,6 +3089,7 @@ 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 "തടയൽ നീക്കുന്നതിൽ പിഴവുണ്ടായി."
@@ -3562,6 +3562,7 @@ 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
 msgid "Already logged in."
 msgstr "മുമ്പേ തന്നെ ലോഗിൻ ചെയ്തിട്ടുണ്ട്."
@@ -3570,7 +3571,8 @@ msgstr "മുമ്പേ തന്നെ ലോഗിൻ ചെയ്തിട
 msgid "Incorrect username or password."
 msgstr "ഉപയോക്തൃനാമമോ രഹസ്യവാക്കോ തെറ്റാണ്."
 
-#: actions/login.php:148 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:148 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "ഉപയോക്തൃ സജ്ജീകരണത്തിൽ പിഴവുണ്ടായി. താങ്കൾക്ക് മിക്കവാറും അനുമതിയുണ്ടാവില്ല."
 
@@ -3624,7 +3626,7 @@ msgstr "%1$s എന്ന ഉപയോക്താവ് \"%2$s\" എന്ന 
 #: actions/makeadmin.php:133
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
-msgstr ""
+msgstr "%2$s സൈറ്റിലെ %1$s സംഘാംഗങ്ങളുടെ അംഗത്വരേഖ ലഭ്യമായില്ല."
 
 #: actions/makeadmin.php:146
 #, php-format
@@ -3729,45 +3731,60 @@ 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 ""
+"[ഈ വിഷയത്തിൽ കുറിപ്പിടുന്ന](%%%%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 "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 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
-#, php-format
-msgid "Updates matching search term \"%1$s\" on %2$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
 msgid ""
@@ -3856,9 +3873,9 @@ msgid "\"%s\" not found."
 msgstr "ഉപയോക്താവിനെ കണ്ടത്താനായില്ല."
 
 #: actions/oembed.php:76
-#, fuzzy, php-format
+#, php-format
 msgid "Notice %s not found."
-msgstr "മാതൃ അറിയിപ്പ് കണ്ടെത്താനായില്ല."
+msgstr "%s എന്ന അറിയിപ്പ് കണ്ടെത്താനായില്ല."
 
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
@@ -3897,11 +3914,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "അറിയിപ്പുകൾ തിരയുക"
 
@@ -3948,23 +3966,28 @@ msgstr ""
 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 "ലോഗിൻ ചീട്ട് കാലഹരണപ്പെട്ടിരിക്കുന്നു."
 
@@ -4036,7 +4059,7 @@ msgstr "പഴയ രഹസ്യവാക്ക് തെറ്റാണ്"
 
 #: actions/passwordsettings.php:180
 msgid "Error saving user; invalid."
-msgstr ""
+msgstr "ഉപയോക്താവിനെ സേവ് ചെയ്യുന്നതിൽ പിഴവുണ്ടായി; അസാധുവാണ്."
 
 #. TRANS: Reset password form validation error message.
 #: actions/passwordsettings.php:185 actions/recoverpassword.php:418
@@ -4317,14 +4340,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 "ആൾക്കാരെ തിരയുക"
 
@@ -4457,9 +4483,8 @@ msgstr "ഭാഷ"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-#, fuzzy
 msgid "Preferred language."
-msgstr "പ്രിയങ്കര ഭാഷ"
+msgstr "പ്രിയങ്കര ഭാഷ."
 
 #. TRANS: Dropdownlist label in form for profile settings.
 #: actions/profilesettings.php:181
@@ -4604,6 +4629,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"
@@ -4656,17 +4687,17 @@ msgstr "താങ്കൾ മുമ്പേതന്നെ ലോഗിൻ ച
 #. TRANS: Client error displayed when password recovery code is not correct.
 #: actions/recoverpassword.php:64
 msgid "No such recovery code."
-msgstr ""
+msgstr "അത്തരത്തിലൊരു വീണ്ടെടുക്കൽ കോഡ് ഇല്ല."
 
 #. TRANS: Client error displayed when no proper password recovery code was submitted.
 #: actions/recoverpassword.php:69
 msgid "Not a recovery code."
-msgstr ""
+msgstr "അതൊരു വീണ്ടെടുക്കൽ കോഡ് അല്ല."
 
 #. TRANS: Server error displayed trying to recover password without providing a user.
 #: actions/recoverpassword.php:77
 msgid "Recovery code for unknown user."
-msgstr ""
+msgstr "അജ്ഞാത ഉപയോക്താവിന്റെ വീണ്ടെടുക്കൽ കോഡ് ആണ്."
 
 #. TRANS: Server error displayed removing a password recovery code from the database.
 #: actions/recoverpassword.php:91
@@ -4741,9 +4772,8 @@ msgstr "രഹസ്യവാക്ക് വീണ്ടെടുക്കൽ 
 
 #. TRANS: Title for password recovery page in password saved mode.
 #: actions/recoverpassword.php:229
-#, fuzzy
 msgid "Password saved"
-msgstr "രഹസ്യവാക്ക് സേവ് ചെയ്തിരിക്കുന്നു."
+msgstr "രഹസ്യവാക്ക് സേവ് ചെയ്തിരിക്കുന്നു"
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
@@ -4837,9 +4867,8 @@ msgid "Registration not allowed."
 msgstr "അംഗത്വമെടുക്കൽ അനുവദിച്ചിട്ടില്ല."
 
 #: actions/register.php:201
-#, fuzzy
 msgid "You cannot register if you don't agree to the license."
-msgstr "താങ്കൾ അനുവാദ പത്രം അംഗീകരിക്കുകയില്ലെങ്കിൽ അംഗത്വമെടുക്കാനുകുകയില്ല."
+msgstr "താങ്കൾ അനുവാദ പത്രം അംഗീകരിക്കുകയില്ലെങ്കിൽ ഭാഗമാകാനാകില്ല."
 
 #: actions/register.php:210
 msgid "Email address already exists."
@@ -4850,13 +4879,12 @@ msgid "Invalid username or password."
 msgstr "ഉപയോക്തൃനാമമോ രഹസ്യവാക്കോ അസാധുവാണ്."
 
 #: actions/register.php:340
-#, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
 "ഈ ഫോം ഉപയോഗിച്ച് താങ്കൾക്ക് പുതിയൊരു അംഗത്വം സൃഷ്ടിക്കാനാകും. പിന്നീട് താങ്കൾക്ക് അറിയിപ്പുകൾ "
-"പ്രസിദ്ധീകരിക്കാനും സുഹൃത്തുക്കളേയും സഹപ്രവർത്തകരേയും കണ്ണിചേർക്കാനുമാകും. "
+"പ്രസിദ്ധീകരിക്കാനും സുഹൃത്തുക്കളേയും സഹപ്രവർത്തകരേയും കണ്ണിചേർക്കാനുമാകും."
 
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:431 actions/register.php:435
@@ -4865,21 +4893,18 @@ msgid "Email"
 msgstr "ഇമെയിൽ"
 
 #: actions/register.php:432 actions/register.php:436
-#, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
 msgstr ""
 "പുതുക്കൽ വിവരങ്ങൾക്കും, അറിയിപ്പുകൾക്കും, രഹസ്യവാക്ക് വീണ്ടെടുക്കൽ പ്രവർത്തനത്തിനും മാത്രം "
-"ഉപയോഗിച്ചത്"
+"ഉപയോഗിച്ചത്."
 
 #: actions/register.php:443
-#, fuzzy
 msgid "Longer name, preferably your \"real\" name."
-msgstr "വലിയ പേര്, താങ്കളുടെ \"യഥാർത്ഥ\" പേര് നൽകാൻ താത്പര്യപ്പെടുന്നു"
+msgstr "വലിയ പേര്, താങ്കളുടെ \"യഥാർത്ഥ\" പേര് നൽകാൻ താത്പര്യപ്പെടുന്നു."
 
 #: actions/register.php:471
-#, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "താങ്കളെവിടെയാണ്, അതായത് \"നഗരം, സംസ്ഥാനം (അഥവ പ്രദേശം), രാജ്യം\" എന്ന്"
+msgstr "താങ്കളെവിടെയാണ്, അതായത് \"നഗരം, സംസ്ഥാനം (അഥവ പ്രദേശം), രാജ്യം\" എന്നിവ."
 
 #: actions/register.php:510
 #, php-format
@@ -4958,9 +4983,8 @@ msgid "User nickname"
 msgstr "ഉപയോക്തൃ വിളിപ്പേര്"
 
 #: actions/remotesubscribe.php:129
-#, fuzzy
 msgid "Nickname of the user you want to follow."
-msgstr "താങ്കൾക്ക് പിന്തുടരേണ്ട ഉപയോക്താവിന്റെ വിളിപ്പേര്"
+msgstr "താങ്കൾക്ക് പിന്തുടരേണ്ട ഉപയോക്താവിന്റെ വിളിപ്പേര്."
 
 #: actions/remotesubscribe.php:132
 msgid "Profile URL"
@@ -5018,6 +5042,7 @@ 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
@@ -5066,9 +5091,11 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
-#, 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
+#, 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.
@@ -5772,9 +5799,8 @@ msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
-#, fuzzy
 msgid "Save site notice."
-msgstr "സൈറ്റ് അറിയിപ്പ് സേവ് ചെയ്യുക"
+msgstr "സൈറ്റ് അറിയിപ്പ് സേവ് ചെയ്യുക."
 
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:57
@@ -5834,7 +5860,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."
-msgstr ""
+msgstr "ഫോൺ നമ്പർ, വിരാമചിഹ്നമോ ഇടയോ ചേർക്കാതെ പ്രദേശത്തിന്റെ കോഡിനോടൊപ്പം നൽകുക."
 
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:191
@@ -5996,15 +6022,19 @@ 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 ""
 
-#: 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 ""
 
@@ -6193,6 +6223,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 ""
@@ -6304,9 +6335,8 @@ msgstr "പുതിയ ഉപയോക്താക്കളെ ക്ഷണി
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-#, fuzzy
 msgid "Save user settings."
-msgstr "ഉപയോക്തൃ സജ്ജീകരണങ്ങൾ സേവ് ചെയ്യുക"
+msgstr "ഉപയോക്തൃ സജ്ജീകരണങ്ങൾ സേവ് ചെയ്യുക."
 
 #. TRANS: Page title.
 #: actions/userauthorization.php:109
@@ -6330,29 +6360,25 @@ msgstr "അനുമതി"
 
 #. TRANS: Button text on Authorise Subscription page.
 #: actions/userauthorization.php:229
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "സ്വീകരിക്കുക"
 
 #. TRANS: Title for button on Authorise Subscription page.
 #: actions/userauthorization.php:231
-#, fuzzy
 msgid "Subscribe to this user."
-msgstr "ഈ ഉപയോക്താവിന്റെ വരിക്കാരൻ/വരിക്കാരി ആകുക"
+msgstr "ഈ ഉപയോക്താവിന്റെ വരിക്കാരൻ/വരിക്കാരി ആകുക."
 
 #. TRANS: Button text on Authorise Subscription page.
 #: actions/userauthorization.php:233
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
-msgstr "നിരാകരിക്കുക"
+msgstr "നിരസിക്കുക"
 
 #. TRANS: Title for button on Authorise Subscription page.
 #: actions/userauthorization.php:235
-#, fuzzy
 msgid "Reject this subscription."
-msgstr "ഈ വരിക്കാരനാകൽ നിരസിക്കുക"
+msgstr "ഈ വരിക്കാരനാകൽ നിരസിക്കുക."
 
 #. TRANS: Client error displayed for an empty authorisation request.
 #: actions/userauthorization.php:248
@@ -6734,7 +6760,7 @@ msgstr ""
 #. TRANS: Server exception thrown when an update for a group inbox fails.
 #: classes/Notice.php:1028
 msgid "Problem saving group inbox."
-msgstr ""
+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.
@@ -6759,14 +6785,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:771
+#: classes/Profile.php:775
 #, 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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7402,19 +7428,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 ""
 
@@ -8293,7 +8323,7 @@ msgstr ""
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
-msgstr ""
+msgstr "%s എന്ന സംഘത്തിനു രൂപകല്പന കൂട്ടിച്ചേർക്കുക അല്ലെങ്കിൽ മാറ്റം വരുത്തുക"
 
 #. TRANS: Title for groups with the most members section.
 #: lib/groupsbymemberssection.php:71
@@ -8320,7 +8350,7 @@ msgstr ""
 #. TRANS: Exception thrown when trying to upload an unsupported image file format.
 #: lib/imagefile.php:73
 msgid "Unsupported image file format."
-msgstr ""
+msgstr "ചിത്രത്തിന്റെ തരത്തിനു പിന്തുണയില്ല."
 
 #. TRANS: Exception thrown when too large a file is uploaded.
 #. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
@@ -8337,7 +8367,7 @@ 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 ""
+msgstr "ഒന്നുകിൽ ചിത്രമല്ല അല്ലെങ്കിൽ ചിത്രത്തിൽ പിഴവുണ്ട്."
 
 #. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
 #: lib/imagefile.php:178
@@ -8686,7 +8716,7 @@ 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 ""
+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
@@ -8703,7 +8733,7 @@ msgstr ""
 #. 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 ""
+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
@@ -9309,18 +9339,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9328,12 +9363,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9341,12 +9376,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9354,12 +9389,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9367,7 +9402,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:1340
 msgid "about a year ago"
 msgstr "ഏകദേശം ഒരു വർഷം മുമ്പ്"
 
@@ -9412,17 +9447,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "6 or more characters"
-#~ msgstr "ആറോ അതിലധികമോ അക്ഷരങ്ങൾ"
-
-#~ msgid "Same as password above"
-#~ msgstr "മുകളിൽ നൽകിയ അതേ രഹസ്യവാക്ക്"
-
-#~ msgid "Can't save new password."
-#~ msgstr "പുതിയ രഹസ്യവാക്ക് സേവ് ചെയ്യാനായില്ല."
-
-#~ msgid "URL of your homepage, blog, or profile on another site"
-#~ msgstr ""
-#~ "താങ്കളുടെ ഹോംപേജിന്റെ, ബ്ലോഗിന്റെ അല്ലെങ്കിൽ മറ്റൊരു സൈറ്റിലെ താങ്കളെക്കുറിച്ചുള്ള "
-#~ "താളിലേയ്ക്കുള്ള യൂ.ആർ.എൽ."
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 49f3b4053d..1bf6d559d5 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:36+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:37:25+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 (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -133,7 +133,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
@@ -151,10 +155,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -813,6 +817,7 @@ 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
@@ -825,7 +830,7 @@ msgstr "Du er ikke autorisert."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1148,13 +1153,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!"
@@ -1256,9 +1262,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."
 
@@ -1992,13 +1999,15 @@ 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/nudge.php:63 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
@@ -2927,6 +2936,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."
@@ -3113,8 +3123,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."
 
@@ -3151,6 +3163,7 @@ 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."
@@ -3654,6 +3667,7 @@ 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
 msgid "Already logged in."
 msgstr "Allerede innlogget."
@@ -3662,7 +3676,8 @@ msgstr "Allerede innlogget."
 msgid "Incorrect username or password."
 msgstr "Feil brukernavn eller passord."
 
-#: actions/login.php:148 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:148 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."
 
@@ -3826,7 +3841,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 "
@@ -3835,16 +3852,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%%%%?"
@@ -3853,7 +3875,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 "
@@ -3863,14 +3887,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
-#, 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
+#, 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
@@ -4004,11 +4031,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Notissøk"
 
@@ -4055,23 +4083,28 @@ msgstr "Vis eller skjul profilutseender."
 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"
@@ -4430,7 +4463,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. "
@@ -4439,7 +4474,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"
 
@@ -4728,6 +4764,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"
@@ -5168,6 +5210,7 @@ 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
@@ -5220,9 +5263,11 @@ msgstr ""
 "Vær den første til å [poste om dette emnet](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#: actions/repliesrss.php:72
-#, 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
+#, 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.
@@ -6183,15 +6228,19 @@ 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 ""
 
-#: 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"
@@ -6385,6 +6434,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."
@@ -6961,14 +7011,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:771
+#: classes/Profile.php:775
 #, 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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7623,19 +7673,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 ""
 
@@ -9685,18 +9739,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9704,12 +9763,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9717,12 +9776,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9730,12 +9789,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9743,7 +9802,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:1340
 msgid "about a year ago"
 msgstr "omtrent ett år siden"
 
@@ -9785,15 +9844,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "6 or more characters"
-#~ msgstr "6 eller flere tegn"
-
-#~ msgid "Same as password above"
-#~ msgstr "Samme som passord ovenfor"
-
-#~ msgid "Can't save new password."
-#~ msgstr "Klarer ikke å lagre nytt passord."
-
-#~ msgid "URL of your homepage, blog, or profile on another site"
-#~ msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 51ff6ac80a..9193da0198 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:33+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10: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-Generator: MediaWiki 1.18alpha (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -152,10 +156,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -519,7 +523,6 @@ 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 "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "U kunt geen privéberichten sturen aan gebruikers die niet op uw "
@@ -820,6 +823,7 @@ 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
@@ -832,7 +836,7 @@ msgstr "Het verzoektoken is al geautoriseerd."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1054,9 +1058,9 @@ 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
+#, php-format
 msgid "Unsupported format: %s."
-msgstr "Niet-ondersteund formaat: %s"
+msgstr "Niet-ondersteund formaat: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
 #: actions/apistatusesshow.php:155
@@ -1163,13 +1167,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"
@@ -1271,9 +1276,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."
 
@@ -1580,10 +1586,9 @@ msgstr "Er is geen bestand geüpload."
 
 #. 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 ""
-"Selecteer een vierkant in de afbeelding om deze als uw avatar in te stellen"
+"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.
@@ -1645,9 +1650,8 @@ msgstr "Reservekopie"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-#, fuzzy
 msgid "Backup your account."
-msgstr "Uw gebruiker back-uppen"
+msgstr "Uw gebruiker back-uppen."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 #: actions/block.php:68
@@ -1687,9 +1691,8 @@ msgstr "Nee"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
-#, fuzzy
 msgid "Do not block this user."
-msgstr "Gebruiker niet blokkeren"
+msgstr "Deze gebruiker niet blokkeren."
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
@@ -1706,9 +1709,8 @@ msgstr "Ja"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 #: actions/block.php:165
-#, fuzzy
 msgid "Block this user."
-msgstr "Deze gebruiker blokkeren"
+msgstr "Deze gebruiker blokkeren."
 
 #. TRANS: Server error displayed when blocking a user fails.
 #: actions/block.php:189
@@ -1931,15 +1933,13 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:161
-#, fuzzy
 msgid "Do not delete this application."
-msgstr "Deze applicatie niet verwijderen"
+msgstr "Deze applicatie niet verwijderen."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:167
-#, fuzzy
 msgid "Delete this application."
-msgstr "Deze applicatie verwijderen"
+msgstr "Deze applicatie verwijderen."
 
 #. TRANS: Client error when trying to delete group while not logged in.
 #: actions/deletegroup.php:64
@@ -1993,28 +1993,28 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-#, fuzzy
 msgid "Do not delete this group."
-msgstr "Verwijder deze groep niet"
+msgstr "Deze groep niet verwijderen."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-#, fuzzy
 msgid "Delete this group."
-msgstr "Groep verwijderen"
+msgstr "Deze groep verwijderen."
 
 #. 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: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/nudge.php:63 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
@@ -2043,15 +2043,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."
-msgstr "Deze mededeling niet verwijderen"
+msgstr "Deze mededeling niet verwijderen."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
 #: actions/deletenotice.php:166
-#, fuzzy
 msgid "Delete this notice."
-msgstr "Deze mededeling verwijderen"
+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
@@ -2086,15 +2084,13 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/deleteuser.php:158
-#, fuzzy
 msgid "Do not delete this user."
-msgstr "Deze gebruiker niet verwijderen"
+msgstr "Deze gebruiker niet verwijderen."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
 #: actions/deleteuser.php:165
-#, fuzzy
 msgid "Delete this user."
-msgstr "Gebruiker verwijderen"
+msgstr "Deze gebruiker verwijderen."
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
@@ -2258,21 +2254,18 @@ msgstr "Standaardinstellingen gebruiken"
 
 #. TRANS: Title for button for resetting theme settings.
 #: actions/designadminpanel.php:720
-#, fuzzy
 msgid "Restore default designs."
-msgstr "Standaardontwerp toepassen"
+msgstr "Het standaardontwerp toepassen."
 
 #. TRANS: Title for button for resetting theme settings.
 #: actions/designadminpanel.php:728
-#, fuzzy
 msgid "Reset back to default."
-msgstr "Standaardinstellingen toepassen"
+msgstr "De standaardinstellingen toepassen."
 
 #. TRANS: Title for button for saving theme settings.
 #: actions/designadminpanel.php:736
-#, fuzzy
 msgid "Save design."
-msgstr "Ontwerp opslaan"
+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
@@ -2685,9 +2678,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"
+msgstr "Van uw favorietenlijst verwijderen."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2932,15 +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."
-msgstr "Deze gebruiker niet de toegang tot deze groep ontzeggen"
+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."
-msgstr "Deze gebruiker de toegang tot deze groep ontzeggen"
+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
@@ -2950,6 +2940,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."
@@ -3138,8 +3129,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."
 
@@ -3176,6 +3169,7 @@ 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."
@@ -3683,6 +3677,7 @@ 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
 msgid "Already logged in."
 msgstr "U bent al aangemeld."
@@ -3691,7 +3686,8 @@ msgstr "U bent al aangemeld."
 msgid "Incorrect username or password."
 msgstr "De gebruikersnaam of wachtwoord is onjuist."
 
-#: actions/login.php:148 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:148 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 "
@@ -3854,7 +3850,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 "
@@ -3863,16 +3861,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%%%%?"
@@ -3881,7 +3884,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 "
@@ -3891,14 +3896,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
-#, 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
+#, fuzzy, 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
@@ -3994,14 +4002,14 @@ msgstr ""
 "met deze Statusnetsite."
 
 #: actions/oembed.php:64
-#, fuzzy, php-format
+#, php-format
 msgid "\"%s\" not found."
-msgstr "De pagina is niet aangetroffen."
+msgstr "\"%s\" is niet aangetroffen."
 
 #: actions/oembed.php:76
-#, fuzzy, php-format
+#, php-format
 msgid "Notice %s not found."
-msgstr "De bovenliggende mededeling is niet aangetroffen."
+msgstr "Opmerking \"%s\" is niet gevonden."
 
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
@@ -4013,14 +4021,14 @@ msgid "%1$s's status on %2$s"
 msgstr "Status van %1$s op %2$s"
 
 #: actions/oembed.php:95
-#, fuzzy, php-format
+#, php-format
 msgid "Attachment %s not found."
-msgstr "De ontvanger is niet aangetroffen."
+msgstr "De bijlage %s is niet gevonden."
 
 #: actions/oembed.php:136
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
-msgstr ""
+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
@@ -4040,11 +4048,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Mededeling zoeken"
 
@@ -4091,23 +4100,28 @@ 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)."
 
-#: 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."
 
@@ -4460,7 +4474,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. "
@@ -4470,7 +4486,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"
 
@@ -4591,13 +4608,12 @@ 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."
 msgstr ""
 "Eigen labels (letter, getallen, -, ., en _). Gescheiden door komma's of "
-"spaties"
+"spaties."
 
 #. TRANS: Dropdownlist label in form for profile settings.
 #: actions/profilesettings.php:169
@@ -4606,9 +4622,8 @@ msgstr "Taal"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-#, fuzzy
 msgid "Preferred language."
-msgstr "Voorkeurstaal"
+msgstr "Uw voorkeurstaal."
 
 #. TRANS: Dropdownlist label in form for profile settings.
 #: actions/profilesettings.php:181
@@ -4622,12 +4637,11 @@ 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)."
 msgstr ""
 "Automatisch abonneren bij abonnement op mij (beste voor automatische "
-"processen)"
+"processen)."
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
@@ -4652,9 +4666,9 @@ 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
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid tag: \"%s\"."
-msgstr "Ongeldig label: '%s'"
+msgstr "Ongeldig label: \"%s\"."
 
 #. TRANS: Server error thrown when user profile settings could not be updated to
 #. TRANS: automatically subscribe to any subscriber.
@@ -4761,6 +4775,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
+#, 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"
@@ -4901,9 +4921,8 @@ msgstr "Wachtwoordherstel aangevraagd"
 
 #. TRANS: Title for password recovery page in password saved mode.
 #: actions/recoverpassword.php:229
-#, fuzzy
 msgid "Password saved"
-msgstr "Het wachtwoord is opgeslagen."
+msgstr "Het wachtwoord is opgeslagen"
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
@@ -4999,9 +5018,8 @@ msgid "Registration not allowed."
 msgstr "Registratie is niet toegestaan."
 
 #: actions/register.php:201
-#, fuzzy
 msgid "You cannot register if you don't agree to the license."
-msgstr "U kunt zich niet registreren als u niet met de licentie akkoord gaat."
+msgstr "U kunt zich niet registreren als u niet akkoord gaat met de licentie."
 
 #: actions/register.php:210
 msgid "Email address already exists."
@@ -5012,13 +5030,12 @@ msgid "Invalid username or password."
 msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
 #: actions/register.php:340
-#, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "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. "
+"mededelingen uitsturen en contact maken met vrienden en collega's."
 
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:431 actions/register.php:435
@@ -5027,19 +5044,16 @@ msgid "Email"
 msgstr "E-mail"
 
 #: actions/register.php:432 actions/register.php:436
-#, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
-msgstr "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel"
+msgstr "Alleen gebruikt voor updates, aankondigingen en wachtwoordherstel."
 
 #: actions/register.php:443
-#, fuzzy
 msgid "Longer name, preferably your \"real\" name."
-msgstr "Een langere naam, mogelijk uw echte naam"
+msgstr "Een langere naam, mogelijk uw echte naam."
 
 #: actions/register.php:471
-#, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Waar u bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\""
+msgstr "Waar u bent, bijvoorbeeld \"woonplaats, land\" of \"postcode, land\"."
 
 #: actions/register.php:510
 #, php-format
@@ -5140,18 +5154,16 @@ msgid "User nickname"
 msgstr "Gebruikersnaam"
 
 #: actions/remotesubscribe.php:129
-#, fuzzy
 msgid "Nickname of the user you want to follow."
-msgstr "De gebruikersnaam van de gebruiker die u wilt volgen"
+msgstr "Gebruikersnaam van de gebruiker waarop u wilt abonneren."
 
 #: actions/remotesubscribe.php:132
 msgid "Profile URL"
 msgstr "Profiel-URL"
 
 #: actions/remotesubscribe.php:133
-#, fuzzy
 msgid "URL of your profile on another compatible microblogging service."
-msgstr "De URL van uw profiel bij een andere, compatibele microblogdienst"
+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
@@ -5160,9 +5172,8 @@ msgid "Subscribe"
 msgstr "Abonneren"
 
 #: actions/remotesubscribe.php:158
-#, fuzzy
 msgid "Invalid profile URL (bad format)."
-msgstr "Ongeldige profiel-URL (foutieve opmaak)"
+msgstr "Ongeldige profiel-URL (foutieve opmaak)."
 
 #: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
@@ -5202,6 +5213,7 @@ 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
@@ -5256,9 +5268,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
-#, 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
+#, fuzzy, 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.
@@ -6000,9 +6014,8 @@ msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
-#, fuzzy
 msgid "Save site notice."
-msgstr "Websitebrede mededeling opslaan"
+msgstr "Websitebrede mededeling opslaan."
 
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:57
@@ -6059,9 +6072,8 @@ 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."
-msgstr "Telefoonnummer zonder spaties of leestekens, met netnummer"
+msgstr "Telefoonnummer zonder spaties of leestekens, met netnummer."
 
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:191
@@ -6229,17 +6241,21 @@ 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."
 
-#: 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"
 
@@ -6440,6 +6456,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."
@@ -6492,7 +6509,7 @@ 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
+#, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Ongeldig standaardabonnement: \"%1$s\" is geen gebruiker."
 
@@ -6553,9 +6570,8 @@ 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."
-msgstr "Gebruikersinstellingen opslaan"
+msgstr "Gebruikersinstellingen opslaan."
 
 #. TRANS: Page title.
 #: actions/userauthorization.php:109
@@ -6564,7 +6580,6 @@ msgstr "Abonneren"
 
 #. 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, "
@@ -6584,29 +6599,25 @@ msgstr "Licentie"
 
 #. TRANS: Button text on Authorise Subscription page.
 #: actions/userauthorization.php:229
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Aanvaarden"
 
 #. TRANS: Title for button on Authorise Subscription page.
 #: actions/userauthorization.php:231
-#, fuzzy
 msgid "Subscribe to this user."
-msgstr "Abonneren op deze gebruiker"
+msgstr "Abonneren op deze gebruiker."
 
 #. TRANS: Button text on Authorise Subscription page.
 #: actions/userauthorization.php:233
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Afwijzen"
 
 #. TRANS: Title for button on Authorise Subscription page.
 #: actions/userauthorization.php:235
-#, fuzzy
 msgid "Reject this subscription."
-msgstr "Dit abonnement weigeren"
+msgstr "Dit abonnement weigeren."
 
 #. TRANS: Client error displayed for an empty authorisation request.
 #: actions/userauthorization.php:248
@@ -6646,35 +6657,35 @@ msgstr ""
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
 #: actions/userauthorization.php:325
-#, fuzzy, php-format
+#, 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
-#, fuzzy, php-format
+#, php-format
 msgid "Listenee URI \"%s\" is too long."
-msgstr "De URI \"%s\" voor de stream is te lang."
+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
-#, fuzzy, php-format
+#, php-format
 msgid "Listenee URI \"%s\" is a local user."
-msgstr "de URI \"%s\" voor de stream is een lokale gebruiker."
+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
-#, fuzzy, php-format
+#, php-format
 msgid "Profile URL \"%s\" is for a local user."
-msgstr "De profiel-URL ‘%s’ is van een lokale gebruiker."
+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
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
 "\"."
@@ -6685,21 +6696,21 @@ msgstr ""
 #. 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
+#, 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
-#, fuzzy, php-format
+#, 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:392
-#, fuzzy, php-format
+#, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
 msgstr "Er staat een verkeerd afbeeldingsttype op de avatar-URL \"%s\"."
 
@@ -7048,7 +7059,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:771
+#: classes/Profile.php:775
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7057,7 +7068,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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7713,19 +7724,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 ""
+
 #. 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."
 
@@ -9797,18 +9812,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9816,12 +9836,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9829,12 +9849,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9842,12 +9862,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9855,7 +9875,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:1340
 msgid "about a year ago"
 msgstr "ongeveer een jaar geleden"
 
@@ -9901,15 +9921,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 "6 or more characters"
-#~ msgstr "Zes of meer tekens"
-
-#~ msgid "Same as password above"
-#~ msgstr "Gelijk aan het wachtwoord hierboven"
-
-#~ msgid "Can't save new password."
-#~ msgstr "Het was niet mogelijk het nieuwe wachtwoord op te slaan."
-
-#~ msgid "URL of your homepage, blog, or profile on another site"
-#~ msgstr "De URL van uw thuispagina, blog of profiel bij een andere website"
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index e056304c47..0329f9d044 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:35+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:37:23+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 (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -159,10 +163,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -825,6 +829,7 @@ 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
@@ -837,7 +842,7 @@ msgstr "Du tingar ikkje oppdateringar til den profilen."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1162,13 +1167,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!"
@@ -1272,9 +1278,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."
@@ -2016,13 +2023,15 @@ 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/nudge.php:63 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
@@ -2978,6 +2987,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"
@@ -3161,8 +3171,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"
 
@@ -3196,6 +3208,7 @@ 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."
@@ -3705,6 +3718,7 @@ 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
 msgid "Already logged in."
 msgstr "Allereie logga inn."
@@ -3713,7 +3727,8 @@ msgstr "Allereie logga inn."
 msgid "Incorrect username or password."
 msgstr "Feil brukarnamn eller passord."
 
-#: actions/login.php:148 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:148 actions/otp.php:127
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Ikkje autorisert."
@@ -3886,7 +3901,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 "
@@ -3895,37 +3912,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
-#, 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
+#, 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
@@ -4061,11 +4088,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Notissøk"
 
@@ -4114,26 +4142,31 @@ msgstr ""
 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 "
@@ -4509,7 +4542,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. "
@@ -4518,7 +4553,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"
 
@@ -4806,6 +4842,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"
@@ -5248,6 +5290,7 @@ 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
@@ -5296,9 +5339,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.
@@ -6248,16 +6293,20 @@ 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 ""
 
-#: 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"
 
@@ -6449,6 +6498,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."
@@ -7043,14 +7093,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:771
+#: classes/Profile.php:775
 #, 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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7726,19 +7776,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 ""
 
@@ -9705,18 +9759,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9724,12 +9783,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9737,12 +9796,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9750,12 +9809,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9763,7 +9822,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:1340
 msgid "about a year ago"
 msgstr "omtrent eitt år sidan"
 
@@ -9805,16 +9864,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "6 or more characters"
-#~ msgstr "6 eller fleire teikn"
-
-#~ msgid "Same as password above"
-#~ msgstr "Samme passord som over"
-
-#~ msgid "Can't save new password."
-#~ msgstr "Klarar ikkje lagra nytt passord."
-
-#~ 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."
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index f857b5d746..d69609d4f4 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:38+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:37:28+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 (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -154,10 +158,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -823,6 +827,7 @@ 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
@@ -835,7 +840,7 @@ msgstr "Token żądania został już upoważniony."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1162,13 +1167,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."
@@ -1270,9 +1276,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."
 
@@ -1995,13 +2002,15 @@ 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/nudge.php:63 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
@@ -2927,6 +2936,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."
@@ -3111,8 +3121,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."
 
@@ -3149,6 +3161,7 @@ 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."
@@ -3665,6 +3678,7 @@ 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
 msgid "Already logged in."
 msgstr "Jesteś już zalogowany."
@@ -3673,7 +3687,8 @@ msgstr "Jesteś już zalogowany."
 msgid "Incorrect username or password."
 msgstr "Niepoprawna nazwa użytkownika lub hasło."
 
-#: actions/login.php:148 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:148 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Błąd podczas ustawiania użytkownika. Prawdopodobnie brak upoważnienia."
 
@@ -3836,7 +3851,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 "
@@ -3845,16 +3862,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%%%%?"
@@ -3863,7 +3885,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 "
@@ -3873,14 +3897,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
-#, 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
+#, 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
@@ -4017,11 +4044,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Wyszukiwanie wpisów"
 
@@ -4068,23 +4096,28 @@ 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)."
 
-#: 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ł."
 
@@ -4439,7 +4472,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. "
@@ -4449,7 +4484,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"
 
@@ -4736,6 +4772,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"
@@ -5171,6 +5213,7 @@ 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
@@ -5225,9 +5268,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
-#, 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
+#, 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.
@@ -6186,17 +6231,21 @@ 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."
 
-#: 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"
 
@@ -6396,6 +6445,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."
@@ -7005,14 +7055,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:771
+#: classes/Profile.php:775
 #, 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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7663,19 +7713,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ć."
 
@@ -9749,18 +9803,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9769,12 +9828,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9783,12 +9842,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9797,12 +9856,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9811,7 +9870,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:1340
 msgid "about a year ago"
 msgstr "około rok temu"
 
@@ -9856,15 +9915,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\"."
-
-#~ msgid "6 or more characters"
-#~ msgstr "6 lub więcej znaków"
-
-#~ msgid "Same as password above"
-#~ msgstr "Takie samo jak powyższe hasło"
-
-#~ msgid "Can't save new password."
-#~ msgstr "Nie można zapisać nowego hasła."
-
-#~ msgid "URL of your homepage, blog, or profile on another site"
-#~ msgstr "Adres URL strony domowej, bloga lub profilu na innej witrynie"
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 03e225030f..7cd89e3ed8 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:39+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:37:31+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 (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -137,7 +137,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
@@ -155,10 +159,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -824,6 +828,7 @@ 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
@@ -836,7 +841,7 @@ msgstr "Não tem autorização."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1163,13 +1168,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!"
@@ -1274,9 +1280,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."
 
@@ -2018,13 +2025,15 @@ 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/nudge.php:63 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
@@ -2965,6 +2974,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."
@@ -3153,8 +3163,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."
 
@@ -3191,6 +3203,7 @@ 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."
@@ -3706,6 +3719,7 @@ 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
 msgid "Already logged in."
 msgstr "Sessão já foi iniciada."
@@ -3714,7 +3728,8 @@ msgstr "Sessão já foi iniciada."
 msgid "Incorrect username or password."
 msgstr "Nome de utilizador ou senha incorrectos."
 
-#: actions/login.php:148 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:148 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Erro ao preparar o utilizador. Provavelmente não está autorizado."
 
@@ -3878,7 +3893,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 "
@@ -3887,16 +3904,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%%%%?"
@@ -3905,7 +3927,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 "
@@ -3914,14 +3938,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
-#, 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
+#, 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
@@ -4055,11 +4082,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Pesquisa de Notas"
 
@@ -4107,23 +4135,28 @@ 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)"
 
-#: 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."
 
@@ -4498,7 +4531,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. "
@@ -4508,7 +4543,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"
 
@@ -4800,6 +4836,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"
@@ -5249,6 +5291,7 @@ 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
@@ -5302,9 +5345,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
-#, 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
+#, 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.
@@ -6269,15 +6314,19 @@ 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."
 
-#: 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"
 
@@ -6477,6 +6526,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."
@@ -7079,7 +7129,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:771
+#: classes/Profile.php:775
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7087,7 +7137,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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7740,19 +7790,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."
 
@@ -9825,18 +9879,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9844,12 +9903,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9857,12 +9916,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9870,12 +9929,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9883,7 +9942,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:1340
 msgid "about a year ago"
 msgstr "há cerca de um ano"
 
@@ -9925,15 +9984,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "6 or more characters"
-#~ msgstr "6 ou mais caracteres"
-
-#~ msgid "Same as password above"
-#~ msgstr "Repita a senha nova"
-
-#~ msgid "Can't save new password."
-#~ msgstr "Não é possível guardar a nova senha."
-
-#~ 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"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 775137fb08..50c2733981 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:41+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:37:34+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 (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -156,10 +160,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -823,6 +827,7 @@ 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
@@ -835,7 +840,7 @@ msgstr "O token solicitado já foi autorizado."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1159,13 +1164,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!"
@@ -1267,9 +1273,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."
 
@@ -2004,13 +2011,15 @@ 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/nudge.php:63 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
@@ -2949,6 +2958,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."
@@ -3137,8 +3147,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."
 
@@ -3175,6 +3187,7 @@ 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."
@@ -3693,6 +3706,7 @@ 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
 msgid "Already logged in."
 msgstr "Já está autenticado."
@@ -3701,7 +3715,8 @@ msgstr "Já está autenticado."
 msgid "Incorrect username or password."
 msgstr "Nome de usuário e/ou senha incorreto(s)."
 
-#: actions/login.php:148 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:148 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."
@@ -3870,7 +3885,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 "
@@ -3879,16 +3896,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%%%%?"
@@ -3897,7 +3919,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 "
@@ -3907,14 +3931,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
-#, 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
+#, 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
@@ -4050,11 +4077,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Procurar mensagens"
 
@@ -4101,23 +4129,28 @@ 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)."
 
-#: 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."
 
@@ -4476,7 +4509,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. "
@@ -4485,7 +4520,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"
 
@@ -4774,6 +4810,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"
@@ -5221,6 +5263,7 @@ 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
@@ -5275,9 +5318,11 @@ msgstr ""
 "Seja o primeiro a [publicar sobre este tópico](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#: actions/repliesrss.php:72
-#, 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
+#, 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.
@@ -6239,15 +6284,19 @@ 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."
 
-#: 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"
 
@@ -6446,6 +6495,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."
@@ -7046,14 +7096,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:771
+#: classes/Profile.php:775
 #, 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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7704,19 +7754,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."
 
@@ -9802,18 +9856,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9821,12 +9880,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9834,12 +9893,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9847,12 +9906,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9860,7 +9919,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:1340
 msgid "about a year ago"
 msgstr "cerca de 1 ano atrás"
 
@@ -9904,15 +9963,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "6 or more characters"
-#~ msgstr "No mínimo 6 caracteres"
-
-#~ msgid "Same as password above"
-#~ msgstr "Igual à senha acima"
-
-#~ msgid "Can't save new password."
-#~ msgstr "Não é possível salvar a nova senha."
-
-#~ msgid "URL of your homepage, blog, or profile on another site"
-#~ msgstr "URL do seu site, blog ou perfil em outro site"
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 7fb26f6dfd..8530c5e105 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:42+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:37:36+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 (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -160,10 +164,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -829,6 +833,7 @@ 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
@@ -841,7 +846,7 @@ msgstr "Ключ запроса уже авторизован."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1166,13 +1171,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 от всех!"
@@ -1274,9 +1280,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 "Нет такого профиля."
 
@@ -2007,13 +2014,15 @@ 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/nudge.php:63 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
@@ -2954,6 +2963,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."
@@ -3142,8 +3152,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 "Нет результатов."
 
@@ -3180,6 +3192,7 @@ 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 "Ошибка при удалении данного блока."
@@ -3700,6 +3713,7 @@ 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
 msgid "Already logged in."
 msgstr "Вы уже авторизовались."
@@ -3708,7 +3722,8 @@ msgstr "Вы уже авторизовались."
 msgid "Incorrect username or password."
 msgstr "Некорректное имя или пароль."
 
-#: actions/login.php:148 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:148 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Ошибка установки пользователя. Вы, вероятно, не авторизованы."
 
@@ -3872,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 "
@@ -3881,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%%%%?"
@@ -3899,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 "
@@ -3908,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
-#, 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
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Все обновления, соответствующие поисковому запросу «%s»"
 
 #: actions/nudge.php:85
@@ -4051,11 +4078,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Поиск в записях"
 
@@ -4102,23 +4130,28 @@ msgstr "Показать или скрыть оформления профиля
 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 "Срок действия ключа для входа истёк."
 
@@ -4476,7 +4509,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. "
@@ -4485,7 +4520,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 "Поиск людей"
 
@@ -4775,6 +4811,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"
@@ -5215,6 +5257,7 @@ 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
@@ -5269,9 +5312,11 @@ msgstr ""
 "Вы можете попробовать «[подтолкнуть %1$s](../%2$s)» или [написать им что-"
 "нибудь](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#: actions/repliesrss.php:72
-#, 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
+#, 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.
@@ -6234,17 +6279,21 @@ 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-запросы."
 
-#: 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 "Подписано"
 
@@ -6444,6 +6493,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 "Вы не заблокировали этого пользователя."
@@ -7044,7 +7094,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:771
+#: classes/Profile.php:775
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -7053,7 +7103,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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7703,19 +7753,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 "Не удаётся произвести аутентификацию."
 
@@ -9797,18 +9851,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9817,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:1316
+#: lib/util.php:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9831,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:1323
+#: lib/util.php:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9845,12 +9904,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9859,7 +9918,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:1340
 msgid "about a year ago"
 msgstr "около года назад"
 
@@ -9908,15 +9967,3 @@ msgstr "Неверный XML, отсутствует корень XRD."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Получение резервной копии из файла «%s»."
-
-#~ msgid "6 or more characters"
-#~ msgstr "6 или больше знаков"
-
-#~ msgid "Same as password above"
-#~ msgstr "Тот же пароль, что и выше"
-
-#~ msgid "Can't save new password."
-#~ msgstr "Не удаётся сохранить новый пароль."
-
-#~ msgid "URL of your homepage, blog, or profile on another site"
-#~ msgstr "Адрес твоей страницы, дневника или профиля на другом портале"
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index e5a81630d6..69aa295e1c 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-17 10:25+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+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,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
@@ -145,10 +149,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -791,6 +795,7 @@ 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
@@ -803,7 +808,7 @@ msgstr ""
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1115,13 +1120,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 ""
@@ -1223,9 +1229,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 ""
 
@@ -1922,13 +1929,15 @@ 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/nudge.php:63 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
@@ -2822,6 +2831,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,8 +3007,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 ""
 
@@ -3031,6 +3043,7 @@ 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 ""
@@ -3488,6 +3501,7 @@ 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
 msgid "Already logged in."
 msgstr ""
@@ -3496,7 +3510,8 @@ msgstr ""
 msgid "Incorrect username or password."
 msgstr ""
 
-#: actions/login.php:148 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:148 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
@@ -3653,44 +3668,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
@@ -3821,11 +3848,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr ""
 
@@ -3872,23 +3900,28 @@ msgstr ""
 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 ""
 
@@ -4241,14 +4274,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 ""
 
@@ -4515,6 +4551,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"
@@ -4907,6 +4949,7 @@ 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
@@ -4955,9 +4998,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.
@@ -5863,15 +5908,19 @@ 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 ""
 
-#: 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 ""
 
@@ -6056,6 +6105,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 ""
@@ -6611,14 +6661,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:771
+#: classes/Profile.php:775
 #, 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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7253,19 +7303,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 ""
 
@@ -9143,18 +9197,22 @@ msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1306
-msgid "a few seconds ago"
+#: 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
+msgid "a few seconds ago"
+msgstr ""
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9162,12 +9220,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9175,12 +9233,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9188,12 +9246,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9201,7 +9259,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:1340
 msgid "about a year ago"
 msgstr ""
 
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 3ef9e7fe9b..7db6444adf 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:46+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:37:39+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 (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -135,7 +135,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
@@ -153,10 +157,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -814,6 +818,7 @@ 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
@@ -826,7 +831,7 @@ msgstr "Begäran-token är redan auktoriserad."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1151,13 +1156,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!"
@@ -1260,9 +1266,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."
 
@@ -1998,13 +2005,15 @@ 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/nudge.php:63 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
@@ -2936,6 +2945,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."
@@ -3124,8 +3134,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."
 
@@ -3162,6 +3174,7 @@ 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."
@@ -3676,6 +3689,7 @@ 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
 msgid "Already logged in."
 msgstr "Redan inloggad."
@@ -3684,7 +3698,8 @@ msgstr "Redan inloggad."
 msgid "Incorrect username or password."
 msgstr "Felaktigt användarnamn eller lösenord."
 
-#: actions/login.php:148 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:148 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."
 
@@ -3849,7 +3864,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 "
@@ -3858,16 +3875,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%%%%?"
@@ -3876,7 +3898,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 "
@@ -3885,14 +3909,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
-#, 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
+#, 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
@@ -4026,11 +4053,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Notissökning"
 
@@ -4078,23 +4106,28 @@ 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)."
 
-#: 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."
 
@@ -4461,7 +4494,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. "
@@ -4470,7 +4505,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"
 
@@ -4763,6 +4799,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"
@@ -5206,6 +5248,7 @@ 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
@@ -5258,9 +5301,11 @@ msgstr ""
 "Var den första att [skriva i detta ämne](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
-#: actions/repliesrss.php:72
-#, 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
+#, 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.
@@ -6219,15 +6264,19 @@ 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."
 
-#: 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"
 
@@ -6428,6 +6477,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."
@@ -7031,14 +7081,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:771
+#: classes/Profile.php:775
 #, 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:780
+#: classes/Profile.php:784
 #, 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."
@@ -7683,19 +7733,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 ""
 
@@ -9756,18 +9810,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9775,12 +9834,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9788,12 +9847,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9801,12 +9860,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9814,7 +9873,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:1340
 msgid "about a year ago"
 msgstr "för ett år sedan"
 
@@ -9856,15 +9915,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "6 or more characters"
-#~ msgstr "Minst 6 tecken"
-
-#~ msgid "Same as password above"
-#~ msgstr "Samma som lösenordet ovan"
-
-#~ msgid "Can't save new password."
-#~ msgstr "Kan inte spara nytt lösenord."
-
-#~ msgid "URL of your homepage, blog, or profile on another site"
-#~ msgstr "URL till din hemsida, blogg eller profil på en annan webbplats."
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 39eff5867e..2ea0fd8dd2 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:47+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10: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-Generator: MediaWiki 1.18alpha (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -150,10 +154,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -215,23 +219,25 @@ 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
+#, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
-"[ఈ విషయంపై](%%%%action.newnotice%%%%?status_textarea=%s) వ్రాసే మొదటివారు మీరే అవ్వండి!"
+"ప్రొఫైలు ద్వారా [%1$sని కదిపి](../%2$s) చూడండి లేదా [వారికి ఏదైనా వ్రాయండి](%%%%action.newnotice%"
+"%%%?status_textarea=%3$s)."
 
 #. TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
 #. 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
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 "post a notice to them."
-msgstr "[ఒక ఖాతాని నమోదుచేసుకుని](%%action.register%%) మీరే మొదట వ్రాసేవారు ఎందుకు కాకూడదు!"
+msgstr ""
+"[ఒక ఖాతాని నమోదుచేసుకుని](%%%%action.register%%%%) %sని కదపండి లేదా వారికి ఒక టపాని పంపించండి!"
 
 #. TRANS: H1 text for page when viewing a list for self.
 #: actions/all.php:188
@@ -286,9 +292,8 @@ msgstr "%2$sలో %1$s మరియు స్నేహితుల నుండ
 #: actions/apitimelineretweetedtome.php:118
 #: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
 #: actions/apitimelineuser.php:206 actions/apiusershow.php:100
-#, fuzzy
 msgid "API method not found."
-msgstr "నిర్ధారణ సంకేతం కనబడలేదు."
+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.
@@ -404,7 +409,6 @@ msgstr "వాడుకరిని తాజాకరించలేకున
 
 #. TRANS: Title for Atom feed.
 #: actions/apiatomservice.php:85
-#, fuzzy
 msgctxt "ATOM"
 msgid "Main"
 msgstr "ప్రధాన"
@@ -508,16 +512,14 @@ 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."
-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.
@@ -627,9 +629,8 @@ msgstr "హోమ్ పేజీ URL సరైనది కాదు."
 #: actions/apigroupcreate.php:191 actions/editgroup.php:206
 #: actions/newgroup.php:152 actions/profilesettings.php:252
 #: actions/register.php:218
-#, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
-msgstr "పూర్తి పేరు చాలా పెద్దగా ఉంది (గరిష్ఠంగా 255 అక్షరాలు)."
+msgstr "పూర్తి పేరు చాలా పెద్దగా ఉంది (గరిష్ఠం 255 అక్షరాలు)."
 
 #. TRANS: Client error shown when providing too long a description during group creation.
 #. TRANS: %d is the maximum number of allowed characters.
@@ -809,6 +810,7 @@ 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
@@ -821,7 +823,7 @@ msgstr "మీకు అధీకరణ లేదు."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1060,9 +1062,9 @@ 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
@@ -1138,13 +1140,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 తాజాకరణలు!"
@@ -1183,9 +1186,8 @@ msgstr "%2$sలో %1$s అనే ట్యాగుతో ఉన్న నో
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
 #: actions/apitimelineuser.php:297
-#, fuzzy
 msgid "Only the user can add to their own timeline."
-msgstr "ఎవరి తపాలాపెట్టెలను ఆ వాడుకరి మాత్రమే చదవలగరు."
+msgstr "ఆ వాడుకరి మాత్రమే వారి కాలరేఖలో చేర్చగలరు."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #: actions/apitimelineuser.php:304
@@ -1248,9 +1250,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 "అటువంటి ఫైలు లేదు."
@@ -1328,9 +1331,8 @@ msgstr "తెలియని చర్య"
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
 #: actions/atompubmembershipfeed.php:267
-#, fuzzy
 msgid "Already a member."
-msgstr "అందరు సభ్యులూ"
+msgstr "ఇప్పటికే సభ్యులు."
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
 #: actions/atompubmembershipfeed.php:275
@@ -1451,9 +1453,9 @@ 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
+#, php-format
 msgid "Already subscribed to %s."
-msgstr "ఇప్పటికే చందాచేరారు!"
+msgstr "ఇప్పటికే %sకి చందాచేరారు."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 #: actions/attachment.php:73
@@ -1684,9 +1686,8 @@ 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
@@ -1802,9 +1803,8 @@ 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 "మీరు వాడుకరులని తొలగించలేరు."
+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
@@ -1816,13 +1816,12 @@ msgstr ""
 #: actions/deleteaccount.php:164
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
-msgstr ""
+msgstr "మీరు పెట్టెలో తప్పనిసరిగా \"%s\" అని వ్రాయాలి."
 
 #. 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.
@@ -1985,13 +1984,15 @@ 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/nudge.php:63 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
@@ -2061,15 +2062,13 @@ 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.
 #. TRANS: Link description in user account settings menu.
@@ -2522,13 +2521,12 @@ msgstr "ఈమెయిలు అభిరుచులు"
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:212
 msgid "Send me notices of new subscriptions through email."
-msgstr ""
+msgstr "కొత్త చందాదార్లు చేరినప్పుడు నాకు ఈమెయిలు ద్వారా తెలియజేయి."
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:218
-#, fuzzy
 msgid "Send me email when someone adds my notice as a favorite."
-msgstr "%s (@%s) మీ నోటీసుని ఇష్టపడ్డారు"
+msgstr "ఎవరైనా నా నోటీసుని ఇష్టాంశంగా చేర్చుకున్నపుడు నాకు ఈమెయిలు పంపించు."
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:225
@@ -2538,7 +2536,7 @@ msgstr "ఎవరైనా నాకు అంతరంగిక సందేశ
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:231
 msgid "Send me email when someone sends me an \"@-reply\"."
-msgstr ""
+msgstr "ఎవరైనా నాకు \"@-స్పందన\"ని పంపినప్పుడు నాకు ఈమెయిలును పంపించు."
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:237
@@ -2649,7 +2647,6 @@ msgstr "ఈమెయిలు చిరునామా లేదు."
 #. 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
-#, fuzzy
 msgid "Could not update user record."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
 
@@ -2918,9 +2915,8 @@ 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 "ఈ గుంపునుండి ఈ వాడుకరిని నిరోధించు"
+msgstr "ఈ వాడుకరిని ఈ గుంపునుండి నిరోధించండి."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
 #: actions/groupblock.php:215
@@ -2929,6 +2925,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 "ఐడీ లేదు."
@@ -3061,7 +3058,6 @@ msgstr "%2$sలో %1$s మరియు స్నేహితుల నుండ
 
 #. TRANS: Title for first page of the groups list.
 #: actions/groups.php:62
-#, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "గుంపులు"
@@ -3069,10 +3065,10 @@ 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
+#, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
-msgstr "గుంపులు, పేజీ %d"
+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.
@@ -3112,8 +3108,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,6 +3147,7 @@ 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 "నిరోధాన్ని తొలగించడంలో పొరపాటు."
@@ -3593,7 +3592,7 @@ msgstr "రకం"
 
 #: actions/licenseadminpanel.php:247
 msgid "Select license"
-msgstr ""
+msgstr "లైసెన్సును ఎంచుకోండి"
 
 #: actions/licenseadminpanel.php:261
 msgid "License details"
@@ -3642,6 +3641,7 @@ 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
 msgid "Already logged in."
 msgstr "ఇప్పటికే లోనికి ప్రవేశించారు."
@@ -3650,7 +3650,8 @@ msgstr "ఇప్పటికే లోనికి ప్రవేశించ
 msgid "Incorrect username or password."
 msgstr "వాడుకరిపేరు లేదా సంకేతపదం తప్పు."
 
-#: actions/login.php:148 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:148 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "వాడుకరిని అమర్చడంలో పొరపాటు. బహుశా మీకు అధీకరణ లేకపోవచ్చు."
 
@@ -3811,7 +3812,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 "
@@ -3820,16 +3823,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%%%%?"
@@ -3837,7 +3845,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 "
@@ -3846,14 +3856,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
-#, 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
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "%2$sలో %1$s అనే ట్యాగుతో ఉన్న నోటీసులు!"
 
 #: actions/nudge.php:85
@@ -3986,11 +3999,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "నోటీసుల అన్వేషణ"
 
@@ -4039,25 +4053,30 @@ msgstr "ఫ్రొఫైలు రూపురేఖలు"
 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 "సైటు లోనికి ప్రవేశించు"
@@ -4103,9 +4122,8 @@ msgid "New password"
 msgstr "కొత్త సంకేతపదం"
 
 #: actions/passwordsettings.php:109 actions/register.php:423
-#, fuzzy
 msgid "6 or more characters."
-msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు"
+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
@@ -4430,7 +4448,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. "
@@ -4439,7 +4459,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 "వ్యక్తుల అన్వేషణ"
 
@@ -4572,9 +4593,8 @@ msgstr "భాష"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-#, fuzzy
 msgid "Preferred language."
-msgstr "ప్రాథాన్యతా భాష"
+msgstr "ప్రాధాన్యతా భాష."
 
 #. TRANS: Dropdownlist label in form for profile settings.
 #: actions/profilesettings.php:181
@@ -4725,6 +4745,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"
@@ -5158,6 +5184,7 @@ 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
@@ -5209,9 +5236,11 @@ msgid ""
 msgstr ""
 "[ఈ విషయంపై](%%%%action.newnotice%%%%?status_textarea=%s) వ్రాసే మొదటివారు మీరే అవ్వండి!"
 
-#: actions/repliesrss.php:72
-#, 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
+#, 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.
@@ -6171,15 +6200,19 @@ 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 ""
 
-#: 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 "చందాచేరారు"
 
@@ -6370,6 +6403,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 "మీరు ఆ వాడుకరిని నిరోధించలేదు."
@@ -6511,29 +6545,25 @@ msgstr "లైసెన్సు"
 
 #. TRANS: Button text on Authorise Subscription page.
 #: actions/userauthorization.php:229
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "అంగీకరించు"
 
 #. TRANS: Title for button on Authorise Subscription page.
 #: actions/userauthorization.php:231
-#, fuzzy
 msgid "Subscribe to this user."
-msgstr "ఈ వాడుకరికి చందాచేరు"
+msgstr "ఈ వాడుకరికి చందాచేరండి."
 
 #. TRANS: Button text on Authorise Subscription page.
 #: actions/userauthorization.php:233
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "తిరస్కరించు"
 
 #. TRANS: Title for button on Authorise Subscription page.
 #: actions/userauthorization.php:235
-#, fuzzy
 msgid "Reject this subscription."
-msgstr "ఈ చందాని తిరస్కరించు"
+msgstr "ఈ చందాని తిరస్కరించండి."
 
 #. TRANS: Client error displayed for an empty authorisation request.
 #: actions/userauthorization.php:248
@@ -6940,14 +6970,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:771
+#: classes/Profile.php:775
 #, 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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7424,9 +7454,8 @@ msgstr "ఏవరికి చందా చేరాలనుకుంటున
 
 #. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
 #: lib/activityimporter.php:132
-#, fuzzy
 msgid "Unknown profile."
-msgstr "తెలియని ఫైలు రకం"
+msgstr "తెలియని ప్రొఫైలు."
 
 #. TRANS: Client exception thrown when trying to import an event not related to the importing user.
 #: lib/activityimporter.php:138
@@ -7597,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 ""
 
@@ -7810,9 +7843,8 @@ 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 "సంకేతపదం మార్పు"
+msgstr "సంకేతపదం మార్పడానికి అనుమతి లేదు."
 
 #. TRANS: Title for the form to block a user.
 #: lib/blockform.php:68
@@ -9634,18 +9666,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9653,12 +9690,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9666,12 +9703,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9679,12 +9716,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9692,7 +9729,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:1340
 msgid "about a year ago"
 msgstr "ఒక సంవత్సరం క్రితం"
 
@@ -9734,15 +9771,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "6 or more characters"
-#~ msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షరాలు"
-
-#~ msgid "Same as password above"
-#~ msgstr "పై సంకేతపదం వలెనే"
-
-#~ msgid "Can't save new password."
-#~ msgstr "కొత్త సంకేతపదాన్ని భద్రపరచలేము."
-
-#~ msgid "URL of your homepage, blog, or profile on another site"
-#~ msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index d4cb84ef60..7445a3cb42 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:48+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:37:44+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 (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -153,10 +157,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -811,6 +815,7 @@ 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
@@ -823,7 +828,7 @@ msgstr "İstek belirteci zaten yetkili."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1147,13 +1152,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 ""
@@ -1257,9 +1263,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."
@@ -2002,13 +2009,15 @@ 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/nudge.php:63 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
@@ -2948,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 "JabberID yok."
@@ -3132,8 +3142,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."
 
@@ -3166,6 +3178,7 @@ 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."
@@ -3643,6 +3656,7 @@ 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
 msgid "Already logged in."
 msgstr "Zaten giriş yapılmış."
@@ -3651,7 +3665,8 @@ msgstr "Zaten giriş yapılmış."
 msgid "Incorrect username or password."
 msgstr "Yanlış kullanıcı adı veya parola."
 
-#: actions/login.php:148 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:148 actions/otp.php:127
 #, fuzzy
 msgid "Error setting user. You are probably not authorized."
 msgstr "Yetkilendirilmemiş."
@@ -3820,7 +3835,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 "
@@ -3829,37 +3846,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
@@ -3990,11 +4017,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Durum Mesajı Arama"
 
@@ -4042,27 +4070,32 @@ msgstr ""
 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 ""
 
@@ -4434,7 +4467,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. "
@@ -4444,7 +4479,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"
 
@@ -4730,6 +4766,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
@@ -5153,6 +5195,7 @@ 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
@@ -5201,9 +5244,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.
@@ -6150,16 +6195,20 @@ 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 ""
 
-#: 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"
@@ -6347,6 +6396,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."
@@ -6927,14 +6977,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:771
+#: classes/Profile.php:775
 #, 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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7587,19 +7637,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 ""
 
@@ -9552,61 +9606,66 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, 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:1319
 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:1323
 #, 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:1326
 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:1330
 #, 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:1333
 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:1337
 #, 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:1340
 msgid "about a year ago"
 msgstr "yaklaşık bir yıl önce"
 
@@ -9647,17 +9706,3 @@ msgstr ""
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr ""
-
-#~ msgid "6 or more characters"
-#~ msgstr "6 veya daha fazla karakter"
-
-#~ msgid "Same as password above"
-#~ msgstr "yukarıdaki parolanın aynısı"
-
-#~ msgid "Can't save new password."
-#~ msgstr "Yeni parola kaydedilemedi."
-
-#~ msgid "URL of your homepage, blog, or profile on another site"
-#~ msgstr ""
-#~ "Web Sitenizin, blogunuzun ya da varsa başka bir sitedeki profilinizin "
-#~ "adresi"
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index edf502beb3..747a4bcbed 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:49+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:37:47+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -155,10 +159,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -522,10 +526,10 @@ 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
@@ -824,6 +828,7 @@ 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
@@ -836,7 +841,7 @@ msgstr "Токен запиту вже авторизовано."
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1056,9 +1061,9 @@ 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
+#, php-format
 msgid "Unsupported format: %s."
-msgstr "Не підтримується формат: %s"
+msgstr "Формат, який не підтримується: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
 #: actions/apistatusesshow.php:155
@@ -1168,13 +1173,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 оновлення від усіх!"
@@ -1276,9 +1282,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 "Немає такого профілю."
 
@@ -1577,9 +1584,8 @@ 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.
@@ -1644,9 +1650,8 @@ msgstr "Резерв. копія"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-#, fuzzy
 msgid "Backup your account."
-msgstr "Резервне копіювання вашого акаунту"
+msgstr "Резервне копіювання вашого облікового запису."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 #: actions/block.php:68
@@ -1686,9 +1691,8 @@ 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.
@@ -1705,9 +1709,8 @@ 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
@@ -1929,15 +1932,13 @@ 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
@@ -1990,28 +1991,28 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-#, fuzzy
 msgid "Do not delete this group."
-msgstr "Не видаляти цю спільноту"
+msgstr "Не видаляти цю спільноту."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-#, 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.
 #. 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/nudge.php:63 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
@@ -2038,15 +2039,13 @@ msgstr "Ви впевненні, що бажаєте видалити цей д
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
-#, fuzzy
 msgid "Do not delete this notice."
-msgstr "Не видаляти цей допис"
+msgstr "Не видаляти цей допис."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
 #: actions/deletenotice.php:166
-#, fuzzy
 msgid "Delete this notice."
-msgstr "Видалити допис"
+msgstr "Видалити допис."
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 #: actions/deleteuser.php:66
@@ -2080,15 +2079,13 @@ 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.
 #. TRANS: Link description in user account settings menu.
@@ -2252,21 +2249,18 @@ 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 "Повернутись до початкових налаштувань"
+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
@@ -2679,9 +2673,8 @@ msgstr "Цей допис вже є обраним!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-#, fuzzy
 msgid "Disfavor favorite."
-msgstr "Видалити з обраних"
+msgstr "Видалити з обраних."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2919,15 +2912,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 "Не блокувати користувача в спільноті"
+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 "Заблокувати користувача в спільноті"
+msgstr "Заблокувати цього користувача у цій спільноті."
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
 #: actions/groupblock.php:215
@@ -2935,6 +2926,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."
@@ -3123,8 +3115,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 "Немає результатів."
 
@@ -3161,6 +3155,7 @@ 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 "Помилка при розблокуванні."
@@ -3673,6 +3668,7 @@ 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
 msgid "Already logged in."
 msgstr "Тепер ви увійшли."
@@ -3681,7 +3677,8 @@ msgstr "Тепер ви увійшли."
 msgid "Incorrect username or password."
 msgstr "Неточне ім’я або пароль."
 
-#: actions/login.php:148 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:148 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "Помилка. Можливо, ви не авторизовані."
 
@@ -3848,7 +3845,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 "
@@ -3857,16 +3856,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%%%%?"
@@ -3875,7 +3879,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 "
@@ -3884,14 +3890,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
-#, 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
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "Всі оновлення за збігом з «%s» на %2$s!"
 
 #: actions/nudge.php:85
@@ -3982,14 +3991,14 @@ msgstr ""
 "користуватися ним на даному сайті StatusNet."
 
 #: actions/oembed.php:64
-#, fuzzy, php-format
+#, php-format
 msgid "\"%s\" not found."
-msgstr "Сторінку не знайдено."
+msgstr "«%s» не знайдено."
 
 #: actions/oembed.php:76
-#, fuzzy, php-format
+#, php-format
 msgid "Notice %s not found."
-msgstr "Початковий допис не знайдено."
+msgstr "Допис %s не знайдено."
 
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
@@ -4001,14 +4010,14 @@ msgid "%1$s's status on %2$s"
 msgstr "%1$s має статус на %2$s"
 
 #: actions/oembed.php:95
-#, fuzzy, php-format
+#, php-format
 msgid "Attachment %s not found."
-msgstr "Отримувача не знайдено."
+msgstr "Вкладення %s не знайдено."
 
 #: actions/oembed.php:136
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
-msgstr ""
+msgstr "«%s» не підтримується для oembed-запитів."
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
@@ -4028,11 +4037,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "Пошук дописів"
 
@@ -4079,23 +4089,28 @@ msgstr "Показувати або приховувати дизайни сто
 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 "Токен для входу втратив чинність."
 
@@ -4450,7 +4465,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. "
@@ -4460,7 +4477,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 "Пошук людей"
 
@@ -4579,13 +4597,12 @@ 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."
 msgstr ""
 "Позначте себе теґами (літери, цифри, -, . та _), відокремлюючи кожен комою "
-"або пробілом"
+"або пробілом."
 
 #. TRANS: Dropdownlist label in form for profile settings.
 #: actions/profilesettings.php:169
@@ -4594,9 +4611,8 @@ msgstr "Мова"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-#, fuzzy
 msgid "Preferred language."
-msgstr "Мова, котрій надаєте перевагу"
+msgstr "Мова, котрій надаєте перевагу."
 
 #. TRANS: Dropdownlist label in form for profile settings.
 #: actions/profilesettings.php:181
@@ -4610,7 +4626,6 @@ 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)."
 msgstr ""
@@ -4640,9 +4655,9 @@ msgstr "Мова надто довга (не більше 50 символів)."
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
 #: actions/profilesettings.php:291
-#, 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.
@@ -4747,6 +4762,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"
@@ -4884,9 +4905,8 @@ msgstr "Запит на відновлення паролю відправлен
 
 #. TRANS: Title for password recovery page in password saved mode.
 #: actions/recoverpassword.php:229
-#, fuzzy
 msgid "Password saved"
-msgstr "Пароль збережено."
+msgstr "Пароль збережено"
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 #: actions/recoverpassword.php:232
@@ -4981,9 +5001,8 @@ msgid "Registration not allowed."
 msgstr "Реєстрацію не дозволено."
 
 #: actions/register.php:201
-#, fuzzy
 msgid "You cannot register if you don't agree to the license."
-msgstr "Ви не зможете зареєструватись, якщо не погодитесь з умовами ліцензії."
+msgstr "Ви не можете зареєструватись, якщо не погодитесь з умовами ліцензії."
 
 #: actions/register.php:210
 msgid "Email address already exists."
@@ -4994,13 +5013,12 @@ msgid "Invalid username or password."
 msgstr "Недійсне ім’я або пароль."
 
 #: actions/register.php:340
-#, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
 msgstr ""
 "Ця форма дозволить вам створити новий акаунт. Ви зможете робити дописи і "
-"будете в курсі справ ваших друзів та колег. "
+"будете в курсі справ ваших друзів та колег."
 
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:431 actions/register.php:435
@@ -5009,19 +5027,16 @@ msgid "Email"
 msgstr "Пошта"
 
 #: actions/register.php:432 actions/register.php:436
-#, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
-msgstr "Використовується лише для оновлень, оголошень та відновлення паролю"
+msgstr "Використовується лише для оновлень, оголошень та відновлення пароля."
 
 #: actions/register.php:443
-#, fuzzy
 msgid "Longer name, preferably your \"real\" name."
-msgstr "Повне ім’я, звісно ж ваше справжнє ім’я"
+msgstr "Повне ім’я, бажано ваше справжнє ім’я."
 
 #: actions/register.php:471
-#, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "Де ви живете, на кшталт «Місто, область (регіон), країна»"
+msgstr "Де ви живете, на кшталт «Місто, область (регіон), країна»."
 
 #: actions/register.php:510
 #, php-format
@@ -5119,7 +5134,6 @@ msgid "User nickname"
 msgstr "Ім’я користувача"
 
 #: actions/remotesubscribe.php:129
-#, fuzzy
 msgid "Nickname of the user you want to follow."
 msgstr "Ім’я користувача, дописи якого ви хотіли б читати."
 
@@ -5128,9 +5142,8 @@ msgid "Profile URL"
 msgstr "URL-адреса профілю"
 
 #: actions/remotesubscribe.php:133
-#, fuzzy
 msgid "URL of your profile on another compatible microblogging service."
-msgstr "URL-адреса вашого профілю на іншому сумісному сервісі"
+msgstr "URL-адреса вашого профілю на іншому сумісному сервісі мікроблоґів."
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
@@ -5139,9 +5152,8 @@ msgid "Subscribe"
 msgstr "Підписатись"
 
 #: actions/remotesubscribe.php:158
-#, fuzzy
 msgid "Invalid profile URL (bad format)."
-msgstr "Недійсна URL-адреса профілю (неправильний формат)"
+msgstr "Неприпустима URL-адреса профілю (неправильний формат)."
 
 #: actions/remotesubscribe.php:167
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
@@ -5180,6 +5192,7 @@ 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
@@ -5234,9 +5247,11 @@ msgstr ""
 "Ви можете [«розштовхати» %1$s](../%2$s) або [написати дещо варте його уваги](%"
 "%%%action.newnotice%%%%?status_textarea=%3$s)."
 
-#: actions/repliesrss.php:72
-#, 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
+#, 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.
@@ -5970,9 +5985,8 @@ msgstr ""
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
-#, fuzzy
 msgid "Save site notice."
-msgstr "Зберегти повідомлення сайту"
+msgstr "Зберегти повідомлення сайту."
 
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:57
@@ -6029,9 +6043,8 @@ 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."
-msgstr "Телефонний номер та регіональний код, ніякої пунктуації чи інтервалів"
+msgstr "Телефонний номер та регіональний код, ніякої пунктуації чи інтервалів."
 
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:191
@@ -6198,15 +6211,19 @@ 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."
 
-#: 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 "Підписані"
 
@@ -6405,6 +6422,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 "Цього користувача блокувати неможливо."
@@ -6455,7 +6473,7 @@ 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
+#, php-format
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr "Помилкова підписка за замовчуванням: «%1$s» не є користувачем."
 
@@ -6517,9 +6535,8 @@ msgstr ""
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-#, fuzzy
 msgid "Save user settings."
-msgstr "Зберегти налаштування користувача"
+msgstr "Зберегти налаштування користувача."
 
 #. TRANS: Page title.
 #: actions/userauthorization.php:109
@@ -6528,15 +6545,14 @@ 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 "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
 "click \"Reject\"."
 msgstr ""
-"Будь ласка, перевірте всі деталі, щоб упевнитись, що ви дійсно бажаєте "
-"підписатись на дописи цього користувача. Якщо ви не збирались підписуватись "
-"ні до чиїх дописів, просто натисніть «Відмінити»."
+"Будь ласка, перевірте всі деталі, аби упевнитись, що ви дійсно бажаєте "
+"підписатись на дописи цього користувача. Якщо ви не збираєтесь "
+"підписуватись, то просто натисніть «Відмінити»."
 
 #. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
@@ -6547,29 +6563,25 @@ msgstr "Ліцензія"
 
 #. TRANS: Button text on Authorise Subscription page.
 #: actions/userauthorization.php:229
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Погодитись"
 
 #. TRANS: Title for button on Authorise Subscription page.
 #: actions/userauthorization.php:231
-#, fuzzy
 msgid "Subscribe to this user."
-msgstr "Підписатись до цього користувача"
+msgstr "Підписатися до цього користувача."
 
 #. TRANS: Button text on Authorise Subscription page.
 #: actions/userauthorization.php:233
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
-msgstr "Забраковано"
+msgstr "Відхилити"
 
 #. TRANS: Title for button on Authorise Subscription page.
 #: actions/userauthorization.php:235
-#, fuzzy
 msgid "Reject this subscription."
-msgstr "Відмінити цю підписку"
+msgstr "Відхилити підписку."
 
 #. TRANS: Client error displayed for an empty authorisation request.
 #: actions/userauthorization.php:248
@@ -6609,60 +6621,60 @@ msgstr ""
 #. TRANS: Exception thrown when no valid user is found for an authorisation request.
 #. TRANS: %s is a listener URI.
 #: actions/userauthorization.php:325
-#, fuzzy, php-format
+#, php-format
 msgid "Listener URI \"%s\" not found here."
-msgstr "URI слухача «%s» тут не знайдено"
+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
-#, fuzzy, php-format
+#, 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
-#, fuzzy, php-format
+#, php-format
 msgid "Listenee URI \"%s\" is a local user."
-msgstr "URI слухача «%s» це локальний користувач"
+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
-#, fuzzy, php-format
+#, 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
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Listenee stream license \"%1$s\" is not compatible with site license \"%2$s"
 "\"."
-msgstr "Ліцензія «%1$s» не відповідає ліцензії сайту «%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
+#, php-format
 msgid "Avatar URL \"%s\" is not valid."
-msgstr "URL-адреса аватари «%s» помилкова."
+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
-#, fuzzy, php-format
+#, php-format
 msgid "Cannot read avatar URL \"%s\"."
-msgstr "Не можна прочитати 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
-#, fuzzy, php-format
+#, php-format
 msgid "Wrong image type for avatar URL \"%s\"."
-msgstr "Неправильний тип зображення для URL-адреси аватари «%s»."
+msgstr "Неправильний тип зображення для URL аватари «%s»."
 
 #. TRANS: Page title for profile design page.
 #: actions/userdesignsettings.php:74 lib/designsettings.php:63
@@ -7005,14 +7017,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:771
+#: classes/Profile.php:775
 #, 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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -7658,19 +7670,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 "Не вдалося автентифікувати вас."
 
@@ -9744,18 +9760,23 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, php-format
 msgid "about one minute ago"
 msgid_plural "about %d minutes ago"
@@ -9764,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:1319
 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:1323
 #, php-format
 msgid "about one hour ago"
 msgid_plural "about %d hours ago"
@@ -9778,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:1326
 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:1330
 #, php-format
 msgid "about one day ago"
 msgid_plural "about %d days ago"
@@ -9792,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:1333
 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:1337
 #, php-format
 msgid "about one month ago"
 msgid_plural "about %d months ago"
@@ -9806,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:1340
 msgid "about a year ago"
 msgstr "близько року тому"
 
@@ -9855,15 +9876,3 @@ msgstr "Неправильний XML, корінь XRD відсутній."
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "Отримання резервної копії файлу «%s»."
-
-#~ msgid "6 or more characters"
-#~ msgstr "6 або більше знаків"
-
-#~ msgid "Same as password above"
-#~ msgstr "Такий само, як і пароль вище"
-
-#~ msgid "Can't save new password."
-#~ msgstr "Неможна зберегти новий пароль."
-
-#~ msgid "URL of your homepage, blog, or profile on another site"
-#~ msgstr "URL-адреса вашої веб-сторінки, блоґу, або профілю на іншому сайті"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 327597f732..52f657227f 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-17 10:25+0000\n"
-"PO-Revision-Date: 2011-02-17 10:27:51+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:37: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-Generator: MediaWiki 1.18alpha (r82325); Translate extension (2011-02-01)\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-14 17:20:58+0000\n"
+"X-POT-Import-Date: 2011-02-17 11:39:54+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -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
@@ -156,10 +160,10 @@ 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:76
+#: 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:74
+#: 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:497 lib/galleryaction.php:59
 #: lib/mailbox.php:80 lib/profileaction.php:77
@@ -511,9 +515,8 @@ 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 "不能给未成为好友的用户发送私信。"
+msgstr "不能将直接邮件发送到用户的不是你的朋友。"
 
 #. TRANS: Client error displayed trying to direct message self (403).
 #: actions/apidirectmessagenew.php:154
@@ -804,6 +807,7 @@ 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
@@ -816,7 +820,7 @@ msgstr "请求 token 已被授权了。"
 #: actions/profilesettings.php:217 actions/recoverpassword.php:383
 #: actions/register.php:164 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/subscribe.php:87 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:53
 #: lib/designsettings.php:310
 msgid "There was a problem with your session token. Try again, please."
@@ -1028,9 +1032,9 @@ 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
+#, php-format
 msgid "Unsupported format: %s."
-msgstr "不支持的格式：%s"
+msgstr "不支持的格式： %s。"
 
 #. TRANS: Client error displayed requesting a deleted status.
 #: actions/apistatusesshow.php:155
@@ -1130,13 +1134,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条来自所有人的消息！"
@@ -1238,9 +1243,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 "没有这个文件。"
 
@@ -1539,9 +1545,8 @@ 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.
@@ -1601,9 +1606,8 @@ msgstr "备份"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #: actions/backupaccount.php:252
-#, fuzzy
 msgid "Backup your account."
-msgstr "备份您的帐户"
+msgstr "备份您的帐户。"
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 #: actions/block.php:68
@@ -1642,7 +1646,6 @@ msgstr "否"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #: actions/block.php:158
-#, fuzzy
 msgid "Do not block this user."
 msgstr "不要屏蔽这个用户"
 
@@ -1661,7 +1664,6 @@ msgstr "是"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 #: actions/block.php:165
-#, fuzzy
 msgid "Block this user."
 msgstr "屏蔽这个用户"
 
@@ -1879,15 +1881,13 @@ 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
@@ -1939,28 +1939,28 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a group.
 #: actions/deletegroup.php:224
-#, fuzzy
 msgid "Do not delete this group."
-msgstr "不要删除这个小组"
+msgstr "不要删除此组。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
 #: actions/deletegroup.php:231
-#, 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.
 #. 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/nudge.php:63 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
@@ -1987,15 +1987,13 @@ msgstr "你确定要删除这条消息吗？"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:159
-#, fuzzy
 msgid "Do not delete this notice."
-msgstr "不要删除这个消息"
+msgstr "不要删除此通知。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
 #: actions/deletenotice.php:166
-#, fuzzy
 msgid "Delete this notice."
-msgstr "删除"
+msgstr "删除此通知。"
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 #: actions/deleteuser.php:66
@@ -2028,15 +2026,13 @@ 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.
 #. TRANS: Link description in user account settings menu.
@@ -2198,21 +2194,18 @@ 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 "重置到默认"
+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
@@ -2621,9 +2614,8 @@ msgstr "已收藏过此消息！"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #: actions/favor.php:95
-#, fuzzy
 msgid "Disfavor favorite."
-msgstr "取消收藏"
+msgstr "不是赞成的最爱。"
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2856,15 +2848,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 "不要在此小组屏蔽此用户。"
 
 #. 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 "在小组中屏蔽此用户。"
+msgstr "阻止此此组中的用户。"
 
 #. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
 #: actions/groupblock.php:215
@@ -2872,6 +2862,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。"
@@ -3053,8 +3044,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 "没有查询结果。"
 
@@ -3089,6 +3082,7 @@ 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 "取消屏蔽时出错。"
@@ -3351,9 +3345,8 @@ 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 "要邀请的好友地址(每行一个)"
+msgstr "朋友邀请的地址（每行一个）。"
 
 #. TRANS: Field label for a personal message to send to invitees.
 #: actions/invite.php:225
@@ -3578,6 +3571,7 @@ 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
 msgid "Already logged in."
 msgstr "已登录。"
@@ -3586,7 +3580,8 @@ msgstr "已登录。"
 msgid "Incorrect username or password."
 msgstr "用户名或密码不正确。"
 
-#: actions/login.php:148 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:148 actions/otp.php:127
 msgid "Error setting user. You are probably not authorized."
 msgstr "设置用户时出错。你可能没有被认证。"
 
@@ -3691,9 +3686,8 @@ msgstr "通过此表单创建小组。"
 
 #. TRANS: Group create form validation error.
 #: actions/newgroup.php:200
-#, fuzzy
 msgid "Alias cannot be the same as nickname."
-msgstr "别名不能和昵称相同。"
+msgstr "别名不能昵称相同。"
 
 #: actions/newmessage.php:71 actions/newmessage.php:234
 msgid "New message"
@@ -3744,7 +3738,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 "
@@ -3753,16 +3749,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%%%%?"
@@ -3771,7 +3772,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 "
@@ -3780,14 +3783,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
-#, 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
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s."
 msgstr "%2$s上符合搜索关键字\"%1$s\"的更新！"
 
 #: actions/nudge.php:85
@@ -3873,14 +3879,14 @@ msgstr ""
 "你是开发者么？[注册一个 OAuth 客户端应用](%s) 来使用这个 StatusNet 网站。"
 
 #: actions/oembed.php:64
-#, fuzzy, php-format
+#, php-format
 msgid "\"%s\" not found."
-msgstr "API方法没有找到。"
+msgstr "找不到\"%s\"。"
 
 #: actions/oembed.php:76
-#, fuzzy, php-format
+#, php-format
 msgid "Notice %s not found."
-msgstr "没有找到父级的消息。"
+msgstr "找不到 %s 的通知。"
 
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
@@ -3892,14 +3898,14 @@ msgid "%1$s's status on %2$s"
 msgstr "%1$s在%2$s时发的消息"
 
 #: actions/oembed.php:95
-#, fuzzy, php-format
+#, php-format
 msgid "Attachment %s not found."
-msgstr "未找到收件人。"
+msgstr "找不到 %s 的附件。"
 
 #: actions/oembed.php:136
 #, php-format
 msgid "\"%s\" not supported for oembed requests."
-msgstr ""
+msgstr "\"%s\"不支持 oembed 的请求。"
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:168
@@ -3919,11 +3925,12 @@ 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:67
+#: actions/opensearch.php:68
 msgid "Notice Search"
 msgstr "搜索消息"
 
@@ -3970,23 +3977,28 @@ msgstr "显示或隐藏个人页面外观。"
 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 已过期。"
 
@@ -4339,7 +4351,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. "
@@ -4348,7 +4362,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 "搜索用户"
 
@@ -4477,9 +4492,8 @@ msgstr "语言"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
 #: actions/profilesettings.php:171
-#, fuzzy
 msgid "Preferred language."
-msgstr "首选语言"
+msgstr "首选的语言。"
 
 #. TRANS: Dropdownlist label in form for profile settings.
 #: actions/profilesettings.php:181
@@ -4493,10 +4507,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)."
-msgstr "自动关注任何关注我的人 (这个选项适合机器人)"
+msgstr "自动关注任何关注我的人（这个选项适合机器人）"
 
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: Plural form is used based on the maximum number of allowed
@@ -4520,9 +4533,9 @@ msgstr "语言过长(不能超过50个字符)。"
 #. TRANS: Validation error in form for profile settings.
 #. TRANS: %s is an invalid tag.
 #: actions/profilesettings.php:291
-#, 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.
@@ -4622,6 +4635,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"
@@ -4754,7 +4773,6 @@ msgstr "已请求密码恢复"
 
 #. TRANS: Title for password recovery page in password saved mode.
 #: actions/recoverpassword.php:229
-#, fuzzy
 msgid "Password saved"
 msgstr "密码已保存。"
 
@@ -4848,9 +4866,8 @@ msgid "Registration not allowed."
 msgstr "不允许注册。"
 
 #: actions/register.php:201
-#, fuzzy
 msgid "You cannot register if you don't agree to the license."
-msgstr "你必须同意许可协议才能注册。"
+msgstr "如果您不同意该许可，您不能注册。"
 
 #: actions/register.php:210
 msgid "Email address already exists."
@@ -4861,13 +4878,10 @@ msgid "Invalid username or password."
 msgstr "用户名或密码不正确。"
 
 #: actions/register.php:340
-#, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues."
-msgstr ""
-"你可以通过此表单建立一个新的账户。然后你就可以发布消息并与朋友和同事们保持联"
-"系。 "
+msgstr "使用此窗体可以创建一个新的帐户。然后可以张贴告示及链接到的朋友和同事。"
 
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:431 actions/register.php:435
@@ -4876,19 +4890,16 @@ msgid "Email"
 msgstr "电子邮件"
 
 #: actions/register.php:432 actions/register.php:436
-#, fuzzy
 msgid "Used only for updates, announcements, and password recovery."
-msgstr "只用于更新、通知及密码恢复"
+msgstr "仅用于更新、 公告及密码恢复。"
 
 #: actions/register.php:443
-#, fuzzy
 msgid "Longer name, preferably your \"real\" name."
-msgstr "更长的名字，最好是“真实姓名”"
+msgstr "你最好是\"真正的\"的名字的长名称技术。"
 
 #: actions/register.php:471
-#, fuzzy
 msgid "Where you are, like \"City, State (or Region), Country\"."
-msgstr "你的地理位置，格式类似\"城市，省份，国家\""
+msgstr "你在哪里，像\"城市、 国家（或地区）、国家\"。"
 
 #: actions/register.php:510
 #, php-format
@@ -4981,18 +4992,16 @@ msgid "User nickname"
 msgstr "昵称"
 
 #: actions/remotesubscribe.php:129
-#, fuzzy
 msgid "Nickname of the user you want to follow."
-msgstr "希望关注的用户昵称"
+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"
+msgstr "另一种兼容的微博客服务配置文件的 URL。"
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
@@ -5041,6 +5050,7 @@ 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
@@ -5092,9 +5102,11 @@ msgstr ""
 "你可以试着 [呼叫%1$s](../%2$s) 或者给他们 [发一些消息](%%%%action.newnotice%%"
 "%%?status_textarea=%3$s)。"
 
-#: actions/repliesrss.php:72
-#, 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
+#, 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.
@@ -5805,9 +5817,8 @@ msgstr "整个网站的公告文字（最长255字符；可使用HTML）"
 
 #. TRANS: Title for button to save site notice in admin panel.
 #: actions/sitenoticeadminpanel.php:201
-#, fuzzy
 msgid "Save site notice."
-msgstr "保存网站公告"
+msgstr "保存网站公告。"
 
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:57
@@ -5864,9 +5875,8 @@ 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."
-msgstr "电话号码，不带标点或空格，包含地区代码"
+msgstr "电话号码、 没有标点或带区号的空格。"
 
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:191
@@ -5957,9 +5967,8 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:535
-#, fuzzy
 msgid "No code entered."
-msgstr "没有输入验证码"
+msgstr "没有输入的代码。"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
@@ -6030,15 +6039,19 @@ 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 请求"
 
-#: 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 "已关注"
 
@@ -6230,6 +6243,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 "你未屏蔽该用户。"
@@ -6341,9 +6355,8 @@ msgstr "是否允许用户发送注册邀请。"
 
 #. TRANS: Title for button to save user settings in user admin panel.
 #: actions/useradminpanel.php:302
-#, fuzzy
 msgid "Save user settings."
-msgstr "保存用户设置"
+msgstr "保存用户设置。"
 
 #. TRANS: Page title.
 #: actions/userauthorization.php:109
@@ -6352,14 +6365,13 @@ 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 "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
 "click \"Reject\"."
 msgstr ""
-"请检查这些详细信息，确认希望关注此用户的消息。如果你不想关注，请点击\\\"拒绝"
-"\\\"。"
+"请检查这些详细信息，请确保您要订阅此用户的通知。如果您不只是要求某人的通知订"
+"阅，请单击\"拒绝\"。"
 
 #. TRANS: DT element on Authorise Subscription page where license is displayed.
 #. TRANS: Menu item for site administration
@@ -6370,29 +6382,25 @@ msgstr "许可协议"
 
 #. TRANS: Button text on Authorise Subscription page.
 #: actions/userauthorization.php:229
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "接受"
 
 #. TRANS: Title for button on Authorise Subscription page.
 #: actions/userauthorization.php:231
-#, fuzzy
 msgid "Subscribe to this user."
-msgstr "关注这个用户"
+msgstr "订阅此用户。"
 
 #. TRANS: Button text on Authorise Subscription page.
 #: actions/userauthorization.php:233
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "拒绝"
 
 #. TRANS: Title for button on Authorise Subscription page.
 #: actions/userauthorization.php:235
-#, fuzzy
 msgid "Reject this subscription."
-msgstr "拒绝此关注"
+msgstr "拒绝此订阅。"
 
 #. TRANS: Client error displayed for an empty authorisation request.
 #: actions/userauthorization.php:248
@@ -6797,14 +6805,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:771
+#: classes/Profile.php:775
 #, 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:780
+#: classes/Profile.php:784
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr "无法取消用户#%2$d的\\\"%1$s\\\"权限，数据库错误。"
@@ -6906,9 +6914,9 @@ 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
+#, php-format
 msgid "Cannot locate account %s."
-msgstr "您不能删除您的帐户。"
+msgstr "找不到帐户 %s。"
 
 #. TRANS: Exception thrown when a service document could not be located account move.
 #. TRANS: %s is the remote site.
@@ -7313,9 +7321,9 @@ msgid "No content for notice %s."
 msgstr "通知 %s 没有内容。"
 
 #: lib/activitymover.php:84
-#, 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.
@@ -7324,10 +7332,10 @@ msgstr "没有这个用户。"
 #. 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
@@ -7443,19 +7451,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 "无法验证你。"
 
@@ -8167,9 +8179,9 @@ msgstr "默认外观已恢复。"
 
 #. TRANS: Exception. %s is an ID.
 #: lib/discovery.php:153
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to find services for %s."
-msgstr "不能取消%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.
@@ -8179,10 +8191,9 @@ msgstr "取消收藏这个消息"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
 #: lib/disfavorform.php:136
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Disfavor favorite"
-msgstr "取消收藏"
+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.
@@ -8192,10 +8203,9 @@ msgstr "收藏"
 
 #. TRANS: Button text for adding the favourite status to a notice.
 #: lib/favorform.php:135
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Favor"
-msgstr "收藏"
+msgstr "请"
 
 #: lib/feed.php:84
 msgid "RSS 1.0"
@@ -8610,9 +8620,9 @@ msgstr "%s：通过此代码证明这是你的手机："
 #. TRANS: Subject for 'nudge' notification email.
 #. TRANS: %s is the nudging user.
 #: lib/mail.php:485
-#, fuzzy, php-format
+#, php-format
 msgid "You have been nudged by %s"
-msgstr "你被%s呼叫了"
+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,
@@ -8910,9 +8920,8 @@ msgid "Send"
 msgstr "发布"
 
 #: lib/messagelist.php:77
-#, fuzzy
 msgid "Messages"
-msgstr "私信"
+msgstr "消息"
 
 #: lib/messagelistitem.php:123 lib/noticelist.php:522
 msgid "from"
@@ -9058,28 +9067,24 @@ msgstr "无法添加新的关注。"
 
 #. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
 #: lib/personalgroupnav.php:107
-#, fuzzy
 msgctxt "MENU"
 msgid "Replies"
-msgstr "回复"
+msgstr "答复"
 
 #. TRANS: Personal group navigation menu option when logged in for seeing own profile.
 #: lib/personalgroupnav.php:114
-#, fuzzy
 msgctxt "MENU"
 msgid "Profile"
-msgstr "个人信息"
+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
-#, fuzzy
 msgctxt "MENU"
 msgid "Inbox"
 msgstr "收件箱"
@@ -9091,7 +9096,6 @@ msgstr "你收到的私信"
 
 #. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
 #: lib/personalgroupnav.php:140
-#, fuzzy
 msgctxt "MENU"
 msgid "Outbox"
 msgstr "发件箱"
@@ -9470,61 +9474,66 @@ 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:1306
+#: lib/util.php:1309
 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:1312
 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:1316
 #, 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:1319
 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:1323
 #, 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:1326
 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:1330
 #, 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:1333
 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:1337
 #, 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:1340
 msgid "about a year ago"
 msgstr "约1年前"
 
@@ -9564,15 +9573,3 @@ msgstr "不合法的XML, 缺少XRD根"
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "从文件'%s'获取备份。"
-
-#~ msgid "6 or more characters"
-#~ msgstr "6 个或更多字符"
-
-#~ msgid "Same as password above"
-#~ msgstr "与上面相同的密码"
-
-#~ msgid "Can't save new password."
-#~ msgstr "无法保存新密码。"
-
-#~ msgid "URL of your homepage, blog, or profile on another site"
-#~ msgstr "你的主页、博客或在其他网站的URL"
diff --git a/plugins/FacebookBridge/locale/zh_CN/LC_MESSAGES/FacebookBridge.po b/plugins/FacebookBridge/locale/zh_CN/LC_MESSAGES/FacebookBridge.po
new file mode 100644
index 0000000000..970db99b9c
--- /dev/null
+++ b/plugins/FacebookBridge/locale/zh_CN/LC_MESSAGES/FacebookBridge.po
@@ -0,0 +1,301 @@
+# Translation of StatusNet - FacebookBridge to Simplified Chinese (‪中文(简体)‬)
+# Exported from translatewiki.net
+#
+# Author: Hydra
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+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"
+"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-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:224 FacebookBridgePlugin.php:263
+#: FacebookBridgePlugin.php:304
+msgctxt "MENU"
+msgid "Facebook"
+msgstr "Facebook"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#: FacebookBridgePlugin.php:226
+msgid "Login or register using Facebook"
+msgstr "登入或使用 Facebook 的注册"
+
+#. TRANS: Tooltip for menu item "Facebook".
+#: FacebookBridgePlugin.php:265
+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
+msgid "Facebook settings"
+msgstr "Facebook 的设置"
+
+#: FacebookBridgePlugin.php:570
+msgid "A plugin for integrating StatusNet with Facebook."
+msgstr "StatusNet 与结合 Facebook 的插件。"
+
+#: lib/facebookclient.php:760
+msgid "Your Facebook connection has been removed"
+msgstr "Facebook 的连接已被删除"
+
+#: lib/facebookclient.php:819
+#, php-format
+msgid "Contact the %s administrator to retrieve your account"
+msgstr "与 %s 管理员联系，以检索您的帐户"
+
+#: 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 "
+"Facebook to a local account. You can either create a new local account, or "
+"connect with an existing local account."
+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, "
+"email address, IM address, and phone number."
+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
+msgid "Facebook"
+msgstr "Facebook"
+
+#: actions/facebookadminpanel.php:62
+msgid "Facebook integration settings"
+msgstr "Facebook 集成设置"
+
+#: actions/facebookadminpanel.php:123
+msgid "Invalid Facebook ID. Max length is 255 characters."
+msgstr "无效的 Facebook ID。最大长度为 255 个字符。"
+
+#: actions/facebookadminpanel.php:129
+msgid "Invalid Facebook secret. Max length is 255 characters."
+msgstr "无效的 Facebook 秘密。最大长度为 255 个字符。"
+
+#: 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 "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 ""
diff --git a/plugins/GroupPrivateMessage/locale/br/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/br/LC_MESSAGES/GroupPrivateMessage.po
new file mode 100644
index 0000000000..9106bb8f9b
--- /dev/null
+++ b/plugins/GroupPrivateMessage/locale/br/LC_MESSAGES/GroupPrivateMessage.po
@@ -0,0 +1,61 @@
+# Translation of StatusNet - GroupPrivateMessage to Breton (Brezhoneg)
+# Exported from translatewiki.net
+#
+# Author: Fulup
+# --
+# 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-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:39: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-02-17 11:34:54+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-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] ""
+"Re hir eo. %d eo an niver brasañ a arouezennoù a c'haller kaout en ur "
+"gemennadenn."
+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
new file mode 100644
index 0000000000..15ac312231
--- /dev/null
+++ b/plugins/GroupPrivateMessage/locale/ia/LC_MESSAGES/GroupPrivateMessage.po
@@ -0,0 +1,61 @@
+# Translation of StatusNet - GroupPrivateMessage 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 - 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"
+"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-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."
+
+#: 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."
+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"
diff --git a/plugins/GroupPrivateMessage/locale/mk/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/mk/LC_MESSAGES/GroupPrivateMessage.po
new file mode 100644
index 0000000000..78cb6b708c
--- /dev/null
+++ b/plugins/GroupPrivateMessage/locale/mk/LC_MESSAGES/GroupPrivateMessage.po
@@ -0,0 +1,59 @@
+# Translation of StatusNet - GroupPrivateMessage 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 - 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"
+"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-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 знаци."
+
+#: 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 "Испрати"
diff --git a/plugins/GroupPrivateMessage/locale/nl/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/nl/LC_MESSAGES/GroupPrivateMessage.po
new file mode 100644
index 0000000000..96cea800c0
--- /dev/null
+++ b/plugins/GroupPrivateMessage/locale/nl/LC_MESSAGES/GroupPrivateMessage.po
@@ -0,0 +1,59 @@
+# Translation of StatusNet - GroupPrivateMessage 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 - 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"
+"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-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."
+
+#: 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."
+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"
diff --git a/plugins/GroupPrivateMessage/locale/sr-ec/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/sr-ec/LC_MESSAGES/GroupPrivateMessage.po
new file mode 100644
index 0000000000..e091754e2d
--- /dev/null
+++ b/plugins/GroupPrivateMessage/locale/sr-ec/LC_MESSAGES/GroupPrivateMessage.po
@@ -0,0 +1,58 @@
+# Translation of StatusNet - GroupPrivateMessage to Serbian Cyrillic ekavian (‪Српски (ћирилица)‬)
+# Exported from translatewiki.net
+#
+# Author: Rancher
+# --
+# 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-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:39:12+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-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 знака"
+
+#: 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 "Пошаљи"
diff --git a/plugins/GroupPrivateMessage/locale/te/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/te/LC_MESSAGES/GroupPrivateMessage.po
new file mode 100644
index 0000000000..6e979f826a
--- /dev/null
+++ b/plugins/GroupPrivateMessage/locale/te/LC_MESSAGES/GroupPrivateMessage.po
@@ -0,0 +1,57 @@
+# Translation of StatusNet - GroupPrivateMessage 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 - 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"
+"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-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] ""
+
+#: 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 "పంపించు"
diff --git a/plugins/GroupPrivateMessage/locale/uk/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/uk/LC_MESSAGES/GroupPrivateMessage.po
new file mode 100644
index 0000000000..f6a0ea5a4c
--- /dev/null
+++ b/plugins/GroupPrivateMessage/locale/uk/LC_MESSAGES/GroupPrivateMessage.po
@@ -0,0 +1,60 @@
+# Translation of StatusNet - GroupPrivateMessage 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 - 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"
+"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-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 символів."
+
+#: 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 "Надіслати"
diff --git a/plugins/GroupPrivateMessage/locale/zh_CN/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/zh_CN/LC_MESSAGES/GroupPrivateMessage.po
new file mode 100644
index 0000000000..0a110a769a
--- /dev/null
+++ b/plugins/GroupPrivateMessage/locale/zh_CN/LC_MESSAGES/GroupPrivateMessage.po
@@ -0,0 +1,57 @@
+# Translation of StatusNet - GroupPrivateMessage to Simplified Chinese (‪中文(简体)‬)
+# Exported from translatewiki.net
+#
+# Author: Hydra
+# --
+# 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-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:39:12+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-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] ""
+
+#: 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 "发送"
diff --git a/plugins/InProcessCache/locale/zh_CN/LC_MESSAGES/InProcessCache.po b/plugins/InProcessCache/locale/zh_CN/LC_MESSAGES/InProcessCache.po
new file mode 100644
index 0000000000..1125503646
--- /dev/null
+++ b/plugins/InProcessCache/locale/zh_CN/LC_MESSAGES/InProcessCache.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - InProcessCache to Simplified Chinese (‪中文(简体)‬)
+# Exported from translatewiki.net
+#
+# Author: Hydra
+# --
+# 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-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:39:16+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-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/LinkPreview/locale/zh_CN/LC_MESSAGES/LinkPreview.po b/plugins/LinkPreview/locale/zh_CN/LC_MESSAGES/LinkPreview.po
new file mode 100644
index 0000000000..358d4f31d9
--- /dev/null
+++ b/plugins/LinkPreview/locale/zh_CN/LC_MESSAGES/LinkPreview.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - LinkPreview to Simplified Chinese (‪中文(简体)‬)
+# Exported from translatewiki.net
+#
+# Author: Hydra
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+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"
+"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-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/LogFilter/locale/zh_CN/LC_MESSAGES/LogFilter.po b/plugins/LogFilter/locale/zh_CN/LC_MESSAGES/LogFilter.po
new file mode 100644
index 0000000000..ae15498ae9
--- /dev/null
+++ b/plugins/LogFilter/locale/zh_CN/LC_MESSAGES/LogFilter.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - LogFilter to Simplified Chinese (‪中文(简体)‬)
+# Exported from translatewiki.net
+#
+# Author: Hydra
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+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"
+"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-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/NewMenu/locale/zh_CN/LC_MESSAGES/NewMenu.po b/plugins/NewMenu/locale/zh_CN/LC_MESSAGES/NewMenu.po
new file mode 100644
index 0000000000..8fe563a170
--- /dev/null
+++ b/plugins/NewMenu/locale/zh_CN/LC_MESSAGES/NewMenu.po
@@ -0,0 +1,99 @@
+# Translation of StatusNet - NewMenu to Simplified Chinese (‪中文(简体)‬)
+# Exported from translatewiki.net
+#
+# Author: Hydra
+# --
+# 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-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:39: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-02-14 17:21:59+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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-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/RequireValidatedEmail/locale/RequireValidatedEmail.pot b/plugins/RequireValidatedEmail/locale/RequireValidatedEmail.pot
index ad649a48f5..bf9abd4b04 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-01-29 21:45+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+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:100
 msgid "You must validate your email address before posting."
 msgstr ""
 
-#: RequireValidatedEmailPlugin.php:112
+#: RequireValidatedEmailPlugin.php:120
 msgid "You must provide an email address to register."
 msgstr ""
 
-#: RequireValidatedEmailPlugin.php:216
+#: RequireValidatedEmailPlugin.php:224
 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 9a8592833a..2dbcff2873 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:16+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:40:43+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:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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:92
+#: RequireValidatedEmailPlugin.php:100
 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:120
 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:224
 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 52fdd017f6..da29ce72cf 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:16+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:40: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-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:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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:92
+#: RequireValidatedEmailPlugin.php:100
 msgid "You must validate your email address before posting."
 msgstr "Vous devez valider votre adresse électronique avant de poster."
 
-#: RequireValidatedEmailPlugin.php:112
+#: RequireValidatedEmailPlugin.php:120
 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:224
 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 ed108a1af2..d1c7173d2f 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:16+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:40:44+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:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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:92
+#: RequireValidatedEmailPlugin.php:100
 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:120
 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:224
 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 2d0d29947e..a67d6d0c6b 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:16+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:40:44+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:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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:92
+#: RequireValidatedEmailPlugin.php:100
 msgid "You must validate your email address before posting."
 msgstr ""
 "Пред да почнете да објавувате ќе мора да ја потврдите Вашата е-поштенска "
 "адреса."
 
-#: RequireValidatedEmailPlugin.php:112
+#: RequireValidatedEmailPlugin.php:120
 msgid "You must provide an email address to register."
 msgstr "За да се регистрирате, ќе мора да наведете е-поштенска адреса."
 
-#: RequireValidatedEmailPlugin.php:216
+#: RequireValidatedEmailPlugin.php:224
 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 759cf1a9aa..0e78ecb1d1 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:16+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:40:44+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:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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:92
+#: RequireValidatedEmailPlugin.php:100
 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:120
 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:224
 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 c227afae63..efbfd6a8e1 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:17+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:40:44+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:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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:92
+#: RequireValidatedEmailPlugin.php:100
 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:120
 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:224
 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 d7f09a1a9e..cca8d72aa0 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-01-29 21:45+0000\n"
-"PO-Revision-Date: 2011-01-29 21:51:17+0000\n"
+"POT-Creation-Date: 2011-02-24 10:32+0000\n"
+"PO-Revision-Date: 2011-02-24 10:40:44+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:20+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r82712); 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:92
+#: RequireValidatedEmailPlugin.php:100
 msgid "You must validate your email address before posting."
 msgstr ""
 "Ви повинні підтвердити свою адресу електронної пошти до того, як почнете "
 "надсилати дописи поштою."
 
-#: RequireValidatedEmailPlugin.php:112
+#: RequireValidatedEmailPlugin.php:120
 msgid "You must provide an email address to register."
 msgstr "Ви повинні зазначити свою адресу електронної пошти для реєстрації."
 
-#: RequireValidatedEmailPlugin.php:216
+#: RequireValidatedEmailPlugin.php:224
 msgid "Disables posting without a validated email address."
 msgstr ""
 "Забороняє надсилання дописів, якщо користувач не має підтвердженої "

From 4e3537a12bbde0a55521f11963201947dcd08d24 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Thu, 24 Feb 2011 13:02:11 +0100
Subject: [PATCH 312/314] * add support for Friulian * move a line around for
 sorting reasons

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

diff --git a/lib/language.php b/lib/language.php
index 86896cff9d..302192efde 100644
--- a/lib/language.php
+++ b/lib/language.php
@@ -315,9 +315,10 @@ function get_all_languages() {
         'en-gb'   => array('q' => 1, 'lang' => 'en_GB', 'name' => 'English (British)', 'direction' => 'ltr'),
         'en'      => array('q' => 1, 'lang' => 'en',    'name' => 'English (US)', 'direction' => 'ltr'),
         'es'      => array('q' => 1, 'lang' => 'es',    'name' => 'Spanish', 'direction' => 'ltr'),
-        'fi'      => array('q' => 1, 'lang' => 'fi', 'name' => 'Finnish', 'direction' => 'ltr'),
         'fa'      => array('q' => 1, 'lang' => 'fa', 'name' => 'Persian', 'direction' => 'rtl'),
+        'fi'      => array('q' => 1, 'lang' => 'fi', 'name' => 'Finnish', 'direction' => 'ltr'),
         'fr-fr'   => array('q' => 1, 'lang' => 'fr', 'name' => 'French', 'direction' => 'ltr'),
+        'fur'     => array('q' => 0.8, 'lang' => 'fur', 'name' => 'Friulian', 'direction' => 'ltr'),
         'ga'      => array('q' => 0.5, 'lang' => 'ga', 'name' => 'Irish', 'direction' => 'ltr'),
         'gl'      => array('q' => 0.8, 'lang' => 'gl', 'name' => 'Galician', 'direction' => 'ltr'),
         'he'      => array('q' => 0.5, 'lang' => 'he', 'name' => 'Hebrew', 'direction' => 'rtl'),

From e00483d703d1c61770f3467eb290380f0988b593 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 25 Feb 2011 15:38:24 -0800
Subject: [PATCH 313/314] Test case for ticket #2248: flickr URLs with @ in the
 path get misinterpreted as mailto

---
 tests/URLDetectionTest.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/URLDetectionTest.php b/tests/URLDetectionTest.php
index eac7ba3f5c..dc017ac616 100644
--- a/tests/URLDetectionTest.php
+++ b/tests/URLDetectionTest.php
@@ -20,6 +20,8 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
     public function testProduction($content, $expected)
     {
         $rendered = common_render_text($content);
+        // hack!
+        $rendered = preg_replace('/id="attachment-\d+"/', 'id="attachment-XXX"', $rendered);
         $this->assertEquals($expected, $rendered);
     }
 
@@ -269,7 +271,13 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
                      array('file.html',
                            'file.html'),
                      array('file.php',
-                           'file.php')
+                           'file.php'),
+
+                     // scheme-less HTTP URLs with @ in the path: http://status.net/open-source/issues/2248
+                     array('http://flickr.com/photos/34807140@N05/3838905434',
+                           '<a href="http://flickr.com/photos/34807140@N05/3838905434" title="http://flickr.com/photos/34807140@N05/3838905434" class="attachment thumbnail" id="attachment-XXX" rel="nofollow external">http://flickr.com/photos/34807140@N05/3838905434</a>'),
+                     array('flickr.com/photos/34807140@N05/3838905434',
+                           '<a href="http://flickr.com/photos/34807140@N05/3838905434" title="http://flickr.com/photos/34807140@N05/3838905434" class="attachment thumbnail" id="attachment-XXX" rel="nofollow external">flickr.com/photos/34807140@N05/3838905434</a>'),
                      );
     }
 }

From 6a6584741f3d91bff2461421ef220b2bcae7847d Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 25 Feb 2011 15:46:35 -0800
Subject: [PATCH 314/314] Fix for ticket #2248: flickr etc URLs that contain @
 in the paths etc no longer accidentally trip the mailto: thingy

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

diff --git a/lib/util.php b/lib/util.php
index 85f49e4c59..8dd22de592 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -922,11 +922,11 @@ function common_linkify($url) {
     // functions
     $url = htmlspecialchars_decode($url);
 
-   if(strpos($url, '@') !== false && strpos($url, ':') === false) {
-       //url is an email address without the mailto: protocol
-       $canon = "mailto:$url";
-       $longurl = "mailto:$url";
-   }else{
+    if (strpos($url, '@') !== false && strpos($url, ':') === false && Validate::email($url)) {
+        //url is an email address without the mailto: protocol
+        $canon = "mailto:$url";
+        $longurl = "mailto:$url";
+    } else {
 
         $canon = File_redirection::_canonUrl($url);